diff --git a/src/components/Navigator.vue b/src/components/Navigator.vue
index bbc069faf..b621472a6 100644
--- a/src/components/Navigator.vue
+++ b/src/components/Navigator.vue
@@ -158,6 +158,7 @@ export default {
         technology: technology.title,
         technologyPath: technology.path || technology.url,
         isTechnologyBeta: technology.beta,
+        isTechnologyDeprecated: technology.deprecated,
       }
     ),
   },
diff --git a/src/components/Navigator/NavigatorCard.vue b/src/components/Navigator/NavigatorCard.vue
index e3a0d2a82..1cb444816 100644
--- a/src/components/Navigator/NavigatorCard.vue
+++ b/src/components/Navigator/NavigatorCard.vue
@@ -32,18 +32,24 @@
         @keydown.up.exact.capture.prevent="focusPrev"
         @keydown.down.exact.capture.prevent="focusNext"
       >
-        <Reference
-          v-if="technology"
-          :id="INDEX_ROOT_KEY"
-          :url="technologyPath"
-          :class="['technology-title', { 'router-link-exact-active': isTechnologyRoute }]"
-          @click.alt.native.prevent="toggleAllNodes"
-        >
-          <h2 class="card-link">
-            {{ technology }}
-          </h2>
-          <Badge v-if="isTechnologyBeta" variant="beta" />
-        </Reference>
+        <slot name="navigator-title" :className="NAVIGATOR_TITLE">
+          <Reference
+            v-if="technology"
+            :id="INDEX_ROOT_KEY"
+            :url="technologyPath"
+            :class="[
+              'technology-title',
+              NAVIGATOR_TITLE,
+              { 'router-link-exact-active': isTechnologyRoute }
+            ]"
+            @click.alt.native.prevent="toggleAllNodes"
+          >
+            <h2 class="card-link">
+              {{ technology }}
+            </h2>
+            <Badge v-if="isTechnologyBeta" variant="beta" />
+          </Reference>
+        </slot>
         <DynamicScroller
           v-show="hasNodes"
           :id="scrollLockID"
@@ -154,6 +160,7 @@ const NO_RESULTS = 'navigator.no-results';
 const NO_CHILDREN = 'navigator.no-children';
 const ERROR_FETCHING = 'navigator.error-fetching';
 const ITEMS_FOUND = 'navigator.items-found';
+const NAVIGATOR_TITLE = 'navigator-title';
 
 /**
  * Renders the card for a technology and it's child symbols, in the navigator.
@@ -244,6 +251,7 @@ export default {
       lastFocusTarget: null,
       allNodesToggled: false,
       INDEX_ROOT_KEY,
+      NAVIGATOR_TITLE,
     };
   },
   computed: {
@@ -1013,26 +1021,31 @@ $navigator-card-vertical-spacing: 8px !default;
   }
 }
 
-.technology-title {
+:deep(.navigator-title) {
   @include safe-area-left-set(margin-left, var(--card-horizontal-spacing));
   @include safe-area-right-set(margin-right, var(--card-horizontal-spacing));
+  white-space: nowrap;
   padding: $navigator-card-vertical-spacing $nav-card-horizontal-spacing;
   padding-left: $nav-card-horizontal-spacing * 2;
+  @include font-styles(label-reduced);
+  font-weight: $font-weight-semibold;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.technology-title {
   background: $technology-title-background;
   border-radius: $nano-border-radius;
   display: flex;
-  white-space: nowrap;
+  color: var(--color-text);
 
-  @include breakpoint(small, nav) {
-    margin-top: 0;
+  .card-link {
+    font-size: inherit;
+    font-weight: inherit
   }
 
-  .card-link {
-    color: var(--color-text);
-    @include font-styles(label-reduced);
-    font-weight: $font-weight-semibold;
-    overflow: hidden;
-    text-overflow: ellipsis;
+  @include breakpoint(small, nav) {
+    margin-top: 0;
   }
 
   &.router-link-exact-active {
@@ -1054,6 +1067,9 @@ $navigator-card-vertical-spacing: 8px !default;
   align-items: flex-end;
 
   .filter-on-top & {
+    // negative margin to bring the filter up
+    // while keeping the height and padding as it is
+    margin-top: calc(#{var(--nav-filter-vertical-padding)} * -1);
     border-top: none;
     align-items: flex-start;
   }
@@ -1063,9 +1079,10 @@ $navigator-card-vertical-spacing: 8px !default;
 
   @include breakpoint(medium, nav) {
     --nav-filter-horizontal-padding: 20px;
+    --nav-filter-vertical-padding: 10px;
     border: none;
-    padding-top: 10px;
-    padding-bottom: 10px;
+    padding-top: var(--nav-filter-vertical-padding);
+    padding-bottom: var(--nav-filter-vertical-padding);
     height: $filter-height-small;
   }
 
@@ -1093,6 +1110,7 @@ $navigator-card-vertical-spacing: 8px !default;
 
 .scroller {
   height: 100%;
+  margin: 0;
   box-sizing: border-box;
   padding-bottom: calc(var(--top-offset, 0px) + var(--card-vertical-spacing));
   transition: padding-bottom ease-in 0.15s;
diff --git a/src/components/Navigator/NavigatorCardItem.vue b/src/components/Navigator/NavigatorCardItem.vue
index c7c950692..49dc849ba 100644
--- a/src/components/Navigator/NavigatorCardItem.vue
+++ b/src/components/Navigator/NavigatorCardItem.vue
@@ -13,7 +13,7 @@
     :class="{ expanded, active: isActive, 'is-group': isGroupMarker }"
     :style="{ '--nesting-index': item.depth }"
     :data-nesting-index="item.depth"
-    :id="`container-${item.uid}`"
+    :id="item.uid ? `container-${item.uid}` : null"
     :aria-hidden="isRendered ? null : 'true'"
     :hideNavigatorIcon="isGroupMarker"
     @keydown.left.native.prevent="handleLeftKeydown"
@@ -75,7 +75,7 @@
         }
       ) }}</span>
       <span
-        v-if="!isParent"
+        v-else-if="item.siblingsCount"
         :id="siblingsLabel"
         hidden
       >
@@ -184,6 +184,10 @@ export default {
       type: Object,
       default: () => ({}),
     },
+    customTag: {
+      type: String,
+      require: false,
+    },
   },
   idState() {
     return {
@@ -193,7 +197,7 @@ export default {
   },
   computed: {
     isGroupMarker: ({ item: { type } }) => type === TopicTypes.groupMarker,
-    isParent: ({ item, isGroupMarker }) => !!item.childUIDs.length && !isGroupMarker,
+    isParent: ({ item, isGroupMarker }) => !!item.childUIDs?.length && !isGroupMarker,
     parentLabel: ({ item }) => `label-parent-${item.uid}`,
     siblingsLabel: ({ item }) => `label-${item.uid}`,
     usageLabel: ({ item }) => `usage-${item.uid}`,
@@ -204,7 +208,11 @@ export default {
     ),
     isBeta: ({ item: { beta } }) => !!beta,
     isDeprecated: ({ item: { deprecated } }) => !!deprecated,
-    refComponent: ({ isGroupMarker }) => (isGroupMarker ? 'h3' : Reference),
+    refComponent: ({ isGroupMarker, customTag }) => {
+      if (customTag) return customTag;
+      if (isGroupMarker) return 'h3';
+      return Reference;
+    },
   },
   methods: {
     toggleTree() {
diff --git a/tests/unit/components/Navigator/NavigatorCard.spec.js b/tests/unit/components/Navigator/NavigatorCard.spec.js
index 8f817a1d7..9cd61b4c9 100644
--- a/tests/unit/components/Navigator/NavigatorCard.spec.js
+++ b/tests/unit/components/Navigator/NavigatorCard.spec.js
@@ -320,6 +320,15 @@ describe('NavigatorCard', () => {
     expect(wrapper.find('.post-head').text()).toBe('CustomPostHead');
   });
 
+  it('exposes a #navigator-title slot', () => {
+    const wrapper = createWrapper({
+      scopedSlots: {
+        'navigator-title': '<div class="navigator-title">CustomNavigatorTitle</div>',
+      },
+    });
+    expect(wrapper.find('.navigator-title').text()).toBe('CustomNavigatorTitle');
+  });
+
   it('exposes a #above-navigator-head slot', () => {
     const wrapper = createWrapper({
       scopedSlots: {
diff --git a/tests/unit/components/Navigator/NavigatorCardItem.spec.js b/tests/unit/components/Navigator/NavigatorCardItem.spec.js
index 817a06396..491d211a6 100644
--- a/tests/unit/components/Navigator/NavigatorCardItem.spec.js
+++ b/tests/unit/components/Navigator/NavigatorCardItem.spec.js
@@ -86,6 +86,16 @@ describe('NavigatorCardItem', () => {
     expect(cardItem.attributes('data-nesting-index')).toBe(String(defaultProps.item.depth));
   });
 
+  it('renders a custom tag for the leaf-link if customTag is defined', () => {
+    const wrapper = createWrapper({
+      propsData: {
+        customTag: 'button',
+      },
+    });
+    const leafLink = wrapper.find('.leaf-link');
+    expect(leafLink.is('button')).toBe(true);
+  });
+
   it('renders the NavigationCardItem with an icon override', () => {
     const navigatorReferences = {
       iconRef: {