diff --git a/ModpackUpdater.Apps.Client.Gui/MainForm.axaml b/ModpackUpdater.Apps.Client.Gui/MainForm.axaml
index 0396678..9a930d0 100644
--- a/ModpackUpdater.Apps.Client.Gui/MainForm.axaml
+++ b/ModpackUpdater.Apps.Client.Gui/MainForm.axaml
@@ -16,11 +16,9 @@
     
     <Grid
         RowDefinitions="Auto,Auto,Auto,Auto,Auto"
-        Margin="3"
-        RowSpacing="6"
-        ColumnSpacing="6"
         HorizontalAlignment="Stretch"
         VerticalAlignment="Top"
+        x:Name="MainGrid"
         >
         
         <Grid.ColumnDefinitions>
@@ -30,11 +28,11 @@
         </Grid.ColumnDefinitions>
         
         <!-- Labels -->
-        <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Content="{x:Static lang:GeneralLangRes.MinecraftProfile}" />
-        <Label Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Content="{x:Static lang:GeneralLangRes.ModpackConfigUrl}" />
-        <Label Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" IsVisible="false" x:Name="LabelInstallKey" Content="{x:Static lang:GeneralLangRes.InstallationKey}" />
-        <Label Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Content="{x:Static lang:GeneralLangRes.Status}" />
-        <Label Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" VerticalAlignment="Center">
+        <Label Grid.Row="0" Grid.Column="0" Margin="3" VerticalAlignment="Center" Content="{x:Static lang:GeneralLangRes.MinecraftProfile}" />
+        <Label Grid.Row="1" Grid.Column="0" Margin="3" VerticalAlignment="Center" Content="{x:Static lang:GeneralLangRes.ModpackConfigUrl}" />
+        <Label Grid.Row="2" Grid.Column="0" Margin="3" VerticalAlignment="Center" IsVisible="false" x:Name="LabelInstallKey" Content="{x:Static lang:GeneralLangRes.InstallationKey}" />
+        <Label Grid.Row="3" Grid.Column="0" Margin="3" VerticalAlignment="Center" Content="{x:Static lang:GeneralLangRes.Status}" />
+        <Label Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="3" VerticalAlignment="Center">
             <StackPanel Orientation="Horizontal" Spacing="6">
                 <Image Width="16" Height="16" x:Name="ImageStatus" />
                 <TextBlock x:Name="TextStatus" />
@@ -46,6 +44,7 @@
             x:Name="TextBoxMinecraftProfileFolder"
             Grid.Row="0"
             Grid.Column="1"
+            Margin="3"
             VerticalAlignment="Center"
             Watermark="C:\..."
             TextChanged="TextBoxMinecraftProfileFolder_TextChanged"
@@ -57,6 +56,7 @@
             Grid.Row="1"
             Grid.Column="1"
             Grid.ColumnSpan="2"
+            Margin="3"
             VerticalAlignment="Center"
             Watermark="https://..."
             TextChanged="TextBoxModpackConfig_TextChanged"
@@ -68,6 +68,7 @@
             Grid.Row="2"
             Grid.Column="1"
             Grid.ColumnSpan="2"
+            Margin="3"
             VerticalAlignment="Center"
             Watermark="XXXXX-YYYYY-ZZZZZ-AAAAA-BBBBB"
             TextChanged="TextBoxInstallKey_TextChanged"
@@ -79,6 +80,7 @@
             x:Name="ButtonSearchProfileFolder"
             Grid.Row="0"
             Grid.Column="2"
+            Margin="3"
             VerticalAlignment="Stretch"
             HorizontalAlignment="Stretch"
             Text="{x:Static lang:GeneralLangRes.Select}"
@@ -90,6 +92,7 @@
             x:Name="ButtonCheckForUpdates"
             Grid.Row="4"
             Grid.Column="1"
+            Margin="3"
             VerticalAlignment="Stretch"
             HorizontalAlignment="Stretch"
             Text="{x:Static lang:GeneralLangRes.CheckForUpdates}"
@@ -101,6 +104,7 @@
             x:Name="ButtonInstall"
             Grid.Row="4"
             Grid.Column="2"
+            Margin="3"
             VerticalAlignment="Stretch"
             HorizontalAlignment="Stretch"
             HorizontalContentAlignment="Center"