Index: src/main/resources/static/css/business_admin.css
===================================================================
--- src/main/resources/static/css/business_admin.css	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
+++ src/main/resources/static/css/business_admin.css	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
@@ -0,0 +1,7 @@
+.custom-tab-item {
+    margin: 10px;
+}
+
+#nav-services, #nav-business {
+    margin: 20px 20px;
+}
Index: src/main/resources/static/js/business_admin.js
===================================================================
--- src/main/resources/static/js/business_admin.js	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
+++ src/main/resources/static/js/business_admin.js	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
@@ -0,0 +1,76 @@
+$(document).ready(function() {
+
+    var business = {};
+
+    $.ajax({
+        url: "http://localhost:8080/api/business/me"
+    }).then(function (data) {
+        business = data;
+        console.log(business);
+        var $header = $("#header");
+
+        // header
+        $header.text($header.text() + " " + business["owner"]['firstName'] + " " + business['owner']['lastName']);
+
+        // business info
+        if(business['businessStatus'] == 'NEW') {
+            $('#new_business_warning').removeAttr("hidden");
+        }
+        $('#business_status').val(business['businessStatus']);
+        $('#business_type').val(business['businessType']['text']);
+
+        // owner info
+        $('#firstName').val(business['owner']['firstName']);
+        $('#lastName').val(business['owner']['lastName']);
+        $('#email').val(business['owner']['email']);
+        $('#username').val(business['owner']['username']);
+
+        // services info
+        var $el = $("#predefined_services_admin_panel");
+        $el.empty();
+        $.each(business['services'], function (index, obj) {
+            $el.append(
+                '<div class=\"form-outline mb-4\">' +
+                '    <div class="row">' +
+                '        <div class="col-md-6">\n' +
+                '            <input class="form-check-input" type="checkbox" checked value=\"' + obj.id + '\" id=\"' + obj.id + '\">\n' +
+                '            <label class="form-check-label" for=\"' + obj.id + '\">\n' +
+                obj['serviceType'].name +
+                '            </label>\n' +
+                '        </div>' +
+                '        <div class=\"form-outline col-md-2 d-grid\">' +
+                '            <input type=\"text\" id=\"' + obj.id + obj['serviceType'].name.replace(/\s/g, "") + "duration" + '\" class=\"form-control\" placeholder="time" value=\"' + obj.duration + '" />' +
+                '        </div>' +
+                '        <div class=\"form-outline col-md-2 d-grid\">' +
+                '            <input type=\"text\" id=\"' + obj.id + obj['serviceType'].name.replace(/\s/g, "") + "price" + '\" class=\"form-control\" placeholder="price" value=\"' + obj.price + '" />' +
+                '        </div>' +
+                '    </div>' +
+                '</div>');
+        });
+    });
+
+    $("#add_service").click(function () {
+        var input_service = $("#input_service").val();
+        // clear the input
+        $("#input_service").val('');
+
+        $("#predefined_services_admin_panel").append(
+            '<div class="form-outline mb-4">' +
+            '    <div class="row">' +
+            '        <div class="col-md-6">\n' +
+            '            <input class="form-check-input" type="checkbox" checked value="' + -1 + '" id="' + -1 + '">\n' +
+            '            <label class="form-check-label" for="' + -1 + '">\n' +
+            input_service +
+            '            </label>\n' +
+            '        </div>' +
+            '        <div class="form-outline col-md-2 d-grid">' +
+            '            <input type="text" id="' + -1 + input_service.replace(/\s/g, "") + "duration" + '" class="form-control" placeholder="time" />' +
+            '        </div>' +
+            '        <div class="form-outline col-md-2 d-grid">' +
+            '            <input type="text" id="' + -1 + input_service.replace(/\s/g, "") + "price"+ '" class="form-control" placeholder="price" />' +
+            '        </div>' +
+            '    </div>' +
+            '</div>');
+        event.preventDefault();
+    });
+});
Index: src/main/resources/static/js/login.js
===================================================================
--- src/main/resources/static/js/login.js	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
+++ src/main/resources/static/js/login.js	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
@@ -0,0 +1,3 @@
+document.getElementById("login").addEventListener("click", function(event){
+    event.preventDefault()
+});
Index: src/main/resources/static/js/register_business.js
===================================================================
--- src/main/resources/static/js/register_business.js	(revision 905079022f7186a4860b626d48726296b486025f)
+++ src/main/resources/static/js/register_business.js	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
@@ -22,5 +22,5 @@
                 '<div class=\"form-outline mb-4\">' +
                 '    <div class="row">' +
-                '        <div class="col-md-8">\n' +
+                '        <div class="col-md-6">\n' +
                 '            <input class="form-check-input" type="checkbox" value=\"' + obj.id + '\" id=\"' + obj.id + '\">\n' +
                 '            <label class="form-check-label" for=\"' + obj.id + '\">\n' +
@@ -29,5 +29,8 @@
                 '        </div>' +
                 '        <div class=\"form-outline col-md-2 d-grid\">' +
-                '            <input type=\"text\" id=\"' + obj.id + obj.name.replace(/\s/g, "") + '\" class=\"form-control\" />' +
+                '            <input type=\"text\" id=\"' + obj.id + obj.name.replace(/\s/g, "") + "duration" + '\" class=\"form-control\" placeholder="time" />' +
+                '        </div>' +
+                '        <div class=\"form-outline col-md-2 d-grid\">' +
+                '            <input type=\"text\" id=\"' + obj.id + obj.name.replace(/\s/g, "") + "price" + '\" class=\"form-control\" placeholder="price" />' +
                 '        </div>' +
                 '    </div>' +
@@ -53,5 +56,8 @@
             '        </div>' +
             '        <div class="form-outline col-md-2 d-grid">' +
-            '            <input type="text" id="' + -1 + input_service.replace(/\s/g, "") + '" class="form-control" />' +
+            '            <input type="text" id="' + -1 + input_service.replace(/\s/g, "") + "duration" + '" class="form-control" placeholder="time" />' +
+            '        </div>' +
+            '        <div class="form-outline col-md-2 d-grid">' +
+            '            <input type="text" id="' + -1 + input_service.replace(/\s/g, "") + "price"+ '" class="form-control" placeholder="price" />' +
             '        </div>' +
             '    </div>' +
@@ -83,4 +89,5 @@
             var text = $(label).text();
             var time = $($($(label).parent()).siblings()[0]).children()[0].value;
+            var price = $($($(label).parent()).siblings()[1]).children()[0].value;
 
             var serviceType = {}
@@ -91,4 +98,5 @@
             service['serviceType'] = serviceType;
             service['duration'] = time;
+            service['price'] = price;
             servicesObj.push(service);
         });
Index: src/main/resources/templates/admin.html
===================================================================
--- src/main/resources/templates/admin.html	(revision 905079022f7186a4860b626d48726296b486025f)
+++ src/main/resources/templates/admin.html	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
@@ -2,5 +2,5 @@
 <html lang="en">
 <head>
-    <title>Schedlr</title>
+    <title>Admin</title>
 
     <meta charset="utf-8"/>
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 8bcd64c37eba4cd984953069331c9faa3a916671)
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Business admin page</title>
+
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet"
+          integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
+    <link href="css/business_admin.css" rel="stylesheet"/>
+</head>
+<body>
+<!-- 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" >
+            <span id="header">
+                Welcome back
+            </span>
+        </div>
+    </div>
+</header>
+
+<nav>
+    <div class="nav nav-tabs" id="nav-tab" role="tablist">
+        <a class="nav-link active" id="nav-business-tab" data-bs-toggle="tab" href="#nav-business" role="tab" aria-controls="nav-business" aria-selected="true">Business Info</a>
+        <a class="nav-link" id="nav-owner-tab" data-bs-toggle="tab" href="#nav-owner" role="tab" aria-controls="nav-owner" aria-selected="false">Owner Info</a>
+        <a class="nav-link" id="nav-services-tab" data-bs-toggle="tab" href="#nav-services" role="tab" aria-controls="nav-services" aria-selected="false">Services Info</a>
+    </div>
+</nav>
+<div class="tab-content" id="nav-tabContent">
+    <div class="tab-pane fade show active" id="nav-business" role="tabpanel" aria-labelledby="nav-business-tab">
+        <div class="col-lg-6 mb-5 mb-lg-0">
+            <div class="form-outline mb-4">
+                <label for="business_status">Business status</label>
+                <input type="text" id="business_status" disabled class="form-control" aria-label="business_status"/>
+                <p id="new_business_warning" style="color:darkorange;" hidden>Please wait for the admin to approve your business.</p>
+            </div>
+
+            <div class="form-outline mb-4">
+                <label for="business_type">Business type</label>
+                <input type="text" id="business_type" disabled class="form-control" aria-label="business_type"/>
+            </div>
+        </div>
+    </div>
+    <div class="tab-pane fade" id="nav-owner" role="tabpanel" aria-labelledby="nav-owner-tab">
+        <div class="col-lg-6 mb-5 mb-lg-0">
+            <div class="card-body py-5 px-md-5">
+                <form>
+                    <div class="row">
+                        <div class="col-md-6 mb-4">
+                            <div class="form-outline">
+                                <label for="firstName">First name</label>
+                                <input type="text" id="firstName" class="form-control" placeholder="First name"
+                                       aria-label="Firstname"/>
+                            </div>
+                        </div>
+                        <div class="col-md-6 mb-4">
+                            <div class="form-outline">
+                                <label for="lastName">Last name</label>
+                                <input type="text" id="lastName" class="form-control" placeholder="Last name"
+                                       aria-label="lastname"/>
+                            </div>
+                        </div>
+                    </div>
+                    <!-- Email input -->
+                    <div class="form-outline mb-4">
+                        <label for="email">Email</label>
+                        <input type="email" id="email" class="form-control" placeholder="Email"
+                               aria-label="Email"/>
+                    </div>
+                    <!-- Email input -->
+                    <div class="form-outline mb-4">
+                        <label for="username">Username</label>
+                        <input type="text" id="username" class="form-control" placeholder="Username"
+                               aria-label="username"/>
+                    </div>
+                    <button type="buttom" class="btn btn-primary btn-block mb-4" id="update_owner_button">
+                        Update profile
+                    </button>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="tab-pane fade" id="nav-services" role="tabpanel" aria-labelledby="nav-services-tab">
+        <div class="col-lg-6 mb-5 mb-lg-0">
+            <div class="form-outline mb-4">
+                <div class="row">
+                    <div class="col-md-10">
+                        <div class="form-outline">
+                            <input type="text" id="input_service" class="form-control"
+                                   placeholder="Services"
+                                   aria-label="services" />
+                        </div>
+                    </div>
+                    <div class="form-outline col-md-2 d-grid">
+                        <button class="btn btn-primary" id="add_service">Add</button>
+                    </div>
+                </div>
+            </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">
+                Update services
+            </button>
+        </div>
+    </div>
+</div>
+<script src='js/jquery-1.10.2.js' type="text/javascript"></script>
+<script src='js/jquery-ui.custom.min.js' type="text/javascript"></script>
+<script src='js/fullcalendar.js' type="text/javascript"></script>
+<script src="js/business_admin.js" type="text/javascript"></script>
+<script src="js/bootstrap.bundle.min.js"></script>
+</body>
+</html>
Index: src/main/resources/templates/homepage.html
===================================================================
--- src/main/resources/templates/homepage.html	(revision 905079022f7186a4860b626d48726296b486025f)
+++ src/main/resources/templates/homepage.html	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
@@ -2,5 +2,5 @@
 <html>
 <head>
-    <title>Schedlr</title>
+    <title>Homepage</title>
 
     <meta charset="utf-8"/>
Index: src/main/resources/templates/login.html
===================================================================
--- src/main/resources/templates/login.html	(revision 905079022f7186a4860b626d48726296b486025f)
+++ src/main/resources/templates/login.html	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
@@ -3,5 +3,5 @@
 <head>
     <meta charset="UTF-8">
-    <title>Schedlr</title>
+    <title>Login</title>
 
     <!-- Font Awesome -->
@@ -54,7 +54,16 @@
 
                             <!-- Submit button -->
-                            <button type="submit" class="btn btn-primary btn-block mb-4">
+                            <button id="login" type="submit" class="btn btn-primary btn-block mb-4">
                                 Login
                             </button>
+                            <div th:if="${param.error}">
+                                <div th:if="${param.error.contains('notApproved')}" class="alert alert-danger">
+                                    Account not approved yet.
+                                </div>
+
+                                <div th:if="${param.error.contains('badCredentials')}" class="alert alert-danger">
+                                    Invalid username or password.
+                                </div>
+                            </div>
                         </form>
 
Index: src/main/resources/templates/register_business.html
===================================================================
--- src/main/resources/templates/register_business.html	(revision 905079022f7186a4860b626d48726296b486025f)
+++ src/main/resources/templates/register_business.html	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
@@ -3,11 +3,8 @@
 <head>
     <meta charset="UTF-8">
-    <title>Schedlr</title>
-
+    <title>Register business</title>
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet"
           integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
-
     <link rel="stylesheet" href="css/login.css">
-
 </head>
 <body>
@@ -30,6 +27,6 @@
                         <form>
                             <div class="text-center">
-                                <p>Personal Info</p>
-                            </div>
+                            <p>Personal Info</p>
+                        </div>
 
                             <!-- 2 column grid layout with text inputs for the first and last names -->
Index: src/main/resources/templates/register_customer.html
===================================================================
--- src/main/resources/templates/register_customer.html	(revision 905079022f7186a4860b626d48726296b486025f)
+++ src/main/resources/templates/register_customer.html	(revision 8bcd64c37eba4cd984953069331c9faa3a916671)
@@ -3,5 +3,5 @@
 <head>
     <meta charset="UTF-8">
-    <title>Schedlr</title>
+    <title>Register customer</title>
 
     <meta charset="utf-8"/>
