diff --git a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
index be847ae..0ebe389 100644
--- a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
+++ b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
@@ -28,7 +28,7 @@
     <Grid
       x:Name="GridMain"
       Grid.Row="1"
-      ColumnDefinitions="Auto,*,300"
+      ColumnDefinitions="Auto,*,500"
       Margin="3">
       
       <StackPanel
@@ -200,32 +200,45 @@
         Margin="3"
         DataContext="{Binding SelectedGridRow}"
         VerticalScrollBarVisibility="Auto">
-
+        
+        <ScrollViewer.Styles>
+          <Style Selector="Label">
+            <Setter Property="VerticalAlignment" Value="Center"/>
+          </Style>
+        </ScrollViewer.Styles>
+        
         <StackPanel
           Spacing="6">
 
           <!-- Update -->
-          <StackPanel
-            Spacing="6"
+          <Grid
+            ColumnDefinitions="150,*"
+            RowDefinitions="Auto,Auto,Auto,Auto"
+            RowSpacing="6"
+            ColumnSpacing="6"
             IsVisible="{Binding IsUpdate}">
 
             <!-- Header -->
-            <StackPanel Orientation="Horizontal" Spacing="6">
-              <Image
-                x:Name="ImageUpdate"
-                Width="{x:Static symbols:SymbolGlobals.DefaultImageMediumSize}"/>
+            <StackPanel
+              Grid.ColumnSpan="2"
+              Orientation="Horizontal"
+              Spacing="6">
+              
+              <Image x:Name="ImageUpdate" Width="{x:Static symbols:SymbolGlobals.DefaultImageMediumSize}"/>
               <TextBlock Text="Update" FontSize="{x:Static symbols:SymbolGlobals.DefaultImageMediumSize}"/>
             </StackPanel>
 
             <!-- Inherit from -->
-            <Label Content="Inherit from" Target="TextBoxUpdateActionInheritFrom"/>
+            <Label Grid.Row="1" Grid.Column="0" Content="Inherit from" Target="TextBoxUpdateActionInheritFrom"/>
             <TextBox
+              Grid.Row="1" Grid.Column="1"
               x:Name="TextBoxUpdateActionInheritFrom"
               Text="{Binding InheritFrom}"/>
 
             <!-- Source type -->
-            <Label Content="Source type" Target="ComboBoxUpdateActionSourceType"/>
+            <Label Grid.Row="2" Grid.Column="0" Content="Source type" Target="ComboBoxUpdateActionSourceType"/>
             <ComboBox
+              Grid.Row="2" Grid.Column="1"
               x:Name="ComboBoxUpdateActionSourceType"
               ItemsSource="{x:Static vm:MainWindowGridRow.UpdateActionTypes}"
               DisplayMemberBinding="{Binding Value}"
@@ -233,18 +246,25 @@
               SelectedValue="{Binding UpdateType}"/>
 
             <!-- Is Directory -->
-            <CheckBox
+            <CheckBox Grid.Row="3" Grid.Column="1"
               x:Name="CheckBoxUpdateActionIsDir"
               Content="Is Directory"
               IsChecked="{Binding IsDirectory}"/>
-          </StackPanel>
+          </Grid>
 
           <!-- General -->
-          <StackPanel
-            Spacing="6">
+          <Grid
+            ColumnDefinitions="150,*"
+            RowDefinitions="Auto,Auto,Auto,Auto,Auto"
+            RowSpacing="6"
+            ColumnSpacing="6">
 
             <!-- Header -->
-            <StackPanel Orientation="Horizontal" Spacing="6">
+            <StackPanel
+              Grid.ColumnSpan="2"
+              Orientation="Horizontal"
+              Spacing="6">
+              
               <Image
                 x:Name="ImageGeneral"
                 Width="{x:Static symbols:SymbolGlobals.DefaultImageMediumSize}"/>
@@ -252,20 +272,23 @@
             </StackPanel>
 
             <!-- Id -->
-            <Label Content="Id" Target="TextBoxInstallActionId"/>
+            <Label Grid.Row="1" Grid.Column="0" Content="Id" Target="TextBoxInstallActionId"/>
             <TextBox
+              Grid.Row="1" Grid.Column="1"
               x:Name="TextBoxInstallActionId"
               Text="{Binding Id}"/>
 
             <!-- Name -->
-            <Label Content="Name" Target="TextBoxInstallActionName"/>
+            <Label Grid.Row="2" Grid.Column="0" Content="Name" Target="TextBoxInstallActionName"/>
             <TextBox
+              Grid.Row="2" Grid.Column="1"
               x:Name="TextBoxInstallActionName"
               Text="{Binding Name}"/>
 
             <!-- Side -->
-            <Label Content="Side" Target="ComboBoxInstallActionSide"/>
+            <Label Grid.Row="3" Grid.Column="0" Content="Side" Target="ComboBoxInstallActionSide"/>
             <ComboBox
+              Grid.Row="3" Grid.Column="1"
               x:Name="ComboBoxInstallActionSide"
               ItemsSource="{x:Static vm:MainWindowGridRow.Sides}"
               DisplayMemberBinding="{Binding Value}"
@@ -274,17 +297,25 @@
 
             <!-- Is Extra -->
             <CheckBox
+              Grid.Row="4" Grid.Column="1"
               x:Name="CheckBoxInstallActionIsExtra"
               Content="Is Extra"
               IsChecked="{Binding IsExtra}"/>
-          </StackPanel>
+          </Grid>
 
           <!-- Destination -->
-          <StackPanel
-            Spacing="6">
+          <Grid
+            ColumnDefinitions="150,*"
+            RowDefinitions="Auto,Auto"
+            RowSpacing="6"
+            ColumnSpacing="6">
 
             <!-- Header -->
-            <StackPanel Orientation="Horizontal" Spacing="6">
+            <StackPanel
+              Grid.ColumnSpan="2"
+              Orientation="Horizontal"
+              Spacing="6">
+              
               <Image
                 x:Name="ImageDestination"
                 Width="{x:Static symbols:SymbolGlobals.DefaultImageMediumSize}"/>
@@ -292,18 +323,26 @@
             </StackPanel>
 
             <!-- Destination path -->
-            <Label Content="Destination path" Target="TextBoxInstallDestPath"/>
+            <Label Grid.Row="1" Grid.Column="0" Content="Destination path" Target="TextBoxInstallDestPath"/>
             <TextBox
+              Grid.Row="1" Grid.Column="1"
               x:Name="TextBoxInstallDestPath"
               Text="{Binding DestPath}"/>
-          </StackPanel>
+          </Grid>
 
           <!-- Source -->
-          <StackPanel
-            Spacing="6">
+          <Grid
+            ColumnDefinitions="150,*"
+            RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto"
+            RowSpacing="6"
+            ColumnSpacing="6">
 
             <!-- Header -->
-            <StackPanel Orientation="Horizontal" Spacing="6">
+            <StackPanel
+              Grid.ColumnSpan="2"
+              Orientation="Horizontal"
+              Spacing="6">
+              
               <Image
                 x:Name="ImageSource"
                 Width="{x:Static symbols:SymbolGlobals.DefaultImageMediumSize}"/>
@@ -311,8 +350,9 @@
             </StackPanel>
 
             <!-- Source types -->
-            <Label Content="Source type" Target="CheckBoxInstallActionSourceType"/>
+            <Label Grid.Row="1" Grid.Column="0" Content="Source type" Target="CheckBoxInstallActionSourceType"/>
             <ComboBox
+              Grid.Row="1" Grid.Column="1"
               x:Name="CheckBoxInstallActionSourceType"
               ItemsSource="{x:Static vm:MainWindowGridRow.SourceTypes}"
               DisplayMemberBinding="{Binding Value}"
@@ -320,53 +360,67 @@
               SelectedValue="{Binding SourceType}"/>
 
             <!-- Is Zip -->
-            <CheckBox
+            <CheckBox Grid.Row="2" Grid.Column="1"
               x:Name="CheckBoxInstallActionIsZip"
               Content="Is Zip archive"
               IsChecked="{Binding IsZip}"/>
 
             <!-- Source owner -->
-            <Label Content="Source owner" Target="TextBoxInstallActionSourceOwner"/>
+            <Label Grid.Row="3" Grid.Column="0" Content="Source owner" Target="TextBoxInstallActionSourceOwner"/>
             <TextBox
+              Grid.Row="3" Grid.Column="1"
               x:Name="TextBoxInstallActionSourceOwner"
               Text="{Binding SourceOwner}"/>
 
             <!-- Source name -->
-            <Label Content="Source name" Target="TextBoxInstallActionSourceName"/>
+            <Label Grid.Row="4" Grid.Column="0" Content="Source name" Target="TextBoxInstallActionSourceName"/>
             <TextBox
+              Grid.Row="4" Grid.Column="1"
               x:Name="TextBoxInstallActionSourceName"
               Text="{Binding SourceName}"/>
 
             <!-- Source RegEx -->
-            <Label Content="Source RegEx" Target="TextBoxInstallActionSourceRegEx"/>
+            <Label Grid.Row="5" Grid.Column="0" Content="Source RegEx" Target="TextBoxInstallActionSourceRegEx"/>
             <TextBox
+              Grid.Row="5" Grid.Column="1"
               x:Name="TextBoxInstallActionSourceRegEx"
               Text="{Binding SourceRegex}"/>
 
             <!-- Source url -->
-            <Label Content="Source URL" Target="TextBoxInstallActionSourceUrl"/>
+            <Label Grid.Row="6" Grid.Column="0" Content="Source URL" Target="TextBoxInstallActionSourceUrl"/>
             <TextBox
+              Grid.Row="6" Grid.Column="1"
               x:Name="TextBoxInstallActionSourceUrl" Text="{Binding SourceUrl}"/>
 
             <!-- Zip archive path -->
-            <Label Content="ZIP archive path" Target="TextBoxInstallActionZipArchivePath"/>
+            <Label Grid.Row="7" Grid.Column="0" Content="ZIP archive path" Target="TextBoxInstallActionZipArchivePath"/>
             <TextBox
+              Grid.Row="7" Grid.Column="1"
               x:Name="TextBoxInstallActionZipArchivePath"
               Text="{Binding SourceUrl}"/>
 
             <!-- Source path -->
-            <Label Content="Source path" Target="TextBoxInstallActionSourcePath"/>
+            <Label Grid.Row="8" Grid.Column="0" Content="Source path" Target="TextBoxInstallActionSourcePath"/>
             <TextBox
+              Grid.Row="8" Grid.Column="1"
               x:Name="TextBoxInstallActionSourcePath"
               Text="{Binding SrcPath}"/>
-          </StackPanel>
+          </Grid>
 
-          <StackPanel
-            Margin="3"
-            Spacing="6">
+          <!-- Metadata -->
+          <Grid
+            ColumnDefinitions="150,*"
+            RowDefinitions="Auto,Auto"
+            RowSpacing="6"
+            ColumnSpacing="6"
+            VerticalAlignment="Center">
 
             <!-- Header -->
-            <StackPanel Orientation="Horizontal" Spacing="6">
+            <StackPanel
+              Grid.ColumnSpan="2"
+              Orientation="Horizontal"
+              Spacing="6">
+              
               <Image
                 x:Name="ImageMetadata"
                 Width="{x:Static symbols:SymbolGlobals.DefaultImageMediumSize}"/>
@@ -374,11 +428,12 @@
             </StackPanel>
             
             <!-- Website -->
-            <Label Content="Website" Target="TextBoxInstallActionWebsite"/>
+            <Label Grid.Row="1" Grid.Column="0" Content="Website" Target="TextBoxInstallActionWebsite"/>
             <TextBox
+              Grid.Row="1" Grid.Column="1"
               x:Name="TextBoxInstallActionWebsite"
               Text="{Binding Website}"/>
-          </StackPanel>
+          </Grid>
         </StackPanel>
       </ScrollViewer>
     </Grid>