diff --git a/api/fonts/exo_2/Exo2-Italic-VariableFont_wght.ttf b/api/fonts/exo_2/Exo2-Italic-VariableFont_wght.ttf
deleted file mode 100644
index b38764068..000000000
Binary files a/api/fonts/exo_2/Exo2-Italic-VariableFont_wght.ttf and /dev/null differ
diff --git a/api/fonts/exo_2/Exo2-VariableFont_wght.ttf b/api/fonts/exo_2/Exo2-VariableFont_wght.ttf
deleted file mode 100644
index b97509d0b..000000000
Binary files a/api/fonts/exo_2/Exo2-VariableFont_wght.ttf and /dev/null differ
diff --git a/api/fonts/exo_2/OFL.txt b/api/fonts/exo_2/OFL.txt
deleted file mode 100644
index 68fb80aa0..000000000
--- a/api/fonts/exo_2/OFL.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright 2013 The Exo 2 Project Authors (https://github.com/NDISCOVER/Exo-2.0)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/docs/docs/designer/design-guides.md b/docs/docs/designer/design-guides.md
index c72a1c05c..6342a05ee 100755
--- a/docs/docs/designer/design-guides.md
+++ b/docs/docs/designer/design-guides.md
@@ -94,7 +94,6 @@ We provide a range of fonts ready to use. Following fonts are available:
 * [STIX Two Text](https://fonts.google.com/specimen/STIX+Two+Text){target=_blank} - similar to Times New Roman
 * [Arimo](https://fonts.google.com/specimen/Arimo){target=_blank} - similar to Verdana
 * [Exo](https://fonts.google.com/specimen/Exo){target=_blank}
-* [Exo 2](https://fonts.google.com/specimen/Exo+2){target=_blank}
 * ~~[Lato](https://fonts.google.com/specimen/Lato){target=_blank}~~*
 * ~~[Roboto](https://fonts.google.com/specimen/Roboto){target=_blank}~~*
 * ~~[Tinos](https://fonts.google.com/specimen/Tinos){target=_blank}~~*
diff --git a/frontend/src/assets/fonts/exo2/Exo2-Italic-VariableFont_wght.woff2 b/frontend/src/assets/fonts/exo2/Exo2-Italic-VariableFont_wght.woff2
deleted file mode 100644
index c7c2ecefa..000000000
Binary files a/frontend/src/assets/fonts/exo2/Exo2-Italic-VariableFont_wght.woff2 and /dev/null differ
diff --git a/frontend/src/assets/fonts/exo2/Exo2-VariableFont_wght.woff2 b/frontend/src/assets/fonts/exo2/Exo2-VariableFont_wght.woff2
deleted file mode 100644
index 35e50a9bb..000000000
Binary files a/frontend/src/assets/fonts/exo2/Exo2-VariableFont_wght.woff2 and /dev/null differ
diff --git a/frontend/src/assets/fonts/exo2/exo2.css b/frontend/src/assets/fonts/exo2/exo2.css
deleted file mode 100644
index ec898df79..000000000
--- a/frontend/src/assets/fonts/exo2/exo2.css
+++ /dev/null
@@ -1,15 +0,0 @@
-@font-face {
-  font-family: 'Exo 2';
-  font-style: normal;
-  font-weight: 100 900;
-  font-display: swap;
-  src: url('~/assets/fonts/exo2/Exo2-VariableFont_wght.woff2') format('woff2');
-}
-
-@font-face {
-  font-family: 'Exo 2';
-  font-style: italic;
-  font-weight: 100 900;
-  font-display: swap;
-  src: url('~/assets/fonts/exo2/Exo2-Italic-VariableFont_wght.woff2') format('woff2');
-}
diff --git a/frontend/src/assets/fonts/noto/NotoSans-Italic-VariableFont_wdth,wght.woff2 b/frontend/src/assets/fonts/noto/NotoSans-Italic-VariableFont_wdth,wght.woff2
new file mode 100644
index 000000000..a7a1e5196
Binary files /dev/null and b/frontend/src/assets/fonts/noto/NotoSans-Italic-VariableFont_wdth,wght.woff2 differ
diff --git a/frontend/src/assets/fonts/noto/NotoSans-VariableFont_wdth,wght.woff2 b/frontend/src/assets/fonts/noto/NotoSans-VariableFont_wdth,wght.woff2
new file mode 100644
index 000000000..c9c4ebe95
Binary files /dev/null and b/frontend/src/assets/fonts/noto/NotoSans-VariableFont_wdth,wght.woff2 differ
diff --git a/frontend/src/assets/fonts/noto/noto.css b/frontend/src/assets/fonts/noto/noto.css
new file mode 100644
index 000000000..fcaf2fae4
--- /dev/null
+++ b/frontend/src/assets/fonts/noto/noto.css
@@ -0,0 +1,15 @@
+@font-face {
+  font-family: 'Noto Sans';
+  font-style: normal;
+  font-weight: 100 900;
+  font-display: swap;
+  src: url('~/assets/fonts/noto/NotoSans-VariableFont_wdth,wght.woff2') format('woff2');
+}
+
+@font-face {
+  font-family: 'Noto Sans';
+  font-style: italic;
+  font-weight: 100 900;
+  font-display: swap;
+  src: url('~/assets/fonts/noto/NotoSans-Italic-VariableFont_wdth,wght.woff2') format('woff2');
+}
diff --git a/frontend/src/assets/global.scss b/frontend/src/assets/global.scss
index 40e551339..b147df954 100644
--- a/frontend/src/assets/global.scss
+++ b/frontend/src/assets/global.scss
@@ -1,6 +1,6 @@
 @use "@/assets/settings.scss" as settings;
 @use "@/assets/vuetify.scss" as vuetify;
-@import '~/assets/fonts/exo2/exo2.css';
+@import '~/assets/fonts/noto/noto.css';
 
 
 // Hide scrollbar when it is not needed
diff --git a/frontend/src/assets/settings.scss b/frontend/src/assets/settings.scss
index 1fad822f0..16fd2d831 100644
--- a/frontend/src/assets/settings.scss
+++ b/frontend/src/assets/settings.scss
@@ -1,5 +1,5 @@
 // Vuetify settings
-$body-font-family: 'Exo 2', sans-serif;
+$body-font-family: 'Noto Sans', sans-serif;
 
 // Colors
 $risk-color-info: #14AE92;
diff --git a/frontend/src/assets/vuetify.scss b/frontend/src/assets/vuetify.scss
index 239d18df4..a9fe03821 100644
--- a/frontend/src/assets/vuetify.scss
+++ b/frontend/src/assets/vuetify.scss
@@ -3,4 +3,5 @@
 // Vuetify customizations
 @forward 'vuetify/settings' with (
   $body-font-family: settings.$body-font-family,
+  $list-item-icon-opacity: 1,
 );
diff --git a/frontend/src/components/EditToolbar.vue b/frontend/src/components/EditToolbar.vue
index d7a10cf01..3ff133ae3 100644
--- a/frontend/src/components/EditToolbar.vue
+++ b/frontend/src/components/EditToolbar.vue
@@ -480,9 +480,4 @@ defineExpose({
   }
 }
 
-.context-menu :deep() {
-  .v-list-item__prepend > .v-icon {
-    opacity: 1;
-  }
-}
 </style>
diff --git a/frontend/src/components/ListView.vue b/frontend/src/components/ListView.vue
index dc7b2af75..adbfaf767 100644
--- a/frontend/src/components/ListView.vue
+++ b/frontend/src/components/ListView.vue
@@ -1,37 +1,42 @@
 <template>
-  <v-container fluid class="pt-0">
-    <v-list v-if="items" class="pt-0 overflow-visible">
-      <div class="list-header pt-2 mb-4">
-        <h1>
-          <slot name="title" />
+  <full-height-page>
+    <v-container class="pt-0">
+      <v-list v-if="items" class="pt-0 overflow-visible">
+        <div class="list-header pt-2 mb-4">
+          <h1>
+            <slot name="title" />
 
-          <div v-if="$slots.actions" class="list-header-actions">
-            <slot name="actions" />
-          </div>
-        </h1>
+            <div v-if="$slots.actions" class="list-header-actions">
+              <slot name="actions" />
+            </div>
+          </h1>
 
-        <slot name="searchbar" :items="items">
-          <v-text-field
-            :model-value="items.search.value"
-            @update:model-value="updateSearch"
-            label="Search"
-            variant="underlined"
-            spellcheck="false"
-            hide-details="auto"
-            autofocus
-            class="mt-0 mb-2"
-          />
-        </slot>
-      </div>
+          <slot name="searchbar" :items="items">
+            <v-text-field
+              :model-value="items.search.value"
+              @update:model-value="updateSearch"
+              label="Search"
+              variant="underlined"
+              spellcheck="false"
+              hide-details="auto"
+              autofocus
+              class="mt-0 mb-2"
+            />
+          </slot>
+          <v-tabs v-if="$slots.tabs" height="30" selected-class="text-primary" class="list-header-tabs">
+            <slot name="tabs" />
+          </v-tabs>
+        </div>
 
-      <slot v-for="item in items.data.value" name="item" :item="item" />
-      <page-loader :items="items" class="mt-4" />
-      <v-list-item
-        v-if="items.data.value.length === 0 && !items.hasNextPage.value"
-        text="No data found"
-      />
-    </v-list>
-  </v-container>
+        <slot v-for="item in items.data.value" name="item" :item="item" />
+        <page-loader :items="items" class="mt-4" />
+        <v-list-item
+          v-if="items.data.value.length === 0 && !items.hasNextPage.value"
+          text="No data found"
+        />
+      </v-list>
+    </v-container>
+  </full-height-page>
 </template>
 
 <script setup lang="ts" generic="T">
@@ -86,4 +91,8 @@ defineExpose({
     margin-left: 0.4rem;
   }
 }
+
+.list-header-tabs:deep(.v-tab) {
+  text-transform: initial;
+}
 </style>
diff --git a/frontend/src/components/LoginProviderForm.vue b/frontend/src/components/LoginProviderForm.vue
index 1b693ed6d..6d7db17e7 100644
--- a/frontend/src/components/LoginProviderForm.vue
+++ b/frontend/src/components/LoginProviderForm.vue
@@ -31,6 +31,10 @@
         </slot>
       </v-list>
     </v-card-text>
+    <v-card-actions v-if="$slots.actions">
+      <v-spacer />
+      <slot name="actions" />
+    </v-card-actions>
   </s-card>
 </template>
 
diff --git a/frontend/src/components/ProInfo.vue b/frontend/src/components/ProInfo.vue
index 022d98a87..c11177921 100644
--- a/frontend/src/components/ProInfo.vue
+++ b/frontend/src/components/ProInfo.vue
@@ -24,6 +24,6 @@ const apiSettings = useApiSettings();
 }
 .pro-badge {
   color: rgb(var(--v-theme-primary));
-  font-weight: 800;
+  font-weight: 900;
 }
 </style>
diff --git a/frontend/src/components/S/SubMenu.vue b/frontend/src/components/S/SubMenu.vue
deleted file mode 100644
index 663d9ced9..000000000
--- a/frontend/src/components/S/SubMenu.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-  <v-tabs class="sub-menu" hide-slider height="30" selected-class="text-primary">
-    <slot />
-  </v-tabs>
-</template>
-
-<style lang="scss" scoped>
-.sub-menu :deep(.v-tab) {
-  text-transform: initial;
-}
-</style>
diff --git a/frontend/src/composables/auth.ts b/frontend/src/composables/auth.ts
index f239ef8e7..c62c591f7 100644
--- a/frontend/src/composables/auth.ts
+++ b/frontend/src/composables/auth.ts
@@ -1,3 +1,4 @@
+import type { NavigateToOptions } from "nuxt/dist/app/composables/router";
 import type { LocationQueryValue } from "#vue-router";
 import { AuthProviderType } from "@/utils/types";
 import type { AuthProvider, User } from "@/utils/types";
@@ -36,6 +37,9 @@ export const useAuthStore = defineStore('auth', {
         this.authRedirect = redirect;
       }
     },
+    clearAuthRedirect() {
+      this.authRedirect = null;
+    }
   },
   persist: {
     storage: persistedState.sessionStorage,
@@ -72,10 +76,10 @@ export function useAuth() {
     return await navigateTo(redirect, { external });
   }
 
-  async function redirectToReAuth() {
+  async function redirectToReAuth(options?: NavigateToOptions) {
     const route = useRoute();
     store.setAuthRedirect(route.fullPath);
-    return await navigateTo('/login/reauth/');
+    return await navigateTo('/login/reauth/', options);
   }
 
   async function logout() {
diff --git a/frontend/src/layouts/default.vue b/frontend/src/layouts/default.vue
index 2d4074bae..ef1eb8c06 100644
--- a/frontend/src/layouts/default.vue
+++ b/frontend/src/layouts/default.vue
@@ -2,7 +2,7 @@
   <div class="height-fullscreen">
     <nuxt-loading-indicator :height="2" :color="false" />
     <v-app-bar absolute height="48" elevation="0" color="header" class="menu-appbar">
-      <v-app-bar-nav-icon v-if="auth.loggedIn.value" @click="navigationDrawerVisible = !navigationDrawerVisible" :ripple="false" color="logo">
+      <v-app-bar-nav-icon v-if="auth.loggedIn.value" @click="navigationDrawerVisible = !navigationDrawerVisible" :ripple="false">
         <svg-logo />
       </v-app-bar-nav-icon>
       <div v-else class="menu-drawer-header">
@@ -43,10 +43,10 @@
         <span class="license-text">{{ licenseText }}</span>
       </div>
       <v-list class="pt-0 menu-drawer-body">
-        <v-list-item to="/projects/" title="Projects" prepend-icon="mdi-file-document" />
-        <v-list-item to="/templates/" title="Templates" prepend-icon="mdi-view-compact" />
-        <v-list-item to="/designs/" title="Designs" prepend-icon="mdi-pencil-ruler" />
-        <v-list-item to="/notes/personal/" title="Notes" prepend-icon="mdi-notebook" />
+        <v-list-item to="/projects/" title="Projects" prepend-icon="mdi-file-document" :active="route.path.startsWith('/projects')" />
+        <v-list-item to="/templates/" title="Templates" prepend-icon="mdi-view-compact" :active="route.path.startsWith('/templates')" />
+        <v-list-item to="/designs/" title="Designs" prepend-icon="mdi-pencil-ruler" :active="route.path.startsWith('/designs')" />
+        <v-list-item to="/notes/personal/" title="Notes" prepend-icon="mdi-notebook" :active="route.path.startsWith('/notes')" />
         
         <template v-if="auth.permissions.superuser || auth.permissions.user_manager || auth.permissions.view_license">
           <v-list-item class="mt-6 pa-0" min-height="0">
@@ -74,7 +74,13 @@
             </template>
           </v-list-item>
 
-          <v-list-item to="/users/" title="Users" prepend-icon="mdi-account-multiple" :disabled="!auth.permissions.user_manager" />
+          <v-list-item 
+            to="/users/" 
+            title="Users" 
+            prepend-icon="mdi-account-multiple" 
+            :active="route.path.startsWith('/users') && !route.path.startsWith('/users/self')"
+            :disabled="!auth.permissions.user_manager" 
+          />
           <license-info-menu-item />
         </template>
       </v-list>
@@ -167,8 +173,10 @@ head.hooks.hook('dom:beforeRender', syncBreadcrumbs);
   fill: rgb(var(--v-theme-primary));
 }
 
-.v-breadcrumbs-item .v-icon {
-  font-size: 1.5em;
+.v-breadcrumbs-item {
+  .v-icon {
+    font-size: 1.5em;
+  }
 }
 
 .menu-drawer:deep() {
@@ -212,8 +220,8 @@ head.hooks.hook('dom:beforeRender', syncBreadcrumbs);
     align-items: center;
     flex-grow: 0;
     flex-shrink: 0;
-    padding-left: 1em;
-    padding-right: 1em;
+    padding-left: 0.75rem;
+    padding-right: 0.75rem;
     cursor: pointer;
     border-bottom-width: vuetify.$navigation-drawer-border-thin-width;
     border-bottom-style: vuetify.$navigation-drawer-border-style;
@@ -240,8 +248,8 @@ head.hooks.hook('dom:beforeRender', syncBreadcrumbs);
   height: 28px;
   display: flex;
   flex-direction: column-reverse;
-  font-weight: 800;
-  font-size: larger;
+  font-weight: 900;
+  font-size: 1.5rem;
   line-height: 1;
   color: rgb(var(--v-theme-logo));
 }
diff --git a/frontend/src/pages/designs/[projectTypeId]/index.vue b/frontend/src/pages/designs/[projectTypeId]/index.vue
index 200b5853c..8783e5045 100644
--- a/frontend/src/pages/designs/[projectTypeId]/index.vue
+++ b/frontend/src/pages/designs/[projectTypeId]/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container fluid class="pt-0">
+  <v-container class="pt-0">
     <v-form ref="form">
       <edit-toolbar v-bind="toolbarAttrs" :form="$refs.form">
         <template #context-menu>
diff --git a/frontend/src/pages/designs/index.vue b/frontend/src/pages/designs/index.vue
index e2a70d3f8..d940cacb5 100644
--- a/frontend/src/pages/designs/index.vue
+++ b/frontend/src/pages/designs/index.vue
@@ -1,55 +1,19 @@
 <template>
   <file-drop-area @drop="importBtnRef.performImport($event)" class="h-100">
-    <full-height-page>
-      <list-view ref="listViewRef" url="/api/v1/projecttypes/?scope=global&ordering=name">
-        <template #title>Designs</template>
-        <template #actions>
-          <design-create-design-dialog />
-          <design-import-design-dialog ref="importBtnRef" />
-        </template>
-        <template #searchbar="{ items }">
-          <v-row dense class="mb-2 w-100">
-            <v-col cols="12" md="10">
-              <v-text-field
-                :model-value="items.search.value"
-                @update:model-value="listViewRef?.updateSearch"
-                label="Search"
-                spellcheck="false"
-                hide-details="auto"
-                variant="underlined"
-                autofocus
-                class="ma-0"
-              />
-            </v-col>
-            <v-col cols="12" md="2">
-              <s-select 
-                v-model="designScopeFilter"
-                :items="[{ title: 'All Designs', value: designFilterAllValue }, { title: 'Global Designs', value: ProjectTypeScope.GLOBAL}, { title: 'Private Designs', value: ProjectTypeScope.PRIVATE }]"
-                label="Scope"
-                variant="underlined"
-                class="ma-0"
-              />
-            </v-col>
-          </v-row>
-        </template>
-        <template #item="{item}">
-          <v-list-item :to="`/designs/${item.id}/pdfdesigner/`" lines="two">
-            <v-list-item-title>{{ item.name }}</v-list-item-title>
-            <v-list-item-subtitle>
-              <v-chip v-if="item.scope === ProjectTypeScope.GLOBAL" size="small" class="ma-1">
-                <v-icon size="small" start icon="mdi-earth" />
-                Global Design
-              </v-chip>
-              <v-chip v-else-if="item.scope === ProjectTypeScope.PRIVATE" size="small" class="ma-1">
-                <v-icon size="small" start icon="mdi-account" />
-                Private Design
-              </v-chip>
-              <chip-created :value="item.created" />
-            </v-list-item-subtitle>
-          </v-list-item>
-        </template>
-      </list-view>
-    </full-height-page>
+    <list-view url="/api/v1/projecttypes/?scope=global&ordering=name">
+      <template #title>Designs</template>
+      <template #actions>
+        <design-create-design-dialog />
+        <design-import-design-dialog ref="importBtnRef" />
+      </template>
+      <template #tabs>
+        <v-tab :to="{ path: '/designs/', query: route.query }" exact prepend-icon="mdi-earth" text="Global Designs" />
+        <v-tab :to="{ path: '/designs/private/', query: route.query }" prepend-icon="mdi-account" text="Private Designs" />
+      </template>
+      <template #item="{item}">
+        <v-list-item :to="`/designs/${item.id}/pdfdesigner/`" :title="item.name" />
+      </template>
+    </list-view>
   </file-drop-area>
 </template>
 
@@ -63,23 +27,6 @@ useHeadExtended({
 });
 
 const route = useRoute();
-const router = useRouter();
 
 const importBtnRef = ref();
-
-const listViewRef = ref();
-const designFilterAllValue = String([ProjectTypeScope.GLOBAL, ProjectTypeScope.PRIVATE]);
-const designScopeFilter = computed({
-  get: () => {
-    const currentScope = String(route.query.scope || '');
-    if (!currentScope) {
-      return ProjectTypeScope.GLOBAL;
-    } else {
-      return currentScope;
-    }
-  }, 
-  set: (val) => {
-    router.replace({ query: { ...route.query, scope: val.split(',') } });
-  }
-});
 </script>
diff --git a/frontend/src/pages/designs/private.vue b/frontend/src/pages/designs/private.vue
new file mode 100644
index 000000000..5dbf4c40d
--- /dev/null
+++ b/frontend/src/pages/designs/private.vue
@@ -0,0 +1,32 @@
+<template>
+  <file-drop-area @drop="importBtnRef.performImport($event)" class="h-100">
+    <list-view url="/api/v1/projecttypes/?scope=private&ordering=name">
+      <template #title>Designs</template>
+      <template #actions>
+        <design-create-design-dialog />
+        <design-import-design-dialog ref="importBtnRef" />
+      </template>
+      <template #tabs>
+        <v-tab :to="{ path: '/designs/', query: route.query }" exact prepend-icon="mdi-earth" text="Global Designs" />
+        <v-tab :to="{ path: '/designs/private/', query: route.query }" prepend-icon="mdi-account" text="Private Designs" />
+      </template>
+      <template #item="{item}">
+        <v-list-item :to="`/designs/${item.id}/pdfdesigner/`" :title="item.name" />
+      </template>
+    </list-view>
+  </file-drop-area>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  title: 'Designs',
+  toplevel: true,
+});
+useHeadExtended({
+  breadcrumbs: () => designListBreadcrumbs(),
+});
+
+const route = useRoute();
+
+const importBtnRef = ref();
+</script>
diff --git a/frontend/src/pages/license.vue b/frontend/src/pages/license.vue
index 8b6bb050f..d5215c3f9 100644
--- a/frontend/src/pages/license.vue
+++ b/frontend/src/pages/license.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container fluid class="h-100 overflow-y-auto">
+  <v-container class="h-100 overflow-y-auto">
     <h1>License Info</h1>
 
     <p v-if="license.error" class="text-error mt-2">
diff --git a/frontend/src/pages/login/auto.vue b/frontend/src/pages/login/auto.vue
index 197150bc1..7c4db112d 100644
--- a/frontend/src/pages/login/auto.vue
+++ b/frontend/src/pages/login/auto.vue
@@ -19,6 +19,11 @@
           <v-card-actions>
             <v-spacer />
             <s-btn-other
+              v-if="auth.loggedIn.value"
+              to="/"
+              text="Cancel"
+            />
+            <s-btn-secondary
               to="/login/?logout=true"
               text="Back"
             />
diff --git a/frontend/src/pages/login/index.vue b/frontend/src/pages/login/index.vue
index 009ada8c9..6814f798f 100644
--- a/frontend/src/pages/login/index.vue
+++ b/frontend/src/pages/login/index.vue
@@ -2,7 +2,14 @@
   <v-container fluid class="fill-height">
     <v-row justify="center">
       <v-col xs="12" sm="8" md="4" align-self="center">
-        <login-provider-form />
+        <login-provider-form>
+          <template #actions v-if="auth.loggedIn.value">
+            <s-btn-other
+              to="/"
+              text="Cancel"
+            />
+          </template>
+        </login-provider-form>
       </v-col>
     </v-row>
   </v-container>
diff --git a/frontend/src/pages/login/local.vue b/frontend/src/pages/login/local.vue
index 8ef9d49df..00aafd40c 100644
--- a/frontend/src/pages/login/local.vue
+++ b/frontend/src/pages/login/local.vue
@@ -14,6 +14,11 @@
 
           <template #actions>
             <s-btn-other
+              v-if="auth.loggedIn.value"
+              to="/"
+              text="Cancel"
+            />
+            <s-btn-secondary
               v-if="apiSettings.isSsoEnabled"
               to="/login/?logout=true"
               text="Back"
diff --git a/frontend/src/pages/login/oidc/[authProviderId]/callback.vue b/frontend/src/pages/login/oidc/[authProviderId]/callback.vue
index 039ffdf10..a85125a59 100644
--- a/frontend/src/pages/login/oidc/[authProviderId]/callback.vue
+++ b/frontend/src/pages/login/oidc/[authProviderId]/callback.vue
@@ -19,6 +19,11 @@
           <v-card-actions>
             <v-spacer />
             <s-btn-other
+              v-if="auth.loggedIn.value"
+              to="/"
+              text="Cancel"
+            />
+            <s-btn-secondary
               to="/login/?logout=true"
               text="Back"
             />
diff --git a/frontend/src/pages/login/reauth.vue b/frontend/src/pages/login/reauth.vue
index f3fec909d..e9944c2cf 100644
--- a/frontend/src/pages/login/reauth.vue
+++ b/frontend/src/pages/login/reauth.vue
@@ -5,6 +5,10 @@
         <login-form v-if="step === 'local'" :username="auth.user.value!.username" @login="auth.redirect()">
           <template #title>Re-Authenticate</template>
           <template #actions>
+            <s-btn-other
+              @click="cancelReAuth"
+              text="Cancel"
+            />
             <s-btn-secondary
               v-if="apiSettings.settings!.auth_providers.length > 1"
               @click="step = Step.LIST"
@@ -23,6 +27,13 @@
               />
             </v-list-item>
           </template>
+          <template #actions>
+            <s-btn-other
+              v-if="apiSettings.settings!.auth_providers.length > 1"
+              @click="cancelReAuth"
+              text="Cancel"
+            />
+          </template>
         </login-provider-form>
       </v-col>
     </v-row>
@@ -37,6 +48,7 @@ definePageMeta({
 });
 
 const route = useRoute();
+const router = useRouter();
 const auth = useAuth();
 const apiSettings = useApiSettings();
 
@@ -64,4 +76,9 @@ useLazyAsyncData(async () => {
     }
   }
 });
+
+function cancelReAuth() {
+  auth.store.clearAuthRedirect();
+  router.back();
+}
 </script>
diff --git a/frontend/src/pages/projects/[projectId]/archive.vue b/frontend/src/pages/projects/[projectId]/archive.vue
index 9aa175514..02ab66b5a 100644
--- a/frontend/src/pages/projects/[projectId]/archive.vue
+++ b/frontend/src/pages/projects/[projectId]/archive.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container fluid class="pt-0">
+  <v-container class="pt-0">
     <h1>Archive Project</h1>
     <p class="text-h6">
       <strong>Name:</strong> {{ project.name }}
diff --git a/frontend/src/pages/projects/[projectId]/index.vue b/frontend/src/pages/projects/[projectId]/index.vue
index d0a10e1dc..201c2e9d3 100644
--- a/frontend/src/pages/projects/[projectId]/index.vue
+++ b/frontend/src/pages/projects/[projectId]/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container fluid class="pt-0">
+  <v-container class="pt-0">
     <v-form ref="formRef">
       <edit-toolbar v-bind="toolbarAttrs">
         <template #title>Project Settings</template>
@@ -159,7 +159,7 @@ const { toolbarAttrs, readonly, editMode } = useLockEdit<PentestProject>({
   hasEditPermissions: computed(() => {
     if (project.value?.readonly) {
       return false;
-    } else if (auth.permissions.update_project_settings) {
+    } else if (!auth.permissions.update_project_settings) {
       return false;
     }
     return true;
diff --git a/frontend/src/pages/projects/archived/[archiveId].vue b/frontend/src/pages/projects/archived/[archiveId].vue
index 07dd30f33..cfd1bfe17 100644
--- a/frontend/src/pages/projects/archived/[archiveId].vue
+++ b/frontend/src/pages/projects/archived/[archiveId].vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container class="pt-0" fluid>
+  <v-container class="pt-0">
     <edit-toolbar>
       <template #title>{{ archive.name }}</template>
 
diff --git a/frontend/src/pages/projects/archived/index.vue b/frontend/src/pages/projects/archived/index.vue
index 381fc4e14..44cabfab5 100644
--- a/frontend/src/pages/projects/archived/index.vue
+++ b/frontend/src/pages/projects/archived/index.vue
@@ -1,51 +1,47 @@
 <template>
-  <full-height-page>
-    <template #header>
-      <s-sub-menu>
-        <v-tab to="/projects/" exact text="Projects" />
-        <v-tab to="/projects/archived/" text="Archived Projects" />
-      </s-sub-menu>
+  <list-view url="/api/v1/archivedprojects/">
+    <template #title>Projects</template>
+    <template #tabs>
+      <v-tab :to="{path: '/projects/', query: route.query}" exact prepend-icon="mdi-file-document" text="Active Projects" />
+      <v-tab :to="{path: '/projects/finished/', query: route.query}" prepend-icon="mdi-flag-checkered" text="Finished Projects" />
+      <v-tab :to="{path: '/projects/archived/', query: route.query}" prepend-icon="mdi-folder-lock-outline" text="Archived Projects" />
     </template>
-
-    <list-view url="/api/v1/archivedprojects/">
-      <template #title>Archived Projects</template>
-      <template #item="{item}: { item: ArchivedProject}">
-        <v-list-item :to="`/projects/archived/${item.id}/`" lines="two">
-          <v-list-item-title> {{ item.name }}</v-list-item-title>
-
-          <v-list-item-subtitle>
-            <chip-created :value="item.created" />
-            <chip-auto-delete :value="item.auto_delete_date" />
-
-            <v-chip size="small" class="ma-1">
-              <v-icon v-if="item.key_parts.some(p => !p.user.is_active) && item.key_parts.filter(p => p.user.is_active).length < item.threshold * 2" size="small" start color="warning" icon="mdi-alert" />
-              {{ item.threshold }} / {{ item.key_parts.length }}
-
-              <s-tooltip activator="parent">
-                {{ item.threshold }} of {{ item.key_parts.length }} users are required to restore this project
-              </s-tooltip>
-            </v-chip>
-
-            <v-chip
-              v-for="keypart in item.key_parts" :key="keypart.id"
-              class="ma-1" size="small"
-            >
-              <v-icon v-if="keypart.is_decrypted" size="small" start color="success" icon="mdi-lock-open-variant" />
-              <v-icon v-else size="small" start color="red" icon="mdi-lock" />
-              {{ keypart.user.username }}
-
-              <s-tooltip activator="parent">
-                <span v-if="keypart.is_decrypted">{{ keypart.user.username }} already restored their part</span>
-                <span v-else>{{ keypart.user.username }}'s part is still encrypted</span>
-              </s-tooltip>
-            </v-chip>
-
-            <chip-tag v-for="tag in item.tags" :key="tag" :value="tag" class="mt-2" />
-          </v-list-item-subtitle>
-        </v-list-item>
-      </template>
-    </list-view>
-  </full-height-page>
+    <template #item="{item}: { item: ArchivedProject}">
+      <v-list-item :to="`/projects/archived/${item.id}/`" lines="two">
+        <v-list-item-title> {{ item.name }}</v-list-item-title>
+
+        <v-list-item-subtitle>
+          <chip-created :value="item.created" />
+          <chip-auto-delete :value="item.auto_delete_date" />
+
+          <v-chip size="small" class="ma-1">
+            <v-icon v-if="item.key_parts.some(p => !p.user.is_active) && item.key_parts.filter(p => p.user.is_active).length < item.threshold * 2" size="small" start color="warning" icon="mdi-alert" />
+            {{ item.threshold }} / {{ item.key_parts.length }}
+
+            <s-tooltip activator="parent">
+              {{ item.threshold }} of {{ item.key_parts.length }} users are required to restore this project
+            </s-tooltip>
+          </v-chip>
+
+          <v-chip
+            v-for="keypart in item.key_parts" :key="keypart.id"
+            class="ma-1" size="small"
+          >
+            <v-icon v-if="keypart.is_decrypted" size="small" start color="success" icon="mdi-lock-open-variant" />
+            <v-icon v-else size="small" start color="red" icon="mdi-lock" />
+            {{ keypart.user.username }}
+
+            <s-tooltip activator="parent">
+              <span v-if="keypart.is_decrypted">{{ keypart.user.username }} already restored their part</span>
+              <span v-else>{{ keypart.user.username }}'s part is still encrypted</span>
+            </s-tooltip>
+          </v-chip>
+
+          <chip-tag v-for="tag in item.tags" :key="tag" :value="tag" class="mt-2" />
+        </v-list-item-subtitle>
+      </v-list-item>
+    </template>
+  </list-view>
 </template>
 
 <script setup lang="ts">
@@ -56,4 +52,6 @@ definePageMeta({
 useHeadExtended({
   breadcrumbs: () => archivedProjectListBreadcrumbs(),
 });
+
+const route = useRoute();
 </script>
diff --git a/frontend/src/pages/projects/finished.vue b/frontend/src/pages/projects/finished.vue
new file mode 100644
index 000000000..a4bd41f0d
--- /dev/null
+++ b/frontend/src/pages/projects/finished.vue
@@ -0,0 +1,28 @@
+<template>
+  <list-view url="/api/v1/pentestprojects/?readonly=true">
+    <template #title>Projects</template>
+    <template #tabs>
+      <v-tab :to="{path: '/projects/', query: route.query}" exact prepend-icon="mdi-file-document" text="Active Projects" />
+      <v-tab :to="{path: '/projects/finished/', query: route.query}" prepend-icon="mdi-flag-checkered" text="Finished Projects" />
+      <v-tab :to="{path: '/projects/archived/', query: route.query}" :disabled="!apiSettings.settings!.features.archiving" prepend-icon="mdi-folder-lock-outline">
+        <pro-info>Archived Projects</pro-info>
+      </v-tab>
+    </template>
+    <template #item="{item}">
+      <project-list-item :item="item" />
+    </template>
+  </list-view>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  title: 'Projects',
+  toplevel: true,
+});
+useHeadExtended({
+  breadcrumbs: () => projectListBreadcrumbs(),
+});
+
+const route = useRoute();
+const apiSettings = useApiSettings();
+</script>
diff --git a/frontend/src/pages/projects/index.vue b/frontend/src/pages/projects/index.vue
index 34af0ac5a..00f571a53 100644
--- a/frontend/src/pages/projects/index.vue
+++ b/frontend/src/pages/projects/index.vue
@@ -1,64 +1,22 @@
 <template>
   <file-drop-area @drop="importBtn.performImport($event)" class="h-100">
-    <full-height-page>
-      <template #header>
-        <s-sub-menu>
-          <v-tab :to="`/projects/`" exact text="Projects" />
-          <v-tab :disabled="!apiSettings.settings!.features.archiving" to="/projects/archived/">
-            <pro-info>Archived Projects</pro-info>
-          </v-tab>
-        </s-sub-menu>
+    <list-view url="/api/v1/pentestprojects/?readonly=false">
+      <template #title>Projects</template>
+      <template #actions>
+        <btn-create to="/projects/new/" :disabled="!auth.permissions.create_projects" />
+        <btn-import ref="importBtn" :import="performImport" :disabled="!auth.permissions.import_projects" />
       </template>
-
-      <list-view ref="listViewRef" :url="apiUrl">
-        <template #title>Projects</template>
-        <template #actions>
-          <btn-create to="/projects/new/" :disabled="!canCreate" />
-          <btn-import ref="importBtn" :import="performImport" :disabled="!canImport" />
-        </template>
-        <template #searchbar="{items}">
-          <v-row dense class="mb-2 w-100">
-            <v-col cols="12" md="10">
-              <v-text-field
-                :model-value="items.search.value"
-                @update:model-value="listViewRef?.updateSearch"
-                label="Search"
-                spellcheck="false"
-                hide-details="auto"
-                variant="underlined"
-                autofocus
-                class="ma-0"
-              />
-            </v-col>
-            <v-col cols="12" md="2">
-              <s-select 
-                v-model="projectStateFilter"
-                :items="[{ title: 'All Projects', value: ProjectStateFilter.ALL }, { title: 'Active Projects', value: ProjectStateFilter.ACTIVE }, { title: 'Finished Projects', value: ProjectStateFilter.FINISHED }]"
-                label="State"
-                variant="underlined"
-                class="ma-0"
-              />
-            </v-col>
-          </v-row>
-        </template>
-        <template #item="{item}">
-          <v-list-item :to="`/projects/${item.id}/reporting/`" lines="two">
-            <v-list-item-title>{{ item.name }}</v-list-item-title>
-
-            <v-list-item-subtitle class="mt-1">
-              <v-chip v-if="item.readonly" size="small" class="ma-1">
-                <v-icon size="small" start icon="mdi-flag-checkered" />
-                Finished
-              </v-chip>
-              <chip-created :value="item.created" />
-              <chip-member v-for="user in item.members" :key="user.id" :value="user" />
-              <chip-member v-for="user in item.imported_members" :key="user.id" :value="user" imported />
-              <chip-tag v-for="tag in item.tags" :key="tag" :value="tag" />
-            </v-list-item-subtitle>
-          </v-list-item>
-        </template>
-      </list-view>
-    </full-height-page>
+      <template #tabs>
+        <v-tab :to="{path: '/projects/', query: route.query}" exact prepend-icon="mdi-file-document" text="Active Projects" />
+        <v-tab :to="{path: '/projects/finished/', query: route.query}" prepend-icon="mdi-flag-checkered" text="Finished Projects" />
+        <v-tab :to="{path: '/projects/archived/', query: route.query}" :disabled="!apiSettings.settings!.features.archiving" prepend-icon="mdi-folder-lock-outline">
+          <pro-info>Archived Projects</pro-info>
+        </v-tab>
+      </template>
+      <template #item="{item}">
+        <project-list-item :item="item" />
+      </template>
+    </list-view>
   </file-drop-area>
 </template>
 
@@ -71,48 +29,10 @@ useHeadExtended({
   breadcrumbs: () => projectListBreadcrumbs(),
 });
 
-const route = useRoute();
-const router = useRouter();
 const auth = useAuth();
+const route = useRoute();
 const apiSettings = useApiSettings();
 
-const listViewRef = ref();
-
-enum ProjectStateFilter {
-  ALL = 'all',
-  ACTIVE = 'active',
-  FINISHED = 'finished',
-};
-
-const projectStateFilter = computed<ProjectStateFilter>({
-  get: () => route.query.state as any || ProjectStateFilter.ACTIVE,
-  set: (val) => {
-    router.replace({ query: { ...route.query, state: val } });
-  }
-});
-const apiUrl = computed(() => {
-  let apiUrl = "/api/v1/pentestprojects/";
-  if (projectStateFilter.value === ProjectStateFilter.ACTIVE) {
-    apiUrl += '?readonly=false';
-  } else if (projectStateFilter.value === ProjectStateFilter.FINISHED) {
-    apiUrl += '?readonly=true';
-  }
-  return apiUrl
-})
-
-const canCreate = computed(() => {
-  if (auth.user.value!.is_guest && !apiSettings.settings!.guest_permissions.create_projects) {
-    return false;
-  }
-  return true;
-})
-const canImport = computed(() => {
-  if (auth.user.value!.is_guest && !apiSettings.settings!.guest_permissions.import_projects) {
-    return false;
-  }
-  return true;
-});
-
 const importBtn = ref();
 async function performImport(file: File) {
   const projects = await uploadFileHelper<PentestProject[]>('/api/v1/pentestprojects/import/', file);
diff --git a/frontend/src/pages/projects/new.vue b/frontend/src/pages/projects/new.vue
index 74618b90a..4386dce79 100644
--- a/frontend/src/pages/projects/new.vue
+++ b/frontend/src/pages/projects/new.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container fluid class="pt-0">
+  <v-container class="pt-0">
     <v-form ref="formRef" @submit.prevent="performCreate">
       <edit-toolbar :form="formRef">
         <template #title>Create new Project</template>
diff --git a/frontend/src/pages/templates/index.vue b/frontend/src/pages/templates/index.vue
index fa68cbf9b..61548db43 100644
--- a/frontend/src/pages/templates/index.vue
+++ b/frontend/src/pages/templates/index.vue
@@ -1,53 +1,51 @@
 <template>
   <file-drop-area @drop="importBtnRef?.performImport($event)" class="h-100">
-    <full-height-page>
-      <list-view ref="listViewRef" url="/api/v1/findingtemplates/">
-        <template #title>Finding Templates</template>
-        <template #searchbar="{items}">
-          <v-row dense class="mb-2 w-100">
-            <v-col cols="12" md="10">
-              <v-text-field
-                :model-value="items.search.value"
-                @update:model-value="listViewRef?.updateSearchQuery"
-                label="Search"
-                spellcheck="false"
-                hide-details="auto"
-                variant="underlined"
-                autofocus
-                class="ma-0"
-              />
-            </v-col>
-            <v-col cols="12" md="2">
-              <s-language-selection
-                v-model="currentLanguage"
-                :items="languageChoices"
-                variant="underlined"
-                class="ma-0"
-              />
-            </v-col>
-          </v-row>
-        </template>
-        <template #actions>
-          <btn-create 
-            to="/templates/new/" 
-            :disabled="!auth.permissions.template_editor"
-          />
-          <btn-import 
-            ref="importBtnRef"
-            :import="performImport"
-            :disabled="!auth.permissions.template_editor"
-          />
-        </template>
-        <template #item="{item}">
-          <template-list-item
-            :template="item"
-            :language="currentLanguage"
-            :to="{path: `/templates/${item.id}/`, query: {language: currentLanguage}}"
-            lines="two"
-          />
-        </template>
-      </list-view>
-    </full-height-page>
+    <list-view ref="listViewRef" url="/api/v1/findingtemplates/">
+      <template #title>Finding Templates</template>
+      <template #searchbar="{items}">
+        <v-row dense class="mb-2 w-100">
+          <v-col cols="12" md="10">
+            <v-text-field
+              :model-value="items.search.value"
+              @update:model-value="listViewRef?.updateSearchQuery"
+              label="Search"
+              spellcheck="false"
+              hide-details="auto"
+              variant="underlined"
+              autofocus
+              class="ma-0"
+            />
+          </v-col>
+          <v-col cols="12" md="2">
+            <s-language-selection
+              v-model="currentLanguage"
+              :items="languageChoices"
+              variant="underlined"
+              class="ma-0"
+            />
+          </v-col>
+        </v-row>
+      </template>
+      <template #actions>
+        <btn-create 
+          to="/templates/new/" 
+          :disabled="!auth.permissions.template_editor"
+        />
+        <btn-import 
+          ref="importBtnRef"
+          :import="performImport"
+          :disabled="!auth.permissions.template_editor"
+        />
+      </template>
+      <template #item="{item}">
+        <template-list-item
+          :template="item"
+          :language="currentLanguage"
+          :to="{path: `/templates/${item.id}/`, query: {language: currentLanguage}}"
+          lines="two"
+        />
+      </template>
+    </list-view>
   </file-drop-area>
 </template>
 
diff --git a/frontend/src/pages/users/index.vue b/frontend/src/pages/users/index.vue
index 9312300e7..352b4447f 100644
--- a/frontend/src/pages/users/index.vue
+++ b/frontend/src/pages/users/index.vue
@@ -1,51 +1,49 @@
 <template>
-  <full-height-page>
-    <list-view url="/api/v1/pentestusers/">
-      <template #title>Users</template>
-      <template #actions>
-        <btn-create 
-          to="/users/new/" 
-          :disabled="!auth.permissions.user_manager"
-        />
-      </template>
-      <template #item="{item: user}: {item: User}">
-        <v-list-item :to="`/users/${user.id}/`">
-          <v-row>
-            <v-col md="3">
-              <v-list-item-title>
-                {{ user.username }}
-                <template v-if="user.name">
-                  ({{ user.name }})
-                </template>
-              </v-list-item-title>
-            </v-col>
-            <v-col md="3">
-              <v-chip size="small" class="ma-1" v-if="user.is_superuser" text="Superuser" />
-              <v-chip size="small" class="ma-1" v-if="user.is_user_manager" text="User Manager" />
-              <v-chip size="small" class="ma-1" v-if="user.is_designer" text="Designer" />
-              <v-chip size="small" class="ma-1" v-if="user.is_template_editor" text="Template Editor" />
-              <v-chip size="small" class="ma-1" v-if="user.is_guest" text="Guest" />
-              <v-chip size="small" class="ma-1" v-if="user.is_global_archiver" text="Global Archiver" />
-              <v-chip size="small" class="ma-1" v-if="user.is_system_user" text="System" />
-            </v-col>
-            <v-col md="1">
-              <v-chip size="small" class="ma-1" v-if="!user.is_system_user">
-                <v-icon v-if="user.is_mfa_enabled" color="green" icon="mdi-check" />
-                <v-icon v-else color="red" icon="mdi-close" />
-                MFA
-              </v-chip>
-            </v-col>
-            <v-col md="2">
-              <v-chip size="small" class="ma-1" v-if="!user.is_system_user">Last Login: {{ (user.last_login || 'never').split('T')[0] }}</v-chip>
-            </v-col>
-            <v-col md="1">
-              <v-chip size="small" class="ma-1" color="warning" v-if="!user.is_active">Inactive</v-chip>
-            </v-col>
-          </v-row>
-        </v-list-item>
-      </template>
-    </list-view>
-  </full-height-page>
+  <list-view url="/api/v1/pentestusers/">
+    <template #title>Users</template>
+    <template #actions>
+      <btn-create 
+        to="/users/new/" 
+        :disabled="!auth.permissions.user_manager"
+      />
+    </template>
+    <template #item="{item: user}: {item: User}">
+      <v-list-item :to="`/users/${user.id}/`">
+        <v-row>
+          <v-col md="3">
+            <v-list-item-title>
+              {{ user.username }}
+              <template v-if="user.name">
+                ({{ user.name }})
+              </template>
+            </v-list-item-title>
+          </v-col>
+          <v-col md="3">
+            <v-chip size="small" class="ma-1" v-if="user.is_superuser" text="Superuser" />
+            <v-chip size="small" class="ma-1" v-if="user.is_user_manager" text="User Manager" />
+            <v-chip size="small" class="ma-1" v-if="user.is_designer" text="Designer" />
+            <v-chip size="small" class="ma-1" v-if="user.is_template_editor" text="Template Editor" />
+            <v-chip size="small" class="ma-1" v-if="user.is_guest" text="Guest" />
+            <v-chip size="small" class="ma-1" v-if="user.is_global_archiver" text="Global Archiver" />
+            <v-chip size="small" class="ma-1" v-if="user.is_system_user" text="System" />
+          </v-col>
+          <v-col md="1">
+            <v-chip size="small" class="ma-1" v-if="!user.is_system_user">
+              <v-icon v-if="user.is_mfa_enabled" color="green" icon="mdi-check" />
+              <v-icon v-else color="red" icon="mdi-close" />
+              MFA
+            </v-chip>
+          </v-col>
+          <v-col md="2">
+            <v-chip size="small" class="ma-1" v-if="!user.is_system_user">Last Login: {{ (user.last_login || 'never').split('T')[0] }}</v-chip>
+          </v-col>
+          <v-col md="1">
+            <v-chip size="small" class="ma-1" color="warning" v-if="!user.is_active">Inactive</v-chip>
+          </v-col>
+        </v-row>
+      </v-list-item>
+    </template>
+  </list-view>
 </template>
 
 <script setup lang="ts">
diff --git a/frontend/src/pages/users/new.vue b/frontend/src/pages/users/new.vue
index 0f0153bc4..1ab44c812 100644
--- a/frontend/src/pages/users/new.vue
+++ b/frontend/src/pages/users/new.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container fluid class="pt-0 h-100 overflow-y-auto">
+  <v-container class="pt-0 h-100 overflow-y-auto">
     <v-form ref="form" @submit.prevent="performCreate">
       <edit-toolbar>
         <template #title>Create new User</template>
diff --git a/frontend/src/pages/users/self/admin/disable.vue b/frontend/src/pages/users/self/admin/disable.vue
index 23316d313..e9158bbb0 100644
--- a/frontend/src/pages/users/self/admin/disable.vue
+++ b/frontend/src/pages/users/self/admin/disable.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container fluid>
+  <v-container>
     <div class="mt-4 d-flex flex-column align-center">
       <v-progress-circular indeterminate size="50" />
     </div>
diff --git a/frontend/src/pages/users/self/admin/enable.vue b/frontend/src/pages/users/self/admin/enable.vue
index a8d98a63b..b2ef0e886 100644
--- a/frontend/src/pages/users/self/admin/enable.vue
+++ b/frontend/src/pages/users/self/admin/enable.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-container fluid>
+  <v-container>
     <div class="mt-4 d-flex flex-column align-center">
       <v-progress-circular indeterminate size="50" />
     </div>
@@ -19,7 +19,7 @@ useLazyAsyncData(async () => {
     auth.redirect(route.query.next);
   } catch (error: any) {
     if (error?.data?.code === 'reauth-required') {
-      await auth.redirectToReAuth();
+      await auth.redirectToReAuth({ replace: true });
     } else {
       requestErrorToast({ message: 'Failed to enable superuser permissions', error });
       auth.redirect(route.query.next);
diff --git a/frontend/src/pages/users/self/apitokens.vue b/frontend/src/pages/users/self/apitokens.vue
index d346d6dc3..daec88430 100644
--- a/frontend/src/pages/users/self/apitokens.vue
+++ b/frontend/src/pages/users/self/apitokens.vue
@@ -110,7 +110,7 @@ const apiTokens = await useAsyncDataE<ApiToken[]>(async () => {
     return await $fetch<ApiToken[]>('/api/v1/pentestusers/self/apitokens/', { method: 'GET' });
   } catch (error: any) {
     if (error?.data?.code === 'reauth-required') {
-      auth.redirectToReAuth();
+      auth.redirectToReAuth({ replace: true });
       return [];
     } else {
       throw error;
diff --git a/frontend/src/pages/users/self/security.vue b/frontend/src/pages/users/self/security.vue
index e0a099f77..4f765f04e 100644
--- a/frontend/src/pages/users/self/security.vue
+++ b/frontend/src/pages/users/self/security.vue
@@ -13,7 +13,7 @@
             text="Cancel"
           />
           <s-btn-primary
-            @click="auth.redirectToReAuth()"
+            @click="auth.redirectToReAuth({ replace: true })"
             text="Re-Authenticate"
           />
         </v-card-actions>
@@ -274,7 +274,7 @@ const mfaMethods = await useAsyncDataE(async () => {
     return await $fetch<MfaMethod[]>('/api/v1/pentestusers/self/mfa/', { method: 'GET' });
   } catch (error: any) {
     if (error?.data?.code === 'reauth-required') {
-      auth.redirectToReAuth();
+      auth.redirectToReAuth({ replace: true });
       return [];
     } else {
       throw error;
diff --git a/frontend/src/vuetify.config.ts b/frontend/src/vuetify.config.ts
index 795cc3203..0f2ef07e4 100644
--- a/frontend/src/vuetify.config.ts
+++ b/frontend/src/vuetify.config.ts
@@ -15,7 +15,7 @@ const themeCommon = {
     secondary: '#4f4f4f',
     'on-secondary': '#ffffff',
 
-    logo: sysreptorGreenDark,
+    logo: sysreptorGreen,
 
     error: '#FF5252',
     info: '#2196F3',