diff --git a/MissNationBlazorHybrid/MissNationBlazorHybrid.csproj b/MissNationBlazorHybrid/MissNationBlazorHybrid.csproj
index b59e617..ced5cd8 100644
--- a/MissNationBlazorHybrid/MissNationBlazorHybrid.csproj
+++ b/MissNationBlazorHybrid/MissNationBlazorHybrid.csproj
@@ -68,4 +68,8 @@
       <ProjectReference Include="..\MissNationSharedUI\MissNationSharedUI.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="wwwroot\css\" />
+    </ItemGroup>
+
 </Project>
diff --git a/MissNationBlazorHybrid/wwwroot/index.html b/MissNationBlazorHybrid/wwwroot/index.html
index e8eb4b4..325b969 100644
--- a/MissNationBlazorHybrid/wwwroot/index.html
+++ b/MissNationBlazorHybrid/wwwroot/index.html
@@ -5,9 +5,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
     <title>MissNationBlazorHybrid</title>
     <base href="/" />
-    <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
-    <link rel="stylesheet" href="css/app.css" />
+    <link rel="stylesheet" href="_content/MissNationSharedUI/css/bootstrap/bootstrap.min.css" />
     <link rel="stylesheet" href="MissNationBlazorHybrid.styles.css" />
+    <link rel="stylesheet" href="css/app.css" />
     <link rel="icon" type="image/png" href="favicon.png" />
 </head>
 
diff --git a/MissNationBlazorWASM/Client/MissNationBlazorWASM.Client.csproj b/MissNationBlazorWASM/Client/MissNationBlazorWASM.Client.csproj
index 108a06a..03911bd 100644
--- a/MissNationBlazorWASM/Client/MissNationBlazorWASM.Client.csproj
+++ b/MissNationBlazorWASM/Client/MissNationBlazorWASM.Client.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.13" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.13" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -17,4 +17,8 @@
     <ProjectReference Include="..\Shared\MissNationBlazorWASM.Shared.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="wwwroot\css\" />
+  </ItemGroup>
+
 </Project>
diff --git a/MissNationBlazorWASM/Client/wwwroot/css/app.css b/MissNationBlazorWASM/Client/wwwroot/css/app.css
deleted file mode 100644
index ffcb043..0000000
--- a/MissNationBlazorWASM/Client/wwwroot/css/app.css
+++ /dev/null
@@ -1,32 +0,0 @@
-h1:focus {
-    outline: none;
-}
-
-#blazor-error-ui {
-    background: lightyellow;
-    bottom: 0;
-    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
-    display: none;
-    left: 0;
-    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
-    position: fixed;
-    width: 100%;
-    z-index: 1000;
-}
-
-    #blazor-error-ui .dismiss {
-        cursor: pointer;
-        position: absolute;
-        right: 0.75rem;
-        top: 0.5rem;
-    }
-
-.blazor-error-boundary {
-    background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
-    padding: 1rem 1rem 1rem 3.7rem;
-    color: white;
-}
-
-    .blazor-error-boundary::after {
-        content: "An error has occurred."
-    }
diff --git a/MissNationBlazorWASM/Client/wwwroot/index.html b/MissNationBlazorWASM/Client/wwwroot/index.html
index 7de841d..4f4e387 100644
--- a/MissNationBlazorWASM/Client/wwwroot/index.html
+++ b/MissNationBlazorWASM/Client/wwwroot/index.html
@@ -6,7 +6,9 @@
     <title>MissNationBlazorWASM</title>
     <base href="/" />
     <link href="_content/MissNationSharedUI/css/app.css" rel="stylesheet" />
-    
+    <link href="_content/MissNationSharedUI/css/bootstrap/bootstrap.min.css" rel="stylesheet" />
+    <link href="MissNationBlazorWasm.Client.styles.css" rel="stylesheet" />
+
     <!-- If you add any scoped CSS files, uncomment the following to load them
     <link href="MissNationBlazorWASM.Client.styles.css" rel="stylesheet" /> -->
 </head>
diff --git a/MissNationBlazorWASM/Server/MissNationBlazorWASM.Server.csproj b/MissNationBlazorWASM/Server/MissNationBlazorWASM.Server.csproj
index c7efb35..8fac473 100644
--- a/MissNationBlazorWASM/Server/MissNationBlazorWASM.Server.csproj
+++ b/MissNationBlazorWASM/Server/MissNationBlazorWASM.Server.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.13" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MissNationSharedUI/Shared/Components/Layout/NavMenu.razor b/MissNationSharedUI/Shared/Components/Layout/NavMenu.razor
index 9abb590..5adadf6 100644
--- a/MissNationSharedUI/Shared/Components/Layout/NavMenu.razor
+++ b/MissNationSharedUI/Shared/Components/Layout/NavMenu.razor
@@ -1,4 +1,5 @@
-<div class="top-row ps-3 navbar navbar-dark">
+
+<div class="top-row ps-3 navbar navbar-dark">
     <div class="container-fluid">
         <a class="navbar-brand" href="">MissNationBlazorHybrid</a>
     </div>
diff --git a/MissNationSharedUI/_Imports.razor b/MissNationSharedUI/_Imports.razor
index 7728512..cef1c7e 100644
--- a/MissNationSharedUI/_Imports.razor
+++ b/MissNationSharedUI/_Imports.razor
@@ -1 +1,2 @@
 @using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Routing
diff --git a/MissNationBlazorHybrid/wwwroot/css/app.css b/MissNationSharedUI/wwwroot/css/app.css
similarity index 100%
rename from MissNationBlazorHybrid/wwwroot/css/app.css
rename to MissNationSharedUI/wwwroot/css/app.css
diff --git a/MissNationBlazorHybrid/wwwroot/css/bootstrap/bootstrap.min.css b/MissNationSharedUI/wwwroot/css/bootstrap/bootstrap.min.css
similarity index 100%
rename from MissNationBlazorHybrid/wwwroot/css/bootstrap/bootstrap.min.css
rename to MissNationSharedUI/wwwroot/css/bootstrap/bootstrap.min.css
diff --git a/MissNationBlazorHybrid/wwwroot/css/bootstrap/bootstrap.min.css.map b/MissNationSharedUI/wwwroot/css/bootstrap/bootstrap.min.css.map
similarity index 100%
rename from MissNationBlazorHybrid/wwwroot/css/bootstrap/bootstrap.min.css.map
rename to MissNationSharedUI/wwwroot/css/bootstrap/bootstrap.min.css.map