From: sr55 <sr55.hb@outlook.com>
Date: Thu, 7 Jun 2012 23:58:09 +0000 (+0000)
Subject: WinGui: Changes to the Main Window and Advanced Tab to make allow it to better suppor... 
X-Git-Tag: 0.9.9~584
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=368023e13a633e9dc94f27696c84f3ce3ca24ed3;p=handbrake

WinGui: Changes to the Main Window and Advanced Tab to make allow it to better support window resizing. Thanks to beta-tester

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4720 b64f7644-9d1e-0410-96f1-a4d463321fa5
---

diff --git a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
index 92923f6c8..0e47ddf10 100644
--- a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
@@ -1,10 +1,14 @@
 <UserControl x:Class="HandBrakeWPF.Views.AdvancedView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
-             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties" xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers"
-             mc:Ignorable="d" x:Name="advancedView">
+             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
+             x:Name="advancedView"
+             mc:Ignorable="d"
+             >
     <UserControl.Resources>
         <Converters:AdvancedVisibilityConverter x:Key="VisibilityConverter" />
         <Converters:BooleanToVisibilityConverter x:Key="BooleanVisibilityConverter" />
@@ -21,298 +25,566 @@
             <Setter Property="TextWrapping" Value="Wrap" />
         </Style>
     </UserControl.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <!-- X264 Query  -->
+        <TextBox Grid.Row="2"
+                 HorizontalAlignment="Stretch"
+                 VerticalAlignment="Stretch"
+                 Text="{Binding AdvancedOptionsString,
+                                UpdateSourceTrigger=PropertyChanged}"
+                 TextWrapping="Wrap"
+                 Visibility="{Binding DisplayX264Options, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=false}"
+                 />
+
+        <StackPanel Orientation="Vertical">
+            
+            <!--  Other Encoders  -->
+            <Grid Visibility="{Binding DisplayX264Options, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=true}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="102" />
+                </Grid.RowDefinitions>
+                <TextBlock Margin="10,5,10,0"
+                           VerticalAlignment="Center"
+                           FontWeight="Bold"
+                           Text="Advanced Query"
+                           />
+                <TextBox Grid.Row="1"
+                         Margin="10,0,10,5"
+                         HorizontalAlignment="Stretch"
+                         VerticalAlignment="Stretch"
+                         Text="{Binding AdvancedOptionsString}"
+                         TextWrapping="Wrap"
+                         />
+            </Grid>
+            
+            <!--  X264  -->
+            <Grid Visibility="{Binding DisplayX264Options, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=false}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <!--  Left Column  -->
+                <StackPanel Grid.Row="0"
+                            Grid.Column="0"
+                            Orientation="Vertical"
+                            >
+                    <!--  Encoding  -->
+                    <StackPanel Orientation="Vertical">
+                        <TextBlock Grid.Row="0"
+                                   Margin="10,5,0,0"
+                                   FontWeight="Bold"
+                                   Text="Encoding: "
+                                   />
+                        <Grid Margin="0,5,0,0"
+                              HorizontalAlignment="Left"
+                              VerticalAlignment="Top"
+                              >
+                            <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" />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" MinWidth="100" />
+                            </Grid.ColumnDefinitions>
+
+                            <Label Grid.Row="0"
+                                   Grid.Column="0"
+                                   Content="Reference Frames:"
+                                   Style="{StaticResource AdvancedLabel}"
+                                   />
+                            <ComboBox Grid.Row="0"
+                                      Grid.Column="1"
+                                      Height="22"
+                                      DisplayMemberPath="Label"
+                                      ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.ReferenceFrames}"
+                                      SelectedItem="{Binding ReferenceFrames}"
+                                      Style="{StaticResource LongToolTipHolder}"
+                                      >
+                                <ComboBox.ToolTip>
+                                    <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_ReferenceFramesToolTip}" />
+                                </ComboBox.ToolTip>
+                            </ComboBox>
+
+                            <Label Grid.Row="1"
+                                   Grid.Column="0"
+                                   Content="Maximum B-Frames:"
+                                   Style="{StaticResource AdvancedLabel}"
+                                   />
+                            <ComboBox Grid.Row="1"
+                                      Grid.Column="1"
+                                      Height="22"
+                                      DisplayMemberPath="Label"
+                                      ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.BFrames}"
+                                      SelectedItem="{Binding BFrames}"
+                                      Style="{StaticResource LongToolTipHolder}"
+                                      >
+                                <ComboBox.ToolTip>
+                                    <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_BFramesToolTip}" />
+                                </ComboBox.ToolTip>
+                            </ComboBox>
+
+
+                            <Label Grid.Row="4"
+                                   Grid.Column="0"
+                                   Height="28"
+                                   Content="CABAC:"
+                                   Style="{StaticResource AdvancedLabel}"
+                                   />
+                            <CheckBox Grid.Row="4"
+                                      Grid.Column="1"
+                                      Height="16"
+                                      IsChecked="{Binding CabacEntropyCoding}"
+                                      Style="{StaticResource LongToolTipHolder}"
+                                      >
+                                <CheckBox.ToolTip>
+                                    <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_CabacToolTip}" />
+                                </CheckBox.ToolTip>
+                            </CheckBox>
+
+                            <Label Grid.Row="5"
+                                   Grid.Column="0"
+                                   Height="28"
+                                   Content="8x8 Transform:"
+                                   Style="{StaticResource AdvancedLabel}"
+                                   Visibility="{Binding EightByEightDctVisible,
+                                                        Converter={StaticResource VisibilityConverter}}"
+                                   />
+                            <CheckBox Grid.Row="5"
+                                      Grid.Column="1"
+                                      Height="16"
+                                      IsChecked="{Binding EightByEightDct}"
+                                      Style="{StaticResource LongToolTipHolder}"
+                                      Visibility="{Binding EightByEightDctVisible,
+                                                           Converter={StaticResource VisibilityConverter}}"
+                                      >
+                                <CheckBox.ToolTip>
+                                    <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_EightByEightDctToolTip}" />
+                                </CheckBox.ToolTip>
+                            </CheckBox>
+
+                            <Label Grid.Row="6"
+                                   Grid.Column="0"
+                                   Content="Weighted P-Frames:"
+                                   Style="{StaticResource AdvancedLabel}"
+                                   />
+                            <CheckBox Grid.Row="6"
+                                      Grid.Column="1"
+                                      VerticalAlignment="Center"
+                                      IsChecked="{Binding WeightedPFrames}"
+                                      Style="{StaticResource LongToolTipHolder}"
+                                      >
+                                <CheckBox.ToolTip>
+                                    <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_WeightPToolTip}" />
+                                </CheckBox.ToolTip>
+                            </CheckBox>
+
+                            <Label Grid.Row="7"
+                                   Grid.Column="0"
+                                   Content="Pyramidal B-Frames:"
+                                   Style="{StaticResource AdvancedLabel}"
+                                   Visibility="{Binding PyramidalBFramesVisible,
+                                                        Converter={StaticResource VisibilityConverter}}"
+                                   />
+                            <ComboBox Grid.Row="7"
+                                      Grid.Column="1"
+                                      Height="22"
+                                      DisplayMemberPath="Label"
+                                      ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.PyramidalBFrames}"
+                                      SelectedItem="{Binding PyramidalBFrames}"
+                                      Style="{StaticResource LongToolTipHolder}"
+                                      Visibility="{Binding PyramidalBFramesVisible,
+                                                           Converter={StaticResource VisibilityConverter}}"
+                                      >
+                                <ComboBox.ToolTip>
+                                    <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_PyramidalBFramesToolTip}" />
+                                </ComboBox.ToolTip>
+                            </ComboBox>
+                        </Grid>
+                    </StackPanel>
 
-    <StackPanel Orientation="Vertical">
-
-        <!-- Other Encoders -->
-        <StackPanel Margin="10" Height="100" VerticalAlignment="Top"
-                     Visibility="{Binding DisplayX264Options, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=true}">
-            <TextBlock Text="Advanced Query" Margin="0,0,0,5" FontWeight="Bold" VerticalAlignment="Center" />
-            <TextBox Text="{Binding AdvancedOptionsString}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="150" TextWrapping="Wrap" />
-        </StackPanel>
+                    <!--  Psychvisual  -->
+                    <StackPanel Orientation="Vertical">
+                        <TextBlock Grid.Row="0"
+                                   Margin="10,5,0,0"
+                                   FontWeight="Bold"
+                                   Text="Psychvisual: "
+                                   />
+                        <StackPanel Orientation="Horizontal">
+                            <Label Width="110"
+                                   HorizontalAlignment="Left"
+                                   VerticalAlignment="Center"
+                                   HorizontalContentAlignment="Right"
+                                   Content="No DCT-Decimate:"
+                                   />
+                            <CheckBox HorizontalAlignment="Left"
+                                      VerticalAlignment="Center"
+                                      IsChecked="{Binding NoDctDecimate}"
+                                      Style="{StaticResource LongToolTipHolder}"
+                                      >
+                                <CheckBox.ToolTip>
+                                    <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_NoDctDecimateToolTip}" />
+                                </CheckBox.ToolTip>
+                            </CheckBox>
+
+                        </StackPanel>
+                    </StackPanel>
 
-        <!-- X264 -->
-        <Grid Visibility="{Binding DisplayX264Options, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=false}">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
+                </StackPanel>
 
-            <!--Left Column -->
-            <StackPanel Orientation="Vertical" Grid.Column="0" Grid.Row="0">
-                <!-- Encoding -->
-                <StackPanel Orientation="Vertical" >
-                    <TextBlock Text="Encoding: " FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" />
-                    <Grid HorizontalAlignment="Left" Margin="0,5,0,0" VerticalAlignment="Top">
+                <!--  Analysis (Center Column)  -->
+                <StackPanel Grid.Row="0"
+                            Grid.Column="1"
+                            Orientation="Vertical"
+                            >
+                    <TextBlock Grid.Row="0"
+                               Margin="10,5,0,0"
+                               FontWeight="Bold"
+                               Text="Analysis: "
+                               />
+                    <Grid HorizontalAlignment="Left" VerticalAlignment="Top">
                         <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" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="110" />
-                            <ColumnDefinition Width="100" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" MinWidth="100" />
                         </Grid.ColumnDefinitions>
 
-                        <Label Content="Reference Frames:" Grid.Row="0" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />
-                        <ComboBox Grid.Row="0" Grid.Column="1" Height="22"
-                              ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.ReferenceFrames}" DisplayMemberPath="Label"
-                              SelectedItem="{Binding ReferenceFrames}" Style="{StaticResource LongToolTipHolder}">
+                        <Label Grid.Row="0"
+                               Grid.Column="0"
+                               Content="Adaptive B-Frames:"
+                               Style="{StaticResource AdvancedLabel}"
+                               Visibility="{Binding BFramesOptionsVisible,
+                                                    Converter={StaticResource VisibilityConverter}}"
+                               />
+                        <ComboBox Grid.Row="0"
+                                  Grid.Column="1"
+                                  Width="120"
+                                  Height="22"
+                                  MaxWidth="120"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.AdaptiveBFrames}"
+                                  SelectedItem="{Binding AdaptiveBFrames}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  Visibility="{Binding BFramesOptionsVisible,
+                                                       Converter={StaticResource VisibilityConverter}}"
+                                  >
                             <ComboBox.ToolTip>
-                                <TextBlock Text="{x:Static Properties:Resources.Advanced_ReferenceFramesToolTip}" Style="{StaticResource LongToolTip}" />
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_AdaptiveBFramesToolTip}" />
                             </ComboBox.ToolTip>
                         </ComboBox>
 
-                        <Label Content="Maximum B-Frames:" Grid.Row="1" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />
-                        <ComboBox Grid.Row="1" Grid.Column="1" Height="22"
-                              ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.BFrames}" DisplayMemberPath="Label"
-                              SelectedItem="{Binding BFrames}" Style="{StaticResource LongToolTipHolder}">
+                        <Label Grid.Row="1"
+                               Grid.Column="0"
+                               Content="Adaptive Direct Mode:"
+                               Style="{StaticResource AdvancedLabel}"
+                               Visibility="{Binding BFramesOptionsVisible,
+                                                    Converter={StaticResource VisibilityConverter}}"
+                               />
+                        <ComboBox Grid.Row="1"
+                                  Grid.Column="1"
+                                  Width="120"
+                                  Height="22"
+                                  MaxWidth="120"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DirectPrediction}"
+                                  SelectedItem="{Binding DirectPrediction}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  Visibility="{Binding BFramesOptionsVisible,
+                                                       Converter={StaticResource VisibilityConverter}}"
+                                  >
                             <ComboBox.ToolTip>
-                                <TextBlock Text="{x:Static Properties:Resources.Advanced_BFramesToolTip}" Style="{StaticResource LongToolTip}" />
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_AdaptiveDirectModeToolTip}" />
                             </ComboBox.ToolTip>
                         </ComboBox>
 
+                        <Label Grid.Row="2"
+                               Grid.Column="0"
+                               Content="Motion Estimation Method:"
+                               Style="{StaticResource AdvancedLabel}"
+                               />
+                        <ComboBox Grid.Row="2"
+                                  Grid.Column="1"
+                                  Width="120"
+                                  Height="22"
+                                  MaxWidth="120"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.MotionEstimationMethod}"
+                                  SelectedItem="{Binding MotionEstimationMethod}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  >
+                            <ComboBox.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_MotionEstimationMethodToolTip}" />
+                            </ComboBox.ToolTip>
+                        </ComboBox>
 
-                        <Label Content="CABAC:" Height="28" Grid.Row="4" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />
-                        <CheckBox Height="16" Grid.Row="4" Grid.Column="1" IsChecked="{Binding CabacEntropyCoding}" Style="{StaticResource LongToolTipHolder}">
-                            <CheckBox.ToolTip>
-                                <TextBlock Text="{x:Static Properties:Resources.Advanced_CabacToolTip}" Style="{StaticResource LongToolTip}" />
-                            </CheckBox.ToolTip>
-                        </CheckBox>
-
-                        <Label Content="8x8 Transform:" Height="28" Grid.Row="5" Grid.Column="0"
-                           Visibility="{Binding EightByEightDctVisible, Converter={StaticResource VisibilityConverter}}"
-                           Style="{StaticResource AdvancedLabel}" />
-                        <CheckBox Height="16" Grid.Row="5" Grid.Column="1" IsChecked="{Binding EightByEightDct}"
-                              Visibility="{Binding EightByEightDctVisible, Converter={StaticResource VisibilityConverter}}"
-                              Style="{StaticResource LongToolTipHolder}">
-                            <CheckBox.ToolTip>
-                                <TextBlock Text="{x:Static Properties:Resources.Advanced_EightByEightDctToolTip}" Style="{StaticResource LongToolTip}" />
-                            </CheckBox.ToolTip>
-                        </CheckBox>
-
-                        <Label Content="Weighted P-Frames:" Grid.Row="6" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />
-                        <CheckBox Grid.Row="6" Grid.Column="1" VerticalAlignment="Center" IsChecked="{Binding WeightedPFrames}" Style="{StaticResource LongToolTipHolder}">
-                            <CheckBox.ToolTip>
-                                <TextBlock Text="{x:Static Properties:Resources.Advanced_WeightPToolTip}" Style="{StaticResource LongToolTip}" />
-                            </CheckBox.ToolTip>
-                        </CheckBox>
+                        <Label Grid.Row="3"
+                               Grid.Column="0"
+                               Content="Subpixel Motion Estimation:"
+                               Style="{StaticResource AdvancedLabel}"
+                               />
+                        <ComboBox Grid.Row="3"
+                                  Grid.Column="1"
+                                  Width="120"
+                                  Height="22"
+                                  MaxWidth="120"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.SubpixelMotionEstimation}"
+                                  SelectedItem="{Binding SubpixelMotionEstimation}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  >
+                            <ComboBox.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_SubpixelMotionEstimationToolTip}" />
+                            </ComboBox.ToolTip>
+                        </ComboBox>
 
-                        <Label Content="Pyramidal B-Frames:" Grid.Row="7" Grid.Column="0"
-                           Visibility="{Binding PyramidalBFramesVisible, Converter={StaticResource VisibilityConverter}}"
-                           Style="{StaticResource AdvancedLabel}" />
-                        <ComboBox Grid.Row="7" Grid.Column="1" Height="22" ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.PyramidalBFrames}" DisplayMemberPath="Label"
-                              SelectedItem="{Binding PyramidalBFrames}"
-                              Visibility="{Binding PyramidalBFramesVisible, Converter={StaticResource VisibilityConverter}}"
-                              Style="{StaticResource LongToolTipHolder}">
+                        <Label Grid.Row="4"
+                               Grid.Column="0"
+                               Content="Motion Estimation Range:"
+                               Style="{StaticResource AdvancedLabel}"
+                               Visibility="{Binding MotionEstimationRangeVisible,
+                                                    Converter={StaticResource VisibilityConverter}}"
+                               />
+                        <ComboBox Grid.Row="4"
+                                  Grid.Column="1"
+                                  Width="120"
+                                  Height="22"
+                                  MaxWidth="120"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.MotionEstimationRange}"
+                                  SelectedItem="{Binding MotionEstimationRange}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  Visibility="{Binding MotionEstimationRangeVisible,
+                                                       Converter={StaticResource VisibilityConverter}}"
+                                  >
                             <ComboBox.ToolTip>
-                                <TextBlock Text="{x:Static Properties:Resources.Advanced_PyramidalBFramesToolTip}" Style="{StaticResource LongToolTip}" />
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_MotionEstimationRangeToolTip}" />
                             </ComboBox.ToolTip>
                         </ComboBox>
                     </Grid>
-                </StackPanel>
-
-                <!-- Psychvisual -->
-                <StackPanel Orientation="Vertical" >
-                    <TextBlock Text="Psychvisual: " FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" />
-                    <StackPanel Orientation="Horizontal">
-                        <Label Content="No DCT-Decimate:" Width="110" HorizontalAlignment="Left" HorizontalContentAlignment="Right"  VerticalAlignment="Center" />
-                        <CheckBox VerticalAlignment="Center" HorizontalAlignment="Left" IsChecked="{Binding NoDctDecimate}" 
-                              Style="{StaticResource LongToolTipHolder}">
-                            <CheckBox.ToolTip>
-                                <TextBlock Text="{x:Static Properties:Resources.Advanced_NoDctDecimateToolTip}" Style="{StaticResource LongToolTip}" />
-                            </CheckBox.ToolTip>
-                        </CheckBox>
-
-                    </StackPanel>
-                </StackPanel>
-
-            </StackPanel>
-
-            <!-- Analysis (Center Column)-->
-            <StackPanel Orientation="Vertical" Grid.Column="1" Grid.Row="0" >
-                <TextBlock Text="Analysis: " FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" />
-                <Grid HorizontalAlignment="Left" VerticalAlignment="Top">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-
-                    <Label Content="Adaptive B-Frames:" Grid.Row="0" Grid.Column="0"
-                       Visibility="{Binding BFramesOptionsVisible, Converter={StaticResource VisibilityConverter}}"
-                       Style="{StaticResource AdvancedLabel}" />
-                    <ComboBox Grid.Row="0" Grid.Column="1" Height="22" ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.AdaptiveBFrames}" DisplayMemberPath="Label"
-                          SelectedItem="{Binding AdaptiveBFrames}" Visibility="{Binding BFramesOptionsVisible, Converter={StaticResource VisibilityConverter}}"
-                          Style="{StaticResource LongToolTipHolder}" MaxWidth="120" Width="120">
-                        <ComboBox.ToolTip>
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_AdaptiveBFramesToolTip}" Style="{StaticResource LongToolTip}" />
-                        </ComboBox.ToolTip>
-                    </ComboBox>
 
-                    <Label Content="Adaptive Direct Mode:" Grid.Row="1" Grid.Column="0"
-                       Visibility="{Binding BFramesOptionsVisible, Converter={StaticResource VisibilityConverter}}"
-                       Style="{StaticResource AdvancedLabel}" />
-                    <ComboBox Grid.Row="1" Grid.Column="1" Height="22" MaxWidth="120" Width="120"
-                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DirectPrediction}" DisplayMemberPath="Label"
-                          SelectedItem="{Binding DirectPrediction}" 
-                          Visibility="{Binding BFramesOptionsVisible, Converter={StaticResource VisibilityConverter}}"
-                          Style="{StaticResource LongToolTipHolder}">
-                        <ComboBox.ToolTip>
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_AdaptiveDirectModeToolTip}" Style="{StaticResource LongToolTip}" />
-                        </ComboBox.ToolTip>
-                    </ComboBox>
-
-                    <Label Content="Motion Estimation Method:" Grid.Row="2" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />
-                    <ComboBox Grid.Row="2" Grid.Column="1" Height="22" MaxWidth="120" Width="120"
-                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.MotionEstimationMethod}" DisplayMemberPath="Label"
-                          SelectedItem="{Binding MotionEstimationMethod}" Style="{StaticResource LongToolTipHolder}">
-                        <ComboBox.ToolTip>
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_MotionEstimationMethodToolTip}" Style="{StaticResource LongToolTip}" />
-                        </ComboBox.ToolTip>
-                    </ComboBox>
-
-                    <Label Content="Subpixel Motion Estimation:" Grid.Row="3" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />
-                    <ComboBox Grid.Row="3" Grid.Column="1" Height="22" MaxWidth="120" Width="120"
-                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.SubpixelMotionEstimation}" DisplayMemberPath="Label"
-                          SelectedItem="{Binding SubpixelMotionEstimation}" Style="{StaticResource LongToolTipHolder}">
-                        <ComboBox.ToolTip>
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_SubpixelMotionEstimationToolTip}" Style="{StaticResource LongToolTip}" />
-                        </ComboBox.ToolTip>
-                    </ComboBox>
-
-                    <Label Content="Motion Estimation Range:" Grid.Row="4" Grid.Column="0"
-                       Visibility="{Binding MotionEstimationRangeVisible, Converter={StaticResource VisibilityConverter}}"
-                       Style="{StaticResource AdvancedLabel}" />
-                    <ComboBox Grid.Row="4" Grid.Column="1" Height="22" MaxWidth="120" Width="120"
-                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.MotionEstimationRange}" DisplayMemberPath="Label"
-                          SelectedItem="{Binding MotionEstimationRange}"
-                          Visibility="{Binding MotionEstimationRangeVisible, Converter={StaticResource VisibilityConverter}}"
-                          Style="{StaticResource LongToolTipHolder}">
-                        <ComboBox.ToolTip>
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_MotionEstimationRangeToolTip}" Style="{StaticResource LongToolTip}" />
-                        </ComboBox.ToolTip>
-                    </ComboBox>
-                </Grid>
-
-                <Grid Height="80" HorizontalAlignment="Left" VerticalAlignment="Top" Width="300">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-
-                    <Label Content="Adaptive Quantization Strength:" Grid.Row="0" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />
-                    <Slider Grid.Row="0" Grid.Column="1" Minimum="0.0" Maximum="2.0" TickPlacement="BottomRight"
-                        TickFrequency="0.1" SmallChange="0.1" LargeChange="0.2" IsSnapToTickEnabled="True"
-                        Value="{Binding AdaptiveQuantizationStrength}" Style="{StaticResource LongToolTipHolder}">
-                        <Slider.ToolTip>
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_AdaptiveQuantizationStrengthToolTip}" Style="{StaticResource LongToolTip}" />
-                        </Slider.ToolTip>
-                    </Slider>
-
-                    <Label Content="Psychovisual Rate Distortion:" Grid.Row="1" Grid.Column="0" Style="{StaticResource AdvancedLabel}"
-                           Visibility="{Binding PsychovisualRateDistortionVisible, Converter={StaticResource VisibilityConverter}}" />
-                    <Slider Grid.Row="1" Grid.Column="1" Minimum="0.0" Maximum="2.0" TickPlacement="BottomRight"
-                            TickFrequency="0.1" SmallChange="0.1" LargeChange="0.2" IsSnapToTickEnabled="True"
-                            Visibility="{Binding PsychovisualRateDistortionVisible, Converter={StaticResource VisibilityConverter}}"
-                            Value="{Binding PsychovisualRateDistortion}" Style="{StaticResource LongToolTipHolder}">
-                        <Slider.ToolTip>
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_PsychovisualRateDistortionToolTip}" Style="{StaticResource LongToolTip}" />
-                        </Slider.ToolTip>
-                    </Slider>
-
-                    <Label Content="Psychovisual Trellis:" Grid.Row="2" Grid.Column="0" Style="{StaticResource AdvancedLabel}"
-                       Visibility="{Binding PsychovisualTrellisVisible, Converter={StaticResource VisibilityConverter}}" />
-                    <Slider Grid.Row="2" Grid.Column="1" Minimum="0.0" Maximum="1.0" TickPlacement="BottomRight"
-                        TickFrequency="0.05" SmallChange="0.05" LargeChange="0.2" IsSnapToTickEnabled="True"
-                        Value="{Binding PsychovisualTrellis}"
-                        Visibility="{Binding PsychovisualTrellisVisible, Converter={StaticResource VisibilityConverter}}"
-                        Style="{StaticResource LongToolTipHolder}">
-                        <Slider.ToolTip>
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_PsychovisualTrellisToolTip}" Style="{StaticResource LongToolTip}" />
-                        </Slider.ToolTip>
-                    </Slider>
-                </Grid>
+                    <Grid Width="300"
+                          Height="80"
+                          HorizontalAlignment="Left"
+                          VerticalAlignment="Top"
+                          >
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" MinWidth="100" />
+                        </Grid.ColumnDefinitions>
 
-            </StackPanel>
+                        <Label Grid.Row="0"
+                               Grid.Column="0"
+                               Content="Adaptive Quantization Strength:"
+                               Style="{StaticResource AdvancedLabel}"
+                               />
+                        <Slider Grid.Row="0"
+                                Grid.Column="1"
+                                IsSnapToTickEnabled="True"
+                                LargeChange="0.2"
+                                Maximum="2.0"
+                                Minimum="0.0"
+                                SmallChange="0.1"
+                                Style="{StaticResource LongToolTipHolder}"
+                                TickFrequency="0.1"
+                                TickPlacement="BottomRight"
+                                Value="{Binding AdaptiveQuantizationStrength}"
+                                >
+                            <Slider.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_AdaptiveQuantizationStrengthToolTip}" />
+                            </Slider.ToolTip>
+                        </Slider>
+
+                        <Label Grid.Row="1"
+                               Grid.Column="0"
+                               Content="Psychovisual Rate Distortion:"
+                               Style="{StaticResource AdvancedLabel}"
+                               Visibility="{Binding PsychovisualRateDistortionVisible,
+                                                    Converter={StaticResource VisibilityConverter}}"
+                               />
+                        <Slider Grid.Row="1"
+                                Grid.Column="1"
+                                IsSnapToTickEnabled="True"
+                                LargeChange="0.2"
+                                Maximum="2.0"
+                                Minimum="0.0"
+                                SmallChange="0.1"
+                                Style="{StaticResource LongToolTipHolder}"
+                                TickFrequency="0.1"
+                                TickPlacement="BottomRight"
+                                Visibility="{Binding PsychovisualRateDistortionVisible,
+                                                     Converter={StaticResource VisibilityConverter}}"
+                                Value="{Binding PsychovisualRateDistortion}"
+                                >
+                            <Slider.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_PsychovisualRateDistortionToolTip}" />
+                            </Slider.ToolTip>
+                        </Slider>
+
+                        <Label Grid.Row="2"
+                               Grid.Column="0"
+                               Content="Psychovisual Trellis:"
+                               Style="{StaticResource AdvancedLabel}"
+                               Visibility="{Binding PsychovisualTrellisVisible,
+                                                    Converter={StaticResource VisibilityConverter}}"
+                               />
+                        <Slider Grid.Row="2"
+                                Grid.Column="1"
+                                IsSnapToTickEnabled="True"
+                                LargeChange="0.2"
+                                Maximum="1.0"
+                                Minimum="0.0"
+                                SmallChange="0.05"
+                                Style="{StaticResource LongToolTipHolder}"
+                                TickFrequency="0.05"
+                                TickPlacement="BottomRight"
+                                Visibility="{Binding PsychovisualTrellisVisible,
+                                                     Converter={StaticResource VisibilityConverter}}"
+                                Value="{Binding PsychovisualTrellis}"
+                                >
+                            <Slider.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_PsychovisualTrellisToolTip}" />
+                            </Slider.ToolTip>
+                        </Slider>
+                    </Grid>
 
-            <!-- Analysis (Right Column)-->
-            <StackPanel Orientation="Vertical" Grid.Column="2" Grid.Row="0">
-                <Grid Margin="0,20,0,0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="100" />
-                    </Grid.ColumnDefinitions>
-                    <Label Content="Partition Type:" Height="28" HorizontalAlignment="Right" VerticalAlignment="Top" Grid.Column="0" />
-                    <ComboBox Height="23" HorizontalAlignment="Right"  VerticalAlignment="Top" Width="100" MaxWidth="100"
-                      ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.Analysis}" DisplayMemberPath="Label" Grid.Column="1" 
-                      SelectedItem="{Binding Analysis}" Style="{StaticResource LongToolTipHolder}">
-                        <ComboBox.ToolTip>
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_AnalysisToolTip}" Style="{StaticResource LongToolTip}" />
-                        </ComboBox.ToolTip>
-                    </ComboBox>
+                </StackPanel>
 
-                    <Label Content="Trellis:" Height="28" HorizontalAlignment="Right"  VerticalAlignment="Top" Grid.Column="0" Grid.Row="1" />
-                    <ComboBox Height="23" HorizontalAlignment="Right" VerticalAlignment="Top" Width="100" MaxWidth="100" Grid.Row="1"
-                      ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.Trellis}" DisplayMemberPath="Label" Grid.Column="1" 
-                      SelectedItem="{Binding Trellis}" Style="{StaticResource LongToolTipHolder}">
-                        <ComboBox.ToolTip>
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_TrellisToolTip}" Style="{StaticResource LongToolTip}" />
-                        </ComboBox.ToolTip>
-                    </ComboBox>
+                <!--  Analysis (Right Column)  -->
+                <StackPanel Grid.Row="0"
+                            Grid.Column="2"
+                            Orientation="Vertical"
+                            >
+                    <Grid Margin="0,20,0,0">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" MinWidth="100" />
+                        </Grid.ColumnDefinitions>
+                        <Label Grid.Column="0"
+                               Height="28"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Top"
+                               Content="Partition Type:"
+                               />
+                        <ComboBox Grid.Column="1"
+                                  Width="100"
+                                  Height="23"
+                                  MaxWidth="100"
+                                  HorizontalAlignment="Right"
+                                  VerticalAlignment="Top"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.Analysis}"
+                                  SelectedItem="{Binding Analysis}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  >
+                            <ComboBox.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_AnalysisToolTip}" />
+                            </ComboBox.ToolTip>
+                        </ComboBox>
 
+                        <Label Grid.Row="1"
+                               Grid.Column="0"
+                               Height="28"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Top"
+                               Content="Trellis:"
+                               />
+                        <ComboBox Grid.Row="1"
+                                  Grid.Column="1"
+                                  Width="100"
+                                  Height="23"
+                                  MaxWidth="100"
+                                  HorizontalAlignment="Right"
+                                  VerticalAlignment="Top"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.Trellis}"
+                                  SelectedItem="{Binding Trellis}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  >
+                            <ComboBox.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_TrellisToolTip}" />
+                            </ComboBox.ToolTip>
+                        </ComboBox>
 
-                    <Label Content="Deblocking:" Height="28" HorizontalAlignment="Right" VerticalAlignment="Top" Grid.Column="0" Grid.Row="2"  />
-                    <ComboBox Height="23" HorizontalAlignment="Right" VerticalAlignment="Top" Width="100" MaxWidth="100"
-                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DeblockingStrength}" DisplayMemberPath="Label" Grid.Column="1" Grid.Row="2" 
-                          SelectedItem="{Binding DeblockingStrength}" Style="{StaticResource LongToolTipHolder}">
-                        <ComboBox.ToolTip>
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_DeblockingToolTip}" Style="{StaticResource LongToolTip}" />
-                        </ComboBox.ToolTip>
-                    </ComboBox>
-                    <ComboBox Height="23" HorizontalAlignment="Right"  VerticalAlignment="Top" Width="100" MaxWidth="100"  Grid.Column="1" Grid.Row="3" 
-                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DeblockingThreshold}" DisplayMemberPath="Label"
-                          SelectedItem="{Binding DeblockingThreshold}" Style="{StaticResource LongToolTipHolder}">
-                        <ComboBox.ToolTip>
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_DeblockingToolTip}" Style="{StaticResource LongToolTip}" />
-                        </ComboBox.ToolTip>
-                    </ComboBox>
-                </Grid>
-            </StackPanel>
 
-            <!-- Query -->
-            <StackPanel Orientation="Vertical" Grid.Row="1" Grid.ColumnSpan="3" Margin="0,10,0,0" HorizontalAlignment="Stretch">
-                <TextBox Text="{Binding AdvancedOptionsString, UpdateSourceTrigger=PropertyChanged}" Height="35" MaxWidth="700" 
-                         HorizontalAlignment="Stretch" TextWrapping="Wrap" />
-            </StackPanel>
-        </Grid>
+                        <Label Grid.Row="2"
+                               Grid.Column="0"
+                               Height="28"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Top"
+                               Content="Deblocking:"
+                               />
+                        <ComboBox Grid.Row="2"
+                                  Grid.Column="1"
+                                  Width="100"
+                                  Height="23"
+                                  MaxWidth="100"
+                                  HorizontalAlignment="Right"
+                                  VerticalAlignment="Top"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DeblockingStrength}"
+                                  SelectedItem="{Binding DeblockingStrength}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  >
+                            <ComboBox.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_DeblockingToolTip}" />
+                            </ComboBox.ToolTip>
+                        </ComboBox>
+                        <ComboBox Grid.Row="3"
+                                  Grid.Column="1"
+                                  Width="100"
+                                  Height="23"
+                                  MaxWidth="100"
+                                  HorizontalAlignment="Right"
+                                  VerticalAlignment="Top"
+                                  DisplayMemberPath="Label"
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DeblockingThreshold}"
+                                  SelectedItem="{Binding DeblockingThreshold}"
+                                  Style="{StaticResource LongToolTipHolder}"
+                                  >
+                            <ComboBox.ToolTip>
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_DeblockingToolTip}" />
+                            </ComboBox.ToolTip>
+                        </ComboBox>
+                    </Grid>
+                </StackPanel>
+            </Grid>
 
-    </StackPanel>
+        </StackPanel>
+    </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 0b8347c0b..938e31719 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -1,27 +1,35 @@
 <Window x:Class="HandBrakeWPF.Views.MainView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework" 
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:Controls="clr-namespace:HandBrakeWPF.Controls"
         xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
-        xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
+        xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework"
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-        xmlns:Controls="clr-namespace:HandBrakeWPF.Controls" Title="{Data:Binding Path=WindowTitle}" Width="1015" 
-        FontSize="11" Background="#FFF0F0F0"
+        xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"
+        Title="{Data:Binding Path=WindowTitle}"
+        Width="1015"
+        Height="652"
+        MinWidth="1015"
+        MinHeight="652"
+        AllowDrop="True"
+        Background="#FFF0F0F0"
+        FontSize="11"
         Micro:Message.Attach="[Event Loaded] = [Action Load]"
-        UseLayoutRounding="True" SizeToContent="Height"
-        WindowStartupLocation="CenterScreen"
         SnapsToDevicePixels="True"
-        AllowDrop="True">
+        UseLayoutRounding="True"
+        WindowStartupLocation="CenterScreen"
+        >
 
     <i:Interaction.Triggers>
         <i:EventTrigger EventName="Drop">
             <Micro:ActionMessage MethodName="FilesDroppedOnWindow">
-                <Micro:Parameter Value="$eventArgs"></Micro:Parameter>
+                <Micro:Parameter Value="$eventArgs" />
             </Micro:ActionMessage>
         </i:EventTrigger>
 
         <i:EventTrigger EventName="Closing">
             <Micro:ActionMessage MethodName="HandleWindowClosing">
-                <Micro:Parameter Value="$eventArgs"></Micro:Parameter>
+                <Micro:Parameter Value="$eventArgs" />
             </Micro:ActionMessage>
         </i:EventTrigger>
     </i:Interaction.Triggers>
@@ -45,19 +53,21 @@
 
         <CollectionViewSource x:Key="presetsCvs" Source="{Binding Presets}">
             <CollectionViewSource.GroupDescriptions>
-                <PropertyGroupDescription PropertyName="Category"/>
+                <PropertyGroupDescription PropertyName="Category" />
             </CollectionViewSource.GroupDescriptions>
         </CollectionViewSource>
 
         <DataTemplate x:Key="presetsTemplate">
             <StackPanel>
-                <TextBlock Text="{Binding Path=Name}"/>
+                <TextBlock Text="{Binding Path=Name}" />
             </StackPanel>
         </DataTemplate>
 
-        <HierarchicalDataTemplate x:Key="presetsCategoryTemplate" ItemsSource="{Binding Path=Items}" 
-                                  ItemTemplate="{StaticResource presetsTemplate}">
-            <TextBlock Text="{Binding Path=Name}" FontWeight="Bold"/>
+        <HierarchicalDataTemplate x:Key="presetsCategoryTemplate"
+                                  ItemsSource="{Binding Path=Items}"
+                                  ItemTemplate="{StaticResource presetsTemplate}"
+                                  >
+            <TextBlock FontWeight="Bold" Text="{Binding Path=Name}" />
         </HierarchicalDataTemplate>
 
         <Style TargetType="TreeViewItem">
@@ -73,18 +83,24 @@
         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
     </Window.Resources>
 
-    <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <!-- Menu and Taskbar-->
-        <StackPanel Orientation="Vertical" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
-                        Grid.Row="0">
-            <!-- Main Menu -->
-            <Menu Height="23" VerticalAlignment="Top" HorizontalAlignment="Stretch">
+        <!--  Menu and Taskbar  -->
+        <StackPanel Grid.Row="0"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    Orientation="Vertical"
+                    >
+            <!--  Main Menu  -->
+            <Menu Height="23"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Top"
+                  >
                 <MenuItem Header="File">
                     <MenuItem Header="Cancel Scan" Micro:Message.Attach="[Event Click] = [Action CancelScan]" />
                     <Separator />
@@ -92,28 +108,28 @@
                 </MenuItem>
 
                 <MenuItem Header="Tools">
-                    <MenuItem Header="Show Queue" Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]" >
+                    <MenuItem Header="Show Queue" Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]">
                         <MenuItem.Icon>
-                            <Image Source="Images/Queue_Small.png" Width="16" />
+                            <Image Width="16" Source="Images/Queue_Small.png" />
                         </MenuItem.Icon>
                     </MenuItem>
-                    <MenuItem Header="Activity Window" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]" >
+                    <MenuItem Header="Activity Window" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]">
                         <MenuItem.Icon>
-                            <Image Source="Images/Output_Small.png" Width="16" />
+                            <Image Width="16" Source="Images/Output_Small.png" />
                         </MenuItem.Icon>
                     </MenuItem>
                     <Separator />
-                    <MenuItem Header="Options" Micro:Message.Attach="[Event Click] = [Action OpenOptionsWindow]" >
+                    <MenuItem Header="Options" Micro:Message.Attach="[Event Click] = [Action OpenOptionsWindow]">
                         <MenuItem.Icon>
-                            <Image Source="Images/Pref_Small.png" Width="16" />
+                            <Image Width="16" Source="Images/Pref_Small.png" />
                         </MenuItem.Icon>
                     </MenuItem>
                 </MenuItem>
 
                 <MenuItem Header="Help">
-                    <MenuItem Header="HandBrake User Guide (HTTP)" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]" >
+                    <MenuItem Header="HandBrake User Guide (HTTP)" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]">
                         <MenuItem.Icon>
-                            <Image Source="Images/Help16.png" Width="16" />
+                            <Image Width="16" Source="Images/Help16.png" />
                         </MenuItem.Icon>
                     </MenuItem>
                     <Separator />
@@ -127,14 +143,24 @@
                 </MenuItem>
             </Menu>
 
-            <!-- ToolBar -->
-            <ToolBar Name="mainToolBar" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"  SnapsToDevicePixels="False">
-                <Menu Background="Transparent" >
+            <!--  ToolBar  -->
+            <ToolBar Name="mainToolBar"
+                     HorizontalAlignment="Stretch"
+                     VerticalAlignment="Stretch"
+                     SnapsToDevicePixels="False"
+                     >
+                <Menu Background="Transparent">
                     <MenuItem ItemsSource="{Binding SourceToolbarMenu}">
                         <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
-                                <Image Source="Images/Movies.png" Height="32" Width="32" />
-                                <Label Content="Source"  Margin="8,0,0,0" VerticalAlignment="Center" />
+                                <Image Width="32"
+                                       Height="32"
+                                       Source="Images/Movies.png"
+                                       />
+                                <Label Margin="8,0,0,0"
+                                       VerticalAlignment="Center"
+                                       Content="Source"
+                                       />
                             </StackPanel>
                         </MenuItem.Header>
 
@@ -143,47 +169,85 @@
 
                 <Separator />
 
-                <Button Name="Start" Micro:Message.Attach="[Event Click] = [Action StartEncode]" Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">
+                <Button Name="Start"
+                        Micro:Message.Attach="[Event Click] = [Action StartEncode]"
+                        Visibility="{Binding IsEncoding,
+                                             Converter={StaticResource boolToVisConverter},
+                                             ConverterParameter=true}"
+                        >
                     <StackPanel Orientation="Horizontal">
-                        <Image Source="Images/Play.png" Height="32" Width="32" />
-                        <Label Content="Start"  Margin="8,0,0,0" VerticalAlignment="Center" />
+                        <Image Width="32"
+                               Height="32"
+                               Source="Images/Play.png"
+                               />
+                        <Label Margin="8,0,0,0"
+                               VerticalAlignment="Center"
+                               Content="Start"
+                               />
                     </StackPanel>
                 </Button>
 
-                <Button Name="Stop" Micro:Message.Attach="[Event Click] = [Action StopEncode]" Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">
+                <Button Name="Stop"
+                        Micro:Message.Attach="[Event Click] = [Action StopEncode]"
+                        Visibility="{Binding IsEncoding,
+                                             Converter={StaticResource boolToVisConverter},
+                                             ConverterParameter=false}"
+                        >
                     <StackPanel Orientation="Horizontal">
-                        <Image Source="Images/stop.png" Height="32" Width="32" SnapsToDevicePixels="True" />
-                        <Label Content="Stop"  Margin="8,0,0,0" VerticalAlignment="Center" />
+                        <Image Width="32"
+                               Height="32"
+                               SnapsToDevicePixels="True"
+                               Source="Images/stop.png"
+                               />
+                        <Label Margin="8,0,0,0"
+                               VerticalAlignment="Center"
+                               Content="Stop"
+                               />
                     </StackPanel>
                 </Button>
 
                 <Menu Background="Transparent">
-                    <MenuItem >
+                    <MenuItem>
                         <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
-                                <Button Name="QueueDrop"  Micro:Message.Attach="[Event Click] = [Action AddToQueue]"
-                                            VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
-                                            HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
-                                            Background="Transparent">
+                                <Button Name="QueueDrop"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Stretch"
+                                        HorizontalContentAlignment="Stretch"
+                                        VerticalContentAlignment="Stretch"
+                                        Background="Transparent"
+                                        Micro:Message.Attach="[Event Click] = [Action AddToQueue]"
+                                        >
                                     <StackPanel Orientation="Horizontal">
-                                        <Image Source="Images/AddToQueue.png" Height="32" Width="32" SnapsToDevicePixels="True" />
-                                        <Label Content="Add To Queue"  Margin="8,0,0,0" VerticalAlignment="Center" />
+                                        <Image Width="32"
+                                               Height="32"
+                                               SnapsToDevicePixels="True"
+                                               Source="Images/AddToQueue.png"
+                                               />
+                                        <Label Margin="8,0,0,0"
+                                               VerticalAlignment="Center"
+                                               Content="Add To Queue"
+                                               />
                                     </StackPanel>
                                     <Button.Style>
                                         <Style TargetType="{x:Type Button}">
                                             <Setter Property="Template">
                                                 <Setter.Value>
                                                     <ControlTemplate TargetType="{x:Type Button}">
-                                                        <Border x:Name="border" SnapsToDevicePixels="True" Background="{TemplateBinding Background}">
-                                                            <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
-                                                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                                                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                                                  Content="{TemplateBinding Content}" 
-                                                                                  ContentTemplate="{TemplateBinding ContentTemplate}"/>
+                                                        <Border x:Name="border"
+                                                                Background="{TemplateBinding Background}"
+                                                                SnapsToDevicePixels="True"
+                                                                >
+                                                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                                              Content="{TemplateBinding Content}"
+                                                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                                                              />
                                                         </Border>
                                                         <ControlTemplate.Triggers>
                                                             <Trigger Property="IsPressed" Value="True">
-                                                                <Setter Property="Background" TargetName="border" Value="#FF98B5E2"/>
+                                                                <Setter TargetName="border" Property="Background" Value="#FF98B5E2" />
                                                             </Trigger>
                                                         </ControlTemplate.Triggers>
                                                     </ControlTemplate>
@@ -193,17 +257,28 @@
                                     </Button.Style>
                                 </Button>
 
-                                <Path Fill="{DynamicResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z"  Height="5" Margin="2,2,2,0"/>
+                                <Path Height="5"
+                                      Margin="2,2,2,0"
+                                      Data="M 0 0 L 4 4 L 8 0 Z"
+                                      Fill="{DynamicResource GlyphBrush}"
+                                      />
                             </StackPanel>
                         </MenuItem.Header>
-                        <MenuItem Header="Add All" Micro:Message.Attach="[Event Click] = [Action AddAllToQueue]"/>
+                        <MenuItem Header="Add All" Micro:Message.Attach="[Event Click] = [Action AddAllToQueue]" />
                     </MenuItem>
                 </Menu>
 
-                <Button Name="ShowQueue"  Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]">
+                <Button Name="ShowQueue" Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]">
                     <StackPanel Orientation="Horizontal">
-                        <Image Source="Images/Queue.png" Height="32" Width="32" SnapsToDevicePixels="True" />
-                        <Label Content="Show Queue"  Margin="8,0,0,0" VerticalAlignment="Center" />
+                        <Image Width="32"
+                               Height="32"
+                               SnapsToDevicePixels="True"
+                               Source="Images/Queue.png"
+                               />
+                        <Label Margin="8,0,0,0"
+                               VerticalAlignment="Center"
+                               Content="Show Queue"
+                               />
                     </StackPanel>
                 </Button>
 
@@ -211,192 +286,344 @@
 
                 <Button Name="Preview" Micro:Message.Attach="[Event Click] = [Action OpenPreviewWindow]">
                     <StackPanel Orientation="Horizontal">
-                        <Image Source="Images/window.png" Height="32" Width="32" SnapsToDevicePixels="True" />
-                        <Label Content="Preview"  Margin="8,0,0,0" VerticalAlignment="Center" />
+                        <Image Width="32"
+                               Height="32"
+                               SnapsToDevicePixels="True"
+                               Source="Images/window.png"
+                               />
+                        <Label Margin="8,0,0,0"
+                               VerticalAlignment="Center"
+                               Content="Preview"
+                               />
                     </StackPanel>
                 </Button>
 
                 <Button Name="ActivityWindow" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]">
                     <StackPanel Orientation="Horizontal">
-                        <Image Source="Images/ActivityWindow.png" Height="32" Width="32" />
-                        <Label Content="Activity Window"  Margin="8,0,0,0" VerticalAlignment="Center" />
+                        <Image Width="32"
+                               Height="32"
+                               Source="Images/ActivityWindow.png"
+                               />
+                        <Label Margin="8,0,0,0"
+                               VerticalAlignment="Center"
+                               Content="Activity Window"
+                               />
                     </StackPanel>
                 </Button>
             </ToolBar>
         </StackPanel>
 
-        <!-- Main Body-->
-        <StackPanel Orientation="Horizontal" Grid.Row="1">
-
-            <!-- Main Controls-->
+        <!--  Main Body  -->
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="260" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <!--  Main Controls  -->
             <StackPanel Orientation="Vertical">
-                <!-- Source -->
-                <StackPanel Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">
+                <!--  Source  -->
+                <StackPanel Margin="10,5,5,5"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            >
                     <StackPanel Orientation="Horizontal">
                         <Label Content="Source" FontWeight="Bold" />
                         <Label Content="{Binding Path=SourceLabel}" />
                     </StackPanel>
-
                     <StackPanel Orientation="Horizontal">
-                        <Label Content="Title" Margin="8,0,0,0" />
-                        <ComboBox Name="Titles" Margin="8,0,0,0" MinWidth="100" ItemsSource="{Binding ScannedSource.Titles}" SelectedItem="{Binding Path=SelectedTitle}" />
-
-                        <Label Content="Angle" Margin="8,0,0,0" />
-                        <ComboBox Name="Angles" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding Angles}"  SelectedItem="{Binding SelectedAngle}"/>
-
-                        <ComboBox Name="PointToPointMode" Margin="8,0,0,0" MinWidth="80" ItemsSource="{Binding RangeMode}" SelectedItem="{Binding SelectedPointToPoint}" />
-
-                        <ComboBox Name="StartPoint" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding StartEndRangeItems}" SelectedItem="{Binding SelectedStartPoint}"
-                                      Visibility="{Binding ShowTextEntryForPointToPointMode,Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>
-                        <TextBox Name="StartPointText" Margin="8,0,0,0" MinWidth="60" Text="{Binding SelectedStartPoint}"
-                                     Visibility="{Binding ShowTextEntryForPointToPointMode, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}"/>
-
-                        <Label Content="through" Margin="8,0,0,0" />
-                        <ComboBox Name="EndPoint" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding StartEndRangeItems}" SelectedItem="{Binding SelectedEndPoint}"
-                                      Visibility="{Binding ShowTextEntryForPointToPointMode, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>
-                        <TextBox Name="EndPointText" Margin="8,0,0,0" MinWidth="60" Text="{Binding SelectedEndPoint}" 
-                                     Visibility="{Binding ShowTextEntryForPointToPointMode, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
-
-                        <Label Content="Duration" Margin="8,0,0,0" />
-                        <Label Content="{Binding Duration}" Margin="8,0,0,0" />
+                        <Label Margin="8,0,0,0" Content="Title" />
+                        <ComboBox Name="Titles"
+                                  MinWidth="100"
+                                  Margin="8,0,0,0"
+                                  ItemsSource="{Binding ScannedSource.Titles}"
+                                  SelectedItem="{Binding Path=SelectedTitle}"
+                                  />
+                        <Label Margin="8,0,0,0" Content="Angle" />
+                        <ComboBox Name="Angles"
+                                  MinWidth="60"
+                                  Margin="8,0,0,0"
+                                  ItemsSource="{Binding Angles}"
+                                  SelectedItem="{Binding SelectedAngle}"
+                                  />
+                        <ComboBox Name="PointToPointMode"
+                                  MinWidth="80"
+                                  Margin="8,0,0,0"
+                                  ItemsSource="{Binding RangeMode}"
+                                  SelectedItem="{Binding SelectedPointToPoint}"
+                                  />
+                        <ComboBox Name="StartPoint"
+                                  MinWidth="60"
+                                  Margin="8,0,0,0"
+                                  ItemsSource="{Binding StartEndRangeItems}"
+                                  SelectedItem="{Binding SelectedStartPoint}"
+                                  Visibility="{Binding ShowTextEntryForPointToPointMode,
+                                                       Converter={StaticResource boolToVisConverter},
+                                                       ConverterParameter=true}"
+                                  />
+                        <TextBox Name="StartPointText"
+                                 MinWidth="60"
+                                 Margin="8,0,0,0"
+                                 Text="{Binding SelectedStartPoint}"
+                                 Visibility="{Binding ShowTextEntryForPointToPointMode,
+                                                      Converter={StaticResource boolToVisConverter},
+                                                      ConverterParameter=false}"
+                                 />
+                        <Label Margin="8,0,0,0" Content="through" />
+                        <ComboBox Name="EndPoint"
+                                  MinWidth="60"
+                                  Margin="8,0,0,0"
+                                  ItemsSource="{Binding StartEndRangeItems}"
+                                  SelectedItem="{Binding SelectedEndPoint}"
+                                  Visibility="{Binding ShowTextEntryForPointToPointMode,
+                                                       Converter={StaticResource boolToVisConverter},
+                                                       ConverterParameter=true}"
+                                  />
+                        <TextBox Name="EndPointText"
+                                 MinWidth="60"
+                                 Margin="8,0,0,0"
+                                 Text="{Binding SelectedEndPoint}"
+                                 Visibility="{Binding ShowTextEntryForPointToPointMode,
+                                                      Converter={StaticResource boolToVisConverter},
+                                                      ConverterParameter=false}"
+                                 />
+                        <Label Margin="8,0,0,0" Content="Duration" />
+                        <Label Margin="8,0,0,0" Content="{Binding Duration}" />
                     </StackPanel>
                 </StackPanel>
-
-                <!-- Destination -->
-                <StackPanel Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">
-                    <Label Content="Destination" FontWeight="Bold" />
-                    <StackPanel Orientation="Horizontal">
-                        <Label Content="File" Margin="8,0,0,0" />
-                        <TextBox Name="Destination" Margin="8,0,0,0" Width="600" Text="{Binding Destination, UpdateSourceTrigger=PropertyChanged}" />
-                        <Button Name="DestinationBrowser" Margin="8,0,0,0" Content="Browse" Micro:Message.Attach="[Event Click] = [Action BrowseDestination]" />
-                    </StackPanel>
-                </StackPanel>
-
-                <!-- Output Options -->
-                <StackPanel Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">
-                    <Label Content="Output Settings" FontWeight="Bold" />
-                    <StackPanel Orientation="Horizontal">
-                        <Label Content="Container" Margin="8,0,0,0" />
-                        <ComboBox Name="Container" Margin="8,0,0,0" MinWidth="100" ItemsSource="{Binding OutputFormats}" SelectedItem="{Binding SelectedOutputFormat}" />
-
-                        <CheckBox Name="LargeFileMp4" Content="Large File Size" IsChecked="{Binding Path=CurrentTask.LargeFile}"
-                                      Visibility="{Binding IsMkv, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" VerticalAlignment="Center" Margin="8,0,0,0" />
-                        <CheckBox Name="WebOptimized" Content="Web Optimized" IsChecked="{Binding Path=CurrentTask.OptimizeMP4}"
-                                      Visibility="{Binding IsMkv, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" VerticalAlignment="Center" Margin="8,0,0,0" />
-                        <CheckBox Name="iPod5G" Content="iPod 5G Support" IsChecked="{Binding Path=CurrentTask.IPod5GSupport}"
-                                      Visibility="{Binding IsMkv, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" VerticalAlignment="Center" Margin="8,0,0,0" />
-                    </StackPanel>
+            </StackPanel>
+            <!--  Destination  -->
+            <StackPanel Grid.Row="1"
+                        Margin="10,5,5,5"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        >
+                <Label Content="Destination" FontWeight="Bold" />
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Label Margin="8,0,0,0" Content="File" />
+                    <TextBox Name="Destination"
+                             Grid.Column="1"
+                             Margin="8,0,0,0"
+                             Text="{Binding Destination,
+                                            UpdateSourceTrigger=PropertyChanged}"
+                             />
+                    <Button Name="DestinationBrowser"
+                            Grid.Column="2"
+                            Margin="8,0,0,0"
+                            Content="Browse"
+                            Micro:Message.Attach="[Event Click] = [Action BrowseDestination]"
+                            />
+                </Grid>
+            </StackPanel>
+            <!--  Output Options  -->
+            <StackPanel Grid.Row="2"
+                        Margin="10,5,5,5"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        >
+                <Label Content="Output Settings" FontWeight="Bold" />
+                <StackPanel Orientation="Horizontal">
+                    <Label Margin="8,0,0,0" Content="Container" />
+                    <ComboBox Name="Container"
+                              MinWidth="100"
+                              Margin="8,0,0,0"
+                              ItemsSource="{Binding OutputFormats}"
+                              SelectedItem="{Binding SelectedOutputFormat}"
+                              />
+                    <CheckBox Name="LargeFileMp4"
+                              Margin="8,0,0,0"
+                              VerticalAlignment="Center"
+                              Content="Large File Size"
+                              IsChecked="{Binding Path=CurrentTask.LargeFile}"
+                              Visibility="{Binding IsMkv,
+                                                   Converter={StaticResource boolToVisConverter},
+                                                   ConverterParameter=true}"
+                              />
+                    <CheckBox Name="WebOptimized"
+                              Margin="8,0,0,0"
+                              VerticalAlignment="Center"
+                              Content="Web Optimized"
+                              IsChecked="{Binding Path=CurrentTask.OptimizeMP4}"
+                              Visibility="{Binding IsMkv,
+                                                   Converter={StaticResource boolToVisConverter},
+                                                   ConverterParameter=true}"
+                              />
+                    <CheckBox Name="iPod5G"
+                              Margin="8,0,0,0"
+                              VerticalAlignment="Center"
+                              Content="iPod 5G Support"
+                              IsChecked="{Binding Path=CurrentTask.IPod5GSupport}"
+                              Visibility="{Binding IsMkv,
+                                                   Converter={StaticResource boolToVisConverter},
+                                                   ConverterParameter=true}"
+                              />
                 </StackPanel>
-
-                <!-- Tab Control -->
-                <TabControl HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="725" Height="310" Margin="10,10,10,10" Name="tabControl" >
-                    <TabItem Header="Picture" Name="pictureTab">
-                        <ContentControl x:Name="PictureSettingsViewModel" ></ContentControl>
-                    </TabItem>
-                    <TabItem Header="Video Filters" Name="filtersTab">
-                        <ContentControl x:Name="FiltersViewModel" ></ContentControl>
-                    </TabItem>
-                    <TabItem Header="Video" Name="videoTab">
-                        <ContentControl x:Name="VideoViewModel" ></ContentControl>
-                    </TabItem>
-                    <TabItem Header="Audio" Name="audioTab">
-                        <ContentControl x:Name="AudioViewModel" ></ContentControl>
-                    </TabItem>
-                    <TabItem Header="Subtitles" Name="subtitlesTab">
-                        <ContentControl x:Name="SubtitleViewModel"></ContentControl>
-                    </TabItem>
-                    <TabItem Header="Chapters" Name="chaptersTab">
-                        <ContentControl x:Name="ChaptersViewModel"></ContentControl>
-                    </TabItem>
-                    <TabItem Header="Advanced" Name="advancedTab">
-                        <ContentControl x:Name="AdvancedViewModel"></ContentControl>
-                    </TabItem>
-                </TabControl>
-
             </StackPanel>
-
-            <!-- Presets -->
-            <StackPanel Margin="5,5,5,5" Orientation="Vertical">
-                <GroupBox Header="Presets" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                    <StackPanel Orientation="Vertical">
-
-                        <TreeView ItemsSource="{Binding Source={StaticResource presetsCvs}, Path=Groups}" 
-                                      ItemTemplate="{StaticResource presetsCategoryTemplate}" Width="240" Height="430"
-                                      >
-                            <i:Interaction.Triggers>
-                                <i:EventTrigger EventName="SelectedItemChanged">
-                                    <Micro:ActionMessage MethodName="SetSelectedPreset">
-                                        <Micro:Parameter Value="$eventArgs"></Micro:Parameter>
-                                    </Micro:ActionMessage>
-                                </i:EventTrigger>
-                            </i:Interaction.Triggers>
-
-                        </TreeView>
-
-
-                        <ToolBar Name="presetsToolBar" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" UseLayoutRounding="False" Background="Transparent" 
-                                     SnapsToDevicePixels="False">
-                            <Button Micro:Message.Attach="[Event Click] = [Action PresetAdd]">
-                                <Button.Content>
-                                    <StackPanel Orientation="Horizontal">
-                                        <Image Source="Images/Add16.png" Height="16" Width="16" />
-                                        <TextBlock Text="Add" Style="{StaticResource textBlockOrangeStyle}"  Margin="2,0,0,0" VerticalAlignment="Center" />
-                                    </StackPanel>
-                                </Button.Content>
-                            </Button>
-
-                            <Button Micro:Message.Attach="[Event Click] = [Action PresetRemove]">
-                                <Button.Content>
+            <!--  Tab Control  -->
+            <TabControl Name="tabControl"
+                        Grid.Row="3"
+                        Margin="10,10,5,5"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        >
+                <TabItem Name="pictureTab" Header="Picture">
+                    <ContentControl x:Name="PictureSettingsViewModel" />
+                </TabItem>
+                <TabItem Name="filtersTab" Header="Video Filters">
+                    <ContentControl x:Name="FiltersViewModel" />
+                </TabItem>
+                <TabItem Name="videoTab" Header="Video">
+                    <ContentControl x:Name="VideoViewModel" />
+                </TabItem>
+                <TabItem Name="audioTab" Header="Audio">
+                    <ContentControl x:Name="AudioViewModel" />
+                </TabItem>
+                <TabItem Name="subtitlesTab" Header="Subtitles">
+                    <ContentControl x:Name="SubtitleViewModel" />
+                </TabItem>
+                <TabItem Name="chaptersTab" Header="Chapters">
+                    <ContentControl x:Name="ChaptersViewModel" />
+                </TabItem>
+                <TabItem Name="advancedTab" Header="Advanced">
+                    <ContentControl x:Name="AdvancedViewModel" />
+                </TabItem>
+            </TabControl>
+            <!--  Presets  -->
+            <GroupBox Grid.RowSpan="4"
+                      Grid.Column="1"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      Header="Presets"
+                      Margin="0,0,0,5"
+                      >
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <TreeView HorizontalAlignment="Stretch"
+                              VerticalAlignment="Stretch"
+                              ItemsSource="{Binding Source={StaticResource presetsCvs},
+                                                    Path=Groups}"
+                              ItemTemplate="{StaticResource presetsCategoryTemplate}"
+                              >
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="SelectedItemChanged">
+                                <Micro:ActionMessage MethodName="SetSelectedPreset">
+                                    <Micro:Parameter Value="$eventArgs" />
+                                </Micro:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TreeView>
+                    <ToolBar Name="presetsToolBar"
+                             Grid.Row="1"
+                             HorizontalAlignment="Stretch"
+                             VerticalAlignment="Stretch"
+                             Background="Transparent"
+                             SnapsToDevicePixels="False"
+                             UseLayoutRounding="False"
+                             >
+                        <Button Micro:Message.Attach="[Event Click] = [Action PresetAdd]">
+                            <Button.Content>
+                                <StackPanel Orientation="Horizontal">
+                                    <Image Width="16"
+                                           Height="16"
+                                           Source="Images/Add16.png"
+                                           />
+                                    <TextBlock Margin="2,0,0,0"
+                                               VerticalAlignment="Center"
+                                               Style="{StaticResource textBlockOrangeStyle}"
+                                               Text="Add"
+                                               />
+                                </StackPanel>
+                            </Button.Content>
+                        </Button>
+                        <Button Micro:Message.Attach="[Event Click] = [Action PresetRemove]">
+                            <Button.Content>
+                                <StackPanel Orientation="Horizontal">
+                                    <Image Width="16"
+                                           Height="16"
+                                           Source="Images/Close.png"
+                                           />
+                                    <TextBlock Margin="2,0,0,0"
+                                               VerticalAlignment="Center"
+                                               Style="{StaticResource textBlockOrangeStyle}"
+                                               Text="Remove"
+                                               />
+                                </StackPanel>
+                            </Button.Content>
+                        </Button>
+                        <Menu Background="Transparent">
+                            <MenuItem ToolBar.OverflowMode="Never">
+                                <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
-                                        <Image Source="Images/Close.png" Height="16" Width="16" />
-                                        <TextBlock Text="Remove" Style="{StaticResource textBlockOrangeStyle}"  Margin="2,0,0,0" VerticalAlignment="Center" />
+                                        <Image Width="16"
+                                               Height="16"
+                                               Source="Images/Options24.png"
+                                               />
+                                        <TextBlock Margin="2,0,0,0"
+                                                   VerticalAlignment="Center"
+                                                   Style="{StaticResource textBlockOrangeStyle}"
+                                                   Text="Options"
+                                                   />
                                     </StackPanel>
-                                </Button.Content>
-                            </Button>
-
-                            <Menu Background="Transparent" >
-                                <MenuItem ToolBar.OverflowMode="Never">
-                                    <MenuItem.Header>
-                                        <StackPanel Orientation="Horizontal">
-                                            <Image Source="Images/Options24.png" Height="16" Width="16" />
-                                            <TextBlock Text="Options" Style="{StaticResource textBlockOrangeStyle}" Margin="2,0,0,0" VerticalAlignment="Center" />
-                                        </StackPanel>
-                                    </MenuItem.Header>
-
-                                    <MenuItem Header="Set Default" Micro:Message.Attach="[Event Click] = [Action PresetSetDefault]" />
-                                    <Separator />
-                                    <MenuItem Header="Import" Micro:Message.Attach="[Event Click] = [Action PresetImport]" />
-                                    <MenuItem Header="Export" Micro:Message.Attach="[Event Click] = [Action PresetExport]" />
-                                    <Separator />
-                                    <MenuItem Header="Reset Built-in Presets" Micro:Message.Attach="[Event Click] = [Action PresetReset]" />
-                                </MenuItem>
-                            </Menu>
-
-
-                        </ToolBar>
-                    </StackPanel>
-                </GroupBox>
-            </StackPanel>
-
-        </StackPanel>
-
+                                </MenuItem.Header>
+                                <MenuItem Header="Set Default" Micro:Message.Attach="[Event Click] = [Action PresetSetDefault]" />
+                                <Separator />
+                                <MenuItem Header="Import" Micro:Message.Attach="[Event Click] = [Action PresetImport]" />
+                                <MenuItem Header="Export" Micro:Message.Attach="[Event Click] = [Action PresetExport]" />
+                                <Separator />
+                                <MenuItem Header="Reset Built-in Presets" Micro:Message.Attach="[Event Click] = [Action PresetReset]" />
+                            </MenuItem>
+                        </Menu>
+                    </ToolBar>
+                </Grid>
+            </GroupBox>
+        </Grid>
+
+        <!--  StatusPanel  -->
         <Controls:StatusPanel x:Name="loadingPanel"
-                              Panel.ZIndex="10"
                               Grid.Row="1"
                               Grid.RowSpan="2"
                               Height="70"
                               VerticalAlignment="Bottom"
+                              Panel.ZIndex="10"
                               IsLoading="{Binding ShowStatusWindow}"
                               Message="{Binding StatusLabel}"
-                              SubMessage="Please Wait ..."  />
-
-        <!-- Status Bar -->
-        <StatusBar Padding="0" Margin="0" Grid.Row="2" Height="32" Grid.ColumnSpan="2" VerticalAlignment="Bottom" >
-            <Label Content="{Binding Path=StatusLabel}" FontSize="11" Padding="0,0,0,5" VerticalAlignment="Center" />
-
-            <Button Content="BETA WPF UI RELEASE NOTES"  Micro:Message.Attach="[Event Click] = [Action ShowReleaseNotes]" 
-                         FontWeight="Bold" Foreground="Blue" Padding="0,0,0,5" FontSize="11"
-                        />
+                              SubMessage="Please Wait ..."
+                              />
+
+        <!--  Status Bar  -->
+        <StatusBar Grid.Row="2"
+                   Grid.ColumnSpan="2"
+                   Height="32"
+                   Margin="0"
+                   VerticalAlignment="Bottom"
+                   Padding="0"
+                   >
+            <Label VerticalAlignment="Center"
+                   Content="{Binding Path=StatusLabel}"
+                   FontSize="11"
+                   Padding="0,0,0,5"
+                   />
+
+            <Button Content="BETA WPF UI RELEASE NOTES"
+                    FontSize="11"
+                    FontWeight="Bold"
+                    Foreground="Blue"
+                    Micro:Message.Attach="[Event Click] = [Action ShowReleaseNotes]"
+                    Padding="0,0,0,5"
+                    />
 
 
         </StatusBar>