diff --git a/samples/NotificationFlyoutSample/App.xaml b/samples/NotificationFlyoutSample/App.xaml
index 318f7f3..82efc8e 100644
--- a/samples/NotificationFlyoutSample/App.xaml
+++ b/samples/NotificationFlyoutSample/App.xaml
@@ -4,6 +4,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:xamlhost="using:Microsoft.Toolkit.Win32.UI.XamlHost">
     <xamlhost:XamlApplication.Resources>
-        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" Version="Latest" />
     </xamlhost:XamlApplication.Resources>
 </xamlhost:XamlApplication>
diff --git a/samples/NotificationFlyoutSample/Shell.xaml b/samples/NotificationFlyoutSample/Shell.xaml
index b0c62c0..b30311b 100644
--- a/samples/NotificationFlyoutSample/Shell.xaml
+++ b/samples/NotificationFlyoutSample/Shell.xaml
@@ -5,21 +5,23 @@
     xmlns:controls="using:NotificationFlyout.Uwp.UI.Controls"
     IconSource="/Assets/Icon.ico"
     LightIconSource="/Assets/Icon-Light.ico">
-    <controls:NotificationFlyout.Content>
-        <StackPanel
-            Width="330"
-            Height="500"
-            Margin="24">
-            <ComboBox x:Name="Theme" SelectionChanged="Theme_SelectionChanged">
-                <ComboBoxItem Content="Default" />
-                <ComboBoxItem Content="Dark" />
-                <ComboBoxItem Content="Light" />
-            </ComboBox>
-            <Button Margin="0,0,0,8" Content="Button" />
-            <Slider Margin="0,0,0,8" />
-            <TextBox Margin="0,0,0,8" />
-            <ToggleButton Margin="0,0,0,8" />
-            <CalendarView Margin="0,0,0,8" />
-        </StackPanel>
-    </controls:NotificationFlyout.Content>
+    <StackPanel
+        Width="330"
+        Height="1000"
+        Margin="24">
+        <ComboBox
+            x:Name="Theme"
+            Margin="0,0,0,8"
+            SelectionChanged="Theme_SelectionChanged">
+            <ComboBoxItem Content="Default" />
+            <ComboBoxItem Content="Dark" />
+            <ComboBoxItem Content="Light" />
+        </ComboBox>
+        <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 />
+    </StackPanel>
 </controls:NotificationFlyout>
diff --git a/src/NotificationFlyout.Shared.UI/Class1.cs b/src/NotificationFlyout.Shared.UI/Class1.cs
deleted file mode 100644
index 5f7c39c..0000000
--- a/src/NotificationFlyout.Shared.UI/Class1.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Drawing;
-
-namespace NotificationFlyout.Shared.UI
-{
-    public static class ImageSourceExtensions
-    {
-        public static Icon ConvertToIcon(this ImageSource imageSource, uint dpi)
-        {
-            if (imageSource == null) return null;
-
-            var uri = new Uri(imageSource.ToString(), UriKind.RelativeOrAbsolute);
-
-            var streamResource = Application.GetResourceStream(uri);
-            if (streamResource == null) throw new ArgumentException(nameof(streamResource));
-
-            return new Icon(streamResource.Stream, new System.Drawing.Size(PInvoke.GetSystemMetricsForDpi((int)SystemMetricFlag.SM_CXICON, dpi), PInvoke.GetSystemMetricsForDpi((int)SystemMetricFlag.SM_CYICON, dpi)));
-        }
-
-        private enum SystemMetricFlag : int
-        {
-            SM_CXICON = 11,
-            SM_CYICON = 12,
-            SM_CXSMICON = 49,
-            SM_CYSMICON = 50
-        }
-    }
-
-}
diff --git a/src/NotificationFlyout.Shared.UI/NotificationFlyout.Shared.UI.csproj b/src/NotificationFlyout.Shared.UI/NotificationFlyout.Shared.UI.csproj
deleted file mode 100644
index cb63190..0000000
--- a/src/NotificationFlyout.Shared.UI/NotificationFlyout.Shared.UI.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs b/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs
index 6137a71..4d38f86 100644
--- a/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs
+++ b/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs
@@ -1,9 +1,11 @@
 using System;
 using Windows.UI.Xaml;
+using Windows.UI.Xaml.Markup;
 using Windows.UI.Xaml.Media;
 
 namespace NotificationFlyout.Uwp.UI.Controls
 {
+    [ContentProperty(Name = "Content")]
     public class NotificationFlyout : DependencyObject
     {
         public static readonly DependencyProperty IconSourceProperty =