diff --git a/application/views/appointments/book.php b/application/views/appointments/book.php
index 41254e23..301e11f6 100755
--- a/application/views/appointments/book.php
+++ b/application/views/appointments/book.php
@@ -252,23 +252,34 @@
                                     <textarea id="notes" maxlength="500" class="form-control" rows="3"></textarea>
                                 </div>
                             </div>
+                        </div>
+                    </div>
 
-                            <?php if ($display_terms_and_conditions): ?>
-                            <label>
-                                <input type="checkbox" class="required" id="accept-to-terms-and-conditions">
-                                <?= strtr(lang('read_and_agree_to_terms_and_conditions'),
-                                    [
-                                        '{$link}' => '<a href="#" data-toggle="modal" data-target="#terms-and-conditions-modal">',
-                                        '{/$link}' => '</a>'
-                                    ])
-                                ?>
-                            </label>
-                            <br>
-                            <?php endif ?>
+                    <?php if ($display_terms_and_conditions): ?>
+                        <label>
+                            <input type="checkbox" class="required" id="accept-to-terms-and-conditions">
+                            <?= strtr(lang('read_and_agree_to_terms_and_conditions'),
+                                [
+                                    '{$link}' => '<a href="#" data-toggle="modal" data-target="#terms-and-conditions-modal">',
+                                    '{/$link}' => '</a>'
+                                ])
+                            ?>
+                        </label>
+                    <?php endif ?>
 
-                            <?php if ($display_privacy_policy): ?>
-                            <label>
-                                <input type="checkbox" class="required" id="accept-to-privacy-policy">
+                    <?php if ($display_privacy_policy): ?>
+                        <!-- <label>
+                            <input type="checkbox" class="required" id="accept-to-privacy-policy">
+                            <?= strtr(lang('read_and_agree_to_privacy_policy'),
+                                [
+                                    '{$link}' => '<a href="#" data-toggle="modal" data-target="#privacy-policy-modal">',
+                                    '{/$link}' => '</a>'
+                                ])
+                            ?>
+                        </label> -->
+                        <div class="form-check">
+                            <input type="checkbox" class="required form-check-input" id="accept-to-privacy-policy">
+                            <label class="form-check-label" for="defaultCheck1">
                                 <?= strtr(lang('read_and_agree_to_privacy_policy'),
                                     [
                                         '{$link}' => '<a href="#" data-toggle="modal" data-target="#privacy-policy-modal">',
@@ -276,12 +287,10 @@
                                     ])
                                 ?>
                             </label>
-                            <br>
-                            <?php endif ?>
-
-                            <span id="form-message" class="text-danger"><?= lang('fields_are_required') ?></span>
                         </div>
-                    </div>
+                    <?php endif ?>
+
+                    <span id="form-message" class="text-danger d-block"><?= lang('fields_are_required') ?></span>
 
                     <div class="command-buttons">
                         <button type="button" id="button-back-3" class="btn button-back btn-light"
diff --git a/assets/css/frontend.css b/assets/css/frontend.css
index 4cfd3977..c5c1fa31 100644
--- a/assets/css/frontend.css
+++ b/assets/css/frontend.css
@@ -66,7 +66,10 @@ body {
 
 #book-appointment-wizard .wizard-frame {
     padding: 10px 20px;
-    height: 560px;
+    height: 570px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
 }
 
 #book-appointment-wizard .wizard-frame .frame-container {
@@ -86,7 +89,8 @@ body {
 }
 
 #book-appointment-wizard .wizard-frame .command-buttons {
-    float: right;
+    display: flex;
+    justify-content: flex-end;
 }
 
 #book-appointment-wizard .wizard-frame .command-buttons .btn {
diff --git a/assets/css/general.css b/assets/css/general.css
index 99c82cec..6f78f12b 100644
--- a/assets/css/general.css
+++ b/assets/css/general.css
@@ -132,9 +132,9 @@ body .ui-datepicker td a.ui-state-highlight {
     background: #80E3AD !important;
     border-radius: 67px;
     color: #FFF !important;
-    width: 22px;
-    height: 22px;
-    line-height: 1.3;
+    width: 24px;
+    height: 24px;
+    line-height: 1.2;
     margin: 4px;
 
 }
@@ -406,3 +406,12 @@ body .popover-content button {
 body .popover-content a {
     margin-right: 5px;
 }
+
+.has-error .control-label,
+.has-error label {
+    color: #dc3545;
+}
+
+.has-error .form-control {
+    border-color: #dc3545;
+}
diff --git a/assets/js/backend_users.js b/assets/js/backend_users.js
index cd413ca0..03c6d122 100644
--- a/assets/js/backend_users.js
+++ b/assets/js/backend_users.js
@@ -66,16 +66,19 @@ window.BackendUsers = window.BackendUsers || {};
             $('<div/>', {
                 'class': 'checkbox',
                 'html': [
-                    $('<label/>', {
-                        'class': 'checkbox',
+                    $('<div/>', {
+                        'class': 'checkbox form-check',
                         'html': [
                             $('<input/>', {
+                                'class': 'form-check-input',
                                 'type': 'checkbox',
                                 'data-id': service.id
                             }),
-                            $('<span/>', {
-                                'text': service.name
-                            })
+                            $('<label/>', {
+                                'class': 'form-check-label',
+                                'text': service.name,
+                                'for': service.id
+                            }),
                         ]
                     })
                 ]
@@ -87,16 +90,19 @@ window.BackendUsers = window.BackendUsers || {};
             $('<div/>', {
                 'class': 'checkbox',
                 'html': [
-                    $('<label/>', {
-                        'class': 'checkbox',
+                    $('<div/>', {
+                        'class': 'checkbox form-check',
                         'html': [
                             $('<input/>', {
+                                'class': 'form-check-input',
                                 'type': 'checkbox',
                                 'data-id': provider.id
                             }),
-                            $('<span/>', {
-                                'text': provider.first_name + ' ' + provider.last_name
-                            })
+                            $('<label/>', {
+                                'class': 'form-check-label',
+                                'text': provider.first_name + ' ' + provider.last_name,
+                                'for': provider.id
+                            }),
                         ]
                     })
                 ]
@@ -156,19 +162,22 @@ window.BackendUsers = window.BackendUsers || {};
                             $('<div/>', {
                                 'class': 'checkbox',
                                 'html': [
-                                    $('<label/>', {
-                                        'class': 'checkbox',
+                                    $('<div/>', {
+                                        'class': 'checkbox form-check',
                                         'html': [
                                             $('<input/>', {
+                                                'class': 'form-check-input',
                                                 'type': 'checkbox',
                                                 'data-id': provider.id,
                                                 'prop': {
                                                     'disabled': true
                                                 }
                                             }),
-                                            $('<span/>', {
-                                                'text': provider.first_name + ' ' + provider.last_name
-                                            })
+                                            $('<label/>', {
+                                                'class': 'form-check-label',
+                                                'text': provider.first_name + ' ' + provider.last_name,
+                                                'for': provider.id
+                                            }),
                                         ]
                                     })
                                 ]
diff --git a/assets/js/working_plan.js b/assets/js/working_plan.js
index 7b147dc0..7cc3a155 100755
--- a/assets/js/working_plan.js
+++ b/assets/js/working_plan.js
@@ -64,19 +64,19 @@
                     $('<td/>', {
                         'html': [
                             $('<div/>', {
-                                'class': 'checkbox',
+                                'class': 'checkbox form-check',
                                 'html': [
+                                    $('<input/>', {
+                                        'class': 'form-check-input',
+                                        'type': 'checkbox',
+                                        'id': index
+                                    }),
                                     $('<label/>', {
-                                        'html': [
-                                            $('<input/>', {
-                                                'type': 'checkbox',
-                                                'id': index
-                                            }),
-                                            $('<span/>', {
-                                                'text': dayDisplayName
-                                            })
-                                        ]
-                                    })
+                                        'class': 'form-check-label',
+                                        'text': dayDisplayName,
+                                        'for': index
+                                    }),
+
                                 ]
                             })
                         ]