diff --git a/src/templates/layout/main.php b/src/templates/layout/main.php
index 0ad21c9..c1cb854 100644
--- a/src/templates/layout/main.php
+++ b/src/templates/layout/main.php
@@ -45,16 +45,5 @@ $resource = $resources->getResource($resourceEntry);
             <span class="h1">PROTOTYPE / POC</span>
         </div>
 
-        <div class="position-fixed bottom-0 start-0 m-3 fs-6">
-            <a href="https://git.php.fail/neintonine/gamesshop/issues/new" class="nav-link text-muted mb-3">
-                <i class="fa-solid fa-bug fa-xl me-3"></i>
-                You found a bug? Please report it.
-            </a>
-            <a href="https://git.php.fail/neintonine/gamesshop" class="nav-link text-muted">
-                <i class="fa-brands fa-git-alt me-3 fa-xl"></i>
-                Interested to help? Checkout the git repository.
-            </a>
-        </div>
-
     </body>
 </html>
diff --git a/src/templates/layout/navbar.php b/src/templates/layout/navbar.php
index 6477edb..e16c5ba 100644
--- a/src/templates/layout/navbar.php
+++ b/src/templates/layout/navbar.php
@@ -29,24 +29,25 @@ $currentPermission = $activeUser === null ? UserPermission::NONE : $activeUser->
                     }
                     ?>
 
+
                     <li class="nav-link">
                         <a href="<?= $header->link ?>" class="nav-link"><?= $header->title ?></a>
                     </li>
                 <?php endforeach; ?>
             </ul>
 
-            <div class="d-flex mode-switch me-4">
-                <button title="Use dark mode" id="dark" class="btn btn-sm btn-default text-secondary">
-                    <i class="fa-regular fa-moon"></i>
-                </button>
-                <button title="Use light mode" id="light" class="btn btn-sm btn-default text-secondary">
-                    <i class="fa-regular fa-sun"></i>
-                </button>
-                <button title="Use system preferred mode" id="system" class="btn btn-sm btn-default text-secondary">
-                    <i class="fa-solid fa-display"></i>
-                </button>
-            </div>
             <?= $this->insert('layout/accountDisplay'); ?>
         </div>
     </div>
+    <div class="d-flex mode-switch me-3">
+        <button title="Use dark mode" id="dark" class="btn btn-sm btn-default text-secondary">
+            <i class="fa-regular fa-moon"></i>
+        </button>
+        <button title="Use light mode" id="light" class="btn btn-sm btn-default text-secondary">
+            <i class="fa-regular fa-sun"></i>
+        </button>
+        <button title="Use system preferred mode" id="system" class="btn btn-sm btn-default text-secondary">
+            <i class="fa-solid fa-display"></i>
+        </button>
+    </div>
 </nav>
\ No newline at end of file