diff --git a/DeepDrftManager/Components/NotFound.razor b/DeepDrftManager/Components/NotFound.razor
new file mode 100644
index 0000000..998bfdd
--- /dev/null
+++ b/DeepDrftManager/Components/NotFound.razor
@@ -0,0 +1,7 @@
+@page "/404"
+
+<PageTitle>SkipperHaven - Page Not Found</PageTitle>
+
+<MudText Typo="Typo.h1" Color="Color.Primary">
+    404 - Resource Not Found 
+</MudText>
diff --git a/DeepDrftManager/Components/Pages/Cms/_Imports.razor b/DeepDrftManager/Components/Pages/Cms/_Imports.razor
deleted file mode 100644
index 24cf4a5..0000000
--- a/DeepDrftManager/Components/Pages/Cms/_Imports.razor
+++ /dev/null
@@ -1 +0,0 @@
-@layout DeepDrftManager.Components.Layout.CmsLayout
diff --git a/DeepDrftManager/Components/Pages/Cms/Index.razor b/DeepDrftManager/Components/Pages/Index.razor
similarity index 88%
rename from DeepDrftManager/Components/Pages/Cms/Index.razor
rename to DeepDrftManager/Components/Pages/Index.razor
index e0993d8..3e387dd 100644
--- a/DeepDrftManager/Components/Pages/Cms/Index.razor
+++ b/DeepDrftManager/Components/Pages/Index.razor
@@ -1,5 +1,7 @@
-@page "/cms"
+@page "/"
 @attribute [Authorize]
+@layout Layout.CmsLayout
+
 
 <PageTitle>DeepDrft CMS</PageTitle>
 
diff --git a/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor b/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor
index ef4f23e..e751844 100644
--- a/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor
+++ b/DeepDrftManager/Components/Pages/Tracks/TrackEdit.razor
@@ -1,4 +1,4 @@
-@page "/cms/tracks/{Id:long}"
+@page "/tracks/{Id:long}"
 @using DeepDrftManager.Services
 @attribute [Authorize]
 @inject ICmsTrackService CmsTrackService
@@ -12,7 +12,7 @@
 <MudContainer MaxWidth="MaxWidth.Medium" Class="mt-8">
     <MudButton Variant="Variant.Text"
                StartIcon="@Icons.Material.Filled.ArrowBack"
-               Href="/cms/tracks"
+               Href="/tracks"
                Class="mb-4">
         Back to tracks
     </MudButton>
@@ -172,7 +172,7 @@
             if (result.Success)
             {
                 Snackbar.Add("Track deleted.", Severity.Success);
-                Nav.NavigateTo("/cms/tracks");
+                Nav.NavigateTo("/tracks");
             }
             else
             {
diff --git a/DeepDrftManager/Components/Pages/Tracks/TrackList.razor b/DeepDrftManager/Components/Pages/Tracks/TrackList.razor
index 02738cb..aa7fbbd 100644
--- a/DeepDrftManager/Components/Pages/Tracks/TrackList.razor
+++ b/DeepDrftManager/Components/Pages/Tracks/TrackList.razor
@@ -1,4 +1,4 @@
-@page "/cms/tracks"
+@page "/tracks"
 @using System.Net
 @using DeepDrftManager.Services
 @attribute [Authorize]
@@ -15,7 +15,7 @@
         <MudButton Variant="Variant.Filled"
                    Color="Color.Primary"
                    StartIcon="@Icons.Material.Filled.Add"
-                   Href="/cms/tracks/new">
+                   Href="/tracks/new">
             Add Track
         </MudButton>
     </MudStack>
@@ -57,7 +57,7 @@
                     <MudIconButton Icon="@Icons.Material.Filled.Edit"
                                    Size="Size.Small"
                                    Color="Color.Primary"
-                                   Href="@($"/cms/tracks/{context.Id}")" />
+                                   Href="@($"/tracks/{context.Id}")" />
                 </MudTooltip>
                 <MudTooltip Text="Delete">
                     <MudIconButton Icon="@Icons.Material.Filled.Delete"
diff --git a/DeepDrftManager/Components/Pages/Tracks/TrackNew.razor b/DeepDrftManager/Components/Pages/Tracks/TrackNew.razor
index a4104fa..31b09a1 100644
--- a/DeepDrftManager/Components/Pages/Tracks/TrackNew.razor
+++ b/DeepDrftManager/Components/Pages/Tracks/TrackNew.razor
@@ -1,4 +1,4 @@
-@page "/cms/tracks/new"
+@page "/tracks/new"
 @using System.Security.Claims
 @using DeepDrftManager.Services
 @attribute [Authorize]
@@ -149,7 +149,7 @@
             if (result.Success)
             {
                 Snackbar.Add($"Uploaded '{_trackName}'.", Severity.Success);
-                Navigation.NavigateTo("/cms/tracks");
+                Navigation.NavigateTo("/tracks");
                 return;
             }
 
@@ -170,7 +170,7 @@
 
     private void Cancel()
     {
-        Navigation.NavigateTo("/cms/tracks");
+        Navigation.NavigateTo("/tracks");
     }
 
     private static string FormatBytes(long bytes)
diff --git a/DeepDrftManager/Components/Pages/Tracks/_Imports.razor b/DeepDrftManager/Components/Pages/Tracks/_Imports.razor
deleted file mode 100644
index 24cf4a5..0000000
--- a/DeepDrftManager/Components/Pages/Tracks/_Imports.razor
+++ /dev/null
@@ -1 +0,0 @@
-@layout DeepDrftManager.Components.Layout.CmsLayout
diff --git a/DeepDrftManager/Components/Routes.razor b/DeepDrftManager/Components/Routes.razor
index 360d3db..289efc1 100644
--- a/DeepDrftManager/Components/Routes.razor
+++ b/DeepDrftManager/Components/Routes.razor
@@ -1,7 +1,9 @@
 <Router AppAssembly="typeof(App).Assembly"
-        AdditionalAssemblies="new[] { typeof(AuthBlocksWeb._Imports).Assembly }">
+        AdditionalAssemblies="new[] { typeof(AuthBlocksWeb._Imports).Assembly }"
+        NotFoundPage="typeof(NotFound)">
     <Found Context="routeData">
-        <AuthorizeRouteView RouteData="routeData">
+        <AuthorizeRouteView RouteData="routeData" 
+                            DefaultLayout="typeof(Layout.CmsLayout)">
             <NotAuthorized Context="authState">
                 @if (authState.User.Identity?.IsAuthenticated == true)
                 {
@@ -15,8 +17,4 @@
         </AuthorizeRouteView>
         <FocusOnNavigate RouteData="routeData" Selector="h1" />
     </Found>
-    <NotFound>
-        <PageTitle>Not found</PageTitle>
-        <p role="alert">Sorry, there's nothing at this address.</p>
-    </NotFound>
 </Router>