diff --git a/MPF/UserControls/LogOutput.xaml b/MPF/UserControls/LogOutput.xaml
index 1a7a2263..4626bfa1 100644
--- a/MPF/UserControls/LogOutput.xaml
+++ b/MPF/UserControls/LogOutput.xaml
@@ -7,47 +7,35 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="40" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="40" />
-        </Grid.RowDefinitions>
-        <Grid Grid.Row="0" Height="22" Margin="10 10 10 0">
-            <ProgressBar x:Name="progressBar" />
-            <TextBlock x:Name="progressLabel" Grid.Row="0" Height="22" HorizontalAlignment="Center" VerticalAlignment="Center" Padding="0 2 0 0" />
-        </Grid>
-        <Border Grid.Row="1" Background="White" BorderBrush="Gainsboro" BorderThickness="1" Margin="10">
-            <ScrollViewer Name="outputViewer" SizeChanged="ScrollViewer_SizeChanged">
-                <RichTextBox Name="output" FontFamily="Consolas" Background="#202020" IsReadOnly="true" TextChanged="OnTextChanged" />
-            </ScrollViewer>
-        </Border>
+        <StackPanel Orientation="Vertical">
+            <Grid Height="22" Margin="10 10 10 0">
+                <ProgressBar x:Name="progressBar" />
+                <TextBlock x:Name="progressLabel" Grid.Row="0" Height="22" HorizontalAlignment="Center" VerticalAlignment="Center" Padding="0 2 0 0" />
+            </Grid>
+            
+            <Border Height="200"  Background="White" BorderBrush="Gainsboro" BorderThickness="1" Margin="10">
+                <ScrollViewer Name="outputViewer" SizeChanged="ScrollViewer_SizeChanged">
+                    <RichTextBox Name="output" FontFamily="Consolas" Background="#202020" IsReadOnly="true" TextChanged="OnTextChanged" />
+                </ScrollViewer>
+            </Border>
 
-        <Grid Grid.Row="2">
-            <Grid.RowDefinitions>
-                <RowDefinition />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition />
-                <ColumnDefinition Width="3*"/>
-                <ColumnDefinition />
-                <ColumnDefinition />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
+            <Grid Grid.Row="2">
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="3*"/>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
 
-            <CheckBox Content="Verbose" Margin="10 0 0 10" Grid.Column="0" VerticalAlignment="Center" 
-                      ToolTip="Enable verbose logging of tasks"
-                      DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}" 
-                      IsChecked="{Binding Path=VerboseLogging}"    
-            />
-            <CheckBox Content="Open at startup" Margin="10 0 0 10" Grid.Column="1" Grid.ColumnSpan="2" VerticalAlignment="Center" 
-                      ToolTip="Open this window at startup"
-                      DataContext="{Binding Source={x:Static local:ViewModels.OptionsViewModel}}" 
-                      IsChecked="{Binding Path=OpenLogWindowAtStartup}"    
-            />
-            <Button Margin="0 0 10 10" Grid.Column="3" Height="22" Width="60" Content="Clear" HorizontalAlignment="Right" Click="OnClearButton" />
-            <Button Margin="0 0 10 10" Grid.Column="5" Height="22" Width="60" Content="Save" HorizontalAlignment="Right" Click="OnSaveButton" />
-            <Button Visibility="Hidden" Name="AbortButton" Margin="0 0 10 10" Grid.Column="2" Height="22" Width="80" Content="Abort" HorizontalAlignment="Right" Click="OnAbortButton" />
-        </Grid>
+                <Button Margin="0 0 10 10" Grid.Column="3" Height="22" Width="60" Content="Clear" HorizontalAlignment="Right" Click="OnClearButton" />
+                <Button Margin="0 0 10 10" Grid.Column="4" Height="22" Width="60" Content="Save" HorizontalAlignment="Right" Click="OnSaveButton" />
+                <Button Visibility="Hidden" Name="AbortButton" Margin="0 0 10 10" Grid.Column="2" Height="22" Width="80" Content="Abort" HorizontalAlignment="Right" Click="OnAbortButton" />
+            </Grid>
+        </StackPanel>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/MPF/Windows/OptionsWindow.xaml b/MPF/Windows/OptionsWindow.xaml
index 600c767f..7f0d9f1b 100644
--- a/MPF/Windows/OptionsWindow.xaml
+++ b/MPF/Windows/OptionsWindow.xaml
@@ -156,23 +156,35 @@
                           ToolTip="Enable adding placeholder text in the submissioninfo output for required and optional fields" Margin="0,4"
                           />
 
-                    <CheckBox Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Content="Show Disc Info"
+                    <CheckBox Grid.Row="1" Grid.Column="3" 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"
                           />
 
-                    <CheckBox Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Content="No Fixed Drives"
+                    <CheckBox Grid.Row="2" Grid.Column="0" 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="2" Grid.Column="2" VerticalAlignment="Center" Content="Reset After Dump"
+                    <CheckBox Grid.Row="2" Grid.Column="1" 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"
                           />
+
+                    <CheckBox Grid.Row="2" Grid.Column="2" 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="2" Grid.Column="3" 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>
 
             </GroupBox>