diff --git a/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj b/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj
index 27e9885..ce80946 100644
--- a/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj
+++ b/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -9,6 +9,7 @@
     <StartupObject>NotificationFlyoutSample.Host.Program</StartupObject>
     <EnableTypeInfoReflection>false</EnableTypeInfoReflection>
     <EnableXBindDiagnostics>false</EnableXBindDiagnostics>
+    <MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj b/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj
index 43b98c3..4f9f150 100644
--- a/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj
+++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj
@@ -184,5 +184,6 @@
   <PropertyGroup>
     <EnableTypeInfoReflection>false</EnableTypeInfoReflection>
     <EnableXBindDiagnostics>false</EnableXBindDiagnostics>
+    <MSBuildWarningsAsMessages>CS8305</MSBuildWarningsAsMessages>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/NotificationFlyoutSample/Shell.xaml b/samples/NotificationFlyoutSample/Shell.xaml
index b30311b..ea95ba1 100644
--- a/samples/NotificationFlyoutSample/Shell.xaml
+++ b/samples/NotificationFlyoutSample/Shell.xaml
@@ -3,12 +3,10 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:NotificationFlyout.Uwp.UI.Controls"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     IconSource="/Assets/Icon.ico"
     LightIconSource="/Assets/Icon-Light.ico">
-    <StackPanel
-        Width="330"
-        Height="1000"
-        Margin="24">
+    <StackPanel Margin="24">
         <ComboBox
             x:Name="Theme"
             Margin="0,0,0,8"
@@ -17,11 +15,69 @@
             <ComboBoxItem Content="Dark" />
             <ComboBoxItem Content="Light" />
         </ComboBox>
+        <muxc:MenuBar>
+            <muxc:MenuBarItem Title="File">
+                <MenuFlyoutItem Text="New" />
+                <MenuFlyoutItem Text="Open..." />
+                <MenuFlyoutItem Text="Save" />
+                <MenuFlyoutItem Text="Exit" />
+            </muxc:MenuBarItem>
+
+            <muxc:MenuBarItem Title="Edit">
+                <MenuFlyoutItem Text="Undo" />
+                <MenuFlyoutItem Text="Cut" />
+                <MenuFlyoutItem Text="Copy" />
+                <MenuFlyoutItem Text="Paste" />
+            </muxc:MenuBarItem>
+
+            <muxc:MenuBarItem Title="Help">
+                <MenuFlyoutItem Text="About" />
+            </muxc:MenuBarItem>
+        </muxc:MenuBar>
+        <muxc:ProgressRing Margin="0,0,0,8" IsActive="True" />
+        <muxc:ProgressBar
+            Width="130"
+            Margin="0,0,0,8"
+            IsIndeterminate="True"
+            ShowError="False"
+            ShowPaused="False" />
         <Button Margin="0,0,0,8" Content="Button" />
         <Slider Margin="0,0,0,8" />
         <TextBox Margin="0,0,0,8" />
         <CalendarView Margin="0,0,0,8" />
         <TimePicker Margin="0,0,0,8" />
         <DatePicker />
+        <muxc:NumberBox
+            x:Name="NumberBoxSpinButtonPlacementExample"
+            Header="Enter an integer:"
+            LargeChange="100"
+            SmallChange="10"
+            SpinButtonPlacementMode="Compact"
+            Value="1" />
+        <muxc:RadioButtons Header="Options:">
+            <RadioButton Content="Option 1" />
+            <RadioButton Content="Option 2" />
+            <RadioButton Content="Option 3" />
+        </muxc:RadioButtons>
+        <StackPanel>
+            <CheckBox
+                x:Name="OptionsAllCheckBox"
+                Content="Select all"
+                IsThreeState="True" />
+            <CheckBox
+                x:Name="Option1CheckBox"
+                Margin="24,0,0,0"
+                Content="Option 1" />
+            <CheckBox
+                x:Name="Option2CheckBox"
+                Margin="24,0,0,0"
+                Content="Option 2"
+                IsChecked="True" />
+            <CheckBox
+                x:Name="Option3CheckBox"
+                Margin="24,0,0,0"
+                Content="Option 3" />
+        </StackPanel>
+        <muxc:RatingControl AutomationProperties.Name="RatingControl with placeholder" PlaceholderValue="0" />
     </StackPanel>
 </controls:NotificationFlyout>
diff --git a/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout.Wpf.UI.Controls.csproj b/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout.Wpf.UI.Controls.csproj
index 5968141..607c21f 100644
--- a/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout.Wpf.UI.Controls.csproj
+++ b/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout.Wpf.UI.Controls.csproj
@@ -1,10 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
     <AssetTargetFallback>uap10.0.19041</AssetTargetFallback>
     <Platforms>AnyCPU;x64</Platforms>
+    <MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs b/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs
index 84482a1..ca79b90 100644
--- a/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs
+++ b/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs
@@ -161,6 +161,8 @@ namespace NotificationFlyout.Wpf.UI.Controls
 
             _xamlHost.Height = 0;
             _xamlHost.Width = 0;
+            _xamlHost.HorizontalAlignment = HorizontalAlignment.Stretch;
+            _xamlHost.VerticalAlignment = VerticalAlignment.Stretch;
 
             Content = _xamlHost;
         }
diff --git a/src/NotificationFlyout.Wpf.UI/Properties/AssemblyInfo.cs b/src/NotificationFlyout.Wpf.UI/Properties/AssemblyInfo.cs
deleted file mode 100644
index c0ea722..0000000
--- a/src/NotificationFlyout.Wpf.UI/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System.Windows;
-
-[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
\ No newline at end of file
diff --git a/src/NotificationFlyout.sln b/src/NotificationFlyout.sln
index 624c71f..49a5979 100644
--- a/src/NotificationFlyout.sln
+++ b/src/NotificationFlyout.sln
@@ -30,8 +30,8 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0A782234-DC9F-4C4A-8820-FC640B03D233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A782234-DC9F-4C4A-8820-FC640B03D233}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A782234-DC9F-4C4A-8820-FC640B03D233}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{0A782234-DC9F-4C4A-8820-FC640B03D233}.Debug|Any CPU.Build.0 = Debug|x64
 		{0A782234-DC9F-4C4A-8820-FC640B03D233}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{0A782234-DC9F-4C4A-8820-FC640B03D233}.Debug|ARM.Build.0 = Debug|Any CPU
 		{0A782234-DC9F-4C4A-8820-FC640B03D233}.Debug|ARM64.ActiveCfg = Debug|Any CPU
@@ -50,8 +50,8 @@ Global
 		{0A782234-DC9F-4C4A-8820-FC640B03D233}.Release|x64.Build.0 = Release|x64
 		{0A782234-DC9F-4C4A-8820-FC640B03D233}.Release|x86.ActiveCfg = Release|Any CPU
 		{0A782234-DC9F-4C4A-8820-FC640B03D233}.Release|x86.Build.0 = Release|Any CPU
-		{9987B132-E42C-401A-9AD5-E62529FACA40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9987B132-E42C-401A-9AD5-E62529FACA40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9987B132-E42C-401A-9AD5-E62529FACA40}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{9987B132-E42C-401A-9AD5-E62529FACA40}.Debug|Any CPU.Build.0 = Debug|x64
 		{9987B132-E42C-401A-9AD5-E62529FACA40}.Debug|ARM.ActiveCfg = Debug|ARM
 		{9987B132-E42C-401A-9AD5-E62529FACA40}.Debug|ARM.Build.0 = Debug|ARM
 		{9987B132-E42C-401A-9AD5-E62529FACA40}.Debug|ARM64.ActiveCfg = Debug|ARM64
@@ -70,8 +70,8 @@ Global
 		{9987B132-E42C-401A-9AD5-E62529FACA40}.Release|x64.Build.0 = Release|x64
 		{9987B132-E42C-401A-9AD5-E62529FACA40}.Release|x86.ActiveCfg = Release|x86
 		{9987B132-E42C-401A-9AD5-E62529FACA40}.Release|x86.Build.0 = Release|x86
-		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|Any CPU.Build.0 = Debug|x64
 		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|ARM.Build.0 = Debug|Any CPU
 		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
@@ -90,8 +90,8 @@ Global
 		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Release|x64.Build.0 = Release|x64
 		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Release|x86.ActiveCfg = Release|Any CPU
 		{29430194-7EDE-4C33-AF59-CE121F48F66E}.Release|x86.Build.0 = Release|Any CPU
-		{3FE0D7F7-1173-4989-BE6C-AD28FE0D4AC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FE0D7F7-1173-4989-BE6C-AD28FE0D4AC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FE0D7F7-1173-4989-BE6C-AD28FE0D4AC9}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{3FE0D7F7-1173-4989-BE6C-AD28FE0D4AC9}.Debug|Any CPU.Build.0 = Debug|x64
 		{3FE0D7F7-1173-4989-BE6C-AD28FE0D4AC9}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{3FE0D7F7-1173-4989-BE6C-AD28FE0D4AC9}.Debug|ARM.Build.0 = Debug|Any CPU
 		{3FE0D7F7-1173-4989-BE6C-AD28FE0D4AC9}.Debug|ARM64.ActiveCfg = Debug|Any CPU