diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json
index c776cb34c8..1eb4089c4b 100644
--- a/docs/en/docs-nav.json
+++ b/docs/en/docs-nav.json
@@ -21,6 +21,31 @@
         }
       ]
     },
+    {
+      "text": "Startup Templates",
+      "items": [
+        {
+          "text": "Overall",
+          "path": "Startup-Templates/Index.md"
+        },
+        {
+          "text": "Application",
+          "path": "Startup-Templates/Application.md"
+        },
+        {
+          "text": "Module",
+          "path": "Startup-Templates/Module.md"
+        },
+        {
+          "text": "Console",
+          "path": "Startup-Templates/Console.md"
+        },
+        {
+          "text": "WPF",
+          "path": "Startup-Templates/WPF.md"
+        }
+      ]
+    },
     {
       "text": "Tutorials",
       "items": [
@@ -68,6 +93,10 @@
               "path": "Tutorials/Part-10.md"
             }
           ]
+        },
+        {
+          "text": "Community Articles",
+          "path": "https://community.abp.io/"
         }
       ]
     },
@@ -98,23 +127,6 @@
         }
       ]
     },
-    {
-      "text": "CLI",
-      "path": "CLI.md"
-    },
-    {
-      "text": "Authentication & Security",
-      "items": [
-        {
-          "text": "Social/External Logins",
-          "path": "Authentication/Social-External-Logins.md"
-        },
-        {
-          "text": "CSRF/XSRF & Anti Forgery",
-          "path": "CSRF-Anti-Forgery.md"
-        }
-      ]
-    },
     {
       "text": "Fundamentals",
       "items": [
@@ -136,10 +148,6 @@
             }
           ]
         },
-        {
-          "text": "Virtual File System",
-          "path": "Virtual-File-System.md"
-        },
         {
           "text": "Localization",
           "path": "Localization.md"
@@ -176,21 +184,13 @@
           "text": "Logging",
           "path": "Logging.md"
         },
-        {
-          "text": "Audit Logging",
-          "path": "Audit-Logging.md"
-        },
         {
           "text": "Settings",
           "path": "Settings.md"
         },
         {
-          "text": "Features",
-          "path": "Features.md"
-        },
-        {
-          "text": "Data Filtering",
-          "path": "Data-Filtering.md"
+          "text": "Connection Strings",
+          "path": "Connection-Strings.md"
         },
         {
           "text": "Object Extensions",
@@ -199,39 +199,91 @@
       ]
     },
     {
-      "text": "Event Bus",
+      "text": "Infrastructure",
       "items": [
         {
-          "text": "Overall",
-          "path": "Event-Bus.md"
+          "text": "Background Jobs",
+          "path": "Background-Jobs.md",
+          "items": [
+            {
+              "text": "Hangfire Integration",
+              "path": "Background-Jobs-Hangfire.md"
+            },
+            {
+              "text": "RabbitMQ Integration",
+              "path": "Background-Jobs-RabbitMq.md"
+            },
+            {
+              "text": "Quartz Integration",
+              "path": "Background-Jobs-Quartz.md"
+            }
+          ]
         },
         {
-          "text": "Local Event Bus",
-          "path": "Local-Event-Bus.md"
+          "text": "Background Workers",
+          "path": "Background-Workers.md",
+          "items": [
+            {
+              "text": "Quartz Integration",
+              "path": "Background-Workers-Quartz.md"
+            }
+          ]
         },
         {
-          "text": "Distributed Event Bus",
-          "path": "Distributed-Event-Bus.md",
+          "text": "Event Bus",
           "items": [
             {
-              "text": "RabbitMQ Integration",
-              "path": "Distributed-Event-Bus-RabbitMQ-Integration.md"
+              "text": "Overall",
+              "path": "Event-Bus.md"
             },
             {
-              "text": "Kafka Integration",
-              "path": "Distributed-Event-Bus-Kafka-Integration.md"
+              "text": "Local Event Bus",
+              "path": "Local-Event-Bus.md"
             },
             {
-              "text": "Rebus Integration",
-              "path": "Distributed-Event-Bus-Rebus-Integration.md"
+              "text": "Distributed Event Bus",
+              "path": "Distributed-Event-Bus.md",
+              "items": [
+                {
+                  "text": "RabbitMQ Integration",
+                  "path": "Distributed-Event-Bus-RabbitMQ-Integration.md"
+                },
+                {
+                  "text": "Kafka Integration",
+                  "path": "Distributed-Event-Bus-Kafka-Integration.md"
+                },
+                {
+                  "text": "Rebus Integration",
+                  "path": "Distributed-Event-Bus-Rebus-Integration.md"
+                }
+              ]
             }
           ]
-        }
-      ]
-    },
-    {
-      "text": "Services",
-      "items": [
+        },
+        {
+          "text": "Data Seeding",
+          "path": "Data-Seeding.md"
+        },
+        {
+          "text": "Virtual File System",
+          "path": "Virtual-File-System.md"
+        },
+        {
+          "text": "CSRF/XSRF & Anti Forgery",
+          "path": "CSRF-Anti-Forgery.md"
+        },
+        {
+          "text": "Audit Logging",
+          "path": "Audit-Logging.md"
+        },
+        {
+          "text": "Features",
+          "path": "Features.md"
+        },
+        {
+          "text": "Data Filtering",
+          "path": "Data-Filtering.md"
+        },
         {
           "text": "Current User",
           "path": "CurrentUser.md"
@@ -310,77 +362,86 @@
       ]
     },
     {
-      "text": "Multi Tenancy",
-      "path": "Multi-Tenancy.md"
-    },
-    {
-      "text": "Module Development",
+      "text": "Architecture",
       "items": [
         {
-          "text": "Basics",
-          "path": "Module-Development-Basics.md"
-        },
-        {
-          "text": "Plug-In Modules"
-        },
-        {
-          "text": "Best Practices",
-          "path": "Best-Practices/Index.md"
-        }
-      ]
-    },
-    {
-      "text": "Domain Driven Design",
-      "items": [
-        {
-          "text": "Overall",
-          "path": "Domain-Driven-Design.md"
-        },
-        {
-          "text": "Domain Layer",
+          "text": "Modularity",
           "items": [
             {
-              "text": "Entities & Aggregate Roots",
-              "path": "Entities.md"
-            },
-            {
-              "text": "Value Objects",
-              "path": "Value-Objects.md"
-            },
-            {
-              "text": "Repositories",
-              "path": "Repositories.md"
+              "text": "Basics",
+              "path": "Module-Development-Basics.md"
             },
             {
-              "text": "Domain Services",
-              "path": "Domain-Services.md"
+              "text": "Plug-In Modules"
             },
             {
-              "text": "Specifications",
-              "path": "Specifications.md"
+              "text": "Best Practices",
+              "path": "Best-Practices/Index.md"
             }
           ]
         },
         {
-          "text": "Application Layer",
+          "text": "Domain Driven Design",
           "items": [
             {
-              "text": "Application Services",
-              "path": "Application-Services.md"
+              "text": "Overall",
+              "path": "Domain-Driven-Design.md"
+            },
+            {
+              "text": "Domain Layer",
+              "items": [
+                {
+                  "text": "Entities & Aggregate Roots",
+                  "path": "Entities.md"
+                },
+                {
+                  "text": "Value Objects",
+                  "path": "Value-Objects.md"
+                },
+                {
+                  "text": "Repositories",
+                  "path": "Repositories.md"
+                },
+                {
+                  "text": "Domain Services",
+                  "path": "Domain-Services.md"
+                },
+                {
+                  "text": "Specifications",
+                  "path": "Specifications.md"
+                }
+              ]
             },
             {
-              "text": "Data Transfer Objects",
-              "path": "Data-Transfer-Objects.md"
+              "text": "Application Layer",
+              "items": [
+                {
+                  "text": "Application Services",
+                  "path": "Application-Services.md"
+                },
+                {
+                  "text": "Data Transfer Objects",
+                  "path": "Data-Transfer-Objects.md"
+                },
+                {
+                  "text": "Unit Of Work",
+                  "path": "Unit-Of-Work.md"
+                }
+              ]
             },
             {
-              "text": "Unit Of Work",
-              "path": "Unit-Of-Work.md"
+              "text": "Guide: Implementing DDD",
+              "path": "Domain-Driven-Design-Implementation-Guide.md"
             }
           ]
         },
         {
-          "text": "Guide: Implementing DDD",
-          "path": "Domain-Driven-Design-Implementation-Guide.md"
+          "text": "Multi Tenancy",
+          "path": "Multi-Tenancy.md"
+        },
+        {
+          "text": "Microservices",
+          "path": "Microservice-Architecture.md"
         }
       ]
     },
@@ -784,57 +845,44 @@
           "path": "Data-Access.md"
         },
         {
-          "text": "Connection Strings",
-          "path": "Connection-Strings.md"
-        },
-        {
-          "text": "Database Providers",
+          "text": "Entity Framework Core",
+          "path": "Entity-Framework-Core.md",
           "items": [
             {
-              "text": "Entity Framework Core",
-              "path": "Entity-Framework-Core.md",
+              "text": "Database Migrations",
+              "path": "Entity-Framework-Core-Migrations.md"
+            },
+            {
+              "text": "Switch DBMS",
+              "path": "Entity-Framework-Core-Other-DBMS.md",
               "items": [
                 {
-                  "text": "Database Migrations",
-                  "path": "Entity-Framework-Core-Migrations.md"
-                },
-                {
-                  "text": "Switch DBMS",
-                  "path": "Entity-Framework-Core-Other-DBMS.md",
-                  "items": [
-                    {
-                      "text": "To MySQL",
-                      "path": "Entity-Framework-Core-MySQL.md"
-                    },
-                    {
-                      "text": "To PostgreSQL",
-                      "path": "Entity-Framework-Core-PostgreSQL.md"
-                    },
-                    {
-                      "text": "To Oracle",
-                      "path": "Entity-Framework-Core-Oracle.md"
-                    },
-                    {
-                      "text": "To SQLite",
-                      "path": "Entity-Framework-Core-SQLite.md"
-                    }
-                  ]
+                  "text": "To MySQL",
+                  "path": "Entity-Framework-Core-MySQL.md"
+                },
+                {
+                  "text": "To PostgreSQL",
+                  "path": "Entity-Framework-Core-PostgreSQL.md"
+                },
+                {
+                  "text": "To Oracle",
+                  "path": "Entity-Framework-Core-Oracle.md"
+                },
+                {
+                  "text": "To SQLite",
+                  "path": "Entity-Framework-Core-SQLite.md"
                 }
               ]
-            },
-            {
-              "text": "MongoDB",
-              "path": "MongoDB.md"
-            },
-            {
-              "text": "Dapper",
-              "path": "Dapper.md"
             }
           ]
         },
         {
-          "text": "Data Seeding",
-          "path": "Data-Seeding.md"
+          "text": "MongoDB",
+          "path": "MongoDB.md"
+        },
+        {
+          "text": "Dapper",
+          "path": "Dapper.md"
         }
       ]
     },
@@ -848,115 +896,67 @@
       ]
     },
     {
-      "text": "Background",
+      "text": "Testing",
+      "path": "Testing.md"
+    },
+    {
+      "text": "Samples",
       "items": [
         {
-          "text": "Background Jobs",
-          "path": "Background-Jobs.md",
-          "items": [
-            {
-              "text": "Hangfire Integration",
-              "path": "Background-Jobs-Hangfire.md"
-            },
-            {
-              "text": "RabbitMQ Integration",
-              "path": "Background-Jobs-RabbitMq.md"
-            },
-            {
-              "text": "Quartz Integration",
-              "path": "Background-Jobs-Quartz.md"
-            }
-          ]
+          "text": "All Samples",
+          "path": "Samples/Index.md"
         },
         {
-          "text": "Background Workers",
-          "path": "Background-Workers.md",
-          "items": [
-            {
-              "text": "Quartz Integration",
-              "path": "Background-Workers-Quartz.md"
-            }
-          ]
+          "text": "Microservice Demo",
+          "path": "Samples/Microservice-Demo.md"
         }
       ]
     },
     {
-      "text": "Testing",
-      "path": "Testing.md"
+      "text": "Application Modules",
+      "path": "Modules/Index.md"
     },
     {
-      "text": "Startup Templates",
+      "text": "Release Information",
       "items": [
         {
-          "text": "Overall",
-          "path": "Startup-Templates/Index.md"
+          "text": "Upgrading",
+          "path": "Upgrading.md"
         },
         {
-          "text": "Application",
-          "path": "Startup-Templates/Application.md"
+          "text": "Official Packages",
+          "path": "https://abp.io/packages"
         },
         {
-          "text": "Module",
-          "path": "Startup-Templates/Module.md"
+          "text": "Preview Releases",
+          "path": "Previews.md"
         },
         {
-          "text": "Console",
-          "path": "Startup-Templates/Console.md"
+          "text": "Nightly Builds",
+          "path": "Nightly-Builds.md"
         },
         {
-          "text": "WPF",
-          "path": "Startup-Templates/WPF.md"
+          "text": "Road Map",
+          "path": "Road-Map.md"
         }
       ]
     },
     {
-      "text": "Samples",
+      "text": "Reference",
       "items": [
         {
-          "text": "All Samples",
-          "path": "Samples/Index.md"
+          "text": "CLI",
+          "path": "CLI.md"
         },
         {
-          "text": "Microservice Demo",
-          "path": "Samples/Microservice-Demo.md"
+          "text": "API Documentation",
+          "path": "{ApiDocumentationUrl}"
         }
       ]
     },
-    {
-      "text": "Application Modules",
-      "path": "Modules/Index.md"
-    },
-    {
-      "text": "Microservice Architecture",
-      "path": "Microservice-Architecture.md"
-    },
-    {
-      "text": "Preview Releases",
-      "path": "Previews.md"
-    },
-    {
-      "text": "Nightly Builds",
-      "path": "Nightly-Builds.md"
-    },
-    {
-      "text": "Road Map",
-      "path": "Road-Map.md"
-    },
-    {
-      "text": "Upgrading",
-      "path": "Upgrading.md"
-    },
     {
       "text": "Contribution Guide",
       "path": "Contribution/Index.md"
-    },
-    {
-      "text": "API Documentation",
-      "path": "{ApiDocumentationUrl}"
-    },
-    {
-      "text": "Official Packages",
-      "path": "https://abp.io/packages"
     }
   ]
 }