diff --git a/src/dotnet/QuantEngine.Web/Components/App.razor b/src/dotnet/QuantEngine.Web/Components/App.razor
index 4fb75fb..4c1c862 100644
--- a/src/dotnet/QuantEngine.Web/Components/App.razor
+++ b/src/dotnet/QuantEngine.Web/Components/App.razor
@@ -1,3 +1,8 @@
+@using System.Reflection
+@using QuantEngine.Web.Client.Theme
+@using QuantEngine.Web.Client.Pages
+@using QuantEngine.Web.Client.Layout
+
 <!DOCTYPE html>
 <html lang="ko">
 
@@ -17,11 +22,31 @@
 </head>
 
 <body>
-    <MudThemeProvider Theme="@_theme" />
-    <MudDialogProvider />
-    <MudSnackbarProvider />
-    <Routes @rendermode="InteractiveWebAssembly" />
-    <ReconnectModal />
+    <div id="app">
+        <MudThemeProvider Theme="@_theme" />
+        <MudDialogProvider />
+        <MudSnackbarProvider />
+
+        <CascadingAuthenticationState>
+            <Router AppAssembly="@typeof(Dashboard).Assembly"
+                    AdditionalAssemblies="@AdditionalAssemblies"
+                    NotFoundPage="@typeof(NotFound)">
+                <Found Context="routeData">
+                    <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
+                        <NotAuthorized>
+                            <RedirectToLogin />
+                        </NotAuthorized>
+                    </AuthorizeRouteView>
+                    <FocusOnNavigate RouteData="@routeData" Selector="h1" />
+                </Found>
+                <NotFound>
+                    <NotFound />
+                </NotFound>
+            </Router>
+        </CascadingAuthenticationState>
+
+        <ReconnectModal />
+    </div>
 
     <script src="_content/MudBlazor/MudBlazor.min.js"></script>
     <script src="@Assets["_framework/blazor.web.js"]"></script>
@@ -30,11 +55,14 @@
 @code {
     private MudTheme _theme = AppTheme.LightTheme;
 
+    private static readonly Assembly[] AdditionalAssemblies = new[]
+    {
+        typeof(Dashboard).Assembly,
+    };
+
     protected override void OnInitialized()
     {
         _theme = AppTheme.LightTheme;
     }
 }
-
-@using QuantEngine.Web.Client.Theme
 </html>
diff --git a/test-results/login-input-filled.png b/test-results/login-input-filled.png
index 46386b0..b4be016 100644
Binary files a/test-results/login-input-filled.png and b/test-results/login-input-filled.png differ
diff --git a/test-results/login-remember-checkbox.png b/test-results/login-remember-checkbox.png
index eae831f..04b3514 100644
Binary files a/test-results/login-remember-checkbox.png and b/test-results/login-remember-checkbox.png differ
