diff --git a/application/controllers/Appointments.php b/application/controllers/Appointments.php
index 69f37754..ee886b55 100755
--- a/application/controllers/Appointments.php
+++ b/application/controllers/Appointments.php
@@ -315,7 +315,7 @@ class Appointments extends EA_Controller {
             $view['exceptions'] = $exceptions;
         }
 
-        $this->load->view('appointments/book_success', $view);
+        $this->load->layout('layouts/message/message_layout', 'pages/booking/booking_success_page', $view);
     }
 
     /**
diff --git a/application/views/appointments/book_success.php b/application/views/appointments/book_success.php
deleted file mode 100755
index 70b4230b..00000000
--- a/application/views/appointments/book_success.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * @var string $company_name
- * @var array $appointment_data
- * @var array $provider_data
- * @var array $customer_data
- */
-?><!doctype html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="theme-color" content="#35A768">
-    <title><?= lang('appointment_registered') . ' - ' . $company_name ?></title>
-
-    <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/vendor/bootstrap/bootstrap.min.css') ?>">
-    <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/frontend.css') ?>">
-
-    <link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
-    <link rel="icon" sizes="192x192" href="<?= asset_url('assets/img/logo.png') ?>">
-
-    <script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/fontawesome.min.js') ?>"></script>
-    <script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/solid.min.js') ?>"></script>
-</head>
-<body>
-<div id="main" class="container">
-    <div class="row wrapper">
-        <div id="success-frame" class="col-12 border my-auto frame-container">
-            <div>
-                <img id="success-icon" class="mt-0 mb-2" src="<?= base_url('assets/img/success.png') ?>" alt="success"/>
-            </div>
-
-            <div>
-                <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="fas 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 ?>
-            </div>
-
-            <div class="mt-2">
-                <small>
-                    Powered by
-                    <a href="https://easyappointments.org">Easy!Appointments</a>
-                </small>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script src="<?= asset_url('assets/vendor/jquery/jquery.min.js') ?>"></script>
-<script src="<?= asset_url('assets/vendor/@popperjs-core/popper.min.js') ?>"></script>
-<script src="<?= asset_url('assets/vendor/bootstrap/bootstrap.min.js') ?>"></script>
-<script src="<?= asset_url('assets/vendor/datejs/date.min.js') ?>"></script>
-<script src="<?= asset_url('assets/vendor/moment/moment.min.js') ?>"></script>
-<script src="<?= asset_url('assets/vendor/moment/moment-timezone-with-data.min.js') ?>"></script>
-<script src="https://apis.google.com/js/client.js"></script>
-
-<script>
-    var GlobalVariables = {
-        csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
-        appointmentData: <?= json_encode($appointment_data) ?>,
-        providerData: <?= json_encode($provider_data) ?>,
-        customerData: <?= json_encode($customer_data) ?>,
-        serviceData: <?= json_encode($service_data) ?>,
-        companyName: <?= json_encode($company_name) ?>,
-        googleApiKey: <?= json_encode(config('google_api_key')) ?>,
-        googleClientId: <?= json_encode(config('google_client_id')) ?>,
-        googleApiScope: 'https://www.googleapis.com/auth/calendar'
-    };
-
-    var EALang = <?= json_encode($this->lang->language) ?>;
-</script>
-
-<script src="<?= asset_url('assets/js/frontend_book_success.js') ?>"></script>
-<script src="<?= asset_url('assets/js/general_functions.js') ?>"></script>
-
-<?php google_analytics_script() ?>
-</body>
-</html>
diff --git a/application/views/pages/booking/booking_success_page.php b/application/views/pages/booking/booking_success_page.php
new file mode 100755
index 00000000..c584d809
--- /dev/null
+++ b/application/views/pages/booking/booking_success_page.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @var string $company_name
+ * @var array $appointment_data
+ * @var array $provider_data
+ * @var array $customer_data
+ */
+?>
+
+<div>
+    <img id="success-icon" class="mt-0 mb-2" src="<?= base_url('assets/img/success.png') ?>" alt="success"/>
+</div>
+
+<div>
+    <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="fas 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 ?>
+</div>
+
+<script src="<?= asset_url('assets/vendor/datejs/date.min.js') ?>"></script>
+<script src="<?= asset_url('assets/vendor/moment/moment.min.js') ?>"></script>
+<script src="<?= asset_url('assets/vendor/moment/moment-timezone-with-data.min.js') ?>"></script>
+<script src="https://apis.google.com/js/client.js"></script>
+
+<script>
+    var GlobalVariables = {
+        csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
+        appointmentData: <?= json_encode($appointment_data) ?>,
+        providerData: <?= json_encode($provider_data) ?>,
+        customerData: <?= json_encode($customer_data) ?>,
+        serviceData: <?= json_encode($service_data) ?>,
+        companyName: <?= json_encode($company_name) ?>,
+        googleApiKey: <?= json_encode(config('google_api_key')) ?>,
+        googleClientId: <?= json_encode(config('google_client_id')) ?>,
+        googleApiScope: 'https://www.googleapis.com/auth/calendar'
+    };
+</script>
+
+<script src="<?= asset_url('assets/js/frontend_book_success.js') ?>"></script>
+<script src="<?= asset_url('assets/js/general_functions.js') ?>"></script>
+
+<?php google_analytics_script() ?>
