diff --git a/client/src/api/index.test.ts b/client/src/api/index.test.ts
index 42b666b2f03f..fb16bc95edc2 100644
--- a/client/src/api/index.test.ts
+++ b/client/src/api/index.test.ts
@@ -22,6 +22,7 @@ const REGISTERED_USER: User = {
 
 const ANONYMOUS_USER: AnonymousUser = {
     isAnonymous: true,
+    total_disk_usage: 0,
 };
 
 const SESSIONLESS_USER = null;
diff --git a/client/src/api/index.ts b/client/src/api/index.ts
index d1dbc8854bbb..718fa099a45a 100644
--- a/client/src/api/index.ts
+++ b/client/src/api/index.ts
@@ -227,7 +227,7 @@ export interface User extends QuotaUsageResponse {
     username?: string;
 }
 
-export interface AnonymousUser {
+export interface AnonymousUser extends QuotaUsageResponse {
     id?: string;
     isAnonymous: true;
     is_admin?: false;
diff --git a/client/src/components/AboutGalaxy.vue b/client/src/components/AboutGalaxy.vue
index 4c40f4978d06..c57775cae140 100644
--- a/client/src/components/AboutGalaxy.vue
+++ b/client/src/components/AboutGalaxy.vue
@@ -3,6 +3,7 @@
 /* (injected by webpack) */
 
 import { computed } from "vue";
+import { RouterLink } from "vue-router";
 
 import { useConfig } from "@/composables/config";
 import { getAppRoot } from "@/onload/loadConfig";
@@ -28,47 +29,101 @@ const versionUserDocumentationUrl = computed(() => {
 
 <template>
     <div v-if="isConfigLoaded" class="about-galaxy">
-        <Heading h1 :icon="['gxd', 'galaxyLogo']" size="xl">About This Galaxy</Heading>
-        <div>
-            <!-- Galaxy version (detailed), with a link to the release notes -->
-            <Heading h2 separator size="md">Galaxy Version Information</Heading>
-            <p>
-                The Galaxy Server is running version
-                <ExternalLink :href="versionUserDocumentationUrl">
-                    <strong> {{ config.version_major }}.{{ config.version_minor }}</strong> </ExternalLink
-                >, and the web client was built on <UtcDate :date="clientBuildDate" mode="pretty" />.
-            </p>
-            <template v-if="config.version_extra">
-                <p>The server also provides the following extra version information</p>
-                <ul>
-                    <li v-for="(value, name, index) in config.version_extra" :key="index">
-                        <strong>{{ name }}</strong>
-                        : {{ value }}
-                    </li>
-                </ul>
-            </template>
-        </div>
-        <div>
-            <Heading h2 separator size="md">Galaxy API Documentation</Heading>
-            <!-- API documentation link -->
-            <p>
-                The Galaxy API is available, and explorable, at
-                <ExternalLink :href="apiDocsLink">
-                    {{ apiDocsLink }}
-                </ExternalLink>
-            </p>
-        </div>
-        <div>
-            <Heading h2 separator size="md">License Information</Heading>
-            <p>The Galaxy Software is licensed under <License :license-id="galaxyLicense" /></p>
-        </div>
-        <div v-if="config.terms_url">
-            <!-- Terms, if available.-->
-            <Heading h2 separator size="md">Terms and Conditions</Heading>
-            <p>
-                This Galaxy Server has specified Terms and Conditions that apply to use of the service.
-                <ExternalLink :href="config.terms_url">Review them here.</ExternalLink>
-            </p>
+        <Heading h1 :icon="['gxd', 'galaxyLogo']" size="xl">Help and Support</Heading>
+        <div class="py-4">
+            <div v-if="config.wiki_url">
+                <Heading h2 separator size="md">Community Hub</Heading>
+                <p>
+                    Interact with the our community, explore and publish tutorials at
+                    <ExternalLink :href="config.wiki_url">
+                        {{ config.wiki_url }}
+                    </ExternalLink>
+                </p>
+            </div>
+            <div v-if="config.citation_url">
+                <Heading h2 separator size="md">How to Cite Us</Heading>
+                <p>
+                    Find more details on how to properly cite Galaxy at
+                    <ExternalLink :href="config.citation_url">
+                        {{ config.citation_url }}
+                    </ExternalLink>
+                </p>
+            </div>
+            <div>
+                <Heading h2 separator size="md">Interactive Tours</Heading>
+                <p>
+                    Explore and learn about Galaxy through interactive
+                    <RouterLink to="tours">tours</RouterLink>.
+                </p>
+            </div>
+            <div v-if="config.screencasts_url">
+                <Heading h2 separator size="md">Videos and Screencasts</Heading>
+                <p>
+                    Learn more about Galaxy by watching videos and screencasts at
+                    <ExternalLink :href="config.screencasts_url">
+                        {{ config.screencasts_url }}
+                    </ExternalLink>
+                </p>
+            </div>
+            <div v-if="config.helpsite_url">
+                <Heading h2 separator size="md">User Documentation</Heading>
+                <p>
+                    Learn more about Galaxy at
+                    <ExternalLink :href="config.helpsite_url">
+                        {{ config.helpsite_url }}
+                    </ExternalLink>
+                </p>
+            </div>
+            <div>
+                <Heading h2 separator size="md">API Documentation</Heading>
+                <!-- API documentation link -->
+                <p>
+                    The Galaxy API is available, and explorable, at
+                    <ExternalLink :href="apiDocsLink">
+                        {{ apiDocsLink }}
+                    </ExternalLink>
+                </p>
+            </div>
+            <div>
+                <!-- Galaxy version (detailed), with a link to the release notes -->
+                <Heading h2 separator size="md">Version Information</Heading>
+                <p>
+                    The Galaxy Server is running version
+                    <ExternalLink :href="versionUserDocumentationUrl">
+                        <strong> {{ config.version_major }}.{{ config.version_minor }}</strong> </ExternalLink
+                    >, and the web client was built on <UtcDate :date="clientBuildDate" mode="pretty" />.
+                </p>
+                <template v-if="config.version_extra">
+                    <p>The server also provides the following extra version information</p>
+                    <ul>
+                        <li v-for="(value, name, index) in config.version_extra" :key="index">
+                            <strong>{{ name }}</strong>
+                            : {{ value }}
+                        </li>
+                    </ul>
+                </template>
+            </div>
+            <div>
+                <Heading h2 separator size="md">License Information</Heading>
+                <p>The Galaxy Software is licensed under <License :license-id="galaxyLicense" /></p>
+            </div>
+            <div v-if="config.terms_url">
+                <!-- Terms, if available.-->
+                <Heading h2 separator size="md">Terms and Conditions</Heading>
+                <p>
+                    This Galaxy Server has specified Terms and Conditions that apply to use of the service.
+                    <ExternalLink :href="config.terms_url">Review them here.</ExternalLink>
+                </p>
+            </div>
+            <div v-if="config.support_url">
+                <Heading h2 separator size="md">Support</Heading>
+                <p>
+                    Do you need help? Reach out at
+                    <ExternalLink :href="config.support_url">
+                        {{ config.support_url }}
+                    </ExternalLink>
+                </p>
+            </div>
         </div>
     </div>
 </template>
diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue
index 0d9f83fb3d05..cde4d7b190ad 100644
--- a/client/src/components/ActivityBar/ActivityBar.vue
+++ b/client/src/components/ActivityBar/ActivityBar.vue
@@ -179,11 +179,7 @@ watch(
                                 :to="activity.to"
                                 @click="onToggleSidebar()" />
                             <ActivityItem
-                                v-else-if="
-                                    ['admin', 'tools', 'visualizations', 'multiview', 'invocation'].includes(
-                                        activity.id
-                                    )
-                                "
+                                v-else-if="activity.id === 'admin' || activity.panel"
                                 :id="`activity-${activity.id}`"
                                 :key="activity.id"
                                 :icon="activity.icon"
@@ -216,10 +212,10 @@ watch(
                     @click="onToggleSidebar('notifications')" />
                 <ActivityItem
                     id="activity-settings"
-                    icon="cog"
+                    icon="ellipsis-h"
                     :is-active="isActiveSideBar('settings')"
-                    title="Settings"
-                    tooltip="Edit preferences"
+                    title="More"
+                    tooltip="View additional activities"
                     @click="onToggleSidebar('settings')" />
                 <ActivityItem
                     v-if="isAdmin"
diff --git a/client/src/components/ActivityBar/ActivitySettings.test.js b/client/src/components/ActivityBar/ActivitySettings.test.js
index e5555451ec85..2fd33b00d02e 100644
--- a/client/src/components/ActivityBar/ActivitySettings.test.js
+++ b/client/src/components/ActivityBar/ActivitySettings.test.js
@@ -19,7 +19,7 @@ function testActivity(id, newOptions = {}) {
         description: "activity-test-description",
         icon: "activity-test-icon",
         mutable: true,
-        optional: false,
+        optional: true,
         title: "activity-test-title",
         to: null,
         tooltip: "activity-test-tooltip",
@@ -56,22 +56,23 @@ describe("ActivitySettings", () => {
 
     it("availability of built-in activities", async () => {
         const items = wrapper.findAll(activityItemSelector);
-        expect(items.length).toBe(Activities.length);
+        const nOptional = Activities.filter((x) => x.optional).length;
+        expect(items.length).toBe(nOptional);
     });
 
-    it("visible but non-optional activity", async () => {
+    it("visible and optional activity", async () => {
         activityStore.setAll([testActivity("1")]);
         await wrapper.vm.$nextTick();
         const items = wrapper.findAll(activityItemSelector);
         expect(items.length).toBe(1);
-        const pinnedCheckbox = items.at(0).find("[data-icon='thumbtack']");
-        expect(pinnedCheckbox.exists()).toBeTruthy();
-        const pinnedIcon = wrapper.find("[icon='activity-test-icon'");
-        expect(pinnedIcon.exists()).toBeTruthy();
+        const checkbox = items.at(0).find("[title='Hide in Activity Bar']");
+        expect(checkbox.exists()).toBeTruthy();
+        const icon = wrapper.find("[icon='activity-test-icon'");
+        expect(icon.exists()).toBeTruthy();
         expect(activityStore.getAll()[0].visible).toBeTruthy();
-        pinnedCheckbox.trigger("click");
+        checkbox.trigger("click");
         await wrapper.vm.$nextTick();
-        expect(activityStore.getAll()[0].visible).toBeTruthy();
+        expect(activityStore.getAll()[0].visible).toBeFalsy();
     });
 
     it("non-visible but optional activity", async () => {
@@ -84,12 +85,12 @@ describe("ActivitySettings", () => {
         await wrapper.vm.$nextTick();
         const items = wrapper.findAll(activityItemSelector);
         expect(items.length).toBe(1);
-        const hiddenCheckbox = items.at(0).find("[data-icon='square']");
-        expect(hiddenCheckbox.exists()).toBeTruthy();
+        const checkbox = items.at(0).find("[title='Show in Activity Bar']");
+        expect(checkbox.exists()).toBeTruthy();
         expect(activityStore.getAll()[0].visible).toBeFalsy();
-        hiddenCheckbox.trigger("click");
+        checkbox.trigger("click");
         await wrapper.vm.$nextTick();
-        const visibleCheckbox = items.at(0).find("[data-icon='check-square']");
+        const visibleCheckbox = items.at(0).find("[title='Hide in Activity Bar']");
         expect(visibleCheckbox.exists()).toBeTruthy();
         expect(activityStore.getAll()[0].visible).toBeTruthy();
     });
diff --git a/client/src/components/ActivityBar/ActivitySettings.vue b/client/src/components/ActivityBar/ActivitySettings.vue
index 835691d3c0b3..fe2ecce28dd5 100644
--- a/client/src/components/ActivityBar/ActivitySettings.vue
+++ b/client/src/components/ActivityBar/ActivitySettings.vue
@@ -1,16 +1,19 @@
 <script setup lang="ts">
 import { library } from "@fortawesome/fontawesome-svg-core";
-import { faSquare } from "@fortawesome/free-regular-svg-icons";
-import { faCheckSquare, faThumbtack, faTrash } from "@fortawesome/free-solid-svg-icons";
+import { faSquare, faStar as faStarRegular } from "@fortawesome/free-regular-svg-icons";
+import { faCheckSquare, faStar, faThumbtack, faTrash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { storeToRefs } from "pinia";
 import { computed, type ComputedRef } from "vue";
 
+import { useActivityAction } from "@/composables/useActivityAction";
 import { type Activity, useActivityStore } from "@/stores/activityStore";
 
 library.add({
     faCheckSquare,
     faSquare,
+    faStar,
+    faStarRegular,
     faTrash,
     faThumbtack,
 });
@@ -21,6 +24,7 @@ const props = defineProps<{
 
 const activityStore = useActivityStore();
 const { activities } = storeToRefs(activityStore);
+const activityAction = useActivityAction();
 
 const filteredActivities = computed(() => {
     if (props.query?.length > 0) {
@@ -44,7 +48,7 @@ const foundActivities: ComputedRef<boolean> = computed(() => {
     return filteredActivities.value.length > 0;
 });
 
-function onClick(activity: Activity) {
+function onFavorite(activity: Activity) {
     if (activity.optional) {
         activity.visible = !activity.visible;
     }
@@ -59,36 +63,49 @@ function onRemove(activity: Activity) {
     <div class="activity-settings rounded no-highlight">
         <div v-if="foundActivities" class="activity-settings-content">
             <div v-for="activity in filteredActivities" :key="activity.id">
-                <button class="activity-settings-item p-2 cursor-pointer" @click="onClick(activity)">
+                <button
+                    v-if="activity.optional"
+                    class="activity-settings-item p-2 cursor-pointer"
+                    @click="activityAction.executeActivity(activity)">
                     <div class="d-flex justify-content-between align-items-start">
-                        <span class="w-100">
-                            <FontAwesomeIcon
-                                v-if="!activity.optional"
-                                class="icon-check mr-1"
-                                icon="fas fa-thumbtack"
-                                fa-fw />
-                            <FontAwesomeIcon
-                                v-else-if="activity.visible"
-                                class="icon-check mr-1"
-                                icon="fas fa-check-square"
-                                fa-fw />
-                            <FontAwesomeIcon v-else class="mr-1" icon="far fa-square" fa-fw />
+                        <span class="d-flex justify-content-between w-100">
                             <span>
                                 <icon class="mr-1" :icon="activity.icon" />
                                 <span v-localize class="font-weight-bold">{{
                                     activity.title || "No title available"
                                 }}</span>
                             </span>
+                            <div>
+                                <BButton
+                                    v-if="activity.mutable"
+                                    v-b-tooltip.hover
+                                    data-description="delete activity"
+                                    size="sm"
+                                    title="Delete Activity"
+                                    variant="link"
+                                    @click.stop="onRemove(activity)">
+                                    <FontAwesomeIcon icon="fa-trash" fa-fw />
+                                </BButton>
+                                <BButton
+                                    v-if="activity.visible"
+                                    v-b-tooltip.hover
+                                    size="sm"
+                                    title="Hide in Activity Bar"
+                                    variant="link"
+                                    @click.stop="onFavorite(activity)">
+                                    <FontAwesomeIcon icon="fas fa-star" fa-fw />
+                                </BButton>
+                                <BButton
+                                    v-else
+                                    v-b-tooltip.hover
+                                    size="sm"
+                                    title="Show in Activity Bar"
+                                    variant="link"
+                                    @click.stop="onFavorite(activity)">
+                                    <FontAwesomeIcon icon="far fa-star" fa-fw />
+                                </BButton>
+                            </div>
                         </span>
-                        <b-button
-                            v-if="activity.mutable"
-                            data-description="delete activity"
-                            class="button-delete"
-                            size="sm"
-                            variant="link"
-                            @click.stop="onRemove(activity)">
-                            <FontAwesomeIcon icon="fa-trash" fa-fw />
-                        </b-button>
                     </div>
                     <div v-localize class="text-muted">
                         {{ activity.description || "No description available" }}
@@ -121,13 +138,6 @@ function onRemove(activity: Activity) {
     text-align: left;
     transition: none;
     width: 100%;
-
-    .icon-check {
-        color: darken($brand-success, 15%);
-    }
-    .button-delete {
-        background: transparent;
-    }
 }
 .activity-settings-item:hover {
     background: $gray-200;
diff --git a/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue b/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
index 6e2e6138ca00..8224ae89b030 100644
--- a/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
+++ b/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
@@ -1,6 +1,7 @@
 <template>
     <div>
         <FolderTopBar
+            :canAddLibraryItem="canAddLibraryItem"
             :folder-contents="folderContents"
             :include-deleted.sync="includeDeleted"
             :folder_id="currentFolderId"
@@ -285,6 +286,7 @@ Vue.use(BootstrapVue);
 
 function initialFolderState() {
     return {
+        canAddLibraryItem: false,
         selected: [],
         unselected: [],
         expandedMessage: [],
@@ -387,6 +389,7 @@ export default {
                 .then((response) => {
                     this.folderContents = response.folder_contents;
                     this.folder_metadata = response.metadata;
+                    this.canAddLibraryItem = response.metadata.can_add_library_item;
                     this.total_rows = response.metadata.total_rows;
                     if (this.isAllSelectedMode) {
                         this.selected = [];
diff --git a/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue b/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue
index cfdd97f1c429..de3b1c052e5b 100644
--- a/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue
+++ b/client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue
@@ -12,7 +12,7 @@
                 <div class="form-inline">
                     <SearchField @updateSearch="updateSearch($event)"></SearchField>
                     <button
-                        v-if="metadata.can_add_library_item"
+                        v-if="canAddLibraryItem"
                         title="Create new folder"
                         class="btn btn-secondary toolbtn-create-folder add-library-items add-library-items-folder mr-1"
                         type="button"
@@ -20,7 +20,7 @@
                         <FontAwesomeIcon icon="plus" />
                         Folder
                     </button>
-                    <div v-if="metadata.can_add_library_item">
+                    <div v-if="canAddLibraryItem">
                         <div
                             title="Add datasets to current folder"
                             class="dropdown add-library-items add-library-items-datasets mr-1">
@@ -168,6 +168,10 @@ export default {
             type: Array,
             required: true,
         },
+        canAddLibraryItem: {
+            type: Boolean,
+            default: false,
+        },
         metadata: {
             type: Object,
             required: true,
diff --git a/client/src/components/Masthead/Masthead.test.js b/client/src/components/Masthead/Masthead.test.js
index 58a7a88137fa..445cc235e9b9 100644
--- a/client/src/components/Masthead/Masthead.test.js
+++ b/client/src/components/Masthead/Masthead.test.js
@@ -1,21 +1,20 @@
 import { createTestingPinia } from "@pinia/testing";
 import { mount } from "@vue/test-utils";
 import { WindowManager } from "layout/window-manager";
-import { PiniaVuePlugin, setActivePinia } from "pinia";
-import { useEntryPointStore } from "stores/entryPointStore";
+import { PiniaVuePlugin } from "pinia";
 import { getLocalVue } from "tests/jest/helpers";
 
 import { mockFetcher } from "@/api/schema/__mocks__";
 
 import { loadWebhookMenuItems } from "./_webhooks";
-import { getActiveTab } from "./utilities";
 
-import { default as Masthead } from "./Masthead.vue";
+import Masthead from "./Masthead.vue";
 
 jest.mock("app");
 jest.mock("./_webhooks");
 jest.mock("vue-router/composables", () => ({
     useRoute: jest.fn(() => ({ name: "Home" })),
+    useRouter: jest.fn(),
 }));
 jest.mock("@/api/schema");
 
@@ -23,14 +22,12 @@ describe("Masthead.vue", () => {
     let wrapper;
     let localVue;
     let windowManager;
-    let tabs;
     let testPinia;
 
     function stubLoadWebhooks(items) {
         items.push({
             id: "extension",
             title: "Extension Point",
-            menu: false,
             url: "extension_url",
         });
     }
@@ -43,75 +40,22 @@ describe("Masthead.vue", () => {
         testPinia = createTestingPinia();
         mockFetcher.path("/api/configuration").method("get").mock({ data: {} });
 
-        tabs = [
-            // Main Analysis Tab..
-            {
-                id: "analysis",
-                title: "Analyze",
-                menu: false,
-                url: "root",
-            },
-            {
-                id: "shared",
-                title: "Shared Items",
-                menu: [{ title: "_menu_title", url: "_menu_url", target: "_menu_target" }],
-            },
-            // Hidden tab (pre-Vue framework supported this, not sure it is used
-            // anywhere?)
-            {
-                id: "hiddentab",
-                title: "Hidden Title",
-                menu: false,
-                hidden: true,
-            },
-        ];
-
-        const initialActiveTab = "shared";
         windowManager = new WindowManager({});
         const windowTab = windowManager.getTab();
         wrapper = mount(Masthead, {
             propsData: {
-                tabs,
                 windowTab,
-                initialActiveTab,
             },
             localVue,
             pinia: testPinia,
         });
     });
 
-    it("test basic active tab matching", () => {
-        expect(getActiveTab("root", tabs)).toBe("analysis");
-        expect(getActiveTab("_menu_url", tabs)).toBe("shared");
-    });
-
     it("should render simple tab item links", () => {
-        expect(wrapper.findAll("li.nav-item").length).toBe(6);
+        expect(wrapper.findAll("li.nav-item").length).toBe(5);
         // Ensure specified link title respected.
-        expect(wrapper.find("#analysis a").text()).toBe("Analyze");
-        expect(wrapper.find("#analysis a").attributes("href")).toBe("root");
-    });
-
-    it("should render tab items with menus", () => {
-        // Ensure specified link title respected.
-        expect(wrapper.find("#shared a").text()).toBe("Shared Items");
-        expect(wrapper.find("#shared").classes("dropdown")).toBe(true);
-
-        expect(wrapper.findAll("#shared .dropdown-menu li").length).toBe(1);
-        expect(wrapper.find("#shared .dropdown-menu li a").attributes().href).toBe("_menu_url");
-        expect(wrapper.find("#shared .dropdown-menu li a").attributes().target).toBe("_menu_target");
-        expect(wrapper.find("#shared .dropdown-menu li a").text()).toBe("_menu_title");
-    });
-
-    it("should make hidden tabs hidden", () => {
-        expect(wrapper.find("#analysis").attributes().style).not.toEqual(expect.stringContaining("display: none"));
-        expect(wrapper.find("#hiddentab").attributes().style).toEqual(expect.stringContaining("display: none"));
-        expect(wrapper.get("#interactive").isVisible()).toBeFalsy();
-    });
-
-    it("should highlight the active tab", () => {
-        expect(wrapper.find("#analysis").classes("active")).toBe(false);
-        expect(wrapper.find("#shared").classes("active")).toBe(true);
+        expect(wrapper.find("#help").text()).toBe("Support, Contact, and Community");
+        expect(wrapper.find("#help a").attributes("href")).toBe("/about");
     });
 
     it("should display window manager button", async () => {
@@ -124,24 +68,4 @@ describe("Masthead.vue", () => {
     it("should load webhooks on creation", async () => {
         expect(wrapper.find("#extension a").text()).toBe("Extension Point");
     });
-
-    it("shows link to interactive tools if any is active", async () => {
-        setActivePinia(testPinia);
-        const entryPointStore = useEntryPointStore();
-        entryPointStore.entryPoints = [
-            {
-                model_class: "InteractiveToolEntryPoint",
-                id: "52e496b945151ee8",
-                job_id: "52e496b945151ee8",
-                name: "Jupyter Interactive Tool",
-                active: true,
-                created_time: "2020-02-24T15:59:18.122103",
-                modified_time: "2020-02-24T15:59:20.428594",
-                target: "http://52e496b945151ee8-be8a5bee5d5849a5b4e035b51305256e.interactivetoolentrypoint.interactivetool.localhost:8080/ipython/lab",
-            },
-        ];
-        // avoid race condition with store's reactivity
-        await new Promise((_) => setTimeout(_, 10));
-        expect(wrapper.get("#interactive").isVisible()).toBeTruthy();
-    });
 });
diff --git a/client/src/components/Masthead/Masthead.vue b/client/src/components/Masthead/Masthead.vue
index 0390029c3951..1e166a469a03 100644
--- a/client/src/components/Masthead/Masthead.vue
+++ b/client/src/components/Masthead/Masthead.vue
@@ -1,41 +1,29 @@
 <script setup>
 import { BNavbar, BNavbarBrand, BNavbarNav } from "bootstrap-vue";
 import { storeToRefs } from "pinia";
-import { useEntryPointStore } from "stores/entryPointStore";
+import { userLogout } from "utils/logout";
 import { withPrefix } from "utils/redirect";
-import { onBeforeMount, onMounted, reactive, ref, watch } from "vue";
-import { useRoute } from "vue-router/composables";
+import { onMounted, ref } from "vue";
+import { useRouter } from "vue-router/composables";
 
 import { useConfig } from "@/composables/config";
 import { useUserStore } from "@/stores/userStore";
 
 import { loadWebhookMenuItems } from "./_webhooks";
+import MastheadDropdown from "./MastheadDropdown";
 import MastheadItem from "./MastheadItem";
 import QuotaMeter from "./QuotaMeter";
-import { getActiveTab } from "./utilities";
 
-import NotificationsBell from "@/components/Notifications/NotificationsBell.vue";
+const { isAnonymous, currentUser } = storeToRefs(useUserStore());
 
-const { isAnonymous } = storeToRefs(useUserStore());
-
-const route = useRoute();
+const router = useRouter();
 const { config, isConfigLoaded } = useConfig();
 
-const emit = defineEmits(["open-url"]);
-
 const props = defineProps({
-    tabs: {
-        type: Array,
-        default: () => [],
-    },
     brand: {
         type: String,
         default: null,
     },
-    initialActiveTab: {
-        type: String,
-        default: "analysis",
-    },
     logoUrl: {
         type: String,
         default: null,
@@ -54,49 +42,29 @@ const props = defineProps({
     },
 });
 
-const activeTab = ref(props.initialActiveTab);
 const extensionTabs = ref([]);
 const windowToggle = ref(false);
 
-let entryPointStore;
-const itsMenu = reactive({
-    id: "interactive",
-    url: "/interactivetool_entry_points/list",
-    tooltip: "See Running Interactive Tools",
-    icon: "fa-cogs",
-    hidden: true,
-});
-
-function setActiveTab() {
-    const currentRoute = route.path;
-    activeTab.value = getActiveTab(currentRoute, props.tabs) || activeTab.value;
+function openUrl(url, target = null) {
+    if (!target) {
+        router.push(url);
+    } else {
+        url = withPrefix(url);
+        if (target == "_blank") {
+            window.open(url);
+        } else {
+            window.location = url;
+        }
+    }
 }
 
 function onWindowToggle() {
     windowToggle.value = !windowToggle.value;
-}
-function updateVisibility(isActive) {
-    itsMenu.hidden = !isActive;
+    props.windowTab.onclick();
 }
 
-watch(
-    () => route.path,
-    () => {
-        setActiveTab();
-    }
-);
-
-/* lifecyle */
-onBeforeMount(() => {
-    entryPointStore = useEntryPointStore();
-    entryPointStore.startWatchingEntryPoints();
-    entryPointStore.$subscribe((mutation, state) => {
-        updateVisibility(state.entryPoints.length > 0);
-    });
-});
 onMounted(() => {
     loadWebhookMenuItems(extensionTabs.value);
-    setActiveTab();
 });
 </script>
 
@@ -104,47 +72,80 @@ onMounted(() => {
     <BNavbar id="masthead" type="dark" role="navigation" aria-label="Main" class="justify-content-between">
         <BNavbarNav>
             <BNavbarBrand
+                id="analysis"
                 v-b-tooltip.hover
-                class="ml-2 mr-2"
+                class="ml-2 mr-2 p-0"
                 title="Home"
                 aria-label="homepage"
                 :href="withPrefix(logoUrl)">
                 <img alt="logo" :src="withPrefix(logoSrc)" />
                 <img v-if="logoSrcSecondary" alt="logo" :src="withPrefix(logoSrcSecondary)" />
             </BNavbarBrand>
-            <span v-if="brand" class="navbar-text px-2">
+            <span v-if="brand" class="navbar-text py-0 px-2">
                 {{ brand }}
             </span>
         </BNavbarNav>
-        <BNavbarNav>
+        <BNavbarNav v-if="isConfigLoaded" class="mr-1">
+            <MastheadItem id="library" icon="fa-database" tooltip="Data Libraries" @click="openUrl('/libraries')" />
             <MastheadItem
-                v-for="(tab, idx) in props.tabs"
-                v-show="tab.hidden !== true"
-                :key="`tab-${idx}`"
-                :tab="tab"
-                :active-tab="activeTab"
-                @open-url="emit('open-url', $event)" />
-            <MastheadItem
-                v-show="itsMenu.hidden !== true"
-                :key="`its-tab`"
-                :tab="itsMenu"
-                :active-tab="activeTab"
-                @open-url="emit('open-url', $event)" />
+                v-if="windowTab"
+                :id="windowTab.id"
+                :icon="windowTab.icon"
+                :toggle="windowToggle"
+                :tooltip="windowTab.tooltip"
+                @click="onWindowToggle" />
             <MastheadItem
                 v-for="(tab, idx) in extensionTabs"
                 v-show="tab.hidden !== true"
+                :id="tab.id"
                 :key="`extension-tab-${idx}`"
-                :tab="tab"
-                :active-tab="activeTab"
-                @open-url="emit('open-url', $event)" />
-            <MastheadItem v-if="windowTab" :tab="windowTab" :toggle="windowToggle" @click="onWindowToggle" />
-            <BNavItem
-                v-if="!isAnonymous && isConfigLoaded && config.enable_notification_system"
-                id="notifications-bell">
-                <NotificationsBell tooltip-placement="bottom" />
-            </BNavItem>
+                :title="tab.title"
+                :icon="tab.icon"
+                :url="tab.url"
+                :tooltip="tab.tooltip"
+                :target="tab.target"
+                @click="tab.onclick ? tab.onclick : undefined" />
+            <MastheadItem
+                id="help"
+                icon="fa-question"
+                url="/about"
+                tooltip="Support, Contact, and Community"
+                @click="openUrl('/about')" />
+            <QuotaMeter />
+            <MastheadItem
+                v-if="isAnonymous && config.allow_user_creation"
+                id="user"
+                class="loggedout-only"
+                title="Login or Register"
+                @click="openUrl('/login/start')" />
+            <MastheadItem
+                v-if="isAnonymous && !config.allow_user_creation"
+                id="user"
+                class="loggedout-only"
+                title="Login"
+                @click="openUrl('/login/start')" />
+            <MastheadDropdown
+                v-if="!isAnonymous && !config.single_user"
+                id="user"
+                class="loggedin-only"
+                icon="fa-user"
+                :title="currentUser.username"
+                tooltip="User Preferences"
+                :menu="[
+                    {
+                        title: 'Preferences',
+                        icon: 'fa-gear',
+                        handler: () => openUrl('/user'),
+                    },
+                    {
+                        title: 'Sign Out',
+                        icon: 'fa-sign-out-alt',
+                        handler: () => userLogout(),
+                    },
+                ]"
+                @click="userLogout" />
         </BNavbarNav>
-        <QuotaMeter />
+        <Icon v-else icon="spinner" class="fa-spin mr-2 text-light" />
     </BNavbar>
 </template>
 
@@ -180,16 +181,18 @@ onMounted(() => {
                 cursor: pointer;
                 text-decoration: none;
                 color: var(--masthead-text-color);
+                margin-right: 0.25rem;
+                margin-left: 0.25rem;
                 &:hover {
                     color: var(--masthead-text-hover);
                 }
                 &.nav-icon {
-                    font-size: 1.3em;
+                    font-size: 1.2em;
                     .nav-note {
                         position: absolute;
-                        left: 1.9rem;
-                        top: 1.9rem;
-                        font-size: 0.6rem;
+                        left: 1.6rem;
+                        top: 1.6rem;
+                        font-size: 0.4rem;
                         font-weight: bold;
                     }
                 }
@@ -201,11 +204,12 @@ onMounted(() => {
     }
     .navbar-brand {
         cursor: pointer;
+        line-height: $masthead-height;
         img {
             filter: $text-shadow;
             display: inline;
             border: none;
-            height: 2.3rem;
+            height: 2rem;
         }
     }
     .navbar-text {
@@ -213,7 +217,7 @@ onMounted(() => {
         font-weight: bold;
         font-family: Verdana, sans-serif;
         font-size: 1rem;
-        line-height: 2rem;
+        line-height: $masthead-height;
         color: var(--masthead-text-color);
     }
 }
diff --git a/client/src/components/Masthead/MastheadDropdown.vue b/client/src/components/Masthead/MastheadDropdown.vue
new file mode 100644
index 000000000000..02bd10771694
--- /dev/null
+++ b/client/src/components/Masthead/MastheadDropdown.vue
@@ -0,0 +1,48 @@
+<script setup>
+import { BDropdownItem, BNavItemDropdown, VBTooltipPlugin } from "bootstrap-vue";
+import Vue, { ref } from "vue";
+
+import TextShort from "@/components/Common/TextShort.vue";
+
+Vue.use(VBTooltipPlugin);
+
+const dropdown = ref(null);
+
+/* props */
+defineProps({
+    id: {
+        type: String,
+    },
+    icon: {
+        type: String,
+    },
+    target: {
+        type: String,
+    },
+    title: {
+        type: String,
+    },
+    tooltip: {
+        type: String,
+    },
+    menu: {
+        type: Array,
+    },
+});
+</script>
+
+<template>
+    <BNavItemDropdown :id="id" ref="dropdown" v-b-tooltip.noninteractive.hover.bottom :title="tooltip" right>
+        <template v-if="icon" v-slot:button-content>
+            <span class="sr-only">{{ tooltip || id }}</span>
+            <span class="fa fa-fw" :class="icon" />
+            <TextShort :text="title" />
+        </template>
+        <template>
+            <BDropdownItem v-for="(item, idx) in menu" :key="idx" role="menuitem" @click="item.handler">
+                <span class="fa fa-fw" :class="item.icon" />
+                <span>{{ item.title }}</span>
+            </BDropdownItem>
+        </template>
+    </BNavItemDropdown>
+</template>
diff --git a/client/src/components/Masthead/MastheadItem.test.js b/client/src/components/Masthead/MastheadItem.test.js
deleted file mode 100644
index 68e8780c00c0..000000000000
--- a/client/src/components/Masthead/MastheadItem.test.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { mount } from "@vue/test-utils";
-import { getLocalVue } from "tests/jest/helpers";
-
-import MastheadItem from "./MastheadItem.vue";
-
-describe("MastheadItem.vue", () => {
-    let wrapper;
-    let localVue;
-
-    beforeEach(() => {
-        localVue = getLocalVue();
-    });
-
-    function m(active, menu) {
-        const tab = {
-            id: "mytab",
-            menu: menu,
-        };
-
-        return mount(MastheadItem, {
-            propsData: {
-                tab,
-                activeTab: active,
-            },
-            localVue,
-        });
-    }
-
-    it("should render active tab with menus", async () => {
-        wrapper = m("mytab", true);
-        expect(wrapper.classes("active")).toBe(true);
-        expect(wrapper.classes("b-nav-dropdown")).toBe(true);
-    });
-
-    it("should render inactive tabs without menus", async () => {
-        wrapper = m("othertab", false);
-        expect(wrapper.classes("active")).toBe(false);
-        expect(wrapper.classes("b-nav-dropdown")).toBe(false);
-    });
-});
diff --git a/client/src/components/Masthead/MastheadItem.vue b/client/src/components/Masthead/MastheadItem.vue
index 889526e01ffa..f3c1ca5c3ab5 100644
--- a/client/src/components/Masthead/MastheadItem.vue
+++ b/client/src/components/Masthead/MastheadItem.vue
@@ -1,125 +1,57 @@
 <script setup>
-import { BDropdownItem, BNavItem, BNavItemDropdown, VBPopoverPlugin, VBTooltipPlugin } from "bootstrap-vue";
+import { BNavItem, VBTooltipPlugin } from "bootstrap-vue";
 import { withPrefix } from "utils/redirect";
-import Vue, { computed, getCurrentInstance, ref } from "vue";
+import Vue from "vue";
 
-Vue.use(VBPopoverPlugin);
 Vue.use(VBTooltipPlugin);
 
-const instance = getCurrentInstance().proxy;
-const emit = defineEmits(["click", "open-url"]);
-const dropdown = ref(null);
-
 /* props */
-const props = defineProps({
-    tab: {
-        type: Object,
-        default: null,
+defineProps({
+    disabled: {
+        type: Boolean,
+    },
+    id: {
+        type: String,
+    },
+    icon: {
+        type: String,
+    },
+    target: {
+        type: String,
+    },
+    title: {
+        type: String,
+    },
+    tooltip: {
+        type: String,
     },
     toggle: {
         type: Boolean,
         default: false,
     },
-    activeTab: {
+    url: {
         type: String,
-        default: null,
     },
 });
-
-/* computed */
-const menu = computed(() => props.tab.menu);
-const popoverNote = computed(
-    () => `Please <a href="${withPrefix("/login")}">log in or register</a> to use this feature.`
-);
-const classes = computed(() => {
-    const isActiveTab = props.tab.id == props.activeTab;
-    return Object.fromEntries([
-        ["active", isActiveTab],
-        [props.tab.cls, !!props.tab.cls],
-    ]);
-});
-const linkClasses = computed(() => ({
-    "nav-icon": props.tab.icon,
-    toggle: props.toggle,
-}));
-const iconClasses = computed(() =>
-    Object.fromEntries([
-        ["fa fa-fw", true],
-        [props.tab.icon, !!props.tab.icon],
-    ])
-);
-
-/* methods */
-function open(tab, event) {
-    if (tab.onclick) {
-        event.preventDefault();
-        tab.onclick();
-        emit("click");
-    } else if (tab.disabled) {
-        event.preventDefault();
-        instance.$root.$emit("bv::hide::tooltip");
-        instance.$root.$emit("bv::show::popover", tab.id);
-        setTimeout(() => {
-            instance.$root.$emit("bv::hide::popover", tab.id);
-        }, 3000);
-    } else if (!tab.menu) {
-        event.preventDefault();
-        emit("open-url", { ...tab });
-    }
-}
 </script>
 
 <template>
     <BNavItem
-        v-if="!menu"
-        :id="tab.id"
-        v-b-tooltip.hover.bottom
-        v-b-popover.manual.bottom="{ id: tab.id, content: popoverNote, html: true }"
-        :class="classes"
-        :href="withPrefix(tab.url)"
-        :target="tab.target || '_parent'"
-        :link-classes="linkClasses"
-        :title="tab.tooltip"
-        @click="open(tab, $event)">
-        <template v-if="tab.icon">
+        :id="id"
+        v-b-tooltip.noninteractive.hover.bottom
+        :href="withPrefix(url)"
+        :target="target || '_parent'"
+        :link-classes="{ 'nav-icon': !!icon, toggle: toggle }"
+        :title="tooltip"
+        @click.prevent="$emit('click')">
+        <template v-if="icon">
             <!-- If this is an icon-based tab, inject tooltip directly for screen readers -->
-            <span class="sr-only">{{ tab.tooltip || tab.id }}</span>
-            <span :class="iconClasses" />
+            <span class="sr-only">{{ tooltip || id }}</span>
+            <span :class="`fa fa-fw ${icon}`" />
             <span v-if="toggle" class="nav-note fa fa-check" />
         </template>
         <template v-else>
-            {{ tab.title }}
+            {{ title }}
         </template>
     </BNavItem>
-    <BNavItemDropdown
-        v-else
-        :id="tab.id"
-        ref="dropdown"
-        v-b-tooltip.hover.bottom
-        v-b-popover.manual.bottom="{ id: tab.id, content: popoverNote, html: true }"
-        :class="classes"
-        :text="tab.title"
-        href="#"
-        :title="tab.tooltip"
-        @show="open(tab, $event)">
-        <template v-if="tab.icon" v-slot:button-content>
-            <span class="sr-only">{{ tab.tooltip || tab.id }}</span>
-            <span :class="iconClasses" />
-        </template>
-        <template v-for="(item, idx) in tab.menu">
-            <div v-if="item.divider" :key="`divider-${idx}`" class="dropdown-divider" />
-            <BDropdownItem
-                v-else-if="item.hidden !== true"
-                :key="`item-${idx}`"
-                :href="withPrefix(item.url)"
-                :target="item.target || '_parent'"
-                role="menuitem"
-                title=""
-                :active="item.disabled"
-                :disabled="item.disabled"
-                @click="open(item, $event)">
-                {{ item.title }}
-            </BDropdownItem>
-        </template>
-    </BNavItemDropdown>
 </template>
diff --git a/client/src/components/Masthead/QuotaMeter.test.ts b/client/src/components/Masthead/QuotaMeter.test.ts
index 583543cb38ad..3599cc2d754a 100644
--- a/client/src/components/Masthead/QuotaMeter.test.ts
+++ b/client/src/components/Masthead/QuotaMeter.test.ts
@@ -3,21 +3,28 @@ import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import { getLocalVue } from "tests/jest/helpers";
 
-import { mockFetcher } from "@/api/schema/__mocks__";
 import { useUserStore } from "@/stores/userStore";
 
 import QuotaMeter from "./QuotaMeter.vue";
 
 jest.mock("@/api/schema");
 
+let configValues = { enable_quotas: true };
+
+jest.mock("@/composables/config", () => ({
+    useConfig: jest.fn(() => ({
+        config: { value: { ...configValues } },
+        isConfigLoaded: true,
+    })),
+}));
+
 const localVue = getLocalVue();
 
 async function createQuotaMeterWrapper(config: any, userData: any) {
-    mockFetcher.path("/api/configuration").method("get").mock({ data: config });
+    configValues = { ...config };
     const pinia = createTestingPinia();
     const userStore = useUserStore();
     userStore.currentUser = { ...userStore.currentUser, ...userData };
-
     const wrapper = mount(QuotaMeter, {
         localVue,
         pinia,
@@ -31,52 +38,36 @@ describe("QuotaMeter.vue", () => {
         const user = {
             total_disk_usage: 5120,
             quota_percent: 50,
+            quota: "100 MB",
         };
-
         const config = { enable_quotas: true };
         const wrapper = await createQuotaMeterWrapper(config, user);
-
-        expect(wrapper.find(".quota-progress > span").text()).toBe("Using 50%");
+        expect(wrapper.find(".quota-progress > span").text()).toBe("Using 50% of 100 MB");
     });
 
     it("changes appearance depending on usage", async () => {
         const config = { enable_quotas: true };
-
         {
             const user = { quota_percent: 30 };
             const wrapper = await createQuotaMeterWrapper(config, user);
-
             expect(wrapper.find(".quota-progress .progress-bar").classes()).toContain("bg-success");
         }
-
         {
             const user = { quota_percent: 80 };
             const wrapper = await createQuotaMeterWrapper(config, user);
-
             expect(wrapper.find(".quota-progress .progress-bar").classes()).toContain("bg-warning");
         }
-
         {
             const user = { quota_percent: 95 };
             const wrapper = await createQuotaMeterWrapper(config, user);
-
             expect(wrapper.find(".quota-progress .progress-bar").classes()).toContain("bg-danger");
         }
     });
 
-    it("prompts user to log in", async () => {
+    it("displays tooltip", async () => {
         const config = { enable_quotas: true };
         const wrapper = await createQuotaMeterWrapper(config, {});
-
-        expect(wrapper.find(".quota-meter > a").attributes("title")).toContain("Log in");
-    });
-
-    it("shows total usage in title", async () => {
-        const user = { total_disk_usage: 9216 };
-        const config = { enable_quotas: true };
-        const wrapper = await createQuotaMeterWrapper(config, user);
-
-        expect(wrapper.find(".quota-progress").attributes("title")).toContain("9 KB");
+        expect(wrapper.attributes("title")).toContain("Storage");
     });
 
     it("shows total usage when there is no quota", async () => {
@@ -84,22 +75,16 @@ describe("QuotaMeter.vue", () => {
             const user = { total_disk_usage: 7168 };
             const config = { enable_quotas: false };
             const wrapper = await createQuotaMeterWrapper(config, user);
-
-            expect(wrapper.find(".quota-text > a").text()).toBe("Using 7 KB");
-            expect(wrapper.find(".quota-text > a").attributes("title")).not.toContain("7 KB");
+            expect(wrapper.find("span").text()).toBe("Using 7 KB");
         }
-
         {
             const user = {
                 total_disk_usage: 21504,
                 quota: "unlimited",
             };
-
             const config = { enable_quotas: true };
             const wrapper = await createQuotaMeterWrapper(config, user);
-
-            expect(wrapper.find(".quota-text > a").text()).toBe("Using 21 KB");
-            expect(wrapper.find(".quota-text > a").attributes("title")).not.toContain("21 KB");
+            expect(wrapper.find("span").text()).toBe("Using 21 KB");
         }
     });
 });
diff --git a/client/src/components/Masthead/QuotaMeter.vue b/client/src/components/Masthead/QuotaMeter.vue
index c2ddf28525c1..fe6ad9e1fcff 100644
--- a/client/src/components/Masthead/QuotaMeter.vue
+++ b/client/src/components/Masthead/QuotaMeter.vue
@@ -1,114 +1,77 @@
-<template>
-    <div>
-        <div v-if="!hasQuota" class="quota-text d-flex align-items-center">
-            <b-link
-                v-b-tooltip.hover.left
-                to="/storage"
-                :disabled="isAnonymous"
-                class="ml-auto"
-                :title="title"
-                data-description="storage dashboard link">
-                {{ usingString + " " + totalUsageString }}
-            </b-link>
-        </div>
-        <div v-else class="quota-meter d-flex align-items-center">
-            <b-link
-                v-b-tooltip.hover.left
-                class="quota-progress"
-                :disabled="isAnonymous"
-                to="/storage"
-                :title="title"
-                data-description="storage dashboard link">
-                <b-progress :max="100">
-                    <b-progress-bar aria-label="Quota usage" :value="usage" :variant="variant" />
-                </b-progress>
-                <span>{{ usingString + " " + usage.toFixed(0) }}%</span>
-            </b-link>
-        </div>
-    </div>
-</template>
+<script setup lang="ts">
+import { BLink, BProgress, BProgressBar } from "bootstrap-vue";
+import { storeToRefs } from "pinia";
+import { computed } from "vue";
 
-<script>
-import { mapState } from "pinia";
-import { bytesToString } from "utils/utils";
-
-import { useConfigStore } from "@/stores/configurationStore";
+import { useConfig } from "@/composables/config";
 import { useUserStore } from "@/stores/userStore";
+import { bytesToString } from "@/utils/utils";
+
+const { config } = useConfig();
+const { currentUser, isAnonymous } = storeToRefs(useUserStore());
+
+const hasQuota = computed(() => {
+    const quotasEnabled = config.value.enable_quotas ?? false;
+    const quotaLimited = currentUser.value?.quota !== "unlimited" ?? false;
+    return quotasEnabled && quotaLimited;
+});
 
-export default {
-    name: "QuotaMeter",
-    data() {
-        return {
-            usingString: this.l("Using"),
-        };
-    },
-    computed: {
-        ...mapState(useConfigStore, ["config"]),
-        ...mapState(useUserStore, ["currentUser", "isAnonymous"]),
-        hasQuota() {
-            const quotasEnabled = this.config?.enable_quotas ?? false;
-            const quotaLimited = this.currentUser?.quota !== "unlimited" ?? false;
+const quotaLimit = computed(() => currentUser.value?.quota ?? 0);
 
-            return quotasEnabled && quotaLimited;
-        },
-        usage() {
-            if (this.hasQuota) {
-                return this.currentUser?.quota_percent ?? 0;
-            } else {
-                return this.currentUser?.total_disk_usage ?? 0;
-            }
-        },
-        totalUsageString() {
-            const total = this.currentUser?.total_disk_usage ?? 0;
-            return bytesToString(total, true);
-        },
-        title() {
-            let details = "";
-            if (this.isAnonymous) {
-                details = this.l("Log in for details.");
-            } else {
-                details = this.l("Click for details.");
-            }
+const totalUsageString = computed(() => {
+    const total = currentUser.value?.total_disk_usage ?? 0;
+    return bytesToString(total, true);
+});
 
-            if (this.hasQuota) {
-                return this.usingString + " " + this.totalUsageString + ". " + details;
-            } else {
-                return details;
-            }
-        },
-        variant() {
-            if (!this.hasQuota || this.usage < 80) {
-                return "success";
-            } else if (this.usage < 95) {
-                return "warning";
-            } else {
-                return "danger";
-            }
-        },
-    },
-};
+const usage = computed(() => {
+    if (hasQuota.value) {
+        return currentUser.value?.quota_percent ?? 0;
+    }
+    return currentUser.value?.total_disk_usage ?? 0;
+});
+
+const quotaLink = computed(() => (isAnonymous.value ? "/login/start" : "/storage"));
+
+const quotaTitle = computed(() =>
+    isAnonymous.value ? "Login to Access Storage Details" : "Storage and Usage Details"
+);
+
+const variant = computed(() => {
+    if (!hasQuota.value || usage.value < 80) {
+        return "success";
+    } else if (usage.value < 95) {
+        return "warning";
+    }
+    return "danger";
+});
 </script>
 
+<template>
+    <div v-b-tooltip.hover.bottom class="quota-meter d-flex align-items-center" :title="quotaTitle">
+        <BLink class="quota-progress" :to="quotaLink" data-description="storage dashboard link">
+            <BProgress :max="100">
+                <BProgressBar aria-label="Quota usage" :value="usage" :variant="variant" />
+            </BProgress>
+            <span>
+                <span v-localize>Using</span>
+                <span v-if="hasQuota">
+                    <span>{{ usage.toFixed(0) }}%</span>
+                    <span v-if="quotaLimit !== 0">of {{ quotaLimit }}</span>
+                </span>
+                <span v-else>{{ totalUsageString }}</span>
+            </span>
+        </BLink>
+    </div>
+</template>
+
 <style lang="scss" scoped>
-.quote-container {
+.quota-meter {
     position: relative;
     height: 100%;
+    margin-left: 0.5rem;
     margin-right: 0.5rem;
-}
-.quota-text {
-    @extend .quote-container;
-    background: var(--masthead-link-color);
-    padding-right: 0.5rem;
-    padding-left: 0.5rem;
-    a {
-        color: var(--masthead-text-color);
-        text-decoration: none;
-    }
-}
-.quota-meter {
-    @extend .quote-container;
     .quota-progress {
-        width: 100px;
+        width: 12rem;
         height: 1.4em;
         position: relative;
         & > * {
@@ -116,8 +79,6 @@ export default {
             width: 100%;
             height: 100%;
             text-align: center;
-        }
-        & > span {
             line-height: 1.4em;
             pointer-events: none;
         }
diff --git a/client/src/components/Panels/SettingsPanel.vue b/client/src/components/Panels/SettingsPanel.vue
index b48829721792..10d38496bd2a 100644
--- a/client/src/components/Panels/SettingsPanel.vue
+++ b/client/src/components/Panels/SettingsPanel.vue
@@ -13,9 +13,8 @@ function onQuery(newQuery: string) {
 </script>
 
 <template>
-    <ActivityPanel title="Settings" go-to-all-title="User Preferences" href="/user">
+    <ActivityPanel title="Additional Activities">
         <template v-slot:header>
-            <h3>Customize Activity Bar</h3>
             <DelayedInput :delay="100" placeholder="Search activities" @change="onQuery" />
         </template>
         <ActivitySettings :query="query" />
diff --git a/client/src/composables/useActivityAction.ts b/client/src/composables/useActivityAction.ts
new file mode 100644
index 000000000000..3dc1babc7f84
--- /dev/null
+++ b/client/src/composables/useActivityAction.ts
@@ -0,0 +1,21 @@
+import { useRouter } from "vue-router/composables";
+
+import { type Activity } from "@/stores/activityStore";
+import { useUserStore } from "@/stores/userStore";
+
+export function useActivityAction() {
+    const router = useRouter();
+    const userStore = useUserStore();
+    const executeActivity = (activity: Activity) => {
+        if (activity.panel) {
+            userStore.toggleSideBar(activity.id);
+        }
+        if (activity.to) {
+            router.push(activity.to);
+        }
+    };
+
+    return {
+        executeActivity,
+    };
+}
diff --git a/client/src/entry/analysis/App.vue b/client/src/entry/analysis/App.vue
index 9e178c8ad225..f87013e6cf45 100644
--- a/client/src/entry/analysis/App.vue
+++ b/client/src/entry/analysis/App.vue
@@ -10,9 +10,7 @@
                     :logo-url="config.logo_url"
                     :logo-src="theme?.['--masthead-logo-img'] ?? config.logo_src"
                     :logo-src-secondary="theme?.['--masthead-logo-img-secondary'] ?? config.logo_src_secondary"
-                    :tabs="tabs"
-                    :window-tab="windowTab"
-                    @open-url="openUrl" />
+                    :window-tab="windowTab" />
                 <Alert
                     v-if="config.message_box_visible && config.message_box_content"
                     id="messagebox"
@@ -55,12 +53,10 @@ import Toast from "components/Toast";
 import { setConfirmDialogComponentRef } from "composables/confirmDialog";
 import { setGlobalUploadModal } from "composables/globalUploadModal";
 import { setToastComponentRef } from "composables/toast";
-import { fetchMenu } from "entry/analysis/menu";
 import { WindowManager } from "layout/window-manager";
 import Modal from "mvc/ui/ui-modal";
 import { getAppRoot } from "onload";
 import { storeToRefs } from "pinia";
-import { withPrefix } from "utils/redirect";
 import { ref, watch } from "vue";
 
 import short from "@/components/plugins/short";
@@ -134,9 +130,6 @@ export default {
         };
     },
     computed: {
-        tabs() {
-            return fetchMenu(this.config);
-        },
         showMasthead() {
             const masthead = this.$route.query.hide_masthead;
             if (masthead !== undefined) {
@@ -199,18 +192,6 @@ export default {
             const notificationsStore = useNotificationsStore();
             notificationsStore.startWatchingNotifications();
         },
-        openUrl(urlObj) {
-            if (!urlObj.target) {
-                this.$router.push(urlObj.url);
-            } else {
-                const url = withPrefix(urlObj.url);
-                if (urlObj.target == "_blank") {
-                    window.open(url);
-                } else {
-                    window.location = url;
-                }
-            }
-        },
     },
 };
 </script>
diff --git a/client/src/entry/analysis/menu.js b/client/src/entry/analysis/menu.js
deleted file mode 100644
index ec1de4f190af..000000000000
--- a/client/src/entry/analysis/menu.js
+++ /dev/null
@@ -1,255 +0,0 @@
-import { getGalaxyInstance } from "app";
-import _l from "utils/localization";
-import { userLogout } from "utils/logout";
-
-import { useUserStore } from "@/stores/userStore";
-
-export function fetchMenu(options = {}) {
-    const Galaxy = getGalaxyInstance();
-    const menu = [];
-    //
-    // Analyze data tab.
-    //
-    menu.push({
-        id: "analysis",
-        url: "/",
-        tooltip: _l("Tools and Current History"),
-        icon: "fa-home",
-        target: "_top",
-    });
-
-    //
-    // Workflow tab.
-    //
-    menu.push({
-        id: "workflow",
-        title: _l("Workflow"),
-        tooltip: _l("Chain tools into workflows"),
-        disabled: !Galaxy.user.id,
-        url: "/workflows/list",
-    });
-
-    //
-    // Visualization tab.
-    //
-    if (Galaxy.config.visualizations_visible) {
-        menu.push({
-            id: "visualization",
-            title: _l("Visualize"),
-            tooltip: _l("Visualize datasets"),
-            disabled: !Galaxy.user.id,
-            url: "/visualizations",
-        });
-    }
-
-    //
-    // 'Data' tab.
-    //
-    if (Galaxy.user.id) {
-        menu.push({
-            id: "resources",
-            title: _l("Data"),
-            url: "javascript:void(0)",
-            tooltip: _l("Access resources"),
-            menu: [
-                {
-                    title: _l("Data Libraries"),
-                    url: "/libraries",
-                },
-                {
-                    title: _l("Datasets"),
-                    url: "/datasets/list",
-                },
-                {
-                    title: _l("Histories"),
-                    url: "/histories/list",
-                },
-                {
-                    title: _l("Pages"),
-                    url: "/pages/list",
-                },
-                {
-                    title: _l("Visualizations"),
-                    url: "/visualizations/list",
-                },
-                {
-                    title: _l("Workflows"),
-                    url: "/workflows/list",
-                },
-                {
-                    title: _l("Workflow Invocations"),
-                    url: "/workflows/invocations",
-                },
-            ],
-        });
-    } else {
-        menu.push({
-            id: "resources",
-            title: _l("Data"),
-            url: "javascript:void(0)",
-            tooltip: _l("Access published resources"),
-            menu: [
-                {
-                    title: _l("Data Libraries"),
-                    url: "/libraries",
-                },
-                {
-                    title: _l("Histories"),
-                    url: "/histories/list_published",
-                },
-                {
-                    title: _l("Pages"),
-                    url: "/pages/list_published",
-                },
-                {
-                    title: _l("Visualizations"),
-                    url: "/visualizations/list_published",
-                },
-                {
-                    title: _l("Workflows"),
-                    url: "/workflows/list_published",
-                },
-            ],
-        });
-    }
-
-    //
-    // Admin.
-    //
-    if (Galaxy.user.get("is_admin")) {
-        menu.push({
-            id: "admin",
-            title: _l("Admin"),
-            url: "/admin",
-            tooltip: _l("Administer this Galaxy"),
-            cls: "admin-only",
-            onclick: () => {
-                const userStore = useUserStore();
-                userStore.toggleSideBar("admin");
-            },
-        });
-    }
-
-    //
-    // Help tab.
-    //
-    const helpTab = {
-        id: "help",
-        title: _l("Help"),
-        url: "javascript:void(0)",
-        tooltip: _l("Support, contact, and community"),
-        menu: [
-            {
-                title: _l("Galaxy Help"),
-                url: options.helpsite_url,
-                target: "_blank",
-                hidden: !options.helpsite_url,
-            },
-            {
-                title: _l("Support"),
-                url: options.support_url,
-                target: "_blank",
-                hidden: !options.support_url,
-            },
-            {
-                title: _l("Videos"),
-                url: options.screencasts_url,
-                target: "_blank",
-                hidden: !options.screencasts_url,
-            },
-            {
-                title: _l("Community Hub"),
-                url: options.wiki_url,
-                target: "_blank",
-                hidden: !options.wiki_url,
-            },
-            {
-                title: _l("How to Cite Galaxy"),
-                url: options.citation_url,
-                target: "_blank",
-            },
-            {
-                title: _l("Interactive Tours"),
-                url: "/tours",
-            },
-            {
-                title: _l("About"),
-                url: "/about",
-            },
-            {
-                title: _l("Terms and Conditions"),
-                url: options.terms_url,
-                target: "_blank",
-                hidden: !options.terms_url,
-            },
-        ],
-    };
-    menu.push(helpTab);
-
-    //
-    // User tab.
-    //
-    let userTab = {};
-    if (!Galaxy.user.id) {
-        if (options.allow_user_creation) {
-            userTab = {
-                id: "user",
-                title: _l("Log in or Register"),
-                cls: "loggedout-only",
-                url: "/login",
-                tooltip: _l("Log in or register a new account"),
-                target: "_top",
-            };
-        } else {
-            userTab = {
-                id: "user",
-                title: _l("Login"),
-                cls: "loggedout-only",
-                tooltip: _l("Login"),
-                url: "/login",
-                target: "_top",
-            };
-        }
-    } else {
-        userTab = {
-            id: "user",
-            title: _l("User"),
-            cls: "loggedin-only",
-            url: "javascript:void(0)",
-            tooltip: _l("Account and saved data"),
-            menu: [
-                {
-                    title: `${_l("Signed in as")} ${
-                        Galaxy.user.get("username") ? Galaxy.user.get("username") : Galaxy.user.get("email")
-                    }`,
-                    disabled: true,
-                },
-                { divider: true },
-            ],
-        };
-        if (Galaxy.config.interactivetools_enable) {
-            userTab.menu.push({
-                title: _l("Active Interactive Tools"),
-                url: "/interactivetool_entry_points/list",
-            });
-        }
-        if (Galaxy.config.enable_notification_system) {
-            userTab.menu.push({
-                title: _l("Notifications"),
-                url: "/user/notifications",
-            });
-        }
-        userTab.menu.push({ divider: true });
-        userTab.menu.push({
-            title: _l("Preferences"),
-            url: "/user",
-        });
-        userTab.menu.push({
-            title: _l("Sign Out"),
-            onclick: userLogout,
-            hidden: Galaxy.config.single_user,
-        });
-    }
-    menu.push(userTab);
-    return menu;
-}
diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js
index 9615f6e299d2..43a38292efa2 100644
--- a/client/src/entry/analysis/router.js
+++ b/client/src/entry/analysis/router.js
@@ -88,10 +88,14 @@ Vue.use(VueRouter);
 patchRouterPush(VueRouter);
 
 // redirect anon users
-function redirectAnon() {
+function redirectAnon(redirect = "") {
     const Galaxy = getGalaxyInstance();
     if (!Galaxy.user || !Galaxy.user.id) {
-        return "/login/start";
+        if (redirect !== "") {
+            return redirect;
+        } else {
+            return "/login/start";
+        }
     }
 }
 
@@ -313,7 +317,7 @@ export function getRouter(Galaxy) {
                         props: {
                             activeList: "my",
                         },
-                        redirect: redirectAnon(),
+                        redirect: redirectAnon("/histories/list_published"),
                     },
                     {
                         path: "histories/list_shared",
@@ -446,7 +450,7 @@ export function getRouter(Galaxy) {
                         props: {
                             activeList: "my",
                         },
-                        redirect: redirectAnon(),
+                        redirect: redirectAnon("/pages/list_published"),
                     },
                     {
                         path: "pages/list_published",
@@ -628,7 +632,7 @@ export function getRouter(Galaxy) {
                     {
                         path: "workflows/list",
                         component: WorkflowList,
-                        redirect: redirectAnon(),
+                        redirect: redirectAnon("/workflows/list_published"),
                     },
                     {
                         path: "workflows/list_published",
diff --git a/client/src/stores/activitySetup.ts b/client/src/stores/activitySetup.ts
index 2e8bf5b1c26e..724921368c9a 100644
--- a/client/src/stores/activitySetup.ts
+++ b/client/src/stores/activitySetup.ts
@@ -7,11 +7,12 @@ import { type EventData } from "@/stores/eventStore";
 export const Activities = [
     {
         anonymous: false,
-        description: "Displays currently active interactive tools (ITs), if these are enabled by the administrator.",
+        description: "Displays currently running interactive tools (ITs), if these are enabled by the administrator.",
         icon: "fa-laptop",
         id: "interactivetools",
         mutable: false,
         optional: false,
+        panel: false,
         title: "Interactive Tools",
         tooltip: "Show active interactive tools",
         to: "/interactivetool_entry_points/list",
@@ -24,6 +25,7 @@ export const Activities = [
         id: "upload",
         mutable: false,
         optional: false,
+        panel: false,
         title: "Upload",
         to: null,
         tooltip: "Download from URL or upload files from disk",
@@ -36,18 +38,20 @@ export const Activities = [
         id: "tools",
         mutable: false,
         optional: false,
+        panel: true,
         title: "Tools",
         to: null,
         tooltip: "Search and run tools",
         visible: true,
     },
     {
-        anonymous: false,
+        anonymous: true,
         description: "Displays a panel to search and access workflows.",
         icon: "sitemap",
         id: "workflows",
         mutable: false,
         optional: true,
+        panel: false,
         title: "Workflows",
         to: "/workflows/list",
         tooltip: "Search and run workflows",
@@ -60,30 +64,33 @@ export const Activities = [
         id: "invocation",
         mutable: false,
         optional: true,
+        panel: true,
         title: "Workflow Invocations",
         tooltip: "Show all workflow runs",
         to: null,
         visible: true,
     },
     {
-        anonymous: false,
+        anonymous: true,
         description: "Displays the list of available visualizations.",
         icon: "chart-bar",
         id: "visualizations",
         mutable: false,
         optional: true,
+        panel: true,
         title: "Visualization",
         to: null,
         tooltip: "Visualize datasets",
         visible: true,
     },
     {
-        anonymous: false,
+        anonymous: true,
         description: "Displays the list of all histories.",
         icon: "fa-hdd",
         id: "histories",
         mutable: false,
         optional: true,
+        panel: false,
         title: "Histories",
         tooltip: "Show all histories",
         to: "/histories/list",
@@ -96,6 +103,7 @@ export const Activities = [
         id: "multiview",
         mutable: false,
         optional: true,
+        panel: true,
         title: "History Multiview",
         tooltip: "Select histories to show in History Multiview",
         to: "/histories/view_multiple",
@@ -108,18 +116,20 @@ export const Activities = [
         id: "datasets",
         mutable: false,
         optional: true,
+        panel: false,
         title: "Datasets",
         tooltip: "Show all datasets",
         to: "/datasets/list",
         visible: true,
     },
     {
-        anonymous: false,
+        anonymous: true,
         description: "Display and create new Pages.",
         icon: "fa-file-contract",
         id: "pages",
         mutable: false,
         optional: true,
+        panel: false,
         title: "Pages",
         tooltip: "Show all pages",
         to: "/pages/list",
@@ -136,6 +146,7 @@ export function convertDropData(data: EventData): Activity | null {
             id: `dataset-${data.id}`,
             mutable: true,
             optional: true,
+            panel: false,
             title: data.name as string,
             tooltip: "View your dataset",
             to: `/datasets/${data.id}/preview`,
@@ -150,6 +161,7 @@ export function convertDropData(data: EventData): Activity | null {
             id: `workflow-${data.id}`,
             mutable: true,
             optional: true,
+            panel: false,
             title: data.name as string,
             tooltip: data.name as string,
             to: `/workflows/run?id=${data.id}`,
diff --git a/client/src/stores/activityStore.test.ts b/client/src/stores/activityStore.test.ts
index 95f71bba9cd2..e5fee99c70ea 100644
--- a/client/src/stores/activityStore.test.ts
+++ b/client/src/stores/activityStore.test.ts
@@ -12,6 +12,7 @@ jest.mock("./activitySetup", () => ({
             id: "a-id",
             mutable: false,
             optional: false,
+            panel: true,
             title: "a-title",
             to: null,
             tooltip: "a-tooltip",
@@ -28,6 +29,7 @@ const newActivities = [
         id: "a-id",
         mutable: false,
         optional: false,
+        panel: true,
         title: "a-title",
         to: "a-to-new",
         tooltip: "a-tooltip-new",
@@ -40,6 +42,7 @@ const newActivities = [
         id: "b-id",
         mutable: true,
         optional: false,
+        panel: true,
         title: "b-title-new",
         to: "b-to-new",
         tooltip: "b-tooltip-new",
diff --git a/client/src/stores/activityStore.ts b/client/src/stores/activityStore.ts
index c7435f2ad10a..ed99ec67b2f7 100644
--- a/client/src/stores/activityStore.ts
+++ b/client/src/stores/activityStore.ts
@@ -22,6 +22,8 @@ export interface Activity {
     mutable: boolean;
     // indicate wether this activity can be disabled by the user
     optional: boolean;
+    // specifiy wether this activity utilizes the side panel
+    panel: boolean;
     // title to be displayed in the activity bar
     title: string;
     // route to be executed upon selecting the activity
diff --git a/client/src/style/scss/theme/blue.scss b/client/src/style/scss/theme/blue.scss
index 24c9f4972e8a..bd34431a210b 100644
--- a/client/src/style/scss/theme/blue.scss
+++ b/client/src/style/scss/theme/blue.scss
@@ -110,7 +110,7 @@ $input-color-placeholder: $text-muted;
 $body-bg: $white;
 
 // Masthead
-$masthead-height: 3rem;
+$masthead-height: 2.5rem;
 
 // Side panels
 $panel-bg-color: $brand-light;
diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index 7ff2b7b344e7..1408646dbda8 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -9,9 +9,11 @@
 _:  # global stuff
 
   selectors:
+    center_panel: '#center'
     editable_text: '.editable-text'
     tooltip_balloon: '.tooltip'
     tooltip_inner: .tooltip-inner
+    left_panel: '#left'
     left_panel_drag: '.flex-panel.left .drag-handle'
     left_panel_collapse: '.collapse-button.left'
     right_panel_drag: '.flex-panel.right .drag-handle'
@@ -38,46 +40,29 @@ masthead:
   selectors:
     _: '#masthead'
 
-    # bootstrap-vue a tag doesn't work as link target, need to hit span inside
-    user: '#user.loggedin-only > a.nav-link.dropdown-toggle > span'
-    register_or_login: '#user.loggedout-only > .nav-link'
-
-    user_menu: '#user .dropdown-menu a'
-    workflow: '#workflow .nav-link'
-
-    username:
-      type: xpath
-      selector: '//a[contains(text(), "Signed in as")]'
-
+    help: '#help'
+    home: '#analysis'
+    libraries: '#library'
+    login: '#user'
+    logout: '.dropdown-menu > li > a > .fa-sign-out-alt'
     logged_in_only: '.loggedin-only'
     logged_out_only: '.loggedout-only'
+    preferences: '.dropdown-menu > li > a > .fa-gear'
+    register_or_login: '#user.loggedout-only > .nav-link'
     storage_dashboard_link:
       selector: 'storage dashboard link'
       type: data-description
-
-  labels:
-    # top-level menus
-    admin: 'Admin'
-    analyze: 'Analyze Data'
-    data: 'Data'
-    help: 'Help'
-    user: 'User'
-    visualization: 'Visualization'
-    workflow: 'Workflow'
-
-    # user menu
-    logout: 'Sign Out'
-    preferences: 'Preferences'
-
-    # data menu
-    libraries: 'Data Libraries'
-    histories: 'Histories'
-    invocations: 'Workflow Invocations'
-    pages: 'Pages'
-    workflows: 'Workflows'
+    user: '#user.loggedin-only > a.nav-link > .fa'
+    username:
+      type: xpath
+      selector: '//a[contains(text(), "Signed in as")]'
+    window_manager: '#enable-window-manager'
+    workflow: '#workflow .nav-link'
 
 preferences:
   selectors:
+    activity: "#activity-settings"
+    activity_expand: ".activity-panel-footer"
     sign_out: "#edit-preferences-sign-out"
     change_password: "#edit-preferences-password"
     manage_information: '#edit-preferences-information'
@@ -457,6 +442,7 @@ collection_builders:
 
 histories:
   selectors:
+    activity: '#activity-histories'
     advanced_search_toggle: '#histories-grid [data-description="toggle advanced search"]'
     advanced_search_name_input: '#histories-advanced-filter-name'
     advanced_search_tag_area: '#histories-advanced-filter-tag .stateless-tags button'
@@ -532,6 +518,7 @@ history_import:
 
 pages:
   selectors:
+    activity: "#activity-pages"
     create: '#page-create'
     submit: '#submit'
     create_title_input: '#form-element-title input'
@@ -600,6 +587,7 @@ tool_form:
 
 workflows:
   selectors:
+    activity: '#activity-workflows'
     shared_with_me_tab: '#shared-with-me'
     published_tab: '#published a'
     new_button: '#workflow-create'
@@ -650,6 +638,7 @@ workflows:
 visualization:
   selectors:
     _: '#center div.plugin-list'
+    activity: '#activity-visualizations'
     plugin_item: '[data-plugin-name*="${id}"]'
 
 trs_search:
@@ -855,6 +844,8 @@ workflow_show:
 
 invocations:
   selectors:
+    activity: "#activity-invocation"
+    activity_expand: ".activity-panel-footer"
     invocations_table: '#invocations-grid .grid-table'
     invocations_table_rows: '#invocations-grid .grid-table [data-description="grid item"]'
     pager: '[data-description="grid pager"]'
@@ -900,6 +891,15 @@ tour:
       next: '${_} .tour-next'
       end: '${_} .tour-end'
 
+tools:
+  selectors:
+    activity: '#activity-tools'
+    body: '#center #tool-card-body'
+    execute: '#execute'
+    help: 'div.form-help'
+    search: '.search-query'
+    title: '.toolSectionTitle'
+
 admin:
   allowlist:
     selectors:
@@ -1128,6 +1128,7 @@ upload:
     source_button: '#upload-row-${n} .upload-source'
     start: '#activity-upload'
     start_button: '#btn-start'
+    local_button: '#btn-local'
 
 new_user_welcome:
   selectors:
diff --git a/config/plugins/tours/core.galaxy_ui.yaml b/config/plugins/tours/core.galaxy_ui.yaml
index 8cdbed21d4a1..6eb0a7961701 100644
--- a/config/plugins/tours/core.galaxy_ui.yaml
+++ b/config/plugins/tours/core.galaxy_ui.yaml
@@ -22,16 +22,16 @@ steps:
       postclick: true
 
     - title: "Upload your data"
-      element: "#btn-local"
+      component: upload.local_button
       intro: "You can upload data from your computer."
 
     - title: "Upload your data"
-      element: "#btn-new"
+      component: upload.create_button
       intro: "Copy and paste data directly into Galaxy or include URLs that lead to your data"
       preclick: true
 
     - title: "Insert URLs"
-      element: ".upload-text-content"
+      component: upload.paste_content(n=0)
       intro: "URLs separated by a line break are automatically downloaded by Galaxy."
       textinsert: |
         https://raw.githubusercontent.com/bgruening/galaxytools/adf077b912ddebd97b07b947b855cdd2862ed8ef/tools/augustus/test-data/human_augustus.fa
@@ -49,15 +49,15 @@ steps:
       postclick: true
 
     - title: "Tools"
-      element: "#left"
+      component: _.left_panel
       intro: "This is your ToolBox. All tools available in your Galaxy instance you can find here."
 
     - title: "Tool categories"
-      element: '.toolSectionTitle'
+      component: tools.title
       intro: "Tools are grouped into categories to make them easier to find."
 
     - title: "Tool search bar"
-      element: '.search-query'
+      component: tools.search
       intro: "You can search for tools by keywords."
       textinsert: 'filter'
 
@@ -67,26 +67,26 @@ steps:
       postclick: true
 
     - title: "Filter Tool"
-      element: '#center'
+      component: _.center_panel
       intro: "Your tool is loaded into the main Galaxy page and ready for use."
 
     - title: "Tool parameters"
-      element: '#center #tool-card-body'
+      component: tools.body
       intro: "Here you can choose your tool parameters. Select your input dataset from your history and specify parameters for your analysis."
 
     - title: "Tool help"
-      element: 'div.form-help'
+      component: tools.help
       intro: "Every Galaxy tool has a help section with detailed information about the tool and its parameters.
               Have a look and study your tool in depth by reading it."
 
     - title: "Run your tool"
-      element: '#execute'
+      component: tools.execute
       intro: "Click on 'Execute' to run your tool and send it to the compute cluster.
               Don't be afraid to test different settings in parallel. Galaxy can handle multiple runs of the same tool."
       postclick: true
 
     - title: "History"
-      element: "#current-history-panel"
+      component: history_panel
       intro: "This is your Galaxy history! All analysis steps with results of the tools and their parameters will be recorded here and can be redone at any time.<br>
               A running tool is shown in yellow and if your calculation is done, it turns green. If your dataset is
               grey this means you are queued and need to wait until your tool can be started. If your dataset turns into red, an error has occurred. Please report the bug to the Galaxy team with the bug report button."
@@ -117,37 +117,34 @@ steps:
       element: "#current-history-panel div.content-item .rerun-btn"
       intro: "By clicking the reload button, you can re-run your tool again (e.g. with different parameters or on another dataset)."
 
-    - title: "Top panel"
-      element: "#masthead"
-      intro: "The top panel will give you access to a lot of useful things."
-
     - title: "Analyze data"
+      component: masthead.home
       element: "#analysis"
       intro: "This is the current view. Start your <b>Analysis</b> from here."
 
+    - title: "Data Libraries"
+      component: masthead.libraries
+      intro: "Get access to source data."
+
     - title: "Workflow"
-      element: "#workflow"
+      component: workflows.activity
       intro: "Create, manage, import, export and share your <b>Workflows</b>."
-
-    - title: "Data"
-      element: "#resources"
-      intro: "Get access to all <b>Workflows</b>, <b>Histories</b>, <b>Pages</b> and <b>Visualizations</b>."
-
+    
     - title: "Visualization"
-      element: "#visualization"
+      component: visualization.activity
       intro: "Galaxy offers a lot of visualizations to review your data!"
 
     - title: "Help"
-      element: "#help"
+      component: masthead.help
       intro: "Here you get more help from the Galaxy <b>Community</b> with Videos, a QA board and more tours."
 
-    - title: "User Preferences"
-      element: "#user"
-      intro: "Login and start your analysis!"
-
     - title: "Window Manager"
-      element: "#enable-window-manager"
+      component: masthead.window_manager
       intro: "Window Manager offers you multiple visualizations next to each other. Have a look at our Window Manager tour to learn more about it."
 
+    - title: "Login"
+      component: masthead.login
+      intro: "Login and start your analysis!"
+
     - title: "Enjoy Galaxy"
       intro: "Thanks for taking this tour! Happy research with Galaxy!"
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index cfb53b38bf7c..4fefd36a282a 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -785,31 +785,6 @@ def register(self, email=None, password=None, username=None, confirm=None, asser
         elif assert_valid:
             self.wait_for_logged_in()
 
-            # Code below previously was needed because there was a bug that would prevent the masthead from changing,
-            # the bug seems maybe to be fixed though - so we could consider eliminating these extra checks to speed
-            # up tests.
-            self.home()
-            self.wait_for_logged_in()
-            self.click_masthead_user()
-            # Make sure the user menu was dropped down
-            user_menu = self.components.masthead.user_menu.wait_for_visible()
-            try:
-                username_element = self.components.masthead.username.wait_for_visible()
-            except SeleniumTimeoutException as e:
-                menu_items = user_menu.find_elements(By.CSS_SELECTOR, "li a")
-                menu_text = [mi.text for mi in menu_items]
-                message = f"Failed to find logged in message in menu items {', '.join(menu_text)}"
-                raise self.prepend_timeout_message(e, message)
-
-            text = username_element.text
-            assert username in text
-            user_object = self.get_logged_in_user()
-            assert user_object and "email" in user_object
-            assert user_object["email"] == email
-
-            # clicking away no longer closes menu post Masthead -> VueJS
-            self.click_masthead_user()
-
     def wait_for_logged_in(self):
         try:
             self.components.masthead.logged_in_only.wait_for_visible()
@@ -1262,47 +1237,41 @@ def workflow_editor_click_save(self):
 
     def navigate_to_histories_page(self):
         self.home()
-        self.click_masthead_data()
-        self.components.masthead.histories.wait_for_and_click()
+        self.components.histories.activity.wait_for_and_click()
         self.components.histories.histories.wait_for_present()
 
     def navigate_to_histories_shared_with_me_page(self):
         self.home()
-        self.click_masthead_data()
-        self.components.masthead.histories.wait_for_and_click()
+        self.components.histories.activity.wait_for_and_click()
         self.components.shared_histories.tab.wait_for_and_click()
 
     def navigate_to_user_preferences(self):
         self.home()
-        self.click_masthead_user()
+        self.components.masthead.user.wait_for_and_click()
         self.components.masthead.preferences.wait_for_and_click()
 
     def navigate_to_invocations(self):
         self.home()
-        self.click_masthead_data()
-        self.components.masthead.invocations.wait_for_and_click()
+        self.components.invocations.activity.wait_for_and_click()
+        self.components.invocations.activity_expand.wait_for_and_click()
 
     def navigate_to_pages(self):
         self.home()
-        self.click_masthead_data()
-        self.components.masthead.pages.wait_for_and_click()
+        self.components.pages.activity.wait_for_and_click()
 
     def navigate_to_published_workflows(self):
         self.home()
-        self.click_masthead_data()
-        self.components.masthead.workflows.wait_for_and_click()
+        self.components.workflows.activity.wait_for_and_click()
         self.components.workflows.published_tab.wait_for_and_click()
 
     def navigate_to_published_histories(self):
         self.home()
-        self.click_masthead_data()
-        self.components.masthead.histories.wait_for_and_click()
+        self.components.histories.activity.wait_for_and_click()
         self.components.published_histories.tab.wait_for_and_click()
 
-    def navigate_to_published_pages(self):
+    def navigate_to_tools(self):
         self.home()
-        self.click_masthead_data()
-        self.components.masthead.pages.wait_for_and_click()
+        self.components.tools.activity.wait_for_and_click()
 
     def admin_open(self):
         self.components.admin.activity.wait_for_and_click()
@@ -1354,7 +1323,6 @@ def create_new_library(self):
 
     def libraries_open(self):
         self.home()
-        self.click_masthead_data()
         self.components.masthead.libraries.wait_for_and_click()
         self.components.libraries.selector.wait_for_visible()
 
@@ -1478,7 +1446,7 @@ def pages_index_table_elements(self):
 
     def workflow_index_open(self):
         self.home()
-        self.click_masthead_workflow()
+        self.click_activity_workflow()
 
     def workflow_shared_with_me_open(self):
         self.workflow_index_open()
@@ -1738,14 +1706,8 @@ def tool_form_generate_tour(self):
     def tool_form_execute(self):
         self.components.tool_form.execute.wait_for_and_click()
 
-    def click_masthead_user(self):
-        self.components.masthead.user.wait_for_and_click()
-
-    def click_masthead_data(self):
-        self.components.masthead.data.wait_for_and_click()
-
-    def click_masthead_workflow(self):
-        self.components.masthead.workflow.wait_for_and_click()
+    def click_activity_workflow(self):
+        self.components.workflows.activity.wait_for_and_click()
 
     def click_button_new_workflow(self):
         self.wait_for_and_click(self.navigation.workflows.selectors.new_button)
@@ -2027,7 +1989,7 @@ def logout_if_needed(self):
 
     def logout(self):
         self.components.masthead.logged_in_only.wait_for_visible()
-        self.click_masthead_user()
+        self.components.masthead.user.wait_for_and_click()
         self.components.masthead.logout.wait_for_and_click()
         try:
             self.components.masthead.logged_out_only.wait_for_visible()
diff --git a/lib/galaxy_test/selenium/test_change_password.py b/lib/galaxy_test/selenium/test_change_password.py
index 7b8aae510509..8ab3e9f8e311 100644
--- a/lib/galaxy_test/selenium/test_change_password.py
+++ b/lib/galaxy_test/selenium/test_change_password.py
@@ -10,8 +10,7 @@ def test_change_password(self):
         self.home()
         email = self._get_random_email()
         self.register(email)
-        self.click_masthead_user()
-        self.components.masthead.preferences.wait_for_and_click()
+        self.navigate_to_user_preferences()
         self.components.preferences.change_password.wait_for_and_click()
         new_password = self._get_random_password()
         self.fill_input_fields(self.default_password, new_password, new_password)
@@ -57,8 +56,7 @@ def test_new_password_same_password(self):
     def register_and_change_password(self):
         self.home()
         self.register()
-        self.click_masthead_user()
-        self.components.masthead.preferences.wait_for_and_click()
+        self.navigate_to_user_preferences()
         self.components.preferences.change_password.wait_for_and_click()
 
     def fill_input_fields(self, current, password, confirm):
diff --git a/lib/galaxy_test/selenium/test_published_pages.py b/lib/galaxy_test/selenium/test_published_pages.py
index d8813f323ba1..c73495dd588f 100644
--- a/lib/galaxy_test/selenium/test_published_pages.py
+++ b/lib/galaxy_test/selenium/test_published_pages.py
@@ -7,7 +7,7 @@
 class TestPublishedPagesGrid(SharedStateSeleniumTestCase):
     @selenium_test
     def test_index(self):
-        self.navigate_to_published_pages()
+        self.navigate_to_pages()
         assert len(self.get_grid_entry_names("#pages-published-grid")) == 2
 
     def setup_shared_state(self):
diff --git a/lib/galaxy_test/selenium/test_sign_out.py b/lib/galaxy_test/selenium/test_sign_out.py
index 2b3a715b386e..c08ed95761d5 100644
--- a/lib/galaxy_test/selenium/test_sign_out.py
+++ b/lib/galaxy_test/selenium/test_sign_out.py
@@ -11,8 +11,7 @@ class TestSignOut(SeleniumTestCase):
     def test_sign_out(self):
         email = self._get_random_email()
         self.register(email)
-        self.click_masthead_user()
-        self.components.masthead.preferences.wait_for_and_click()
+        self.navigate_to_user_preferences()
         self.components.preferences.sign_out.wait_for_and_click()
         self.components.sign_out.cancel_button.wait_for_and_click()
         assert self.is_logged_in()
diff --git a/lib/galaxy_test/selenium/test_workflow_editor.py b/lib/galaxy_test/selenium/test_workflow_editor.py
index 7aefe2ef269d..be5433ef3f18 100644
--- a/lib/galaxy_test/selenium/test_workflow_editor.py
+++ b/lib/galaxy_test/selenium/test_workflow_editor.py
@@ -899,22 +899,18 @@ def assert_workflow_bookmarked_status(target_status):
             assert status == target_status
 
         new_workflow_name = self.workflow_create_new(clear_placeholder=True)
+        self.components.workflow_editor.canvas_body.wait_for_visible()
+        self.wait_for_selector_absent_or_hidden(self.modal_body_selector())
 
         # Assert workflow not initially bookmarked.
+        self.navigate_to_tools()
         assert_workflow_bookmarked_status(False)
 
-        self.components.workflow_editor.canvas_body.wait_for_visible()
-        self.wait_for_selector_absent_or_hidden(self.modal_body_selector())
-        self.components.masthead.workflow.wait_for_and_click()
-
-        self.sleep_for(self.wait_types.UX_RENDER)
+        self.click_activity_workflow()
         self.components.workflows.bookmark_link(action="add").wait_for_and_click()
-        self.components.masthead.workflow.wait_for_and_click()
-        self.sleep_for(self.wait_types.UX_TRANSITION)
 
         # search for bookmark in tools menu
-        self.components.tool_panel.search.wait_for_and_send_keys(new_workflow_name)
-        self.sleep_for(self.wait_types.UX_RENDER)
+        self.navigate_to_tools()
         assert_workflow_bookmarked_status(True)
 
     def tab_to(self, accessible_name, direction="forward"):
diff --git a/test/integration_selenium/test_objectstore_selection.py b/test/integration_selenium/test_objectstore_selection.py
index 85be2f937430..aa7f28b0118d 100644
--- a/test/integration_selenium/test_objectstore_selection.py
+++ b/test/integration_selenium/test_objectstore_selection.py
@@ -136,7 +136,6 @@ def test_3_user_un_override(self):
         preferences = self.components.preferences
         preferences.preferred_storage.wait_for_and_click()
         self.select_storage("__null__")
-
         self.run_environment_test_tool()
         self.wait_for_hid_ok_and_open_details(1)
         details = self.components.object_store_details
diff --git a/test/integration_selenium/test_user_file_source_aws_public.py b/test/integration_selenium/test_user_file_source_aws_public.py
index 668d022b97f0..5ec2ba12d64d 100644
--- a/test/integration_selenium/test_user_file_source_aws_public.py
+++ b/test/integration_selenium/test_user_file_source_aws_public.py
@@ -15,7 +15,6 @@ class TestUserFileSourceAwsPublicSeleniumIntegration(BaseUserObjectStoreSelenium
     @managed_history
     @selenium_test
     def test_create_and_use(self):
-        self.navigate_to_user_preferences()
         random_name = self._get_random_name(prefix="Encyclopedia of DNA Elements ENCODE")
         instance = FileSourceInstance(
             template_id="aws_public",