diff --git a/website/sidebars.js b/website/sidebars.js
index 71f3ae7c1..d4fe27591 100644
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -86,8 +86,8 @@ module.exports = {
       'extending/error-handling',
       'extending/testing',
       'extending/debugging',
-      ...FBInternalOnly(['extending/fb/desktop-plugin-releases']),
       ...FBInternalOnly([
+        'extending/fb/desktop-plugin-releases',
         // TODO: Remove once sandy is public T69061061
         'extending/fb/sandy/sandy-plugins',
       ]),
@@ -105,36 +105,57 @@ module.exports = {
   },
   'fb-internal': {
     'FB Internal': FBInternalOnly([
-      'fb/active-linters',
+      'fb/troubleshooting',
       'fb/Add-flipper-to-android-app',
-      'fb/adding-analytics-0',
       'fb/Adding-flipper-to-ios-app',
-      'fb/adding-npm-dependencies-0',
-      'fb/Add-Support-Group-to-Flipper-Support-Form',
-      'fb/android-plugin-development-Android-interacting-0',
-      'fb/android-plugin-development-testing-android-plugins-0',
-      'fb/building-a-linter',
-      'fb/create-new-plugin',
-      'fb/developmentworkflow',
+      'fb/LauncherConfig',
       'fb/Flipper-fbsource-Pinning',
       'fb/Flipper-Release-Cycle',
       'fb/Flipper-Strict-TypeScript',
       'fb/Help-Updating-Flipper',
-      'fb/ios-plugin-development-sending-data-to-an-i-o-s-plugin-0',
-      'fb/ios-plugin-development-testing-i-o-s-plugins-0',
-      'fb/LauncherConfig',
-      'fb/layout-extending-android-layout-inspector',
-      'fb/layout-extending-i-o-s-layout-inspector',
-      'fb/Memory-Tools',
-      'fb/mobile-config',
-      'fb/Navigation-Plugin',
-      'fb/plugins',
-      'fb/sections',
-      'fb/supporting-feed-inspector',
-      'fb/Trace',
-      'fb/troubleshooting',
-      'fb/TypeScript',
-      'fb/using-gatekeepers',
+      {
+        'Internal Plugins': [
+          'fb/plugins',
+          {
+            Layout: [
+              'fb/layout-extending-android-layout-inspector',
+              'fb/layout-extending-ios-layout-inspector',
+            ],
+          },
+          'fb/Memory-Tools',
+          'fb/Navigation-Plugin',
+          'fb/supporting-feed-inspector',
+          'fb/sections',
+          'fb/Trace',
+          'fb/mobile-config',
+        ],
+      },
+      {
+        'Plugin Development': [
+          'fb/create-new-plugin',
+          'fb/developmentworkflow',
+          'fb/TypeScript',
+          'fb/using-gatekeepers',
+          'fb/adding-npm-dependencies-0',
+          'fb/adding-analytics-0',
+          {
+            Android: [
+              'fb/android-plugin-development-Android-interacting-0',
+              'fb/android-plugin-development-testing-android-plugins-0',
+            ],
+          },
+          {
+            iOS: [
+              'fb/ios-plugin-development-sending-data-to-an-ios-plugin-0',
+              'fb/ios-plugin-development-testing-ios-plugins-0',
+            ],
+          },
+          'fb/Add-Support-Group-to-Flipper-Support-Form',
+        ],
+      },
+      {
+        Lints: ['fb/building-a-linter', 'fb/active-linters'],
+      },
       'fb/index',
     ]),
   },