diff --git a/Borepin/Borepin/Model/MachineVisualize.cs b/Borepin/Borepin/Model/MachineVisualize.cs
index 709c7c5..8aac695 100644
--- a/Borepin/Borepin/Model/MachineVisualize.cs
+++ b/Borepin/Borepin/Model/MachineVisualize.cs
@@ -21,6 +21,11 @@ namespace Borepin.Model
         #region Methods
         public async Task LoadData()
         {
+            if(_Machine== null) 
+            {
+                return;
+            }
+
             //ID = _Machine.Id;
             //Space = new SpaceVisualize(_Machine.Space);
             Name = _Machine.Name;
diff --git a/Borepin/Borepin/Page/MachinePage.xaml b/Borepin/Borepin/Page/MachinePage.xaml
index 2a41cc2..ee2f13d 100644
--- a/Borepin/Borepin/Page/MachinePage.xaml
+++ b/Borepin/Borepin/Page/MachinePage.xaml
@@ -47,11 +47,11 @@
                     <Label Text="{x:Static resource_text:TextResource.MachinePage_CanNotUseByPermission}" IsVisible="{Binding MachineItem.CanNotUseByPermission}" Style="{StaticResource Style_Label_Text_Center}" TextColor="{StaticResource FourthColor}"/>
                     <Button Text="{x:Static resource_text:TextResource.MachinePage_GiveBack}" IsVisible="{Binding MachineItem.CanInUse}" Command="{Binding GiveBackMachineCommand}" Style="{StaticResource Style_Button_Primary}"/>
                     <Button VerticalOptions="End" Text="{x:Static resource_text:TextResource.MachinePage_OpenWiki}" IsVisible="{Binding MachineItem.Wiki, Converter={StaticResource IsNotNullBoolConverter}}" Command="{Binding OpenWikiCommand}" Style="{StaticResource Style_Button_Primary}"/>
-                    <StackLayout Grid.Row="2" VerticalOptions="End" IsVisible="{Binding MachineItem.CanManage}">
+                    <StackLayout Grid.Row="2" VerticalOptions="End" IsVisible="{Binding MachineItem.CanManage}" Margin="0,50,0,0">
                         <Label Text="{x:Static resource_text:TextResource.MachinePage_ManageMachine}" Style="{StaticResource Style_Label_Property_Title}"/>
-                        <StackLayout Margin="10, 0, 0, 20" Orientation="Horizontal" IsVisible="{Binding MachineItem.LastUser, Converter={StaticResource IsNotNullBoolConverter}}">
+                        <StackLayout Orientation="Horizontal" IsVisible="{Binding MachineItem.LastUser, Converter={StaticResource IsNotNullBoolConverter}}">
                             <Label Text="{x:Static resource_text:TextResource.MachinePage_LastUser}" Style="{StaticResource Style_Label_Property_Title}"/>
-                            <Label Text="{Binding MachineItem.LastUser.Username}" Style="{StaticResource Style_Label_Property_Text}" Margin="10, 0, 0, 0"/>
+                            <Label Text="{Binding MachineItem.LastUser.Username}" Style="{StaticResource Style_Label_Property_Text}"/>
                         </StackLayout>
                         <Button Text="{x:Static resource_text:TextResource.MachinePage_ForceFree}" Command="{Binding ForceFreeMachineCommand}" Style="{StaticResource Style_Button_Primary}"/>
                         <Button Text="{x:Static resource_text:TextResource.MachinePage_ForceBlock}" Command="{Binding ForceBlockMachineCommand}" Style="{StaticResource Style_Button_Admin}"/>
diff --git a/Borepin/Borepin/Page/UserListPage.xaml b/Borepin/Borepin/Page/UserListPage.xaml
index 4b990d5..d1a2ac8 100644
--- a/Borepin/Borepin/Page/UserListPage.xaml
+++ b/Borepin/Borepin/Page/UserListPage.xaml
@@ -27,7 +27,7 @@
                     </MultiBinding>
                 </StackLayout.IsVisible>
                 <Button Text="{x:Static resource_text:TextResource.UserListPage_AddUser}" Command="{Binding AddUserCommand}" Style="{StaticResource Style_Button_Primary}"/>
-                <SearchBar Text="{Binding SearchUsername}" SearchCommand="{Binding SearchUserCommand}">
+                <SearchBar Text="{Binding SearchUsername}" SearchCommand="{Binding SearchUserCommand}" Placeholder="{x:Static resource_text:TextResource.UserListPage_Search}" PlaceholderColor="{StaticResource SecondColor}">
                     <SearchBar.Behaviors>
                         <prism:EventToCommandBehavior EventName="TextChanged" Command="{Binding SearchUserCommand}"/>
                     </SearchBar.Behaviors>
diff --git a/Borepin/Borepin/Page/UserPage.xaml b/Borepin/Borepin/Page/UserPage.xaml
index ea4c8b6..e314dc8 100644
--- a/Borepin/Borepin/Page/UserPage.xaml
+++ b/Borepin/Borepin/Page/UserPage.xaml
@@ -22,7 +22,7 @@
                 <StackLayout.IsVisible>
                     <MultiBinding Converter="{StaticResource AllTrueBoolConverter}">
                         <Binding Path="IsBusy" Converter="{StaticResource InvertBoolConverter}"/>
-                        <Binding Path="IsConnected" />
+                        <Binding Path="IsConnected"/>
                     </MultiBinding>
                 </StackLayout.IsVisible>
                 <Label Text="{Binding UserItem.Username}" Style="{StaticResource LabelStyle_Title}"/>
@@ -41,8 +41,8 @@
                     <Button Text="{x:Static resource_text:TextResource.UserPage_UpdatePassword}" Command="{Binding UpdatePasswordCommand}" Style="{StaticResource Style_Button_Primary}"/>
                 </StackLayout>
                 <StackLayout IsVisible="{Binding CanCreateCard}">
-                    <Button Text="Create Card" Command="{Binding CreateCardCommand}" IsVisible="{Binding HasCardBinded, Converter={StaticResource InvertBoolConverter}}" Style="{StaticResource Style_Button_Primary}"/>
-                    <Button Text="Unbind Card" Command="{Binding UnbindCardCommand}" IsVisible="{Binding HasCardBinded}" Style="{StaticResource Style_Button_Admin}"/>
+                    <Button Text="{x:Static resource_text:TextResource.UserPage_CreateCard}" Command="{Binding CreateCardCommand}" IsVisible="{Binding HasCardBinded, Converter={StaticResource InvertBoolConverter}}" Style="{StaticResource Style_Button_Primary}"/>
+                    <Button Text="{x:Static resource_text:TextResource.UserPage_UnbindCard}" Command="{Binding UnbindCardCommand}" IsVisible="{Binding HasCardBinded}" Style="{StaticResource Style_Button_Admin}"/>
                 </StackLayout>
                 <Button Text="{x:Static resource_text:TextResource.DELETE}" Command="{Binding DeleteCommand}" Style="{StaticResource Style_Button_Admin}"/>
             </StackLayout>
diff --git a/Borepin/Borepin/Resources/Text/TextResource.Designer.cs b/Borepin/Borepin/Resources/Text/TextResource.Designer.cs
index b4030b0..40587e6 100644
--- a/Borepin/Borepin/Resources/Text/TextResource.Designer.cs
+++ b/Borepin/Borepin/Resources/Text/TextResource.Designer.cs
@@ -369,7 +369,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die Connecting to Server ... ähnelt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Connecting to Server ähnelt.
         /// </summary>
         internal static string ConnectionStatus_Connecting {
             get {
@@ -939,7 +939,7 @@ namespace Borepin.Resources.Text {
         }
         
         /// <summary>
-        ///   Sucht eine lokalisierte Zeichenfolge, die Add User ähnelt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Add new User ähnelt.
         /// </summary>
         internal static string UserListPage_AddUser {
             get {
@@ -947,6 +947,15 @@ namespace Borepin.Resources.Text {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Search User ähnelt.
+        /// </summary>
+        internal static string UserListPage_Search {
+            get {
+                return ResourceManager.GetString("UserListPage_Search", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Search Username ... ähnelt.
         /// </summary>
@@ -974,6 +983,15 @@ namespace Borepin.Resources.Text {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Create new FabFire Card ähnelt.
+        /// </summary>
+        internal static string UserPage_CreateCard {
+            get {
+                return ResourceManager.GetString("UserPage_CreateCard", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die New Password ähnelt.
         /// </summary>
@@ -983,6 +1001,15 @@ namespace Borepin.Resources.Text {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die Unbind FabFire Card ähnelt.
+        /// </summary>
+        internal static string UserPage_UnbindCard {
+            get {
+                return ResourceManager.GetString("UserPage_UnbindCard", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die Force Password Update ähnelt.
         /// </summary>
diff --git a/Borepin/Borepin/Resources/Text/TextResource.resx b/Borepin/Borepin/Resources/Text/TextResource.resx
index 2a8a73a..0c98615 100644
--- a/Borepin/Borepin/Resources/Text/TextResource.resx
+++ b/Borepin/Borepin/Resources/Text/TextResource.resx
@@ -239,7 +239,7 @@ In addition to being able to connect to individual servers, FabAccess also allow
     <value>Confirm</value>
   </data>
   <data name="ConnectionStatus_Connecting" xml:space="preserve">
-    <value>Connecting to Server ...</value>
+    <value>Connecting to Server</value>
   </data>
   <data name="ConnectionStatus_NoConnection" xml:space="preserve">
     <value>No Connection to Server</value>
@@ -431,7 +431,10 @@ With FabAccess, you can access and schedule machines, manage users and receive r
     <value>Uncategorised</value>
   </data>
   <data name="UserListPage_AddUser" xml:space="preserve">
-    <value>Add User</value>
+    <value>Add new User</value>
+  </data>
+  <data name="UserListPage_Search" xml:space="preserve">
+    <value>Search User</value>
   </data>
   <data name="UserListPage_SearchUser" xml:space="preserve">
     <value>Search Username ...</value>
@@ -442,9 +445,15 @@ With FabAccess, you can access and schedule machines, manage users and receive r
   <data name="UserPage_ChangePassword" xml:space="preserve">
     <value>Update Password</value>
   </data>
+  <data name="UserPage_CreateCard" xml:space="preserve">
+    <value>Create new FabFire Card</value>
+  </data>
   <data name="UserPage_NewPassword" xml:space="preserve">
     <value>New Password</value>
   </data>
+  <data name="UserPage_UnbindCard" xml:space="preserve">
+    <value>Unbind FabFire Card</value>
+  </data>
   <data name="UserPage_UpdatePassword" xml:space="preserve">
     <value>Force Password Update</value>
   </data>
diff --git a/Borepin/Borepin/View/ConnectionStateView.xaml b/Borepin/Borepin/View/ConnectionStateView.xaml
index 2e003bb..9ccaabc 100644
--- a/Borepin/Borepin/View/ConnectionStateView.xaml
+++ b/Borepin/Borepin/View/ConnectionStateView.xaml
@@ -23,9 +23,10 @@
                         <Binding Path="IsConnected" Converter="{StaticResource InvertBoolConverter}"/>
                     </MultiBinding>
                 </StackLayout.IsVisible>
-                <Label Text="{x:Static resource_text:TextResource.ConnectionStatus_NoConnection}"/>
-                <Label Text="{x:Static resource_text:TextResource.ConnectionStatus_Connecting}" IsVisible="{Binding IsConnecting}"/>
-                <Label Text="{x:Static resource_text:TextResource.ConnectionStatus_NotConnected}" IsVisible="{Binding IsConnecting, Converter={StaticResource InvertBoolConverter}}"/>
+                <Label Text="{x:Static resource_text:TextResource.ConnectionStatus_NoConnection}" Style="{StaticResource Style_Label_Text_Center}"/>
+                <Label Text="{x:Static resource_text:TextResource.ConnectionStatus_Connecting}" IsVisible="{Binding IsConnecting}" Style="{StaticResource Style_Label_Text_Center}"/>
+                <ActivityIndicator IsRunning="{Binding IsConnecting}" IsVisible="{Binding IsConnecting}"/>
+                <Label Text="{x:Static resource_text:TextResource.ConnectionStatus_NotConnected}" IsVisible="{Binding IsConnecting, Converter={StaticResource InvertBoolConverter}}" Style="{StaticResource Style_Label_Text_Center}"/>
             </StackLayout>
         </StackLayout>
     </ContentView.Content>