diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json
index 7c8f19d830..401f6f7aa5 100644
--- a/docs/en/docs-nav.json
+++ b/docs/en/docs-nav.json
@@ -1844,8 +1844,87 @@
         },
         {
           "text": "Layered Solution",
+          "isLazyExpandable": true,
           "path": "solution-templates/layered-web-application",
           "items": [
+            {
+              "text": "Overview",
+              "path": "solution-templates/layered-web-application/overview.md"
+            },
+            {
+              "text": "Solution Structure",
+              "path": "solution-templates/layered-web-application/solution-structure.md"
+            },
+            {
+              "text": "Main Components",
+              "isLazyExpandable": true,
+              "path": "solution-templates/layered-web-application/main-components.md",
+              "items": [
+                {
+                  "text": "Web Applications",
+                  "path": "solution-templates/layered-web-application/web-applications.md"
+                },
+                {
+                  "text": "Db Migrator",
+                  "path": "solution-templates/layered-web-application/db-migrator.md"
+                },
+                {
+                  "text": "Mobile Applications",
+                  "path": "solution-templates/layered-web-application/mobile-applications.md"
+                }
+              ]
+            },
+            {
+              "text": "Built-In Features",
+              "isLazyExpandable": true,
+              "path": "solution-templates/layered-web-application/built-in-features.md",
+              "items": [
+                {
+                  "text": "Authentication",
+                  "path": "solution-templates/layered-web-application/authentication.md"
+                },
+                {
+                  "text": "Database configurations",
+                  "path": "solution-templates/layered-web-application/database-configurations.md"
+                },
+                {
+                  "text": "Logging (with Serilog)",
+                  "path": "solution-templates/layered-web-application/logging.md"
+                },
+                {
+                  "text": "Swagger integration",
+                  "path": "solution-templates/layered-web-application/swagger-integration.md"
+                },
+                {
+                  "text": "Background Jobs",
+                  "path": "solution-templates/layered-web-application/background-jobs.md"
+                },
+                {
+                  "text": "Background Workers",
+                  "path": "solution-templates/layered-web-application/background-workers.md"
+                },
+                {
+                  "text": "Distributed Locking",
+                  "path": "solution-templates/layered-web-application/distributed-locking.md"
+                },
+                {
+                  "text": "Multi-Tenancy",
+                  "path": "solution-templates/layered-web-application/multi-tenancy.md"
+                },
+                {
+                  "text": "BLOB Storing",
+                  "path": "solution-templates/layered-web-application/blob-storing.md"
+                },
+                {
+                  "text": "CORS configuration",
+                  "path": "solution-templates/layered-web-application/cors-configuration.md"
+                }
+              ]
+            },
+            {
+              "text": "Helm Charts and Kubernetes",
+              "path": "solution-templates/layered-web-application/helm-charts-and-kubernetes.md"
+            },
             {
               "text": "Deployment",
               "path": "solution-templates/layered-web-application/deployment",
diff --git a/docs/en/tutorials/book-store-with-abp-suite/index.md b/docs/en/tutorials/book-store-with-abp-suite/index.md
index 492d06bc99..4524a1b8f2 100644
--- a/docs/en/tutorials/book-store-with-abp-suite/index.md
+++ b/docs/en/tutorials/book-store-with-abp-suite/index.md
@@ -18,8 +18,8 @@
 
 In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
 
-* **{{DB_Value}}** as the database provider.
-* **{{UI_Value}}** as the UI Framework.
+* **Entity Framework Core** as the database provider.
+* **MVC** as the UI Framework.
 
 This tutorial is organized as the following parts: