diff --git a/docs/setup/edit-terms-privacy-and-contact.md b/docs/configuration/edit-terms-privacy-and-contact.md
similarity index 98%
rename from docs/setup/edit-terms-privacy-and-contact.md
rename to docs/configuration/edit-terms-privacy-and-contact.md
index 6ed4e5e..2173d93 100644
--- a/docs/setup/edit-terms-privacy-and-contact.md
+++ b/docs/configuration/edit-terms-privacy-and-contact.md
@@ -1,7 +1,7 @@
-# Edit Terms, Privacy and Contact
-
-By default, LinkStack includes a footer consisting of Terms, Privacy and Contact pages. These page’s content can be changed on the Admin Panel under Admin>Pages. A graphical text editor is included in this project to edit content on these pages, but basic HTML syntax is accepted.
-
-For each section, a basic template is provided. Depending on your case and or local laws, you might want to change this.
-
-The footer can be disabled entirely in the config.
+# Edit Terms, Privacy and Contact
+
+By default, LinkStack includes a footer consisting of Terms, Privacy and Contact pages. These page’s content can be changed on the Admin Panel under Admin>Pages. A graphical text editor is included in this project to edit content on these pages, but basic HTML syntax is accepted.
+
+For each section, a basic template is provided. Depending on your case and or local laws, you might want to change this.
+
+The footer can be disabled entirely in the config.
diff --git a/docs/getting-started/setup.md b/docs/setup/setup.md
similarity index 97%
rename from docs/getting-started/setup.md
rename to docs/setup/setup.md
index d201589..022e79d 100644
--- a/docs/getting-started/setup.md
+++ b/docs/setup/setup.md
@@ -1,14 +1,14 @@
-# Setup
-
-The installation of LinkStack is tailored to be as easy and user-friendly as possible.
-
-In most cases, you will just be able to drop the LinkStack installation folder onto your web server, then visit this page with a browser to follow the setup wizard.
-
-It will:
-
-1. Check the server dependencies
-2. Setup the database
-3. Create the admin user
-4. Configure the app
-
-**To ensure everything works as expected, please read the [installation requirements](./requirements.md).**
+# Setup
+
+The installation of LinkStack is tailored to be as easy and user-friendly as possible.
+
+In most cases, you will just be able to drop the LinkStack installation folder onto your web server, then visit this page with a browser to follow the setup wizard.
+
+It will:
+
+1. Check the server dependencies
+2. Setup the database
+3. Create the admin user
+4. Configure the app
+
+**To ensure everything works as expected, please read the [installation requirements](./requirements.md).**
diff --git a/mkdocs.yml b/mkdocs.yml
index 84fcea3..f2bd1bf 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -103,17 +103,17 @@ nav:
         - getting-started/index.md
         - Requirements: getting-started/requirements.md
         - Download: getting-started/download.md
-        - Setup: getting-started/setup.md
-        - Other webservers: getting-started/other-webservers.md
-    - Docker:
-        - Setup: docker/setup.md
-        - Reverse Proxies: docker/reverse-proxies.md
+  
     - Setup:
     #    - First steps: setup/first-steps.md
     #   - Getting to know the Admin Panel: setup/getting-to-know-the-admin-panel.md
-        - Edit Terms, Privacy and Contact: setup/edit-terms-privacy-and-contact.md
+          - Setup: setup/setup.md
+          - Docker Setup: docker/setup.md
+          - Reverse Proxies: docker/reverse-proxies.md
+          - Other webservers: getting-started/other-webservers.md
+
     #    - Disable registration: setup/disable-registration.md
-    # - Configuration:
+    - Configuration:
     #     - configuration/index.md
     #     - Email verification: configuration/email-verification.md
     #     - Internal notifications: configuration/internal-notifications.md
@@ -125,6 +125,8 @@ nav:
     #     - Cache Settings: configuration/cache-settings.md
     #     - Miscellaneous Settings: configuration/miscellaneous-settings.md
     #     - Social login: configuration/social-login.md
+          - Edit Terms, Privacy and Contact: configuration/edit-terms-privacy-and-contact.md
+
 
 extra:
   social:
@@ -140,17 +142,11 @@ extra:
     - icon: fontawesome/brands/discord
       link: https://discord.linkstack.org
       name: Discord
-    - icon: simple/matrix
-      link: https://matrix.linkstack.org
-      name: Matrix
-    - icon: simple/lemmy
-      link: https://lemmy.ml/c/linkstack
-      name: Lemmy
     - icon: fontawesome/solid/heart
       link: https://linkstack.org/donate
       name: Sponsor us
 
-copyright: Copyright © 2022 - 2023 LittleLink Custom | 2023 - present LinkStack
+copyright: Copyright © 2022 - 2023 LittleLink Custom | 2023 - present LinkStack 
 
 extra_css:
   - assets/css/style.css