diff --git a/AppInstallerFileBuilder/AppInstallerFileBuilder/Package.appxmanifest b/AppInstallerFileBuilder/AppInstallerFileBuilder/Package.appxmanifest
index d0c68cf..5542fd4 100644
--- a/AppInstallerFileBuilder/AppInstallerFileBuilder/Package.appxmanifest
+++ b/AppInstallerFileBuilder/AppInstallerFileBuilder/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="AppInstallerFileBuilder" Publisher="CN=MSIX-Toolkit-Tempkey" Version="1.2019.812.0" />
+  <Identity Name="AppInstallerFileBuilder" Publisher="CN=MSIX-Toolkit-Tempkey" Version="1.2019.1001.0" />
   <mp:PhoneIdentity PhoneProductId="4a19f631-5573-4e7d-9544-322a5adf9868" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>AppInstaller File Builder (Preview)</DisplayName>
diff --git a/AppInstallerFileBuilder/AppInstallerFileBuilder/Views/MainPackageView.xaml b/AppInstallerFileBuilder/AppInstallerFileBuilder/Views/MainPackageView.xaml
index 8f25641..ed90131 100644
--- a/AppInstallerFileBuilder/AppInstallerFileBuilder/Views/MainPackageView.xaml
+++ b/AppInstallerFileBuilder/AppInstallerFileBuilder/Views/MainPackageView.xaml
@@ -9,8 +9,8 @@
     mc:Ignorable="d">
 
     <RelativePanel>
-        <ScrollViewer VerticalScrollMode="Enabled" VerticalScrollBarVisibility="Visible">
-            <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="{StaticResource PageMargin}">
+        <ScrollViewer VerticalScrollMode="Enabled" VerticalScrollBarVisibility="Visible" x:Name="Main_ScrollViewer">
+            <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Margin="{StaticResource PageMargin}" MinHeight="917" MinWidth="637">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto"/>
                     <RowDefinition Height="Auto"/>
@@ -51,7 +51,7 @@
                                 Width="453"
                                 Margin="0,0,15,0"
                             />
-                            <Button x:Name="PackageInfoButton" Content="Get Package Info">
+                            <Button x:Name="PackageInfoButton" Content="Get Package Info" Margin="12,0,0,0">
 
                             </Button>
                         </StackPanel>
@@ -61,7 +61,7 @@
                     <StackPanel Margin="{StaticResource SettingsSubheaderMargin}" Orientation="Horizontal">
                         <TextBlock
                             ToolTipService.ToolTip="e.g. MyCompany.MySuite.MyApp"
-                            Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center">  
+                            Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center" Width="185">  
                             <Run Text="Name" />
                             <Run Text="*" Foreground="Red" />
                         </TextBlock>
@@ -73,14 +73,14 @@
                             PlaceholderText="Package Name"
                             HorizontalAlignment="Left"
                             Width="400"
-                            Margin="141,0,0,0"
+                            Margin="10,0,0,0"
                         />
                     </StackPanel >
 
                     <StackPanel Margin="{StaticResource SettingsSubheaderMargin}" Orientation="Horizontal">
                         <TextBlock
                             ToolTipService.ToolTip="e.g. 1.0.0.0"
-                            Style="{StaticResource SubtitleTextBlockStyle}" Margin="5" FontSize="15" VerticalAlignment="Center" Windows10FallCreatorsUpdate:HorizontalTextAlignment="Right">
+                            Style="{StaticResource SubtitleTextBlockStyle}" Margin="5" FontSize="15" VerticalAlignment="Center" Windows10FallCreatorsUpdate:HorizontalTextAlignment="Left" Width="185">
                             <Run Text="Version" />
                             <Run Text="*" Foreground="Red" />
                         </TextBlock>
@@ -93,14 +93,14 @@
                             ToolTipService.ToolTip="e.g. 1.0.0.0"
                             HorizontalAlignment="Left"
                             Width="400"
-                            Margin="132,0,0,0"
+                            Margin="10,0,0,0"
                         />
                     </StackPanel>
 
                     <StackPanel Margin="{StaticResource SettingsSubheaderMargin}" Orientation="Horizontal">
                         <TextBlock
                             ToolTipService.ToolTip="e.g. CN=janedoe"
-                            Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center"> 
+                            Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center" Width="185"> 
                             <Run Text="Publisher" />
                             <Run Text="*" Foreground="Red" />
                         </TextBlock>
@@ -112,7 +112,7 @@
                             PlaceholderText="Publisher"
                             HorizontalAlignment="Left"
                             Width="400"
-                            Margin="121,0,0,0"
+                            Margin="10,0,0,0"
                         />
                     </StackPanel>
 
@@ -120,7 +120,7 @@
                         <TextBlock
                             x:Uid="Resource_Id"                            
                             ToolTipService.ToolTip="e.g. English"
-                            Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center">
+                            Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center" Width="185">
                             <Run Text="Resource Id"/>
                         </TextBlock>
                         <TextBox 
@@ -131,13 +131,13 @@
                             PlaceholderText="Resource Id"
                             HorizontalAlignment="Left"
                             Width="400"
-                            Margin="116,0,0,0"
+                            Margin="10,0,0,0"
                         />
                     </StackPanel>
 
                     <StackPanel Margin="{StaticResource SettingsSubheaderMargin}" x:Name="Processor_Type_Stack_Panel" Orientation="Horizontal">
                         <TextBlock                            
-                            Style="{StaticResource SubtitleTextBlockStyle}" Margin="5" VerticalAlignment="Center" FontSize="15">
+                            Style="{StaticResource SubtitleTextBlockStyle}" Margin="5" VerticalAlignment="Center" FontSize="15" Width="185">
                             <Run Text="Processor Architecture Type" />
                         </TextBlock>
 
@@ -149,14 +149,14 @@
                             PlaceholderText="Processor Architecture"
                             HorizontalAlignment="Left"
                             Width="400"
-                            Margin="8,0,0,0"
+                            Margin="10,0,0,0"
                         />
                     </StackPanel>
 
                     <StackPanel Margin="{StaticResource SettingsSubheaderMargin}" Orientation="Horizontal">
                         <TextBlock
                             ToolTipService.ToolTip="e.g. C:\Users\JaneDoe\Desktop\MyApp.msix"
-                            Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center"
+                            Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15" Margin="5" VerticalAlignment="Center" Width="185"
                         >
                             <Run  Text="File Path"  />
                             <Run  Text="*" Foreground="Red"/>
@@ -169,47 +169,48 @@
                                 PlaceholderText="Enter the package URI"
                                 ToolTipService.ToolTip="e.g. C:\Users\JaneDoe\Desktop\MyApp.msix"
                                 HorizontalAlignment="Left"
-                                Width="518"
-                                Margin="8,0,0,0"
+                                Width="400"
+                                Margin="10,0,0,0"
                             />
                         </StackPanel>
                     </StackPanel>
-                    
+
                     <StackPanel Margin="{StaticResource SettingsSubheaderMargin}" Orientation="Horizontal">
                         <TextBlock
                             x:Uid="Check_For_Updates" 
-                            Style="{StaticResource SubtitleTextBlockStyle}" Padding="1,0,0,0"  FontSize="15"
-                            Margin="5" VerticalAlignment="Center"
+                            Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
+                            VerticalAlignment="Center"
+                            Margin="5"
+                            Width="185"
                         />
                         <ToggleSwitch
                             x:Uid="Check_For_Updates_Switch"
                             x:Name="Check_For_Updates_Switch"
                             IsOn="{Binding IsCheckUpdates}"
                             Toggled="ToggleSwitch_Toggled"
+                            Margin="10,0,0,0"
                         />
                     </StackPanel>
 
-                    <StackPanel Margin="{StaticResource SettingsSubheaderMargin}" x:Name="Update_Settings_Stack_Panel">
-                        <StackPanel x:Name="Compatibility_Stack_Panel" Orientation="Horizontal">
+                    <StackPanel x:Name="Update_Settings_Stack_Panel">
+                        <StackPanel x:Name="Compatibility_Stack_Panel" Orientation="Horizontal" Margin="{StaticResource SettingsSubheaderMargin}">
                             <TextBlock
                             x:Uid="compat_text_block"
                             Text="Min OS Version:"
                             Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
                             Margin="5" VerticalAlignment="Center"
-                        />
-                            <ComboBox x:Name="CompatComboBox" x:Uid="CompatComboBox" PlaceholderText="Choose the min Win10 OS version" ItemsSource="{x:Bind Schemas}" SelectionChanged="CompatComboBox_SelectionChanged"/>
+                            Width="185"/>
+                            <ComboBox x:Name="CompatComboBox" x:Uid="CompatComboBox" PlaceholderText="Choose the min Win10 OS version" ItemsSource="{x:Bind Path=Schemas}" SelectionChanged="CompatComboBox_SelectionChanged" Margin="10,0,0,0"/>
                         </StackPanel>
-
-                        <StackPanel Orientation="Horizontal" x:Name="One_Update_Settings_Stack_Panel" x:Uid="One_Update_Settings_Stack_Panel" Visibility="Collapsed">
-                          
+                        <StackPanel Orientation="Vertical" x:Name="One_Update_Settings_Stack_Panel" x:Uid="One_Update_Settings_Stack_Panel" Visibility="Collapsed">
                         </StackPanel>
-
-                        <StackPanel Orientation="Horizontal" x:Name="Two_Update_Settings_Stack_Panel" x:Uid="Two_Update_Settings_Stack_Panel" Visibility="Collapsed">
-                            <TextBlock
-                            x:Uid="Update_Frequency_Text_Block"
-                            Text="Hours between update checks"
-                            Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
-                            Margin="5" VerticalAlignment="Center"
+                        <StackPanel Orientation="Vertical" x:Name="Two_Update_Settings_Stack_Panel" x:Uid="Two_Update_Settings_Stack_Panel" Visibility="Collapsed">
+                            <StackPanel Orientation="Horizontal" Margin="{StaticResource SettingsSubheaderMargin}">
+                                <TextBlock x:Uid="Update_Frequency_Text_Block"
+                                    Text="Hours between update checks"
+                                    Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
+                                    Width="185" VerticalAlignment="Center"
+                                    Margin="5"
                             />
                             <TextBox
                             x:Uid="Hours_Between_Updates_Text_Box"
@@ -217,54 +218,65 @@
                             PlaceholderText="12"
                             Width="70"
                             HorizontalAlignment="Left"
-                            FontSize="15" Margin="5" VerticalAlignment="Center"
+                            FontSize="15" Margin="10,0,0,0" VerticalAlignment="Center"
                             />
-                            
-                            <TextBlock Text="Auto background update" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
-                            Margin="5" VerticalAlignment="Center" />
-                            <ToggleSwitch
-                                Margin="21,0,0,0"
+                            </StackPanel>
+
+                            <StackPanel Orientation="Horizontal" Margin="{StaticResource SettingsSubheaderMargin}">
+                                <TextBlock Text="Auto background update checks" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
+                                Width="185" Margin="5"
+                                VerticalAlignment="Center" />
+                                <ToggleSwitch
+                                Margin="10,0,0,0"
                                 x:Uid="Auto_Update_Switch"
                                 x:Name="Auto_Update_Switch"
                                 IsOn="{Binding IsAutoUpdate}"
                                 Toggled="Auto_Update_Switch_Toggled"
+                                HorizontalAlignment="Right"
                             />
+                            </StackPanel>
                         </StackPanel>
-
-                        <StackPanel Orientation="Horizontal" x:Name="Three_Update_Settings_Stack_Panel" x:Uid="Three_Update_Settings_Stack_Panel" Visibility="Collapsed">
-                            <TextBlock Text="Force update" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
-                            Margin="5" VerticalAlignment="Center" />
-                            <ToggleSwitch
-                                Margin="21,0,0,0"
-                                x:Uid="Force_Update_Switch"
-                                x:Name="Force_Update_Switch"
-                                IsOn="{Binding IsForcedUpdate}"
-                                Toggled="Force_Update_Switch_Toggled"
-                            />
-                            
-                            <TextBlock Text="Show prompt" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
-                            Margin="5" VerticalAlignment="Center"/>
-                            <ToggleSwitch
-                                Margin="21,0,0,0"
+                        <StackPanel Orientation="Vertical" x:Name="Three_Update_Settings_Stack_Panel" x:Uid="Three_Update_Settings_Stack_Panel" Visibility="Collapsed">
+                            <StackPanel Orientation="Horizontal" Margin="{StaticResource SettingsSubheaderMargin}">
+                                <TextBlock Text="Show update prompt" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
+                                 Width="185" Margin="5" VerticalAlignment="Center"/>
+                                <ToggleSwitch
+                                Margin="10,0,0,0"
                                 x:Uid="Show_Prompt_Switch"
                                 x:Name="Show_Prompt_Switch"
                                 IsOn="{Binding IsShowPrompt}"
                                 Toggled="Show_Prompt_Switch_Toggled"
+                                HorizontalAlignment="Right"
                             />
-                            <TextBlock Text="Blocking update" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
-                            Margin="31,5,5,5" VerticalAlignment="Center"/>
-                            <ToggleSwitch
-                                Margin="2,0,0,0"
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal" Margin="{StaticResource SettingsSubheaderMargin}">
+                            <TextBlock Text="Update blocks activation" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
+                            Width="185" Margin="5" VerticalAlignment="Center"/>
+                                <ToggleSwitch
+                                Margin="10,0,0,0"
                                 x:Uid="Block_Update_Switch"
                                 x:Name="Block_Update_Switch"
                                 IsOn="{Binding IsBlockingUpdate}"
                                 Toggled="Block_Update_Switch_Toggled"
+                                HorizontalAlignment="Right"
                             />
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal" Margin="{StaticResource SettingsSubheaderMargin}">
+                                <TextBlock Text="Force update to version" Style="{StaticResource SubtitleTextBlockStyle}" FontSize="15"
+                                Width="185" Margin="5" VerticalAlignment="Center" />
+                                <ToggleSwitch
+                                Margin="10,0,0,0"
+                                x:Uid="Force_Update_Switch"
+                                x:Name="Force_Update_Switch"
+                                IsOn="{Binding IsForcedUpdate}"
+                                Toggled="Force_Update_Switch_Toggled"
+                                HorizontalAlignment="Right"
+                            />
+                            </StackPanel>
                         </StackPanel>
 
                     </StackPanel>
 
-
                 </StackPanel>
             </Grid>
         </ScrollViewer>
diff --git a/AppInstallerFileBuilder/AppInstallerFileBuilder/Views/MainPackageView.xaml.cs b/AppInstallerFileBuilder/AppInstallerFileBuilder/Views/MainPackageView.xaml.cs
index e2857b9..8ad7c5b 100644
--- a/AppInstallerFileBuilder/AppInstallerFileBuilder/Views/MainPackageView.xaml.cs
+++ b/AppInstallerFileBuilder/AppInstallerFileBuilder/Views/MainPackageView.xaml.cs
@@ -59,6 +59,7 @@ public sealed partial class MainPackageView : Page
         private StackPanel _1809updateSettingsStackPanel;
 
         private int _hoursBetweenUpdates;
+        private ScrollViewer _scrollViewer;
         
         /***************************************************************************
         * 
@@ -79,6 +80,7 @@ public MainPackageView()
             _uriPathTextBox = (TextBox)this.FindName("Uri_Path_Text_Box");
             _processorTypeStackPanel = (StackPanel)this.FindName("Processor_Type_Stack_Panel");
             _resourceIdStackPanel = (StackPanel)this.FindName("Resource_Id_Stack_Panel");
+            _scrollViewer = (ScrollViewer)this.FindName("Main_ScrollViewer");
 
             PackageInfoButton.Click += new RoutedEventHandler(PackageInfoButton_Click);
 
@@ -312,6 +314,7 @@ private void CompatComboBox_SelectionChanged(object sender, SelectionChangedEven
                     _1803updateSettingsStackPanel.Visibility = Visibility.Visible;
                     _1709updateSettingsStackPanel.Visibility = Visibility.Visible;
                     App.AppInstallerFileSchemaNamespace = "http://schemas.microsoft.com/appx/appinstaller/2018";
+                    _scrollViewer.ChangeView(0.0f, _scrollViewer.ScrollableHeight, 1.0f);
                     break;
                 case 1: //1803 and above
                     Debug.WriteLine("1");
@@ -321,6 +324,7 @@ private void CompatComboBox_SelectionChanged(object sender, SelectionChangedEven
                     _showPromptSwitch.IsOn = false;
                     _blockUpdateSwitch.IsOn = false;
                     App.AppInstallerFileSchemaNamespace = "http://schemas.microsoft.com/appx/appinstaller/2017/2";
+                    _scrollViewer.ChangeView(0.0f, _scrollViewer.ScrollableHeight/2.5, 1.0f);
                     break;
                 case 2: //1709 and above
                     Debug.WriteLine("2");
@@ -369,5 +373,9 @@ private void Auto_Update_Switch_Toggled(object sender, RoutedEventArgs e)
 
         }
 
+        private void TextBlock_SelectionChanged(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
 }