diff --git a/DbFirst.BlazorWasm/Pages/Dashboard.razor b/DbFirst.BlazorWasm/Pages/Dashboard.razor
index 242840e..eb0a3b9 100644
--- a/DbFirst.BlazorWasm/Pages/Dashboard.razor
+++ b/DbFirst.BlazorWasm/Pages/Dashboard.razor
@@ -49,25 +49,10 @@
     <aside class="dashboard-nav">
         <div class="dashboard-nav-title">Dashboards</div>
         <NavLink class="dashboard-nav-link" href="dashboards/default">Default Dashboard (Designer)</NavLink>
-        <NavLink class="dashboard-nav-link" href="dashboards/catalog-grid">Catalogs (Dashboard Grid)</NavLink>
-        <NavLink class="dashboard-nav-link" href="dashboards/custom-grid">Catalogs (Custom Grid)</NavLink>
     </aside>
     <section class="dashboard-content">
-        @if (SelectedDashboardId == "default")
-        {
-            <DxDashboard Endpoint="@DashboardEndpoint" InitialDashboardId="DefaultDashboard" WorkingMode="WorkingMode.Designer" style="width: 100%; height: 800px;">
-            </DxDashboard>
-        }
-        else if (SelectedDashboardId == "catalog-grid")
-        {
-            <DxDashboard Endpoint="@DashboardEndpoint" InitialDashboardId="CatalogsGrid" WorkingMode="WorkingMode.ViewerOnly" style="width: 100%; height: 800px;">
-            </DxDashboard>
-        }
-        else if (SelectedDashboardId == "custom-grid")
-        {
-            <h3>Catalogs (Custom Grid)</h3>
-            <CatalogsGrid />
-        }
+        <DxDashboard Endpoint="@DashboardEndpoint" InitialDashboardId="DefaultDashboard" WorkingMode="WorkingMode.Designer" style="width: 100%; height: 800px;">
+        </DxDashboard>
     </section>
 </div>
 
@@ -75,11 +60,10 @@
     [Parameter] public string? DashboardId { get; set; }
 
     private string DashboardEndpoint => $"{Configuration["ApiBaseUrl"]?.TrimEnd('/')}/api/dashboard";
-    private string SelectedDashboardId => string.IsNullOrWhiteSpace(DashboardId) ? "default" : DashboardId;
 
     protected override void OnParametersSet()
     {
-        if (string.IsNullOrWhiteSpace(DashboardId))
+        if (!string.Equals(DashboardId, "default", StringComparison.OrdinalIgnoreCase))
         {
             Navigation.NavigateTo("dashboards/default", replace: true);
         }
diff --git a/DbFirst.BlazorWebApp/Components/Layout/NavMenu.razor b/DbFirst.BlazorWebApp/Components/Layout/NavMenu.razor
index bae738e..4d4a741 100644
--- a/DbFirst.BlazorWebApp/Components/Layout/NavMenu.razor
+++ b/DbFirst.BlazorWebApp/Components/Layout/NavMenu.razor
@@ -25,6 +25,12 @@
                 <span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather
             </NavLink>
         </div>
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="catalogs">
+                <span class="bi bi-collection-nav-menu" aria-hidden="true"></span> Catalogs
+            </NavLink>
+        </div>
+
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="dashboards/default">
                 <span class="oi oi-list-rich" aria-hidden="true"></span> Dashboards
diff --git a/DbFirst.BlazorWebApp/Components/Pages/Catalogs.razor b/DbFirst.BlazorWebApp/Components/Pages/Catalogs.razor
new file mode 100644
index 0000000..fa158c3
--- /dev/null
+++ b/DbFirst.BlazorWebApp/Components/Pages/Catalogs.razor
@@ -0,0 +1,7 @@
+@page "/catalogs"
+
+<PageTitle>Catalogs</PageTitle>
+
+<h1>Catalogs</h1>
+
+<CatalogsGrid />
diff --git a/DbFirst.BlazorWebApp/Components/Pages/Dashboard.razor b/DbFirst.BlazorWebApp/Components/Pages/Dashboard.razor
index 242840e..eb0a3b9 100644
--- a/DbFirst.BlazorWebApp/Components/Pages/Dashboard.razor
+++ b/DbFirst.BlazorWebApp/Components/Pages/Dashboard.razor
@@ -49,25 +49,10 @@
     <aside class="dashboard-nav">
         <div class="dashboard-nav-title">Dashboards</div>
         <NavLink class="dashboard-nav-link" href="dashboards/default">Default Dashboard (Designer)</NavLink>
-        <NavLink class="dashboard-nav-link" href="dashboards/catalog-grid">Catalogs (Dashboard Grid)</NavLink>
-        <NavLink class="dashboard-nav-link" href="dashboards/custom-grid">Catalogs (Custom Grid)</NavLink>
     </aside>
     <section class="dashboard-content">
-        @if (SelectedDashboardId == "default")
-        {
-            <DxDashboard Endpoint="@DashboardEndpoint" InitialDashboardId="DefaultDashboard" WorkingMode="WorkingMode.Designer" style="width: 100%; height: 800px;">
-            </DxDashboard>
-        }
-        else if (SelectedDashboardId == "catalog-grid")
-        {
-            <DxDashboard Endpoint="@DashboardEndpoint" InitialDashboardId="CatalogsGrid" WorkingMode="WorkingMode.ViewerOnly" style="width: 100%; height: 800px;">
-            </DxDashboard>
-        }
-        else if (SelectedDashboardId == "custom-grid")
-        {
-            <h3>Catalogs (Custom Grid)</h3>
-            <CatalogsGrid />
-        }
+        <DxDashboard Endpoint="@DashboardEndpoint" InitialDashboardId="DefaultDashboard" WorkingMode="WorkingMode.Designer" style="width: 100%; height: 800px;">
+        </DxDashboard>
     </section>
 </div>
 
@@ -75,11 +60,10 @@
     [Parameter] public string? DashboardId { get; set; }
 
     private string DashboardEndpoint => $"{Configuration["ApiBaseUrl"]?.TrimEnd('/')}/api/dashboard";
-    private string SelectedDashboardId => string.IsNullOrWhiteSpace(DashboardId) ? "default" : DashboardId;
 
     protected override void OnParametersSet()
     {
-        if (string.IsNullOrWhiteSpace(DashboardId))
+        if (!string.Equals(DashboardId, "default", StringComparison.OrdinalIgnoreCase))
         {
             Navigation.NavigateTo("dashboards/default", replace: true);
         }