diff --git a/Borepin/Borepin/Page/ScanPage.xaml b/Borepin/Borepin/Page/ScanPage.xaml
index 4c89a67..c828014 100644
--- a/Borepin/Borepin/Page/ScanPage.xaml
+++ b/Borepin/Borepin/Page/ScanPage.xaml
@@ -6,7 +6,14 @@
              x:Class="Borepin.Page.ScanPage">
     <ContentPage.Content>
         <StackLayout IsVisible="{Binding IsVisible}">
-            <zxing:ZXingScannerView Result="{Binding ScanResult, Mode=TwoWay}" ScanResultCommand="{Binding ScannedCommand}"  IsScanning="{Binding IsScanning}" WidthRequest="300" HeightRequest="500" VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand" Options="{Binding ScanOptions}"/>
+            <zxing:ZXingScannerView 
+                Result="{Binding ScanResult, Mode=TwoWay}" 
+                ScanResultCommand="{Binding ScannedCommand}"  
+                IsScanning="{Binding IsScanning}" 
+                Options="{Binding ScanOptions}" 
+                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 02b7db1..1ba1b0c 100644
--- a/Borepin/Borepin/Page/ScanURNPage.xaml
+++ b/Borepin/Borepin/Page/ScanURNPage.xaml
@@ -6,7 +6,14 @@
              x:Class="Borepin.Page.ScanURNPage">
     <ContentPage.Content>
         <StackLayout IsVisible="{Binding IsVisible}">
-            <zxing:ZXingScannerView Result="{Binding ScanResult, Mode=TwoWay}" ScanResultCommand="{Binding ScannedCommand}"  IsScanning="{Binding IsScanning}" WidthRequest="300" HeightRequest="500" VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand" Options="{Binding ScanOptions}"/>
+            <zxing:ZXingScannerView 
+                Result="{Binding ScanResult, Mode=TwoWay}" 
+                ScanResultCommand="{Binding ScannedCommand}"  
+                IsScanning="{Binding IsScanning}" 
+                Options="{Binding ScanOptions}" 
+                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;
diff --git a/external/NFC b/external/NFC
index 4420dbf..e79b6aa 160000
--- a/external/NFC
+++ b/external/NFC
@@ -1 +1 @@
-Subproject commit 4420dbf1b1e820d94d6adaa2b65a851ac582be8f
+Subproject commit e79b6aace26c8b362a5f450345a67ba700f06805
diff --git a/external/capnproto-dotnetcore b/external/capnproto-dotnetcore
index 63e6385..1be9ffb 160000
--- a/external/capnproto-dotnetcore
+++ b/external/capnproto-dotnetcore
@@ -1 +1 @@
-Subproject commit 63e63853c1d5ca9f223aa3627ad391ce434a0683
+Subproject commit 1be9ffbf8acbc9770f2d5b67c961fb60e49e5ec5