diff --git a/docs/docs/guides/guides.md b/docs/docs/docs/docs.md
similarity index 80%
rename from docs/docs/guides/guides.md
rename to docs/docs/docs/docs.md
index 33b5dd6da..ed1a5cd97 100644
--- a/docs/docs/guides/guides.md
+++ b/docs/docs/docs/docs.md
@@ -1,7 +1,6 @@
 ---
 sidebar_position: 1
 title: Getting Started
-slug: /guides
 ---
 
 TODO
\ No newline at end of file
diff --git a/docs/docs/guides/install/linux.md b/docs/docs/docs/install/linux.md
similarity index 100%
rename from docs/docs/guides/install/linux.md
rename to docs/docs/docs/install/linux.md
diff --git a/docs/docs/guides/install/mac.md b/docs/docs/docs/install/mac.md
similarity index 100%
rename from docs/docs/guides/install/mac.md
rename to docs/docs/docs/install/mac.md
diff --git a/docs/docs/guides/install/windows.md b/docs/docs/docs/install/windows.md
similarity index 100%
rename from docs/docs/guides/install/windows.md
rename to docs/docs/docs/install/windows.md
diff --git a/docs/docs/features/features.md b/docs/docs/features/features.md
index b933ad1af..d68e9a7ad 100644
--- a/docs/docs/features/features.md
+++ b/docs/docs/features/features.md
@@ -1,5 +1,3 @@
 ---
-sidebar_position: 1
-title: Overview
-slug: /features
----
+title: Features
+---
\ No newline at end of file
diff --git a/docs/docs/guides/install/install.md b/docs/docs/guides/install/install.md
deleted file mode 100644
index e90afe746..000000000
--- a/docs/docs/guides/install/install.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-sidebar_position: 1
-title: Installing Jan
-slug: /install
----
-
diff --git a/docs/docs/platform/platform.md b/docs/docs/platform/platform.md
new file mode 100644
index 000000000..11531572e
--- /dev/null
+++ b/docs/docs/platform/platform.md
@@ -0,0 +1,5 @@
+---
+sidebar_position: 1
+title: Overview
+slug: /platform
+---
diff --git a/docs/docs/platforms/platform.md b/docs/docs/platforms/platform.md
deleted file mode 100644
index 3daf4f574..000000000
--- a/docs/docs/platforms/platform.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Platform
-slug: /platform
----
\ No newline at end of file
diff --git a/docs/docs/platforms/desktop.md b/docs/docs/products/desktop.md
similarity index 100%
rename from docs/docs/platforms/desktop.md
rename to docs/docs/products/desktop.md
diff --git a/docs/docs/platforms/mobile.md b/docs/docs/products/mobile.md
similarity index 100%
rename from docs/docs/platforms/mobile.md
rename to docs/docs/products/mobile.md
diff --git a/docs/docs/products/products.md b/docs/docs/products/products.md
new file mode 100644
index 000000000..c95072f26
--- /dev/null
+++ b/docs/docs/products/products.md
@@ -0,0 +1,4 @@
+---
+title: Products
+slug: /product
+---
\ No newline at end of file
diff --git a/docs/docs/platforms/server.md b/docs/docs/products/server.md
similarity index 100%
rename from docs/docs/platforms/server.md
rename to docs/docs/products/server.md
diff --git a/docs/docs/solutions/enterprise.md b/docs/docs/solutions/enterprise.md
deleted file mode 100644
index f6636ad50..000000000
--- a/docs/docs/solutions/enterprise.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-title: Enterprise AI Platform
----
\ No newline at end of file
diff --git a/docs/docs/solutions/industries/education.md b/docs/docs/solutions/industries/education.md
new file mode 100644
index 000000000..8f8b9a0a1
--- /dev/null
+++ b/docs/docs/solutions/industries/education.md
@@ -0,0 +1,3 @@
+---
+title: Education
+---
\ No newline at end of file
diff --git a/docs/docs/solutions/industries/finance.md b/docs/docs/solutions/industries/finance.md
new file mode 100644
index 000000000..55663a756
--- /dev/null
+++ b/docs/docs/solutions/industries/finance.md
@@ -0,0 +1,3 @@
+---
+title: Finance
+---
\ No newline at end of file
diff --git a/docs/docs/solutions/industries/healthcare.md b/docs/docs/solutions/industries/healthcare.md
new file mode 100644
index 000000000..368cefa52
--- /dev/null
+++ b/docs/docs/solutions/industries/healthcare.md
@@ -0,0 +1,3 @@
+---
+title: Healthcare
+---
\ No newline at end of file
diff --git a/docs/docs/solutions/industries/law.md b/docs/docs/solutions/industries/law.md
new file mode 100644
index 000000000..772ec3739
--- /dev/null
+++ b/docs/docs/solutions/industries/law.md
@@ -0,0 +1,3 @@
+---
+title: Law
+---
\ No newline at end of file
diff --git a/docs/docs/solutions/industries/public-sector.md b/docs/docs/solutions/industries/public-sector.md
new file mode 100644
index 000000000..aec5dd5be
--- /dev/null
+++ b/docs/docs/solutions/industries/public-sector.md
@@ -0,0 +1,3 @@
+---
+title: Public Sector
+---
\ No newline at end of file
diff --git a/docs/docs/solutions/self-hosted.md b/docs/docs/solutions/self-hosted.md
new file mode 100644
index 000000000..6c6aeb0e5
--- /dev/null
+++ b/docs/docs/solutions/self-hosted.md
@@ -0,0 +1,3 @@
+---
+title: Self-hosted ChatGPT
+---
\ No newline at end of file
diff --git a/docs/docs/solutions/solutions.md b/docs/docs/solutions/solutions.md
index 8ddf76cbb..5cbb047a4 100644
--- a/docs/docs/solutions/solutions.md
+++ b/docs/docs/solutions/solutions.md
@@ -1,4 +1,4 @@
 ---
-title: Solutions
+title: Overview
 slug: /solutions
 ---
\ No newline at end of file
diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
index 7c3136b66..10d32c39e 100644
--- a/docs/docusaurus.config.js
+++ b/docs/docusaurus.config.js
@@ -48,7 +48,6 @@ const config = {
           sidebarPath: require.resolve('./sidebars.js'),
           editUrl:
             'https://github.com/janhq/jan/tree/main/docs',
-          sidebarCollapsed: false,
           showLastUpdateAuthor: true,
           showLastUpdateTime: true,
         },
@@ -109,13 +108,19 @@ const config = {
             type: 'docSidebar',
             sidebarId: 'featuresSidebar',
             position: 'left',
-            label: 'Features',
+            label: 'Platform',
           },
           {
             type: 'docSidebar',
-            sidebarId: 'guidesSidebar',
+            sidebarId: 'solutionsSidebar',
             position: 'left',
-            label: 'Guides',
+            label: 'Use Cases',
+          },
+          {
+            type: 'docSidebar',
+            sidebarId: 'docsSidebar',
+            position: 'left',
+            label: 'Docs',
           },
           {
             type: 'docSidebar',
diff --git a/docs/sidebars.js b/docs/sidebars.js
index a9180dbb4..9265db4bf 100644
--- a/docs/sidebars.js
+++ b/docs/sidebars.js
@@ -20,64 +20,74 @@ const sidebars = {
 
   // But you can create a sidebar manually
   featuresSidebar: [
-    'features/features',
+    'platform/platform',
     {
       type: 'category',
-      label: 'Platforms',
+      label: 'Products',
       collapsible: true,
-      collapsed: true,
-      link: { type: 'doc', id: 'platforms/platform' },
+      collapsed: false,
+      link: { type: 'doc', id: 'products/products' },
       items: [
-        'platforms/desktop',
-        'platforms/mobile',
-        'platforms/server'
+        'products/desktop',
+        'products/mobile',
+        'products/server'
       ]
     },
     {
       type: 'category',
       label: 'Features',
       collapsible: true,
-      collapsed: true,
+      collapsed: false,
+      link: { type: 'doc', id: 'features/features' },
       items: [
         'features/self-hosted',
         'features/acceleration',
+        'features/extensions',
+      ]
+    }
+  ],
+
+  // Note: Tab name is "Use Cases"
+  solutionsSidebar: [
+    'solutions/solutions',
+    {
+      type: 'category',
+      label: 'Use cases',
+      collapsible: true,
+      collapsed: false,
+      items: [
+        'solutions/personal-ai',
+        'solutions/self-hosted'
       ]
     },
     {
       type: 'category',
-      label: 'Solutions',
+      label: 'Industries',
       collapsible: true,
-      collapsed: true,
+      collapsed: false,
       items: [
-        'solutions/personal-ai',
-        'solutions/enterprise'
+        'solutions/industries/public-sector',
+        'solutions/industries/education',
+        'solutions/industries/finance',
+        'solutions/industries/law',
+        'solutions/industries/healthcare',
       ]
-    },
+    }
   ],
 
-  guidesSidebar: [
-    { type: 'doc', label: "Overview", id: 'guides/guides' },
+  docsSidebar: [
+    { type: 'doc', label: "Getting Started", id: 'docs/docs' },
     {
       type: 'category',
       label: 'Install',
       collapsible: true,
-      collapsed: true,
+      collapsed: false,
       items: [
-        { type: 'doc', label: 'Overview', id: 'guides/install/install' },
-        { type: 'doc', label: 'Windows', id: 'guides/install/windows' },
-        { type: 'doc', label: 'Mac', id: 'guides/install/mac' },
-        { type: 'doc', label: 'Linux', id: 'guides/install/linux' },
+        { type: 'doc', label: 'Windows', id: 'docs/install/windows' },
+        { type: 'doc', label: 'Mac', id: 'docs/install/mac' },
+        { type: 'doc', label: 'Linux', id: 'docs/install/linux' },
       ]
-    },
-    {
-      type: 'category',
-      label: 'Running as Server',
-      collapsible: true,
-      collapsed: true,
-      items: [
-        { type: 'doc', label: 'Overview', id: 'guides/install/install' },
-      ]
-    },
+    }
   ]
 };