diff --git a/web/app/src/lib/components/ui/Navbar.svelte b/web/app/src/lib/components/ui/Navbar.svelte
index b12b1e5..3d367fe 100644
--- a/web/app/src/lib/components/ui/Navbar.svelte
+++ b/web/app/src/lib/components/ui/Navbar.svelte
@@ -33,6 +33,7 @@
             <span aria-hidden="true"></span>
             <span aria-hidden="true"></span>
             <span aria-hidden="true"></span>
+            <span aria-hidden="true"></span>
         </a>
     </div>
 
@@ -46,20 +47,27 @@
         </div>
 
         <div class="navbar-end">
-            <div class="navbar-item has-dropdown is-hoverable">
+            <div
+                class="navbar-item has-dropdown is-hoverable"
+            >
+                <a
+                    href={"#"}
+                    class="navbar-link"
+                >
+                    {loggedIn ? username : "Guest"}
+                </a>
                 {#if loggedIn}
-                    <div class="navbar-link">{username}</div>
-
-                    <div class="navbar-dropdown">
+                    <div class="navbar-dropdown is-right">
                         <a href="/user/profile" class="navbar-item">
                             Profile
                         </a>
-
+                        <a href="/user/password" class="navbar-item">
+                            Change Password
+                        </a>
+                        <hr class="navbar-divider" />
                         <a href="/auth/logout" class="navbar-item">Log out</a>
                     </div>
                 {:else}
-                    <div class="navbar-link">logged out</div>
-
                     <div class="navbar-dropdown">
                         <a href="/auth/register" class="navbar-item">
                             Register
diff --git a/web/app/src/lib/login-check.js b/web/app/src/lib/login-check.js
index 2389265..9c69cfe 100644
--- a/web/app/src/lib/login-check.js
+++ b/web/app/src/lib/login-check.js
@@ -13,7 +13,7 @@ const getUsernameFromToken = (token) => {
         const tokenData = (JSON.parse(atob(token.split('.')[1])));
         return tokenData.name;
     }
-    return "logged out";
+    return "Guest";
 
 }