diff --git a/Samples/ButtonXamlPage.xaml b/Samples/ButtonXamlPage.xaml
index 2026370..02012d6 100755
--- a/Samples/ButtonXamlPage.xaml
+++ b/Samples/ButtonXamlPage.xaml
@@ -2,12 +2,12 @@
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ButtonXaml.ButtonXamlPage">
-
-    <StackLayout Padding="20">
-        <Label Text="Welcome to Xamarin.Forms!"/>
+
+    <StackLayout Padding="20">
+        <Label Text="Welcome to Xamarin.Forms!"/>
         <Label x:Name="LabelCount" Text="Click Count: 0"/>
-        <Button Text="Tap for click count!"
+        <Button Text="Tap for click count!"
                 HeightRequest="30"
                 Clicked="OnButtonClicked" />
     </StackLayout>
-</ContentPage>
+</ContentPage>
diff --git a/Samples/ButtonXamlPageSample.cs b/Samples/ButtonXamlPageSample.cs
deleted file mode 100644
index 4b95f6d..0000000
--- a/Samples/ButtonXamlPageSample.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using Ooui;
-using Xamarin.Forms;
-
-namespace Samples
-{
-    public class ButtonXamlPageSample : ISample
-    {
-        public string Title => "Xamarin.Forms Button XAML";
-
-        public Ooui.Element CreateElement ()
-        {
-            var page = new ButtonXaml.ButtonXamlPage ();
-            return page.GetOouiElement ();
-        }
-    }
-}
diff --git a/Samples/DisplayAlertSample.xaml b/Samples/DisplayAlertSample.xaml
new file mode 100644
index 0000000..77fa509
--- /dev/null
+++ b/Samples/DisplayAlertSample.xaml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Samples.DisplayAlertSample">
+    <ContentPage.Content>
+        <StackLayout>
+            <Label Text="Welcome to DisplayAlert Sample!" />
+            <Button Text="Tap for Display Alert"
+                    HeightRequest="30"
+                    Clicked="OnButtonClicked" />
+        </StackLayout>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/Samples/DisplayAlertSample.xaml.cs b/Samples/DisplayAlertSample.xaml.cs
new file mode 100644
index 0000000..de11f2b
--- /dev/null
+++ b/Samples/DisplayAlertSample.xaml.cs
@@ -0,0 +1,21 @@
+using System;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace Samples
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class DisplayAlertSample : ContentPage
+	{
+		public DisplayAlertSample ()
+		{
+			InitializeComponent ();
+		}
+
+        public async void OnButtonClicked(object sender, EventArgs args)
+        {
+            await DisplayAlert("Alert Message", "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis ipsum. Praesent mauris. Fusce nec tellus sed augue semper porta. Mauris massa.", "OK");
+        }
+	}
+}
diff --git a/Samples/Program.cs b/Samples/Program.cs
index ee406c6..ddea28f 100644
--- a/Samples/Program.cs
+++ b/Samples/Program.cs
@@ -25,12 +25,15 @@ namespace Samples
                 }
             }
 
-            new ButtonSample ().Publish ();
-            new TodoSample ().Publish ();
-            new DrawSample ().Publish ();
-			new FilesSample ().Publish ();
+            new ButtonSample().Publish();
+            new TodoSample().Publish();
+            new DrawSample().Publish();
+            new FilesSample().Publish();
 
-            UI.Present ("/todo");
+            var sample = new XamlPageSample();
+            UI.Publish("/display-alert", sample.CreateElement(new DisplayAlertSample()));
+
+            UI.Present ("/display-alert", sample);
 
             Console.ReadLine ();
         }
diff --git a/Samples/Samples.csproj b/Samples/Samples.csproj
index e9de299..883c5f7 100644
--- a/Samples/Samples.csproj
+++ b/Samples/Samples.csproj
@@ -17,10 +17,19 @@
     <EmbeddedResource Include="**/*.xaml" />
   </ItemGroup>
 	
+  <ItemGroup>
+    <Compile Update="DisplayAlertSample.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+	
   <ItemGroup>
     <EmbeddedResource Update="ButtonXamlPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
+    <EmbeddedResource Update="DisplayAlertSample.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
   </ItemGroup>
     
   <PropertyGroup>
diff --git a/Samples/XamlPageSample.cs b/Samples/XamlPageSample.cs
new file mode 100644
index 0000000..ae6b365
--- /dev/null
+++ b/Samples/XamlPageSample.cs
@@ -0,0 +1,14 @@
+using Xamarin.Forms;
+
+namespace Samples
+{
+    public class XamlPageSample
+    {
+        public string Title => "Xamarin.Forms Button XAML";
+
+        public Ooui.Element CreateElement (Page page)
+        {
+            return page.GetOouiElement ();
+        }
+    }
+}