diff --git a/src/.vitepress/sidebar/en.js b/src/.vitepress/sidebar/en.js
index 3706b815..652d43e5 100644
--- a/src/.vitepress/sidebar/en.js
+++ b/src/.vitepress/sidebar/en.js
@@ -62,8 +62,9 @@ export default {
       collapsed: true,
       items: [
         { text: 'Overview', link: '/layer/overview/' },
-        { text: 'Widgets', link: '/layer/form-widgets/',
+        { text: 'Widgets',
         items: [
+           { text: 'Form Widgets Gallery', link: '/layer/form-widgets/' },
            { text: 'Text', link: '/layer/text/' },
            { text: 'Date and Time', link: '/layer/date-time/' },
            { text: 'Relations', link: '/layer/relations/' },
@@ -74,22 +75,25 @@ export default {
            { text: 'Photos', link: '/layer/photos/' },
            { text: 'Informational Widgets', link: '/layer/info-widgets/' },
         ] },
-        { text: 'Default Values', link: '/layer/default-values/',
+        { text: 'Default Values',
         collapsed: true,
         items: [
+           { text: 'Default Values Setup', link: '/layer/default-values/' },
            { text: 'Geotagging', link: '/layer/exif/' },
            { text: 'Variables', link: '/layer/variables/' }
         ] },
         { text: 'Constraints', link: '/layer/constraints/' },        
-        { text: 'Layout', link: '/layer/form-layout/',
+        { text: 'Layout',
         collapsed: true,
         items: [
+           { text: 'Attributes Form Layout', link: '/layer/form-layout/' },
            { text: 'Tabs and Groups', link: '/layer/tabs-and-groups/' },
            { text: 'Conditional Visibility', link: '/layer/conditional-visibility/' },
         ] },
-        { text: 'Use Cases', link: '/layer/use-cases/', 
+        { text: 'Use Cases', 
         collapsed: true,
         items: [
+           { text: 'Use Cases Overview', link: '/layer/use-cases/' },
 	   { text: 'How to Open a File', link: '/layer/open-file/' },
 	   { text: 'How to Use Hyperlinks', link: '/layer/external-link/' },
            { text: 'How to Open a Link to a Navigation App', link: '/layer/link-to-navigation/' },
@@ -159,9 +163,10 @@ export default {
       items: [
         { text: 'Licensing', link: '/misc/licensing/' },
         { text: 'Get Involved', link: '/misc/get-involved/' },
-        { text: 'Troubleshoot', link: '/misc/troubleshoot/',
+        { text: 'Troubleshoot',
         collapsed:true,
         items: [
+           { text: 'Support and Troubleshooting', link: '/misc/troubleshoot/' },
            { text: 'Project fails to sync', link: '/misc/troubleshoot/not_syncing/' },
         ] },
         { text: 'Write Documentation', link: '/misc/write-docs/' }
diff --git a/src/layer/default-values/index.md b/src/layer/default-values/index.md
index c7a33d4b..ab33f17d 100644
--- a/src/layer/default-values/index.md
+++ b/src/layer/default-values/index.md
@@ -2,7 +2,7 @@
 description: Default values can be used to automatically fill in the fields in the form using values, variables or expressions.
 ---
 
-# Default values
+# Default Values
 Default values can be used to automatically record, e.g. the name of the surveyor, date and time of the survey, latitude and longitude of a feature or to have frequently used values filled in advance (see <QGISHelp ver="latest" link="user_manual/working_with_vector/vector_properties.html#default-values" text="QGIS documentation" />). 
 
 Fields with default values can be hidden from the attributes form if they are used to store data that are not expected to be modified manually.
diff --git a/src/misc/troubleshoot/index.md b/src/misc/troubleshoot/index.md
index 3a27b1bc..86337c46 100644
--- a/src/misc/troubleshoot/index.md
+++ b/src/misc/troubleshoot/index.md
@@ -2,7 +2,7 @@
 description: Find troubleshooting tips, resources, and support information to help resolve issues with Mergin Maps.
 ---
 
-# Troubleshoot
+# Support and Troubleshooting
 [[toc]]
 
 ## Troubleshooting tips