diff --git a/resources/menu/horizontalMenu.json b/resources/menu/horizontalMenu.json
index 7019777..53d23a8 100644
--- a/resources/menu/horizontalMenu.json
+++ b/resources/menu/horizontalMenu.json
@@ -8,27 +8,13 @@
     },
     {
       "url": "/worklist",
-      "icon": "menu-icon tf-icons ri-file-line",
+      "icon": "menu-icon tf-icons ri-survey-line",
       "name": "Worklist",
       "slug": "worklist"
     },
     {
-      "url": "/pages/misc-error",
-      "name": "Error",
-      "icon": "menu-icon tf-icons ri-alert-line",
-      "slug": "pages-misc-error",
-      "target": "_blank"
-    },
-    {
-      "url": "/auth/login-basic",
-      "name": "Login",
-      "icon": "menu-icon tf-icons ri-logout-box-r-line",
-      "slug": "auth-login-basic",
-      "target": "_blank"
-    },
-    {
-      "url": "/auth/register-basic",
-      "name": "Register",
+      "url": "/logout",
+      "name": "Logout",
       "icon": "menu-icon tf-icons ri-account-circle-line",
       "slug": "auth-register-basic",
       "target": "_blank"
diff --git a/resources/views/layouts/sections/navbar/navbar.blade.php b/resources/views/layouts/sections/navbar/navbar.blade.php
index a668dac..51d8a29 100644
--- a/resources/views/layouts/sections/navbar/navbar.blade.php
+++ b/resources/views/layouts/sections/navbar/navbar.blade.php
@@ -74,8 +74,8 @@
         <!-- User -->
         <li class="nav-item navbar-dropdown dropdown-user dropdown">
           <a class="nav-link dropdown-toggle hide-arrow" href="javascript:void(0);" data-bs-toggle="dropdown">
-            <div class="avatar avatar-online">
-              <img src="{{ Auth::user() ? Auth::user()->profile_photo_url : asset('assets/img/avatars/1.png') }}" alt class="rounded-circle">
+            <div class="avatar avatar-{{ Auth::check() ? 'online' : 'offline' }}">
+              <img src="{{ Auth::check() ? Auth::user()->profile_photo_url : asset('assets/img/avatars/user.png') }}" alt class="rounded-circle">
             </div>
           </a>
           <ul class="dropdown-menu dropdown-menu-end">
@@ -83,7 +83,7 @@
               <a class="dropdown-item" href="{{ Route::has('profile.show') ? route('profile.show') : 'javascript:void(0);' }}">
                 <div class="d-flex">
                   <div class="flex-shrink-0 me-2">
-                    <div class="avatar avatar-online">
+                    <div class="avatar avatar-{{ Auth::check() ? 'online' : 'offline' }}">
                       <img src="{{ Auth::user() ? Auth::user()->profile_photo_url : asset('assets/img/avatars/user.png') }}" alt class="rounded-circle">
                     </div>
                   </div>
@@ -93,23 +93,26 @@
                         {{ Auth::user()->display_name }}
                       @endif
                     </span>
+                    @auth
                     <small class="text-muted">
-                        @auth
-                            {{ Auth::user()->primaryRole() }}
-                        @endauth
+                        {{ Auth::user()->primaryRole() }}
                     </small>
-                  </div>
+                    @endauth
+                </div>
                 </div>
               </a>
             </li>
             <li>
               <div class="dropdown-divider"></div>
             </li>
+            @auth
             <li>
               <a class="dropdown-item" href="{{ Route::has('profile.show') ? route('profile.show') : 'javascript:void(0);' }}">
                 <i class="ri-user-3-line ri-22px me-3"></i><span class="align-middle">My Profile</span>
               </a>
             </li>
+            @endauth
+
             @if (Auth::check() && Laravel\Jetstream\Jetstream::hasApiFeatures())
               <li>
                 <a class="dropdown-item" href="{{ route('api-tokens.index') }}">
@@ -117,14 +120,6 @@
                 </a>
               </li>
             @endif
-            <li>
-              <a class="dropdown-item" href="javascript:void(0);">
-                <span class="d-flex align-items-center align-middle">
-                  <i class="flex-shrink-0 ri-file-text-line ri-22px me-3"></i>
-                  <span class="flex-grow-1 align-middle">Billing</span>
-                </span>
-              </a>
-            </li>
 
             @if (Auth::User() && Laravel\Jetstream\Jetstream::hasTeamFeatures())
               <li>