diff --git a/public/views/layout.php b/public/views/layout.php
index b7be8f2..e2138a6 100644
--- a/public/views/layout.php
+++ b/public/views/layout.php
@@ -27,17 +27,44 @@ function renderLayout(string $contentView, array $viewData, string $pageTitle, ?
     }
 
     $partialsPath = __DIR__ . '/partials';
-
-    require $partialsPath . '/head.php';
-    require $partialsPath . '/sidebar.php';
-    require $partialsPath . '/topbar.php';
     ?>
-    <!-- Begin Page Content -->
-    <div class="container-fluid">
-        <?php require $contentView; ?>
+    <!DOCTYPE html>
+    <html lang="de">
+    <!-- Begin Head -->
+    <?php require $partialsPath . '/head.php'; ?>
+    <!-- End of Head -->
+    <body id="page-top">
+
+    <!-- Page Wrapper -->
+    <div id="wrapper">
+        <!-- Begin Sidebar -->
+        <?php require $partialsPath . '/sidebar.php'; ?>
+        <!-- End of Sidebar -->
+        <!-- Content Wrapper -->
+        <div id="content-wrapper" class="d-flex flex-column">
+
+            <!-- Main Content -->
+            <div id="content">
+                <!-- Begin Topbar -->
+                <?php require $partialsPath . '/topbar.php'; ?>
+                <!-- End of Topbar -->
+                <!-- Begin Page Content -->
+                <div class="container-fluid">
+                    <?php require $contentView; ?>
+                </div>
+                <!-- End of Page Content -->
+            </div>
+            <!-- End of Main Content -->
+            <!-- Begin Footer -->
+            <?php require $partialsPath . '/footer.php'; ?>
+            <!-- End of Footer -->
+        </div>
+        <!-- End of Content Wrapper -->
     </div>
-    <!-- /.container-fluid -->
+    <!-- End of Page Wrapper -->
+    <?php require $partialsPath . '/scripts.php';
+    ?>
+    </body>
+    </html>
     <?php
-    require $partialsPath . '/footer.php';
-    require $partialsPath . '/scripts.php';
 }
diff --git a/public/views/login.php b/public/views/login.php
index 6883e90..1f1ab85 100644
--- a/public/views/login.php
+++ b/public/views/login.php
@@ -17,7 +17,7 @@ declare(strict_types=1);
                             <div class="text-center mb-4">
                                 <h1 class="h4 text-gray-900">Willkommen beim AD Admin Tool</h1>
                                 <p class="text-muted mb-0">
-                                    Dies ist unser Testserver für den <pre>develop</pre> Branch.
+                                    Dies ist unser Testserver für den <code>develop</code> Branch.
                                 </p>
                             </div>
 
diff --git a/public/views/partials/footer.php b/public/views/partials/footer.php
index 23aee7b..5de355c 100644
--- a/public/views/partials/footer.php
+++ b/public/views/partials/footer.php
@@ -1,13 +1,8 @@
 <?php
 // public/views/partials/footer.php
 ?>
-</div>
-<!-- /.container-fluid -->
 
-</div>
-<!-- End of Main Content -->
 
-<!-- Footer -->
 <footer class="sticky-footer bg-white">
     <div class="container my-auto">
         <div class="copyright text-center my-auto">
@@ -15,10 +10,3 @@
         </div>
     </div>
 </footer>
-<!-- End of Footer -->
-
-</div>
-<!-- End of Content Wrapper -->
-
-</div>
-<!-- End of Page Wrapper -->
diff --git a/public/views/partials/head.php b/public/views/partials/head.php
index 1f5ce7b..96e0060 100644
--- a/public/views/partials/head.php
+++ b/public/views/partials/head.php
@@ -1,8 +1,7 @@
 <?php
 // public/views/partials/head.php
 ?>
-<!DOCTYPE html>
-<html lang="de">
+
 
 <head>
     <meta charset="utf-8">
@@ -17,7 +16,4 @@
     <link href="../../vendor/datatables/dataTables.bootstrap4.min.css" rel="stylesheet">
 </head>
 
-<body id="page-top">
 
-<!-- Page Wrapper -->
-<div id="wrapper">
diff --git a/public/views/partials/scripts.php b/public/views/partials/scripts.php
index 5845a34..6deaec0 100644
--- a/public/views/partials/scripts.php
+++ b/public/views/partials/scripts.php
@@ -26,5 +26,4 @@
 <script src="../../js/demo/chart-area-demo.js"></script>
 <script src="../../js/demo/chart-pie-demo.js"></script>
 
-</body>
-</html>
+
diff --git a/public/views/partials/sidebar.php b/public/views/partials/sidebar.php
index 9a4047e..dc23d9b 100644
--- a/public/views/partials/sidebar.php
+++ b/public/views/partials/sidebar.php
@@ -1,7 +1,7 @@
 <?php
 // public/views/partials/sidebar.php
 ?>
-<!-- Sidebar -->
+
 <ul class="navbar-nav bg-gradient-primary sidebar sidebar-dark accordion" id="accordionSidebar">
 
     <!-- Sidebar - Brand -->
@@ -46,4 +46,3 @@
     </div>
 
 </ul>
-<!-- End of Sidebar -->
diff --git a/public/views/partials/topbar.php b/public/views/partials/topbar.php
index d29658c..d710450 100644
--- a/public/views/partials/topbar.php
+++ b/public/views/partials/topbar.php
@@ -1,49 +1,40 @@
 <?php
 // public/views/partials/topbar.php
 ?>
-<!-- Content Wrapper -->
-<div id="content-wrapper" class="d-flex flex-column">
 
-    <!-- Main Content -->
-    <div id="content">
 
-        <!-- Topbar -->
-        <nav class="navbar navbar-expand navbar-light bg-white topbar mb-4 static-top shadow">
+<nav class="navbar navbar-expand navbar-light bg-white topbar mb-4 static-top shadow">
 
-            <!-- Sidebar Toggle (Topbar) -->
-            <button id="sidebarToggleTop" class="btn btn-link d-md-none rounded-circle mr-3">
-                <i class="fa fa-bars"></i>
-            </button>
+    <!-- Sidebar Toggle (Topbar) -->
+    <button id="sidebarToggleTop" class="btn btn-link d-md-none rounded-circle mr-3">
+        <i class="fa fa-bars"></i>
+    </button>
 
-            <!-- Topbar Navbar -->
-            <ul class="navbar-nav ml-auto">
+    <!-- Topbar Navbar -->
+    <ul class="navbar-nav ml-auto">
 
-                <!-- Nav Item - User Information -->
-                <li class="nav-item dropdown no-arrow">
-                    <a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button"
-                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <!-- Nav Item - User Information -->
+        <li class="nav-item dropdown no-arrow">
+            <a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button"
+               data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <span class="mr-2 d-none d-lg-inline text-gray-600 small">
                             <?= isset($currentUsername)
                                     ? htmlspecialchars($currentUsername, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8')
                                     : 'Administrator' ?>
                         </span>
-                        <img class="img-profile rounded-circle"
-                             src="../../images/undraw_profile.svg">
-                    </a>
-                    <!-- Dropdown - User Information -->
-                    <div class="dropdown-menu dropdown-menu-right shadow animated--grow-in"
-                         aria-labelledby="userDropdown">
-                        <a class="dropdown-item" href="../../index.php?route=logout">
-                            <i class="fas fa-sign-out-alt fa-sm fa-fw mr-2 text-gray-400"></i>
-                            Logout
-                        </a>
-                    </div>
-                </li>
+                <img class="img-profile rounded-circle"
+                     src="../../images/undraw_profile.svg">
+            </a>
+            <!-- Dropdown - User Information -->
+            <div class="dropdown-menu dropdown-menu-right shadow animated--grow-in"
+                 aria-labelledby="userDropdown">
+                <a class="dropdown-item" href="../../index.php?route=logout">
+                    <i class="fas fa-sign-out-alt fa-sm fa-fw mr-2 text-gray-400"></i>
+                    Logout
+                </a>
+            </div>
+        </li>
 
-            </ul>
+    </ul>
 
-        </nav>
-        <!-- End of Topbar -->
-
-        <!-- Begin Page Content -->
-        <div class="container-fluid">
+</nav>
