diff --git a/Borepin/Borepin/Page/ScanPage.xaml b/Borepin/Borepin/Page/ScanPage.xaml
index 8f29baa..c828014 100644
--- a/Borepin/Borepin/Page/ScanPage.xaml
+++ b/Borepin/Borepin/Page/ScanPage.xaml
@@ -11,10 +11,9 @@
                 ScanResultCommand="{Binding ScannedCommand}"  
                 IsScanning="{Binding IsScanning}" 
                 Options="{Binding ScanOptions}" 
-                WidthRequest="300" 
-                HeightRequest="500" 
-                VerticalOptions="CenterAndExpand" 
-                HorizontalOptions="CenterAndExpand"/>
+                VerticalOptions="FillAndExpand" 
+                HorizontalOptions="FillAndExpand"
+                Margin="10"/>
             <Button Text="{x:Static resource_text:TextResource.CANCEL}" Command="{Binding CancelCommand}"/>
         </StackLayout>
     </ContentPage.Content>
diff --git a/Borepin/Borepin/Page/ScanURNPage.xaml b/Borepin/Borepin/Page/ScanURNPage.xaml
index cbaba29..1ba1b0c 100644
--- a/Borepin/Borepin/Page/ScanURNPage.xaml
+++ b/Borepin/Borepin/Page/ScanURNPage.xaml
@@ -11,10 +11,9 @@
                 ScanResultCommand="{Binding ScannedCommand}"  
                 IsScanning="{Binding IsScanning}" 
                 Options="{Binding ScanOptions}" 
-                WidthRequest="300" 
-                HeightRequest="500" 
-                VerticalOptions="CenterAndExpand" 
-                HorizontalOptions="CenterAndExpand"/>
+                VerticalOptions="FillAndExpand" 
+                HorizontalOptions="FillAndExpand"
+                Margin="10"/>
             <Button Text="{x:Static resource_text:TextResource.CANCEL}" Command="{Binding CancelCommand}"/>
         </StackLayout>
     </ContentPage.Content>
diff --git a/Borepin/Borepin/PageModel/MachineListPageModel.cs b/Borepin/Borepin/PageModel/MachineListPageModel.cs
index 6e05381..5fdbe13 100644
--- a/Borepin/Borepin/PageModel/MachineListPageModel.cs
+++ b/Borepin/Borepin/PageModel/MachineListPageModel.cs
@@ -125,13 +125,6 @@ namespace Borepin.PageModel
             get => _MachineListItemViewModel_List;
             set => SetProperty(ref _MachineListItemViewModel_List, value);
         }
-
-        private bool _IsRefreshing;
-        public bool IsRefreshing
-        {
-            get => _IsRefreshing;
-            set => SetProperty(ref _IsRefreshing, value);
-        }
         #endregion
 
         #region Commands
@@ -155,8 +148,6 @@ namespace Borepin.PageModel
                 }
                 
             }
-            
-            IsRefreshing = false;
         }
 
         private ICommand _ScanCodeCommand;
diff --git a/Borepin/Borepin/PageModel/UserListPageModel.cs b/Borepin/Borepin/PageModel/UserListPageModel.cs
index 937ad9e..bc13b1c 100644
--- a/Borepin/Borepin/PageModel/UserListPageModel.cs
+++ b/Borepin/Borepin/PageModel/UserListPageModel.cs
@@ -64,13 +64,6 @@ namespace Borepin.PageModel
             set => SetProperty(ref _FilteredUserListItemViewModel_List, value);
         }
 
-        private bool _IsRefreshing;
-        public bool IsRefreshing
-        {
-            get => _IsRefreshing;
-            set => SetProperty(ref _IsRefreshing, value);
-        }
-
         private string _SearchUsername;
         public string SearchUsername
         {
@@ -99,8 +92,6 @@ namespace Borepin.PageModel
                     // TODO
                 }
             }
-            
-            IsRefreshing = false;
         }
 
         private ICommand _AddUserCommand;