diff --git a/RomRepoMgr/Views/About.xaml b/RomRepoMgr/Views/About.xaml
index 93846f6..5c34e5f 100644
--- a/RomRepoMgr/Views/About.xaml
+++ b/RomRepoMgr/Views/About.xaml
@@ -43,14 +43,9 @@
         <vm:AboutViewModel />
     </Design.DataContext>
     <Border Padding="15">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" /> <RowDefinition Height="*" /> <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid Grid.Row="0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+        <Grid RowDefinitions="Auto,*,Auto">
+            <Grid Grid.Row="0"
+                  ColumnDefinitions="Auto,*">
                 <Border Grid.Column="0"
                         BorderThickness="5">
                     <Image Source="/Assets/avalonia-logo.ico"
@@ -59,10 +54,8 @@
                 </Border>
                 <Grid Grid.Column="1"
                       HorizontalAlignment="Left"
-                      VerticalAlignment="Center">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
+                      VerticalAlignment="Center"
+                      RowDefinitions="Auto,Auto">
                     <TextBlock Grid.Row="0"
                                Text="{Binding SoftwareName}"
                                HorizontalAlignment="Left"
diff --git a/RomRepoMgr/Views/EditDat.xaml b/RomRepoMgr/Views/EditDat.xaml
index 54ec86a..c8e1745 100644
--- a/RomRepoMgr/Views/EditDat.xaml
+++ b/RomRepoMgr/Views/EditDat.xaml
@@ -44,18 +44,9 @@
         <vm:EditDatViewModel />
     </Design.DataContext>
     <Border Padding="15">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid Grid.Row="0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+        <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+            <Grid Grid.Row="0"
+                  ColumnDefinitions="140,*">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -68,10 +59,8 @@
                          Text="{Binding Name}"
                          Padding="5" />
             </Grid>
-            <Grid Grid.Row="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="1"
+                  ColumnDefinitions="140,*">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -84,10 +73,8 @@
                          Text="{Binding Version}"
                          Padding="5" />
             </Grid>
-            <Grid Grid.Row="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="2"
+                  ColumnDefinitions="140,*">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -100,10 +87,8 @@
                          Text="{Binding Author}"
                          Padding="5" />
             </Grid>
-            <Grid Grid.Row="3">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="3"
+                  ColumnDefinitions="140,*">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -116,10 +101,8 @@
                          Text="{Binding Category}"
                          Padding="5" />
             </Grid>
-            <Grid Grid.Row="4">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="4"
+                  ColumnDefinitions="140,*">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -132,10 +115,8 @@
                          Text="{Binding Comment}"
                          Padding="5" />
             </Grid>
-            <Grid Grid.Row="5">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="5"
+                  ColumnDefinitions="140,*">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -148,10 +129,8 @@
                          Text="{Binding Date}"
                          Padding="5" />
             </Grid>
-            <Grid Grid.Row="6">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="6"
+                  ColumnDefinitions="140,*">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -164,10 +143,8 @@
                          Text="{Binding Description}"
                          Padding="5" />
             </Grid>
-            <Grid Grid.Row="7">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="7"
+                  ColumnDefinitions="140,*">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -180,10 +157,8 @@
                          Text="{Binding Homepage}"
                          Padding="5" />
             </Grid>
-            <Grid Grid.Row="8">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="8"
+                  ColumnDefinitions="140,*">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -196,10 +171,8 @@
                            Text="{Binding TotalMachines}"
                            Padding="5" />
             </Grid>
-            <Grid Grid.Row="9">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="9"
+                  ColumnDefinitions="140,*">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -212,10 +185,8 @@
                            Text="{Binding CompleteMachines}"
                            Padding="5" />
             </Grid>
-            <Grid Grid.Row="10">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="10"
+                  ColumnDefinitions="140,*">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -228,10 +199,8 @@
                            Text="{Binding IncompleteMachines}"
                            Padding="5" />
             </Grid>
-            <Grid Grid.Row="11">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="11"
+                  ColumnDefinitions="140,*">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -244,10 +213,8 @@
                            Text="{Binding TotalRoms}"
                            Padding="5" />
             </Grid>
-            <Grid Grid.Row="12">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="12"
+                  ColumnDefinitions="140,*">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -260,10 +227,8 @@
                            Text="{Binding HaveRoms}"
                            Padding="5" />
             </Grid>
-            <Grid Grid.Row="13">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="140" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="13"
+                  ColumnDefinitions="140,*">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
diff --git a/RomRepoMgr/Views/ExportDat.xaml b/RomRepoMgr/Views/ExportDat.xaml
index 7622dc6..f0f7a72 100644
--- a/RomRepoMgr/Views/ExportDat.xaml
+++ b/RomRepoMgr/Views/ExportDat.xaml
@@ -44,11 +44,7 @@
         <vm:ExportDatViewModel />
     </Design.DataContext>
     <Border Padding="15">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" /> <RowDefinition Height="auto" /> <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
+        <Grid RowDefinitions="Auto,auto,Auto,Auto">
             <TextBlock Grid.Row="0"
                        Text="{Binding StatusMessage}"
                        HorizontalAlignment="Center" />
diff --git a/RomRepoMgr/Views/ExportRoms.xaml b/RomRepoMgr/Views/ExportRoms.xaml
index bb42a4b..4eae7f7 100644
--- a/RomRepoMgr/Views/ExportRoms.xaml
+++ b/RomRepoMgr/Views/ExportRoms.xaml
@@ -44,12 +44,7 @@
         <vm:ExportRomsViewModel />
     </Design.DataContext>
     <Border Padding="15">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" /> <RowDefinition Height="*" /> <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
+        <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,*,Auto">
             <StackPanel Grid.Row="0"
                         Orientation="Horizontal"
                         HorizontalAlignment="Stretch">
diff --git a/RomRepoMgr/Views/ImportDat.xaml b/RomRepoMgr/Views/ImportDat.xaml
index 6686b69..d534a82 100644
--- a/RomRepoMgr/Views/ImportDat.xaml
+++ b/RomRepoMgr/Views/ImportDat.xaml
@@ -44,11 +44,7 @@
         <vm:ImportDatViewModel />
     </Design.DataContext>
     <Border Padding="15">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" /> <RowDefinition Height="auto" /> <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
+        <Grid RowDefinitions="Auto,auto,Auto,Auto">
             <TextBlock Grid.Row="0"
                        Text="{Binding StatusMessage}"
                        HorizontalAlignment="Center" />
diff --git a/RomRepoMgr/Views/ImportDatFolder.xaml b/RomRepoMgr/Views/ImportDatFolder.xaml
index d8157b7..235309c 100644
--- a/RomRepoMgr/Views/ImportDatFolder.xaml
+++ b/RomRepoMgr/Views/ImportDatFolder.xaml
@@ -44,12 +44,7 @@
         <vm:ImportDatFolderViewModel />
     </Design.DataContext>
     <Border Padding="15">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" /> <RowDefinition Height="*" /> <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
+        <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,*,Auto">
             <StackPanel Grid.Row="0"
                         Orientation="Horizontal"
                         HorizontalAlignment="Stretch">
@@ -57,10 +52,8 @@
                            FontWeight="Bold" />
                 <TextBlock Text="{Binding FolderPath}" />
             </StackPanel>
-            <Grid Grid.Row="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" /> <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="1"
+                  ColumnDefinitions="Auto,*">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
diff --git a/RomRepoMgr/Views/ImportRomFolder.xaml b/RomRepoMgr/Views/ImportRomFolder.xaml
index 214f9e2..bfeb7e1 100644
--- a/RomRepoMgr/Views/ImportRomFolder.xaml
+++ b/RomRepoMgr/Views/ImportRomFolder.xaml
@@ -44,12 +44,7 @@
         <vm:ImportRomFolderViewModel />
     </Design.DataContext>
     <Border Padding="15">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" /> <RowDefinition Height="*" /> <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
+        <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,*,Auto">
             <StackPanel Grid.Row="0"
                         Orientation="Horizontal"
                         HorizontalAlignment="Stretch">
diff --git a/RomRepoMgr/Views/RemoveDat.xaml b/RomRepoMgr/Views/RemoveDat.xaml
index cf580f8..1a25d79 100644
--- a/RomRepoMgr/Views/RemoveDat.xaml
+++ b/RomRepoMgr/Views/RemoveDat.xaml
@@ -44,10 +44,7 @@
         <vm:RemoveDatViewModel />
     </Design.DataContext>
     <Border Padding="15">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" /> <RowDefinition Height="auto" />
-            </Grid.RowDefinitions>
+        <Grid RowDefinitions="Auto,auto">
             <TextBlock Grid.Row="0"
                        Text="{Binding StatusMessage}"
                        HorizontalAlignment="Center" />
diff --git a/RomRepoMgr/Views/SettingsDialog.xaml b/RomRepoMgr/Views/SettingsDialog.xaml
index 0aa0537..25bb993 100644
--- a/RomRepoMgr/Views/SettingsDialog.xaml
+++ b/RomRepoMgr/Views/SettingsDialog.xaml
@@ -43,15 +43,9 @@
         <vm:SettingsViewModel />
     </Design.DataContext>
     <Border Padding="15">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid Grid.Row="0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" /> <ColumnDefinition Width="250" /> <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
+        <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
+            <Grid Grid.Row="0"
+                  ColumnDefinitions="*,250,Auto">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -72,10 +66,8 @@
                     <TextBlock Text="{x:Static resources:Localization.ChooseLabel}" />
                 </Button>
             </Grid>
-            <Grid Grid.Row="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" /> <ColumnDefinition Width="250" /> <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="1"
+                  ColumnDefinitions="*,250,Auto">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -96,10 +88,8 @@
                     <TextBlock Text="{x:Static resources:Localization.ChooseLabel}" />
                 </Button>
             </Grid>
-            <Grid Grid.Row="2">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" /> <ColumnDefinition Width="250" /> <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="2"
+                  ColumnDefinitions="*,250,Auto">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
@@ -120,10 +110,8 @@
                     <TextBlock Text="{x:Static resources:Localization.ChooseLabel}" />
                 </Button>
             </Grid>
-            <Grid Grid.Row="3">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" /> <ColumnDefinition Width="250" /> <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Row="3"
+                  ColumnDefinitions="*,250,Auto">
                 <TextBlock Grid.Column="0"
                            HorizontalAlignment="Right"
                            VerticalAlignment="Center"
diff --git a/RomRepoMgr/Views/UpdateStats.xaml b/RomRepoMgr/Views/UpdateStats.xaml
index 988702b..66ef483 100644
--- a/RomRepoMgr/Views/UpdateStats.xaml
+++ b/RomRepoMgr/Views/UpdateStats.xaml
@@ -42,11 +42,7 @@
         <vm:UpdateStatsViewModel />
     </Design.DataContext>
     <Border Padding="15">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" /> <RowDefinition Height="Auto" /> <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
+        <Grid RowDefinitions="Auto,Auto,*,Auto">
             <TextBlock Grid.Row="0"
                        Text="{Binding StatusMessage}"
                        HorizontalAlignment="Center" />