diff --git a/application/views/layouts/account/account_layout.php b/application/views/layouts/account/account_layout.php
index d9b2cccb..f0ed60dd 100644
--- a/application/views/layouts/account/account_layout.php
+++ b/application/views/layouts/account/account_layout.php
@@ -48,7 +48,8 @@
 </head>
 <body>
 <div id="login-frame" class="frame-container">
-    <?php require $page_path ?>
+    
+    <?php slot('content') ?>
 
     <div class="mt-4">
         <small>
diff --git a/application/views/layouts/backend/backend_layout.php b/application/views/layouts/backend/backend_layout.php
index 67a2368f..3a1be4a9 100644
--- a/application/views/layouts/backend/backend_layout.php
+++ b/application/views/layouts/backend/backend_layout.php
@@ -46,11 +46,11 @@
 <script src="<?= asset_url('assets/js/backend.js') ?>"></script>
 <script src="<?= asset_url('assets/js/general_functions.js') ?>"></script>
 
-<?php require __DIR__ . '/backend_header.php' ?>
+<?php require 'backend_header.php' ?>
 
-<?php require $page_path ?>
+<?php slot('content') ?>
 
-<?php require __DIR__ . '/backend_footer.php' ?>
+<?php require 'backend_footer.php' ?>
 
 </body>
 </html>
diff --git a/application/views/layouts/booking/booking_layout.php b/application/views/layouts/booking/booking_layout.php
index c74ca97c..d352e4fb 100644
--- a/application/views/layouts/booking/booking_layout.php
+++ b/application/views/layouts/booking/booking_layout.php
@@ -47,26 +47,26 @@
     <div class="row wrapper">
         <div id="book-appointment-wizard" class="col-12 col-lg-10 col-xl-8">
 
-            <?php require __DIR__ . '/booking_header.php' ?>
+            <?php require 'booking_header.php' ?>
+
+            <?php slot('content') ?>
+
+            <?php require 'booking_footer.php' ?>
 
-            <?php require $page_path ?>
-            
-            <?php require __DIR__ . '/booking_footer.php' ?>
-            </div>
         </div>
     </div>
 </div>
 
 <?php if ($display_cookie_notice === '1'): ?>
-    <?php require __DIR__ . '/../modals/cookie_notice_modal.php' ?>
+    <?php component('cooking_notice_modal') ?>
 <?php endif ?>
 
 <?php if ($display_terms_and_conditions === '1'): ?>
-    <?php require __DIR__ . '/../modals/terms_and_conditions_modal.php' ?>
+    <?php component('terms_and_conditions_modal') ?>
 <?php endif ?>
 
 <?php if ($display_privacy_policy === '1'): ?>
-    <?php require __DIR__ . '/../modals/privacy_policy_modal.php' ?>
+    <?php component('privacy_policy_modal') ?>
 <?php endif ?>
 
 <script>
@@ -91,7 +91,6 @@
     var availableLanguages = <?= json_encode(config('available_languages')) ?>;
 </script>
 
-<script src="<?= asset_url('assets/js/general_functions.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/jquery/jquery.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/jquery-ui-dist/jquery-ui.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/cookieconsent/cookieconsent.min.js') ?>"></script>
@@ -101,6 +100,7 @@
 <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-timezone/moment-timezone-with-data.min.js') ?>"></script>
+<script src="<?= asset_url('assets/js/general_functions.js') ?>"></script>
 <script src="<?= asset_url('assets/js/frontend_book_api.js') ?>"></script>
 <script src="<?= asset_url('assets/js/frontend_book.js') ?>"></script>
 
@@ -111,6 +111,7 @@
     });
 </script>
 
-<?php google_analytics_script(); ?>
+<?php google_analytics_script() ?>
+
 </body>
 </html>
diff --git a/application/views/layouts/message/message_layout.php b/application/views/layouts/message/message_layout.php
index 64c9e40b..ef4ca382 100644
--- a/application/views/layouts/message/message_layout.php
+++ b/application/views/layouts/message/message_layout.php
@@ -1,9 +1,6 @@
 <?php
 /**
  * @var string $title
- * @var array $styles
- * @var string $template
- * @var array $scripts
  * @var array $global_variables
  */
 ?>
@@ -19,16 +16,17 @@
     <title><?= $page_title ?> | Easy!Appointments</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') ?>">
-    <?php foreach ($styles as $style): ?>
-        <link rel="stylesheet" type="text/css" href="<?= $style ?>">
-    <?php endforeach ?>
+    
+    <?php slot('meta') ?>
+    
+    <?php slot('styles') ?>
 </head>
 <body>
 <div id="main" class="container">
     <div class="row wrapper">
         <div id="message-frame" class="col-12 border my-auto frame-container">
             
-            <?php require $page_path ?>
+            <?php slot('content') ?>
             
             <div class="mt-2">
                 <small>
@@ -50,10 +48,9 @@
 <script src="<?= asset_url('assets/vendor/bootstrap/bootstrap.min.js') ?>"></script>
 <script src="<?= asset_url('assets/js/general_functions.js') ?>"></script>
 
-<?php foreach ($scripts as $script): ?>
-    <script src="<?= $script ?>"></script>
-<?php endforeach ?>
-
 <?php google_analytics_script() ?>
+
+<?php slot('scripts') ?>
+
 </body>
 </html>
