diff --git a/application/views/appointments/book.php b/application/views/appointments/book.php
index 2963a5f2..6b0c740f 100755
--- a/application/views/appointments/book.php
+++ b/application/views/appointments/book.php
@@ -71,16 +71,17 @@
                 </div>
                 <?php endif; ?>
 
-                <?php
-                    if (isset($exceptions)) {
-                        echo '<div style="margin: 10px">';
-                        echo '<h4>' . lang('unexpected_issues') . '</h4>';
-                        foreach($exceptions as $exception) {
-                            echo exceptionToHtml($exception);
-                        }
-                        echo '</div>';
-                    }
-                ?>
+                <?php if (isset($exceptions)): ?>
+                <div style="margin: 10px">
+                    <h4><?= lang('unexpected_issues') ?></h4>
+
+                    <?php foreach($exceptions as $exception): ?>
+                        <?= exceptionToHtml($exception) ?>
+                    <?php endforeach ?>
+                </div>
+                <?php endif ?>
+
+
 
                 <!-- SELECT SERVICE AND PROVIDER -->
 
@@ -162,7 +163,7 @@
                     </div>
 
                     <div class="command-buttons">
-                        <button type="button" id="button-next-1" class="btn button-next btn-info"
+                        <button type="button" id="button-next-1" class="btn button-next btn-primary"
                                 data-step_index="1">
                             <?= lang('next') ?>
                             <i class="fas fa-long-arrow-alt-right"></i>
@@ -197,7 +198,7 @@
                                 <i class="fas fa-long-arrow-alt-left"></i>
                             <?= lang('back') ?>
                         </button>
-                        <button type="button" id="button-next-2" class="btn button-next btn-info"
+                        <button type="button" id="button-next-2" class="btn button-next btn-primary"
                                 data-step_index="2">
                             <?= lang('next') ?>
                             <i class="fas fa-long-arrow-alt-right"></i>
@@ -290,7 +291,7 @@
                                 data-step_index="3"><i class="fas fa-long-arrow-alt-left"></i>
                             <?= lang('back') ?>
                         </button>
-                        <button type="button" id="button-next-3" class="btn button-next btn-info"
+                        <button type="button" id="button-next-3" class="btn button-next btn-primary"
                                 data-step_index="3">
                             <?= lang('next') ?>
                             <i class="fas fa-long-arrow-alt-right"></i>
diff --git a/application/views/appointments/book_success.php b/application/views/appointments/book_success.php
index df49772c..be4a3b16 100755
--- a/application/views/appointments/book_success.php
+++ b/application/views/appointments/book_success.php
@@ -21,36 +21,40 @@
                 <div class="col-xs-12">
                     <img id="success-icon" class="mt-0 mb-2" src="<?= base_url('assets/img/success.png') ?>" />
                 </div>
-                <div class="col-xs-12 col">
-                    <?php
-                        echo '
-                            <h3>' . lang('appointment_registered') . '</h3>
-                            <p>' . lang('appointment_details_was_sent_to_you') . '</p>
-                            <p><strong>' . lang('check_spam_folder') . '</strong></p>
-                            <a href="' . site_url() . '" class="btn btn-success btn-large">
-                                <i class="far fa-calendar-alt"></i> ' .
-                                lang('go_to_booking_page') . '
-                            </a>
-                        ';
+                <div class="col-xs-12">
+                    <h3><?= lang('appointment_registered') ?></h3>
 
-                        if (config('google_sync_feature')) {
-                            echo '
-                                <button id="add-to-google-calendar" class="btn btn-primary">
-                                    <i class="fas fa-plus"></i>
-                                    ' . lang('add_to_google_calendar') . '
-                                </button>';
-                        }
+                    <p>
+                        <?=  lang('appointment_details_was_sent_to_you') ?>
+                    </p>
 
-                        // Display exceptions (if any).
-                        if (isset($exceptions)) {
-                            echo '<div class="col-xs-12" style="margin:10px">';
-                            echo '<h4>Unexpected Errors</h4>';
-                            foreach($exceptions as $exception) {
-                                echo exceptionToHtml($exception);
-                            }
-                            echo '</div>';
-                        }
-                    ?>
+                    <p>
+                        <strong>
+                            <?= lang('check_spam_folder') ?>
+                        </strong>
+                    </p>
+
+                    <a href="<?= site_url() ?>" class="btn btn-success btn-large">
+                        <i class="far fa-calendar-alt"></i>
+                        <?= lang('go_to_booking_page') ?>
+                    </a>
+
+                    <?php if(config('google_sync_feature')): ?>
+                        <button id="add-to-google-calendar" class="btn btn-primary">
+                            <i class="fas fa-plus"></i>
+                            <?= lang('add_to_google_calendar') ?>
+                        </button>
+                    <?php endif ?>
+
+                    <?php if (isset($exceptions)): ?>
+                        <div class="col-xs-12" style="margin:10px">
+                            <h4><?= lang('unexpected_issues') ?></h4>
+
+                            <?php foreach($exceptions as $exception): ?>
+                                <?= exceptionToHtml($exception) ?>
+                            <?php endforeach ?>
+                        </div>
+                    <?php endif ?>
                 </div>
             </div>
         </div>
diff --git a/application/views/appointments/message.php b/application/views/appointments/message.php
index aca71b7b..b72a8f03 100644
--- a/application/views/appointments/message.php
+++ b/application/views/appointments/message.php
@@ -26,19 +26,13 @@
 
 <body>
     <div id="main" class="container">
-        <div class="wrapper row">
-
-            <div id="message-frame" class="frame-container
-                    col-xs-12
-                    col-sm-offset-1 col-sm-10
-                    col-md-offset-2 col-md-8
-                    col-lg-offset-2 col-lg-8">
-
-                <div class="col-xs-12 col-sm-2">
+        <div class="wrapper row d-md-flex align-items-center justify-content-center">
+            <div id="message-frame" class="frame-container col-xs-12 d-md-flex">
+                <div class="col-xs-12">
                     <img id="message-icon" src="<?= $message_icon ?>" alt="warning">
                 </div>
 
-                <div class="col-xs-12 col-sm-10">
+                <div class="col-xs-12">
                     <h3><?= $message_title ?></h3>
                     <p><?= $message_text ?></p>
 
@@ -52,7 +46,6 @@
                     <?php endif ?>
                 </div>
             </div>
-
         </div>
     </div>
 
diff --git a/application/views/backend/calendar.php b/application/views/backend/calendar.php
index e71d124b..49225ca7 100755
--- a/application/views/backend/calendar.php
+++ b/application/views/backend/calendar.php
@@ -13,36 +13,36 @@
 <script src="<?= asset_url('assets/js/backend_calendar_api.js') ?>"></script>
 <script>
     var GlobalVariables = {
-        'csrfToken'             : <?= json_encode($this->security->get_csrf_hash()) ?>,
-        'availableProviders'    : <?= json_encode($available_providers) ?>,
-        'availableServices'     : <?= json_encode($available_services) ?>,
-        'baseUrl'               : <?= json_encode($base_url) ?>,
-        'bookAdvanceTimeout'    : <?= $book_advance_timeout ?>,
-        'dateFormat'            : <?= json_encode($date_format) ?>,
-        'timeFormat'            : <?= json_encode($time_format) ?>,
-        'firstWeekday'          : <?= json_encode($first_weekday) ?>,
-        'editAppointment'       : <?= json_encode($edit_appointment) ?>,
-        'customers'             : <?= json_encode($customers) ?>,
-        'secretaryProviders'    : <?= json_encode($secretary_providers) ?>,
-        'calendarView'          : <?= json_encode($calendar_view) ?>,
-        'timezones'             : <?= json_encode($timezones) ?>,
-        'user'                  : {
-            'id'        : <?= $user_id ?>,
-            'email'     : <?= json_encode($user_email) ?>,
-            'timezone'  : <?= json_encode($timezone) ?>,
-            'role_slug' : <?= json_encode($role_slug) ?>,
+        'csrfToken': <?= json_encode($this->security->get_csrf_hash()) ?>,
+        'availableProviders': <?= json_encode($available_providers) ?>,
+        'availableServices': <?= json_encode($available_services) ?>,
+        'baseUrl': <?= json_encode($base_url) ?>,
+        'bookAdvanceTimeout': <?= $book_advance_timeout ?>,
+        'dateFormat': <?= json_encode($date_format) ?>,
+        'timeFormat': <?= json_encode($time_format) ?>,
+        'firstWeekday': <?= json_encode($first_weekday) ?>,
+        'editAppointment': <?= json_encode($edit_appointment) ?>,
+        'customers': <?= json_encode($customers) ?>,
+        'secretaryProviders': <?= json_encode($secretary_providers) ?>,
+        'calendarView': <?= json_encode($calendar_view) ?>,
+        'timezones': <?= json_encode($timezones) ?>,
+        'user': {
+            'id': <?= $user_id ?>,
+            'email': <?= json_encode($user_email) ?>,
+            'timezone': <?= json_encode($timezone) ?>,
+            'role_slug': <?= json_encode($role_slug) ?>,
             'privileges': <?= json_encode($privileges) ?>,
         }
     };
 
-    $(document).ready(function() {
+    $(document).ready(function () {
         BackendCalendar.initialize(GlobalVariables.calendarView);
     });
 </script>
 
 <div id="calendar-page" class="container-fluid">
-    <div id="calendar-toolbar" class="d-md-flex">
-        <div id="calendar-filter" class="col-12 col-md-5 d-flex">
+    <div id="calendar-toolbar">
+        <div id="calendar-filter" class="col-12 col-md-5">
             <div class="form-group calendar-filter-items">
                 <label for="select-filter-item" class="mr-3"><?= lang('display_calendar') ?></label>
                 <select id="select-filter-item" class="form-control col" title="<?= lang('select_filter_item_hint') ?>">
@@ -52,8 +52,8 @@
 
         <div id="calendar-actions" class="col-12 col-md-7">
             <?php if (($role_slug == DB_SLUG_ADMIN || $role_slug == DB_SLUG_PROVIDER)
-                    && config('google_sync_feature') == TRUE): ?>
-                <button id="google-sync" class="btn btn-info"
+                && config('google_sync_feature') == TRUE): ?>
+                <button id="google-sync" class="btn btn-primary"
                         title="<?= lang('trigger_google_sync_hint') ?>">
                     <i class="fas fa-sync-alt"></i>
                     <span><?= lang('synchronize') ?></span>
@@ -67,26 +67,26 @@
             <?php endif ?>
 
             <?php if ($privileges[PRIV_APPOINTMENTS]['add'] == TRUE): ?>
-                <div class="btn-group" role="group" aria-label="Button group with nested dropdown">
-                    <button class="btn btn-light" type="button" id="insert-appointment">
-                        <i class="fas fa-plus"></i>
-                        <?= lang('appointment') ?>
-                    </button>
-                    <button type="button" id="insert-dropdown" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                        <span class="caret"></span>
-                        <span class="sr-only">Toggle Dropdown</span>
-                    </button>
-                    <ul class="dropdown-menu">
-                        <li>
-                            <a href="#" id="insert-unavailable">
-                                <?= lang('unavailable') ?>
-                            </a>
-                            <a class="dropdown-item" href="#" id="insert-extra-period">
-                                <?= lang('extra_period') ?>
-                            </a>
-                        </div>
-                    </div>
+            <div class="btn-group">
+                <button class="btn btn-light" id="insert-appointment">
+                    <i class="fas fa-plus"></i>
+                    <?= lang('appointment') ?>
+                </button>
+
+                <button class="btn btn-light dropdown-toggle" id="insert-dropdown" data-toggle="dropdown">
+                    <span class="caret"></span>
+                    <span class="sr-only">Toggle Dropdown</span>
+                </button>
+
+                <div class="dropdown-menu">
+                    <a class="dropdown-item" href="#" id="insert-unavailable">
+                        <?= lang('unavailable') ?>
+                    </a>
+                    <a class="dropdown-item" href="#" id="insert-extra-period">
+                        <?= lang('extra_period') ?>
+                    </a>
                 </div>
+            </div>
             <?php endif ?>
 
             <button id="reload-appointments" class="btn btn-light" title="<?= lang('reload_appointments_hint') ?>">
@@ -106,16 +106,13 @@
                     <i class="fas fa-calendar-alt"></i>
                 </a>
             <?php endif ?>
-
-            <button id="toggle-fullscreen" class="btn btn-light">
-                <i class="fas fa-expand-arrows-alt"></i>
-            </button>
         </div>
     </div>
 
     <div id="calendar"><!-- Dynamically Generated Content --></div>
 </div>
 
+
 <!-- MANAGE APPOINTMENT MODAL -->
 
 <div id="manage-appointment" class="modal fade" data-keyboard="true" tabindex="-1">
@@ -123,7 +120,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3 class="modal-title"><?= lang('edit_appointment_title') ?></h3>
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <button class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
             </div>
 
             <div class="modal-body">
@@ -144,20 +141,26 @@
                                         // Group services by category, only if there is at least one service
                                         // with a parent category.
                                         $has_category = FALSE;
-                                        foreach($available_services as $service) {
-                                            if ($service['category_id'] != NULL) {
+                                        foreach ($available_services as $service)
+                                        {
+                                            if ($service['category_id'] != NULL)
+                                            {
                                                 $has_category = TRUE;
                                                 break;
                                             }
                                         }
 
-                                        if ($has_category) {
-                                            $grouped_services = array();
+                                        if ($has_category)
+                                        {
+                                            $grouped_services = [];
 
-                                            foreach($available_services as $service) {
-                                                if ($service['category_id'] != NULL) {
-                                                    if (!isset($grouped_services[$service['category_name']])) {
-                                                        $grouped_services[$service['category_name']] = array();
+                                            foreach ($available_services as $service)
+                                            {
+                                                if ($service['category_id'] != NULL)
+                                                {
+                                                    if ( ! isset($grouped_services[$service['category_name']]))
+                                                    {
+                                                        $grouped_services[$service['category_name']] = [];
                                                     }
 
                                                     $grouped_services[$service['category_name']][] = $service;
@@ -166,28 +169,36 @@
 
                                             // We need the uncategorized services at the end of the list so
                                             // we will use another iteration only for the uncategorized services.
-                                            $grouped_services['uncategorized'] = array();
-                                            foreach($available_services as $service) {
-                                                if ($service['category_id'] == NULL) {
+                                            $grouped_services['uncategorized'] = [];
+                                            foreach ($available_services as $service)
+                                            {
+                                                if ($service['category_id'] == NULL)
+                                                {
                                                     $grouped_services['uncategorized'][] = $service;
                                                 }
                                             }
 
-                                            foreach($grouped_services as $key => $group) {
+                                            foreach ($grouped_services as $key => $group)
+                                            {
                                                 $group_label = ($key != 'uncategorized')
                                                     ? $group[0]['category_name'] : 'Uncategorized';
 
-                                                if (count($group) > 0) {
+                                                if (count($group) > 0)
+                                                {
                                                     echo '<optgroup label="' . $group_label . '">';
-                                                    foreach($group as $service) {
+                                                    foreach ($group as $service)
+                                                    {
                                                         echo '<option value="' . $service['id'] . '">'
                                                             . $service['name'] . '</option>';
                                                     }
                                                     echo '</optgroup>';
                                                 }
                                             }
-                                        }  else {
-                                            foreach($available_services as $service) {
+                                        }
+                                        else
+                                        {
+                                            foreach ($available_services as $service)
+                                            {
                                                 echo '<option value="' . $service['id'] . '">'
                                                     . $service['name'] . '</option>';
                                             }
@@ -202,7 +213,8 @@
                                 </div>
 
                                 <div class="form-group">
-                                    <label for="appointment-location" class="control-label"><?= lang('location') ?></label>
+                                    <label for="appointment-location"
+                                           class="control-label"><?= lang('location') ?></label>
                                     <input id="appointment-location" class="form-control">
                                 </div>
 
@@ -214,7 +226,8 @@
 
                             <div class="col-12 col-sm-6">
                                 <div class="form-group">
-                                    <label for="start-datetime" class="control-label"><?= lang('start_date_time') ?></label>
+                                    <label for="start-datetime"
+                                           class="control-label"><?= lang('start_date_time') ?></label>
                                     <input id="start-datetime" class="required form-control">
                                 </div>
 
@@ -250,13 +263,13 @@
                     <fieldset>
                         <legend>
                             <?= lang('customer_details_title') ?>
-                            <button id="new-customer" class="btn btn-light btn-xs"
-                                    title="<?= lang('clear_fields_add_existing_customer_hint') ?>"
-                                    type="button"><?= lang('new') ?>
+                            <button id="new-customer" class="btn btn-light btn-sm" type="button"
+                                    title="<?= lang('clear_fields_add_existing_customer_hint') ?>">
+                                <?= lang('new') ?>
                             </button>
-                            <button id="select-customer" class="btn btn-info btn-xs"
-                                    title="<?= lang('pick_existing_customer_hint') ?>"
-                                    type="button"><?= lang('select') ?>
+                            <button id="select-customer" class="btn btn-primary btn-sm" type="button"
+                                    title="<?= lang('pick_existing_customer_hint') ?>">
+                                <?= lang('select') ?>
                             </button>
                             <input id="filter-existing-customers"
                                    placeholder="<?= lang('type_to_filter_customers') ?>"
@@ -284,7 +297,8 @@
                                 </div>
 
                                 <div class="form-group">
-                                    <label for="phone-number" class="control-label"><?= lang('phone_number') ?> *</label>
+                                    <label for="phone-number" class="control-label"><?= lang('phone_number') ?>
+                                        *</label>
                                     <input id="phone-number" class="required form-control">
                                 </div>
                             </div>
@@ -315,8 +329,9 @@
             </div>
 
             <div class="modal-footer">
-                <button id="save-appointment" class="btn btn-info"><?= lang('save') ?></button>
-                <button id="cancel-appointment" class="btn btn-light" data-dismiss="modal"><?= lang('cancel') ?></button>
+                <button id="save-appointment" class="btn btn-primary"><?= lang('save') ?></button>
+                <button id="cancel-appointment" class="btn btn-light"
+                        data-dismiss="modal"><?= lang('cancel') ?></button>
             </div>
         </div>
     </div>
@@ -329,7 +344,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3 class="modal-title"><?= lang('new_unavailable_title') ?></h3>
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <button class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
             </div>
             <div class="modal-body">
                 <div class="modal-message alert d-none"></div>
@@ -380,8 +395,9 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <button id="save-unavailable" class="btn btn-info"><?= lang('save') ?></button>
-                <button id="cancel-unavailable" class="btn btn-light" data-dismiss="modal"><?= lang('cancel') ?></button>
+                <button id="save-unavailable" class="btn btn-primary"><?= lang('save') ?></button>
+                <button id="cancel-unavailable" class="btn btn-light"
+                        data-dismiss="modal"><?= lang('cancel') ?></button>
             </div>
         </div>
     </div>
@@ -394,7 +410,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3 class="modal-title"><?= lang('new_extra_period_title') ?></h3>
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <button class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
             </div>
             <div class="modal-body">
                 <div class="modal-message alert d-none"></div>
@@ -453,17 +469,18 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <button class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h3 class="modal-title"><?= lang('select_google_calendar') ?></h3>
             </div>
             <div class="modal-body">
                 <div class="form-group">
-                    <label for="google-calendar" class="control-label"><?= lang('select_google_calendar_prompt') ?></label>
+                    <label for="google-calendar"
+                           class="control-label"><?= lang('select_google_calendar_prompt') ?></label>
                     <select id="google-calendar" class="form-control"></select>
                 </div>
             </div>
             <div class="modal-footer">
-                <button id="select-calendar" class="btn btn-info"><?= lang('select') ?></button>
+                <button id="select-calendar" class="btn btn-primary"><?= lang('select') ?></button>
                 <button id="close-calendar" class="btn btn-light" data-dismiss="modal"><?= lang('close') ?></button>
             </div>
         </div>
diff --git a/application/views/backend/customers.php b/application/views/backend/customers.php
index 26df6545..19f618b8 100755
--- a/application/views/backend/customers.php
+++ b/application/views/backend/customers.php
@@ -54,7 +54,7 @@
             <div class="btn-toolbar mb-4">
                 <div id="add-edit-delete-group" class="btn-group">
                     <?php if ($privileges[PRIV_CUSTOMERS]['add'] === TRUE): ?>
-                    <button id="add-customer" class="btn btn-info">
+                    <button id="add-customer" class="btn btn-primary">
                         <i class="fas fa-plus"></i>
                         <?= lang('add') ?>
                     </button>
@@ -76,7 +76,7 @@
                 </div>
 
                 <div id="save-cancel-group" class="btn-group" style="display:none;">
-                    <button id="save-customer" class="btn btn-info">
+                    <button id="save-customer" class="btn btn-primary">
                         <i class="far fa-check-circle"></i>
                         <?= lang('save') ?>
                     </button>
diff --git a/application/views/backend/services.php b/application/views/backend/services.php
index 3ffe9457..748c2e96 100755
--- a/application/views/backend/services.php
+++ b/application/views/backend/services.php
@@ -61,7 +61,7 @@
                 <div class="record-details column col-xs-12 col-md-5">
                     <div class="btn-toolbar mb-4">
                         <div class="add-edit-delete-group btn-group">
-                            <button id="add-service" class="btn btn-info">
+                            <button id="add-service" class="btn btn-primary">
                                 <i class="fas fa-plus"></i>
                                 <?= lang('add') ?>
                             </button>
@@ -76,7 +76,7 @@
                         </div>
 
                         <div class="save-cancel-group btn-group" style="display:none;">
-                            <button id="save-service" class="btn btn-info">
+                            <button id="save-service" class="btn btn-primary">
                                 <i class="far fa-check-circle"></i>
                                 <?= lang('save') ?>
                             </button>
@@ -181,7 +181,7 @@
                 <div class="record-details col-xs-12 col-md-5">
                     <div class="btn-toolbar mb-4">
                         <div class="add-edit-delete-group btn-group">
-                            <button id="add-category" class="btn btn-info">
+                            <button id="add-category" class="btn btn-primary">
                                 <i class="fas fa-plus"></i>
                                 <?= lang('add') ?>
                             </button>
@@ -196,7 +196,7 @@
                         </div>
 
                         <div class="save-cancel-group btn-group" style="display:none;">
-                            <button id="save-category" class="btn btn-info">
+                            <button id="save-category" class="btn btn-primary">
                                 <i class="far fa-check-circle"></i>
                                 <?= lang('save') ?>
                             </button>
diff --git a/application/views/backend/settings.php b/application/views/backend/settings.php
index 953be607..122a749c 100755
--- a/application/views/backend/settings.php
+++ b/application/views/backend/settings.php
@@ -69,7 +69,7 @@
                     <legend class="border-bottom mb-4">
                         <?= lang('general_settings') ?>
                         <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['edit'] == TRUE): ?>
-                            <button type="button" class="save-settings btn btn-info btn-xs mb-2"
+                            <button type="button" class="save-settings btn btn-primary btn-sm mb-2"
                                     title="<?= lang('save') ?>">
                                 <i class="far fa-save"></i>
                                 <?= lang('save') ?>
@@ -149,7 +149,7 @@
                             <div class="form-group">
                                 <label for="google-analytics-code">
                                     Google Analytics ID</label>
-                                <input id="google-analytics-code" placeholder="UA-XXXXXXXX-X"
+                                <input id="google-analytics-code" placeholder="UA-XXXXXXXX-XX"
                                        data-field="google_analytics_code" class="form-control">
                                 <span class="help-block">
                                     <?= lang('google_analytics_code_hint') ?>
@@ -228,7 +228,7 @@
                     <legend class="border-bottom mb-4">
                         <?= lang('business_logic') ?>
                         <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['edit'] == TRUE): ?>
-                            <button type="button" class="save-settings btn btn-info btn-xs mb-2"
+                            <button type="button" class="save-settings btn btn-primary btn-sm mb-2"
                                     title="<?= lang('save') ?>">
                                 <i class="far fa-save"></i>
                                 <?= lang('save') ?>
@@ -280,7 +280,7 @@
                             </span>
 
                             <div class="mt-2">
-                                <button type="button" class="add-break btn btn-info">
+                                <button type="button" class="add-break btn btn-primary">
                                     <i class="fas fa-plus"></i>
                                     <?= lang('add_break');?>
                                 </button>
@@ -314,7 +314,7 @@
                     <legend class="border-bottom mb-4">
                         <?= lang('legal_contents') ?>
                         <?php if ($privileges[PRIV_SYSTEM_SETTINGS]['edit'] == TRUE): ?>
-                            <button type="button" class="save-settings btn btn-info btn-xs mb-2"
+                            <button type="button" class="save-settings btn btn-primary btn-sm mb-2"
                                     title="<?= lang('save') ?>">
                                 <i class="far fa-save"></i>
                                 <?= lang('save') ?>
@@ -393,7 +393,7 @@
                         <legend  class="border-bottom mb-4">
                             <?= lang('personal_information') ?>
                             <?php if ($privileges[PRIV_USER_SETTINGS]['edit'] == TRUE): ?>
-                                <button type="button" class="save-settings btn btn-info btn-xs mb-2"
+                                <button type="button" class="save-settings btn btn-primary btn-sm mb-2"
                                         title="<?= lang('save') ?>">
                                     <i class="far fa-save"></i>
                                     <?= lang('save') ?>
diff --git a/application/views/backend/users.php b/application/views/backend/users.php
index 41a658b6..adf41fd3 100755
--- a/application/views/backend/users.php
+++ b/application/views/backend/users.php
@@ -73,7 +73,7 @@
                 <div class="record-details column col-xs-12 col-md-7">
                     <div class="float-md-left mb-4">
                         <div class="add-edit-delete-group btn-group">
-                            <button id="add-provider" class="btn btn-info">
+                            <button id="add-provider" class="btn btn-primary">
                                 <i class="fas fa-plus"></i>
                                 <?= lang('add') ?>
                             </button>
@@ -88,7 +88,7 @@
                         </div>
 
                         <div class="save-cancel-group btn-group" style="display:none;">
-                            <button id="save-provider" class="btn btn-info">
+                            <button id="save-provider" class="btn btn-primary">
                                 <i class="far fa-check-circle"></i>
                                 <?= lang('save') ?>
                             </button>
@@ -212,7 +212,7 @@
 
                     <div class="working-plan-view provider-view" style="display: none;">
                         <h3><?= lang('working_plan') ?></h3>
-                        <button id="reset-working-plan" class="btn btn-info"
+                        <button id="reset-working-plan" class="btn btn-primary"
                                 title="<?= lang('reset_working_plan') ?>">
                             <i class="fas fa-redo-alt"></i>
                             <?= lang('reset_plan') ?></button>
@@ -236,7 +236,7 @@
                         </span>
 
                         <div>
-                            <button type="button" class="add-break btn btn-info">
+                            <button type="button" class="add-break btn btn-primary">
                                 <i class="fas fa-plus"></i>
                                 <?= lang('add_break') ?>
                             </button>
@@ -265,7 +265,7 @@
                         </span>
 
                         <div>
-                            <button type="button" class="add-extra-periods btn btn-info">
+                            <button type="button" class="add-extra-periods btn btn-primary">
                                 <i class="fas fa-plus"></i>
                                 <?= lang('add_extra_period') ?>
                             </button>
@@ -319,7 +319,7 @@
                 <div class="record-details column col-xs-12 col-md-7">
                     <div class="btn-toolbar mb-4">
                         <div class="add-edit-delete-group btn-group">
-                            <button id="add-secretary" class="btn btn-info">
+                            <button id="add-secretary" class="btn btn-primary">
                                 <i class="fas fa-plus"></i>
                                 <?= lang('add') ?>
                             </button>
@@ -334,7 +334,7 @@
                         </div>
 
                         <div class="save-cancel-group btn-group" style="display:none;">
-                            <button id="save-secretary" class="btn btn-info">
+                            <button id="save-secretary" class="btn btn-primary">
                                 <i class="far fa-check-circle"></i>
                                 <?= lang('save') ?>
                             </button>
@@ -479,7 +479,7 @@
                 <div class="record-details column col-xs-12 col-md-7">
                     <div class="btn-toolbar mb-4">
                         <div class="add-edit-delete-group btn-group">
-                            <button id="add-admin" class="btn btn-info">
+                            <button id="add-admin" class="btn btn-primary">
                                 <i class="fas fa-plus"></i>
                                 <?= lang('add') ?>
                             </button>
@@ -494,7 +494,7 @@
                         </div>
 
                         <div class="save-cancel-group btn-group" style="display:none;">
-                            <button id="save-admin" class="btn btn-info">
+                            <button id="save-admin" class="btn btn-primary">
                                 <i class="far fa-check-circle"></i>
                                 <?= lang('save') ?>
                             </button>
diff --git a/application/views/user/login.php b/application/views/user/login.php
index 9434815e..c488e27a 100644
--- a/application/views/user/login.php
+++ b/application/views/user/login.php
@@ -82,7 +82,7 @@
             </div>
             <br>
 
-            <button type="submit" id="login" class="btn btn-info">
+            <button type="submit" id="login" class="btn btn-primary">
             	<?= lang('login') ?>
             </button>
 
diff --git a/assets/css/backend.css b/assets/css/backend.css
index ff9daa5c..07d32f8f 100644
--- a/assets/css/backend.css
+++ b/assets/css/backend.css
@@ -20,8 +20,7 @@ root {
 /* BACKEND GENERAL ELEMENTS
    -------------------------------------------------------------------- */
 #header {
-    background-color: #39c678;
-    border-bottom: 4px solid #c0f1d6;
+    background-color: #429a82;
     box-shadow: none;
     border-radius: 0;
     margin-bottom: 15px;
@@ -249,7 +248,7 @@ body legend {
 
 .backend-page .filter-records .results .entry.selected {
     background-color: #F4F4F4;
-    border-right: 5px solid #39c678;
+    border-right: 5px solid #429a82;
 }
 
 .backend-page .filter-records .results hr {
@@ -514,13 +513,8 @@ body .form-horizontal .controls {
     margin-right: 20px;
 }
 
-#calendar .calendar-view .date-column .provider-column .not-working {
-    width: 115px;
-    border-radius: 3px;
-    padding: 10px;
-    text-align: center;
+#calendar .fc-unavailable {
     background: #eaeaea url('../img/unavailable.jpg');
-    opacity: 0.7;
 }
 
 #calendar .calendar-view .date-column .provider-column {
diff --git a/assets/css/frontend.css b/assets/css/frontend.css
index 04d96c93..54a4a00a 100644
--- a/assets/css/frontend.css
+++ b/assets/css/frontend.css
@@ -232,6 +232,7 @@ body {
 #message-frame #message-icon,
 #success-frame #success-icon {
     margin-top: 20px;
+    margin-right: 20px;
 }
 
 #message-frame .alert,
diff --git a/assets/js/backend_calendar_default_view.js b/assets/js/backend_calendar_default_view.js
index 64b44e7b..50a6cd14 100755
--- a/assets/js/backend_calendar_default_view.js
+++ b/assets/js/backend_calendar_default_view.js
@@ -1542,7 +1542,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
                 $selectFilterItem.find('option:selected').attr('type'),
                 $calendar.fullCalendar('getView').start,
                 $calendar.fullCalendar('getView').end);
-        }, 10000);
+        }, 30000);
     };
 
 })(window.BackendCalendarDefaultView);
diff --git a/assets/js/backend_settings_system.js b/assets/js/backend_settings_system.js
index b6b190e5..ac6d25b5 100644
--- a/assets/js/backend_settings_system.js
+++ b/assets/js/backend_settings_system.js
@@ -76,22 +76,22 @@
 
         settings.push({
             name: 'customer_notifications',
-            value: $('#customer-notifications').hasClass('active') === true ? '1' : '0'
+            value: $('#customer-notifications').hasClass('active') ? '1' : '0'
         });
 
         settings.push({
             name: 'require_captcha',
-            value: $('#require-captcha').hasClass('active') === true ? '1' : '0'
+            value: $('#require-captcha').hasClass('active') ? '1' : '0'
         });
 
         settings.push({
             name: 'require_phone_number',
-            value: $('#require-phone-number').hasClass('active') === true ? '1' : '0'
+            value: $('#require-phone-number').hasClass('active') ? '1' : '0'
         });
 
         settings.push({
             name: 'display_any_provider',
-            value: $('#display-any-provider').hasClass('active') === true ? '1' : '0'
+            value: $('#display-any-provider').hasClass('active') ? '1' : '0'
         });