Index: src/main/resources/templates/admin.html
===================================================================
--- src/main/resources/templates/admin.html	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
+++ src/main/resources/templates/admin.html	(revision 950fa0d7a6b439770e79c885947e9b7d6058b424)
@@ -14,7 +14,12 @@
 <!-- Navbar start -->
 <header class="p-3 mb-3 border-bottom">
-    <div class="container">
-        <div class="d-flex flex-wrap align-items-center justify-content-center justify-content-lg-start">
+    <div class="row">
+        <div class="col-md-10 mb-10">
             Welcome to the admin page
+        </div>
+        <div class="col-md-2 mb-2">
+            <button id="logout" class="btn btn-primary btn-block">
+                Logout
+            </button>
         </div>
     </div>
@@ -39,5 +44,5 @@
 
     <!-- Submit button -->
-    <button type="buttom" class="btn btn-primary btn-block mb-4" id="save_button">
+    <button type="button" class="btn btn-primary btn-block mb-4" id="save_button">
         Save changes
     </button>
@@ -52,4 +57,5 @@
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
 <script src="js/admin.js" type="text/javascript"></script>
+<script src="js/logout.js" type="text/javascript"></script>
 </body>
 </html>
Index: src/main/resources/templates/business_admin.html
===================================================================
--- src/main/resources/templates/business_admin.html	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
+++ src/main/resources/templates/business_admin.html	(revision 950fa0d7a6b439770e79c885947e9b7d6058b424)
@@ -14,9 +14,14 @@
 <!-- Navbar start -->
 <header class="p-3 mb-3 border-bottom">
-    <div class="container">
-        <div class="d-flex flex-wrap align-items-center justify-content-center justify-content-lg-start" >
+    <div class="row">
+        <div class="col-md-10 mb-10" >
             <span id="header">
                 Welcome back
             </span>
+        </div>
+        <div class="col-md-2 mb-2">
+            <button id="logout" class="btn btn-primary btn-block">
+                Logout
+            </button>
         </div>
     </div>
@@ -77,5 +82,5 @@
                                aria-label="username"/>
                     </div>
-                    <button type="buttom" class="btn btn-primary btn-block mb-4" id="update_owner_button">
+                    <button type="button" class="btn btn-primary btn-block mb-4" id="update_owner_button">
                         Update profile
                     </button>
@@ -101,5 +106,5 @@
             </div>
             <div id="predefined_services_admin_panel" class="form-outline mb-4"></div>
-            <button type="buttom" class="btn btn-primary btn-block mb-4" id="update_services_button">
+            <button type="button" class="btn btn-primary btn-block mb-4" id="update_services_button">
                 Update services
             </button>
@@ -112,4 +117,5 @@
 <script src="js/business_admin.js" type="text/javascript"></script>
 <script src="js/bootstrap.bundle.min.js"></script>
+<script src="js/logout.js" type="text/javascript"></script>
 </body>
 </html>
Index: src/main/resources/templates/homepage.html
===================================================================
--- src/main/resources/templates/homepage.html	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
+++ src/main/resources/templates/homepage.html	(revision 950fa0d7a6b439770e79c885947e9b7d6058b424)
@@ -22,60 +22,61 @@
 <!-- Navbar start -->
 <header class="p-3 mb-3 border-bottom">
-    <div class="container">
-        <div class="d-flex flex-wrap align-items-center justify-content-center justify-content-lg-start">
-            <a href="/" class="d-flex align-items-center mb-2 mb-lg-0 text-dark text-decoration-none">
-                <svg class="bi me-2" width="40" height="32" role="img" aria-label="Bootstrap">
-                    <use xlink:href="#bootstrap"/>
-                </svg>
-            </a>
-
-            <ul class="nav col-12 col-lg-auto me-lg-auto mb-2 justify-content-center mb-md-0">
-                <li><a href="#" class="nav-link px-2 link-secondary">Overview</a></li>
-                <li><a href="#" class="nav-link px-2 link-dark">Inventory</a></li>
-                <li><a href="#" class="nav-link px-2 link-dark">Customers</a></li>
-                <li><a href="#" class="nav-link px-2 link-dark">Products</a></li>
-            </ul>
-
-            <form class="col-12 col-lg-auto mb-3 mb-lg-0 me-lg-3" role="search">
-                <input type="search" class="form-control" placeholder="Search..." aria-label="Search">
-            </form>
-
-            <div class="dropdown text-end">
-                <a href="#" class="d-block link-dark text-decoration-none dropdown-toggle" data-bs-toggle="dropdown"
-                   aria-expanded="false">
-                    <img src="https://github.com/mdo.png" alt="mdo" width="32" height="32" class="rounded-circle">
-                </a>
-                <ul class="dropdown-menu text-small">
-                    <li><a class="dropdown-item" href="#">New project...</a></li>
-                    <li><a class="dropdown-item" href="#">Settings</a></li>
-                    <li><a class="dropdown-item" href="#">Profile</a></li>
-                    <li>
-                        <hr class="dropdown-divider">
-                    </li>
-                    <li><a class="dropdown-item" href="#">Sign out</a></li>
-                </ul>
-            </div>
+    <div class="row" style="justify-content: space-between;">
+        <div class="col-md-8 mb-8">
+            Welcome to the Schedlr
+        </div>
+        <div class="col-md-2 mb-2">
+            <button id="profile" class="btn btn-primary btn-block">
+                Profile
+            </button>
+        </div>
+        <div class="col-md-2 mb-2">
+            <button id="logout" class="btn btn-primary btn-block">
+                Logout
+            </button>
+        </div>
+        <div class="col-md-2 mb-2">
+            <button id="login" class="btn btn-primary btn-block">
+                Login
+            </button>
         </div>
     </div>
 </header>
 <!-- Navbar end -->
+<div class="container">
+    <div id='wrap'>
+        <div id='calendar'></div>
+        <div style='clear:both'></div>
+    </div>
 
-<div id='wrap'>
-    <div id='calendar'></div>
-    <div style='clear:both'></div>
-</div>
 
-<div class="">
     <div class="card">
-        <div class="card-body py-5 px-md-5">
-            <div>
-                <label for="student-birth-date">Date of search:</label>
-                <input type="date" id="student-birth-date"/>
-            </div>
-            <div>
-                <button type="submit" class="button" id="search">Search</button>
-            </div>
+        <div class="form-outline mb-4">
+            <select class="form-select" id="companyType" aria-label="Select company type">
+                <option disabled selected hidden>Company Type</option>
+            </select>
+        </div>
+
+        <div class="form-outline mb-4">
+            <select class="form-select" id="company" aria-label="Select company">
+                <option disabled selected hidden>Company</option>
+            </select>
+        </div>
+        <div class="form-outline mb-4">
+            <select class="form-select" id="service" aria-label="Select service">
+                <option disabled selected hidden>Service</option>
+            </select>
+        </div>
+        <div class="form-outline mb-4">
+            <label for="startdatetime">Start:</label>
+            <input type="datetime-local" id="startdatetime" name="startdatetime">
+        </div>
+        <div class="form-outline mb-4">
+            <button id="createAppointment" class="btn btn-primary btn-block">
+                Create Appointment
+            </button>
         </div>
     </div>
+
 </div>
 <script src='js/jquery-1.10.2.js' type="text/javascript"></script>
@@ -84,4 +85,5 @@
 <script src="js/homepage.js" type="text/javascript"></script>
 <script src="js/bootstrap.bundle.min.js"></script>
+<script src="js/logout.js" type="text/javascript"></script>
 </body>
 </html>
Index: src/main/resources/templates/login.html
===================================================================
--- src/main/resources/templates/login.html	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
+++ src/main/resources/templates/login.html	(revision 950fa0d7a6b439770e79c885947e9b7d6058b424)
@@ -58,11 +58,15 @@
                             </button>
                             <div th:if="${param.error}">
-                                <div th:if="${param.error.contains('notApproved')}" class="alert alert-danger">
+                                <div th:if="${param.error.contains('notApproved')}" class="alert alert-danger alert-dismissible fade show">
                                     Account not approved yet.
                                 </div>
 
-                                <div th:if="${param.error.contains('badCredentials')}" class="alert alert-danger">
+                                <div th:if="${param.error.contains('badCredentials')}" class="alert alert-danger alert-dismissible fade show">
                                     Invalid username or password.
                                 </div>
+                            </div>
+                            <div th:if="${#request.getParameter('logoutSuccessful') != null}"
+                                 class="alert alert-success alert-dismissible fade show" role="alert">
+                                Successful logout
                             </div>
                         </form>
Index: src/main/resources/templates/register_business.html
===================================================================
--- src/main/resources/templates/register_business.html	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
+++ src/main/resources/templates/register_business.html	(revision 950fa0d7a6b439770e79c885947e9b7d6058b424)
@@ -104,5 +104,5 @@
 
                             <!-- Submit button -->
-                            <button type="buttom" class="btn btn-primary btn-block mb-4" id="signup_business_button">
+                            <button type="button" class="btn btn-primary btn-block mb-4" id="signup_business_button">
                                 Sign up
                             </button>
