1 files changed, 19 insertions, 15 deletions
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index e79fd91a7..80a97754f 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -1,9 +1,9 @@
-<Window x:Class="HandBrakeWPF.Views.OptionsView"
+<UserControl  x:Class="HandBrakeWPF.Views.OptionsView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"
-        xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers" Title="{Binding Title}" MinWidth="620" SizeToContent="Height" Width="620">
+        xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers" >
 
-    <Window.Resources>
+    <UserControl.Resources>
         <Style TargetType="Button">
             <Setter Property="Foreground" Value="DarkOrange" />
             <Setter Property="FontWeight" Value="Bold" />
@@ -21,12 +21,17 @@
         <Style TargetType="CheckBox">
             <Setter Property="Margin" Value="0,0,0,5" />
         </Style>
-    </Window.Resources>
-
-
-    <StackPanel Orientation="Vertical" Background="#FFF1F0EF">
+        </UserControl.Resources>
+
+    <Grid Background="#FFF1F0EF">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        
         <!-- Header -->
-        <StackPanel Orientation="Horizontal"  Background="White" Height="50" >
+        <StackPanel Orientation="Horizontal"  Background="White" Height="50" Grid.Row="0" >
             <Image Source="Images/Preferences.png" Margin="10,0,5,0" Width="32" Height="32" VerticalAlignment="Center" />
             <StackPanel Orientation="Vertical" VerticalAlignment="Center">
                 <TextBlock Text="Options" FontWeight="Bold" />
@@ -35,7 +40,7 @@
         </StackPanel>
 
         <!-- Options Panel-->
-        <TabControl Margin="10,10,10,10" Height="405">
+        <TabControl Margin="10,10,10,10" MinHeight="410" Grid.Row="1">
             <TabItem Header="General">
                 <StackPanel Orientation="Vertical">
                     <Grid Margin="10,10,0,10">
@@ -367,12 +372,11 @@
             </TabItem>
         </TabControl>
 
-        <StackPanel HorizontalAlignment="Stretch" Background="LightGray" >
-            <Button Content="Close" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"
-                    HorizontalAlignment="Right" Padding="10,2" Margin="0,5,10,5" />
+        <StackPanel HorizontalAlignment="Stretch" Background="LightGray" Grid.Row="2" >
+            <Button Content="Save Changes" IsDefault="True" cal:Message.Attach="[Event Click] = [Action Close]"
+                    HorizontalAlignment="Center" Padding="12,2" Margin="0,5,10,5" />
         </StackPanel>
-        
 
 
-    </StackPanel>
-</Window>
+    </Grid>
+</UserControl>