diff --git a/Views/Admin/Index.cshtml b/Views/Admin/Index.cshtml
index b1eccc8..5491974 100644
--- a/Views/Admin/Index.cshtml
+++ b/Views/Admin/Index.cshtml
@@ -4,17 +4,26 @@
 @model AdminViewModel
 <div class="container">
     <div class="row">
-        <span class="display-4">Admin Panel</span>
+        <div class="col-1">
+            <a href="/Home" class="btn btn-secondary btn-md mt-1 mb-1"><i class="bi bi-arrow-left-square"></i></a>
+        </div>
+        <div class="col-11">
+            <span class="display-6">Admin Panel</span>
+        </div>
     </div>
     <hr />
     <div class="row">
         <div class="col-5">
             <div class="row">
-                <div class="form-check form-switch">
-                    <input class="form-check-input" type="checkbox" role="switch" id="enableAutoNotify" checked>
-                    <label class="form-check-label" for="enableAutoNotify">Auto Notify(via Email)</label>
+                 <div class="col-6">
+                    <button onclick="generateNewToken()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>Generate User Token</button>
+                </div>
+                <div class="col-6 d-flex align-items-center">
+                    <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" role="switch" id="enableAutoNotify" checked>
+                        <label class="form-check-label" for="enableAutoNotify">Auto Notify(via Email)</label>
+                    </div>
                 </div>
-                <button onclick="generateNewToken()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>Generate User Token</button>
             </div>
             <table class="table table-hover">
                 <thead>
@@ -74,9 +83,9 @@
             }
         });
     }
-    function deleteUser(userId){
-        $.post(`/Admin/DeleteUser?userId=${userId}`, function(data){
-            if (data){
+    function deleteUser(userId) {
+        $.post(`/Admin/DeleteUser?userId=${userId}`, function (data) {
+            if (data) {
                 reloadPage();
             }
         })
@@ -86,12 +95,12 @@
         navigator.clipboard.writeText(textToCopy);
         successToast("Copied to Clipboard");
     }
-    function generateNewToken(){
+    function generateNewToken() {
         Swal.fire({
             title: 'Generate Token',
             html: `
-                        <input type="text" id="inputEmail" class="swal2-input" placeholder="Email Address">
-                        `,
+                            <input type="text" id="inputEmail" class="swal2-input" placeholder="Email Address">
+                            `,
             confirmButtonText: 'Generate',
             focusConfirm: false,
             preConfirm: () => {
@@ -104,7 +113,7 @@
         }).then(function (result) {
             if (result.isConfirmed) {
                 var autoNotify = $("#enableAutoNotify").is(":checked");
-                $.get('/Admin/GenerateNewToken', {emailAddress: result.value.emailAddress, autoNotify: autoNotify}, function (data) {
+                $.get('/Admin/GenerateNewToken', { emailAddress: result.value.emailAddress, autoNotify: autoNotify }, function (data) {
                     if (data.success) {
                         reloadPage();
                     } else {
diff --git a/Views/Home/Index.cshtml b/Views/Home/Index.cshtml
index 5eddcea..730d5cf 100644
--- a/Views/Home/Index.cshtml
+++ b/Views/Home/Index.cshtml
@@ -45,8 +45,19 @@
         </li>
         @if (User.IsInRole("CookieAuth"))
         {
-            <li class="nav-item">
-                <button class="nav-link" onclick="performLogOut()"><i class="bi bi-box-arrow-right me-2"></i>Logout</button>
+            <li class="nav-item dropdown" role="presentation">
+                <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false"><i class="bi bi-person me-2"></i>@User.Identity.Name</a>
+                <ul class="dropdown-menu">
+                    @if (User.IsInRole(nameof(UserData.IsRootUser)))
+                    {
+                        <li>
+                            <a class="dropdown-item" href="/Admin"><i class="bi bi-people me-2"></i>Admin Panel</a>
+                        </li>
+                    }
+                    <li>
+                        <button class="dropdown-item" onclick="performLogOut()"><i class="bi bi-box-arrow-right me-2"></i>Logout</button>
+                    </li>
+                </ul>
             </li>
         }
     </ul>
diff --git a/Views/Vehicle/Index.cshtml b/Views/Vehicle/Index.cshtml
index 998847e..25ed3c7 100644
--- a/Views/Vehicle/Index.cshtml
+++ b/Views/Vehicle/Index.cshtml
@@ -42,7 +42,7 @@
         <li class="nav-item" role="presentation">
             <button class="nav-link" id="report-tab" data-bs-toggle="tab" data-bs-target="#report-tab-pane" type="button" role="tab" aria-selected="false"><span class="display-3 ms-2"><i class="bi bi-file-bar-graph me-2"></i>Reports</span></button>
         </li>
-        <li class="nav-item dropdown" role="presentation">
+        <li class="nav-item" role="presentation">
             <button onclick="deleteVehicle(@Model.Id)" class="dropdown-item"><span class="display-3 ms-2"><i class="bi bi-trash me-2"></i>Delete Vehicle</span></button>
         </li>
     </ul>