diff --git a/config/navbar.js b/config/navbar.js
index a222d6ef13..7951302f51 100644
--- a/config/navbar.js
+++ b/config/navbar.js
@@ -40,15 +40,55 @@ const navbar = {
             to: '/general/community/contribute',
             label: 'Community',
             position: 'left',
+            activeBasePath: '/general/community',
         },
         {
-            to: '/general/development/gettingstarted',
+            type: 'docSidebar',
+            position: 'left',
+            sidebarId: 'coding',
             label: 'Coding',
+            docsPluginId: 'general',
+        },
+        {
+            type: 'docSidebar',
+            position: 'left',
+            sidebarId: 'process',
+            label: 'Processes',
+            docsPluginId: 'general',
+        },
+        {
+            type: 'docSidebar',
+            position: 'left',
+            sidebarId: 'moodleapp',
+            label: 'Moodle App',
+            docsPluginId: 'general',
+        },
+        {
+            type: 'docSidebar',
             position: 'left',
+            sidebarId: 'releaseNotes',
+            label: 'Releases',
+            docsPluginId: 'general',
         },
         {
-            to: '/general/development/process',
-            label: 'Process',
+            type: 'dropdown',
+            label: 'Writing',
+            items: [
+                {
+                    type: 'docSidebar',
+                    // position: 'left',
+                    sidebarId: 'contentguidelines',
+                    label: 'Content guidelines',
+                    docsPluginId: 'general',
+                },
+                {
+                    type: 'docSidebar',
+                    // position: 'left',
+                    sidebarId: 'documentation',
+                    label: 'Documentation',
+                    docsPluginId: 'general',
+                },
+            ],
             position: 'left',
         },
 
diff --git a/sidebars/docs.js b/sidebars/docs.js
index c800a441a2..eb1666468d 100644
--- a/sidebars/docs.js
+++ b/sidebars/docs.js
@@ -49,34 +49,23 @@ const sidebars = {
                 id: 'apis',
             },
         },
-
-        {
-            label: 'Content guidelines',
-            type: 'link',
-            href: '/general/contentguidelines',
-        },
-
         {
             label: 'Developer update',
             type: 'doc',
             id: 'devupdate',
         },
 
-        {
-            label: 'Moodle App',
-            type: 'link',
-            href: '/general/app',
-        },
-
         {
             type: 'html',
             value: '<hr>',
         },
+
         {
-            label: 'Release notes',
+            label: 'Content guidelines',
             type: 'link',
-            href: '/general/releases/4.3',
+            href: '/general/contentguidelines',
         },
+
         {
             label: 'Projects',
             type: 'link',
diff --git a/sidebars/general.js b/sidebars/general.js
index f7aabd6289..21d9b5bd4a 100644
--- a/sidebars/general.js
+++ b/sidebars/general.js
@@ -125,17 +125,8 @@ const sidebars = {
         },
         {
             label: 'Upgrade notes',
-            type: 'category',
-            items: [
-                {
-                    type: 'autogenerated',
-                    dirName: 'development/upgradenotes',
-                },
-            ],
-            link: {
-                type: 'doc',
-                id: 'development/upgradenotes',
-            },
+            type: 'doc',
+            id: 'development/upgradenotes',
         },
     ],