diff --git a/RobotApp.Client/Layout/MainLayout.razor.css b/RobotApp.Client/Layout/MainLayout.razor.css
index 784b896..da43ded 100644
--- a/RobotApp.Client/Layout/MainLayout.razor.css
+++ b/RobotApp.Client/Layout/MainLayout.razor.css
@@ -1,11 +1,17 @@
 
 .app-shell {
     display: flex;
-    min-height: 100vh; 
+    min-height: 100vh;
+    min-width: 100vw;
+    width: 100vw;
+    height: 100vh;
+    overflow: hidden;
+    flex-direction: row;
 }
 
 .page {
-    flex: 1 1 auto; 
-    min-width: 0; 
-    overflow: auto; 
+    flex: 1 1 auto;
+    min-width: 0;
+    display: flex;
+    overflow: hidden;
 }
diff --git a/RobotApp.Client/Layout/NavMenu.razor b/RobotApp.Client/Layout/NavMenu.razor
index 9e1e064..da332e9 100644
--- a/RobotApp.Client/Layout/NavMenu.razor
+++ b/RobotApp.Client/Layout/NavMenu.razor
@@ -31,6 +31,25 @@
         }
     </div>
     <div class="user">
+        <div>
+            <span class="mdi mdi-account mdi-36px text-white "></span>
+        </div>
+        <AuthorizeView>
+            <Authorized>
+                <div class="nav-label">
+                    <MudText Class="text-white name" Typo="Typo.subtitle1">@context.User.Identity?.Name</MudText>
+                </div>
+            </Authorized>
+        </AuthorizeView>
+        <MudSpacer />
+        <form action="Account/Logout" method="post">
+            <AntiforgeryToken />
+            <input type="hidden" name="ReturnUrl" value="" />
+            <button class="btn button">
+                <i class="mdi mdi-logout" style="color: white; font-size: 35px"></i>
+            </button>
+            @* <MudIconButton Class="text-white" ButtonType="@ButtonType.Submit" Icon="@Icons.Material.Filled.Logout" /> *@
+        </form>
     </div>
 </div>
 
@@ -45,7 +64,7 @@
 
     public NavModel[] Navs = [
         new(){Icon = "mdi-view-dashboard", Path="/", Label = "Dashboard", Match = NavLinkMatch.All},
-        new(){Icon = "mdi-map-legend", Path="/", Label = "Maps-manager", Match = NavLinkMatch.All},
+        new(){Icon = "mdi-map-legend", Path="/Maps-manager", Label = "Mapping", Match = NavLinkMatch.All},
     ];
 
     private bool collapseNavMenu = true;
diff --git a/RobotApp.Client/Layout/NavMenu.razor.css b/RobotApp.Client/Layout/NavMenu.razor.css
index 681b4a7..f4221f4 100644
--- a/RobotApp.Client/Layout/NavMenu.razor.css
+++ b/RobotApp.Client/Layout/NavMenu.razor.css
@@ -48,10 +48,9 @@
                 display: flex;
             }
 
-    /*.sidebar .title .button {
-        display: flex;
-        border-radius: 20px;
-    }*/
+        .sidebar.collapsed .nav-label {
+            display: none;
+        }
 
     .sidebar .title .button:hover {
         background-color: rgb(5, 39, 80);
@@ -67,8 +66,8 @@
         display: none !important;
     }
 
-    .sidebar.collapsed .nav-label {
-        display: none;
+    .sidebar.collapsed .user .nav-label {
+        display: none !important;
     }
 
 .nav-item {
diff --git a/RobotApp.Client/Pages/Home.razor b/RobotApp.Client/Pages/Home.razor
index 2f4fa1a..84411a1 100644
--- a/RobotApp.Client/Pages/Home.razor
+++ b/RobotApp.Client/Pages/Home.razor
@@ -1,4 +1,4 @@
 @page "/"
 @using Microsoft.AspNetCore.Authorization
 @attribute [Authorize]
-<h1>Welcome to RobotApp!</h1>
\ No newline at end of file
+<h1>Welcome to RobotApp!</h1>
diff --git a/RobotApp.Client/Routes.razor b/RobotApp.Client/Routes.razor
deleted file mode 100644
index f913b39..0000000
--- a/RobotApp.Client/Routes.razor
+++ /dev/null
@@ -1,18 +0,0 @@
-@using RobotApp.Client.Layout
-
-<CascadingAuthenticationState>
-    <Router AppAssembly="@typeof(Program).Assembly">
-        <Found Context="routeData">
-            <AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)">
-                <NotAuthorized>
-                    <RedirectToLogin />
-                </NotAuthorized>
-            </AuthorizeRouteView>
-        </Found>
-        <NotFound>
-            <LayoutView Layout="typeof(MainLayout)">
-                <p>Không tìm thấy trang.</p>
-            </LayoutView>
-        </NotFound>
-    </Router>
-</CascadingAuthenticationState>
diff --git a/RobotApp/Components/App.razor b/RobotApp/Components/App.razor
index d164f11..e304093 100644
--- a/RobotApp/Components/App.razor
+++ b/RobotApp/Components/App.razor
@@ -5,27 +5,41 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <base href="/" />
-    <link rel="stylesheet" href="_content/MudBlazor/MudBlazor.min.css" />
     <link rel="stylesheet" href="@Assets["lib/bootstrap/css/bootstrap.min.css"]" />
     <link rel="stylesheet" href="@Assets["lib/mdi/font/css/materialdesignicons.min.css"]" />
-    <link rel="stylesheet" href="@Assets["lib/bootstrap/dist/css/bootstrap.min.css"]" />
     <link rel="stylesheet" href="@Assets["app.css"]" />
     <link rel="stylesheet" href="@Assets["RobotApp.styles.css"]" />
-    <ImportMap />
+    <link rel="stylesheet" href="@Assets["_content/MudBlazor/MudBlazor.min.css"]" />
     <link rel="icon" type="image/png" href="favicon.png" />
+    <ImportMap />
     <ImportMap @rendermode="InteractiveServer" />
     <HeadOutlet @rendermode="InteractiveServer" />
 </head>
 
 <body>
-   
-    <Routes />
+    <CascadingAuthenticationState>
+        <Router AppAssembly="@typeof(Program).Assembly">
+            <Found Context="routeData">
+                <AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(RobotApp.Client.Layout.MainLayout)">
+                    <NotAuthorized>
+                        <RedirectToLogin />
+                    </NotAuthorized>
+                </AuthorizeRouteView>
+            </Found>
+            <NotFound>
+                <PageTitle>Not found</PageTitle>
+                <LayoutView Layout="typeof(RobotApp.Client.Layout.MainLayout)">
+                    <p>Không tìm thấy trang.</p>
+                </LayoutView>
+            </NotFound>
+        </Router>
+    </CascadingAuthenticationState>
+
 
     <script src="_framework/blazor.web.js"></script>
     <script src="@Assets["lib/bootstrap/js/bootstrap.bundle.min.js"]"></script>
     <script src="@Assets["lib/bootstrap/js/bootstrap.min.js"]"></script>
     <script src="_content/MudBlazor/MudBlazor.min.js"></script>
-    
 </body>
 
 </html>
diff --git a/RobotApp/Program.cs b/RobotApp/Program.cs
index e81d55c..353c5dd 100644
--- a/RobotApp/Program.cs
+++ b/RobotApp/Program.cs
@@ -6,6 +6,7 @@ using RobotApp.Components;
 using RobotApp.Components.Account;
 using RobotApp.Data;
 using RobotApp.Services.Robot;
+using RobotApp.Client;
 
 var builder = WebApplication.CreateBuilder(args);
 
diff --git a/RobotApp/RobotApp.csproj b/RobotApp/RobotApp.csproj
index 2e851d5..64234bd 100644
--- a/RobotApp/RobotApp.csproj
+++ b/RobotApp/RobotApp.csproj
@@ -32,7 +32,6 @@
 
   <ItemGroup>
     <Folder Include="Services\Robot\Simulation\" />
-    <Folder Include="wwwroot\lib\" />
   </ItemGroup>
 
 </Project>
diff --git a/RobotApp/libman.json b/RobotApp/libman.json
deleted file mode 100644
index f2868d8..0000000
--- a/RobotApp/libman.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "version": "3.0",
-  "defaultProvider": "jsdelivr",
-  "libraries": [
-    {
-      "library": "@mdi/font@7.4.47",
-      "destination": "wwwroot/lib/mdi/font/"
-    },
-    {
-      "provider": "cdnjs",
-      "library": "bootstrap@5.3.8",
-      "destination": "wwwroot/lib/bootstrap/"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/RobotApp/robot.db b/RobotApp/robot.db
index fa4a3f5..8359201 100644
Binary files a/RobotApp/robot.db and b/RobotApp/robot.db differ
diff --git a/RobotApp/wwwroot/app.css b/RobotApp/wwwroot/app.css
index 73a69d6..20751b3 100644
--- a/RobotApp/wwwroot/app.css
+++ b/RobotApp/wwwroot/app.css
@@ -1,5 +1,7 @@
 html, body {
     font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    width: 100vw;
+    height: 100vh;
 }
 
 a, .btn-link {
diff --git a/RobotApp/wwwroot/favicon.png b/RobotApp/wwwroot/favicon.png
deleted file mode 100644
index 8422b59..0000000
Binary files a/RobotApp/wwwroot/favicon.png and /dev/null differ
diff --git a/RobotApp/wwwroot/favicon.svg b/RobotApp/wwwroot/favicon.svg
new file mode 100644
index 0000000..b07dbc4
--- /dev/null
+++ b/RobotApp/wwwroot/favicon.svg
@@ -0,0 +1,5 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+	<path d="M31.81,1.79,21.29,14.32l-2.48-3a2.6,2.6,0,0,1,0-3.34l4.45-5.31a2.64,2.64,0,0,1,2-.93Z" fill="#e06e2e"/>
+	<path d="M.19,1.8,10.71,14.34l2.48-2.95a2.6,2.6,0,0,0,0-3.34L8.75,2.74a2.66,2.66,0,0,0-2-.94Z" fill="#e06e2e"/>
+	<path d="M32,30.21H25.36a2.61,2.61,0,0,1-2-.92L16.5,21.1a.65.65,0,0,0-1,0L8.63,29.29a2.58,2.58,0,0,1-2,.92H0L12.07,15.83,14,13.57a2.67,2.67,0,0,1,4.08,0l1.89,2.26Z" fill="#233871"/>
+</svg>
\ No newline at end of file