diff --git a/Borepin/Borepin.Android/MainActivity.cs b/Borepin/Borepin.Android/MainActivity.cs
index 60d2c0f..36ff798 100644
--- a/Borepin/Borepin.Android/MainActivity.cs
+++ b/Borepin/Borepin.Android/MainActivity.cs
@@ -2,6 +2,7 @@
 using Android.App;
 using Android.Content.PM;
 using Android.OS;
+using AndroidX.AppCompat.App;
 
 namespace Borepin.Droid
 {
@@ -10,6 +11,8 @@ namespace Borepin.Droid
     {
         protected override void OnCreate(Bundle savedInstanceState)
         {
+            AppCompatDelegate.DefaultNightMode = AppCompatDelegate.ModeNightNo;
+
             TabLayoutResource = Resource.Layout.Tabbar;
             ToolbarResource = Resource.Layout.Toolbar;
 
diff --git a/Borepin/Borepin.UWP/App.xaml b/Borepin/Borepin.UWP/App.xaml
index f6da795..4048647 100644
--- a/Borepin/Borepin.UWP/App.xaml
+++ b/Borepin/Borepin.UWP/App.xaml
@@ -2,6 +2,5 @@
     x:Class="Borepin.UWP.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Borepin.UWP">
-
+    xmlns:local="using:Borepin.UWP" RequestedTheme="Light">
 </Application>
diff --git a/Borepin/Borepin.iOS/Borepin.iOS.csproj b/Borepin/Borepin.iOS/Borepin.iOS.csproj
index dc82457..9b2c35b 100644
--- a/Borepin/Borepin.iOS/Borepin.iOS.csproj
+++ b/Borepin/Borepin.iOS/Borepin.iOS.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -193,4 +193,8 @@
   <ItemGroup>
     <Folder Include="Assets.xcassets\LaunchIcon.imageset\" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <Target Name="BeforeBuild" Condition=" '$(GITLAB_CI)' == 'true' ">
+    <XmlPoke XmlInputPath="Info.plist" Query="//dict/key[. = 'CFBundleVersion']/following-sibling::string[1]" Value="$(CI_PIPELINE_ID)" /> 
+    <XmlPoke XmlInputPath="Info.plist" Query="//dict/key[. = 'CFBundleShortVersionString']/following-sibling::string[1]" Value="0.1.0" />
+</Target>
+</Project>
diff --git a/Borepin/Borepin.iOS/Info.plist b/Borepin/Borepin.iOS/Info.plist
index b464cc1..7ba1bb6 100644
--- a/Borepin/Borepin.iOS/Info.plist
+++ b/Borepin/Borepin.iOS/Info.plist
@@ -40,5 +40,7 @@
 	<false/>
 	<key>NFCReaderUsageDescription</key>
 	<string>FabAccess needs to be able to read your card for authentication with the server.</string>
+  <key>UIUserInterfaceStyle</key>
+  <string>Light</string>
 </dict>
 </plist>
diff --git a/Borepin/Borepin/App.xaml.cs b/Borepin/Borepin/App.xaml.cs
index 6514feb..09f5c74 100644
--- a/Borepin/Borepin/App.xaml.cs
+++ b/Borepin/Borepin/App.xaml.cs
@@ -45,6 +45,7 @@ namespace Borepin
             containerRegistry.RegisterForNavigation<MachineListPage, MachineListPageModel>();
             containerRegistry.RegisterForNavigation<ServerListPage, ServerListPageModel>();
             containerRegistry.RegisterForNavigation<ServerPage, ServerPageModel>();
+            containerRegistry.RegisterForNavigation<ListPage, ListPageModel>();
 
             containerRegistry.RegisterForNavigation<WelcomePage, WelcomePageModel>("SetUpProcess_WelcomePage");
             containerRegistry.RegisterForNavigation<ScanPage, ScanPageModel>("SetUpProcess_ScanPage");
diff --git a/Borepin/Borepin/Borepin.csproj b/Borepin/Borepin/Borepin.csproj
index f729d47..71862f2 100644
--- a/Borepin/Borepin/Borepin.csproj
+++ b/Borepin/Borepin/Borepin.csproj
@@ -68,6 +68,9 @@
     <EmbeddedResource Update="Page\AddServerProcess\HostSelectPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
+    <EmbeddedResource Update="Page\ListPage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
     <EmbeddedResource Update="Page\AddServerProcess\LoginChoosePage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
@@ -98,6 +101,9 @@
     <EmbeddedResource Update="Page\StartUpDistributorPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
+    <EmbeddedResource Update="Page\TestPage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
     <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -109,6 +115,12 @@
     <EmbeddedResource Update="Styles\LightTheme.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
+    <EmbeddedResource Update="View\IsBusyView.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="View\ListItemView.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
     <EmbeddedResource Update="View\ScanView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
diff --git a/Borepin/Borepin/Model/MachineVisualize.cs b/Borepin/Borepin/Model/MachineVisualize.cs
index ef37065..05a1743 100644
--- a/Borepin/Borepin/Model/MachineVisualize.cs
+++ b/Borepin/Borepin/Model/MachineVisualize.cs
@@ -29,12 +29,12 @@ namespace Borepin.Model
             State = _Machine.State;
             Manager = new UserVisualize(_Machine.Manager);
             
-            CanUse = _Machine.Use != null;
-            CanInUse = _Machine.Inuse != null;
-            CanTransfer = _Machine.Transfer != null;
-            CanCheck = _Machine.Check != null;
-            CanManage = _Machine.Manage != null;
-            CanAdmin = _Machine.Admin != null;
+            CanUse = !((UseInterface_Proxy)_Machine.Use).IsNull;
+            CanInUse = !((InUseInterface_Proxy) _Machine.Inuse).IsNull;
+            CanTransfer = !((TransferInterface_Proxy) _Machine.Transfer).IsNull;
+            CanCheck = !((CheckInterface_Proxy) _Machine.Check).IsNull;
+            CanManage = !((ManageInterface_Proxy) _Machine.Manage).IsNull;
+            CanAdmin = !((AdminInterface_Proxy) _Machine.Admin).IsNull;
         }
         #endregion
 
diff --git a/Borepin/Borepin/Page/ListPage.xaml b/Borepin/Borepin/Page/ListPage.xaml
new file mode 100644
index 0000000..b649e6b
--- /dev/null
+++ b/Borepin/Borepin/Page/ListPage.xaml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
+             xmlns:views="clr-namespace:Borepin.View"
+             x:Class="Borepin.Page.ListPage">
+    <ContentPage.Content>
+        <StackLayout>
+            <ListView ItemsSource="{Binding ListItemViewModel_List}">
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <ViewCell>
+                            <views:ListItemView />
+                        </ViewCell>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+        </StackLayout>
+    </ContentPage.Content>
+</ContentPage>
\ No newline at end of file
diff --git a/Borepin/Borepin/Page/ListPage.xaml.cs b/Borepin/Borepin/Page/ListPage.xaml.cs
new file mode 100644
index 0000000..4f57114
--- /dev/null
+++ b/Borepin/Borepin/Page/ListPage.xaml.cs
@@ -0,0 +1,15 @@
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace Borepin.Page
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class ListPage : ContentPage
+    {
+        public ListPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Borepin/Borepin/Page/SetUpProcess/ScanPage.xaml b/Borepin/Borepin/Page/SetUpProcess/ScanPage.xaml
index a87a52e..4a60546 100644
--- a/Borepin/Borepin/Page/SetUpProcess/ScanPage.xaml
+++ b/Borepin/Borepin/Page/SetUpProcess/ScanPage.xaml
@@ -3,26 +3,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Borepin.Page.SetUpProcess.ScanPage"
              xmlns:i18n="clr-namespace:Borepin.Helpers"
-             xmlns:views="clr-namespace:Borepin.View"
-             xmlns:converters="clr-namespace:Borepin.Converter">
-    <NavigationPage.TitleView>
-        <Label Text="FabAccess" HorizontalOptions="End" Margin="0, 0, 10, 0" VerticalOptions="CenterAndExpand" FontSize="Medium" TextColor="{StaticResource FirstColor}"/>
-    </NavigationPage.TitleView>
-    <ContentPage.Resources>
-        <ResourceDictionary>
-            <converters:InvertBoolConverter x:Key="InvertBoolConverter"/>
-        </ResourceDictionary>
-    </ContentPage.Resources>
+             xmlns:views="clr-namespace:Borepin.View">
     <ContentPage.Content>
-        <StackLayout Padding="20">
-            <StackLayout IsVisible="{Binding IsBusy}">
-                <ActivityIndicator IsRunning="{Binding IsBusy}"></ActivityIndicator>
-            </StackLayout>
-            <StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}">
+        <ScrollView>
+            <StackLayout Style="{StaticResource Style_StackLayout_Content}">
                 <views:ScanView />
                 <Label Text="{i18n:Translate SetUp_ScanPage_Text}" Style="{StaticResource Style_Label_Text}"/>
                 <Button Text="{i18n:Translate SetUp_ScanPage_Button}" Command="{Binding NextCommand}" Style="{StaticResource Style_Button_Primary}"/>
             </StackLayout>
-        </StackLayout>
+        </ScrollView>
     </ContentPage.Content>
 </ContentPage>
\ No newline at end of file
diff --git a/Borepin/Borepin/Page/TestPage.xaml b/Borepin/Borepin/Page/TestPage.xaml
new file mode 100644
index 0000000..8018b7d
--- /dev/null
+++ b/Borepin/Borepin/Page/TestPage.xaml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Borepin.Page.TestPage"
+             xmlns:converters="clr-namespace:Borepin.Converter">
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <converters:InvertBoolConverter x:Key="InvertBoolConverter"/>
+        </ResourceDictionary>
+    </ContentPage.Resources>
+    <ContentPage.Content>
+        <StackLayout Padding="20">
+            <StackLayout IsVisible="{Binding IsBusy}">
+                <ActivityIndicator IsRunning="{Binding IsBusy}"></ActivityIndicator>
+            </StackLayout>
+            <StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}">
+                <Label Text="TestPage"/>
+            </StackLayout>
+        </StackLayout>
+    </ContentPage.Content>
+</ContentPage>
\ No newline at end of file
diff --git a/Borepin/Borepin/Page/TestPage.xaml.cs b/Borepin/Borepin/Page/TestPage.xaml.cs
new file mode 100644
index 0000000..b78f7d1
--- /dev/null
+++ b/Borepin/Borepin/Page/TestPage.xaml.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace Borepin.Page
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class TestPage : ContentPage
+    {
+        public TestPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Borepin/Borepin/PageModel/AddServerProcess/HostSelectPageModel.cs b/Borepin/Borepin/PageModel/AddServerProcess/HostSelectPageModel.cs
index aa96d05..c664418 100644
--- a/Borepin/Borepin/PageModel/AddServerProcess/HostSelectPageModel.cs
+++ b/Borepin/Borepin/PageModel/AddServerProcess/HostSelectPageModel.cs
@@ -31,12 +31,11 @@ namespace Borepin.PageModel.AddServerProcess
         #endregion
 
         #region LoadData
-        public override async Task LoadData()
+        public override Task LoadData()
         {
-            IsBusy = true;
-
             IsBusy = false;
-            await Task.CompletedTask;
+
+            return Task.CompletedTask;
         }
         #endregion
 
@@ -125,8 +124,7 @@ namespace Borepin.PageModel.AddServerProcess
 
         public override void OnNavigatedTo(INavigationParameters parameters)
         {
-            IsBusy = true;
-            Task.Run(LoadData);
+            
         }
         #endregion
     }
diff --git a/Borepin/Borepin/PageModel/AddServerProcess/LoginChoosePageModel.cs b/Borepin/Borepin/PageModel/AddServerProcess/LoginChoosePageModel.cs
index 100f0d8..367750c 100644
--- a/Borepin/Borepin/PageModel/AddServerProcess/LoginChoosePageModel.cs
+++ b/Borepin/Borepin/PageModel/AddServerProcess/LoginChoosePageModel.cs
@@ -16,12 +16,11 @@ namespace Borepin.PageModel.AddServerProcess
         #endregion
 
         #region LoadData
-        public override async Task LoadData()
+        public override Task LoadData()
         {
-            IsBusy = true;
-
             IsBusy = false;
-            await Task.CompletedTask;
+
+            return Task.CompletedTask;
         }
         #endregion
 
@@ -51,8 +50,7 @@ namespace Borepin.PageModel.AddServerProcess
 
         public override void OnNavigatedTo(INavigationParameters parameters)
         {
-            IsBusy = true;
-            Task.Run(LoadData);
+            IsBusy = false;
         }
         #endregion
     }
diff --git a/Borepin/Borepin/PageModel/AddServerProcess/LoginPasswordPageModel.cs b/Borepin/Borepin/PageModel/AddServerProcess/LoginPasswordPageModel.cs
index 76d1502..77f8b9d 100644
--- a/Borepin/Borepin/PageModel/AddServerProcess/LoginPasswordPageModel.cs
+++ b/Borepin/Borepin/PageModel/AddServerProcess/LoginPasswordPageModel.cs
@@ -4,6 +4,7 @@ using Borepin.Service.BFFH;
 using Borepin.Service.Connections;
 using Prism.Commands;
 using Prism.Navigation;
+using Prism.Services;
 using System;
 using System.Threading.Tasks;
 using System.Windows.Input;
@@ -15,13 +16,16 @@ namespace Borepin.PageModel.AddServerProcess
         #region Private Properties
         private readonly IBFFHService _BFFHService;
         private readonly IConnectionService _ConnectionService;
+        private readonly IPageDialogService _PageDialogService;
         #endregion
 
         #region Constructors
-        public LoginPasswordPageModel(INavigationService navigationService, IBFFHService bffhService, IConnectionService connectionService) : base(navigationService)
+        public LoginPasswordPageModel(INavigationService navigationService, IBFFHService bffhService, IConnectionService connectionService, IPageDialogService pageDialogService) : base(navigationService)
         {
             _BFFHService = bffhService;
             _ConnectionService = connectionService;
+            _PageDialogService = pageDialogService;
+
 
             AuthenticateCommand = new DelegateCommand(async () => await AuthenticateCommandExecuted());
 
@@ -30,12 +34,11 @@ namespace Borepin.PageModel.AddServerProcess
         #endregion
 
         #region LoadData
-        public override async Task LoadData()
+        public override Task LoadData()
         {
-            IsBusy = true;
-
             IsBusy = false;
-            await Task.CompletedTask;
+
+            return Task.CompletedTask;
         }
         #endregion
 
@@ -65,11 +68,19 @@ namespace Borepin.PageModel.AddServerProcess
 
         private async Task AuthenticateCommandExecuted()
         {
+            IsBusy = true;
+
             Connection connection_update = _BFFHService.ActiveConnection;
 
             connection_update.Username = Username;
 
-            await _BFFHService.Authenticate(connection_update, Password).ConfigureAwait(false);
+            if(!await _BFFHService.Authenticate(connection_update, Password))
+            {
+                await _PageDialogService.DisplayAlertAsync("Connection failed", "Unable to authenticate to server.", "Ok");
+
+                IsBusy = false;
+                return;
+            }
 
             try
             {
@@ -77,7 +88,7 @@ namespace Borepin.PageModel.AddServerProcess
             }
             catch (ArgumentException)
             {
-
+                // Could be better catched
             }
 
             await _ConnectionService.LogConnect(_BFFHService.ActiveConnection);
@@ -99,8 +110,7 @@ namespace Borepin.PageModel.AddServerProcess
 
         public override void OnNavigatedTo(INavigationParameters parameters)
         {
-            IsBusy = true;
-            Task.Run(LoadData);
+
         }
         #endregion
     }
diff --git a/Borepin/Borepin/PageModel/ListPageModel.cs b/Borepin/Borepin/PageModel/ListPageModel.cs
new file mode 100644
index 0000000..f34f149
--- /dev/null
+++ b/Borepin/Borepin/PageModel/ListPageModel.cs
@@ -0,0 +1,57 @@
+using Borepin.Model;
+using Borepin.ViewModel;
+using Prism.Mvvm;
+using System.Collections.Generic;
+using System.Windows.Input;
+using Xamarin.Forms;
+
+namespace Borepin.PageModel
+{
+    public class ListPageModel : BindableBase
+    {
+        public ListPageModel()
+        {
+            ListItemViewModel_List = new List<ListItemViewModel>()
+            {
+                new ListItemViewModel(
+                new ListItem()
+                {
+                    Value1 = "ListItem 1"
+                }),
+
+                new ListItemViewModel(
+                new ListItem()
+                {
+                    Value1 = "ListItem 2"
+                }),
+
+                new ListItemViewModel(
+                new ListItem()
+                {
+                    Value1 = "ListItem 3"
+                }),
+            };
+
+            SelectListItemCommand = new Command<object>(SelectListItemCommandExecuted);
+        }
+
+        private List<ListItemViewModel> _ListItemViewModel_List;
+        public List<ListItemViewModel> ListItemViewModel_List
+        {
+            get => _ListItemViewModel_List;
+            set => SetProperty(ref _ListItemViewModel_List, value);
+        }
+
+        private ICommand _SelectListItemCommand;
+        public ICommand SelectListItemCommand
+        {
+            get => _SelectListItemCommand;
+            set => SetProperty(ref _SelectListItemCommand, value);
+        }
+
+        private void SelectListItemCommandExecuted(object obj)
+        {
+            System.Diagnostics.Debugger.Break();
+        }
+    }
+}
diff --git a/Borepin/Borepin/PageModel/MachineListPageModel.cs b/Borepin/Borepin/PageModel/MachineListPageModel.cs
index 31d9981..f327821 100644
--- a/Borepin/Borepin/PageModel/MachineListPageModel.cs
+++ b/Borepin/Borepin/PageModel/MachineListPageModel.cs
@@ -25,11 +25,9 @@ namespace Borepin.PageModel
         }
         #endregion
 
-        #region LoadData
+        #region Data
         public override async Task LoadData()
         {
-            IsBusy = true;
-
             if (_BFFHService.ActiveConnection == null)
             {
                 IsBusy = false;
diff --git a/Borepin/Borepin/PageModel/MachinePageModel.cs b/Borepin/Borepin/PageModel/MachinePageModel.cs
index 652ceeb..c624f01 100644
--- a/Borepin/Borepin/PageModel/MachinePageModel.cs
+++ b/Borepin/Borepin/PageModel/MachinePageModel.cs
@@ -28,7 +28,7 @@ namespace Borepin.PageModel
         }
         #endregion
 
-        #region LoadData
+        #region Data
         public override async Task LoadData()
         {
             IsBusy = true;
diff --git a/Borepin/Borepin/PageModel/MainPagePageModel.cs b/Borepin/Borepin/PageModel/MainPagePageModel.cs
index fa07d47..77063b4 100644
--- a/Borepin/Borepin/PageModel/MainPagePageModel.cs
+++ b/Borepin/Borepin/PageModel/MainPagePageModel.cs
@@ -1,31 +1,20 @@
-using Borepin.Base;
+using Prism.Mvvm;
 using Prism.Navigation;
-using System.Threading.Tasks;
 using System.Windows.Input;
 using Xamarin.Forms;
 
 namespace Borepin.PageModel
 {
-    public class MainPagePageModel : PageModelBase
+    public class MainPagePageModel : BindableBase
     {
-        #region Constructors
-        public MainPagePageModel(INavigationService navigationService) : base(navigationService)
+        private INavigationService _NavigationService;
+
+        public MainPagePageModel(INavigationService navigationService)
         {
+            _NavigationService = navigationService;
             NavigateCommand = new Command<string>(NavigateCommandExecuted);
         }
-        #endregion
 
-        #region LoadData
-        public override async Task LoadData()
-        {
-            IsBusy = true;
-
-            IsBusy = false;
-            await LoadData();
-        }
-        #endregion
-
-        #region Commands
         private ICommand _NavigationCommand;
 
         public ICommand NavigateCommand 
@@ -42,19 +31,5 @@ namespace Borepin.PageModel
                 System.Diagnostics.Debugger.Break();
             }
         }
-        #endregion
-
-        #region INavigationService
-        public override void OnNavigatedFrom(INavigationParameters parameters)
-        {
-
-        }
-
-        public override void OnNavigatedTo(INavigationParameters parameters)
-        {
-            IsBusy = true;
-            Task.Run(LoadData);
-        }
-        #endregion
     }
 }
diff --git a/Borepin/Borepin/PageModel/ServerListPageModel.cs b/Borepin/Borepin/PageModel/ServerListPageModel.cs
index 879fc57..20d7077 100644
--- a/Borepin/Borepin/PageModel/ServerListPageModel.cs
+++ b/Borepin/Borepin/PageModel/ServerListPageModel.cs
@@ -31,11 +31,9 @@ namespace Borepin.PageModel
         }
         #endregion
 
-        #region LoadData
+        #region Data
         public override async Task LoadData()
         {
-            IsBusy = true;
-
             List<Connection> list = await _ConnectionService.GetConnectionList();
             if (_BFFHService.ActiveConnection != null)
             {
diff --git a/Borepin/Borepin/PageModel/ServerPageModel.cs b/Borepin/Borepin/PageModel/ServerPageModel.cs
index b27678b..523f7b7 100644
--- a/Borepin/Borepin/PageModel/ServerPageModel.cs
+++ b/Borepin/Borepin/PageModel/ServerPageModel.cs
@@ -37,13 +37,10 @@ namespace Borepin.PageModel
         }
         #endregion
 
-        #region LoadData
-        public override async Task LoadData()
+        #region Data
+        public override Task LoadData()
         {
-            IsBusy = true;
-
-            IsBusy = false;
-            await LoadData();
+            throw new System.NotImplementedException();
         }
         #endregion
 
@@ -94,7 +91,14 @@ namespace Borepin.PageModel
                     IsBusy = false;
                     return;
                 }
-                await _BFFHService.Authenticate();
+                
+                if(!await _BFFHService.Authenticate())
+                {
+                    await _PageDialogService.DisplayAlertAsync("Connection failed", "Unable to authenticate to server.", "Ok");
+
+                    IsBusy = false;
+                    return;
+                }
 
                 IsConnected = true;
             }
@@ -169,8 +173,7 @@ namespace Borepin.PageModel
                 IsConnected = false;
             }
 
-            IsBusy = true;
-            Task.Run(LoadData);
+            IsBusy = false;
         }
         #endregion
     }
diff --git a/Borepin/Borepin/PageModel/SetUpProcess/ScanPageModel.cs b/Borepin/Borepin/PageModel/SetUpProcess/ScanPageModel.cs
index 40ad3cb..39d9a64 100644
--- a/Borepin/Borepin/PageModel/SetUpProcess/ScanPageModel.cs
+++ b/Borepin/Borepin/PageModel/SetUpProcess/ScanPageModel.cs
@@ -15,13 +15,10 @@ namespace Borepin.PageModel.SetUpProcess
         }
         #endregion
 
-        #region LoadData
-        public override async Task LoadData()
+        #region Data
+        public override Task LoadData()
         {
-            IsBusy = true;
-
-            IsBusy = false;
-            await Task.CompletedTask;
+            return Task.CompletedTask;
         }
         #endregion
 
@@ -50,8 +47,7 @@ namespace Borepin.PageModel.SetUpProcess
 
         public override void OnNavigatedTo(INavigationParameters parameters)
         {
-            IsBusy = true;
-            Task.Run(LoadData);
+            
         }
         #endregion
     }
diff --git a/Borepin/Borepin/PageModel/SetUpProcess/WelcomePageModel.cs b/Borepin/Borepin/PageModel/SetUpProcess/WelcomePageModel.cs
index 990834f..8f82f79 100644
--- a/Borepin/Borepin/PageModel/SetUpProcess/WelcomePageModel.cs
+++ b/Borepin/Borepin/PageModel/SetUpProcess/WelcomePageModel.cs
@@ -15,13 +15,10 @@ namespace Borepin.PageModel.SetUpProcess
         }
         #endregion
 
-        #region LoadData
-        public override async Task LoadData()
+        #region Data
+        public override Task LoadData()
         {
-            IsBusy = true;
-
-            IsBusy = false;
-            await Task.CompletedTask;
+            return Task.CompletedTask;
         }
         #endregion
 
@@ -34,7 +31,8 @@ namespace Borepin.PageModel.SetUpProcess
         }
         private async void NextCommandCommandExecuted(object obj)
         {
-            INavigationResult result = await _NavigationService.NavigateAsync("SetUpProcess_ScanPage");
+            //INavigationResult result = await _NavigationService.NavigateAsync("SetUpProcess_ScanPage");
+            INavigationResult result = await _NavigationService.NavigateAsync("AddServerProcess_HostSelectPage");
             if (!result.Success)
             {
                 System.Diagnostics.Debugger.Break();
@@ -50,8 +48,7 @@ namespace Borepin.PageModel.SetUpProcess
 
         public override void OnNavigatedTo(INavigationParameters parameters)
         {
-            IsBusy = true;
-            Task.Run(LoadData);
+            
         }
         #endregion
     }
diff --git a/Borepin/Borepin/PageModel/StartUpDistributorPageModel.cs b/Borepin/Borepin/PageModel/StartUpDistributorPageModel.cs
index 5e5dd27..7fce2dd 100644
--- a/Borepin/Borepin/PageModel/StartUpDistributorPageModel.cs
+++ b/Borepin/Borepin/PageModel/StartUpDistributorPageModel.cs
@@ -27,12 +27,9 @@ namespace Borepin.PageModel
         #endregion
 
         #region LoadData
-        public override async Task LoadData()
+        public override Task LoadData()
         {
-            IsBusy = true;
-
-            IsBusy = false;
-            await LoadData();
+            return Task.CompletedTask;
         }
         #endregion
 
@@ -78,8 +75,7 @@ namespace Borepin.PageModel
 
         public override void OnNavigatedTo(INavigationParameters parameters)
         {
-            IsBusy = true;
-            Task.Run(LoadData);
+            
         }
         #endregion
     }
diff --git a/Borepin/Borepin/PageModel/TestPageModel.cs b/Borepin/Borepin/PageModel/TestPageModel.cs
new file mode 100644
index 0000000..cbaf33c
--- /dev/null
+++ b/Borepin/Borepin/PageModel/TestPageModel.cs
@@ -0,0 +1,39 @@
+using Borepin.Base;
+using Prism.Navigation;
+using System.Threading.Tasks;
+
+namespace Borepin.PageModel
+{
+    class TestPageModel : PageModelBase
+    {
+        #region Contructors
+        public TestPageModel(INavigationService navigationService) : base(navigationService)
+        {
+
+        }
+        #endregion
+
+        #region Data
+        public override Task LoadData()
+        {
+            Task.Delay(3000);
+
+            IsBusy = false;
+            return Task.CompletedTask;
+        }
+        #endregion
+
+        #region INavigationService
+        public override void OnNavigatedFrom(INavigationParameters parameters)
+        {
+
+        }
+
+        public override void OnNavigatedTo(INavigationParameters parameters)
+        {
+            IsBusy = true;
+            Task.Run(LoadData);
+        }
+        #endregion
+    }
+}
diff --git a/Borepin/Borepin/Resources/Text/TextResource.Designer.cs b/Borepin/Borepin/Resources/Text/TextResource.Designer.cs
index a6b3603..8491aaa 100644
--- a/Borepin/Borepin/Resources/Text/TextResource.Designer.cs
+++ b/Borepin/Borepin/Resources/Text/TextResource.Designer.cs
@@ -79,7 +79,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Start working.
+        ///   Looks up a localized string similar to Begin working.
         /// </summary>
         internal static string SetUp_WelcomePage_Button {
             get {
@@ -88,7 +88,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Hier muss ein kurzer Text hin was FabAccess ist und was man damit machen kann.
+        ///   Looks up a localized string similar to Automate your Space with FabAccess.
         /// </summary>
         internal static string SetUp_WelcomePage_Text {
             get {
diff --git a/Borepin/Borepin/Resources/Text/TextResource.resx b/Borepin/Borepin/Resources/Text/TextResource.resx
index e90605a..63638c2 100644
--- a/Borepin/Borepin/Resources/Text/TextResource.resx
+++ b/Borepin/Borepin/Resources/Text/TextResource.resx
@@ -124,10 +124,10 @@
     <value>Wenn du dieses Logo siehst, dann kannst du es scannen</value>
   </data>
   <data name="SetUp_WelcomePage_Button" xml:space="preserve">
-    <value>Start working</value>
+    <value>Begin working</value>
   </data>
   <data name="SetUp_WelcomePage_Text" xml:space="preserve">
-    <value>Hier muss ein kurzer Text hin was FabAccess ist und was man damit machen kann</value>
+    <value>Automate your Space with FabAccess</value>
   </data>
   <data name="SetUp_WelcomePage_Title" xml:space="preserve">
     <value>Welcome</value>
diff --git a/Borepin/Borepin/Service/BFFH/BFFHService.cs b/Borepin/Borepin/Service/BFFH/BFFHService.cs
index f97b948..e368396 100644
--- a/Borepin/Borepin/Service/BFFH/BFFHService.cs
+++ b/Borepin/Borepin/Service/BFFH/BFFHService.cs
@@ -75,20 +75,21 @@ namespace Borepin.Service.BFFH
         {
             string password = await _CredentialService.GetPasswordAsync(ActiveConnection);
 
-            await _Connection.Auth("PLAIN", new Dictionary<string, object> { { "Username", ActiveConnection.Username }, { "Password", password } });
-
-            return await Task.FromResult(true);
+            return await _Connection.Auth("PLAIN", new Dictionary<string, object> { { "Username", ActiveConnection.Username }, { "Password", password } });
         }
 
         public async Task<bool> Authenticate(Connection connection, string password)
         {
-            await _Connection.Auth("PLAIN", new Dictionary<string, object> { { "Username", ActiveConnection.Username }, { "Password", password } }).ConfigureAwait(false);
+            bool result = await _Connection.Auth("PLAIN", new Dictionary<string, object> { { "Username", ActiveConnection.Username }, { "Password", password } });
 
-            await _CredentialService.AddCredentialsAsync(connection, password);
+            if(result == true)
+            {
+                await _CredentialService.AddCredentialsAsync(connection, password);
 
-            ActiveConnection = connection;
+                ActiveConnection = connection;
+            }
 
-            return await Task.FromResult(true);
+            return result;
         }
 
         public Task<IMachineSystem> GetMachineSystemInterface()
diff --git a/Borepin/Borepin/View/IsBusyView.xaml b/Borepin/Borepin/View/IsBusyView.xaml
new file mode 100644
index 0000000..2b7601c
--- /dev/null
+++ b/Borepin/Borepin/View/IsBusyView.xaml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Borepin.View.IsBusyView">
+  <ContentView.Content>
+      <StackLayout>
+          <Label Text="IsBusy" />
+      </StackLayout>
+  </ContentView.Content>
+</ContentView>
\ No newline at end of file
diff --git a/Borepin/Borepin/View/IsBusyView.xaml.cs b/Borepin/Borepin/View/IsBusyView.xaml.cs
new file mode 100644
index 0000000..d9b5abf
--- /dev/null
+++ b/Borepin/Borepin/View/IsBusyView.xaml.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace Borepin.View
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class IsBusyView : ContentView
+    {
+        public IsBusyView()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Borepin/Borepin/View/ListItemView.xaml b/Borepin/Borepin/View/ListItemView.xaml
new file mode 100644
index 0000000..069fe9e
--- /dev/null
+++ b/Borepin/Borepin/View/ListItemView.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Borepin.View.ListItemView"
+             xmlns:pagemodel="clr-namespace:Borepin.PageModel">
+    <ContentView.Content>
+        <StackLayout Orientation="Horizontal" HorizontalOptions="Center">
+            <Label Text="{Binding Value}" />
+            <Button Text="X" Command="{Binding Source={RelativeSource AncestorType={x:Type pagemodel:ListPageModel}}, Path=SelectListItemCommand}" CommandParameter="{Binding .}" />
+        </StackLayout>
+    </ContentView.Content>
+</ContentView>
\ No newline at end of file
diff --git a/Borepin/Borepin/View/ListItemView.xaml.cs b/Borepin/Borepin/View/ListItemView.xaml.cs
new file mode 100644
index 0000000..9751765
--- /dev/null
+++ b/Borepin/Borepin/View/ListItemView.xaml.cs
@@ -0,0 +1,15 @@
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace Borepin.View
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class ListItemView : ContentView
+    {
+        public ListItemView()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Borepin/Borepin/ViewModel/ListItemViewModel.cs b/Borepin/Borepin/ViewModel/ListItemViewModel.cs
new file mode 100644
index 0000000..3b28819
--- /dev/null
+++ b/Borepin/Borepin/ViewModel/ListItemViewModel.cs
@@ -0,0 +1,20 @@
+using Borepin.Model;
+using Prism.Mvvm;
+
+namespace Borepin.ViewModel
+{
+    public class ListItemViewModel : BindableBase
+    {
+        public ListItemViewModel(ListItem listItem)
+        {
+            Value = listItem.Value1;
+        }
+
+        private string _Value;
+        public string Value
+        {
+            get => _Value;
+            set => SetProperty(ref _Value, value);
+        }
+    }
+}
diff --git a/FabAccessAPI/Auth.cs b/FabAccessAPI/Auth.cs
index 4639c87..6558b25 100644
--- a/FabAccessAPI/Auth.cs
+++ b/FabAccessAPI/Auth.cs
@@ -124,7 +124,6 @@ namespace FabAccessAPI
 
         public async Task<bool> Authenticate(string mech, Dictionary<string, object> properties)
         {
-
             var m = SaslFactory.Create(mech);
             foreach (KeyValuePair<string, object> entry in properties)
             {
diff --git a/FabAccessAPI/Connection.cs b/FabAccessAPI/Connection.cs
index 952b313..fa47049 100644
--- a/FabAccessAPI/Connection.cs
+++ b/FabAccessAPI/Connection.cs
@@ -40,11 +40,15 @@ namespace FabAccessAPI
         /// <param name="mech">The desired authentication mechanism</param>
         /// <param name="kvs">Key-Value data specific to the mechanism</param>
         /// <returns></returns>
-        public async Task Auth(string mech, Dictionary<string, object> kvs, CancellationToken cancellationToken_ = default)
+        public async Task<bool> Auth(string mech, Dictionary<string, object> kvs, CancellationToken cancellationToken_ = default)
         {
             // _bootstrapCap = await _bootstrapCap.Unwrap();
-            var authCap = await _bootstrapCap.AuthenticationSystem(cancellationToken_).ConfigureAwait(false);
-            _auth = new Auth(authCap);
+            if(_auth == null)
+            {
+                var authCap = await _bootstrapCap.AuthenticationSystem(cancellationToken_);
+                _auth = new Auth(authCap);
+            }
+            
             var mechs = await _auth.GetMechanisms();
             //_Log.Debug($"The Server supports the following auth mechs: {string.Join(", ", mechs)}");
 
@@ -53,7 +57,7 @@ namespace FabAccessAPI
                 throw new UnsupportedMechanismException();
             }
 
-            await _auth.Authenticate(mech, kvs);
+            return await _auth.Authenticate(mech, kvs);
         }
 
         /// <summary>