diff --git a/source/_static/default.css b/source/_static/default.css
index ac95bde..71e20fb 100644
--- a/source/_static/default.css
+++ b/source/_static/default.css
@@ -91,7 +91,8 @@ code {
 
 @media (min-width: 1200px){
     .container, .container-lg, .container-md, .container-sm, .container-xl {
-    max-width: 2200px;
+        max-width: 2200px;
+    }
 }
 
 .container-fluid, .container-lg, .container-md, .container-sm, .container-xl {
@@ -145,4 +146,12 @@ code {
         width: 90%;
         margin: 0 0 1em 1.5em;
     }
+}
+
+.caption > i {
+    display: none;
+}
+
+nav.bd-links .fa-chevron-up:hover, nav.bd-links .fa-chevron-down:hover {
+    color: #ff4960;
 }
\ No newline at end of file
diff --git a/source/available-services/index.rst b/source/available-services/index.rst
deleted file mode 100644
index 78c012a..0000000
--- a/source/available-services/index.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-.. _available-services:
-
-******************
-Available Services
-******************
-
-`Bitcoin <https://github.com/Start9Labs/bitcoind-wrapper>`_
-
-`Bitwarden <https://github.com/Start9Labs/filebrowser-wrapper>`_
-
-`Cups <https://github.com/Start9Labs/cups-wrapper>`_
-
-`File Browser <https://github.com/Start9Labs/filebrowser-wrapper>`_
\ No newline at end of file
diff --git a/source/conf.py b/source/conf.py
index 98edb59..960db99 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -74,9 +74,10 @@ html_theme_options = {
     "use_issues_button": True,
     "use_repository_button": True,
     "extra_navbar": "",
+    "show_navbar_depth": 1,
 }
 html_logo = "_static/logo.png"
-html_title = "Start9 Labs"
+html_title = "Docs"
 html_favicon = "_static/favicon.ico"
 html_js_files = [
     'js/main.js'
diff --git a/source/index.rst b/source/index.rst
index 60aaea7..043d625 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -1,6 +1,6 @@
-#############
-Documentation
-#############
+#########################
+Start9 Labs Documentation
+#########################
 
 Welcome to the docs!
 
@@ -18,7 +18,7 @@ Here you will find guidance and information about the Start9 Embassy personal se
   :caption: User Manuals
 
   user-manuals/embassyos/index
-  user-manuals/services/index
+  user-manuals/available-services/index
 
 .. toctree::
   :maxdepth: 2
diff --git a/source/user-manuals/available-services/index.rst b/source/user-manuals/available-services/index.rst
new file mode 100644
index 0000000..6e0fa9d
--- /dev/null
+++ b/source/user-manuals/available-services/index.rst
@@ -0,0 +1,15 @@
+.. _available-services:
+
+******************
+Available Services
+******************
+
+A list of currently released services for EmbassyOS. Links to the wrapper repository that contains advanced instructions and integration guides. 
+
+    `Bitcoin <https://github.com/Start9Labs/bitcoind-wrapper>`_
+
+    `Bitwarden <https://github.com/Start9Labs/filebrowser-wrapper>`_
+
+    `Cups <https://github.com/Start9Labs/cups-wrapper>`_
+
+    `File Browser <https://github.com/Start9Labs/filebrowser-wrapper>`_
\ No newline at end of file
diff --git a/source/user-manuals/embassyos/developer-options/alt-marketplace.rst b/source/user-manuals/embassyos/general/developer-options/alt-marketplace.rst
similarity index 100%
rename from source/user-manuals/embassyos/developer-options/alt-marketplace.rst
rename to source/user-manuals/embassyos/general/developer-options/alt-marketplace.rst
diff --git a/source/user-manuals/embassyos/developer-options/index.rst b/source/user-manuals/embassyos/general/developer-options/index.rst
similarity index 100%
rename from source/user-manuals/embassyos/developer-options/index.rst
rename to source/user-manuals/embassyos/general/developer-options/index.rst
diff --git a/source/user-manuals/embassyos/developer-options/ssh-setup.rst b/source/user-manuals/embassyos/general/developer-options/ssh-setup.rst
similarity index 100%
rename from source/user-manuals/embassyos/developer-options/ssh-setup.rst
rename to source/user-manuals/embassyos/general/developer-options/ssh-setup.rst
diff --git a/source/user-manuals/embassyos/embassy-config.rst b/source/user-manuals/embassyos/general/embassy-config.rst
similarity index 100%
rename from source/user-manuals/embassyos/embassy-config.rst
rename to source/user-manuals/embassyos/general/embassy-config.rst
diff --git a/source/user-manuals/embassyos/forgot-password.rst b/source/user-manuals/embassyos/general/forgot-password.rst
similarity index 100%
rename from source/user-manuals/embassyos/forgot-password.rst
rename to source/user-manuals/embassyos/general/forgot-password.rst
diff --git a/source/user-manuals/embassyos/general/index.rst b/source/user-manuals/embassyos/general/index.rst
new file mode 100644
index 0000000..cb2902f
--- /dev/null
+++ b/source/user-manuals/embassyos/general/index.rst
@@ -0,0 +1,20 @@
+*******
+General
+*******
+
+An overview of EmbassyOS general capabilities. 
+
+Features
+========
+
+.. toctree::
+  :maxdepth: 2
+
+  embassy-config
+  updating
+  wifi
+  developer-options/index
+  power
+  notifications
+  ssl
+  forgot-password
\ No newline at end of file
diff --git a/source/user-manuals/embassyos/notifications.rst b/source/user-manuals/embassyos/general/notifications.rst
similarity index 100%
rename from source/user-manuals/embassyos/notifications.rst
rename to source/user-manuals/embassyos/general/notifications.rst
diff --git a/source/user-manuals/embassyos/power.rst b/source/user-manuals/embassyos/general/power.rst
similarity index 100%
rename from source/user-manuals/embassyos/power.rst
rename to source/user-manuals/embassyos/general/power.rst
diff --git a/source/user-manuals/embassyos/ssl.rst b/source/user-manuals/embassyos/general/ssl.rst
similarity index 100%
rename from source/user-manuals/embassyos/ssl.rst
rename to source/user-manuals/embassyos/general/ssl.rst
diff --git a/source/user-manuals/embassyos/updating.rst b/source/user-manuals/embassyos/general/updating.rst
similarity index 100%
rename from source/user-manuals/embassyos/updating.rst
rename to source/user-manuals/embassyos/general/updating.rst
diff --git a/source/user-manuals/embassyos/wifi.rst b/source/user-manuals/embassyos/general/wifi.rst
similarity index 100%
rename from source/user-manuals/embassyos/wifi.rst
rename to source/user-manuals/embassyos/general/wifi.rst
diff --git a/source/user-manuals/embassyos/index.rst b/source/user-manuals/embassyos/index.rst
index 68d5dca..f745da7 100644
--- a/source/user-manuals/embassyos/index.rst
+++ b/source/user-manuals/embassyos/index.rst
@@ -10,14 +10,11 @@ You can view and manage your Embassy inside the ``Embassy`` tab in the main menu
 
   Embassy tab
 
+Features
+========
+
 .. toctree::
   :maxdepth: 2
 
-  embassy-config
-  updating
-  wifi
-  developer-options/index
-  power
-  notifications
-  ssl
-  forgot-password
\ No newline at end of file
+  general/index
+  services/index
\ No newline at end of file
diff --git a/source/user-manuals/services/backups.rst b/source/user-manuals/embassyos/services/backups.rst
similarity index 100%
rename from source/user-manuals/services/backups.rst
rename to source/user-manuals/embassyos/services/backups.rst
diff --git a/source/user-manuals/services/index.rst b/source/user-manuals/embassyos/services/index.rst
similarity index 100%
rename from source/user-manuals/services/index.rst
rename to source/user-manuals/embassyos/services/index.rst
diff --git a/source/user-manuals/services/installing.rst b/source/user-manuals/embassyos/services/installing.rst
similarity index 100%
rename from source/user-manuals/services/installing.rst
rename to source/user-manuals/embassyos/services/installing.rst
diff --git a/source/user-manuals/services/instructions.rst b/source/user-manuals/embassyos/services/instructions.rst
similarity index 100%
rename from source/user-manuals/services/instructions.rst
rename to source/user-manuals/embassyos/services/instructions.rst
diff --git a/source/user-manuals/services/logs.rst b/source/user-manuals/embassyos/services/logs.rst
similarity index 100%
rename from source/user-manuals/services/logs.rst
rename to source/user-manuals/embassyos/services/logs.rst
diff --git a/source/user-manuals/services/managing-deps.rst b/source/user-manuals/embassyos/services/managing-deps.rst
similarity index 100%
rename from source/user-manuals/services/managing-deps.rst
rename to source/user-manuals/embassyos/services/managing-deps.rst
diff --git a/source/user-manuals/services/properties.rst b/source/user-manuals/embassyos/services/properties.rst
similarity index 100%
rename from source/user-manuals/services/properties.rst
rename to source/user-manuals/embassyos/services/properties.rst
diff --git a/source/user-manuals/services/service-config.rst b/source/user-manuals/embassyos/services/service-config.rst
similarity index 100%
rename from source/user-manuals/services/service-config.rst
rename to source/user-manuals/embassyos/services/service-config.rst