diff --git a/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml b/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml
index c61b3ad..efe5162 100644
--- a/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml
+++ b/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml
@@ -14,11 +14,17 @@
             <RowDefinition Height="0.1*"/>
         </Grid.RowDefinitions>
 
-        <TextBlock
+        <GridView Grid.Row="0" Grid.Column="0" />
+        
+        <AppBar>
+            <AppBarButton Icon="Home" Label="Home" Click="AppBarButton_Click" />
+        </AppBar>
+
+        <Button
             Grid.Row="1"
             Grid.Column="0"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            Text="**Clear All Orders**"/>
+            Content="Clear All Orders"/>
     </Grid>
 </Page>
diff --git a/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml.cs b/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml.cs
index 2c333f7..819ede5 100644
--- a/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml.cs
+++ b/RestaurantManager/RestaurantManager.UniversalWindows/ExpeditePage.xaml.cs
@@ -26,5 +26,11 @@ public ExpeditePage()
         {
             this.InitializeComponent();
         }
+
+        private void AppBarButton_Click(object sender, RoutedEventArgs e)
+        {
+            this.Frame.GoBack();
+        }
+
     }
 }
diff --git a/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml b/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml
index 3e09371..fbb5143 100644
--- a/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml
+++ b/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml
@@ -37,18 +37,18 @@
             FontSize="20"
             Text="Internal Test Version"/>
 
-        <TextBlock
+        <Button
             Grid.Row="2"
             Grid.Column="0"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            Text="**Go to Orders View**"/>
+            Content="Go to Orders View" Click="Button_Click"/>
 
-        <TextBlock
+        <Button
             Grid.Row="2"
             Grid.Column="1"
             HorizontalAlignment="Center"
             VerticalAlignment="Center" 
-            Text="**Submit Order**"/>
+            Content="Submit Order" Click="Button_Click_1"/>
     </Grid>
 </Page>
diff --git a/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml.cs b/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml.cs
index 682c2ae..2262ea0 100644
--- a/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml.cs
+++ b/RestaurantManager/RestaurantManager.UniversalWindows/MainPage.xaml.cs
@@ -26,5 +26,16 @@ public MainPage()
         {
             this.InitializeComponent();
         }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            this.Frame.Navigate(typeof(ExpeditePage));
+        }
+
+        private void Button_Click_1(object sender, RoutedEventArgs e)
+        {
+            this.Frame.Navigate(typeof(OrderPage));
+        }
     }
+
 }
diff --git a/RestaurantManager/RestaurantManager.UniversalWindows/OrderPage.xaml b/RestaurantManager/RestaurantManager.UniversalWindows/OrderPage.xaml
index 52787de..89c3cab 100644
--- a/RestaurantManager/RestaurantManager.UniversalWindows/OrderPage.xaml
+++ b/RestaurantManager/RestaurantManager.UniversalWindows/OrderPage.xaml
@@ -22,6 +22,10 @@
             <ColumnDefinition Width="0.25*"/>
             <ColumnDefinition Width="0.25*"/>
         </Grid.ColumnDefinitions>
+
+        <AppBar Grid.ColumnSpan="3">
+            <AppBarButton Icon="Home" Label="Home" Click="AppBarButton_Click" />
+        </AppBar>
         
         <TextBlock
             Grid.Row="1"
@@ -33,19 +37,22 @@
             Grid.Column="2"
             Text="Order Items:"/>
 
-        <TextBlock
+        <ListView Grid.Row="2" Grid.Column="0" />
+        <ListView Grid.Row="2" Grid.Column="3" />
+        
+        <Button
             Grid.Row="4"
             Grid.Column="0"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            Text="**Add to Order**"/>
+            Content="Add to Order"/>
 
-        <TextBlock
+        <Button
             Grid.Row="4"
             Grid.Column="1"
             Grid.ColumnSpan="2"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            Text="**Submit Order**"/>
+            Content="Submit Order"/>
     </Grid>
 </Page>
diff --git a/RestaurantManager/RestaurantManager.UniversalWindows/OrderPage.xaml.cs b/RestaurantManager/RestaurantManager.UniversalWindows/OrderPage.xaml.cs
index e3a5334..f53ffe7 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 AppBarButton_Click(object sender, RoutedEventArgs e)
+        {
+            this.Frame.GoBack();
+        }
     }
 }
diff --git a/RestaurantManager/RestaurantManager.UniversalWindows/Package.appxmanifest b/RestaurantManager/RestaurantManager.UniversalWindows/Package.appxmanifest
index cdcfa4b..339d1bc 100644
--- a/RestaurantManager/RestaurantManager.UniversalWindows/Package.appxmanifest
+++ b/RestaurantManager/RestaurantManager.UniversalWindows/Package.appxmanifest
@@ -22,6 +22,9 @@
           </uap:ShowNameOnTiles>
         </uap:DefaultTile>
         <uap:SplashScreen Image="Assets\SplashScreen.png" BackgroundColor="#000000" />
+        <uap:InitialRotationPreference>
+          <uap:Rotation Preference="landscape" />
+        </uap:InitialRotationPreference>
       </uap:VisualElements>
     </Application>
   </Applications>