diff --git a/apps/home/static/home/css/index.css b/apps/home/static/home/css/index.css
index 1d1c958..fb10104 100644
--- a/apps/home/static/home/css/index.css
+++ b/apps/home/static/home/css/index.css
@@ -62,7 +62,7 @@
 }
 
 .server-item-selector .font-monospace {
-  color: var(--bs-secondary-color)
+    color: var(--bs-secondary-color)
 }
 
 .server-item-selector:hover,
@@ -76,51 +76,69 @@
 /* widths */
 
 .mw-10rem {
-  max-width: 10rem;
+    max-width: 10rem;
 }
 
 .col-switch-width {
-  width: 3.5rem;
-  min-width: 3.5rem;
-  max-width: 3.5rem;
+    width: 3.5rem;
+    min-width: 3.5rem;
+    max-width: 3.5rem;
 }
 
 
 /* Server Tabs */
 
 #serverTabs .nav-item:not(:last-child) {
-  margin-right: 1rem;
+    margin-right: 1rem;
 }
 
 #serverTabs .nav-item .nav-link:hover:not(.active) {
-  background-color: var(--bs-secondary-bg);
+    background-color: var(--bs-secondary-bg);
 }
 
 #serverTabs .nav-item .nav-link:not(.active) {
-  color: var(--bs-text-body);
+    color: var(--bs-text-body);
 }
 
 /* Yellow Dot Indicator for the server sidebar */
 .dot-container {
-  width: .75rem;
-  height: .75rem;
+    width: .75rem;
+    height: .75rem;
 
-  display: flex;
-  position: absolute;
-  top: 0;
-  right: 0;
+    display: flex;
+    position: absolute;
+    top: 0;
+    right: 0;
 }
 
 @media (max-width: 992px) {
-  .dot-container {
-    transform: translate(25%, -25%);
-  }
+    .dot-container {
+        transform: translate(25%, -25%);
+    }
 }
 
 .dot-icon {
-  height: .75rem;
-  width: .75rem;
-  background-color: var(--bs-primary);
-  border-radius: 50%;
-  display: inline-block;
+    height: .75rem;
+    width: .75rem;
+    background-color: var(--bs-primary);
+    border-radius: 50%;
+    display: inline-block;
+}
+
+
+/* Sidebar Buttons */
+.sidebar-btn {
+    border: none;
+    width: 100%;
+    height: 100%;
+    padding: 0.5rem 0;
+    border-radius: var(--bs-border-radius-sm);
+    transition: 0.3s;
+
+    color: var(--bs-body-color);
+    background-color: var(--bs-secondary-bg);
+}
+
+.sidebar-btn:hover {
+    background-color: var(--bs-tertiary-bg);
 }
\ No newline at end of file
diff --git a/apps/home/templates/home/index.html b/apps/home/templates/home/index.html
index 242e6bd..2d8ab8d 100644
--- a/apps/home/templates/home/index.html
+++ b/apps/home/templates/home/index.html
@@ -41,7 +41,59 @@
                     </div>
                 </li>
             </ul>
-            <ul class="d-flex flex-lg-row flex-column list-unstyled text-center flex-nowrap mb-0 px-lg-4 px-2 align-items-center text-body-secondary">
+            <ul class="row align-items-stretch g-0 list-unstyled text-center mb-0 px-lg-2 px-1 align-items-center text-body-secondary">
+                <li class="col-lg-4">
+                    <button type="button" id="themeToggle" class="sidebar-btn text-center">
+                        <i class="bi bi-sun"></i>
+                    </button>
+                </li>
+                <li class="col-lg-4">
+                    <a href="https://gitea.cor.bz/corbz/PYRSS-Website" class="sidebar-btn d-block text-center">
+                        <i class="bi bi-git"></i>
+                    </a>
+                </li>
+                <li class="col-lg-4">
+                    <a href="https://gitea.cor.bz/corbz/PYRSS-Website/wiki" class="sidebar-btn d-block text-center">
+                        <i class="bi bi-question-lg"></i>
+                    </a>
+                </li>
+                <li class="col-12">
+                    <div class="dropdown">
+                        <button type="button" class="sidebar-btn d-flex align-items-center px-lg-3" data-bs-toggle="dropdown" data-bs-auto-close="outside">
+                            <img src="{{ request.user.avatar_url }}" alt="User Icon" width="30" class="rounded-circle mx-auto mx-lg-0">
+                            <span class="d-none d-lg-inline mx-2 small text-truncate">@{{ request.user.global_name }}</span>
+                            <i class="d-none d-lg-inline bi bi-chevron-down ms-auto"></i>
+                        </button>
+                        <ul class="dropdown-menu dropdown-menu-start rounded-1">
+                            <li>
+                                <h6 class="dropdown-header d-flex justify-content-between">
+                                    <span>@{{ request.user.username }}</span>
+                                    <div class="vr mx-3"></div>
+                                    <span>{{ request.user.id }}</span>
+                                </h6>
+                            </li>
+                            <li><hr class="dropdown-divider"></li>
+                            <li>
+                                {% comment %}<!-- Logout only accepts POST requests -->{% endcomment %}
+                                <form action="/logout/" method="post" class="m-0">
+                                    {% csrf_token %}
+                                    <button type="submit" class="dropdown-item py-2">
+                                        <i class="bi bi-arrow-left-short"></i><span class="ms-2">Logout</span>
+                                    </button>
+                                </form>
+                            </li>
+                            {% if request.user.is_superuser %}
+                            <li>
+                                <a href="/admin/" class="dropdown-item py-2" target="_blank">
+                                    <i class="bi bi-person-check-fill"></i><span class="ms-2">Admin Interface</span>
+                                </a>
+                            </li>
+                            {% endif %}
+                        </ul>
+                    </div>
+                </li>
+            </ul>
+            <!-- <ul class="d-flex flex-lg-row flex-column list-unstyled text-center flex-nowrap mb-0 px-lg-4 px-2 align-items-center text-body-secondary">
                 <li>
                     <a href="https://gitea.cor.bz/corbz/PYRSS-Website" class="text-reset" target="_blank">
                         <i class="bi bi-git fs-6"></i>
@@ -58,7 +110,7 @@
                 <li class="d-none d-lg-inline text-nowrap text-reset small">
                     &copy; 2024 PYRSS
                 </li>
-            </ul>
+            </ul> -->
         </div>
         <div class="flex-grow-1 container-fluid bg-body rounded-top-2 rounded-end-0 overflow-y-auto" style="min-width: 0;">
             <div id="noSelectedServer" class="h-100">
diff --git a/templates/base.html b/templates/base.html
index 06884a7..5f83d1c 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -44,9 +44,7 @@
     </head>
     <body data-bs-theme="light" class="bg-body d-flex flex-column vh-100 overflow-hidden font-sora">
 
-        {% include 'includes/navbar.html' %}
-
-        <div class="flex-grow-1 overflow-y-auto" style="max-height: calc(100vh - 73px);">
+        <div class="flex-grow-1 overflow-y-auto vh-100">
             {% block content %}{% endblock content %}            
         </div>