diff --git a/FakeDemo/App.cs b/FakeDemo/App.cs
index 506f7e3..a987928 100644
--- a/FakeDemo/App.cs
+++ b/FakeDemo/App.cs
@@ -7,21 +7,7 @@ public class App : Application
         public App()
         {
             // The root page of your application
-            MainPage = new ContentPage
-            {
-                Content = new StackLayout
-                {
-                    VerticalOptions = LayoutOptions.Center,
-                    Children =
-                    {
-                        new Label
-                        {
-                            XAlign = TextAlignment.Center,
-                            Text = "Welcome to Xamarin Forms!"
-                        }
-                    }
-                }
-            };
+            MainPage = new MainPage();
         }
 
         protected override void OnStart()
diff --git a/FakeDemo/FakeDemo.csproj b/FakeDemo/FakeDemo.csproj
index d28da64..4ebd1aa 100644
--- a/FakeDemo/FakeDemo.csproj
+++ b/FakeDemo/FakeDemo.csproj
@@ -32,6 +32,9 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="App.cs" />
+    <Compile Include="MainPage.xaml.cs">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
@@ -49,4 +52,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MainPage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/FakeDemo/MainPage.xaml b/FakeDemo/MainPage.xaml
new file mode 100644
index 0000000..e965be3
--- /dev/null
+++ b/FakeDemo/MainPage.xaml
@@ -0,0 +1,8 @@
+<?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="FakeDemo.MainPage">
+
+	<Label Text="Built using FAKE!" HorizontalOptions="Center" VerticalOptions="Center" />
+</ContentPage>
diff --git a/FakeDemo/MainPage.xaml.cs b/FakeDemo/MainPage.xaml.cs
new file mode 100644
index 0000000..004ac86
--- /dev/null
+++ b/FakeDemo/MainPage.xaml.cs
@@ -0,0 +1,12 @@
+using Xamarin.Forms;
+
+namespace FakeDemo
+{
+    public partial class MainPage : ContentPage
+    {
+        public MainPage()
+        {
+            InitializeComponent();
+        }
+    }
+}