diff --git a/MyFirstBlazor/BlazingPizza/App.razor b/MyFirstBlazor/BlazingPizza/App.razor
index 2c502a1..b6ab7c9 100644
--- a/MyFirstBlazor/BlazingPizza/App.razor
+++ b/MyFirstBlazor/BlazingPizza/App.razor
@@ -1,9 +1,9 @@
 <Router AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true">
     <Found Context="routeData">
-        <RouteView RouteData="@routeData" />
+        <RouteView RouteData="@routeData" DefaultLayout="typeof(MainLayout)" />
     </Found>
     <NotFound>
-        <LayoutView>
+        <LayoutView Layout="typeof(MainLayout)">
             <p>Sorry, there's nothing at this address.</p>
         </LayoutView>
     </NotFound>
diff --git a/MyFirstBlazor/BlazingPizza/Pages/Checkout.razor b/MyFirstBlazor/BlazingPizza/Pages/Checkout.razor
index 3b67888..ca0fae0 100644
--- a/MyFirstBlazor/BlazingPizza/Pages/Checkout.razor
+++ b/MyFirstBlazor/BlazingPizza/Pages/Checkout.razor
@@ -5,21 +5,6 @@
 @inject HttpClient HttpClient
 @inject NavigationManager NavigationManager
 
-<div class="top-bar">
-    <a class="logo" href="">
-        <img src="/img/logo.svg" />
-    </a>
-
-    <NavLink class="nav-tab" href="" Match="NavLinkMatch.All">
-        <img src="/img/pizza-slice.svg" />
-        <div>Get Pizza</div>
-    </NavLink>
-    <NavLink class="nav-tab" href="myorders">
-        <img src="img/bike.svg" />
-        <div>My orders</div>
-    </NavLink>
-</div>
-
 <div class="main">
     <div class="checkout-cols">
         <div class="checkout-order-details">
diff --git a/MyFirstBlazor/BlazingPizza/Pages/Index.razor b/MyFirstBlazor/BlazingPizza/Pages/Index.razor
index 35971d9..318ffc9 100644
--- a/MyFirstBlazor/BlazingPizza/Pages/Index.razor
+++ b/MyFirstBlazor/BlazingPizza/Pages/Index.razor
@@ -5,21 +5,6 @@
 @inject NavigationManager NavigationManager
 @inject OrderState OrderState
 
-<div class="top-bar">
-	<a class="logo" href="">
-		<img src="/img/logo.svg" />
-	</a>
-
-	<NavLink class="nav-tab" href="" Match="NavLinkMatch.All">
-		<img src="/img/pizza-slice.svg" />
-		<div>Get Pizza</div>
-	</NavLink>
-	<NavLink class="nav-tab" href="myorders">
-		<img src="img/bike.svg" />
-		<div>My orders</div>
-	</NavLink>
-</div>
-
 <div class="main">
 	<h1>Blazing Pizzas</h1>
 	<ul class="pizza-cards">
diff --git a/MyFirstBlazor/BlazingPizza/Pages/MyOrders.razor b/MyFirstBlazor/BlazingPizza/Pages/MyOrders.razor
index 6fd8e27..80c9acf 100644
--- a/MyFirstBlazor/BlazingPizza/Pages/MyOrders.razor
+++ b/MyFirstBlazor/BlazingPizza/Pages/MyOrders.razor
@@ -2,21 +2,6 @@
 @inject HttpClient HttpClient
 @inject NavigationManager NavigationManager
 
-<div class="top-bar">
-    <a class="logo" href="">
-        <img src="img/logo.svg" />
-    </a>
-
-    <NavLink class="nav-tab" href="" Match="NavLinkMatch.All">
-        <img src="/img/pizza-slice.svg" />
-        <div>Get Pizza</div>
-    </NavLink>
-    <NavLink class="nav-tab" href="myorders">
-        <img src="img/bike.svg" />
-        <div>My orders</div>
-    </NavLink>
-</div>
-
 <div class="main">
     @if (_ordersWithStatus == null)
     {
diff --git a/MyFirstBlazor/BlazingPizza/Pages/OrderDetail.razor b/MyFirstBlazor/BlazingPizza/Pages/OrderDetail.razor
index 3e56224..cb22415 100644
--- a/MyFirstBlazor/BlazingPizza/Pages/OrderDetail.razor
+++ b/MyFirstBlazor/BlazingPizza/Pages/OrderDetail.razor
@@ -2,21 +2,6 @@
 @inject HttpClient HttpClient
 @inject NavigationManager NavigationManager
 
-<div class="top-bar">
-    <a class="logo" href="">
-        <img src="img/logo.svg" />
-    </a>
-
-    <NavLink class="nav-tab" href="" Match="NavLinkMatch.All">
-        <img src="/img/pizza-slice.svg" />
-        <div>Get Pizza</div>
-    </NavLink>
-    <NavLink class="nav-tab" href="myorders">
-        <img src="img/bike.svg" />
-        <div>My orders</div>
-    </NavLink>
-</div>
-
 <div class="main">
     @if (_invalidOrder)
     {
diff --git a/MyFirstBlazor/BlazingPizza/Pages/_Host.cshtml b/MyFirstBlazor/BlazingPizza/Pages/_Host.cshtml
index 5548310..24ec93e 100644
--- a/MyFirstBlazor/BlazingPizza/Pages/_Host.cshtml
+++ b/MyFirstBlazor/BlazingPizza/Pages/_Host.cshtml
@@ -15,11 +15,7 @@
 </head>
 <body>
 
-    <div id="app">
-      <div class="content">
-        <component type="typeof(App)" render-mode="ServerPrerendered" />
-      </div>
-    </div>
+    <component type="typeof(App)" render-mode="ServerPrerendered" />
 
     <div id="blazor-error-ui">
         <environment include="Staging,Production">
diff --git a/MyFirstBlazor/BlazingPizza/Shared/MainLayout.razor b/MyFirstBlazor/BlazingPizza/Shared/MainLayout.razor
index ac9903f..5b37068 100644
--- a/MyFirstBlazor/BlazingPizza/Shared/MainLayout.razor
+++ b/MyFirstBlazor/BlazingPizza/Shared/MainLayout.razor
@@ -1,6 +1,27 @@
 @inherits LayoutComponentBase
 
-<div class="content">
-    @Body
-</div>
+<div id="app">
+
+    <header class="top-bar">
+        <a class="logo" href="">
+            <img src="img/logo.svg" />
+        </a>
+
+        <NavLink class="nav-tab" href="" Match="NavLinkMatch.All">
+            <img src="/img/pizza-slice.svg" />
+            <div>Get Pizza</div>
+        </NavLink>
+        <NavLink class="nav-tab" href="myorders">
+            <img src="img/bike.svg" />
+            <div>My orders</div>
+        </NavLink>
+    </header>
 
+    <div class="content">
+        @Body
+    </div>
+
+    <footer>
+        &copy; Blazing Pizza @DateTime.UtcNow.Year
+    </footer>
+</div>
diff --git a/MyFirstBlazor/BlazingPizza/pizza.db b/MyFirstBlazor/BlazingPizza/pizza.db
index e2a2455..b3f91f1 100644
Binary files a/MyFirstBlazor/BlazingPizza/pizza.db and b/MyFirstBlazor/BlazingPizza/pizza.db differ
diff --git a/MyFirstBlazor/BlazingPizza/pizza.db-shm b/MyFirstBlazor/BlazingPizza/pizza.db-shm
index 17063f4..67f4617 100644
Binary files a/MyFirstBlazor/BlazingPizza/pizza.db-shm and b/MyFirstBlazor/BlazingPizza/pizza.db-shm differ
diff --git a/MyFirstBlazor/BlazingPizza/pizza.db-wal b/MyFirstBlazor/BlazingPizza/pizza.db-wal
index 4c3b1f7..4097639 100644
Binary files a/MyFirstBlazor/BlazingPizza/pizza.db-wal and b/MyFirstBlazor/BlazingPizza/pizza.db-wal differ