diff --git a/Borepin/Borepin/Dialog/ConfirmDialog.xaml b/Borepin/Borepin/Dialog/ConfirmDialog.xaml
index 116e979..aedfd2e 100644
--- a/Borepin/Borepin/Dialog/ConfirmDialog.xaml
+++ b/Borepin/Borepin/Dialog/ConfirmDialog.xaml
@@ -4,11 +4,11 @@
              x:Class="Borepin.Dialog.ConfirmDialog"
              BackgroundColor="White">
     <ContentView.Content>
-        <StackLayout>
-            <Label Text="{Binding Title}"/>
-            <Label Text="{Binding Message}"/>
-            <Button Text="Confirm" Command="{Binding ConfirmCommand}"/>
-            <Button Text="Abort" Command="{Binding AbortCommand}"/>
+        <StackLayout Background="{StaticResource EighthColor}" Padding="10">
+            <Label Text="{Binding Title}" Style="{StaticResource LabelStyle_Title}"/>
+            <Label Text="{Binding Message}" Style="{StaticResource Style_Label_Property_Text}"/>
+            <Button Text="Confirm" Command="{Binding ConfirmCommand}" Style="{StaticResource Style_Button_Primary}"/>
+            <Button Text="Abort" Command="{Binding AbortCommand}" Style="{StaticResource Style_Button_Primary}"/>
         </StackLayout>
     </ContentView.Content>
 </ContentView>
\ No newline at end of file
diff --git a/Borepin/Borepin/Page/ServerListPage.xaml b/Borepin/Borepin/Page/ServerListPage.xaml
index 40f8dc6..1f590a0 100644
--- a/Borepin/Borepin/Page/ServerListPage.xaml
+++ b/Borepin/Borepin/Page/ServerListPage.xaml
@@ -18,7 +18,7 @@
             <StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}" VerticalOptions="FillAndExpand">
                 <Label Text="Active Connection" IsVisible="{Binding HasActiveConnection}"/>
                 <StackLayout IsVisible="{Binding HasActiveConnection}">
-                    <views:ServerListItemView BindingContext="{Binding ActiveConnection}" HeightRequest="70"/>
+                    <views:ServerListItemView BindingContext="{Binding ActiveConnection}" MinimumHeightRequest="50"/>
                 </StackLayout>
                 <Label Text="Last Connections"/>
                 <ListView ItemsSource="{Binding ServerListItemViewModel_List}" SelectionMode="None" SeparatorColor="Transparent" VerticalOptions="StartAndExpand">
diff --git a/Borepin/Borepin/Page/ServerPage.xaml b/Borepin/Borepin/Page/ServerPage.xaml
index 05ca8d6..c2ce4f1 100644
--- a/Borepin/Borepin/Page/ServerPage.xaml
+++ b/Borepin/Borepin/Page/ServerPage.xaml
@@ -20,9 +20,10 @@
                     <RowDefinition Height="50"/>
                 </Grid.RowDefinitions>
                 <StackLayout Grid.Row="0">
-                    <Label Text="{Binding DisplayAddress}" HorizontalTextAlignment="Center" Margin="0,0,0,10" Style="{StaticResource LabelStyle_Title}"/>
-                    <Button IsVisible="{Binding InstanceIsActiveConnection, Converter={StaticResource InvertBoolConverter}}" Text="Connect" Command="{Binding ConnectCommand}" Style="{StaticResource Style_Button_Primary}"/>
-                    <Button IsVisible="{Binding InstanceIsActiveConnection}" Text="Disconnect" Command="{Binding DisconnectCommand}" Style="{StaticResource Style_Button_Admin}"/>
+                    <Label Text="{Binding DisplayAddress}" Style="{StaticResource LabelStyle_Title}"/>
+                    <Label Text="{Binding Connection_Item.Username}" Style="{StaticResource Style_Label_Text_Center}"/>
+                    <Button IsVisible="{Binding InstanceIsActiveConnection, Converter={StaticResource InvertBoolConverter}}" Text="Connect" Margin="0,10,0,0" Command="{Binding ConnectCommand}" Style="{StaticResource Style_Button_Primary}"/>
+                    <Button IsVisible="{Binding InstanceIsActiveConnection}" Text="Disconnect" Margin="0,10,0,0" Command="{Binding DisconnectCommand}" Style="{StaticResource Style_Button_Admin}"/>
                 </StackLayout>
                 <Button Grid.Row="1" Text="Delete" Command="{Binding DeleteCommand}" Style="{StaticResource Style_Button_Admin}" VerticalOptions="End"/>
             </Grid>
diff --git a/Borepin/Borepin/View/MachineListItemView.xaml b/Borepin/Borepin/View/MachineListItemView.xaml
index e865d86..2f2f836 100644
--- a/Borepin/Borepin/View/MachineListItemView.xaml
+++ b/Borepin/Borepin/View/MachineListItemView.xaml
@@ -28,7 +28,7 @@
                 <Label Text="{Binding State, Converter={StaticResource MachineStateStringConverter}}" TextColor="{Binding State, Converter={StaticResource MachineStateColorConverter}}" Style="{StaticResource LabelStyle_Second}"/>
                 <Label Text="by Me" IsVisible="{Binding IsUserAssigned}" Style="{StaticResource LabelStyle_Second}"/>
             </StackLayout>
-            <Button Grid.Row="0" Grid.Column="3" Margin="0, 3, 0, 3" Text="->" Command="{Binding Source={RelativeSource AncestorType={x:Type pagemodel:MachineListPageModel}}, Path=SelectInstanceCommand}" CommandParameter="{Binding .}" Style="{StaticResource Style_Button_Primary}"/>
+            <Button Grid.Row="0" Grid.Column="3" Margin="0, 3, 0, 3" Text="➔" Command="{Binding Source={RelativeSource AncestorType={x:Type pagemodel:MachineListPageModel}}, Path=SelectInstanceCommand}" CommandParameter="{Binding .}" Style="{StaticResource Style_Button_Primary}"/>
             <BoxView Grid.Row="1" Grid.ColumnSpan="5" BackgroundColor="{StaticResource FifthColor}"/>
         </Grid>
     </ContentView.Content>
diff --git a/Borepin/Borepin/View/ServerListItemView.xaml b/Borepin/Borepin/View/ServerListItemView.xaml
index d73553a..6049b8d 100644
--- a/Borepin/Borepin/View/ServerListItemView.xaml
+++ b/Borepin/Borepin/View/ServerListItemView.xaml
@@ -18,7 +18,7 @@
             </Grid.RowDefinitions>
             <Label Grid.Row="0" Grid.Column="1" Text="{Binding Address, StringFormat='{0}'}" Style="{StaticResource LabelStyle_Primary}" VerticalOptions="Center"/>
             <Label Grid.Row="0" Grid.Column="2" Text="{Binding Username}" Style="{StaticResource LabelStyle_Second}" HorizontalTextAlignment="End" VerticalOptions="Center"/>
-            <Button Grid.Row="0" Grid.Column="3" Margin="0, 3, 0, 3" Text="->" Command="{Binding Source={RelativeSource AncestorType={x:Type pagemodel:ServerListPageModel}}, Path=SelectInstanceCommand}" CommandParameter="{Binding .}" Style="{StaticResource Style_Button_Primary}" VerticalOptions="Center"/>
+            <Button Grid.Row="0" Grid.Column="3" Margin="0, 3, 0, 3" Text="➔" Command="{Binding Source={RelativeSource AncestorType={x:Type pagemodel:ServerListPageModel}}, Path=SelectInstanceCommand}" CommandParameter="{Binding .}" Style="{StaticResource Style_Button_Primary}" VerticalOptions="Center"/>
             <BoxView Grid.Row="1" Grid.ColumnSpan="5" BackgroundColor="{StaticResource FifthColor}"/>
         </Grid>
     </ContentView.Content>