diff --git a/Screen Shot 2020-01-05 at 11.20.17 PM.png b/Screen Shot 2020-01-05 at 11.20.17 PM.png
new file mode 100644
index 0000000..4848d23
Binary files /dev/null and b/Screen Shot 2020-01-05 at 11.20.17 PM.png differ
diff --git a/Screen Shot 2020-01-05 at 11.21.41 PM.png b/Screen Shot 2020-01-05 at 11.21.41 PM.png
new file mode 100644
index 0000000..ec691b7
Binary files /dev/null and b/Screen Shot 2020-01-05 at 11.21.41 PM.png differ
diff --git a/src/Functions/SantaTalk.Functions/ApiKeyServiceClientCredentials.cs b/src/Functions/SantaTalk.Functions/ApiKeyServiceClientCredentials.cs
index 51ff2ea..4e521d4 100644
--- a/src/Functions/SantaTalk.Functions/ApiKeyServiceClientCredentials.cs
+++ b/src/Functions/SantaTalk.Functions/ApiKeyServiceClientCredentials.cs
@@ -19,7 +19,7 @@ public override Task ProcessHttpRequestAsync(HttpRequestMessage request, Cancell
         {
             if (request == null)
             {
-                throw new ArgumentNullException("request");
+                throw new ArgumentNullException(nameof(request));
             }
             request.Headers.Add("Ocp-Apim-Subscription-Key", this.apiKey);
             return base.ProcessHttpRequestAsync(request, cancellationToken);
diff --git a/src/Functions/SantaTalk.Functions/SantaTalk.Functions.csproj b/src/Functions/SantaTalk.Functions/SantaTalk.Functions.csproj
index 6548534..c3333d9 100644
--- a/src/Functions/SantaTalk.Functions/SantaTalk.Functions.csproj
+++ b/src/Functions/SantaTalk.Functions/SantaTalk.Functions.csproj
@@ -15,8 +15,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="local.settings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Functions/SantaTalk.Functions/SantaTalk.Functions.sln b/src/Functions/SantaTalk.Functions/SantaTalk.Functions.sln
new file mode 100644
index 0000000..cca0ce8
--- /dev/null
+++ b/src/Functions/SantaTalk.Functions/SantaTalk.Functions.sln
@@ -0,0 +1,23 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SantaTalk.Functions", "SantaTalk.Functions.csproj", "{8B1596A8-6091-4F56-8CC1-181879196AF1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SantaTalk.Models", "..\SantaTalk.Models\SantaTalk.Models.csproj", "{4F60AC05-3995-43B7-827F-A47DC2764D6A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8B1596A8-6091-4F56-8CC1-181879196AF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B1596A8-6091-4F56-8CC1-181879196AF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B1596A8-6091-4F56-8CC1-181879196AF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B1596A8-6091-4F56-8CC1-181879196AF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F60AC05-3995-43B7-827F-A47DC2764D6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F60AC05-3995-43B7-827F-A47DC2764D6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F60AC05-3995-43B7-827F-A47DC2764D6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F60AC05-3995-43B7-827F-A47DC2764D6A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/src/Functions/SantaTalk.Functions/WriteSanta.cs b/src/Functions/SantaTalk.Functions/WriteSanta.cs
index 1b402a6..56c7d40 100644
--- a/src/Functions/SantaTalk.Functions/WriteSanta.cs
+++ b/src/Functions/SantaTalk.Functions/WriteSanta.cs
@@ -17,13 +17,11 @@ namespace SantaTalk.Functions
 {
     public static class WriteSanta
     {
-        static TextAnalyticsClient textClient;
-
+        static readonly TextAnalyticsClient textClient;
         static WriteSanta()
         {
-            var keys = new ApiKeyServiceClientCredentials(Environment.GetEnvironmentVariable("APIKey"));
-
-            textClient = new TextAnalyticsClient(keys) { Endpoint = Environment.GetEnvironmentVariable("APIEndpoint") };
+            var credentials = new ApiKeyServiceClientCredentials(Environment.GetEnvironmentVariable("APIKey"));
+            textClient = new TextAnalyticsClient(credentials) { Endpoint = Environment.GetEnvironmentVariable("APIEndpoint") };
         }
 
         [FunctionName("WriteSanta")]
diff --git a/src/Functions/SantaTalk.Functions/local.settings.json b/src/Functions/SantaTalk.Functions/local.settings.json
new file mode 100644
index 0000000..a44dc5c
--- /dev/null
+++ b/src/Functions/SantaTalk.Functions/local.settings.json
@@ -0,0 +1,10 @@
+{
+  "IsEncrypted": false,
+  "Values": {
+    "API_HOST": "https://configuredOnAzure.azurewebsites.net",
+    "END_POINT": "registers",
+    "APIKey": "6cf27ec5e0604d5b967fdb997f476443",
+    "APIEndpoint": "https://westcentralus.api.cognitive.microsoft.com/",
+    "FUNCTIONS_WORKER_RUNTIME": "dotnet"
+  }  
+}
\ No newline at end of file
diff --git a/src/SantaTalk.Android/SantaTalk.Android.csproj b/src/SantaTalk.Android/SantaTalk.Android.csproj
index ffcd81d..214173e 100644
--- a/src/SantaTalk.Android/SantaTalk.Android.csproj
+++ b/src/SantaTalk.Android/SantaTalk.Android.csproj
@@ -52,7 +52,7 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991477" />
     <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
     <PackageReference Include="Xamarin.FFImageLoading.Forms">
       <Version>2.4.11.982</Version>
@@ -64,7 +64,7 @@
       <Version>1.1.3</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms.PancakeView">
-      <Version>1.3.6</Version>
+      <Version>1.3.7</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>12.0.3</Version>
diff --git a/src/SantaTalk.iOS/SantaTalk.iOS.csproj b/src/SantaTalk.iOS/SantaTalk.iOS.csproj
index 19ef860..19647f8 100644
--- a/src/SantaTalk.iOS/SantaTalk.iOS.csproj
+++ b/src/SantaTalk.iOS/SantaTalk.iOS.csproj
@@ -122,7 +122,7 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991477" />
     <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
     <PackageReference Include="Xamarin.FFImageLoading.Forms">
       <Version>2.4.11.982</Version>
@@ -131,7 +131,7 @@
       <Version>1.3.0</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms.PancakeView">
-      <Version>1.3.6</Version>
+      <Version>1.3.7</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms.StateSquid">
       <Version>1.1.3</Version>
diff --git a/src/SantaTalk/App.xaml b/src/SantaTalk/App.xaml
index 1558f4a..2385341 100644
--- a/src/SantaTalk/App.xaml
+++ b/src/SantaTalk/App.xaml
@@ -27,7 +27,7 @@
             <Color x:Key="entry_background">#190336</Color>
             <Color x:Key="normal_text">#ffffff</Color>
             <Color x:Key="white">#ffffff</Color>
-
+            <Color x:Key="shell_background">#301536</Color>
             <!-- Controls -->
             <Style TargetType="{x:Type StackLayout}">
                 <Setter Property="Spacing" Value="0" />
diff --git a/src/SantaTalk/App.xaml.cs b/src/SantaTalk/App.xaml.cs
index 13cc1eb..9116245 100644
--- a/src/SantaTalk/App.xaml.cs
+++ b/src/SantaTalk/App.xaml.cs
@@ -1,6 +1,5 @@
 using System;
 using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
 
 namespace SantaTalk
 {
@@ -9,14 +8,7 @@ public partial class App : Application
         public App()
         {
             InitializeComponent();
-
-            var navPage = new NavigationPage(new MainPage())
-            {
-                BarBackgroundColor = Color.FromHex("#301536"),
-                BarTextColor = Color.Wheat
-            };
-
-            MainPage = navPage;
+            MainPage = new AppShell();
         }
 
         protected override void OnStart()
diff --git a/src/SantaTalk/AppShell.xaml b/src/SantaTalk/AppShell.xaml
new file mode 100644
index 0000000..0b06756
--- /dev/null
+++ b/src/SantaTalk/AppShell.xaml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Shell xmlns="http://xamarin.com/schemas/2014/forms"
+       xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+       xmlns:views="clr-namespace:SantaTalk.Views"           
+       Shell.FlyoutBehavior="Disabled"
+       Shell.TitleColor="Wheat"
+       Shell.BackgroundColor="{StaticResource shell_background}"
+       x:Class="SantaTalk.AppShell">
+
+   <ShellContent Route="home"
+                      Title="Home"                      
+                      ContentTemplate="{DataTemplate views:MainPage}">
+   </ShellContent>
+</Shell>
diff --git a/src/SantaTalk/AppShell.xaml.cs b/src/SantaTalk/AppShell.xaml.cs
new file mode 100644
index 0000000..f63599d
--- /dev/null
+++ b/src/SantaTalk/AppShell.xaml.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using Xamarin.Forms;
+
+namespace SantaTalk
+{
+    public partial class AppShell : Shell
+    {
+        public AppShell()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/SantaTalk/SantaTalk.csproj b/src/SantaTalk/SantaTalk.csproj
index 7ad5715..72d71ea 100644
--- a/src/SantaTalk/SantaTalk.csproj
+++ b/src/SantaTalk/SantaTalk.csproj
@@ -11,11 +11,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991265" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991477" />
     <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
     <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.11.982" />
     <PackageReference Include="Refractored.MvvmHelpers" Version="1.3.0" />
-    <PackageReference Include="Xamarin.Forms.PancakeView" Version="1.3.6" />
+    <PackageReference Include="Xamarin.Forms.PancakeView" Version="1.3.7" />
     <PackageReference Include="Xamarin.Forms.StateSquid" Version="1.1.3" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
@@ -25,5 +25,6 @@
   <ItemGroup>
     <Folder Include="Services\" />
     <Folder Include="ViewModels\" />
+    <Folder Include="Views\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/SantaTalk/Services/LetterDeliveryService.cs b/src/SantaTalk/Services/LetterDeliveryService.cs
index 9a55d77..1b29739 100644
--- a/src/SantaTalk/Services/LetterDeliveryService.cs
+++ b/src/SantaTalk/Services/LetterDeliveryService.cs
@@ -9,11 +9,10 @@ namespace SantaTalk
 {
     public class LetterDeliveryService
     {
-        //string santaUrl = "{REPLACE WITH YOUR FUNCTION URL}/api/WriteSanta";
-
-        string santaUrl = "http://localhost:7071/api/WriteSanta";
-        static HttpClient httpClient = new HttpClient();
+        string santaUrl = "https://xamarinazureSantaTalk-kumar.azurewebsites.net/api/WriteSanta?code=xxxxxxxxxxx";
+        //string santaUrl = "http://localhost:7071/api/WriteSanta";
 
+        static readonly HttpClient httpClient = new HttpClient();
         public async Task<SantaResults> WriteLetterToSanta(SantaLetter letter)
         {
             // if we're on the Android emulator, running functions locally, need to swap out the function url
@@ -22,7 +21,7 @@ public async Task<SantaResults> WriteLetterToSanta(SantaLetter letter)
                 santaUrl = "http://10.0.2.2:7071/api/WriteSanta";
             }
 
-            SantaResults results = null;
+            SantaResults results;
             try
             {
                 var letterJson = JsonConvert.SerializeObject(letter);
diff --git a/src/SantaTalk/ViewModels/MainPageViewModel.cs b/src/SantaTalk/ViewModels/MainPageViewModel.cs
index 2663946..7d096d0 100644
--- a/src/SantaTalk/ViewModels/MainPageViewModel.cs
+++ b/src/SantaTalk/ViewModels/MainPageViewModel.cs
@@ -1,18 +1,21 @@
 using System;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Input;
 using MvvmHelpers;
+using SantaTalk.Views;
 using Xamarin.Forms;
 
 namespace SantaTalk
 {
     public class MainPageViewModel : BaseViewModel
     {
+        public ICommand SendLetterCommand { get; private set; }
+
         public MainPageViewModel()
         {
-            SendLetterCommand = new Command(async () =>
-            {
-                await Application.Current.MainPage.Navigation.PushAsync(new ResultsPage(KidsName, LetterText));
-            });
+            SendLetterCommand = new Command(() =>
+            NavigateToResultPage().ConfigureAwait(false));
         }
 
         string kidsName;
@@ -29,6 +32,29 @@ public string LetterText
             set => SetProperty(ref letterText, value);
         }
 
-        public ICommand SendLetterCommand { get; }
+        async Task NavigateToResultPage()
+        {
+            var areFieldsValid = await AreFieldsValid(KidsName, LetterText);
+            if (!areFieldsValid)
+                return;
+
+            await Shell.Current.Navigation.PushAsync(new ResultsPage(KidsName, LetterText), true);
+        }
+
+        async Task<bool> AreFieldsValid(string name, string inputText)
+        {
+            var builder = new StringBuilder();
+
+            if (string.IsNullOrWhiteSpace(name))
+                builder.AppendLine("Please enter your name.");
+
+            else if (inputText.EndsWith("Dear Santa...", StringComparison.InvariantCultureIgnoreCase))
+                builder.AppendLine("Please write something...");
+
+            if (builder.Length != 0)
+                await Application.Current.MainPage.DisplayAlert("Invalid Field(s)", builder.ToString(), "Ok");
+
+            return builder.Length == 0;
+        }
     }
 }
diff --git a/src/SantaTalk/ViewModels/ResultsPageViewModel.cs b/src/SantaTalk/ViewModels/ResultsPageViewModel.cs
index 696a611..3dc4b4d 100644
--- a/src/SantaTalk/ViewModels/ResultsPageViewModel.cs
+++ b/src/SantaTalk/ViewModels/ResultsPageViewModel.cs
@@ -60,23 +60,31 @@ public async Task SendLetterToSanta()
                 LetterText = LetterText
             };
 
-            var letterService = new LetterDeliveryService();
-            var results = await letterService.WriteLetterToSanta(letter);
-
-            if (results.SentimentScore == -1)
+            try
             {
-                CurrentState = State.Error;
-                return;
-            }
+                var letterService = new LetterDeliveryService();
+                var results = await letterService.WriteLetterToSanta(letter);
+
+                if (results.SentimentScore.Equals(-1))
+                {
+                    CurrentState = State.Error;
+                    return;
+                }
 
-            var commentsService = new SantasCommentsService();
-            var comments = commentsService.MakeGiftDecision(results);
+                var commentsService = new SantasCommentsService();
+                var comments = commentsService.MakeGiftDecision(results);
 
-            SantasComment = comments.SentimentInterpretation;
-            GiftDecision = comments.GiftPrediction;
-            DetectedLanguage = results.DetectedLanguage;
+                SantasComment = comments.SentimentInterpretation;
+                GiftDecision = comments.GiftPrediction;
+                DetectedLanguage = results.DetectedLanguage;
 
-            CurrentState = State.Success;
+                CurrentState = State.Success;
+            }
+            catch(Exception ex)
+            {
+                currentState = State.Error;
+                Console.WriteLine(ex.Message);
+            }
         }
     }
 }
diff --git a/src/SantaTalk/MainPage.xaml b/src/SantaTalk/Views/MainPage.xaml
similarity index 92%
rename from src/SantaTalk/MainPage.xaml
rename to src/SantaTalk/Views/MainPage.xaml
index 7263026..eaff30f 100644
--- a/src/SantaTalk/MainPage.xaml
+++ b/src/SantaTalk/Views/MainPage.xaml
@@ -7,12 +7,10 @@
     xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
     xmlns:controls="clr-namespace:Xamarin.Forms.PancakeView;assembly=Xamarin.Forms.PancakeView"
     xmlns:viewmodels="clr-namespace:SantaTalk"
-    mc:Ignorable="d"
-    NavigationPage.HasNavigationBar="False"
-    NavigationPage.BackButtonTitle=""
+    mc:Ignorable="d"    
     ios:Page.UseSafeArea="True"
-    BackgroundColor="{StaticResource dark_gradient}"
-    x:Class="SantaTalk.MainPage">
+    BackgroundColor="{StaticResource dark_gradient}"  
+    x:Class="SantaTalk.Views.MainPage">
 
     <ContentPage.BindingContext>
         <viewmodels:MainPageViewModel />
diff --git a/src/SantaTalk/MainPage.xaml.cs b/src/SantaTalk/Views/MainPage.xaml.cs
similarity index 64%
rename from src/SantaTalk/MainPage.xaml.cs
rename to src/SantaTalk/Views/MainPage.xaml.cs
index 6785898..79eb2f2 100644
--- a/src/SantaTalk/MainPage.xaml.cs
+++ b/src/SantaTalk/Views/MainPage.xaml.cs
@@ -9,7 +9,7 @@
 using Xamarin.Essentials;
 using Xamarin.Forms;
 
-namespace SantaTalk
+namespace SantaTalk.Views
 {
     // Learn more about making custom code visible in the Xamarin.Forms previewer
     // by visiting https://aka.ms/xamarinforms-previewer
@@ -19,9 +19,8 @@ public partial class MainPage : ContentPage
         private readonly int _formsWidth;
         private readonly int _formsHeight;
 
-        private bool _initialized = false;
-        private bool _starsAdded = false;
-        private List<VisualElement> _stars = new List<VisualElement>();
+        private bool _initialized;      
+        private readonly List<VisualElement> _stars = new List<VisualElement>();
 
         public MainPage()
         {
@@ -31,41 +30,37 @@ public MainPage()
             _formsHeight = Convert.ToInt32(DeviceDisplay.MainDisplayInfo.Height / DeviceDisplay.MainDisplayInfo.Density);
         }
 
-        protected override async void OnAppearing()
+        protected override void OnAppearing()
         {
             base.OnAppearing();
 
             if (!_initialized)
             {
                 PositionStars();
-                RotateStars();
+                RotateStars().ConfigureAwait(false);
+                _initialized = true;
             }
-
-            _initialized = true;
         }
 
         private void PositionStars()
         {
-            if (!_starsAdded)
-            {
-                var random = new Random();
 
+            var random = new Random();
 
-                for (int j = 0; j < 5; j++)
-                {
-                    var starField = new Grid();
+            for (int j = 0; j < 5; j++)
+            {
+                var starField = new Grid();
 
-                    for (int i = 0; i < 20; i++)
-                    {
-                        var size = random.Next(3, 7);
-                        var star = new CachedImage() { Source = "star.png", Opacity = 0.3, HeightRequest = size, WidthRequest = size, HorizontalOptions = LayoutOptions.Start, VerticalOptions = LayoutOptions.Start, TranslationX = random.Next(0, _formsWidth), TranslationY = random.Next(0, _formsHeight) };
-                        starField.Children.Add(star);
-                    }
+                for (int i = 0; i < 20; i++)
+                {
+                    var size = random.Next(3, 7);
+                    var star = new CachedImage() { Source = "star.png", Opacity = 0.3, HeightRequest = size, WidthRequest = size, HorizontalOptions = LayoutOptions.Start, VerticalOptions = LayoutOptions.Start, TranslationX = random.Next(0, _formsWidth), TranslationY = random.Next(0, _formsHeight) };
+                    starField.Children.Add(star);
+                }
 
-                    _stars.Add(starField);
+                _stars.Add(starField);
 
-                    MainGrid.Children.Insert(0, starField);
-                }
+                MainGrid.Children.Insert(0, starField);
             }
         }
 
diff --git a/src/SantaTalk/ResultsPage.xaml b/src/SantaTalk/Views/ResultsPage.xaml
similarity index 94%
rename from src/SantaTalk/ResultsPage.xaml
rename to src/SantaTalk/Views/ResultsPage.xaml
index a31892f..536cdef 100644
--- a/src/SantaTalk/ResultsPage.xaml
+++ b/src/SantaTalk/Views/ResultsPage.xaml
@@ -2,13 +2,16 @@
 <ContentPage
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:d="http://xamarin.com/schemas/2014/forms/design"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
     xmlns:controls="clr-namespace:Xamarin.Forms.PancakeView;assembly=Xamarin.Forms.PancakeView"
-    xmlns:state="clr-namespace:Xamarin.Forms.StateSquid;assembly=Xamarin.Forms.StateSquid"             
-    x:Class="SantaTalk.ResultsPage"
+    xmlns:state="clr-namespace:Xamarin.Forms.StateSquid;assembly=Xamarin.Forms.StateSquid"
+    mc:Ignorable="d" 
+    x:Class="SantaTalk.Views.ResultsPage"
+    Title="Santa's Reply"
     ios:Page.UseSafeArea="True"
-    BackgroundColor="{StaticResource dark_gradient}"
-    NavigationPage.HasNavigationBar="False">
+    BackgroundColor="{StaticResource dark_gradient}">
 
     <ContentPage.Resources>
         <ResourceDictionary>
@@ -25,7 +28,7 @@
                           BackgroundGradientEndColor="{StaticResource light_gradient}">
 
             <Grid x:Name="MainGrid" state:StateLayout.CurrentState="{Binding CurrentState}">
-                                
+                
                 <state:StateLayout.StateViews>
                     <state:StateView StateKey="Loading">
                         <StackLayout Margin="24" Spacing="0">
@@ -57,7 +60,6 @@
                         <StackLayout Margin="24" Spacing="0">
                             <Label Text="HERE IS SANTA'S LETTER BACK TO YOU" FontSize="16" TextColor="{StaticResource highlight_text}"/>
                             <Label Text="{Binding KidsName, StringFormat='Dear {0},'}" FontSize="48"/>
-
                             <controls:PancakeView Margin="0,24,0,0" BackgroundColor="{StaticResource white}" CornerRadius="8">
                                 <StackLayout Padding="24" Spacing="8">
                                     <Label Text="I think it's very nice that you took the time to write me." Style="{StaticResource SantaText}" />
@@ -91,7 +93,8 @@
                 </state:StateLayout.StateViews>
 
             </Grid>
-            
+
+
         </controls:PancakeView>
 
     </ContentPage.Content>
diff --git a/src/SantaTalk/ResultsPage.xaml.cs b/src/SantaTalk/Views/ResultsPage.xaml.cs
similarity index 61%
rename from src/SantaTalk/ResultsPage.xaml.cs
rename to src/SantaTalk/Views/ResultsPage.xaml.cs
index 26c040a..9968629 100644
--- a/src/SantaTalk/ResultsPage.xaml.cs
+++ b/src/SantaTalk/Views/ResultsPage.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Threading;
 using System.Threading.Tasks;
 using FFImageLoading.Forms;
@@ -7,17 +8,17 @@
 using Xamarin.Forms;
 using Xamarin.Forms.StateSquid;
 
-namespace SantaTalk
+namespace SantaTalk.Views
 {
+    [DesignTimeVisible(false)]
     public partial class ResultsPage : ContentPage
     {
         private readonly int _formsWidth;
         private readonly int _formsHeight;
 
-        private bool _initialized = false;
-        private bool _starsAdded = false;
-        private List<VisualElement> _stars = new List<VisualElement>();
-        private ResultsPageViewModel vm = new ResultsPageViewModel();
+        private bool _initialized;      
+        private readonly List<VisualElement> _stars = new List<VisualElement>();
+        private readonly ResultsPageViewModel vm = new ResultsPageViewModel();
 
         public ResultsPage(string kidsName, string letterText)
         {
@@ -33,43 +34,38 @@ public ResultsPage(string kidsName, string letterText)
             _formsHeight = Convert.ToInt32(DeviceDisplay.MainDisplayInfo.Height / DeviceDisplay.MainDisplayInfo.Density);
         }
 
-        protected override async void OnAppearing()
+        protected override void OnAppearing()
         {
             base.OnAppearing();
 
-            await vm.SendLetterToSanta();
+            vm.SendLetterToSanta().ConfigureAwait(false);
 
             if (!_initialized)
             {
                 PositionStars();
-                RotateStars();
+                RotateStars().ConfigureAwait(false);
+                _initialized = true;
             }
-
-            _initialized = true;
         }
 
         private void PositionStars()
         {
-            if (!_starsAdded)
-            {
-                var random = new Random();
+            var random = new Random();
 
+            for (int j = 0; j < 5; j++)
+            {
+                var starField = new Grid();
 
-                for (int j = 0; j < 5; j++)
+                for (int i = 0; i < 20; i++)
                 {
-                    var starField = new Grid();
-
-                    for (int i = 0; i < 20; i++)
-                    {
-                        var size = random.Next(3, 7);
-                        var star = new CachedImage() { Source = "star.png", Opacity = 0.3, HeightRequest = size, WidthRequest = size, HorizontalOptions = LayoutOptions.Start, VerticalOptions = LayoutOptions.Start, TranslationX = random.Next(0, _formsWidth), TranslationY = random.Next(0, _formsHeight) };
-                        starField.Children.Add(star);
-                    }
+                    var size = random.Next(3, 7);
+                    var star = new CachedImage() { Source = "star.png", Opacity = 0.3, HeightRequest = size, WidthRequest = size, HorizontalOptions = LayoutOptions.Start, VerticalOptions = LayoutOptions.Start, TranslationX = random.Next(0, _formsWidth), TranslationY = random.Next(0, _formsHeight) };
+                    starField.Children.Add(star);
+                }
 
-                    _stars.Add(starField);
+                _stars.Add(starField);
 
-                    MainGrid.Children.Insert(0, starField);
-                }
+                MainGrid.Children.Insert(0, starField);
             }
         }