diff --git a/Borepin/Borepin/Page/MachinePage.xaml b/Borepin/Borepin/Page/MachinePage.xaml
index 656b523..07b3c88 100644
--- a/Borepin/Borepin/Page/MachinePage.xaml
+++ b/Borepin/Borepin/Page/MachinePage.xaml
@@ -21,8 +21,8 @@
             <StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}">
                 <Label Text="{Binding Name}" Style="{StaticResource LabelStyle_Title}"/>
 
-                <!--<Button Text="Use" Command="{Binding UseMachineCommand}" IsVisible="{Binding MachineItem.Use, Converter=IsNotNullBoolConverter}" Style="{StaticResource Style_Button_Primary}"/>
-                <Button Text="GiveBack" Command="{Binding GiveBackMachineCommand}" IsVisible="{Binding MachineItem.Inuse, Converter=IsNotNullBoolConverter}" Style="{StaticResource Style_Button_Primary}"/>-->
+                <Button Text="Use" Command="{Binding UseMachineCommand}" IsVisible="{Binding MachineItem.CanUse}" Style="{StaticResource Style_Button_Primary}"/>
+                <Button Text="GiveBack" Command="{Binding GiveBackMachineCommand}" IsVisible="{Binding MachineItem.CanInUse}" Style="{StaticResource Style_Button_Primary}"/>
             </StackLayout>
         </StackLayout>
     </ContentPage.Content>
diff --git a/Borepin/Borepin/Page/MainPage.xaml b/Borepin/Borepin/Page/MainPage.xaml
index 9d32bc4..7d56fd9 100644
--- a/Borepin/Borepin/Page/MainPage.xaml
+++ b/Borepin/Borepin/Page/MainPage.xaml
@@ -7,8 +7,8 @@
         <ContentPage Title="FabAccess">
             <StackLayout>
                 <Button Text="Machines" Command="{Binding NavigateCommand}" CommandParameter="MachineListPage" />
-                <Button Text="Settings" Command="{Binding NavigateCommand}" CommandParameter="SettingsPage" />
                 <Button Text="Servers" Command="{Binding NavigateCommand}" CommandParameter="ServerListPage" />
+                <!--<Button Text="Settings" Command="{Binding NavigateCommand}" CommandParameter="SettingsPage" />-->
             </StackLayout>
         </ContentPage>
     </FlyoutPage.Flyout>
diff --git a/Borepin/Borepin/PageModel/MachineListPageModel.cs b/Borepin/Borepin/PageModel/MachineListPageModel.cs
index 51b73c7..f7795af 100644
--- a/Borepin/Borepin/PageModel/MachineListPageModel.cs
+++ b/Borepin/Borepin/PageModel/MachineListPageModel.cs
@@ -30,6 +30,7 @@ namespace Borepin.PageModel
         {
             if (_BFFHService.ActiveConnection == null)
             {
+                IsBusy = false;
                 return;
             }
             else
diff --git a/Borepin/Borepin/PageModel/ServerListPageModel.cs b/Borepin/Borepin/PageModel/ServerListPageModel.cs
index c96b226..20d7077 100644
--- a/Borepin/Borepin/PageModel/ServerListPageModel.cs
+++ b/Borepin/Borepin/PageModel/ServerListPageModel.cs
@@ -111,7 +111,7 @@ namespace Borepin.PageModel
         }
         private async void AddInstancesCommandExecuted()
         {
-            INavigationResult result = await _NavigationService.NavigateAsync("HostSelectPage");
+            INavigationResult result = await _NavigationService.NavigateAsync("AddServerProcess_HostSelectPage");
             if (!result.Success)
             {
                 System.Diagnostics.Debugger.Break();