From 36a203f106810ddd03244d291f8f1a73d5a79b62 Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Wed, 1 Dec 2021 10:27:45 +1000
Subject: [PATCH] Added the Profile ID to the top of the profile window.

---
 .../Globalization/en-US/en-US.xaml            |  2 +
 src/ARKServerManager/Styles/Default.xaml      |  1 +
 src/ARKServerManager/VersionFeed.xml          | 13 +++++--
 src/ARKServerManager/VersionFeedBeta.xml      | 25 +++++++++++-
 .../Windows/ServerSettingsControl.xaml        | 37 ++++++++++--------
 .../Globalization/en-US/en-US.xaml            |  2 +
 src/ConanServerManager/VersionFeed.xml        | 13 +++++--
 src/ConanServerManager/VersionFeedBeta.xml    | 25 +++++++++++-
 .../Windows/ServerSettingsControl.xaml        | 38 +++++++++++--------
 9 files changed, 116 insertions(+), 40 deletions(-)

diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml
index 16869a5b..1b601aaf 100644
--- a/src/ARKServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml
@@ -763,6 +763,8 @@
     <!--#region Server Settings -->
 
     <!--#region Server Settings - General -->
+    <sys:String x:Key="ServerSettings_ProfileIdLabel">Profile ID:</sys:String>
+    <sys:String x:Key="ServerSettings_ProfileIdTooltip">The unique ID assigned to the profile.</sys:String>
     <sys:String x:Key="ServerSettings_ProfileLabel">Profile:</sys:String>
     <sys:String x:Key="ServerSettings_ProfileTooltip">The name for the server profile.  This is not the public name users will see in Ark.  For that, set the 'Server Name' field.</sys:String>
     <sys:String x:Key="ServerSettings_InstalledVersionLabel">Installed Version:</sys:String>
diff --git a/src/ARKServerManager/Styles/Default.xaml b/src/ARKServerManager/Styles/Default.xaml
index e8594da3..13380fe5 100644
--- a/src/ARKServerManager/Styles/Default.xaml
+++ b/src/ARKServerManager/Styles/Default.xaml
@@ -85,6 +85,7 @@
         <Setter Property="BorderBrush" Value="{StaticResource DarkBorder}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="CornerRadius" Value="3"/>
+        <Setter Property="Background" Value="{StaticResource BeigeLabel}"/>
     </Style>
 
     <Style x:Key="BorderLightStyle" TargetType="Border">
diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml
index 99299614..f482898f 100644
--- a/src/ARKServerManager/VersionFeed.xml
+++ b/src/ARKServerManager/VersionFeed.xml
@@ -5,17 +5,22 @@
   <title>Ark Server Manager Version Feed</title>
   <subtitle>This is the Ark Server Manager release version feed.</subtitle>
   <link href="http://arkservermanager.freeforums.net/" />
-  <updated>2021-11-30T00:00:00Z</updated>
+  <updated>2021-12-01T00:00:00Z</updated>
 
   <entry>
     <id>urn:uuid:0B63D89E-0C36-41DE-96E7-BFB140250C02</id>
-    <title>1.1.409 (1.1.409.2)</title>
-    <summary>1.1.409.2</summary>
+    <title>1.1.409 (1.1.409.3)</title>
+    <summary>1.1.409.3</summary>
     <link href="" />
-    <updated>2021-11-30T00:00:00Z</updated>
+    <updated>2021-12-01T00:00:00Z</updated>
     <content type="xhtml">
       <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
         <p>
+          <u style="font-size: .9em;">NEW</u>
+          <br/>
+          <ul>
+            <li>Added the Profile ID to the top of the profile window.</li>
+          </ul>
           <u style="font-size: .9em;">CHANGE</u>
           <br/>
           <ul>
diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml
index e2f3e826..2b0645f1 100644
--- a/src/ARKServerManager/VersionFeedBeta.xml
+++ b/src/ARKServerManager/VersionFeedBeta.xml
@@ -5,7 +5,30 @@
   <title>Ark Server Manager Version Feed</title>
   <subtitle>This is the Ark Server Manager beta version feed.</subtitle>
   <link href="http://arkservermanager.freeforums.net/" />
-  <updated>2021-11-30T00:00:00Z</updated>
+  <updated>2021-12-01T00:00:00Z</updated>
+
+  <entry>
+    <id>urn:uuid:0B63D89E-0C36-41DE-96E7-BFB140250C02</id>
+    <title>1.1.409 (1.1.409.3)</title>
+    <summary>1.1.409.3</summary>
+    <link href="" />
+    <updated>2021-12-01T00:00:00Z</updated>
+    <content type="xhtml">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
+        <p>
+          <u style="font-size: .9em;">NEW</u>
+          <br/>
+          <ul>
+            <li>Added the Profile ID to the top of the profile window.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:0B63D89E-0C36-41DE-96E7-BFB140250C02</id>
diff --git a/src/ARKServerManager/Windows/ServerSettingsControl.xaml b/src/ARKServerManager/Windows/ServerSettingsControl.xaml
index 5f2b99f2..9326f68c 100644
--- a/src/ARKServerManager/Windows/ServerSettingsControl.xaml
+++ b/src/ARKServerManager/Windows/ServerSettingsControl.xaml
@@ -44,13 +44,13 @@
 
             <ContentControl x:Key="SupportZipButtonContent">
                 <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,0,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Zip.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Zip.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
                     <Label Content="{DynamicResource ServerSettings_SupportZipButtonLabel}" VerticalAlignment="Center"/>
                 </StackPanel>
             </ContentControl>
             <ContentControl x:Key="SyncProfileButtonContent">
                 <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,0,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Copy.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Copy.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
                     <Label Content="{DynamicResource ServerSettings_SyncProfileButtonLabel}" VerticalAlignment="Center"/>
                 </StackPanel>
             </ContentControl>
@@ -290,6 +290,7 @@
             <Border DockPanel.Dock="Top" Margin="3" Padding="2" Style="{StaticResource BorderDarkStyle}">
                 <Grid>
                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
                         <RowDefinition Height="36"/>
                         <RowDefinition Height="36"/>
                         <RowDefinition Height="36"/>
@@ -297,14 +298,20 @@
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition/>
+                        <ColumnDefinition Width="Auto" MinWidth="60"/>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
 
-                    <DockPanel Grid.Row="0" Grid.Column="0" Margin="2" DataContext="{Binding Profile}" VerticalAlignment="Center" >
+                    <StackPanel Grid.Row="0" Grid.Column="0" DataContext="{Binding Profile}" Orientation="Horizontal" >
+                        <Label Margin="2,0,0,0" VerticalAlignment="Center" Content="{DynamicResource ServerSettings_ProfileIdLabel}" ToolTip="{DynamicResource ServerSettings_ProfileIdTooltip}"/>
+                        <Label VerticalAlignment="Center" Content="{Binding ProfileID}" ToolTip="{DynamicResource ServerSettings_ProfileIdTooltip}"/>
+                    </StackPanel>
+                    <Button Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Click="CreateSupportZip_Click" Content="{StaticResource SupportZipButtonContent}" ToolTip="{DynamicResource ServerSettings_SupportZipButtonTooltip}"/>
+                    <Button Grid.Row="0" Grid.Column="3" Margin="2" Click="SyncProfile_Click" Content="{StaticResource SyncProfileButtonContent}" ToolTip="{DynamicResource ServerSettings_SyncProfileButtonTooltip}"/>
+
+                    <DockPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Profile}" VerticalAlignment="Center" >
                         <Label DockPanel.Dock="Left" FontSize="15" Content="{DynamicResource ServerSettings_ProfileLabel}" ToolTip="{Binding ProfileToolTip}"/>
-                        <Button DockPanel.Dock="Right" Margin="2,0,0,0" Click="SyncProfile_Click" Content="{StaticResource SyncProfileButtonContent}" ToolTip="{DynamicResource ServerSettings_SyncProfileButtonTooltip}"/>
-                        <Button DockPanel.Dock="Right" Margin="2,0,0,0" Click="CreateSupportZip_Click" Content="{StaticResource SupportZipButtonContent}" ToolTip="{DynamicResource ServerSettings_SupportZipButtonTooltip}"/>
                         <TextBox VerticalContentAlignment="Center" SourceUpdated="ProfileName_SourceUpdated">
                             <Validation.ErrorTemplate>
                                 <ControlTemplate>
@@ -323,10 +330,10 @@
                             </TextBox.Text>
                         </TextBox>
                     </DockPanel>
-                    <Button Grid.Row="0" Grid.Column="1" Margin="2" Content="{StaticResource ImportButtonContent}" ToolTip="{DynamicResource ServerSettings_ImportButtonTooltip}" Click="Load_Click" />
-                    <Button Grid.Row="0" Grid.Column="2" Margin="2" Content="{StaticResource SaveButtonContent}" ToolTip="{DynamicResource ServerSettings_SaveButtonTooltip}" Command="{Binding SaveCommand, ElementName=SettingsControl}" CommandParameter="{Binding}" />
+                    <Button Grid.Row="1" Grid.Column="2" Margin="2" Content="{StaticResource ImportButtonContent}" ToolTip="{DynamicResource ServerSettings_ImportButtonTooltip}" Click="Load_Click" />
+                    <Button Grid.Row="1" Grid.Column="3" Margin="2" Content="{StaticResource SaveButtonContent}" ToolTip="{DynamicResource ServerSettings_SaveButtonTooltip}" Command="{Binding SaveCommand, ElementName=SettingsControl}" CommandParameter="{Binding}" />
 
-                    <Border Grid.Row="1" Grid.Column="0" Margin="2" DataContext="{Binding Profile}" Style="{StaticResource BorderFillLightStyle}">
+                    <Border Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Profile}" Style="{StaticResource BorderFillLightStyle}">
                         <Grid VerticalAlignment="Center">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
@@ -387,7 +394,7 @@
                             </Button>
                         </Grid>
                     </Border>
-                    <Button Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Runtime}" Click="Upgrade_Click">
+                    <Button Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Runtime}" Click="Upgrade_Click">
                         <Button.Style>
                             <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                                 <Style.Triggers>
@@ -430,7 +437,7 @@
                         </Button.Style>
                     </Button>
 
-                    <Border Grid.Row="2" Grid.Column="0" Margin="2" DataContext="{Binding Profile}" ToolTip="{DynamicResource ServerSettings_InstallLocationTooltip}" Style="{StaticResource BorderFillLightStyle}">
+                    <Border Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Profile}" ToolTip="{DynamicResource ServerSettings_InstallLocationTooltip}" Style="{StaticResource BorderFillLightStyle}">
                         <Grid VerticalAlignment="Center" >
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
@@ -445,7 +452,7 @@
                             </Button>
                         </Grid>
                     </Border>
-                    <Button Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Content="{StaticResource LocationButtonContent}" DataContext="{Binding Runtime}" Click="SelectInstallDirectory_Click">
+                    <Button Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="2" Margin="2" Content="{StaticResource LocationButtonContent}" DataContext="{Binding Runtime}" Click="SelectInstallDirectory_Click">
                         <Button.Style>
                             <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                                 <Style.Triggers>
@@ -480,7 +487,7 @@
                         </Button.Style>
                     </Button>
 
-                    <Grid Grid.Row="3" Grid.Column="0" DataContext="{Binding Runtime}" >
+                    <Grid Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" DataContext="{Binding Runtime}" >
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition Width="*"/>
@@ -530,7 +537,7 @@
                             </StackPanel>
                         </Border>
                     </Grid>
-                    <Button Grid.Row="3" Grid.Column="1" Margin="2" DataContext="{Binding Runtime}" Click="Start_Click">
+                    <Button Grid.Row="4" Grid.Column="2" Margin="2" DataContext="{Binding Runtime}" Click="Start_Click">
                         <Button.Style>
                             <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                                 <Style.Triggers>
@@ -574,7 +581,7 @@
                             </Style>
                         </Button.Style>
                     </Button>
-                    <Button Grid.Row="3" Grid.Column="2" Margin="2" DataContext="{Binding Profile}" Content="{StaticResource OpenRCONButtonContent}" ToolTip="{DynamicResource ServerSettings_RCONButtonTooltip}" Click="OpenRCON_Click">
+                    <Button Grid.Row="4" Grid.Column="3" Margin="2" DataContext="{Binding Profile}" Content="{StaticResource OpenRCONButtonContent}" ToolTip="{DynamicResource ServerSettings_RCONButtonTooltip}" Click="OpenRCON_Click">
                         <Button.Style>
                             <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                                 <Setter Property="Visibility" Value="Visible"/>
@@ -586,7 +593,7 @@
                             </Style>
                         </Button.Style>
                     </Button>
-                    <Button Grid.Row="3" Grid.Column="2" Margin="2" DataContext="{Binding Profile}" Content="{StaticResource PlayerListButtonContent}" ToolTip="{DynamicResource ServerSettings_PlayerListButtonTooltip}" Click="OpenPlayerList_Click">
+                    <Button Grid.Row="4" Grid.Column="3" Margin="2" DataContext="{Binding Profile}" Content="{StaticResource PlayerListButtonContent}" ToolTip="{DynamicResource ServerSettings_PlayerListButtonTooltip}" Click="OpenPlayerList_Click">
                         <Button.Style>
                             <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                                 <Setter Property="Visibility" Value="Visible"/>
diff --git a/src/ConanServerManager/Globalization/en-US/en-US.xaml b/src/ConanServerManager/Globalization/en-US/en-US.xaml
index e05e6e2b..412fc049 100644
--- a/src/ConanServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ConanServerManager/Globalization/en-US/en-US.xaml
@@ -847,6 +847,8 @@
 
     <!--#region Server Settings Control-->
     <!--#region Server Settings - General -->
+    <sys:String x:Key="ServerSettings_ProfileIdLabel">Profile ID:</sys:String>
+    <sys:String x:Key="ServerSettings_ProfileIdTooltip">The unique ID assigned to the profile.</sys:String>
     <sys:String x:Key="ServerSettings_ProfileLabel">Profile:</sys:String>
     <sys:String x:Key="ServerSettings_ProfileTooltip">The name for the server profile. This is not the public name users will see in the game. For that, set the 'Server Name' field.</sys:String>
     <sys:String x:Key="ServerSettings_InstalledVersionLabel">Installed Version:</sys:String>
diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml
index 37c81f3f..ba7feabd 100644
--- a/src/ConanServerManager/VersionFeed.xml
+++ b/src/ConanServerManager/VersionFeed.xml
@@ -5,17 +5,22 @@
   <title>Conan Server Manager Version Feed</title>
   <subtitle>This is the Conan Server Manager release version feed.</subtitle>
   <link href="http://servermanagers.freeforums.net/" />
-  <updated>2021-11-30T00:00:00Z</updated>
+  <updated>2021-12-01T00:00:00Z</updated>
 
   <entry>
     <id>urn:uuid:38961ED8-0964-4C1A-B09C-8AE2C5FCF76E</id>
-    <title>1.1.54 (1.1.54.2)</title>
-    <summary>1.1.54.2</summary>
+    <title>1.1.54 (1.1.54.3)</title>
+    <summary>1.1.54.3</summary>
     <link href="" />
-    <updated>2021-11-30T00:00:00Z</updated>
+    <updated>2021-12-01T00:00:00Z</updated>
     <content type="xhtml">
       <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
         <p>
+          <u style="font-size: .9em;">NEW</u>
+          <br/>
+          <ul>
+            <li>Added the Profile ID to the top of the profile window.</li>
+          </ul>
           <u style="font-size: .9em;">CHANGE</u>
           <br/>
           <ul>
diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml
index 7379f498..bd161bba 100644
--- a/src/ConanServerManager/VersionFeedBeta.xml
+++ b/src/ConanServerManager/VersionFeedBeta.xml
@@ -5,7 +5,30 @@
   <title>Conan Server Manager Version Feed</title>
   <subtitle>This is the Conan Server Manager beta version feed.</subtitle>
   <link href="http://servermanagers.freeforums.net/" />
-  <updated>2021-11-30T00:00:00Z</updated>
+  <updated>2021-12-01T00:00:00Z</updated>
+
+  <entry>
+    <id>urn:uuid:38961ED8-0964-4C1A-B09C-8AE2C5FCF76E</id>
+    <title>1.1.54 (1.1.54.3)</title>
+    <summary>1.1.54.3</summary>
+    <link href="" />
+    <updated>2021-12-01T00:00:00Z</updated>
+    <content type="xhtml">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
+        <p>
+          <u style="font-size: .9em;">NEW</u>
+          <br/>
+          <ul>
+            <li>Added the Profile ID to the top of the profile window.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:38961ED8-0964-4C1A-B09C-8AE2C5FCF76E</id>
diff --git a/src/ConanServerManager/Windows/ServerSettingsControl.xaml b/src/ConanServerManager/Windows/ServerSettingsControl.xaml
index 82841663..44e3b99c 100644
--- a/src/ConanServerManager/Windows/ServerSettingsControl.xaml
+++ b/src/ConanServerManager/Windows/ServerSettingsControl.xaml
@@ -278,6 +278,7 @@
                 <Setter Property="BorderBrush" Value="{StaticResource DarkBorder}"/>
                 <Setter Property="BorderThickness" Value="1"/>
                 <Setter Property="CornerRadius" Value="3"/>
+                <Setter Property="Background" Value="{StaticResource BeigeLabel}"/>
             </Style>
             <Style x:Key="BorderLightStyle" TargetType="Border">
                 <Setter Property="BorderBrush" Value="{StaticResource BeigeBorder}"/>
@@ -309,13 +310,13 @@
 
             <ContentControl x:Key="SupportZipButtonContent">
                 <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,0,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Zip.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Zip.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
                     <Label Content="{DynamicResource ServerSettings_SupportZipButtonLabel}" VerticalAlignment="Center"/>
                 </StackPanel>
             </ContentControl>
             <ContentControl x:Key="SyncProfileButtonContent">
                 <StackPanel Orientation="Horizontal" Height="27">
-                    <Image Margin="5,0,0,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Copy.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+                    <Image Margin="5,0,5,0" Source="{com:Icon Path=/ConanServerManager;component/Art/Copy.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
                     <Label Content="{DynamicResource ServerSettings_SyncProfileButtonLabel}" VerticalAlignment="Center"/>
                 </StackPanel>
             </ContentControl>
@@ -433,6 +434,7 @@
             <Border DockPanel.Dock="Top" Margin="3" Padding="2" Style="{StaticResource BorderDarkStyle}">
                 <Grid>
                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
                         <RowDefinition Height="36"/>
                         <RowDefinition Height="36"/>
                         <RowDefinition Height="36"/>
@@ -440,14 +442,20 @@
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition/>
+                        <ColumnDefinition Width="Auto" MinWidth="60"/>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
 
-                    <DockPanel Grid.Row="0" Grid.Column="0" Margin="2" DataContext="{Binding Profile}" VerticalAlignment="Center" >
+                    <StackPanel Grid.Row="0" Grid.Column="0" DataContext="{Binding Profile}" Orientation="Horizontal" >
+                        <Label Margin="2,0,0,0" VerticalAlignment="Center" Content="{DynamicResource ServerSettings_ProfileIdLabel}" ToolTip="{DynamicResource ServerSettings_ProfileIdTooltip}"/>
+                        <Label VerticalAlignment="Center" Content="{Binding ProfileID}" ToolTip="{DynamicResource ServerSettings_ProfileIdTooltip}"/>
+                    </StackPanel>
+                    <Button Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Click="CreateSupportZip_Click" Content="{StaticResource SupportZipButtonContent}" ToolTip="{DynamicResource ServerSettings_SupportZipButtonTooltip}"/>
+                    <Button Grid.Row="0" Grid.Column="3" Margin="2" Click="SyncProfile_Click" Content="{StaticResource SyncProfileButtonContent}" ToolTip="{DynamicResource ServerSettings_SyncProfileButtonTooltip}"/>
+
+                    <DockPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Profile}" VerticalAlignment="Center" >
                         <Label DockPanel.Dock="Left" FontSize="15" Content="{DynamicResource ServerSettings_ProfileLabel}" ToolTip="{Binding ProfileToolTip}"/>
-                        <Button DockPanel.Dock="Right" Margin="2,0,0,0" Click="SyncProfile_Click" Content="{StaticResource SyncProfileButtonContent}" ToolTip="{DynamicResource ServerSettings_SyncProfileButtonTooltip}"/>
-                        <Button DockPanel.Dock="Right" Margin="2,0,0,0" Click="CreateSupportZip_Click" Content="{StaticResource SupportZipButtonContent}" ToolTip="{DynamicResource ServerSettings_SupportZipButtonTooltip}"/>
                         <TextBox VerticalContentAlignment="Center" SourceUpdated="ProfileName_SourceUpdated">
                             <Validation.ErrorTemplate>
                                 <ControlTemplate>
@@ -466,10 +474,10 @@
                             </TextBox.Text>
                         </TextBox>
                     </DockPanel>
-                    <Button Grid.Row="0" Grid.Column="1" Margin="2" Content="{StaticResource ImportButtonContent}" ToolTip="{DynamicResource ServerSettings_ImportButtonTooltip}" Click="Load_Click"/>
-                    <Button Grid.Row="0" Grid.Column="2" Margin="2" Content="{StaticResource SaveButtonContent}" ToolTip="{DynamicResource ServerSettings_SaveButtonTooltip}" Command="{Binding SaveCommand, ElementName=SettingsControl}" CommandParameter="{Binding}" />
+                    <Button Grid.Row="1" Grid.Column="2" Margin="2" Content="{StaticResource ImportButtonContent}" ToolTip="{DynamicResource ServerSettings_ImportButtonTooltip}" Click="Load_Click"/>
+                    <Button Grid.Row="1" Grid.Column="3" Margin="2" Content="{StaticResource SaveButtonContent}" ToolTip="{DynamicResource ServerSettings_SaveButtonTooltip}" Command="{Binding SaveCommand, ElementName=SettingsControl}" CommandParameter="{Binding}" />
 
-                    <Border Grid.Row="1" Grid.Column="0" Margin="2" DataContext="{Binding Profile}" Style="{StaticResource BorderFillLightStyle}">
+                    <Border Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Profile}" Style="{StaticResource BorderFillLightStyle}">
                         <Grid VerticalAlignment="Center">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
@@ -530,7 +538,7 @@
                             </Button>
                         </Grid>
                     </Border>
-                    <Button Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Runtime}" Click="Upgrade_Click">
+                    <Button Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Runtime}" Click="Upgrade_Click">
                         <Button.Style>
                             <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                                 <Style.Triggers>
@@ -573,7 +581,7 @@
                         </Button.Style>
                     </Button>
 
-                    <Border Grid.Row="2" Grid.Column="0" Margin="2" DataContext="{Binding Profile}" ToolTip="{DynamicResource ServerSettings_InstallLocationTooltip}" Style="{StaticResource BorderFillLightStyle}">
+                    <Border Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Profile}" ToolTip="{DynamicResource ServerSettings_InstallLocationTooltip}" Style="{StaticResource BorderFillLightStyle}">
                         <Grid VerticalAlignment="Center" >
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
@@ -588,7 +596,7 @@
                             </Button>
                         </Grid>
                     </Border>
-                    <Button Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Content="{StaticResource LocationButtonContent}" DataContext="{Binding Runtime}" Click="SelectInstallDirectory_Click">
+                    <Button Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="2" Margin="2" Content="{StaticResource LocationButtonContent}" DataContext="{Binding Runtime}" Click="SelectInstallDirectory_Click">
                         <Button.Style>
                             <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                                 <Style.Triggers>
@@ -623,7 +631,7 @@
                         </Button.Style>
                     </Button>
 
-                    <Grid Grid.Row="3" Grid.Column="0" DataContext="{Binding Runtime}" >
+                    <Grid Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" DataContext="{Binding Runtime}" >
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition Width="*"/>
@@ -673,7 +681,7 @@
                             </StackPanel>
                         </Border>
                     </Grid>
-                    <Button Grid.Row="3" Grid.Column="1" Margin="2" DataContext="{Binding Runtime}" Click="Start_Click">
+                    <Button Grid.Row="4" Grid.Column="2" Margin="2" DataContext="{Binding Runtime}" Click="Start_Click">
                         <Button.Style>
                             <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                                 <Style.Triggers>
@@ -717,7 +725,7 @@
                             </Style>
                         </Button.Style>
                     </Button>
-                    <Button Grid.Row="3" Grid.Column="2" Margin="2" DataContext="{Binding Profile}" Content="{StaticResource OpenRconButtonContent}" ToolTip="{DynamicResource ServerSettings_RconButtonTooltip}" Click="OpenRcon_Click">
+                    <Button Grid.Row="4" Grid.Column="3" Margin="2" DataContext="{Binding Profile}" Content="{StaticResource OpenRconButtonContent}" ToolTip="{DynamicResource ServerSettings_RconButtonTooltip}" Click="OpenRcon_Click">
                         <Button.Style>
                             <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                                 <Setter Property="Visibility" Value="Visible"/>
@@ -729,7 +737,7 @@
                             </Style>
                         </Button.Style>
                     </Button>
-                    <Button Grid.Row="3" Grid.Column="2" Margin="2" DataContext="{Binding Profile}" Content="{StaticResource PlayerListButtonContent}" ToolTip="{DynamicResource ServerSettings_PlayerListButtonTooltip}" Click="OpenPlayerList_Click">
+                    <Button Grid.Row="4" Grid.Column="3" Margin="2" DataContext="{Binding Profile}" Content="{StaticResource PlayerListButtonContent}" ToolTip="{DynamicResource ServerSettings_PlayerListButtonTooltip}" Click="OpenPlayerList_Click">
                         <Button.Style>
                             <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                                 <Setter Property="Visibility" Value="Visible"/>