diff --git a/templates/about.page.tmpl b/templates/about.page.tmpl
index 387c555..a3144d6 100644
--- a/templates/about.page.tmpl
+++ b/templates/about.page.tmpl
@@ -4,4 +4,4 @@
 
 
 
-{{end}}
+{{end}}
\ No newline at end of file
diff --git a/templates/admin-all-reservations.page.tmpl b/templates/admin-all-reservations.page.tmpl
index 10515e1..c8aef57 100644
--- a/templates/admin-all-reservations.page.tmpl
+++ b/templates/admin-all-reservations.page.tmpl
@@ -1,22 +1,22 @@
 {{template "admin" .}}
 
 {{define "css"}}
-    <link href="https://cdn.jsdelivr.net/npm/simple-datatables@latest/dist/style.css" rel="stylesheet" type="text/css">
+<link href="https://cdn.jsdelivr.net/npm/simple-datatables@latest/dist/style.css" rel="stylesheet" type="text/css">
 {{end}}
 
 {{define "page-title"}}
-    All Reservations
+All Reservations
 {{end}}
 
 {{define "content"}}
-    <div class="col-md-12">
+<div class="col-md-12">
     <h2>{{template "page-title" .}}</h2>
     {{ $res := index .Data "reservations"}}
     <div class="table-responsive">
 
-            <table class="table table-striped table-hover" id="all-res">
-                <thead>
-                    <tr>
+        <table class="table table-striped table-hover" id="all-res">
+            <thead>
+                <tr>
                     <th>ID</th>
                     <th>First Name</th>
                     <th>Last Name</th>
@@ -29,43 +29,43 @@
                     <th>Updated At</th>
                     <th>Room ID</th>
                     <th>Room Name</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {{range $i, $reservation := $res}}
-                        <tr>
-                        <td>{{$reservation.ID}}</td>
-                        <td>{{$reservation.FirstName}}</td>
-                        <td>
+                </tr>
+            </thead>
+            <tbody>
+                {{range $i, $reservation := $res}}
+                <tr>
+                    <td>{{$reservation.ID}}</td>
+                    <td>{{$reservation.FirstName}}</td>
+                    <td>
                         <a href="/admin/reservations/all/{{$reservation.ID}}">
-                        {{$reservation.LastName}}
+                            {{$reservation.LastName}}
                         </a>
-                        </td>
-                        <td>{{$reservation.Email}}</td>
-                        <td>{{$reservation.Phone}}</td>
-                        <td>{{dateformate $reservation.StartDate}}</td>
-                        <td>{{dateformate $reservation.EndDate}}</td>
-                        <td>{{$reservation.RoomID}}</td>
-                        <td>{{dateformate $reservation.CreatedAt}}</td>
-                        <td>{{dateformate $reservation.UpdatedAt}}</td>
-                        <td>{{$reservation.Room.ID}}</td>
-                        <td>{{$reservation.Room.RoomName}}</td>
-                        </tr>
-                    {{end}}
-                </tbody>
-            </table>
-    </div>
+                    </td>
+                    <td>{{$reservation.Email}}</td>
+                    <td>{{$reservation.Phone}}</td>
+                    <td>{{dateformate $reservation.StartDate}}</td>
+                    <td>{{dateformate $reservation.EndDate}}</td>
+                    <td>{{$reservation.RoomID}}</td>
+                    <td>{{dateformate $reservation.CreatedAt}}</td>
+                    <td>{{dateformate $reservation.UpdatedAt}}</td>
+                    <td>{{$reservation.Room.ID}}</td>
+                    <td>{{$reservation.Room.RoomName}}</td>
+                </tr>
+                {{end}}
+            </tbody>
+        </table>
     </div>
+</div>
 {{end}}
 
 {{define "js"}}
-    <script src="https://cdn.jsdelivr.net/npm/simple-datatables@latest" type="text/javascript"></script>
+<script src="https://cdn.jsdelivr.net/npm/simple-datatables@latest" type="text/javascript"></script>
 
-    <script>
-    document.addEventListener("DOMContentLoaded", function(){
-                                                    const dataTable = new simpleDatatables.DataTable("#all-res", {
-                                                        select: 5, sort: "desc",
-                                                    })
+<script>
+    document.addEventListener("DOMContentLoaded", function () {
+        const dataTable = new simpleDatatables.DataTable("#all-res", {
+            select: 5, sort: "desc",
         })
-    </script>
+    })
+</script>
 {{end}}
\ No newline at end of file
diff --git a/templates/admin-dashboard.page.tmpl b/templates/admin-dashboard.page.tmpl
index 9758926..fe50677 100644
--- a/templates/admin-dashboard.page.tmpl
+++ b/templates/admin-dashboard.page.tmpl
@@ -1,11 +1,11 @@
 {{template "admin" .}}
 
 {{define "page-title"}}
-    Dashboard
+Dashboard
 {{end}}
 
 {{define "content"}}
-    <div class="col-md-12">
-        Dashboard content
-    </div>
+<div class="col-md-12">
+    Dashboard content
+</div>
 {{end}}
\ No newline at end of file
diff --git a/templates/admin-new-reservations.page.tmpl b/templates/admin-new-reservations.page.tmpl
index bda606c..89546f9 100644
--- a/templates/admin-new-reservations.page.tmpl
+++ b/templates/admin-new-reservations.page.tmpl
@@ -1,22 +1,22 @@
 {{template "admin" .}}
 
 {{define "css"}}
-    <link href="https://cdn.jsdelivr.net/npm/simple-datatables@latest/dist/style.css" rel="stylesheet" type="text/css">
+<link href="https://cdn.jsdelivr.net/npm/simple-datatables@latest/dist/style.css" rel="stylesheet" type="text/css">
 {{end}}
 
 {{define "page-title"}}
-    All Reservations
+All Reservations
 {{end}}
 
 {{define "content"}}
-    <div class="col-md-12">
+<div class="col-md-12">
     <h2>{{template "page-title" .}}</h2>
     {{ $res := index .Data "reservations"}}
     <div class="table-responsive">
 
-            <table class="table table-striped table-hover" id="new-res">
-                <thead>
-                    <tr>
+        <table class="table table-striped table-hover" id="new-res">
+            <thead>
+                <tr>
                     <th>ID</th>
                     <th>New</th>
                     <th>First Name</th>
@@ -30,44 +30,44 @@
                     <th>Updated At</th>
                     <th>Room ID</th>
                     <th>Room Name</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {{range $i, $reservation := $res}}
-                        <tr>
-                        <td>{{$reservation.ID}}</td>
-                        <td>{{$reservation.Processed}}</td>
-                        <td>{{$reservation.FirstName}}</td>
-                        <td>
+                </tr>
+            </thead>
+            <tbody>
+                {{range $i, $reservation := $res}}
+                <tr>
+                    <td>{{$reservation.ID}}</td>
+                    <td>{{$reservation.Processed}}</td>
+                    <td>{{$reservation.FirstName}}</td>
+                    <td>
                         <a href="/admin/reservations/new/{{$reservation.ID}}">
-                        {{$reservation.LastName}}
+                            {{$reservation.LastName}}
                         </a>
-                        </td>
-                        <td>{{$reservation.Email}}</td>
-                        <td>{{$reservation.Phone}}</td>
-                        <td>{{dateformate $reservation.StartDate}}</td>
-                        <td>{{dateformate $reservation.EndDate}}</td>
-                        <td>{{$reservation.RoomID}}</td>
-                        <td>{{dateformate $reservation.CreatedAt}}</td>
-                        <td>{{dateformate $reservation.UpdatedAt}}</td>
-                        <td>{{$reservation.Room.ID}}</td>
-                        <td>{{$reservation.Room.RoomName}}</td>
-                        </tr>
-                    {{end}}
-                </tbody>
-            </table>
+                    </td>
+                    <td>{{$reservation.Email}}</td>
+                    <td>{{$reservation.Phone}}</td>
+                    <td>{{dateformate $reservation.StartDate}}</td>
+                    <td>{{dateformate $reservation.EndDate}}</td>
+                    <td>{{$reservation.RoomID}}</td>
+                    <td>{{dateformate $reservation.CreatedAt}}</td>
+                    <td>{{dateformate $reservation.UpdatedAt}}</td>
+                    <td>{{$reservation.Room.ID}}</td>
+                    <td>{{$reservation.Room.RoomName}}</td>
+                </tr>
+                {{end}}
+            </tbody>
+        </table>
     </div>
 </div>
 {{end}}
 
 {{define "js"}}
-    <script src="https://cdn.jsdelivr.net/npm/simple-datatables@latest" type="text/javascript"></script>
+<script src="https://cdn.jsdelivr.net/npm/simple-datatables@latest" type="text/javascript"></script>
 
-    <script>
-    document.addEventListener("DOMContentLoaded", function(){
-                                                    const dataTable = new simpleDatatables.DataTable("#new-res", {
-                                                        select: 5, sort: "desc",
-                                                    })
+<script>
+    document.addEventListener("DOMContentLoaded", function () {
+        const dataTable = new simpleDatatables.DataTable("#new-res", {
+            select: 5, sort: "desc",
         })
-    </script>
+    })
+</script>
 {{end}}
\ No newline at end of file
diff --git a/templates/admin-reservations-show.page.tmpl b/templates/admin-reservations-show.page.tmpl
index f8366e6..16be64d 100644
--- a/templates/admin-reservations-show.page.tmpl
+++ b/templates/admin-reservations-show.page.tmpl
@@ -1,22 +1,22 @@
 {{template "admin" .}}
 
 {{define "page-title"}}
-    Reservations
+Reservations
 {{end}}
 
 {{define "content"}}
-    {{$reservation := index .Data "reservation"}}
-    {{$src := index .StringMap "src"}}
-    <div class="col-md-12">
-        <p>
+{{$reservation := index .Data "reservation"}}
+{{$src := index .StringMap "src"}}
+<div class="col-md-12">
+    <p>
         <strong>Arrival:</strong> {{dateformate $reservation.StartDate}}<br>
         <strong>Departue:</strong> {{dateformate $reservation.EndDate}}<br>
-        </p>
-        <div class="table-responsive">
+    </p>
+    <div class="table-responsive">
 
-            <table class="table table-striped table-hover" id="new-res">
-                <thead>
-                    <tr>
+        <table class="table table-striped table-hover" id="new-res">
+            <thead>
+                <tr>
                     <th>ID</th>
                     <th>New</th>
                     <th>First Name</th>
@@ -29,102 +29,97 @@
                     <th>Created At</th>
                     <th>Updated At</th>
                     <th>Room Name</th>
-                    </tr>
-                </thead>
-                <tbody>
-                        <tr>
-                        <td>{{$reservation.ID}}</td>
-                        <td>{{$reservation.Processed}}</td>
-                        <td>{{$reservation.FirstName}}</td>
-                        <td>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td>{{$reservation.ID}}</td>
+                    <td>{{$reservation.Processed}}</td>
+                    <td>{{$reservation.FirstName}}</td>
+                    <td>
                         <a href="/admin/reservations/new/{{$reservation.ID}}">
-                        {{$reservation.LastName}}
+                            {{$reservation.LastName}}
                         </a>
-                        </td>
-                        <td>{{$reservation.Email}}</td>
-                        <td>{{$reservation.Phone}}</td>
-                        <td>{{dateformate $reservation.StartDate}}</td>
-                        <td>{{dateformate $reservation.EndDate}}</td>
-                        <td>{{$reservation.RoomID}}</td>
-                        <td>{{dateformate $reservation.CreatedAt}}</td>
-                        <td>{{dateformate $reservation.UpdatedAt}}</td>
-                        <td>{{$reservation.Room.RoomName}}</td>
-                        </tr>
-                </tbody>
-            </table>
+                    </td>
+                    <td>{{$reservation.Email}}</td>
+                    <td>{{$reservation.Phone}}</td>
+                    <td>{{dateformate $reservation.StartDate}}</td>
+                    <td>{{dateformate $reservation.EndDate}}</td>
+                    <td>{{$reservation.RoomID}}</td>
+                    <td>{{dateformate $reservation.CreatedAt}}</td>
+                    <td>{{dateformate $reservation.UpdatedAt}}</td>
+                    <td>{{$reservation.Room.RoomName}}</td>
+                </tr>
+            </tbody>
+        </table>
 
-            <form method="post" action="/admin/reservations/{{$src}}/{{$reservation.ID}}" novalidate>
-                <input type="hidden" name="csrf_token" value="{{.CSRFToken}}">
+        <form method="post" action="/admin/reservations/{{$src}}/{{$reservation.ID}}" novalidate>
+            <input type="hidden" name="csrf_token" value="{{.CSRFToken}}">
 
-                <div class="form-group mt-3">
-                    <label for="first_name">First Name:</label>
-                    {{with.Form.Errors.Get "first_name"}}
-                    <label class="text-danger">{{.}}</label>
-                    {{end}}
-                    <input class='form-control {{ with.Form.Errors.Get "first_name"}} is-invalid {{end}}'
-                           id="first_name" autocomplete="off" type='text'
-                           name='first_name' value="{{$reservation.FirstName}}" required>
-                </div>
+            <div class="form-group mt-3">
+                <label for="first_name">First Name:</label>
+                {{with.Form.Errors.Get "first_name"}}
+                <label class="text-danger">{{.}}</label>
+                {{end}}
+                <input class='form-control {{ with.Form.Errors.Get "first_name"}} is-invalid {{end}}' id="first_name"
+                    autocomplete="off" type='text' name='first_name' value="{{$reservation.FirstName}}" required>
+            </div>
 
-                <div class="form-group">
-                    <label for="last_name">Last Name:</label>
-                    {{with.Form.Errors.Get "last_name"}}
-                    <label class="text-danger">{{.}}</label>
-                    {{end}}
-                    <input class='form-control {{ with.Form.Errors.Get "last_name"}} is-invalid {{end}}'
-                           id="last_name" autocomplete="off" type='text'
-                           name='last_name' value="{{$reservation.LastName}}" required>
-                </div>
+            <div class="form-group">
+                <label for="last_name">Last Name:</label>
+                {{with.Form.Errors.Get "last_name"}}
+                <label class="text-danger">{{.}}</label>
+                {{end}}
+                <input class='form-control {{ with.Form.Errors.Get "last_name"}} is-invalid {{end}}' id="last_name"
+                    autocomplete="off" type='text' name='last_name' value="{{$reservation.LastName}}" required>
+            </div>
 
-                <div class="form-group">
-                    <label for="email">Email:</label>
-                    {{with.Form.Errors.Get "email"}}
-                    <label class="text-danger">{{.}}</label>
-                    {{end}}
-                    <input class='form-control {{ with.Form.Errors.Get "email"}} is-invalid {{end}}'
-                           id="email" autocomplete="off" type='email'
-                           name='email' value="{{$reservation.Email}}" required>
-                </div>
+            <div class="form-group">
+                <label for="email">Email:</label>
+                {{with.Form.Errors.Get "email"}}
+                <label class="text-danger">{{.}}</label>
+                {{end}}
+                <input class='form-control {{ with.Form.Errors.Get "email"}} is-invalid {{end}}' id="email"
+                    autocomplete="off" type='email' name='email' value="{{$reservation.Email}}" required>
+            </div>
 
-                <div class="form-group">
-                    <label for="phone">Phone:</label>
-                    {{with.Form.Errors.Get "phone"}}
-                    <label class="text-danger">{{.}}</label>
-                    {{end}}
-                    <input class='form-control {{ with.Form.Errors.Get "phone"}} is-invalid {{end}}' 
-                           id="phone" autocomplete="off" type='text'
-                           name='phone' value="{{$reservation.Phone}}" required>
-                </div>
+            <div class="form-group">
+                <label for="phone">Phone:</label>
+                {{with.Form.Errors.Get "phone"}}
+                <label class="text-danger">{{.}}</label>
+                {{end}}
+                <input class='form-control {{ with.Form.Errors.Get "phone"}} is-invalid {{end}}' id="phone"
+                    autocomplete="off" type='text' name='phone' value="{{$reservation.Phone}}" required>
+            </div>
 
-                <hr>
-                <input type="submit" class="btn btn-primary" value="Save">
-                <a href="/admin/reservations-{{$src}}" class="btn btn-warning">Cancel</a>
+            <hr>
+            <input type="submit" class="btn btn-primary" value="Save">
+            <a href="/admin/reservations-{{$src}}" class="btn btn-warning">Cancel</a>
 
-                <a href="#!" class="btn btn-info" onclick="processRes({{$reservation.ID}})">Mark As Processed</a>
-            </form>
+            <a href="#!" class="btn btn-info" onclick="processRes({{$reservation.ID}})">Mark As Processed</a>
+        </form>
 
     </div>
 </div>
 
-    </div>
+</div>
 {{end}}
 
 {{define "js"}}
- {{$src := index .StringMap "src"}}
-    <script>
-            function processRes(id) {
-                attention.custom({
-                    title: 'Confirmation',
-                    icon: 'warning',
-                    msg: 'Are you sure?',
-                    callback: function(result) {
-                           if (result !== false) {
-                            window.location.href = "/admin/processes-reservation/{{$src}}/" + id;
-                        }
-                    }
-                });
+{{$src := index .StringMap "src"}}
+<script>
+    function processRes(id) {
+        attention.custom({
+            title: 'Confirmation',
+            icon: 'warning',
+            msg: 'Are you sure?',
+            callback: function (result) {
+                if (result !== false) {
+                    window.location.href = "/admin/processes-reservation/{{$src}}/" + id;
+                }
             }
+        });
+    }
 
-    </script>
-{{end}}
-
+</script>
+{{end}}
\ No newline at end of file
diff --git a/templates/admin.layout.tmpl b/templates/admin.layout.tmpl
index 71f2e10..4590e8f 100644
--- a/templates/admin.layout.tmpl
+++ b/templates/admin.layout.tmpl
@@ -1,48 +1,50 @@
 {{define "admin"}}
-    <!DOCTYPE html>
-    <html lang="en">
+<!DOCTYPE html>
+<html lang="en">
 
-    <head>
-        <!-- Required meta tags -->
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-        <title>Administration</title>
+<head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <title>Administration</title>
 
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css"
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css"
         integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">
-        <link rel="stylesheet"
-            href="https://cdn.jsdelivr.net/npm/vanillajs-datepicker@1.1.2/dist/css/datepicker-bs4.min.css">
-        <link rel="stylesheet" type="text/css" href="https://unpkg.com/notie/dist/notie.min.css">
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/sweetalert2@10.15.5/dist/sweetalert2.min.css">
-
-        <link rel="stylesheet" type="text/css" href="/static/css/styles.css">
-
-        <!-- plugins:css -->
-        <link rel="stylesheet" href="/static/admin/css/style.css">
-        <link rel="stylesheet" href="/static/admin/vendors/ti-icons/css/themify-icons.css">
-        <link rel="stylesheet" href="/static/admin/vendors/base/vendor.bundle.base.css">
-        <!-- endinject -->
-        <!-- plugin css for this page -->
-        <!-- End plugin css for this page -->
-        <!-- inject:css -->
-        <!-- endinject -->
-        <link rel="shortcut icon" href="/static/admin/images/favicon.png"/>
-
-        {{block "css" . }}
-
-        <style>
-                label {
-                font-weight: bold
-                }
-                .notie-container {
-                    z-index: 4000
-                }
-        </style>
-
-        {{end}}
-
-    </head>
-    <body>
+    <link rel="stylesheet"
+        href="https://cdn.jsdelivr.net/npm/vanillajs-datepicker@1.1.2/dist/css/datepicker-bs4.min.css">
+    <link rel="stylesheet" type="text/css" href="https://unpkg.com/notie/dist/notie.min.css">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/sweetalert2@10.15.5/dist/sweetalert2.min.css">
+
+    <link rel="stylesheet" type="text/css" href="/static/css/styles.css">
+
+    <!-- plugins:css -->
+    <link rel="stylesheet" href="/static/admin/css/style.css">
+    <link rel="stylesheet" href="/static/admin/vendors/ti-icons/css/themify-icons.css">
+    <link rel="stylesheet" href="/static/admin/vendors/base/vendor.bundle.base.css">
+    <!-- endinject -->
+    <!-- plugin css for this page -->
+    <!-- End plugin css for this page -->
+    <!-- inject:css -->
+    <!-- endinject -->
+    <link rel="shortcut icon" href="/static/admin/images/favicon.png" />
+
+    {{block "css" . }}
+
+    <style>
+        label {
+            font-weight: bold
+        }
+
+        .notie-container {
+            z-index: 4000
+        }
+    </style>
+
+    {{end}}
+
+</head>
+
+<body>
     <div class="container-scroller">
         <!-- partial:partials/_navbar.html -->
         <nav class="navbar col-lg-12 col-12 p-0 fixed-top d-flex flex-row">
@@ -79,7 +81,7 @@
                     </li>
                     <li class="nav-item">
                         <a class="nav-link" data-bs-toggle="collapse" href="#ui-basic" aria-expanded="false"
-                           aria-controls="ui-basic">
+                            aria-controls="ui-basic">
                             <i class="ti-palette menu-icon"></i>
                             <span class="menu-title">Reservations</span>
                             <i class="menu-arrow"></i>
@@ -141,8 +143,8 @@
 
     <!-- plugins:js -->
     <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"
-      integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj"
-      crossorigin="anonymous"></script>
+        integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj"
+        crossorigin="anonymous"></script>
 
 
     <script src="/static/admin/vendors/base/vendor.bundle.base.js"></script>
@@ -161,7 +163,7 @@
     <script src="https://cdn.jsdelivr.net/npm/sweetalert2@10.15.5/dist/sweetalert2.min.js"></script>
     <script src="/static/js/app.js"> </script>
     <script src="/static/admin/js/dashboard.js"></script>
-   
+
 
     <!-- End custom js for this page-->
 
@@ -184,17 +186,17 @@
             })
         }
 
-        {{with .Error}}
+        { { with .Error} }
         notify("{{.}}", "error")
-        {{end}}
+        { { end } }
 
-        {{with .Flash}}
+        { { with .Flash} }
         notify("{{.}}", "success")
-        {{end}}
+        { { end } }
 
-        {{with .Warning}}
+        { { with .Warning} }
         notify("{{.}}", "warning")
-        {{end}}
+        { { end } }
     </script>
 
 
@@ -202,9 +204,9 @@
     {{block "js" . }}
 
     {{end}}
-    </body>
+</body>
 
-    </html>
+</html>
 
 
 {{end}}
\ No newline at end of file
diff --git a/templates/choose-room.page.tmpl b/templates/choose-room.page.tmpl
index 03adc96..ba996e3 100644
--- a/templates/choose-room.page.tmpl
+++ b/templates/choose-room.page.tmpl
@@ -2,23 +2,23 @@
 
 {{define "content"}}
 
-    <div class="container">
-        <div class="row">
-            <div class="col-md-12">
-                <h1>Choose a room</h1>
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <h1>Choose a room</h1>
 
-                {{$rooms := index .Data "rooms"}}
+            {{$rooms := index .Data "rooms"}}
 
-                <ul>
+            <ul>
                 {{range $rooms}}
-                   <li><a href="/choose-room/{{.ID}}"> {{.RoomName}}</a> </il>
-                {{end}}
-                </ul>
-               
-                </div>
-            </div>
+                <li><a href="/choose-room/{{.ID}}"> {{.RoomName}}</a> </il>
+                    {{end}}
+            </ul>
+
         </div>
+    </div>
+</div>
 
 
 
-{{end}}
+{{end}}
\ No newline at end of file
diff --git a/templates/contact.html b/templates/contact.html
index c09a44b..c22547f 100644
--- a/templates/contact.html
+++ b/templates/contact.html
@@ -1,105 +1,113 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Bootstrap demo</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-  
-    <style>
-        .my-footer {
-            height: 5em;
-            padding: 1em;
-            background-color: #000;
-            color: #fff;
-            margin-top: 1em;
-            font-size: 80%;
-        }
-        .room-image {
-            max-width: 50%;
-            height: auto;
-        }
-    </style>
-  
-  </head>
-  <body>
 
-<nav class="navbar bg-dark border-bottom border-body" data-bs-theme="dark">
-  <div class="container-fluid">
-    <a class="navbar-brand" href="#">Navbar</a>
-    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-      <span class="navbar-toggler-icon"></span>
-    </button>
-    <div class="collapse navbar-collapse" id="navbarSupportedContent">
-      <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-        <li class="nav-item">
-          <a class="nav-link active" aria-current="page" href="/index">Home</a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="/about">About</a>
-        </li>
-        <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-            Rooms
-          </a>
-          <ul class="dropdown-menu">
-            <li><a class="dropdown-item" href="/rooms/generals-quarters">General's Quarters</a></li>
-            <li><a class="dropdown-item" href="/rooms/majors-suite">Major's Suite</a></li>
-          </ul>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link active" aria-current="/reservation" href="/">Book Now</a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link active" aria-current="/contact" href="/">Contact</a>
-        </li>
-      </ul>
-      <form class="d-flex" role="search">
-        <input class="form-control me-2" type="search" placeholder="Search" aria-label="Search">
-        <button class="btn btn-outline-success" type="submit">Search</button>
-      </form>
-    </div>
-  </div>
-</nav>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Bootstrap demo</title>
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
+    integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+
+  <style>
+    .my-footer {
+      height: 5em;
+      padding: 1em;
+      background-color: #000;
+      color: #fff;
+      margin-top: 1em;
+      font-size: 80%;
+    }
+
+    .room-image {
+      max-width: 50%;
+      height: auto;
+    }
+  </style>
 
-    <div class="container">
-        <div class="row">
-            <div class="col">
-                <h1> Column1 </h1>
-            </div>
-            <div class="col">
-                <h1> Column2 </h1>
-            </div>
-            <div class="col">
-                <h1> Column3 </h1>
-            </div>
-            <div class="col">
-                <h1> Column4 </h1>
-            </div>
-        </div>
+</head>
 
-            <div class="col">
-            <h1 class="text-center mt-4"> This will be the contact page </h1>
-            <p> Some text. Some text. Some text. Some text. </p>
-            </div>
-        </div>
+<body>
+
+  <nav class="navbar bg-dark border-bottom border-body" data-bs-theme="dark">
+    <div class="container-fluid">
+      <a class="navbar-brand" href="#">Navbar</a>
+      <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
+        aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
+      <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+          <li class="nav-item">
+            <a class="nav-link active" aria-current="page" href="/index">Home</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="/about">About</a>
+          </li>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+              Rooms
+            </a>
+            <ul class="dropdown-menu">
+              <li><a class="dropdown-item" href="/rooms/generals-quarters">General's Quarters</a></li>
+              <li><a class="dropdown-item" href="/rooms/majors-suite">Major's Suite</a></li>
+            </ul>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link active" aria-current="/reservation" href="/">Book Now</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link active" aria-current="/contact" href="/">Contact</a>
+          </li>
+        </ul>
+        <form class="d-flex" role="search">
+          <input class="form-control me-2" type="search" placeholder="Search" aria-label="Search">
+          <button class="btn btn-outline-success" type="submit">Search</button>
+        </form>
+      </div>
+    </div>
+  </nav>
+
+  <div class="container">
+    <div class="row">
+      <div class="col">
+        <h1> Column1 </h1>
+      </div>
+      <div class="col">
+        <h1> Column2 </h1>
+      </div>
+      <div class="col">
+        <h1> Column3 </h1>
+      </div>
+      <div class="col">
+        <h1> Column4 </h1>
+      </div>
+    </div>
 
+    <div class="col">
+      <h1 class="text-center mt-4"> This will be the contact page </h1>
+      <p> Some text. Some text. Some text. Some text. </p>
     </div>
   </div>
 
-    <div class="row my-footer">
-        <div class="col">
-        left
-        </div>
-        <div class="col">
-        middle
-        </div>
-        <div class="col">
-        right
-        </div>
+  </div>
+  </div>
+
+  <div class="row my-footer">
+    <div class="col">
+      left
+    </div>
+    <div class="col">
+      middle
     </div>
+    <div class="col">
+      right
+    </div>
+  </div>
+
+
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
+    integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
+    crossorigin="anonymous"></script>
+</body>
 
-    
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
-  </body>
 </html>
\ No newline at end of file
diff --git a/templates/generals.page.tmpl b/templates/generals.page.tmpl
index a2e5555..c9e53d8 100644
--- a/templates/generals.page.tmpl
+++ b/templates/generals.page.tmpl
@@ -16,34 +16,35 @@
         <div class="col">
             <h1> Column4 </h1>
         </div>
-    <div class="row">
+        <div class="row">
 
-    <div class="row">
-        <div class="col">
-            <img src="/static/images/generals-quarters.png" class="img-fluid img-thumbnail mx-auto d-block room-image" alt="Responsive image">
-        </div>
-    </div>
+            <div class="row">
+                <div class="col">
+                    <img src="/static/images/generals-quarters.png"
+                        class="img-fluid img-thumbnail mx-auto d-block room-image" alt="Responsive image">
+                </div>
+            </div>
 
-        <div class="col">
-        <h1 class="text-center mt-4"> Generals Quarters </h1>
-        <p> Some text. Some text. Some text. Some text. </p>
+            <div class="col">
+                <h1 class="text-center mt-4"> Generals Quarters </h1>
+                <p> Some text. Some text. Some text. Some text. </p>
+            </div>
         </div>
-    </div>
-    <div class="row">
-        <div class="col text-center">
-            <a id="check-availability-button" href="#!" class="btn btn-success">Check Availability</a>
+        <div class="row">
+            <div class="col text-center">
+                <a id="check-availability-button" href="#!" class="btn btn-success">Check Availability</a>
+            </div>
         </div>
     </div>
 </div>
-</div>
 
 {{end}}
 
 {{define "js"}}
 <script>
 
-document.getElementById("check-availability-button").addEventListener("click", function () {
-      let html = `
+    document.getElementById("check-availability-button").addEventListener("click", function () {
+        let html = `
       <form id="check-availability-form" action="" method="post" novalidate class="needs-validation">
           <div class="form-row">
               <div class="col">
@@ -60,11 +61,11 @@ document.getElementById("check-availability-button").addEventListener("click", f
           </div>
       </form>
       `;
-      attention.custom({
-          title: 'Choose your dates',
-          msg: html,
-          
-        willOpen: () => {
+        attention.custom({
+            title: 'Choose your dates',
+            msg: html,
+
+            willOpen: () => {
                 const elem = document.getElementById("reservation-dates-modal");
                 const rp = new DateRangePicker(elem, {
                     format: 'yyyy-mm-dd',
@@ -73,52 +74,52 @@ document.getElementById("check-availability-button").addEventListener("click", f
                 })
             },
 
-        didOpen: () => {
-            document.getElementById("start").removeAttribute("disabled");
-            document.getElementById("end").removeAttribute("disabled");
-        },
-              
-
-
-          callback: function (result){
-            console.log("callback");
-
-            let form = document.getElementById("check-availability-form");
-            let formData = new FormData(form);
-            formData.append ("csrf_token", "{{.CSRFToken}}");
-            formData.append("room_id", "1");
-
-            fetch('/search-availability-json', {
-                method: 'post',
-                body: formData,
-                
-            })
-                .then(response => response.json())
-                .then(data => {
-                    console.log(data);
-                    if (data.ok){
-                        attention.custom({
-                            icon: 'success',
-                            showConfirmButton: false,
-                            msg: '<p>Room is Available</p>'
-                            + '<p><a href="/book-room?id='
-                            + data.room_id
-                            + '&s='
-                            + data.start_date
-                            + '&e='
-                            + data.end_date
-                            + '" class="btn btn-primary">'
-                            + 'Book Now!</a></p>'
-                        });
-                    } else{
-                        attention.error({
-                            msg: "Not Available",
-                        });
-                    }
+            didOpen: () => {
+                document.getElementById("start").removeAttribute("disabled");
+                document.getElementById("end").removeAttribute("disabled");
+            },
+
+
+
+            callback: function (result) {
+                console.log("callback");
+
+                let form = document.getElementById("check-availability-form");
+                let formData = new FormData(form);
+                formData.append("csrf_token", "{{.CSRFToken}}");
+                formData.append("room_id", "1");
+
+                fetch('/search-availability-json', {
+                    method: 'post',
+                    body: formData,
+
                 })
-          }
-      });
-  })
+                    .then(response => response.json())
+                    .then(data => {
+                        console.log(data);
+                        if (data.ok) {
+                            attention.custom({
+                                icon: 'success',
+                                showConfirmButton: false,
+                                msg: '<p>Room is Available</p>'
+                                    + '<p><a href="/book-room?id='
+                                    + data.room_id
+                                    + '&s='
+                                    + data.start_date
+                                    + '&e='
+                                    + data.end_date
+                                    + '" class="btn btn-primary">'
+                                    + 'Book Now!</a></p>'
+                            });
+                        } else {
+                            attention.error({
+                                msg: "Not Available",
+                            });
+                        }
+                    })
+            }
+        });
+    })
 
 </script>
 
diff --git a/templates/home.page.tmpl b/templates/home.page.tmpl
index d93f85a..81ae7d2 100644
--- a/templates/home.page.tmpl
+++ b/templates/home.page.tmpl
@@ -3,72 +3,73 @@
 
 <div id="main-carousel" class="carousel slide carousel-fade">
 
-    <div class="carousel-indicators">
-      <button type="button" data-bs-target="#main-carousel" data-bs-slide-to="0" class="active" aria-current="true" aria-label="Slide 1"></button>
-      <button type="button" data-bs-target="#main-carousel" data-bs-slide-to="1" aria-label="Slide 2"></button>
-      <button type="button" data-bs-target="#main-carousel" data-bs-slide-to="2" aria-label="Slide 3"></button>
-    </div>
-  
-    <div class="carousel-inner">
-      <div class="carousel-item active">
-        <img src="/static/images/woman-laptop.png" class="d-block w-100" alt="woman-laptop">
-          <div class="carousel-caption d-none d-md-block">
-            <h5>First slide label</h5>
-            <p>Some representative placeholder content for the first slide.</p>
-          </div>
+  <div class="carousel-indicators">
+    <button type="button" data-bs-target="#main-carousel" data-bs-slide-to="0" class="active" aria-current="true"
+      aria-label="Slide 1"></button>
+    <button type="button" data-bs-target="#main-carousel" data-bs-slide-to="1" aria-label="Slide 2"></button>
+    <button type="button" data-bs-target="#main-carousel" data-bs-slide-to="2" aria-label="Slide 3"></button>
+  </div>
+
+  <div class="carousel-inner">
+    <div class="carousel-item active">
+      <img src="/static/images/woman-laptop.png" class="d-block w-100" alt="woman-laptop">
+      <div class="carousel-caption d-none d-md-block">
+        <h5>First slide label</h5>
+        <p>Some representative placeholder content for the first slide.</p>
       </div>
-      <div class="carousel-item">
-        <img src="/static/images/tray.png" class="d-block w-100" alt="tray">
-          <div class="carousel-caption d-none d-md-block">
-            <h5>Second slide label</h5>
-            <p>Some representative placeholder content for the first slide.</p>
-          </div>
+    </div>
+    <div class="carousel-item">
+      <img src="/static/images/tray.png" class="d-block w-100" alt="tray">
+      <div class="carousel-caption d-none d-md-block">
+        <h5>Second slide label</h5>
+        <p>Some representative placeholder content for the first slide.</p>
       </div>
-      <div class="carousel-item">
-        <img src="/static/images/outside.png" class="d-block w-100" alt="outside">
-          <div class="carousel-caption d-none d-md-block">
-            <h5>Third slide label</h5>
-            <p>Some representative placeholder content for the first slide.</p>
-          </div>      
+    </div>
+    <div class="carousel-item">
+      <img src="/static/images/outside.png" class="d-block w-100" alt="outside">
+      <div class="carousel-caption d-none d-md-block">
+        <h5>Third slide label</h5>
+        <p>Some representative placeholder content for the first slide.</p>
       </div>
     </div>
-    <button class="carousel-control-prev" type="button" data-bs-target="#carouselExample" data-bs-slide="prev">
-      <span class="carousel-control-prev-icon" aria-hidden="true"></span>
-      <span class="visually-hidden">Previous</span>
-    </button>
-    <button class="carousel-control-next" type="button" data-bs-target="#carouselExample" data-bs-slide="next">
-      <span class="carousel-control-next-icon" aria-hidden="true"></span>
-      <span class="visually-hidden">Next</span>
-    </button>
   </div>
-  
-      <div class="container">
-          <div class="row">
-              <div class="col">
-                  <h1> Column1 </h1>
-              </div>
-              <div class="col">
-                  <h1> Column2 </h1>
-              </div>
-              <div class="col">
-                  <h1> Column3 </h1>
-              </div>
-              <div class="col">
-                  <h1> Column4 </h1>
-              </div>
-            </div>
-          <div class="row">
-              <div class="col">
-              <h1 class="text-center mt-4"> Welcome </h1>
-              <p> Some text. Some text. Some text. Some text. </p>
-              </div>
-          </div>
-          <div class="row">
-              <div class="col text-center">
-                  <a href="/search-availability" class="btn btn-success">Make Reservation</a>
-              </div>
-          </div>
-      </div>
+  <button class="carousel-control-prev" type="button" data-bs-target="#carouselExample" data-bs-slide="prev">
+    <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+    <span class="visually-hidden">Previous</span>
+  </button>
+  <button class="carousel-control-next" type="button" data-bs-target="#carouselExample" data-bs-slide="next">
+    <span class="carousel-control-next-icon" aria-hidden="true"></span>
+    <span class="visually-hidden">Next</span>
+  </button>
+</div>
+
+<div class="container">
+  <div class="row">
+    <div class="col">
+      <h1> Column1 </h1>
+    </div>
+    <div class="col">
+      <h1> Column2 </h1>
     </div>
+    <div class="col">
+      <h1> Column3 </h1>
+    </div>
+    <div class="col">
+      <h1> Column4 </h1>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col">
+      <h1 class="text-center mt-4"> Welcome </h1>
+      <p> Some text. Some text. Some text. Some text. </p>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col text-center">
+      <a href="/search-availability" class="btn btn-success">Make Reservation</a>
+    </div>
+  </div>
+</div>
+</div>
 
-{{end}}
+{{end}}
\ No newline at end of file
diff --git a/templates/login.page.tmpl b/templates/login.page.tmpl
index b5813d8..e7e68c3 100644
--- a/templates/login.page.tmpl
+++ b/templates/login.page.tmpl
@@ -1,38 +1,36 @@
 {{template "base" .}}
 
 {{define "content"}}
-    <div class="container">
-        <div class="row">
-            <div class="col">
-                <h1>Login</h1>
+<div class="container">
+    <div class="row">
+        <div class="col">
+            <h1>Login</h1>
 
-                <form method="post" action="/user-login" novalidate>
-                    <input type="hidden" name="csrf_token" value="{{.CSRFToken}}">
-                    
-                    <div class="form-group mt-3">
-                        <label for="emial">Email</label>
-                        {{with.Form.Errors.Get "email"}}
-                        <label class="text-danger">{{.}}</label>
-                        {{end}}
-                        <input class='form-control {{ with.Form.Errors.Get "email"}} is-invalid {{end}}'
-                            id="email" autocomplete="off" type='email'
-                            name='email' value="" required>
-                    </div>
-                    <div class="form-group">
-                        <label for="password">Password</label>
-                        {{with.Form.Errors.Get "password"}}
-                        <label class="text-danger">{{.}}</label>
-                        {{end}}
-                        <input class='form-control {{ with.Form.Errors.Get "password"}} is-invalid {{end}}'
-                            id="password" autocomplete="off" type='password'
-                            name='password' value="" required>
-                    </div>
-                    <hr>
-                    <input type="submit" class="button-primary" value="submit">
-                </form>
-            </div>
+            <form method="post" action="/user-login" novalidate>
+                <input type="hidden" name="csrf_token" value="{{.CSRFToken}}">
+
+                <div class="form-group mt-3">
+                    <label for="emial">Email</label>
+                    {{with.Form.Errors.Get "email"}}
+                    <label class="text-danger">{{.}}</label>
+                    {{end}}
+                    <input class='form-control {{ with.Form.Errors.Get "email"}} is-invalid {{end}}' id="email"
+                        autocomplete="off" type='email' name='email' value="" required>
+                </div>
+                <div class="form-group">
+                    <label for="password">Password</label>
+                    {{with.Form.Errors.Get "password"}}
+                    <label class="text-danger">{{.}}</label>
+                    {{end}}
+                    <input class='form-control {{ with.Form.Errors.Get "password"}} is-invalid {{end}}' id="password"
+                        autocomplete="off" type='password' name='password' value="" required>
+                </div>
+                <hr>
+                <input type="submit" class="button-primary" value="submit">
+            </form>
         </div>
     </div>
+</div>
 
 
-{{end}}
+{{end}}
\ No newline at end of file
diff --git a/templates/majors.page.tmpl b/templates/majors.page.tmpl
index 0a56a7e..2d2a78b 100644
--- a/templates/majors.page.tmpl
+++ b/templates/majors.page.tmpl
@@ -16,34 +16,35 @@
         <div class="col">
             <h1> Column4 </h1>
         </div>
-    <div class="row">
+        <div class="row">
 
-    <div class="row">
-        <div class="col">
-            <img src="/static/images/marjors-suite.png" class="img-fluid img-thumbnail mx-auto d-block room-image" alt="Responsive image">
-        </div>
-    </div>
+            <div class="row">
+                <div class="col">
+                    <img src="/static/images/marjors-suite.png"
+                        class="img-fluid img-thumbnail mx-auto d-block room-image" alt="Responsive image">
+                </div>
+            </div>
 
-        <div class="col">
-        <h1 class="text-center mt-4"> Major's Suite </h1>
-        <p> Some text. Some text. Some text. Some text. </p>
+            <div class="col">
+                <h1 class="text-center mt-4"> Major's Suite </h1>
+                <p> Some text. Some text. Some text. Some text. </p>
+            </div>
         </div>
-    </div>
-    <div class="row">
-        <div class="col text-center">
-            <a id="check-availability-button" href="#!" class="btn btn-success">Check Availability</a>
+        <div class="row">
+            <div class="col text-center">
+                <a id="check-availability-button" href="#!" class="btn btn-success">Check Availability</a>
+            </div>
         </div>
     </div>
 </div>
-</div>
 
 {{end}}
 
 {{define "js"}}
 <script>
 
-document.getElementById("check-availability-button").addEventListener("click", function () {
-      let html = `
+    document.getElementById("check-availability-button").addEventListener("click", function () {
+        let html = `
       <form id="check-availability-form" action="" method="post" novalidate class="needs-validation">
           <div class="form-row">
               <div class="col">
@@ -60,11 +61,11 @@ document.getElementById("check-availability-button").addEventListener("click", f
           </div>
       </form>
       `;
-      attention.custom({
-          title: 'Choose your dates',
-          msg: html,
-          
-        willOpen: () => {
+        attention.custom({
+            title: 'Choose your dates',
+            msg: html,
+
+            willOpen: () => {
                 const elem = document.getElementById("reservation-dates-modal");
                 const rp = new DateRangePicker(elem, {
                     format: 'yyyy-mm-dd',
@@ -73,52 +74,52 @@ document.getElementById("check-availability-button").addEventListener("click", f
                 })
             },
 
-        didOpen: () => {
-            document.getElementById("start").removeAttribute("disabled");
-            document.getElementById("end").removeAttribute("disabled");
-        },
-              
-
-
-          callback: function (result){
-            console.log("callback");
-
-            let form = document.getElementById("check-availability-form");
-            let formData = new FormData(form);
-            formData.append ("csrf_token", "{{.CSRFToken}}");
-            formData.append("room_id", "2");
-
-            fetch('/search-availability-json', {
-                method: 'post',
-                body: formData,
-                
-            })
-                .then(response => response.json())
-                .then(data => {
-                    console.log(data);
-                    if (data.ok){
-                        attention.custom({
-                            icon: 'success',
-                            showConfirmButton: false,
-                            msg: '<p>Room is Available</p>'
-                            + '<p><a href="/book-room?id='
-                            + data.room_id
-                            + '&s='
-                            + data.start_date
-                            + '&e='
-                            + data.end_date
-                            + '" class="btn btn-primary">'
-                            + 'Book Now!</a></p>'
-                        });
-                    } else{
-                        attention.error({
-                            msg: "Not Available",
-                        });
-                    }
+            didOpen: () => {
+                document.getElementById("start").removeAttribute("disabled");
+                document.getElementById("end").removeAttribute("disabled");
+            },
+
+
+
+            callback: function (result) {
+                console.log("callback");
+
+                let form = document.getElementById("check-availability-form");
+                let formData = new FormData(form);
+                formData.append("csrf_token", "{{.CSRFToken}}");
+                formData.append("room_id", "2");
+
+                fetch('/search-availability-json', {
+                    method: 'post',
+                    body: formData,
+
                 })
-          }
-      });
-  })
+                    .then(response => response.json())
+                    .then(data => {
+                        console.log(data);
+                        if (data.ok) {
+                            attention.custom({
+                                icon: 'success',
+                                showConfirmButton: false,
+                                msg: '<p>Room is Available</p>'
+                                    + '<p><a href="/book-room?id='
+                                    + data.room_id
+                                    + '&s='
+                                    + data.start_date
+                                    + '&e='
+                                    + data.end_date
+                                    + '" class="btn btn-primary">'
+                                    + 'Book Now!</a></p>'
+                            });
+                        } else {
+                            attention.error({
+                                msg: "Not Available",
+                            });
+                        }
+                    })
+            }
+        });
+    })
 
 </script>
 
diff --git a/templates/make-reservation.page.tmpl b/templates/make-reservation.page.tmpl
index 311cd53..394f52f 100644
--- a/templates/make-reservation.page.tmpl
+++ b/templates/make-reservation.page.tmpl
@@ -1,74 +1,71 @@
 {{template "base" .}}
 
 {{define "content"}}
-    <div class="container">
-        <div class="row">
-            <div class="col">
-                {{$res := index .Data "reservation"}}
+<div class="container">
+    <div class="row">
+        <div class="col">
+            {{$res := index .Data "reservation"}}
 
-                <h1 class="mt-3">Make Reservation</h1>
+            <h1 class="mt-3">Make Reservation</h1>
 
-                <p><strong>Reservation Details</strong>
-                    Room: {{$res.Room.RoomName}} <br>
-                    Arrival: {{index .StringMap "start_date"}} <br>
-                    Departure: {{index .StringMap "end_date"}}
-                </p>
+            <p><strong>Reservation Details</strong>
+                Room: {{$res.Room.RoomName}} <br>
+                Arrival: {{index .StringMap "start_date"}} <br>
+                Departure: {{index .StringMap "end_date"}}
+            </p>
 
-                
-        
-                <form method="post" action="/make-reservation" novalidate>
-                    <input type="hidden" name="csrf_token" value="{{.CSRFToken}}">
-                    <input type="hidden" name="start_date" value="{{index .StringMap "start_date"}}">
-                    <input type="hidden" name="end_date" value="{{index .StringMap "end_date"}}">
-                    <input type="hidden" name="room_id" value="{{$res.RoomID}}">
 
-                    <div class="form-group mt-3">
-                        <label for="first_name">First Name:</label>
-                        {{with.Form.Errors.Get "first_name"}}
-                        <label class="text-danger">{{.}}</label>
-                        {{end}}
-                        <input class='form-control {{ with.Form.Errors.Get "first_name"}} is-invalid {{end}}'
-                               id="first_name" autocomplete="off" type='text'
-                               name='first_name' value="{{$res.FirstName}}" required>
-                    </div>
 
-                    <div class="form-group">
-                        <label for="last_name">Last Name:</label>
-                        {{with.Form.Errors.Get "last_name"}}
-                        <label class="text-danger">{{.}}</label>
-                        {{end}}
-                        <input class='form-control {{ with.Form.Errors.Get "last_name"}} is-invalid {{end}}'
-                               id="last_name" autocomplete="off" type='text'
-                               name='last_name' value="{{$res.LastName}}" required>
-                    </div>
+            <form method="post" action="/make-reservation" novalidate>
+                <input type="hidden" name="csrf_token" value="{{.CSRFToken}}">
+                <input type="hidden" name="start_date" value="{{index .StringMap " start_date"}}">
+                <input type="hidden" name="end_date" value="{{index .StringMap " end_date"}}">
+                <input type="hidden" name="room_id" value="{{$res.RoomID}}">
 
-                    <div class="form-group">
-                        <label for="email">Email:</label>
-                        {{with.Form.Errors.Get "email"}}
-                        <label class="text-danger">{{.}}</label>
-                        {{end}}
-                        <input class='form-control {{ with.Form.Errors.Get "email"}} is-invalid {{end}}'
-                               id="email" autocomplete="off" type='email'
-                               name='email' value="{{$res.Email}}" required>
-                    </div>
+                <div class="form-group mt-3">
+                    <label for="first_name">First Name:</label>
+                    {{with.Form.Errors.Get "first_name"}}
+                    <label class="text-danger">{{.}}</label>
+                    {{end}}
+                    <input class='form-control {{ with.Form.Errors.Get "first_name"}} is-invalid {{end}}'
+                        id="first_name" autocomplete="off" type='text' name='first_name' value="{{$res.FirstName}}"
+                        required>
+                </div>
 
-                    <div class="form-group">
-                        <label for="phone">Phone:</label>
-                        {{with.Form.Errors.Get "phone"}}
-                        <label class="text-danger">{{.}}</label>
-                        {{end}}
-                        <input class='form-control {{ with.Form.Errors.Get "phone"}} is-invalid {{end}}' 
-                               id="phone" autocomplete="off" type='email'
-                               name='phone' value="{{$res.Phone}}" required>
-                    </div>
+                <div class="form-group">
+                    <label for="last_name">Last Name:</label>
+                    {{with.Form.Errors.Get "last_name"}}
+                    <label class="text-danger">{{.}}</label>
+                    {{end}}
+                    <input class='form-control {{ with.Form.Errors.Get "last_name"}} is-invalid {{end}}' id="last_name"
+                        autocomplete="off" type='text' name='last_name' value="{{$res.LastName}}" required>
+                </div>
 
-                    <hr>
-                    <input type="submit" class="btn btn-primary" value="Make Reservation">
-                </form>
+                <div class="form-group">
+                    <label for="email">Email:</label>
+                    {{with.Form.Errors.Get "email"}}
+                    <label class="text-danger">{{.}}</label>
+                    {{end}}
+                    <input class='form-control {{ with.Form.Errors.Get "email"}} is-invalid {{end}}' id="email"
+                        autocomplete="off" type='email' name='email' value="{{$res.Email}}" required>
+                </div>
 
+                <div class="form-group">
+                    <label for="phone">Phone:</label>
+                    {{with.Form.Errors.Get "phone"}}
+                    <label class="text-danger">{{.}}</label>
+                    {{end}}
+                    <input class='form-control {{ with.Form.Errors.Get "phone"}} is-invalid {{end}}' id="phone"
+                        autocomplete="off" type='email' name='phone' value="{{$res.Phone}}" required>
+                </div>
+
+                <hr>
+                <input type="submit" class="btn btn-primary" value="Make Reservation">
+            </form>
 
-            </div>
-        </div>
 
+        </div>
     </div>
+
+</div>
 {{end}}
\ No newline at end of file
diff --git a/templates/reservation-summary.page.tmpl b/templates/reservation-summary.page.tmpl
index 8e669e9..aaf23da 100644
--- a/templates/reservation-summary.page.tmpl
+++ b/templates/reservation-summary.page.tmpl
@@ -2,19 +2,19 @@
 
 {{define "content"}}
 {{$res := index .Data "reservation"}}
-    <div class="container">
-        <div class="row">
-            <div class="col">
-                <h1 class="mt-5">Reservation Summary</h1>
-                <hr>
-                <table class="table table-striped">
-                    <thead>
+<div class="container">
+    <div class="row">
+        <div class="col">
+            <h1 class="mt-5">Reservation Summary</h1>
+            <hr>
+            <table class="table table-striped">
+                <thead>
 
                     <tr>
                     </tr>
 
-                    </thead>
-                    <tbody>
+                </thead>
+                <tbody>
                     <tr>
                         <td>Name:</td>
                         <td>{{$res.FirstName}} {{$res.LastName}}</td>
@@ -45,10 +45,10 @@
                         <td>{{$res.Phone}}</td>
                     </tr>
 
-                    </tbody>
-                </table>
-            </div>
+                </tbody>
+            </table>
         </div>
     </div>
+</div>
 
 {{end}}
\ No newline at end of file
diff --git a/templates/search-availability.page.tmpl b/templates/search-availability.page.tmpl
index fa9752a..79fdc37 100644
--- a/templates/search-availability.page.tmpl
+++ b/templates/search-availability.page.tmpl
@@ -1,37 +1,37 @@
 {{template "base" .}}
 
 {{define "content"}}
-    <div class="container">
-        <div class="row">
-            <div class="col-md-3"></div>
-            <div class="col-md-6">
-                <h1 class="mt-3">Search for Availability</h1>
-
-                <form action="/search-availability" method="post" novalidate class="needs-validation">
-                    <input type="hidden" name="csrf_token" value="{{.CSRFToken}}">
-                    <div class="row">
-                        <div class="col">
-                            <div class="row" id="reservation-dates">
-                                <div class="col-md-6">
-                                    <input required class="form-control" type="text" name="start" placeholder="Arrival">
-                                </div>
-                                <div class="col-md-6">
-                                    <input required class="form-control" type="text" name="end" placeholder="Departure">
-                                </div>
+<div class="container">
+    <div class="row">
+        <div class="col-md-3"></div>
+        <div class="col-md-6">
+            <h1 class="mt-3">Search for Availability</h1>
+
+            <form action="/search-availability" method="post" novalidate class="needs-validation">
+                <input type="hidden" name="csrf_token" value="{{.CSRFToken}}">
+                <div class="row">
+                    <div class="col">
+                        <div class="row" id="reservation-dates">
+                            <div class="col-md-6">
+                                <input required class="form-control" type="text" name="start" placeholder="Arrival">
+                            </div>
+                            <div class="col-md-6">
+                                <input required class="form-control" type="text" name="end" placeholder="Departure">
                             </div>
                         </div>
                     </div>
+                </div>
 
-                    <hr>
+                <hr>
 
-                    <button type="submit" class="btn btn-primary">Search Availability</button>
+                <button type="submit" class="btn btn-primary">Search Availability</button>
 
-                </form>
-            </div>
-            <div class="col-md-3"></div>
+            </form>
         </div>
-
+        <div class="col-md-3"></div>
     </div>
+
+</div>
 {{end}}
 
 
@@ -44,5 +44,4 @@
     });
     console.log(new Date());
 </script>
-{{end}}
-
+{{end}}
\ No newline at end of file