diff --git a/src/components/ProfileMenu.vue b/src/components/ProfileMenu.vue
index 6cbb821..ac69e59 100644
--- a/src/components/ProfileMenu.vue
+++ b/src/components/ProfileMenu.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import { logout } from "~/composables/logout";
 
-const isAuthenticated = ref(false);
 let isOpened = ref(false);
 const menuRef = ref<HTMLElement>();
 
@@ -51,9 +50,11 @@ onMounted(() => {
         <li role="none">
           <NuxtLink class="menu-link" to="/user/profile"> Profile</NuxtLink>
         </li>
+        <!--
         <li role="none">
           <NuxtLink class="menu-link" to="/user/settings"> Settings</NuxtLink>
         </li>
+        -->
         <li
           id="logout"
           class="menu-link"
diff --git a/src/components/common/navigation/navbar.vue b/src/components/common/navigation/navbar.vue
index 6a4adfd..ff470d0 100644
--- a/src/components/common/navigation/navbar.vue
+++ b/src/components/common/navigation/navbar.vue
@@ -2,7 +2,7 @@
   <div
     class="grid grid-rows-2 text-center sm:text-left sm:grid-rows-none sm:grid-cols-2 my-5 navbar w-full"
   >
-    <NuxtLink class="block" to="/admin">
+    <NuxtLink class="block" to="/">
       <h1 class="block site-title bloodseeker">Cinema Corona</h1>
     </NuxtLink>
 
@@ -15,17 +15,17 @@
       <li>
         <NuxtLink class="text-xl header-link" to="/schedule">Schedule</NuxtLink>
       </li>
-      <li>
+      <li v-if="authenticated">
         <ProfileMenu />
       </li>
     </ul>
   </div>
 </template>
 
-<script>
-export default {
-  name: "navbar",
-};
+<script lang="ts" setup>
+import { hasToken } from "~/composables/hasToken";
+
+const authenticated = computed(() => hasToken());
 </script>
 
 <style scoped></style>
diff --git a/src/composables/hasToken.ts b/src/composables/hasToken.ts
new file mode 100644
index 0000000..7b8d7c2
--- /dev/null
+++ b/src/composables/hasToken.ts
@@ -0,0 +1,6 @@
+import { useCookie } from "#app";
+
+export function hasToken() {
+  const token = useCookie("token").value;
+  return token !== null && token !== undefined && token !== "";
+}
diff --git a/src/composables/logout.ts b/src/composables/logout.ts
index 860ab94..6349738 100644
--- a/src/composables/logout.ts
+++ b/src/composables/logout.ts
@@ -17,10 +17,3 @@ export function logout() {
     })
     .catch((err) => console.log(err));
 }
-
-onMounted(() => {
-  const token = useCookie("token").value;
-  if (!token) {
-    navigateTo("/");
-  }
-});
diff --git a/src/pages/user/profile.vue b/src/pages/user/profile.vue
index fdeac50..b73974d 100644
--- a/src/pages/user/profile.vue
+++ b/src/pages/user/profile.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useCookie } from "#app";
-import type { UserProfile } from "~/types/user_profile";
+import type { UserProfile } from "~/types/userProfile";
 
 const config = useRuntimeConfig();
 
@@ -29,49 +29,54 @@ const getProfile = async function () {
 
 const formatDate = function (date_string: string) {
   return new Date(date_string).toLocaleDateString();
-}
+};
 
 onMounted(getProfile);
 </script>
 
 <template>
-  <h2 class="page-header">Profile</h2>
-  <div id="profile-card" class="movie-card neon-border">
-    <div id="user-data">
-      <div id="profile-picture">
-        <img
-          alt="profile image"
-          class="user-icon neon-border"
-          src="https://placecage.lucidinternets.com/g/200/200"
-        />
-      </div>
-      <ul class="profile-details">
-        <li class="user-detail">
-          <label for="name">Name</label>
-          <span id="name">{{profile?.name || profile?.username}}</span>
-        </li>
-        <li class="user-detail">
-          <label for="username">Username</label>
-          <span id="username">{{ profile?.username }}@movienight.social</span>
-        </li>
-        <li class="user-detail">
-          <label for="date-joined">Date Joined</label>
-          <span id="date-joined">{{ formatDate(profile?.date_joined || "") }}</span>
-        </li>
-      </ul>
-    </div>
-
-    <hr class="neon-border my-5" />
-
-    <div id="extra-fields">
-      <div id="movielists">
-        <h3 class="section-header">Lists</h3>
-        <ul id="movielist-list">
-          <li v-for="list in profile?.lists">
-            <NuxtLink :to="`/lists/${list.id}`">{{ list.name }}</NuxtLink>
+  <LoadingIcon v-if="loading" show-quote="true" />
+  <div v-else>
+    <h2 class="page-header">Profile</h2>
+    <div id="profile-card" class="movie-card neon-border">
+      <div id="user-data">
+        <div id="profile-picture">
+          <img
+            alt="profile image"
+            class="user-icon neon-border"
+            src="https://placecage.lucidinternets.com/g/200/200"
+          />
+        </div>
+        <ul class="profile-details">
+          <li class="user-detail">
+            <label for="name">Name</label>
+            <span id="name">{{ profile?.name || profile?.username }}</span>
+          </li>
+          <li class="user-detail">
+            <label for="username">Username</label>
+            <span id="username">{{ profile?.username }}@movienight.social</span>
+          </li>
+          <li class="user-detail">
+            <label for="date-joined">Date Joined</label>
+            <span id="date-joined">{{
+              formatDate(profile?.date_joined || "")
+            }}</span>
           </li>
         </ul>
       </div>
+
+      <hr class="neon-border my-5" />
+
+      <div id="extra-fields">
+        <div id="movielists">
+          <h3 class="section-header">Lists</h3>
+          <ul id="movielist-list">
+            <li v-for="list in profile?.lists">
+              <NuxtLink :to="`/lists/${list.id}`">{{ list.name }}</NuxtLink>
+            </li>
+          </ul>
+        </div>
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/types/user_profile.ts b/src/types/userProfile.ts
similarity index 100%
rename from src/types/user_profile.ts
rename to src/types/userProfile.ts