diff --git a/Borepin/Borepin/App.xaml.cs b/Borepin/Borepin/App.xaml.cs
index cb34528..d27bb64 100644
--- a/Borepin/Borepin/App.xaml.cs
+++ b/Borepin/Borepin/App.xaml.cs
@@ -18,7 +18,7 @@ namespace Borepin
         {
             InitializeComponent();
 
-            var result = await NavigationService.NavigateAsync("//NavigationPage/HostSelectPage");
+            var result = await NavigationService.NavigateAsync("/NavigationPage/HostSelectPage");
 
             if (!result.Success)
             {
diff --git a/Borepin/Borepin/Page/HostSelectPage.xaml b/Borepin/Borepin/Page/HostSelectPage.xaml
index 0661d38..2d370b2 100644
--- a/Borepin/Borepin/Page/HostSelectPage.xaml
+++ b/Borepin/Borepin/Page/HostSelectPage.xaml
@@ -9,13 +9,7 @@
     <ContentPage.Content>
         <StackLayout Padding="20">
             <Label Text="Host" Style="{StaticResource LabelStyle_PropertyTitle}"></Label>
-            <customControl:EntryAutoComplete
-                VerticalOptions="CenterAndExpand"
-                Placeholder="Entry host ..." 
-                ItemsSource="{Binding KnownHost_List}"
-                SearchText="{Binding Host}"
-                MaximumVisibleElements="5"/>
-
+            <Entry Text="{Binding Host}"/>
             <Button Text="Detect local host" Command="{Binding DetectHostCommand}" Style="{StaticResource ButtonStyle_Primary}"/>
             <Button Text="Select Host" Command="{Binding UseHostCommand}" Style="{StaticResource ButtonStyle_Primary}"/>
         </StackLayout>
diff --git a/Borepin/Borepin/PageModel/HostSelectPageModel.cs b/Borepin/Borepin/PageModel/HostSelectPageModel.cs
index c4b655a..95453a5 100644
--- a/Borepin/Borepin/PageModel/HostSelectPageModel.cs
+++ b/Borepin/Borepin/PageModel/HostSelectPageModel.cs
@@ -71,7 +71,7 @@ namespace Borepin.PageModel
 
             _BFFHService.Connect(builder.Uri);
 
-            INavigationResult result = await _NavigationService.NavigateAsync($"LoginChoosePage");
+            INavigationResult result = await _NavigationService.NavigateAsync("LoginChoosePage");
             if (!result.Success)
             {
                 System.Diagnostics.Debugger.Break();
diff --git a/Borepin/Borepin/PageModel/LoginChoosePageModel.cs b/Borepin/Borepin/PageModel/LoginChoosePageModel.cs
index 848ca20..c78cba1 100644
--- a/Borepin/Borepin/PageModel/LoginChoosePageModel.cs
+++ b/Borepin/Borepin/PageModel/LoginChoosePageModel.cs
@@ -28,7 +28,7 @@ namespace Borepin.PageModel
 
         private async void LoginPasswordCommandExecuted()
         {
-            INavigationResult result = await _NavigationService.NavigateAsync($"LoginPasswordPage");
+            INavigationResult result = await _NavigationService.NavigateAsync("LoginPasswordPage");
             if (!result.Success)
             {
                 System.Diagnostics.Debugger.Break();
diff --git a/Borepin/Borepin/PageModel/LoginPasswordPageModel.cs b/Borepin/Borepin/PageModel/LoginPasswordPageModel.cs
index 81e11f1..91379de 100644
--- a/Borepin/Borepin/PageModel/LoginPasswordPageModel.cs
+++ b/Borepin/Borepin/PageModel/LoginPasswordPageModel.cs
@@ -13,7 +13,7 @@ namespace Borepin.PageModel
         private INavigationService _NavigationService;
         private BFFHService _BFFHService;
 
-        private string _KnownUsername = "";
+        private string _KnownUsername;
 
         public LoginPasswordPageModel(INavigationService navigationService, BFFHService bffhService)
         {
@@ -68,7 +68,7 @@ namespace Borepin.PageModel
                 await _BFFHService.Authenticate(Username, Password);
             }
 
-            var result = await _NavigationService.NavigateAsync("//MainPage/NavigationPage/MachinesPage");
+            var result = await _NavigationService.NavigateAsync("/MainPage/NavigationPage/MachinesPage");
 
             if (!result.Success)
             {
diff --git a/Borepin/Borepin/PageModel/MachinesPageModel.cs b/Borepin/Borepin/PageModel/MachinesPageModel.cs
index f717cc3..4a6f3aa 100644
--- a/Borepin/Borepin/PageModel/MachinesPageModel.cs
+++ b/Borepin/Borepin/PageModel/MachinesPageModel.cs
@@ -13,11 +13,11 @@ namespace Borepin.PageModel
 {
     public class MachinesPageModel : BindableBase
     {
-        private INavigationService _navigationService;
+        private INavigationService _NavigationService;
 
         public MachinesPageModel(INavigationService navigationService)
         {
-            _navigationService = navigationService;
+            _NavigationService = navigationService;
             GoToMachineCommand = new Command<object>(GoToMachineCommandExecuted);
 
             MachineList = new ObservableCollection<Machine>(BFFHService_OLD.GetMachines());
@@ -32,12 +32,14 @@ namespace Borepin.PageModel
 
         private async void GoToMachineCommandExecuted(object obj)
         {
+            _NavigationService.GetNavigationUriPath();
+
             Machine machine = obj as Machine;
 
             NavigationParameters navigationParams = new NavigationParameters();
             navigationParams.Add("machineID", machine.ID);
 
-            INavigationResult result = await _navigationService.NavigateAsync($"MachinePage", navigationParams);
+            INavigationResult result = await _NavigationService.NavigateAsync($"MachinePage", navigationParams);
             if (!result.Success)
             {
                 System.Diagnostics.Debugger.Break();