diff --git a/MPF/UserControls/LogOutput.xaml b/MPF/UserControls/LogOutput.xaml
index 63caa331..6c6768ba 100644
--- a/MPF/UserControls/LogOutput.xaml
+++ b/MPF/UserControls/LogOutput.xaml
@@ -20,17 +20,12 @@
             </Border>
 
             <GroupBox Grid.Row="2" Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Grid Margin="5,5,5,5" Height="28">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <Button Name="ClearButton" Grid.Row="0" Grid.Column="1" Height="25" Width="80" Content="Clear" Click="OnClearButton" />
-                    <Button Name="SaveButton" Grid.Row="0" Grid.Column="2" Height="25" Width="80" Content="Save" Click="OnSaveButton" />
-                </Grid>
+                <UniformGrid Columns="4" Margin="5,5,5,5" Height="28">
+                    <Label/>
+                    <Button Name="ClearButton" Height="25" Width="80" Content="Clear" Click="OnClearButton" />
+                    <Button Name="SaveButton" Height="25" Width="80" Content="Save" Click="OnSaveButton" />
+                    <Label/>
+                </UniformGrid>
             </GroupBox>
         </StackPanel>
     </Grid>
diff --git a/MPF/Windows/DiscInformationWindow.xaml b/MPF/Windows/DiscInformationWindow.xaml
index 21ad436c..a0e5ddbb 100644
--- a/MPF/Windows/DiscInformationWindow.xaml
+++ b/MPF/Windows/DiscInformationWindow.xaml
@@ -123,17 +123,10 @@
 
             <!-- Accept / Cancel -->
             <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Grid Margin="5,5,5,5" Height="28">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-
+                <UniformGrid Columns="4" Margin="5,5,5,5" Height="28">
                     <Button Name="AcceptButton" Grid.Row="0" Grid.Column="1" Height="25" Width="80" Content="Accept" Click="OnAcceptClick" />
                     <Button Name="CancelButton" Grid.Row="0" Grid.Column="2" Height="25" Width="80" Content="Cancel" Click="OnCancelClick" />
-                </Grid>
+                </UniformGrid>
             </GroupBox>
         </StackPanel>
     </Grid>
diff --git a/MPF/Windows/MainWindow.xaml b/MPF/Windows/MainWindow.xaml
index c650ac06..c79b4c0a 100644
--- a/MPF/Windows/MainWindow.xaml
+++ b/MPF/Windows/MainWindow.xaml
@@ -86,35 +86,18 @@
             </GroupBox>
 
             <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" Header="Controls">
-                <Grid Margin="5,5,5,5">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition/>
-                    </Grid.RowDefinitions>
-
-                    <Button x:Name="StartStopButton" Grid.Row="0" Grid.Column="0" Height="22" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Start Dumping" Click="StartStopButtonClick" IsEnabled="False" />
-                    <Button x:Name="MediaScanButton" Grid.Row="0" Grid.Column="1" Height="22" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Scan for disks" Click="MediaScanButtonClick" />
-                    <Button x:Name="CopyProtectScanButton" Grid.Row="0" Grid.Column="2" Height="22" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Scan for protection" Click="CopyProtectScanButtonClick" />
-                    <CheckBox x:Name="EjectWhenDoneCheckBox" Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Eject When Done" IsChecked="False" />
-                </Grid>
+                <UniformGrid Columns="4" Margin="5,5,5,5">
+                    <Button x:Name="StartStopButton" Height="22" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Start Dumping" Click="StartStopButtonClick" IsEnabled="False" />
+                    <Button x:Name="MediaScanButton" Height="22" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Scan for disks" Click="MediaScanButtonClick" />
+                    <Button x:Name="CopyProtectScanButton" Height="22" Width="125" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Scan for protection" Click="CopyProtectScanButtonClick" />
+                    <CheckBox x:Name="EjectWhenDoneCheckBox" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Eject When Done" IsChecked="False" />
+                </UniformGrid>
             </GroupBox>
 
             <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" Header="Status">
-                <Grid Margin="5,5,5,5" Grid.ColumnSpan="2">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition/>
-                    </Grid.RowDefinitions>
-
-                    <Label x:Name="StatusLabel" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Waiting for media..." />
-                </Grid>
+                <UniformGrid Margin="5,5,5,5" Grid.ColumnSpan="2">
+                    <Label x:Name="StatusLabel" VerticalAlignment="Center" HorizontalAlignment="Center" Content="Waiting for media..." />
+                </UniformGrid>
             </GroupBox>
 
             <Expander Margin="5,5 5 5" MaxHeight="300" HorizontalAlignment="Stretch" Header="Log Output" x:Name="LogPanel">
diff --git a/MPF/Windows/OptionsWindow.xaml b/MPF/Windows/OptionsWindow.xaml
index 73aaa0e8..70d08b90 100644
--- a/MPF/Windows/OptionsWindow.xaml
+++ b/MPF/Windows/OptionsWindow.xaml
@@ -65,62 +65,50 @@
                 <TabItem Header="Dumping">
                     <StackPanel>
                         <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Dumping">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="1*" />
-                                    <ColumnDefinition Width="1*" />
-                                </Grid.ColumnDefinitions>
-
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-
-                                <CheckBox Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Content="Skip Type Detect"
+                            <UniformGrid Columns="2" Rows="4">
+                                <CheckBox VerticalAlignment="Center" Content="Skip Type Detect"
                                      DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
                                      IsChecked="{Binding Path=SkipMediaTypeDetection}"
                                      ToolTip="Disable trying to guess media type inserted (may improve performance at startup)" Margin="0,4"
                                      />
 
-                                <CheckBox Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Content="No Fixed Drives"
+                                <CheckBox VerticalAlignment="Center" Content="No Fixed Drives"
                                      DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
                                      IsChecked="{Binding Path=IgnoreFixedDrives}"
                                      ToolTip="Ignore hard drives and other fixed drives" Margin="0,4"
                                      />
 
-                                <CheckBox Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Content="Quiet Mode"
+                                <CheckBox VerticalAlignment="Center" Content="Quiet Mode"
                                      DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
                                      IsChecked="{Binding Path=QuietMode}"
                                      ToolTip="Disable DiscImageCreator sounds" Margin="0,4"
                                      />
 
-                                <CheckBox Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Content="Paranoid Mode"
+                                <CheckBox VerticalAlignment="Center" Content="Paranoid Mode"
                                      DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
                                      IsChecked="{Binding Path=ParanoidMode}"
                                      ToolTip="Enable pedantic and super-safe flags" Margin="0,4"
                                      />
 
-                                <CheckBox Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Content="Protection Scan"
+                                <CheckBox VerticalAlignment="Center" Content="Protection Scan"
                                     DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
                                     IsChecked="{Binding Path=ScanForProtection}"
                                     ToolTip="Enable automatic checking for copy protection on dumped media" Margin="0,4,0,0"
                                     />
 
-                                <CheckBox Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Content="Reset After Dump"
+                                <CheckBox VerticalAlignment="Center" Content="Reset After Dump"
                                      DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
                                      IsChecked="{Binding Path=ResetDriveAfterDump}"
                                      ToolTip="Reset disc drives after dumping; useful for some older machines" Margin="0,4"
                                      />
 
-                                <Label Grid.Row="3" Grid.Column="0" Content="Reread Tries:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
-                                <TextBox Grid.Row="3" Grid.Column="1" VerticalAlignment="Center"
+                                <Label Content="Reread Tries:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
+                                <TextBox VerticalAlignment="Center"
                                     DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
                                     Text="{Binding Path=RereadAmountForC2}"
                                     ToolTip="Specifies how many rereads are attempted on C2 error"
                                     />
-                            </Grid>
+                            </UniformGrid>
                         </GroupBox>
                         
                         <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Default Speeds" Grid.ColumnSpan="2">
@@ -137,7 +125,6 @@
                                     <RowDefinition />
                                 </Grid.RowDefinitions>
                                 
-
                                 <Label Grid.Row="0" Grid.Column="0" Content="CD-ROM" />
                                 <Slider x:Name="DumpSpeedCDSlider" Grid.Row="0" Grid.Column="1" Minimum="1" Maximum="72" IsSnapToTickEnabled="True" TickPlacement="BottomRight"
                                     Ticks="{Binding Source={x:Static local:Constants.SpeedsForCDAsCollection}}"
@@ -170,53 +157,35 @@
                 <TabItem Header="Misc. Options">
                     <StackPanel>
                         <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Disc Information">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="1*" />
-                                    <ColumnDefinition Width="1*" />
-                                </Grid.ColumnDefinitions>
-
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-
-                                <CheckBox Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Content="Add Placeholders"
+                            <UniformGrid Columns="2">
+                                <CheckBox VerticalAlignment="Center" Content="Add Placeholders"
                                      DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
                                      IsChecked="{Binding Path=AddPlaceholders}"
                                      ToolTip="Enable adding placeholder text in the submissioninfo output for required and optional fields" Margin="0,4"
                                      />
 
-                                <CheckBox Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Content="Show Disc Info"
+                                <CheckBox VerticalAlignment="Center" Content="Show Disc Info"
                                      DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
                                      IsChecked="{Binding Path=PromptForDiscInformation}"
                                      ToolTip="Enable showing the disc information output after dumping" Margin="0,4"
                                       />
-                            </Grid>
+                            </UniformGrid>
                         </GroupBox>
 
                         <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Logging">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="1*" />
-                                    <ColumnDefinition Width="1*" />
-                                </Grid.ColumnDefinitions>
-
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-
-                                <CheckBox Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Content="Verbose Logging"
+                            <UniformGrid Columns="2">
+                                <CheckBox VerticalAlignment="Center" Content="Verbose Logging"
                                      DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
                                      IsChecked="{Binding Path=VerboseLogging}"
                                      ToolTip="Display all logging statements" Margin="0,4"
                                      />
 
-                                <CheckBox Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Content="Auto-Open Log"
+                                <CheckBox VerticalAlignment="Center" Content="Auto-Open Log"
                                      DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
                                      IsChecked="{Binding Path=OpenLogWindowAtStartup}"
                                      ToolTip="Open the log panel when the program launches" Margin="0,4"
                                      />
-                            </Grid>
+                            </UniformGrid>
                         </GroupBox>
                     </StackPanel>
                 </TabItem>
@@ -224,29 +193,17 @@
                 <TabItem Header="Login Info">
                     <StackPanel>
                         <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Redump Credentials">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="1*" />
-                                    <ColumnDefinition Width="1*" />
-                                    <ColumnDefinition Width="1*" />
-                                    <ColumnDefinition Width="1*" />
-                                    <ColumnDefinition Width="1.2*" />
-                                </Grid.ColumnDefinitions>
-
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-
-                                <Label Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Username" />
-                                <TextBox x:Name="RedumpUsernameTextBox" Grid.Row="1" Grid.Column="1" Height="22" HorizontalAlignment="Stretch"
+                            <UniformGrid Columns="5" Rows="1">
+                                <Label VerticalAlignment="Center" HorizontalAlignment="Right" Content="Username" />
+                                <TextBox x:Name="RedumpUsernameTextBox" Height="22" HorizontalAlignment="Stretch"
                                     DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}"
                                     Text="{Binding Path=Username}" />
 
-                                <Label Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Password" />
-                                <PasswordBox x:Name="RedumpPasswordBox" Grid.Row="1" Grid.Column="3" Height="22" HorizontalAlignment="Stretch" PasswordChar="*" />
+                                <Label VerticalAlignment="Center" HorizontalAlignment="Right" Content="Password" />
+                                <PasswordBox x:Name="RedumpPasswordBox" Height="22" HorizontalAlignment="Stretch" PasswordChar="*" />
 
-                                <Button x:Name="RedumpLoginTestButton" Grid.Row="1" Grid.Column="5" Height="22" Width="80" Content="Test Login" Click="OnRedumpTestClick" />
-                            </Grid>
+                                <Button x:Name="RedumpLoginTestButton" Height="22" Width="80" Content="Test Login" Click="OnRedumpTestClick" />
+                            </UniformGrid>
                         </GroupBox>
                     </StackPanel>
                 </TabItem>
@@ -254,17 +211,12 @@
 
             <!-- Accept / Cancel -->
             <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                <Grid Margin="5,5,5,5" Height="28">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <Button Name="AcceptButton" Grid.Row="0" Grid.Column="1" Height="25" Width="80" Content="Accept" Click="OnAcceptClick" />
-                    <Button Name="CancelButton" Grid.Row="0" Grid.Column="2" Height="25" Width="80" Content="Cancel" Click="OnCancelClick" />
-                </Grid>
+                <UniformGrid Columns="4" Margin="5,5,5,5" Height="28">
+                    <Label/>
+                    <Button Name="AcceptButton" Height="25" Width="80" Content="Accept" Click="OnAcceptClick" />
+                    <Button Name="CancelButton" Height="25" Width="80" Content="Cancel" Click="OnCancelClick" />
+                    <Label/>
+                </UniformGrid>
             </GroupBox>
         </StackPanel>
     </Grid>