diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/AppUIBasics.csproj b/Samples/XamlUIBasics/cs/AppUIBasics/AppUIBasics.csproj
index 90f5445529..8fa2182c2c 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/AppUIBasics.csproj
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/AppUIBasics.csproj
@@ -10,8 +10,8 @@
     <AssemblyName>AppUIBasics</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17713.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17713.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17758.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <FileAlignment>512</FileAlignment>
@@ -147,7 +147,9 @@
     <Content Include="Assets\CoffeeCup.png" />
     <Content Include="Assets\ColorPicker.png" />
     <Content Include="Assets\CommandBarFlyout.png" />
+    <Content Include="Assets\CompactSizing.png" />
     <Content Include="Assets\ConnectedAnimations.png" />
+    <Content Include="Assets\Contacts.txt" />
     <Content Include="Assets\DefaultIcon.png" />
     <Content Include="Assets\DropdownButton.png" />
     <Content Include="Assets\EasingFunctions.png" />
@@ -184,7 +186,6 @@
     <Content Include="Assets\Sun-100-Black.png" />
     <Content Include="Assets\Sun.32.scale-100-White.png" />
     <Content Include="Assets\Swipe.png" />
-    <Content Include="Assets\theme_editor2.gif" />
     <Content Include="Assets\Tiles\LargeTile.scale-100.png" />
     <Content Include="Assets\Tiles\LargeTile.scale-125.png" />
     <Content Include="Assets\Tiles\LargeTile.scale-150.png" />
@@ -501,9 +502,6 @@
     <Compile Include="ControlPages\StackPanelPage.xaml.cs">
       <DependentUpon>StackPanelPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ControlPages\StandardSizingPage.xaml.cs">
-      <DependentUpon>StandardSizingPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="ControlPages\SwipePage.xaml.cs">
       <DependentUpon>SwipePage.xaml</DependentUpon>
     </Compile>
@@ -568,6 +566,9 @@
       <DependentUpon>PageHeader.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SamplePages\SampleCompactSizingPage.xaml.cs">
+      <DependentUpon>SampleCompactSizingPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SamplePages\SamplePage1.xaml.cs">
       <DependentUpon>SamplePage1.xaml</DependentUpon>
     </Compile>
@@ -583,6 +584,9 @@
     <Compile Include="SamplePages\SampleSettingsPage.xaml.cs">
       <DependentUpon>SampleSettingsPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="SamplePages\SampleStandardSizingPage.xaml.cs">
+      <DependentUpon>SampleStandardSizingPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SearchResultsPage.xaml.cs">
       <DependentUpon>SearchResultsPage.xaml</DependentUpon>
     </Compile>
@@ -680,6 +684,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ControlPages\CompactDictionary.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ControlPages\CompactSizingPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -708,10 +716,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="ControlPages\StandardSizingPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="ControlExample.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1032,6 +1036,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="SamplePages\SampleCompactSizingPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="SamplePages\SamplePage1.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1052,6 +1060,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="SamplePages\SampleStandardSizingPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="SearchResultsPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1073,12 +1085,13 @@
       <Version>6.2.0-Preview1-26502-02</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.0.180717002-prerelease</Version>
+      <Version>2.0.180916002-prerelease</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
       <Version>2.0.0</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
@@ -1090,4 +1103,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/Assets/CompactSizing.png b/Samples/XamlUIBasics/cs/AppUIBasics/Assets/CompactSizing.png
new file mode 100644
index 0000000000..4e0a60a7ef
Binary files /dev/null and b/Samples/XamlUIBasics/cs/AppUIBasics/Assets/CompactSizing.png differ
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/Assets/theme_editor2.gif b/Samples/XamlUIBasics/cs/AppUIBasics/Assets/theme_editor2.gif
deleted file mode 100644
index 58ab150ef4..0000000000
Binary files a/Samples/XamlUIBasics/cs/AppUIBasics/Assets/theme_editor2.gif and /dev/null differ
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/ColorPaletteResourcesPage.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/ColorPaletteResourcesPage.xaml
index 7c771061a8..2efa643b52 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/ColorPaletteResourcesPage.xaml
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/ColorPaletteResourcesPage.xaml
@@ -11,7 +11,7 @@
 
     <Grid>
         <StackPanel>
-            <Image Source="ms-appx:///Assets/theme_editor2.gif" HorizontalAlignment="Center"/>
+            <TextBlock Margin="0,20,0,0" Text="Coming soon..."/>
             <TextBlock Margin="0,20,0,0" Text="The ColorPaletteResources API allows you to easily access global values that adjust the theme colors of your controls. This API can also be scoped to a container or control within a page." TextWrapping="WrapWholeWords"/>
             <TextBlock Margin="0,20,0,0" Text="To learn more about this API and to see what it can do, checkout the Fluent XAML Theme Editor!" TextWrapping="WrapWholeWords"/>
             <Button IsEnabled="False" Content="Launch Editor" Margin="0,10,0,0"/>
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CommandBarFlyoutPage.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CommandBarFlyoutPage.xaml
index c4abf536f0..9464161474 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CommandBarFlyoutPage.xaml
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CommandBarFlyoutPage.xaml
@@ -18,11 +18,13 @@
         </muxcontrols:CommandBarFlyout>
     </Page.Resources>
     <StackPanel>
-        <local:ControlExample HeaderText="CommandBarFlyout for commands on an in-app object" XamlSource="CommandBarFlyout/CommandBarFlyoutSample1_xaml.txt" CSharpSource="CommandBarFlyout/CommandBarFlyoutSample1_cs.txt">
+        <local:ControlExample HeaderText="CommandBarFlyout for commands on an in-app object" XamlSource="CommandBarFlyout/CommandBarFlyoutSample1_xaml.txt"
+                              CSharpSource="CommandBarFlyout/CommandBarFlyoutSample1_cs.txt">
             <StackPanel>
                 <TextBlock Text="Click or right click the image to open a CommandBarFlyout" />
-                <Border x:Name="myImageBorder" BorderBrush="Transparent" BorderThickness="2">
-                    <Image x:Name="Image1" Width="200" Height="200" Source="/Assets/rainier.jpg" PointerPressed="Image_PointerPressed" PointerReleased="Image_PointerReleased" ContextFlyout="{x:Bind CommandBarFlyout1}"/>
+                <Border x:Name="myImageBorder" BorderBrush="Transparent" VerticalAlignment="Center" HorizontalAlignment="Center" BorderThickness="2">
+                    <Image x:Name="Image1" Height="300" Source="/Assets/rainier.jpg" PointerPressed="Image_PointerPressed"
+                           PointerReleased="Image_PointerReleased" ContextFlyout="{x:Bind CommandBarFlyout1}"/>
                 </Border>
                 <TextBlock x:Name="SelectedOptionText" Text="" />
             </StackPanel>
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CommandBarFlyoutPage.xaml.cs b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CommandBarFlyoutPage.xaml.cs
index 5660f648ce..ee11d24ad7 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CommandBarFlyoutPage.xaml.cs
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CommandBarFlyoutPage.xaml.cs
@@ -1,4 +1,5 @@
-using Windows.UI;
+using Windows.Foundation.Metadata;
+using Windows.UI;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
 using Windows.UI.Xaml.Input;
@@ -14,7 +15,7 @@ public CommandBarFlyoutPage()
         {
             this.InitializeComponent();
         }
-        
+
         public void OnClosed(object sender, object args)
         {
             myImageBorder.BorderBrush = new SolidColorBrush(Colors.Transparent);
@@ -31,12 +32,20 @@ public void Image_PointerReleased(object sender, PointerRoutedEventArgs args)
 
             if (wasLeftPointerPressed)
             {
-                FlyoutShowOptions myOption = new FlyoutShowOptions();
-                myOption.ShowMode = FlyoutShowMode.Transient;
-                myOption.Placement = FlyoutPlacementMode.RightEdgeAlignedTop;
-                CommandBarFlyout1.ShowAt(Image1, myOption);
+                if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7))
+                {
+                    FlyoutShowOptions myOption = new FlyoutShowOptions();
+                    myOption.ShowMode = FlyoutShowMode.Transient;
+                    myOption.Placement = FlyoutPlacementMode.RightEdgeAlignedTop;
+                    CommandBarFlyout1.ShowAt(Image1, myOption);
+                }
+                else
+                {
+                    CommandBarFlyout1.ShowAt(Image1);
+                }
                 wasLeftPointerPressed = false;
             }
+            args.Handled = true;
         }
 
         private void OnElementClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CompactDictionary.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CompactDictionary.xaml
new file mode 100644
index 0000000000..67bd94aa8d
--- /dev/null
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CompactDictionary.xaml
@@ -0,0 +1,30 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:AppUIBasics.ControlPages">
+
+    <Thickness x:Key="TextControlPlaceholderThemePadding">12,5,10,5</Thickness>
+    <x:Double x:Key="TextControlThemeMinHeight">23</x:Double>
+
+    <Style TargetType="TextBox">
+        <Setter Property="Padding" Value="8,1,6,1" />
+        <Setter Property="MinHeight" Value="23" />
+        <Setter Property="MaxHeight" Value="48" />
+    </Style>
+
+    <!--Password Box-->
+    <Style TargetType="PasswordBox">
+        <Setter Property="Padding" Value="8,1,6,1" />
+        <Setter Property="MinHeight" Value="23" />
+        <Setter Property="MaxHeight" Value="48" />
+    </Style>
+
+    <!--ComboBox-->
+    <Style TargetType="ComboBox">
+        <Setter Property="Margin" Value="0,0,0,0" />
+        <Setter Property="Padding" Value="12,0,0,0" />
+        <Setter Property="MinHeight" Value="24" />
+        <Setter Property="MaxHeight" Value="48" />
+    </Style>
+
+</ResourceDictionary>
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CompactSizingPage.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CompactSizingPage.xaml
index 708aee8421..8dcd909161 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CompactSizingPage.xaml
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CompactSizingPage.xaml
@@ -10,7 +10,7 @@
 //*********************************************************
 -->
     
-    <Page
+<Page
     x:Class="AppUIBasics.ControlPages.CompactSizingPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -20,16 +20,10 @@
     x:Name="compactPage"
     mc:Ignorable="d">
 
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" x:Name="CompactGrid">
-        <local:ControlExample x:Name="Example1" HeaderText="Compact Sizing for controls">
-            <StackPanel x:Name="CompactPanel">
-                <TextBlock x:Name="HeaderBlock" Text="Standard Size" FontSize="18"/>
-                <TextBox Header="First Name:" x:Name="txtfirstName" />
-                <TextBox Header="Last Name:" x:Name="txtLastName"  />
-                <PasswordBox Header="Password:" />
-                <PasswordBox Header="Confrim Password:" />
-                <DatePicker Header="Date Of Birth" />
-            </StackPanel>
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <local:ControlExample x:Name="Example1" HeaderText="Compact Sizing for controls" Loaded="Example1_Loaded">
+            <Frame x:Name="ContentFrame" />
+
             <local:ControlExample.Options>
                 <StackPanel>
                     <TextBlock Text="Fluent Standard and Compact Sizing" />
@@ -37,40 +31,17 @@
                     <RadioButton Content="Compact" Tag="CompactSize" GroupName="ControlSize" Checked="Compact_Checked" />
                 </StackPanel>
             </local:ControlExample.Options>
-            
+
             <local:ControlExample.Xaml>
-                <StackPanel>
-                    <TextBlock Text="Applying Compact Size: App Level" FontSize="20" Margin="0,12,12,12"/>
-                    <RichTextBlock Style="{StaticResource XamlCodeRichTextBlockStyle}">
-                        <Paragraph>&lt;Application.Resources&gt;</Paragraph>
-                        <Paragraph TextIndent="12">&lt;ResourceDictionary/&gt;</Paragraph>
-                        <Paragraph TextIndent="24">&lt;ResourceDictionary.MergedDictionaries&gt;</Paragraph>
-                        <Paragraph TextIndent="36">&lt;ResourceDictionary Source="CompactSize.xaml"&gt;</Paragraph>
-                        <Paragraph TextIndent="24">&lt;ResourceDictionary.MergedDictionaries/&gt;</Paragraph>
-                        <Paragraph TextIndent="12">&lt;/ResourceDictionary&gt;</Paragraph>
-                        <Paragraph>&lt;/Application.Resources&gt;</Paragraph>
-                    </RichTextBlock>
-                    <TextBlock Text="Applying Compact Size: Page Level" FontSize="20" Margin="0,12,12,12" />
-                    <RichTextBlock Style="{StaticResource XamlCodeRichTextBlockStyle}">
-                        <Paragraph>&lt;Page.Resources&gt;</Paragraph>
-                        <Paragraph TextIndent="12">&lt;ResourceDictionary/&gt;</Paragraph>
-                        <Paragraph TextIndent="24">&lt;ResourceDictionary.MergedDictionaries&gt;</Paragraph>
-                        <Paragraph TextIndent="36">&lt;ResourceDictionary Source="CompactSize.xaml"&gt;</Paragraph>
-                        <Paragraph TextIndent="24">&lt;ResourceDictionary.MergedDictionaries/&gt;</Paragraph>
-                        <Paragraph TextIndent="12">&lt;/ResourceDictionary&gt;</Paragraph>
-                        <Paragraph>&lt;/Page.Resources&gt;</Paragraph>
-                    </RichTextBlock>
-                    <TextBlock Text="Applying Compact Size: Element Level" FontSize="20" Margin="0,12,12,12" />
-                    <RichTextBlock Style="{StaticResource XamlCodeRichTextBlockStyle}">
-                        <Paragraph>&lt;Grid.Resources&gt;</Paragraph>
-                        <Paragraph TextIndent="12">&lt;ResourceDictionary/&gt;</Paragraph>
-                        <Paragraph TextIndent="24">&lt;ResourceDictionary.MergedDictionaries&gt;</Paragraph>
-                        <Paragraph TextIndent="36">&lt;ResourceDictionary Source="CompactSize.xaml"&gt;</Paragraph>
-                        <Paragraph TextIndent="24">&lt;ResourceDictionary.MergedDictionaries/&gt;</Paragraph>
-                        <Paragraph TextIndent="12">&lt;/ResourceDictionary&gt;</Paragraph>
-                        <Paragraph>&lt;/Grid.Resources&gt;</Paragraph>
-                    </RichTextBlock>
-                </StackPanel>
+                <RichTextBlock Style="{StaticResource XamlCodeRichTextBlockStyle}">
+                    <Paragraph>&lt;Application.Resources&gt;</Paragraph>
+                    <Paragraph TextIndent="12">&lt;ResourceDictionary/&gt;</Paragraph>
+                    <Paragraph TextIndent="24">&lt;ResourceDictionary.MergedDictionaries&gt;</Paragraph>
+                    <Paragraph TextIndent="36">&lt;ResourceDictionary Source="CompactSize.xaml"&gt;</Paragraph>
+                    <Paragraph TextIndent="24">&lt;ResourceDictionary.MergedDictionaries/&gt;</Paragraph>
+                    <Paragraph TextIndent="12">&lt;/ResourceDictionary&gt;</Paragraph>
+                    <Paragraph>&lt;/Application.Resources&gt;</Paragraph>
+                </RichTextBlock>
             </local:ControlExample.Xaml>
         </local:ControlExample>
     </Grid>
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CompactSizingPage.xaml.cs b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CompactSizingPage.xaml.cs
index 76675061a8..d6a94da209 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CompactSizingPage.xaml.cs
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/CompactSizingPage.xaml.cs
@@ -1,50 +1,31 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+using Windows.UI.Xaml.Media.Animation;
+using AppUIBasics.SamplePages;
 
 namespace AppUIBasics.ControlPages
 {
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
     public sealed partial class CompactSizingPage : Page
     {
-
-        ResourceDictionary compact = new ResourceDictionary();
-        Uri source = new Uri("ms-appx:///ControlPages/CompactSizing.xaml");
-
         public CompactSizingPage()
         {
             this.InitializeComponent();
+
         }
 
-        private void Standard_Checked(object sender, RoutedEventArgs e)
+        private void Example1_Loaded(object sender, RoutedEventArgs e)
         {
-            //compact.Source = source;
-            //CompactGrid.Resources.MergedDictionaries.Remove(compact);
-
+            ContentFrame.Navigate(typeof(SampleStandardSizingPage), null, new SuppressNavigationTransitionInfo());
+        }
 
+        private void Standard_Checked(object sender, RoutedEventArgs e)
+        {
+            ContentFrame.Navigate(typeof(SampleStandardSizingPage), null, new SuppressNavigationTransitionInfo());
         }
 
         private void Compact_Checked(object sender, RoutedEventArgs e)
-        {            
-            //compact.Source = source;
-            //CompactGrid.Resources.MergedDictionaries.Insert(0, compact);
-
-            Frame.Navigate(typeof(StandardSizingPage));
+        {
+            ContentFrame.Navigate(typeof(SampleCompactSizingPage), null, new SuppressNavigationTransitionInfo());
         }
     }
 }
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/DataGridPage.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/DataGridPage.xaml
index df416de5e2..8020ef76ee 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/DataGridPage.xaml
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/DataGridPage.xaml
@@ -8,17 +8,13 @@
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <StackPanel Margin="0,12,0,0">
-            <RichTextBlock TextWrapping="WrapWholeWords">
-                <Paragraph>The contents of a
-                    <Bold>DataGrid</Bold> control can be generated simply by using the
-                    <Bold>ItemsSource</Bold> property to bind to a collection of any type.
-                </Paragraph>
-                <Paragraph Margin="0,8,0,0">The built-in column types include a text column, a check box column, and a template column for hosting custom content. The built-in row type includes a drop-down details section that you can use to display additional content below the cell values. </Paragraph>
+            <RichTextBlock TextWrapping="WrapWholeWords" Margin="0,12">
+                <Paragraph>The built-in column types include a text column, a check box column, and a template column for hosting custom content. The built-in row type includes a drop-down details section that you can use to display additional content below the cell values. </Paragraph>
                 <Paragraph Margin="0,8,0,0">The DataGrid control supports common table formatting options, such as alternating row backgrounds and foregrounds and the ability to show or hide headers, grid lines, and scroll bars. Additionally, the control provides several style and template properties that you can use to completely change the appearance of the control and its rows, columns, cells, and row or column headers.</Paragraph>
             </RichTextBlock>
 
             <TextBlock Margin="0,24,0,0" Text="DataGrid is included as a part of the Windows Community Toolkit." />
-            <Button Margin="0,8,0,0" Content="Launch the Windows Community Toolkit Sample App" Click="LaunchToolkitButton_Click" />
+            <HyperlinkButton Margin="0,8,0,0" Content="Launch the Windows Community Toolkit Sample App" Click="LaunchToolkitButton_Click" />
         </StackPanel>
     </Grid>
 </Page>
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/ListViewPage.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/ListViewPage.xaml
index cf776bb0fb..779163aa9d 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/ListViewPage.xaml
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/ListViewPage.xaml
@@ -14,25 +14,11 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:AppUIBasics"
-    xmlns:common="using:AppUIBasics.Common"
-    xmlns:data="using:AppUIBasics.Data">
+    xmlns:data="using:AppUIBasics.Data"
+    xmlns:local1="using:AppUIBasics.ControlPages">
     <Page.Resources>
-        <DataTemplate x:Key="ImageTextListTemplate" x:DataType="data:ControlInfoDataItem">
-            <RelativePanel>
-                <Border Width="80" x:Name="imageBorder">
-                    <Image Width="36" Margin="0,8,0,8" Source="{x:Bind ImagePath}" />
-                </Border>
-                <StackPanel VerticalAlignment="Center" Margin="8,8,0,0" RelativePanel.RightOf="imageBorder">
-                    <TextBlock Text="{x:Bind Title}" Style="{StaticResource BaseTextBlockStyle}" />
-                    <TextBlock Text="{x:Bind Subtitle}" TextWrapping="WrapWholeWords"
-                            Style="{StaticResource CaptionTextBlockStyle}" />
-                    <TextBlock Text="{x:Bind Description}" TextWrapping="WrapWholeWords" Margin="0,8,0,0"
-                            Style="{StaticResource BodyTextBlockStyle}" />
-                </StackPanel>
-            </RelativePanel>
-        </DataTemplate>
         <DataTemplate x:Key="IconTextTemplate" x:DataType="data:ControlInfoDataItem">
-            <RelativePanel >
+            <RelativePanel>
                 <Image x:Name="image" Height="36" Width="36" Margin="0,8,0,8" Source="{x:Bind ImagePath}" Stretch="UniformToFill" />
                 <StackPanel Orientation="Vertical" VerticalAlignment="Top" Margin="8,8,0,0" RelativePanel.RightOf="image">
                     <TextBlock Text="{x:Bind Title}" Style="{StaticResource BaseTextBlockStyle}" />
@@ -41,72 +27,67 @@
             </RelativePanel>
         </DataTemplate>
         <DataTemplate x:Key="ImageTextListMailFolderTemplate" x:DataType="data:ControlInfoDataItem">
-            <Grid>
-                <TextBlock Text="{x:Bind Title}" Style="{StaticResource BaseTextBlockStyle}" Margin="8,0,0,0"
-                        HorizontalAlignment="Left" TextWrapping="Wrap" />
-            </Grid>
-        </DataTemplate>
-        <DataTemplate x:Key="ImageOverlayTemplate" x:DataType="data:ControlInfoDataItem">
-            <Grid >
-                <Grid.RowDefinitions>
-                    <RowDefinition />
-                    <RowDefinition />
-                </Grid.RowDefinitions>
+            <Grid Margin="0,12,0,12">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" MinWidth="550"/>
                 </Grid.ColumnDefinitions>
-                <Image Source="{x:Bind ImagePath}" Stretch="Uniform" Width="36" Grid.Column="1" Grid.RowSpan="2" Margin="0,8,0,8" />
-                <Border Background="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" Margin="0,8,0,8">
-                    <TextBlock Text="{x:Bind Title}" Margin="8,8,0,0" TextWrapping="Wrap" HorizontalAlignment="Left"
-                            Style="{StaticResource BaseTextBlockStyle}" />
-                </Border>
-                <TextBlock Text="{x:Bind Subtitle}" Grid.Row="1" Style="{StaticResource BodyTextBlockStyle}"
-                        TextWrapping="Wrap" Margin="8,0,0,0" />
+                <TextBlock Text="{x:Bind Title}" Margin="0,12,0,0" HorizontalAlignment="Left" TextWrapping="Wrap" />
             </Grid>
         </DataTemplate>
-    </Page.Resources>
-    <StackPanel>
-        <local:ControlExample HeaderText="Content inside of a ListView.">
 
+        <!-- Use a collection view source for content that presents itself as a list of items that can be grouped or sorted.  Otherwise, you can use x:Bind
+        directly on the ListView's item source to for further optimization. Please see the AppUIBasics sample for an example of how to do this.  -->
+        <CollectionViewSource x:Name="ContactsCVS" IsSourceGrouped="True" />
+
+        <!-- When using x:Bind, you need to set x:DataType -->
+        <DataTemplate x:Name="ContactListViewTemplate" x:DataType="local1:Contact">
             <Grid>
                 <Grid.RowDefinitions>
-                    <RowDefinition />
-                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
-
-                <ListView x:Name="Control1"
-                    ItemsSource="{x:Bind Items}"
-                    ItemTemplate="{StaticResource ImageTextListTemplate}"
-                    CanDragItems="{x:Bind DragCheckBox.IsChecked.Value, Mode=OneWay}"
-                    IsItemClickEnabled="{x:Bind ItemClickCheckBox.IsChecked.Value, Mode=OneWay}"
-                    IsSwipeEnabled="{x:Bind SwipeCheckBox.IsChecked.Value, Mode=OneWay}"
-                    SelectionChanged="Control1_SelectionChanged"
-                    ItemClick="Control1_ItemClick"
-                    Height="400" />
-
-                <StackPanel Grid.Row="1">
-                    <TextBlock x:Name="ClickOutput" Style="{StaticResource OutputTextBlockStyle}" />
-                    <TextBlock x:Name="SelectionOutput" Style="{StaticResource OutputTextBlockStyle}" />
-                </StackPanel>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Ellipse x:Name="Ellipse"
+                         Grid.RowSpan="2"
+                         Width ="32"
+                         Height="32"
+                         Margin="6"
+                         VerticalAlignment="Center"
+                         HorizontalAlignment="Center"
+                         Fill="Gray"/>
+                <TextBlock Grid.Column="1"
+                           Text="{x:Bind Name}"
+                           x:Phase="1"
+                           Style="{ThemeResource BaseTextBlockStyle}"
+                           Margin="12,6,0,0"/>
+                <TextBlock  Grid.Column="1"
+                            Grid.Row="1"
+                            Text="{x:Bind Company}"
+                            x:Phase="2"
+                            Style="{ThemeResource BodyTextBlockStyle}"
+                            Margin="12,0,0,6"/>
             </Grid>
+        </DataTemplate>
 
+        <DataTemplate x:Key="ContactListViewTemplate2" x:DataType="local1:Contact">
+            <Grid Margin="0,12,0,12">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" MinWidth="550"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock Grid.Column="1"
+                           Text="{x:Bind Name}"
+                           x:Phase="1"
+                           Margin="0,12,0,0"/>
+            </Grid>
+        </DataTemplate>
+    </Page.Resources>
+    <StackPanel>
+        <local:ControlExample HeaderText="A Simple ListView with Selection support">
             <local:ControlExample.Options>
                 <StackPanel>
-                    <TextBlock Text="ItemTemplate" Margin="0,0,0,10" />
-                    <RadioButton Content="Image overlay" GroupName="Template" Tag="ImageOverlayTemplate"
-                        Click="ItemTemplate_Click" />
-                    <RadioButton Content="Icon/Text" GroupName="Template" Tag="IconTextTemplate"
-                        Click="ItemTemplate_Click" />
-                    <RadioButton Content="Image/Text" GroupName="Template" Tag="ImageTextListTemplate"
-                        Click="ItemTemplate_Click" IsChecked="True" />
-                    <RadioButton Content="Text" GroupName="Template" Tag="ImageTextListMailFolderTemplate"
-                        Click="ItemTemplate_Click" />
-                    <ToggleButton Content="Reverse FlowDirection" Click="FlowDirectionCheckBox_Click" Margin="0,8,0,0" />
-                    <TextBlock Text="ListView Properties" Margin="0,16,0,10" />
-                    <CheckBox x:Name="ItemClickCheckBox" Content="IsItemClickEnabled" Click="ItemClickCheckBox_Click" />
-                    <CheckBox x:Name="SwipeCheckBox" Content="IsSwipeEnabled" />
-                    <CheckBox x:Name="DragCheckBox" Content="CanDragItems" />
                     <ComboBox SelectionChanged="SelectionModeComboBox_SelectionChanged" Header="SelectionMode"
                         SelectedIndex="1" Margin="0,12,0,0">
                         <x:String>None</x:String>
@@ -116,26 +97,169 @@
                     </ComboBox>
                 </StackPanel>
             </local:ControlExample.Options>
+            <Grid MinWidth="550" Height="400">
+                <ListView
+                    x:Name="Control2"
+                    ItemsSource="{x:Bind ContactsCVS.View, Mode=OneWay}"
+                    CanDragItems="True"
+                    CanReorderItems="True"
+                    AllowDrop="True"
+                    BorderThickness="1"
+                    BorderBrush="DimGray" />
+            </Grid>
+
             <local:ControlExample.Xaml>
                 <RichTextBlock Style="{StaticResource XamlCodeRichTextBlockStyle}">
-                    <Paragraph>&lt;ListView ItemsSource="{x:Bind Groups}"</Paragraph>
-                    <Paragraph TextIndent="24">ItemTemplate="{StaticResource
-                        <Run x:Name="itemTemplate">ImageTextListTemplate</Run>}"
-                    </Paragraph>
-                    <Paragraph TextIndent="24">
-                        IsItemClickEnabled="<Run Text="{x:Bind Control1.IsItemClickEnabled, Converter={StaticResource valueToStringConverter}, Mode=OneWay}"></Run>"
-                    </Paragraph>
-                    <Paragraph TextIndent="24">
-                        IsSwipeEnabled="<Run Text="{x:Bind Control1.IsSwipeEnabled, Converter={StaticResource valueToStringConverter}, Mode=OneWay}"/>"
-                    </Paragraph>
-                    <Paragraph TextIndent="24">
-                        CanDragItems="<Run Text="{x:Bind Control1.CanDragItems, Converter={StaticResource valueToStringConverter}, Mode=OneWay}"/>"
-                    </Paragraph>
-                    <Paragraph TextIndent="24">
-                        SelectionMode="<Run Text="{x:Bind Control1.SelectionMode, Converter={StaticResource valueToStringConverter}, Mode=OneWay}"/>" /&gt;
+                    <Paragraph>&lt;ListView ItemsSource="{x:Bind Contacts}" SelectionMode="
+                        <Run Text="{x:Bind Control2.SelectionMode, Converter={StaticResource valueToStringConverter}, Mode=OneWay}"/> "/&gt;
                     </Paragraph>
                 </RichTextBlock>
             </local:ControlExample.Xaml>
         </local:ControlExample>
+
+        <local:ControlExample HeaderText="A ListView with Grouped Headers">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" MinWidth="550"/>
+                </Grid.ColumnDefinitions>
+
+                <ListView ItemsSource="{x:Bind ContactsCVS.View, Mode=OneWay}"
+                  ItemTemplate="{StaticResource ContactListViewTemplate}"
+                  SelectionMode="Single"
+                  ShowsScrollingPlaceholders="True"
+                  Grid.Row="1"
+                  Grid.ColumnSpan="2" Style="{ThemeResource TitleTextBlockStyle}" Height="400" BorderThickness="1" BorderBrush="DimGray">
+                    <ListView.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <ItemsStackPanel AreStickyGroupHeadersEnabled="False" />
+                        </ItemsPanelTemplate>
+                    </ListView.ItemsPanel>
+
+                    <ListView.GroupStyle>
+                        <GroupStyle >
+                            <GroupStyle.HeaderTemplate>
+                                <DataTemplate x:DataType="local1:GroupInfoList">
+                                    <TextBlock Text="{x:Bind Key}"
+                                       Style="{ThemeResource TitleTextBlockStyle}"/>
+                                </DataTemplate>
+                            </GroupStyle.HeaderTemplate>
+                        </GroupStyle>
+                    </ListView.GroupStyle>
+                </ListView>
+            </Grid>
+
+            <local:ControlExample.Xaml>
+                <RichTextBlock Style="{StaticResource XamlCodeRichTextBlockStyle}">
+                    <Paragraph>&lt;CollectionViewSource x:Name="ContactsCVS" IsSourceGrouped="True"/&gt;</Paragraph>
+                    <Paragraph />
+                    <Paragraph>&lt;ListView ItemsSource="{x:Bind Contacts}"/&gt;</Paragraph>
+                    <Paragraph TextIndent="12">&lt;ListView.ItemsPanel/&gt;</Paragraph>
+                    <Paragraph TextIndent="24">&lt;ItemsPanelTemplate/&gt;</Paragraph>
+                    <Paragraph TextIndent="36">&lt;ItemsStackPanel AreStickyGroupHeadersEnabled="False"/&gt;</Paragraph>
+                    <Paragraph TextIndent="24">&lt;ItemsPanelTemplate /&gt;</Paragraph>
+                    <Paragraph TextIndent="12">&lt;ListView.ItemsPanel/&gt;</Paragraph>
+                    <Paragraph>&lt;ListView/&gt;</Paragraph>
+                </RichTextBlock>
+            </local:ControlExample.Xaml>
+        </local:ControlExample>
+
+        <local:ControlExample HeaderText="A ListView with Grouped Sticky Headers">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" MinWidth="550"/>
+                </Grid.ColumnDefinitions>
+
+                <ListView ItemsSource="{x:Bind ContactsCVS.View, Mode=OneWay}"
+                  ItemTemplate="{StaticResource ContactListViewTemplate}"
+                  SelectionMode="Single"
+                  ShowsScrollingPlaceholders="True"
+                  Grid.Row="1"
+                  Grid.ColumnSpan="2"
+                  Style="{ThemeResource TitleTextBlockStyle}" Height="400" BorderThickness="1" BorderBrush="DimGray">
+                    <ListView.GroupStyle>
+                        <GroupStyle >
+                            <GroupStyle.HeaderTemplate>
+                                <DataTemplate x:DataType="local1:GroupInfoList">
+                                    <TextBlock Text="{x:Bind Key}"
+                                       Style="{ThemeResource TitleTextBlockStyle}"/>
+                                </DataTemplate>
+                            </GroupStyle.HeaderTemplate>
+                        </GroupStyle>
+                    </ListView.GroupStyle>
+                </ListView>
+            </Grid>
+
+            <local:ControlExample.Xaml>
+                <RichTextBlock Style="{StaticResource XamlCodeRichTextBlockStyle}">
+                    <Paragraph>&lt;CollectionViewSource x:Name="ContactsCVS" IsSourceGrouped="True"/&gt;</Paragraph>
+                    <Paragraph />
+                    <Paragraph>&lt;ListView ItemsSource="{x:Bind Contacts}"/&gt;</Paragraph>
+                    <Paragraph TextIndent="12">&lt;ListView.ItemsPanel/&gt;</Paragraph>
+                    <Paragraph TextIndent="24">&lt;ItemsPanelTemplate/&gt;</Paragraph>
+                    <Paragraph TextIndent="36">&lt;ItemsStackPanel AreStickyGroupHeadersEnabled="True"/&gt;</Paragraph>
+                    <Paragraph TextIndent="24">&lt;ItemsPanelTemplate /&gt;</Paragraph>
+                    <Paragraph TextIndent="12">&lt;ListView.ItemsPanel/&gt;</Paragraph>
+                    <Paragraph>&lt;ListView/&gt;</Paragraph>
+                </RichTextBlock>
+            </local:ControlExample.Xaml>
+        </local:ControlExample>
+
+        <local:ControlExample HeaderText="A ListView with Images">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <ListView x:Name="Control4"
+                          CanDragItems="True"
+                          CanReorderItems="True"
+                          CanDrag="True"
+                          AllowDrop="True"
+                          Height="400"
+                          Width="550"
+                          BorderThickness="1"
+                          BorderBrush="DimGray">
+                    <ListView.ItemTemplate>
+                        <DataTemplate x:DataType="local1:CustomDataObject">
+                            <Grid Margin="0,12,0,12">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" MinWidth="150"/>
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Image Source="{x:Bind ImageLocation}" MaxHeight="100" Stretch="Fill"/>
+
+                                <StackPanel Margin="12,0,0,0" Grid.Column="1" >
+                                    <TextBlock Text="{x:Bind Title}" FontFamily="Segoe UI" FontSize="14" FontWeight="SemiBold" Style="{ThemeResource BaseTextBlockStyle}" HorizontalAlignment="Left" Margin="0,0,0,6" LineHeight="20"/>
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="{x:Bind Description}" FontFamily="Segoe UI" FontWeight="Normal" LineHeight="20" Style="{ThemeResource BodyTextBlockStyle}" TextTrimming="CharacterEllipsis" Width="350" MaxLines="1"/>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="{x:Bind Views}" FontFamily="Segoe UI" FontSize="12" FontWeight="Normal" HorizontalAlignment="Left" Style="{ThemeResource CaptionTextBlockStyle}" Margin="0,0,0,0"/>
+                                        <TextBlock Text=" Views " FontFamily="Segoe UI" FontSize="12" FontWeight="Normal" HorizontalAlignment="Left" Style="{ThemeResource CaptionTextBlockStyle}"/>
+                                        <TextBlock Text=" &#x22C5; " FontFamily="Segoe UI" FontSize="12" FontWeight="Bold" HorizontalAlignment="Left"/>
+                                        <TextBlock Text="{x:Bind Likes}" FontFamily="Segoe UI" FontSize="12" FontWeight="Normal" HorizontalAlignment="Left" Style="{ThemeResource CaptionTextBlockStyle}" Margin="5,0,0,0"/>
+                                        <TextBlock Text=" Likes" FontFamily="Segoe UI" FontSize="12" FontWeight="Normal" HorizontalAlignment="Left" Style="{ThemeResource CaptionTextBlockStyle}"/>
+                                    </StackPanel>
+                                </StackPanel>
+                            </Grid>
+                        </DataTemplate>
+                    </ListView.ItemTemplate>
+                </ListView>
+            </Grid>
+            <local:ControlExample.Xaml>
+                <RichTextBlock TextWrapping="WrapWholeWords">
+                    <Paragraph>Refer to the DataTemplate on the ListViewPage.xaml page to get this visual of Images in a list</Paragraph>
+                </RichTextBlock>
+            </local:ControlExample.Xaml>
+        </local:ControlExample>
     </StackPanel>
 </local:ItemsPageBase>
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/ListViewPage.xaml.cs b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/ListViewPage.xaml.cs
index f26b1850ee..a8be6f7305 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/ListViewPage.xaml.cs
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/ListViewPage.xaml.cs
@@ -7,19 +7,18 @@
 // PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
 //
 //*********************************************************
-using AppUIBasics.Common;
 using AppUIBasics.Data;
+using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
-using Windows.UI.Xaml;
+using System.Threading.Tasks;
+using Windows.Storage;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 
 namespace AppUIBasics.ControlPages
 {
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
     public sealed partial class ListViewPage : ItemsPageBase
     {
         public ListViewPage()
@@ -27,72 +26,91 @@ public ListViewPage()
             this.InitializeComponent();
         }
 
-        protected override void OnNavigatedTo(NavigationEventArgs e)
+        protected override async void OnNavigatedTo(NavigationEventArgs e)
         {
-            base.OnNavigatedTo(e);
-
             Items = ControlInfoDataSource.Instance.Groups.Take(3).SelectMany(g => g.Items).ToList();
-        }
-
-        private void ItemTemplate_Click(object sender, RoutedEventArgs e)
-        {
-            var template = (sender as FrameworkElement).Tag.ToString();
-            Control1.ItemTemplate = (DataTemplate)this.Resources[template];
-            itemTemplate.Text = template;
-        }
-
-        private void Control1_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (sender is ListView listView)
-            {
-                SelectionOutput.Text = string.Format("You have selected {0} item(s).", listView.SelectedItems.Count);
-            }
-        }
-
-        private void Control1_ItemClick(object sender, ItemClickEventArgs e)
-        {
-            ClickOutput.Text = string.Format("You clicked {0}.", e.ClickedItem.ToString());
-        }
-
-        private void ItemClickCheckBox_Click(object sender, RoutedEventArgs e)
-        {
-            ClickOutput.Text = string.Empty;
-        }
-
-        private void FlowDirectionCheckBox_Click(object sender, RoutedEventArgs e)
-        {
-            if (Control1.FlowDirection == FlowDirection.LeftToRight)
-            {
-                Control1.FlowDirection = FlowDirection.RightToLeft;
-            }
-            else
-            {
-                Control1.FlowDirection = FlowDirection.LeftToRight;
-            }
+            Control4.ItemsSource = AppUIBasics.ControlPages.CustomDataObject.GetDataObjects();
+            ContactsCVS.Source = await Contact.GetContactsGroupedAsync();
         }
 
         private void SelectionModeComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (Control1 != null)
+            if (Control2 != null)
             {
                 string colorName = e.AddedItems[0].ToString();
                 switch (colorName)
                 {
                     case "None":
-                        Control1.SelectionMode = ListViewSelectionMode.None;
-                        SelectionOutput.Text = string.Empty;
+                        Control2.SelectionMode = ListViewSelectionMode.None;
                         break;
                     case "Single":
-                        Control1.SelectionMode = ListViewSelectionMode.Single;
+                        Control2.SelectionMode = ListViewSelectionMode.Single;
                         break;
                     case "Multiple":
-                        Control1.SelectionMode = ListViewSelectionMode.Multiple;
+                        Control2.SelectionMode = ListViewSelectionMode.Multiple;
                         break;
                     case "Extended":
-                        Control1.SelectionMode = ListViewSelectionMode.Extended;
+                        Control2.SelectionMode = ListViewSelectionMode.Extended;
                         break;
                 }
             }
         }
     }
+
+    public class Contact
+    {
+        #region Properties
+        public string FirstName { get; private set; }
+        public string LastName { get; private set; }
+        public string Company { get; private set; }
+        public string Name => FirstName + " " + LastName;
+        #endregion
+
+        public Contact(string firstName, string lastName, string company)
+        {
+            FirstName = firstName;
+            LastName = lastName;
+            Company = company;
+        }
+
+        #region Public Methods
+        public static async Task<ObservableCollection<Contact>> GetContactsAsync()
+        {
+            StorageFile file = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/Contacts.txt"));
+            IList<string> lines = await FileIO.ReadLinesAsync(file);
+
+            var contacts = new ObservableCollection<Contact>();
+
+            for (int i = 0; i < lines.Count; i += 3)
+            {
+                contacts.Add(new Contact(lines[i], lines[i + 1], lines[i + 2]));
+            }
+
+            return contacts;
+        }
+
+        public static async Task<ObservableCollection<GroupInfoList>> GetContactsGroupedAsync()
+        {
+            var query = from item in await GetContactsAsync()
+                        group item by item.LastName.Substring(0, 1).ToUpper() into g
+                        orderby g.Key
+                        select new GroupInfoList(g) { Key = g.Key };
+
+            return new ObservableCollection<GroupInfoList>(query);
+        }
+
+        public override string ToString()
+        {
+            return Name;
+        }
+        #endregion
+    }
+
+    public class GroupInfoList : List<object>
+    {
+        public GroupInfoList(IEnumerable<object> items) : base(items)
+        {
+        }
+        public object Key { get; set; }
+    }
 }
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/StandardSizingPage.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/StandardSizingPage.xaml
deleted file mode 100644
index bd733baa1e..0000000000
--- a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/StandardSizingPage.xaml
+++ /dev/null
@@ -1,284 +0,0 @@
-<!--
-//*********************************************************
-//
-// Copyright (c) Microsoft. All rights reserved.
-// THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY
-// IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
-// PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
-//
-//*********************************************************
--->
-    <Page
-    x:Class="AppUIBasics.ControlPages.StandardSizingPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:AppUIBasics"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
-
-    <Page.Resources>
-        
-        <x:Double x:Key="FlyoutThemeMinHeight">32</x:Double>
-        
-        <!--CompactDatePicker Resources-->
-        <x:Double x:Key="DatePickerButtonHeight">24</x:Double>
-        <Thickness x:Key="DayButtonPadding">0,0,0,2</Thickness>
-        <Thickness x:Key="MonthButtonPadding">10,0,0,2</Thickness>
-        <Thickness x:Key="YearButtonPadding">0,0,0,1</Thickness>
-        <x:Double x:Key="DatePickerFlyoutPresenterHighlightHeight">32</x:Double>
-        <x:Double x:Key="DatePickerFlyoutPresenterAcceptDismissHostGridHeight">32</x:Double>
-        <x:Double x:Key="DatePickerFlyoutPresenterItemHeight">32</x:Double>
-
-        <!--CompactDatePickerTemplate-->
-        <Style TargetType="DatePicker">
-            <Setter Property="Orientation" Value="Horizontal" />
-            <Setter Property="IsTabStop" Value="False" />
-            <Setter Property="MinWidth" Value="296" />
-            <Setter Property="MaxWidth" Value="456" />
-            <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-            <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-            <Setter Property="Foreground" Value="{ThemeResource DatePickerButtonForeground}" />
-            <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-            <Setter Property="UseSystemFocusVisuals" Value="{ThemeResource IsApplicationFocusVisualKindReveal}" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="DatePicker">
-                        <StackPanel x:Name="LayoutRoot" Margin="{TemplateBinding Padding}">
-                            <StackPanel.Resources>
-                                <Style x:Key="DatePickerFlyoutButtonStyle" TargetType="Button">
-                                    <Setter Property="UseSystemFocusVisuals" Value="False" />
-                                    <Setter Property="ElementSoundMode" Value="FocusOnly" />
-                                    <Setter Property="Height" Value="{ThemeResource DatePickerButtonHeight}" />
-                                    <Setter Property="Template">
-                                        <Setter.Value>
-                                            <ControlTemplate TargetType="Button">
-                                                <Grid Background="{TemplateBinding Background}">
-                                                    <VisualStateManager.VisualStateGroups>
-                                                        <VisualStateGroup x:Name="CommonStates">
-                                                            <VisualState x:Name="Normal" />
-                                                            <VisualState x:Name="PointerOver">
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DatePickerButtonBorderBrushPointerOver}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DatePickerButtonBackgroundPointerOver}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DatePickerButtonForegroundPointerOver}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                            <VisualState x:Name="Pressed">
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DatePickerButtonBackgroundPressed}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DatePickerButtonBorderBrushPressed}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DatePickerButtonForegroundPressed}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                            <VisualState x:Name="Disabled">
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DatePickerButtonBackgroundDisabled}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DatePickerButtonBorderBrushDisabled}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DatePickerButtonForegroundDisabled}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                        </VisualStateGroup>
-                                                        <VisualStateGroup x:Name="FocusStates">
-                                                            <VisualState x:Name="Focused">
-                                                                <Storyboard>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DatePickerButtonBackgroundFocused}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DatePickerButtonForegroundFocused}" />
-                                                                    </ObjectAnimationUsingKeyFrames>
-                                                                </Storyboard>
-                                                            </VisualState>
-                                                            <VisualState x:Name="Unfocused" />
-                                                            <VisualState x:Name="PointerFocused" />
-                                                        </VisualStateGroup>
-                                                    </VisualStateManager.VisualStateGroups>
-                                                    <ContentPresenter x:Name="ContentPresenter"
-                                                    BorderBrush="{ThemeResource DatePickerButtonBorderBrush}"
-                                                    Background="{ThemeResource DatePickerButtonBackground}"
-                                                    BorderThickness="2"
-                                                    Content="{TemplateBinding Content}"
-                                                    Foreground="{TemplateBinding Foreground}"
-                                                    HorizontalContentAlignment="Stretch"
-                                                    VerticalContentAlignment="Stretch"
-                                                    AutomationProperties.AccessibilityView="Raw" />
-                                                </Grid>
-                                            </ControlTemplate>
-                                        </Setter.Value>
-                                    </Setter>
-                                </Style>
-                            </StackPanel.Resources>
-
-                            <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Normal" />
-
-                                    <VisualState x:Name="Disabled">
-
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DatePickerHeaderForegroundDisabled}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FirstPickerSpacing" Storyboard.TargetProperty="Fill">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DatePickerSpacerFillDisabled}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SecondPickerSpacing" Storyboard.TargetProperty="Fill">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DatePickerSpacerFillDisabled}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                </VisualStateGroup>
-
-                            </VisualStateManager.VisualStateGroups>
-                            <ContentPresenter x:Name="HeaderContentPresenter"
-                            x:DeferLoadStrategy="Lazy"
-                            Visibility="Collapsed"
-                            Content="{TemplateBinding Header}"
-                            ContentTemplate="{TemplateBinding HeaderTemplate}"
-                            Margin="0,0,0,8"
-                            Foreground="{ThemeResource DatePickerHeaderForeground}"
-                            AutomationProperties.AccessibilityView="Raw" />
-                            <Button x:Name="FlyoutButton"
-                            Style="{StaticResource DatePickerFlyoutButtonStyle}"
-                            Foreground="{TemplateBinding Foreground}"
-                            Background="{TemplateBinding Background}"
-                            IsEnabled="{TemplateBinding IsEnabled}"
-                            HorizontalAlignment="Stretch"
-                            HorizontalContentAlignment="Stretch"
-                            UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}">
-                                <Grid x:Name="FlyoutButtonContentGrid">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="78*" x:Name="DayColumn" />
-                                        <ColumnDefinition Width="Auto" x:Name="FirstSpacerColumn" />
-                                        <ColumnDefinition Width="132*" x:Name="MonthColumn" />
-                                        <ColumnDefinition Width="Auto" x:Name="SecondSpacerColumn" />
-                                        <ColumnDefinition Width="78*" x:Name="YearColumn" />
-                                    </Grid.ColumnDefinitions>
-                                    <TextBlock x:Name="DayTextBlock"
-                                    Text="Day"
-                                    TextAlignment="Center"
-                                    Padding="{ThemeResource DayButtonPadding}"
-                                    FontFamily="{TemplateBinding FontFamily}"
-                                    FontWeight="{TemplateBinding FontWeight}"
-                                    FontSize="{TemplateBinding FontSize}"
-                                AutomationProperties.AccessibilityView="Raw" />
-                                    <TextBlock x:Name="MonthTextBlock"
-                                    Text="Month"
-                                    TextAlignment="Left"
-                                    Padding="{ThemeResource MonthButtonPadding}"
-                                    FontFamily="{TemplateBinding FontFamily}"
-                                    FontWeight="{TemplateBinding FontWeight}"
-                                    FontSize="{TemplateBinding FontSize}"
-                                    AutomationProperties.AccessibilityView="Raw" />
-                                    <TextBlock x:Name="YearTextBlock"
-                                    Text="Year"
-                                    TextAlignment="Center"
-                                    Padding="{ThemeResource MonthButtonPadding}"
-                                    FontFamily="{TemplateBinding FontFamily}"
-                                    FontWeight="{TemplateBinding FontWeight}"
-                                    FontSize="{TemplateBinding FontSize}"
-                                    AutomationProperties.AccessibilityView="Raw" />
-                                    <Rectangle x:Name="FirstPickerSpacing"
-                                    Fill="{ThemeResource DatePickerSpacerFill}"
-                                    HorizontalAlignment="Center"
-                                    Width="2"
-                                    Grid.Column="1" />
-                                    <Rectangle x:Name="SecondPickerSpacing"
-                                    Fill="{ThemeResource DatePickerSpacerFill}"
-                                    HorizontalAlignment="Center"
-                                    Width="2"
-                                    Grid.Column="3" />
-                                </Grid>
-                            </Button>
-                        </StackPanel>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <!-- Compact TextBox with header-->
-        <x:Double x:Key="TextControlThemeMinHeight">48</x:Double>
-        <Thickness x:Key="TextControlBorderThemeThickness">2</Thickness>
-        <Thickness x:Key="TextControlMarginThemeThickness">0,9.5,0,9.5</Thickness>
-        <x:Double x:Key="TextControlThemeMinWidth">64</x:Double>
-        <Thickness x:Key="TextControlThemePadding">8,1,6,1</Thickness>
-        <Thickness x:Key="TextControlPlaceholderThemePadding">12,5,10,5</Thickness>
-
-    </Page.Resources>
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <local:ControlExample x:Name="Example1" HeaderText="Compact spacing for controls">
-            <StackPanel>
-                <TextBlock x:Name="HeaderBlock" Text="Compact Spacing" FontSize="18"/>
-                <TextBox Header="First Name:" x:Name="txtfirstName" />
-                <TextBox Header="Last Name:" x:Name="txtLastName"  />
-                <PasswordBox Header="Password:" />
-                <PasswordBox Header="Confrim Password:" />
-                <DatePicker Header="Date Of Birth" />
-            </StackPanel>
-            <local:ControlExample.Options>
-                <StackPanel>
-                    <TextBlock Text="Fluent Standard and Compact Sizing" />
-                    <RadioButton Content="Standard" Tag="StandardSize" GroupName="ControlSize" Checked="Standard_Checked" />
-                    <RadioButton Content="Compact" Tag="CompactSize" GroupName="ControlSize" Checked="Compact_Checked" IsChecked="True" />
-                </StackPanel>
-            </local:ControlExample.Options>
-
-            <local:ControlExample.Xaml>
-                <StackPanel>
-                    <TextBlock Text="Applying Compact Size: App Level" FontSize="20" Margin="0,12,12,12"/>
-                    <RichTextBlock Style="{StaticResource XamlCodeRichTextBlockStyle}">
-                        <Paragraph>&lt;Application.Resources&gt;</Paragraph>
-                        <Paragraph TextIndent="12">&lt;ResourceDictionary/&gt;</Paragraph>
-                        <Paragraph TextIndent="24">&lt;ResourceDictionary.MergedDictionaries&gt;</Paragraph>
-                        <Paragraph TextIndent="36">&lt;ResourceDictionary Source="CompactSize.xaml"&gt;</Paragraph>
-                        <Paragraph TextIndent="24">&lt;ResourceDictionary.MergedDictionaries/&gt;</Paragraph>
-                        <Paragraph TextIndent="12">&lt;/ResourceDictionary&gt;</Paragraph>
-                        <Paragraph>&lt;/Application.Resources&gt;</Paragraph>
-                    </RichTextBlock>
-                    <TextBlock Text="Applying Compact Size: Page Level" FontSize="20" Margin="0,12,12,12" />
-                    <RichTextBlock Style="{StaticResource XamlCodeRichTextBlockStyle}">
-                        <Paragraph>&lt;Page.Resources&gt;</Paragraph>
-                        <Paragraph TextIndent="12">&lt;ResourceDictionary/&gt;</Paragraph>
-                        <Paragraph TextIndent="24">&lt;ResourceDictionary.MergedDictionaries&gt;</Paragraph>
-                        <Paragraph TextIndent="36">&lt;ResourceDictionary Source="CompactSize.xaml"&gt;</Paragraph>
-                        <Paragraph TextIndent="24">&lt;ResourceDictionary.MergedDictionaries/&gt;</Paragraph>
-                        <Paragraph TextIndent="12">&lt;/ResourceDictionary&gt;</Paragraph>
-                        <Paragraph>&lt;/Page.Resources&gt;</Paragraph>
-                    </RichTextBlock>
-                    <TextBlock Text="Applying Compact Size: Element Level" FontSize="20" Margin="0,12,12,12" />
-                    <RichTextBlock Style="{StaticResource XamlCodeRichTextBlockStyle}">
-                        <Paragraph>&lt;Grid.Resources&gt;</Paragraph>
-                        <Paragraph TextIndent="12">&lt;ResourceDictionary/&gt;</Paragraph>
-                        <Paragraph TextIndent="24">&lt;ResourceDictionary.MergedDictionaries&gt;</Paragraph>
-                        <Paragraph TextIndent="36">&lt;ResourceDictionary Source="CompactSize.xaml"&gt;</Paragraph>
-                        <Paragraph TextIndent="24">&lt;ResourceDictionary.MergedDictionaries/&gt;</Paragraph>
-                        <Paragraph TextIndent="12">&lt;/ResourceDictionary&gt;</Paragraph>
-                        <Paragraph>&lt;/Grid.Resources&gt;</Paragraph>
-                    </RichTextBlock>
-                </StackPanel>
-            </local:ControlExample.Xaml>
-        </local:ControlExample>
-    </Grid>
-</Page>
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/UICommandPage.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/UICommandPage.xaml
index a904ba4eec..8093efe308 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/UICommandPage.xaml
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/UICommandPage.xaml
@@ -8,7 +8,6 @@
       xmlns:muxcontrols="using:Microsoft.UI.Xaml.Controls"
       mc:Ignorable="d">
     <Page.Resources>
-
         <Style x:Key="HorizontalSwipe" TargetType="ListViewItem" BasedOn="{StaticResource ListViewItemRevealStyle}">
             <Setter Property="Height" Value="60"/>
             <Setter Property="Padding" Value="0"/>
@@ -19,8 +18,13 @@
     </Page.Resources>
 
     <StackPanel>
-        <local:ControlExample HeaderText="Exposing a command in multiple controls using UICommand" XamlSource="UICommand\UICommandSample1_xaml.txt" CSharpSource="UICommand\UICommandSample1_cs.txt" HorizontalContentAlignment="Stretch">
-            <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <local:ControlExample HeaderText="Exposing a command in multiple controls using UICommand"
+                              XamlSource="UICommand\UICommandSample1_xaml.txt"
+                              CSharpSource="UICommand\UICommandSample1_cs.txt"
+                              HorizontalContentAlignment="Stretch"
+                              MinimumUniversalAPIContract="7"
+                              Loaded="ControlExample_Loaded">
+            <Grid x:Name="rootGrid" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/UICommandPage.xaml.cs b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/UICommandPage.xaml.cs
index 6b47dc3494..43c98ba08c 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/UICommandPage.xaml.cs
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/UICommandPage.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Windows.Input;
+using Windows.Foundation.Metadata;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Input;
@@ -16,20 +17,10 @@ public class ListItemData
     public sealed partial class UICommandPage : Page
     {
         ObservableCollection<ListItemData> collection = new ObservableCollection<ListItemData>();
+
         public UICommandPage()
         {
             this.InitializeComponent();
-
-            //EditMenuBarItem.AccessKey = "E";
-            var deleteCommand = new StandardUICommand(StandardUICommandKind.Delete);
-            deleteCommand.ExecuteRequested += DeleteCommand_ExecuteRequested;
-
-            DeleteFlyoutItem.Command = deleteCommand;
-
-            for (var i = 0; i < 15; i++)
-            {
-                collection.Add(new ListItemData { Text = "List item " + i.ToString(), Command = deleteCommand });
-           }
         }
 
         private void DeleteCommand_ExecuteRequested(XamlUICommand sender, ExecuteRequestedEventArgs args)
@@ -77,5 +68,28 @@ private void ListViewSwipeContainer_PointerExited(object sender, PointerRoutedEv
         {
             VisualStateManager.GoToState(sender as Control, "HoverButtonsHidden", true);
         }
+
+        private void ControlExample_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7))
+            {
+                var deleteCommand = new StandardUICommand(StandardUICommandKind.Delete);
+                deleteCommand.ExecuteRequested += DeleteCommand_ExecuteRequested;
+
+                DeleteFlyoutItem.Command = deleteCommand;
+
+                for (var i = 0; i < 15; i++)
+                {
+                    collection.Add(new ListItemData { Text = "List item " + i.ToString(), Command = deleteCommand });
+                }
+            }
+            else
+            {
+                for (var i = 0; i < 15; i++)
+                {
+                    collection.Add(new ListItemData { Text = "List item " + i.ToString(), Command = null });
+                }
+            }
+        }
     }
 }
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/WebViewPage.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/WebViewPage.xaml
index 5507a8ba53..6166b815b8 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/WebViewPage.xaml
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/WebViewPage.xaml
@@ -16,13 +16,24 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d">
 
-    <local:ControlExample HeaderText="A simple WebView" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
+    <local:ControlExample HeaderText="A simple WebView " HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
         <local:ControlExample.Example>
-            <WebView Source="https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/web-view" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
+            <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <TextBlock TextWrapping="Wrap" Margin="0,0,0,12">
+                WebView is powered by the modern Edge engine. See
+                    <Hyperlink NavigateUri="https://go.microsoft.com/fwlink/p/?LinkId=722922">Full Sample</Hyperlink>
+                in the Documentation section for a complete sample.
+                </TextBlock>
+                <WebView Source="https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/web-view" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Row="1" />
+            </Grid>
         </local:ControlExample.Example>
         <local:ControlExample.Xaml>
             <RichTextBlock Style="{StaticResource XamlCodeRichTextBlockStyle}">
-                <Paragraph>&lt;WebView Source="https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/web-view" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" /&gt;</Paragraph>
+                <Paragraph>&lt;WebView Source="https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/web-view" /&gt;</Paragraph>
             </RichTextBlock>
         </local:ControlExample.Xaml>
     </local:ControlExample>
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/DataModel/ControlInfoData.json b/Samples/XamlUIBasics/cs/AppUIBasics/DataModel/ControlInfoData.json
index 1fbc34bfe9..d3f9fa0d20 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/DataModel/ControlInfoData.json
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/DataModel/ControlInfoData.json
@@ -623,13 +623,22 @@
           "Description": "The ListView lets you show a collection of items in a list that scrolls vertically.",
           "Content": "<p><b>ListView</b> is an <b>ItemsControl</b>, so it can contain a collection of items of any type. To populate the view, add items to the <b>Items</b> collection, or set the <b>ItemsSource</b> property to a data source.</p><p>Set an <b>ItemTemplate</b> to define the look of individual items.</p><p>Look at the <i>ListViewPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
           "IsNew": false,
+          "IsUpdated": true,
           "Docs": [
             {
               "Title": "ListView",
               "Uri": "http://msdn.microsoft.com/library/windows/apps/windows.ui.xaml.controls.listview.aspx"
             },
             {
-              "Title": "Guidelines",
+              "Title": "Inverted Lists",
+              "Uri": "https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/inverted-lists"
+            },
+            {
+              "Title": "Inverted Lists - Full Sample",
+              "Uri": "https://github.com/Microsoft/Windows-universal-samples/tree/master/Samples/XamlBottomUpList"
+            },
+            {
+              "Title": "Guidelines for Lists",
               "Uri": "https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/lists"
             }
           ],
@@ -1709,6 +1718,16 @@
           "Content": "",
           "IsNew": true,
           "Docs": []
+        },
+        {
+          "UniqueId": "CompactSizing",
+          "Title": "Compact Sizing",
+          "Subtitle": "(Preview) How to use a Resource Dictionary to enable compact sizing.",
+          "ImagePath": "ms-appx:///Assets/CompactSizing.png",
+          "Description": "Preview! This functionality will come to WinUI later this year.",
+          "Content": "",
+          "IsPreview": true,
+          "Docs": []
         }
       ]
     },
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/DataModel/ControlInfoDataSource.cs b/Samples/XamlUIBasics/cs/AppUIBasics/DataModel/ControlInfoDataSource.cs
index 050bfb7e48..5cc742b23a 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/DataModel/ControlInfoDataSource.cs
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/DataModel/ControlInfoDataSource.cs
@@ -32,14 +32,14 @@ namespace AppUIBasics.Data
     /// </summary>
     public class ControlInfoDataItem
     {
-        public ControlInfoDataItem(String uniqueId, String title, String subtitle, String imagePath, String badgePath, String description, String content, bool isNew, bool isUpdated, bool isPreview)
+        public ControlInfoDataItem(String uniqueId, String title, String subtitle, String imagePath, String badgeString, String description, String content, bool isNew, bool isUpdated, bool isPreview)
         {
             this.UniqueId = uniqueId;
             this.Title = title;
             this.Subtitle = subtitle;
             this.Description = description;
             this.ImagePath = imagePath;
-            this.BadgePath = badgePath;
+            this.BadgeString = badgeString;
             this.Content = content;
             this.IsNew = isNew;
             this.IsUpdated = isUpdated;
@@ -53,7 +53,7 @@ public ControlInfoDataItem(String uniqueId, String title, String subtitle, Strin
         public string Subtitle { get; private set; }
         public string Description { get; private set; }
         public string ImagePath { get; private set; }
-        public string BadgePath { get; private set; }
+        public string BadgeString { get; private set; }
         public string Content { get; private set; }
         public bool IsNew { get; private set; }
         public bool IsUpdated { get; private set; }
@@ -210,7 +210,7 @@ private async Task GetControlInfoDataAsync()
                     {
                         JsonObject itemObject = itemValue.GetObject();
 
-                        string badgePath = "ms-appx:///Assets/blank.png";
+                        string badgeString = null;
 
                         bool isNew = itemObject.ContainsKey("IsNew") ? itemObject["IsNew"].GetBoolean() : false;
                         bool isUpdated = itemObject.ContainsKey("IsUpdated") ? itemObject["IsUpdated"].GetBoolean() : false;
@@ -218,24 +218,22 @@ private async Task GetControlInfoDataAsync()
 
                         if (isNew)
                         {
-                            badgePath = "ms-appx:///Assets/new.png";
+                            badgeString = "New";
                         }
-
-                        if (isUpdated)
+                        else if (isUpdated)
                         {
-                            badgePath = "ms-appx:///Assets/updated.png";
+                            badgeString = "Updated";
                         }
-
-                        if (isPreview)
+                        else if (isPreview)
                         {
-                            badgePath = "ms-appx:///Assets/preview.png";
+                            badgeString = "Preview";
                         }
 
                         var item = new ControlInfoDataItem(itemObject["UniqueId"].GetString(),
                                                                 itemObject["Title"].GetString(),
                                                                 itemObject["Subtitle"].GetString(),
                                                                 itemObject["ImagePath"].GetString(),
-                                                                badgePath,
+                                                                badgeString,
                                                                 itemObject["Description"].GetString(),
                                                                 itemObject["Content"].GetString(),
                                                                 isNew,
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/ItemTemplates.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/ItemTemplates.xaml
index 214a1ac10d..0e3555c946 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/ItemTemplates.xaml
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/ItemTemplates.xaml
@@ -45,7 +45,6 @@
                     Source="{x:Bind ImagePath}"
                     Stretch="Uniform" />
 
-
                 <RelativePanel Grid.Column="1" Grid.ColumnSpan="2" Margin="16,6,0,0">
                     <TextBlock
                         x:Name="titleText"
@@ -57,22 +56,22 @@
                     <TextBlock
                         Style="{StaticResource BodyTextBlockStyle}"
                         Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}"
-                        Margin="0,4,0,0"
+                        Margin="0,4,16,0"
                         RelativePanel.Below="titleText"
                         Text="{x:Bind Description}"
                         TextTrimming="CharacterEllipsis" />
                 </RelativePanel>
 
-                <Image
+                <Grid
+                    Margin="-12"
                     Grid.Column="2"
-                    x:Name="gridImage2"
-                    Width="18"
                     VerticalAlignment="Top"
-                    AutomationProperties.Name="{x:Bind Title}"
-                    Source="{x:Bind BadgePath}"
-                    Stretch="Uniform" />
+                    Visibility="{x:Bind BadgeString, Converter={StaticResource nullToVisibilityConverter}}" >
+
+                    <Rectangle Fill="{ThemeResource SystemAccentColor}" Opacity=".5" />
+                    <TextBlock Text="{x:Bind BadgeString}" Margin="8,2,8,4" />
+                </Grid>
             </Grid>
         </UserControl>
     </DataTemplate>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/Navigation/NavigationRootPage.xaml.cs b/Samples/XamlUIBasics/cs/AppUIBasics/Navigation/NavigationRootPage.xaml.cs
index e19fa544ee..bd87128900 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/Navigation/NavigationRootPage.xaml.cs
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/Navigation/NavigationRootPage.xaml.cs
@@ -123,7 +123,7 @@ public bool CheckNewControlSelected()
 
         private void AddNavigationMenuItems()
         {
-            foreach (var group in ControlInfoDataSource.Instance.Groups)
+            foreach (var group in ControlInfoDataSource.Instance.Groups.OrderBy(i => i.Title))
             {
                 var item = new Microsoft.UI.Xaml.Controls.NavigationViewItem() { Content = group.Title, Tag = group.UniqueId, DataContext = group };
                 AutomationProperties.SetName(item, group.Title);
@@ -140,10 +140,22 @@ private void AddNavigationMenuItems()
                     };
                 }
                 NavigationViewControl.MenuItems.Add(item);
+
+                if (group.UniqueId == "AllControls")
+                {
+                    this._allControlsMenuItem = item;
+                }
+                else if (group.UniqueId == "NewControls")
+                {
+                    this._newControlsMenuItem = item;
+                }
             }
 
-            this._allControlsMenuItem = (Microsoft.UI.Xaml.Controls.NavigationViewItem)NavigationViewControl.MenuItems[1];
-            this._newControlsMenuItem = (Microsoft.UI.Xaml.Controls.NavigationViewItem)NavigationViewControl.MenuItems[0];
+            // Move "What's New" and "All Controls" to the top of the NavigationView
+            NavigationViewControl.MenuItems.Remove(_allControlsMenuItem);
+            NavigationViewControl.MenuItems.Remove(_newControlsMenuItem);
+            NavigationViewControl.MenuItems.Insert(0, _allControlsMenuItem);
+            NavigationViewControl.MenuItems.Insert(0, _newControlsMenuItem);
 
             _newControlsMenuItem.Loaded += OnNewControlsMenuItemLoaded;
         }
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/NewControlsPage.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/NewControlsPage.xaml
index 33884b3a65..69d37a490b 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/NewControlsPage.xaml
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/NewControlsPage.xaml
@@ -34,9 +34,13 @@
                         <AdaptiveTrigger MinWindowWidth="0" />
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="itemGridView.Padding" Value="14,0,14,0" />
+                        <Setter Target="newItemGridView.Padding" Value="14,0,14,0" />
+                        <Setter Target="updatedItemGridView.Padding" Value="14,0,14,0" />
+                        <Setter Target="previewItemGridView.Padding" Value="14,0,14,0" />
+                        <Setter Target="newItemGridView.ItemContainerStyle" Value="{StaticResource GridViewItemStyleSmall}" />
+                        <Setter Target="updatedItemGridView.ItemContainerStyle" Value="{StaticResource GridViewItemStyleSmall}" />
+                        <Setter Target="previewItemGridView.ItemContainerStyle" Value="{StaticResource GridViewItemStyleSmall}" />
                         <Setter Target="headerImageView.Margin" Value="-14,0,-14,14" />
-                        <Setter Target="itemGridView.ItemContainerStyle" Value="{StaticResource GridViewItemStyleSmall}" />
                         <Setter Target="pageHeader.Visibility" Value="Collapsed" />
                     </VisualState.Setters>
                 </VisualState>
@@ -44,46 +48,32 @@
         </VisualStateManager.VisualStateGroups>
 
         <ScrollViewer x:Name="newPageSV" >
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition/>
-                </Grid.RowDefinitions>
-                <ParallaxView
-                    x:Name="headerImageView"
-                    Height="250"
-                    Margin="-24,0,0,24"
-                    Source="{x:Bind newPageSV}"
-                    VerticalShift="350">
-                    <Image
-                        x:Name="headerImage"
-                        HorizontalAlignment="Center"
-                        Source="Assets/MainPage_Banner.jpg"
-                        Stretch="UniformToFill" />
-                </ParallaxView>
+            <StackPanel HorizontalAlignment="Stretch">
+                <Grid>
+                    <ParallaxView
+                        x:Name="headerImageView"
+                        Height="250"
+                        Margin="-24,0,0,24"
+                        Source="{x:Bind newPageSV}"
+                        VerticalShift="350">
+                        <Image
+                            x:Name="headerImage"
+                            HorizontalAlignment="Center"
+                            Source="Assets/MainPage_Banner.jpg"
+                            Stretch="UniformToFill" />
+                    </ParallaxView>
 
-                <local:PageHeader
-                    x:Name="pageHeader"
-                    Title="What's New"
-                    VerticalAlignment="Top"
-                    Background="{ThemeResource HomePageBackgroundBrush}"
-                    FontSize="42"
-                    Foreground="White" />
+                    <local:PageHeader
+                        x:Name="pageHeader"
+                        Title="What's New"
+                        VerticalAlignment="Top"
+                        Background="{ThemeResource HomePageBackgroundBrush}"
+                        FontSize="42"
+                        Foreground="White" />
+                </Grid>
 
-                <TextBlock Grid.Row="1" TextWrapping="WrapWholeWords" Foreground="Red" Padding="24,12,0,12">
-                    <Span xml:space="preserve"><Run>*NOTE: The samples in this app use WinUI. Please read the </Run><Hyperlink ToolTipService.ToolTip="https://aka.ms/winui-toolkit" NavigateUri="https://aka.ms/winui-toolkit">documentation on WinUI</Hyperlink><Run> to understand the code examples.</Run> </Span>
-                </TextBlock>
-
-                <TextBlock Grid.Row="2" Style="{StaticResource SubtitleTextBlockStyle}" Padding="24,0,0,10">Recently Added Samples</TextBlock>
                 <GridView
-                    Grid.Row="3"
-                    x:Name="itemGridView"
+                    x:Name="newItemGridView"
                     Padding="24,0,0,0"
                     AutomationProperties.AutomationId="ItemGridView"
                     AutomationProperties.Name="Items In Group"
@@ -97,16 +87,15 @@
                     KeyDown="OnItemGridViewKeyDown"
                     Loaded="OnItemGridViewLoaded"
                     SizeChanged="OnItemGridViewSizeChanged"
-                    SelectionMode="None">
-                    <interactivity:Interaction.Behaviors>
-                        <behavior:ImageScrollBehavior TargetControl="{Binding ElementName=pageHeader}" />
-                    </interactivity:Interaction.Behaviors>
+                    SelectionMode="None"
+                    ScrollViewer.VerticalScrollMode="Disabled">
+                    <GridView.Header>
+                        <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Padding="0,0,0,10" Text="Recently Added Samples" />
+                    </GridView.Header>
                 </GridView>
 
-                <TextBlock Grid.Row="4" Style="{StaticResource SubtitleTextBlockStyle}" Padding="24,0,0,10">Recently Updated Samples</TextBlock>
                 <GridView
-                    Grid.Row="5"
-                    x:Name="itemGridView2"
+                    x:Name="updatedItemGridView"
                     Padding="24,0,0,0"
                     AutomationProperties.AutomationId="ItemGridView"
                     AutomationProperties.Name="Items In Group"
@@ -120,18 +109,15 @@
                     KeyDown="OnItemGridViewKeyDown"
                     Loaded="OnItemGridViewLoaded"
                     SizeChanged="OnItemGridViewSizeChanged"
-                    SelectionMode="None">   
-                    <interactivity:Interaction.Behaviors>
-                        <behavior:ImageScrollBehavior TargetControl="{Binding ElementName=pageHeader}" />
-                    </interactivity:Interaction.Behaviors>
+                    SelectionMode="None"
+                    ScrollViewer.VerticalScrollMode="Disabled">
+                    <GridView.Header>
+                        <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Padding="0,0,0,10" Text="Recently Updated Samples" />
+                    </GridView.Header>
                 </GridView>
 
-
-                <TextBlock Grid.Row="6"  Style="{StaticResource SubtitleTextBlockStyle}" 
-                          Padding="24,0,0,10">Preview Samples</TextBlock>
                 <GridView
-                    Grid.Row="7"
-                    x:Name="itemGridView3"
+                    x:Name="previewItemGridView"
                     Padding="24,0,0,0"
                     AutomationProperties.AutomationId="ItemGridView"
                     AutomationProperties.Name="Items In Group"
@@ -145,12 +131,13 @@
                     KeyDown="OnItemGridViewKeyDown"
                     Loaded="OnItemGridViewLoaded"
                     SizeChanged="OnItemGridViewSizeChanged"
-                    SelectionMode="None">
-                    <interactivity:Interaction.Behaviors>
-                        <behavior:ImageScrollBehavior TargetControl="{Binding ElementName=pageHeader}" />
-                    </interactivity:Interaction.Behaviors>
+                    SelectionMode="None"
+                    ScrollViewer.VerticalScrollMode="Disabled">
+                    <GridView.Header>
+                        <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Padding="0,0,0,10" Text="Preview Samples" />
+                    </GridView.Header>
                 </GridView>
-            </Grid>
+            </StackPanel>
         </ScrollViewer>
     </Grid>
 </local:ItemsPageBase>
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/SamplePages/SampleCompactSizingPage.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/SamplePages/SampleCompactSizingPage.xaml
new file mode 100644
index 0000000000..47f48e0249
--- /dev/null
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/SamplePages/SampleCompactSizingPage.xaml
@@ -0,0 +1,46 @@
+<!--
+//*********************************************************
+//
+// Copyright (c) Microsoft. All rights reserved.
+// THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
+// ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY
+// IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
+// PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
+//
+//*********************************************************
+-->
+<Page
+    x:Class="AppUIBasics.SamplePages.SampleCompactSizingPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="ms-appx:///ControlPages/CompactDictionary.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Page.Resources>
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <StackPanel Spacing="4">
+            <TextBlock x:Name="HeaderBlock" Text="Compact Size" FontSize="18"/>
+            <TextBox Header="First Name:" x:Name="txtfirstName" />
+            <TextBox Header="Last Name:" x:Name="txtLastName"  />
+            <PasswordBox Header="Password:" />
+            <PasswordBox Header="Confrim Password:" />
+            <ComboBox Header="State:">
+                <ComboBoxItem Content="Alabama" />
+                <ComboBoxItem Content="Alaska" />
+                <ComboBoxItem Content="Arizona" />
+                <ComboBoxItem Content="Arkansas" />
+                <ComboBoxItem Content="California" />
+                <ComboBoxItem Content="Colorado" />
+                <ComboBoxItem Content="Connecticut" />
+            </ComboBox>
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/SamplePages/SampleCompactSizingPage.xaml.cs b/Samples/XamlUIBasics/cs/AppUIBasics/SamplePages/SampleCompactSizingPage.xaml.cs
new file mode 100644
index 0000000000..600bb766cd
--- /dev/null
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/SamplePages/SampleCompactSizingPage.xaml.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+namespace AppUIBasics.SamplePages
+{
+    public sealed partial class SampleCompactSizingPage : Page
+    {
+        public SampleCompactSizingPage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/SamplePages/SampleStandardSizingPage.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/SamplePages/SampleStandardSizingPage.xaml
new file mode 100644
index 0000000000..d8fa0df81d
--- /dev/null
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/SamplePages/SampleStandardSizingPage.xaml
@@ -0,0 +1,38 @@
+<!--
+//*********************************************************
+//
+// Copyright (c) Microsoft. All rights reserved.
+// THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
+// ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY
+// IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
+// PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
+//
+//*********************************************************
+-->
+<Page
+    x:Class="AppUIBasics.SamplePages.SampleStandardSizingPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <StackPanel x:Name="CompactPanel" Spacing="16">
+            <TextBlock x:Name="HeaderBlock" Text="Standard Size" FontSize="18"/>
+            <TextBox Header="First Name:" x:Name="txtfirstName" />
+            <TextBox Header="Last Name:" x:Name="txtLastName"  />
+            <PasswordBox Header="Password:" />
+            <PasswordBox Header="Confrim Password:" />
+            <ComboBox Header="State:">
+                <ComboBoxItem Content="Alabama" />
+                <ComboBoxItem Content="Alaska" />
+                <ComboBoxItem Content="Arizona" />
+                <ComboBoxItem Content="Arkansas" />
+                <ComboBoxItem Content="California" />
+                <ComboBoxItem Content="Colorado" />
+                <ComboBoxItem Content="Connecticut" />
+            </ComboBox>
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/StandardSizingPage.xaml.cs b/Samples/XamlUIBasics/cs/AppUIBasics/SamplePages/SampleStandardSizingPage.xaml.cs
similarity index 65%
rename from Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/StandardSizingPage.xaml.cs
rename to Samples/XamlUIBasics/cs/AppUIBasics/SamplePages/SampleStandardSizingPage.xaml.cs
index be8fc8ebaf..4cc4838320 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/ControlPages/StandardSizingPage.xaml.cs
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/SamplePages/SampleStandardSizingPage.xaml.cs
@@ -15,26 +15,16 @@
 
 // The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
 
-namespace AppUIBasics.ControlPages
+namespace AppUIBasics.SamplePages
 {
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class StandardSizingPage : Page
+    public sealed partial class SampleStandardSizingPage : Page
     {
-        public StandardSizingPage()
+        public SampleStandardSizingPage()
         {
             this.InitializeComponent();
         }
-
-        private void Standard_Checked(object sender, RoutedEventArgs e)
-        {
-            Frame.Navigate(typeof(CompactSizingPage));
-        }
-
-        private void Compact_Checked(object sender, RoutedEventArgs e)
-        {
-            
-        }
     }
 }
diff --git a/Samples/XamlUIBasics/cs/AppUIBasics/SettingsPage.xaml b/Samples/XamlUIBasics/cs/AppUIBasics/SettingsPage.xaml
index 04d954d4a8..4b927f078c 100644
--- a/Samples/XamlUIBasics/cs/AppUIBasics/SettingsPage.xaml
+++ b/Samples/XamlUIBasics/cs/AppUIBasics/SettingsPage.xaml
@@ -77,7 +77,7 @@
                     </Paragraph>
                     <Paragraph>
                         To contact the authors,
-                        <Hyperlink NavigateUri="mailto:ControlsGallery@microsoft.com"> mailto:ControlsGallery@microsoft.com </Hyperlink>.
+                        <Hyperlink NavigateUri="mailto:ControlsGallery@microsoft.com">mailto:ControlsGallery@microsoft.com </Hyperlink>.
                     </Paragraph>
                 </RichTextBlock>
                 <Button Click="OnFeedbackButtonClick" Content="Feedback" Margin="0,8,0,0" Visibility="Collapsed" />
@@ -87,7 +87,12 @@
                     Margin="0,40,0,0"
                     FontWeight="Normal"
                     Text="Dependencies and References" />
-                <RichTextBlock MaxWidth="840" Margin="0,10,0,0" IsTextSelectionEnabled="True">
+                <RichTextBlock IsTextSelectionEnabled="True" MaxWidth="840" Margin="0,10,0,0">
+                    <Paragraph Margin="0,10,0,10">
+                        <Hyperlink NavigateUri="https://aka.ms/winui-toolkit">Windows UI Library (Preview)</Hyperlink>
+                    </Paragraph>
+                </RichTextBlock>
+                <RichTextBlock IsTextSelectionEnabled="True" MaxWidth="840" Margin="0,10,0,0">
                     <Paragraph Margin="0,10,0,10">
                         <Hyperlink NavigateUri="https://github.com/WilliamABradley/ColorCode-Universal">ColorCode-Universal</Hyperlink>
                     </Paragraph>