diff --git a/nx-dev/feature-doc-viewer/src/lib/sidebar.tsx b/nx-dev/feature-doc-viewer/src/lib/sidebar.tsx
index f0cffe0b7c..f6a5a333f1 100644
--- a/nx-dev/feature-doc-viewer/src/lib/sidebar.tsx
+++ b/nx-dev/feature-doc-viewer/src/lib/sidebar.tsx
@@ -75,7 +75,7 @@ export function Sidebar({ menu, navIsOpen }: SidebarProps) {
             }))}
             selected={{ label: flavor.name, value: flavor.alias }}
             onChange={(item) =>
-              router.push(
+              !!router.push(
                 createNextPath(version.alias, item.value, router.asPath)
               ) &&
               item.data &&
@@ -89,8 +89,8 @@ export function Sidebar({ menu, navIsOpen }: SidebarProps) {
           data-testid="navigation"
           className="px-1 pt-1 font-medium text-base sm:px-3 xl:px-5 lg:text-sm pb-10 lg:pb-14 sticky?lg:h-(screen-18)"
         >
-          {menu.sections.map((section) => (
-            <SidebarSection key={section.id} section={section} />
+          {menu.sections.map((section, index) => (
+            <SidebarSection key={section.id + '-' + index} section={section} />
           ))}
         </nav>
       </div>
@@ -111,8 +111,8 @@ function SidebarSection({ section }: { section: MenuSection }) {
       )}
       <ul>
         <li className="mt-2">
-          {section.itemList.map((item) => (
-            <SidebarSectionItems key={item.id} item={item} />
+          {section.itemList.map((item, index) => (
+            <SidebarSectionItems key={item.id + '-' + index} item={item} />
           ))}
         </li>
       </ul>
@@ -153,10 +153,13 @@ function SidebarSectionItems({ item }: { item: MenuItem }) {
         )}
       </h5>
       <ul className={cx('mb-6', collapsed ? 'hidden' : '')}>
-        {(item.itemList as MenuItem[]).map((item) => {
+        {(item.itemList as MenuItem[]).map((item, index) => {
           const isActiveLink = item.url === withoutAnchors(router?.asPath);
           return (
-            <li key={item.id} data-testid={`section-li:${item.id}`}>
+            <li
+              key={item.id + '-' + index}
+              data-testid={`section-li:${item.id}`}
+            >
               <Link href={item.url as string}>
                 <a
                   className={cx(
diff --git a/nx-dev/ui/common/src/lib/header.tsx b/nx-dev/ui/common/src/lib/header.tsx
index 43bc8068e8..7b57ffcbb1 100644
--- a/nx-dev/ui/common/src/lib/header.tsx
+++ b/nx-dev/ui/common/src/lib/header.tsx
@@ -24,7 +24,6 @@ export function Header(props: HeaderProps) {
     'version' in props ? props.version : { name: 'Latest', value: 'l' };
   const flavor =
     'flavor' in props ? props.flavor : { name: 'React', value: 'r' };
-
   return (
     <header
       className={cx(
@@ -79,24 +78,12 @@ export function Header(props: HeaderProps) {
         {/*NAVIGATION*/}
         <div className="text-sm flex-shrink-0">
           <nav className="flex items-justified justify-center space-x-1">
-            <Link
-              href={
-                version && flavor
-                  ? `/${version.value}/${flavor.value}/getting-started/intro`
-                  : `/getting-started/intro`
-              }
-            >
+            <Link href="/getting-started/intro">
               <a className="font-bold px-3 py-2 text-white leading-tight">
                 Docs
               </a>
             </Link>
-            <Link
-              href={
-                version && flavor
-                  ? `/${version.value}/${flavor.value}/core-concepts/nx-devkit`
-                  : `/core-concepts/nx-devkit`
-              }
-            >
+            <Link href="/core-concepts/nx-devkit">
               <a className="px-3 py-2 hidden md:inline-flex text-white leading-tight">
                 Plugins
               </a>