diff --git a/docs/About/1.md b/docs/1.md
similarity index 99%
rename from docs/About/1.md
rename to docs/1.md
index 59cb09c..06a4a07 100644
--- a/docs/About/1.md
+++ b/docs/1.md
@@ -1,5 +1,6 @@
 ---
 title: Introduction
+slug: /
 ---
 
 Waku (v2) is family of modular peer-to-peer protocols for **secure communication**. The protocols are designed to be secure, privacy-preserving, censorship-resistant and able to run in resource restricted environments.
diff --git a/docs/About/2.md b/docs/2.md
similarity index 93%
rename from docs/About/2.md
rename to docs/2.md
index 6fb09a1..fc75d5e 100644
--- a/docs/About/2.md
+++ b/docs/2.md
@@ -3,7 +3,7 @@ title: History
 ---
 
 Waku v1 was a fork of Whisper with some added tweaks for efficiency.
-Waku v2 is a completely redesigned suite of protocols designed to address the goals set out [previously](./1).
+Waku v2 is a completely redesigned suite of protocols designed to address the goals set out [previously](./1.md).
 
 ### 2013
 
diff --git a/docs/About/3.md b/docs/3.md
similarity index 100%
rename from docs/About/3.md
rename to docs/3.md
diff --git a/docs/About/4.md b/docs/4.md
similarity index 100%
rename from docs/About/4.md
rename to docs/4.md
diff --git a/docs/About/5.md b/docs/5.md
similarity index 100%
rename from docs/About/5.md
rename to docs/5.md
diff --git a/docs/About/6.md b/docs/6.md
similarity index 100%
rename from docs/About/6.md
rename to docs/6.md
diff --git a/docs/About/7.md b/docs/7.md
similarity index 100%
rename from docs/About/7.md
rename to docs/7.md
diff --git a/docusaurus.config.js b/docusaurus.config.js
index 27f069b..0fca86c 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -6,9 +6,9 @@ const darkCodeTheme = require("prism-react-renderer/themes/dracula");
 
 /** @type {import('@docusaurus/types').Config} */
 const config = {
-  title: "Waku guides",
+  title: "Waku Guides",
   tagline: "Waku is the communication layer for Web3.",
-  url: "https://waku.guides",
+  url: "https://waku.guide/",
   baseUrl: "/",
   onBrokenLinks: "throw",
   onBrokenMarkdownLinks: "warn",
@@ -33,11 +33,12 @@ const config = {
       /** @type {import('@docusaurus/preset-classic').Options} */
       ({
         docs: {
+          routeBasePath: '/',
           sidebarPath: require.resolve("./sidebars.js"),
           // Please change this to your repo.
           // Remove this to remove the "edit this page" links.
           editUrl:
-            "https://github.com/facebook/docusaurus/tree/main/packages/create-docusaurus/templates/shared/",
+            "https://github.com/waku-org/waku.guide/tree/staging/",
         },
         theme: {
           customCss: require.resolve("./src/css/custom.css"),
@@ -59,12 +60,6 @@ const config = {
       },
 
       items: [
-        {
-          type: "doc",
-          docId: "About/1",
-          position: "left",
-          label: "About",
-        },
         {
           type: "doc",
           docId: "Concepts/1",
@@ -80,16 +75,16 @@ const config = {
           title: "Community",
           items: [
             {
-              label: "Stack Overflow",
-              href: "https://stackoverflow.com/questions/tagged/docusaurus",
+              label: "Discourse",
+              href: "https://forum.vac.dev/",
             },
             {
               label: "Discord",
-              href: "https://discordapp.com/invite/docusaurus",
+              href: "https://discord.gg/j5pGbn7MHZ",
             },
             {
               label: "Twitter",
-              href: "https://twitter.com/docusaurus",
+              href: "https://twitter.com/waku-org",
             },
           ],
         },
diff --git a/src/pages/index.md b/src/pages/index.md
deleted file mode 100644
index bcc3901..0000000
--- a/src/pages/index.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Waku Guide
----
-
-Home page for waku guide
\ No newline at end of file