diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts
index b79fb82a66..29267ae466 100644
--- a/docs/.vitepress/config.mts
+++ b/docs/.vitepress/config.mts
@@ -11,18 +11,63 @@ export default defineConfig({
       { text: 'Authenticator', link: '/authenticator/index' }
     ],
 
-    sidebar: [
-      {
-        text: 'Examples',
-        items: [
-          { text: 'Markdown Examples', link: '/markdown-examples' },
-          { text: 'Runtime API Examples', link: '/api-examples' }
-        ]
-      }
-    ],
+    sidebar: {
+      '/': sidebarphotos(),
+      '/photos/': sidebarphotos(),
+      '/common/': sidebarphotos(),
+      '/authenticator/': sidebarAuth()
+  },
+
 
     socialLinks: [
       { icon: 'github', link: 'https://github.com/ente-io/' }
     ]
   }
 })
+
+function sidebarphotos() {
+  return [
+    {
+      text: 'Examples',
+      items: [
+        { text: 'Markdown Examples', link: '/markdown-examples' },
+        { text: 'Runtime API Examples', link: '/api-examples' }
+      ]
+    },
+    {
+      text: 'User Guide',
+      items: [
+           {
+              text: 'Features',
+              collapsed: true,
+              // link: '/photos/features/',
+              items: [
+                  { text: 'Archive', link: '/photos/features/archive' },
+                  { text: 'Hidden', link: '/photos/features/hidden' },
+                  { text: 'Family Plan', link: '/photos/features/family-plan' },
+                  { text: 'Map', link: '/photos/features/map' },
+                  { text: 'Location Tags', link: '/photos/features/location' },
+                  { text: 'Collect Photos', link: '/photos/features/collect' },
+                  { text: 'Public link', link: '/photos/features/public-link' },
+                  { text: 'Quick link', link: '/photos/features/quick-link' },
+                  { text: 'Referral Plan', link: '/photos/features/referral' },
+                  { text: 'Live & Motion Photos', link: '/photos/features/live-photos' },
+
+              ]
+          },
+        ]
+    },
+  ]
+}
+
+function sidebarAuth() {
+  return [
+    {
+      text: 'Examples',
+      items: [
+        { text: 'Markdown Examples', link: '/markdown-examples' },
+        { text: 'Runtime API Examples', link: '/api-examples' }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
index b3c304a09c..b07c769708 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -9,10 +9,10 @@ hero:
   actions:
     - theme: brand
       text: Photos
-      link: /markdown-examples
+      link: /photos/
     - theme: brand
       text: Authenticator
-      link: /api-examples
+      link: /authenticator/
 
 features:
   - title: Private
diff --git a/docs/photos/features/archive.md b/docs/photos/features/archive.md
new file mode 100644
index 0000000000..6f1aebb64a
--- /dev/null
+++ b/docs/photos/features/archive.md
@@ -0,0 +1 @@
+# Archive
\ No newline at end of file
diff --git a/docs/photos/features/collect.md b/docs/photos/features/collect.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/photos/features/family-plan.md b/docs/photos/features/family-plan.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/photos/features/hidden.md b/docs/photos/features/hidden.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/photos/features/live-photos.md b/docs/photos/features/live-photos.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/photos/features/location.md b/docs/photos/features/location.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/photos/features/map.md b/docs/photos/features/map.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/photos/features/public-link.md b/docs/photos/features/public-link.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/photos/features/quick-link.md b/docs/photos/features/quick-link.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docs/photos/features/referral.md b/docs/photos/features/referral.md
new file mode 100644
index 0000000000..e69de29bb2