diff --git a/.gitignore b/.gitignore
index 074320c..fd8fca6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 
 # Autosave files
 *~
+.vs/
 
 # build
 [Oo]bj/
diff --git a/Samples/ButtonXamlPage.xaml b/Samples/ButtonXamlPage.xaml
index 6f601c1..2026370 100755
--- a/Samples/ButtonXamlPage.xaml
+++ b/Samples/ButtonXamlPage.xaml
@@ -2,8 +2,12 @@
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ButtonXaml.ButtonXamlPage">
-
-  <Button Text="Tap for click count!"
-          Clicked="OnButtonClicked" />
-  
-</ContentPage>
\ No newline at end of file
+
+    <StackLayout Padding="20">
+        <Label Text="Welcome to Xamarin.Forms!"/>
+        <Label x:Name="LabelCount" Text="Click Count: 0"/>
+        <Button Text="Tap for click count!"
+                HeightRequest="30"
+                Clicked="OnButtonClicked" />
+    </StackLayout>
+</ContentPage>
diff --git a/Samples/ButtonXamlPage.xaml.cs b/Samples/ButtonXamlPage.xaml.cs
index 7a94d1c..cebaf80 100755
--- a/Samples/ButtonXamlPage.xaml.cs
+++ b/Samples/ButtonXamlPage.xaml.cs
@@ -15,9 +15,8 @@ namespace ButtonXaml
         public void OnButtonClicked(object sender, EventArgs args)
         {
             count++;
-
-            ((Button)sender).Text = 
-                String.Format("{0} click{1}!", count, count == 1 ? "" : "s");
+            LabelCount.Text = $"Click Count: {count}";
+           
         }
     }
 }
diff --git a/Samples/Samples.csproj b/Samples/Samples.csproj
index 74a58df..e9de299 100644
--- a/Samples/Samples.csproj
+++ b/Samples/Samples.csproj
@@ -16,6 +16,12 @@
   <ItemGroup>
     <EmbeddedResource Include="**/*.xaml" />
   </ItemGroup>
+	
+  <ItemGroup>
+    <EmbeddedResource Update="ButtonXamlPage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
     
   <PropertyGroup>
     <OutputType>Exe</OutputType>