diff --git a/RestaurantManager/RestaurantManager.UniversalWindows/App.xaml.cs b/RestaurantManager/RestaurantManager.UniversalWindows/App.xaml.cs
index b03a0c7..bded7d4 100644
--- a/RestaurantManager/RestaurantManager.UniversalWindows/App.xaml.cs
+++ b/RestaurantManager/RestaurantManager.UniversalWindows/App.xaml.cs
@@ -38,14 +38,7 @@ public App()
     /// </summary>
     /// <param name="e">Details about the launch request and process.</param>
     protected override void OnLaunched(LaunchActivatedEventArgs e)
-    {
-      #if DEBUG
-      if (System.Diagnostics.Debugger.IsAttached)
-      {
-        this.DebugSettings.EnableFrameRateCounter = true;
-      }
-      #endif
-
+    {      
       Frame rootFrame = Window.Current.Content as Frame;
 
       // Do not repeat app initialization when the Window already has content,
diff --git a/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml b/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml
index 8e96013..897890e 100644
--- a/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml
+++ b/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml
@@ -6,17 +6,24 @@
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
   mc:Ignorable="d">
+  <Page.TopAppBar>
+    <AppBar x:Name="topAppBar" IsSticky="false">
+      <Grid>
+        <AppBarButton x:Name="btnHome"  Label="Home" Icon="Home" Click="btnHome_Click" />
+      </Grid>
+    </AppBar>
+  </Page.TopAppBar>
   <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
     <Grid.RowDefinitions>
       <RowDefinition Height="9*" />
       <RowDefinition Height="1*" />
     </Grid.RowDefinitions>
-    <TextBlock 
-      x:Name="textBlock" 
+    <GridView x:Name="OrdersGridView" />
+    <Button 
+      x:Name="ClearOrders" 
+      Content="Clear All Orders"
       Grid.Row="1" 
       HorizontalAlignment="Center" 
-      Text="**Clear All Orders**" 
-      TextWrapping="Wrap" 
       VerticalAlignment="Center" />
   </Grid>
 </Page>
\ No newline at end of file
diff --git a/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml.cs b/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml.cs
index 6c11731..62f3307 100644
--- a/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml.cs
+++ b/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml.cs
@@ -26,5 +26,10 @@ public ExpeditePage()
     {
       this.InitializeComponent();
     }
+
+    private void btnHome_Click(object sender, RoutedEventArgs e)
+    {
+      Frame.Navigate(typeof(MainPage));
+    }
   }
 }
diff --git a/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml b/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml
index 633c329..1960993 100644
--- a/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml
+++ b/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml
@@ -32,21 +32,21 @@
       Text="Internal Test Version" 
       TextWrapping="Wrap" 
       VerticalAlignment="Bottom" />
-    <TextBlock 
-      x:Name="textBlock2" 
+    <Button 
+      x:Name="OrdersView" 
+      Content="Go to Orders View"
       Grid.Column="0"  
       Grid.Row="2" 
       HorizontalAlignment="Center" 
-      Text="**Go to Orders View**" 
-      TextWrapping="Wrap" 
-      VerticalAlignment="Center" />
-    <TextBlock 
-      x:Name="textBlock3" 
+      VerticalAlignment="Center" 
+      Click="OrdersView_Click" />
+    <Button 
+      x:Name="SubmitOrder" 
+      Content="Submit Order" 
       Grid.Column="1" 
       Grid.Row="2" 
-      HorizontalAlignment="Center" 
-      Text="**Submit Order**" 
-      TextWrapping="Wrap" 
-      VerticalAlignment="Center" />
+      HorizontalAlignment="Center"
+      VerticalAlignment="Center" 
+      Click="SubmitOrder_Click" />
   </Grid>
 </Page>
\ No newline at end of file
diff --git a/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml.cs b/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml.cs
index b4b38c3..0ee8997 100644
--- a/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml.cs
+++ b/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml.cs
@@ -26,5 +26,15 @@ public MainPage()
     {
       this.InitializeComponent();
     }
+
+    private void OrdersView_Click(object sender, RoutedEventArgs e)
+    {
+      Frame.Navigate(typeof(ExpeditePage));
+    }
+
+    private void SubmitOrder_Click(object sender, RoutedEventArgs e)
+    {
+      Frame.Navigate(typeof(OrderPage));
+    }
   }
 }
\ No newline at end of file
diff --git a/RestaurantManager/RestaurantManager.UniversalWindows/OrderPage.xaml b/RestaurantManager/RestaurantManager.UniversalWindows/OrderPage.xaml
index 5442046..365bdf7 100644
--- a/RestaurantManager/RestaurantManager.UniversalWindows/OrderPage.xaml
+++ b/RestaurantManager/RestaurantManager.UniversalWindows/OrderPage.xaml
@@ -6,6 +6,13 @@
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
   mc:Ignorable="d">
+  <Page.TopAppBar>
+    <AppBar x:Name="topAppBar" IsSticky="false">
+      <Grid>
+        <AppBarButton x:Name="btnHome"  Label="Home" Icon="Home" Click="btnHome_Click" />
+      </Grid>
+    </AppBar>
+  </Page.TopAppBar>
   <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
     <Grid.ColumnDefinitions>
       <ColumnDefinition Width="5*" />
@@ -19,6 +26,10 @@
       <RowDefinition Height="1*" />
       <RowDefinition Height="1*" />
     </Grid.RowDefinitions>
+    <ListView 
+      x:Name="listView" 
+      Grid.Row="1" 
+      Grid.RowSpan="3" />
     <TextBlock 
       x:Name="textBlock" 
       Grid.Column="1" 
@@ -35,21 +46,24 @@
       Text="Order Items:" 
       TextWrapping="Wrap" 
       VerticalAlignment="Center"/>
-    <TextBlock 
-      x:Name="textBlock2" 
+    <ListView 
+      x:Name="listView1" 
+      Grid.Column="2" 
+      Grid.Row="2" 
+      Grid.RowSpan="2"  />
+    <Button 
+      x:Name="AddOrder" 
+      Content="Add to Order" 
       Grid.Row="4" 
       HorizontalAlignment="Center" 
-      Text="**Add to Order**" 
-      TextWrapping="Wrap" 
       VerticalAlignment="Center" />
-    <TextBlock 
-      x:Name="textBlock3" 
+    <Button 
+      x:Name="SubmitOrder" 
+      Content="Submit Order" 
       Grid.Column="1" 
       Grid.ColumnSpan="2" 
       Grid.Row="4" 
       HorizontalAlignment="Center" 
-      Text="**Submit Order**" 
-      TextWrapping="Wrap" 
       VerticalAlignment="Center" />
   </Grid>
 </Page>
\ No newline at end of file
diff --git a/RestaurantManager/RestaurantManager.UniversalWindows/OrderPage.xaml.cs b/RestaurantManager/RestaurantManager.UniversalWindows/OrderPage.xaml.cs
index 3b55183..9b5da39 100644
--- a/RestaurantManager/RestaurantManager.UniversalWindows/OrderPage.xaml.cs
+++ b/RestaurantManager/RestaurantManager.UniversalWindows/OrderPage.xaml.cs
@@ -26,5 +26,10 @@ public OrderPage()
     {
       this.InitializeComponent();
     }
+
+    private void btnHome_Click(object sender, RoutedEventArgs e)
+    {
+      Frame.Navigate(typeof(MainPage));
+    }
   }
-}
+}
\ No newline at end of file