diff --git a/docs/faq/product.md b/docs/faq/product.md
index edbb1ffb4d..f09b5696b8 100644
--- a/docs/faq/product.md
+++ b/docs/faq/product.md
@@ -1,6 +1,6 @@
 ---
 id: product
-title: Product FAQ
+title: Non-technical FAQ
 description: Questions related to product and design.
 ---
 
diff --git a/microsite/sidebars.js b/microsite/sidebars.js
index e48e3b7b52..0e3837e5bc 100644
--- a/microsite/sidebars.js
+++ b/microsite/sidebars.js
@@ -4,15 +4,9 @@ module.exports = {
   docs: {
     Overview: [
       'overview/what-is-backstage',
-      'overview/architecture-overview',
-      'overview/roadmap',
-      'overview/vision',
       'overview/background',
-      'overview/adopting',
-      'overview/versioning-policy',
-      'overview/threat-model',
-      'overview/support',
-      'overview/logos',
+      'overview/vision',
+      'overview/roadmap',
     ],
     'Getting Started': [
       'getting-started/index',
@@ -46,6 +40,7 @@ module.exports = {
           'getting-started/create-a-component',
         ],
       },
+      'overview/support',
       'getting-started/keeping-backstage-updated',
     ],
     'Core Features': [
@@ -301,6 +296,7 @@ module.exports = {
     ],
     Plugins: [
       'plugins/index',
+      'overview/architecture-overview',
       'plugins/existing-plugins',
       'plugins/create-a-plugin',
       'plugins/plugin-development',
@@ -489,34 +485,40 @@ module.exports = {
         ],
       },
     ],
-    'Designing for Backstage': [
-      'dls/design',
-      'dls/component-design-guidelines',
-      'dls/contributing-to-storybook',
-      'dls/figma',
-    ],
     Tutorials: [
-      'tutorials/quickstart-app-plugin',
-      'tutorials/react-router-stable-migration',
-      'tutorials/react18-migration',
-      'tutorials/package-role-migration',
-      'tutorials/migrating-away-from-core',
-      'tutorials/configuring-plugin-databases',
-      'tutorials/switching-sqlite-postgres',
-      'tutorials/using-backstage-proxy-within-plugin',
-      'tutorials/yarn-migration',
-      'tutorials/migrate-to-mui5',
-      'tutorials/auth-service-migration',
-      'tutorials/enable-public-entry',
-      'tutorials/setup-opentelemetry',
+      { 'Non-technical': ['overview/adopting'] },
+      {
+        Techical: [
+          'tutorials/quickstart-app-plugin',
+          'tutorials/react-router-stable-migration',
+          'tutorials/react18-migration',
+          'tutorials/package-role-migration',
+          'tutorials/migrating-away-from-core',
+          'tutorials/configuring-plugin-databases',
+          'tutorials/switching-sqlite-postgres',
+          'tutorials/using-backstage-proxy-within-plugin',
+          'tutorials/yarn-migration',
+          'tutorials/migrate-to-mui5',
+          'tutorials/auth-service-migration',
+          'tutorials/enable-public-entry',
+          'tutorials/setup-opentelemetry',
+          'accessibility/index'
+        ],
+      },
     ],
-
-    FAQ: ['faq/index', 'faq/product', 'faq/technical'],
-    Accessibility: ['accessibility/index'],
+    FAQ: ['faq/index', 'faq/technical', 'faq/product'],
     Contribute: [
       'contribute/index',
       'contribute/getting-involved',
       'contribute/project-structure',
+      {
+        'Designing for Backstage': [
+          'dls/design',
+          'dls/component-design-guidelines',
+          'dls/contributing-to-storybook',
+          'dls/figma',
+        ],
+      },
     ],
     References: [
       {
@@ -541,10 +543,13 @@ module.exports = {
       },
       'api/deprecations',
       'references/glossary',
+      'overview/threat-model',
       'api/utility-apis',
+      'overview/versioning-policy',
       'reference/index',
     ],
   },
+  Assets: ['overview/logos'],
   releases: {
     'Release Notes': releases.map(release => `releases/${release}`),
   },