diff --git a/src/application/views/appointments/book.php b/src/application/views/appointments/book.php
index 004c2e01..f44a375a 100644
--- a/src/application/views/appointments/book.php
+++ b/src/application/views/appointments/book.php
@@ -1,48 +1,20 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8" />
+    <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#35A768">
     <title><?php echo $this->lang->line('page_title') . ' ' .  $company_name; ?></title>
 
-    <?php
-        // ------------------------------------------------------------
-        // INCLUDE CSS FILES
-        // ------------------------------------------------------------ ?>
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.css'); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/ext/jquery-qtip/jquery.qtip.min.css'); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/css/frontend.css'); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/css/general.css'); ?>">
 
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.css'); ?>">
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo base_url('assets/ext/jquery-qtip/jquery.qtip.min.css'); ?>">
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo base_url('assets/css/frontend.css'); ?>">
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo base_url('assets/css/general.css'); ?>">
-
-    <?php
-        // ------------------------------------------------------------
-        // WEBPAGE FAVICON
-        // ------------------------------------------------------------ ?>
-
-    <link rel="icon" type="image/x-icon"
-            href="<?php echo base_url('assets/img/favicon.ico'); ?>">
-
-    <link rel="icon" sizes="192x192"
-            href="<?php echo base_url('assets/img/logo.png'); ?>">
+    <link rel="icon" type="image/x-icon" href="<?php echo base_url('assets/img/favicon.ico'); ?>">
+    <link rel="icon" sizes="192x192" href="<?php echo base_url('assets/img/logo.png'); ?>">
 </head>
 
 <body>
@@ -50,10 +22,7 @@
         <div class="wrapper row">
             <div id="book-appointment-wizard" class="col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
 
-                <?php
-                    // ------------------------------------------------------
-                    // FRAME TOP BAR
-                    // ------------------------------------------------------ ?>
+                <!-- FRAME TOP BAR -->
 
                 <div id="header">
                     <span id="company-name"><?php echo $company_name; ?></span>
@@ -76,9 +45,6 @@
                 </div>
 
                 <?php
-                    // ------------------------------------------------------
-                    // CANCEL APPOINTMENT BUTTON
-                    // ------------------------------------------------------
                     if ($manage_mode === TRUE) {
                         echo '
                             <div id="cancel-appointment-frame" class="row">
@@ -101,9 +67,6 @@
                 ?>
 
                 <?php
-                    // ------------------------------------------------------
-                    // DISPLAY EXCEPTIONS (IF ANY)
-                    // ------------------------------------------------------
                     if (isset($exceptions)) {
                         echo '<div style="margin: 10px">';
                         echo '<h4>' . $this->lang->line('unexpected_issues') . '</h4>';
@@ -114,10 +77,7 @@
                     }
                 ?>
 
-                <?php
-                    // ------------------------------------------------------
-                    // SELECT SERVICE AND PROVIDER
-                    // ------------------------------------------------------ ?>
+                <!-- SELECT SERVICE AND PROVIDER -->
 
                 <div id="wizard-frame-1" class="wizard-frame">
                     <div class="frame-container">
@@ -207,10 +167,7 @@
                     </div>
                 </div>
 
-                <?php
-                    // ------------------------------------------------------
-                    // SELECT APPOINTMENT DATE
-                    // ------------------------------------------------------ ?>
+                <!-- SELECT APPOINTMENT DATE -->
 
                 <div id="wizard-frame-2" class="wizard-frame" style="display:none;">
                     <div class="frame-container">
@@ -243,10 +200,7 @@
                     </div>
                 </div>
 
-                <?php
-                    // ------------------------------------------------------
-                    // ENTER CUSTOMER DATA
-                    // ------------------------------------------------------ ?>
+                <!-- ENTER CUSTOMER DATA -->
 
                 <div id="wizard-frame-3" class="wizard-frame" style="display:none;">
                     <div class="frame-container">
@@ -309,10 +263,7 @@
                     </div>
                 </div>
 
-                <?php
-                    // ------------------------------------------------------
-                    // APPOINTMENT DATA CONFIRMATION
-                    // ------------------------------------------------------ ?>
+                <!-- APPOINTMENT DATA CONFIRMATION -->
 
                 <div id="wizard-frame-4" class="wizard-frame" style="display:none;">
                     <div class="frame-container">
@@ -356,10 +307,7 @@
                     </div>
                 </div>
 
-                <?php
-                    // ------------------------------------------------------
-                    // FRAME FOOTER
-                    // ------------------------------------------------------ ?>
+                <!-- FRAME FOOTER -->
 
                 <div id="frame-footer">
                     Powered By
@@ -379,17 +327,12 @@
         </div>
     </div>
 
-    <?php
-        // ------------------------------------------------------------
-        // GLOBAL JAVASCRIPT VARIABLES
-        // ------------------------------------------------------------ ?>
-
-    <script type="text/javascript">
+    <script>
         var GlobalVariables = {
             availableServices   : <?php echo json_encode($available_services); ?>,
             availableProviders  : <?php echo json_encode($available_providers); ?>,
             baseUrl             : <?php echo json_encode($this->config->item('base_url')); ?>,
-            manageMode          : <?php echo ($manage_mode) ? 'true' : 'false'; ?>,
+            manageMode          : <?php echo $manage_mode ? 'true' : 'false'; ?>,
             dateFormat          : <?php echo json_encode($date_format); ?>,
             appointmentData     : <?php echo json_encode($appointment_data); ?>,
             providerData        : <?php echo json_encode($provider_data); ?>,
@@ -401,43 +344,17 @@
         var availableLanguages = <?php echo json_encode($this->config->item('available_languages')); ?>;
     </script>
 
-    <?php
-        // ------------------------------------------------------------
-        // INCLUDE JAVASCRIPT FILES
-        // ------------------------------------------------------------ ?>
+    <script src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/jquery-qtip/jquery.qtip.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/js/frontend_book_api.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/js/frontend_book.js'); ?>"></script>
 
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/jquery-qtip/jquery.qtip.min.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/js/frontend_book_api.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/js/frontend_book.js'); ?>"></script>
-
-    <?php
-        // ------------------------------------------------------------
-        // VIEW FILE JAVASCRIPT CODE
-        // ------------------------------------------------------------ ?>
-
-    <script type="text/javascript">
-    $(document).ready(function() {
+    <script>
+        $(document).ready(function() {
             FrontendBook.initialize(true, GlobalVariables.manageMode);
             GeneralFunctions.enableLanguageSelection($('#select-language'));
         });
diff --git a/src/application/views/appointments/book_success.php b/src/application/views/appointments/book_success.php
index 8447e29b..f6439a5b 100755
--- a/src/application/views/appointments/book_success.php
+++ b/src/application/views/appointments/book_success.php
@@ -1,32 +1,17 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8" />
+    <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#35A768">
     <title><?php echo $this->lang->line('appointment_registered') . ' - ' . $company_name; ?></title>
 
-    <?php
-        // ------------------------------------------------------------
-        // INCLUDE CSS FILES
-        // ------------------------------------------------------------ ?>
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/css/frontend.css'); ?>">
 
-    <link rel="stylesheet" type="text/css"
-        href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
-    <link rel="stylesheet" type="text/css"
-        href="<?php echo base_url('assets/css/frontend.css'); ?>">
-
-    <?php
-        // ------------------------------------------------------------
-        // SET PAGE FAVICON
-        // ------------------------------------------------------------ ?>
-
-    <link rel="icon" type="image/x-icon"
-        href="<?php echo base_url('assets/img/favicon.ico'); ?>">
-
-    <link rel="icon" sizes="192x192"
-        href="<?php echo base_url('assets/img/logo.png'); ?>">
+    <link rel="icon" type="image/x-icon" href="<?php echo base_url('assets/img/favicon.ico'); ?>">
+    <link rel="icon" sizes="192x192" href="<?php echo base_url('assets/img/logo.png'); ?>">
 </head>
 <body>
     <div id="main" class="container">
@@ -74,51 +59,28 @@
         </div>
     </div>
 
-    <?php
-        // ------------------------------------------------------------
-        // INCLUDE JS FILES
-        // ------------------------------------------------------------ ?>
+    <script src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
+    <script src="https://apis.google.com/js/client.js"></script>
 
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="https://apis.google.com/js/client.js"></script>
-
-    <?php
-        // ------------------------------------------------------------
-        // CUSTOM PAGE JS
-        // ------------------------------------------------------------ ?>
-
-    <script type="text/javascript">
+    <script>
         var GlobalVariables = {
             'csrfToken'         : <?php echo json_encode($this->security->get_csrf_hash()); ?>,
             'appointmentData'   : <?php echo json_encode($appointment_data); ?>,
             'providerData'      : <?php echo json_encode($provider_data); ?>,
             'serviceData'       : <?php echo json_encode($service_data); ?>,
-            'companyName'       : <?php echo '"' . $company_name . '"'; ?>,
-            'googleApiKey'      : <?php echo '"' . Config::GOOGLE_API_KEY . '"'; ?>,
-            'googleClientId'    : <?php echo '"' . Config::GOOGLE_CLIENT_ID . '"'; ?>,
+            'companyName'       : <?php echo json_encode($company_name); ?>,
+            'googleApiKey'      : <?php echo json_encode(Config::GOOGLE_API_KEY); ?>,
+            'googleClientId'    : <?php echo json_encode(Config::GOOGLE_CLIENT_ID); ?>,
             'googleApiScope'    : 'https://www.googleapis.com/auth/calendar'
         };
 
         var EALang = <?php echo json_encode($this->lang->language); ?>;
     </script>
 
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/js/frontend_book_success.js'); ?>"></script>
-
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/js/frontend_book_success.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
 
     <?php google_analytics_script(); ?>
 </body>
diff --git a/src/application/views/appointments/message.php b/src/application/views/appointments/message.php
index ed07b833..81609d87 100644
--- a/src/application/views/appointments/message.php
+++ b/src/application/views/appointments/message.php
@@ -1,59 +1,26 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8" />
+    <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#35A768">
     <title><?php echo $message_title ?></title>
 
-    <?php
-        // ------------------------------------------------------------
-        // INCLUDE CSS FILES
-        // ------------------------------------------------------------ ?>
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('/assets/ext/bootstrap/css/bootstrap.css'); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('/assets/css/frontend.css'); ?>">
 
-    <link rel="stylesheet" type="text/css"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.css">
-    <link rel="stylesheet" type="text/css"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/css/frontend.css">
+    <link rel="icon" type="image/x-icon" href="<?php echo base_url('/assets/img/favicon.ico'); ?>">
+    <link rel="icon" sizes="192x192" href="<?php echo base_url('/assets/img/logo.png'); ?>">
 
-    <?php
-        // ------------------------------------------------------------
-        // SET PAGE FAVICON
-        // ------------------------------------------------------------ ?>
-
-    <link rel="icon" type="image/x-icon"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/img/favicon.ico">
-
-    <link rel="icon" sizes="192x192"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/img/logo.png">
-
-    <?php
-        // ------------------------------------------------------------
-        // CUSTOM PAGE JS
-        // ------------------------------------------------------------ ?>
-
-    <script type="text/javascript">
+    <script>
         var EALang = <?php echo json_encode($this->lang->language); ?>;
     </script>
 
-    <?php
-        // ------------------------------------------------------------
-        // INCLUDE JS FILES
-        // ------------------------------------------------------------ ?>
-
-    <script
-        type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/datejs/date.js"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/general_functions.js"></script>
+    <script src="<?php echo base_url('/assets/ext/jquery/jquery.min.js'); ?>"></script>
+    <script src="<?php echo base_url('/assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
+    <script src="<?php echo base_url('/assets/ext/datejs/date.js'); ?>"></script>
+    <script src="<?php echo base_url('/assets/js/general_functions.js'); ?>"></script>
 </head>
 
 <body>
diff --git a/src/application/views/backend/calendar.php b/src/application/views/backend/calendar.php
index e936cbca..c9d8004d 100644
--- a/src/application/views/backend/calendar.php
+++ b/src/application/views/backend/calendar.php
@@ -1,37 +1,16 @@
-<link rel="stylesheet" type="text/css"
-        href="<?php echo $base_url; ?>/assets/ext/jquery-fullcalendar/jquery.fullcalendar.css" />
+<link rel="stylesheet" type="text/css" href="<?php echo base_url('/assets/ext/jquery-fullcalendar/jquery.fullcalendar.css'); ?>">
 
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/jquery-fullcalendar/jquery.fullcalendar.min.js"></script>
-
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/jquery-sticky-table-headers/jquery.stickytableheaders.min.js"></script>
-
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui-timepicker-addon.js"></script>
-
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_calendar.js"></script>
-
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_calendar_default_view.js"></script>
-
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_calendar_table_view.js"></script>
-
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_calendar_google_sync.js"></script>
-
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_calendar_appointments_modal.js"></script>
-
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_calendar_unavailabilities_modal.js"></script>
-
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_calendar_api.js"></script>
-
-<script type="text/javascript">
+<script src="<?php echo base_url('/assets/ext/jquery-fullcalendar/jquery.fullcalendar.min.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/ext/jquery-sticky-table-headers/jquery.stickytableheaders.min.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/ext/jquery-ui/jquery-ui-timepicker-addon.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_calendar.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_calendar_default_view.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_calendar_table_view.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_calendar_google_sync.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_calendar_appointments_modal.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_calendar_unavailabilities_modal.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_calendar_api.js'); ?>"></script>
+<script>
     var GlobalVariables = {
         'csrfToken'             : <?php echo json_encode($this->security->get_csrf_hash()); ?>,
         'availableProviders'    : <?php echo json_encode($available_providers); ?>,
@@ -114,13 +93,8 @@
     <div id="calendar"></div> <?php // Main calendar container ?>
 </div>
 
-<?php
-    // --------------------------------------------------------------------
-    //
-    // MANAGE APPOINTMENT
-    //
-    // --------------------------------------------------------------------
-?>
+<!-- MANAGE APPOINTMENT MODAL -->
+
 <div id="manage-appointment" class="modal fade full-screen" data-keyboard="true" tabindex="-1">
     <div class="modal-dialog">
         <div class="modal-content">
@@ -337,13 +311,8 @@
     </div>
 </div>
 
-<?php
-    // --------------------------------------------------------------------
-    //
-    // MANAGE UNAVAILABLE
-    //
-    // --------------------------------------------------------------------
-?>
+<!-- MANAGE UNAVAILABLE MODAL -->
+
 <div id="manage-unavailable" class="modal fade">
     <div class="modal-dialog">
         <div class="modal-content">
@@ -413,13 +382,8 @@
     </div>
 </div>
 
-<?php
-    // --------------------------------------------------------------------
-    //
-    // SELECT GOOGLE CALENDAR
-    //
-    // --------------------------------------------------------------------
-?>
+<!-- SELECT GOOGLE CALENDAR MODAL -->
+
 <div id="select-google-calendar" class="modal fade">
     <div class="modal-dialog">
         <div class="modal-content">
diff --git a/src/application/views/backend/customers.php b/src/application/views/backend/customers.php
index 27236e7c..1e07d4c5 100644
--- a/src/application/views/backend/customers.php
+++ b/src/application/views/backend/customers.php
@@ -1,13 +1,7 @@
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui-timepicker-addon.js"></script>
-
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_customers_helper.js"></script>
-
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_customers.js"></script>
-
-<script type="text/javascript">
+<script src="<?php echo base_url('/assets/ext/jquery-ui/jquery-ui-timepicker-addon.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_customers_helper.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_customers.js'); ?>"></script>
+<script>
     var GlobalVariables = {
         'csrfToken'         : <?php echo json_encode($this->security->get_csrf_hash()); ?>,
         'availableProviders': <?php echo json_encode($available_providers); ?>,
diff --git a/src/application/views/backend/footer.php b/src/application/views/backend/footer.php
index f05ad0f4..e9e4a3bf 100644
--- a/src/application/views/backend/footer.php
+++ b/src/application/views/backend/footer.php
@@ -25,11 +25,7 @@
     </div>
 </div>
 
-<script
-    type="text/javascript"
-    src="<?php echo $base_url; ?>/assets/js/backend.js"></script>
-<script
-    type="text/javascript"
-    src="<?php echo $base_url; ?>/assets/js/general_functions.js"></script>
+<script src="<?php echo base_url('/assets/js/backend.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/general_functions.js'); ?>"></script>
 </body>
 </html>
diff --git a/src/application/views/backend/header.php b/src/application/views/backend/header.php
index 47550570..62cbd727 100755
--- a/src/application/views/backend/header.php
+++ b/src/application/views/backend/header.php
@@ -5,65 +5,24 @@
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
-    <link rel="icon" type="image/x-icon"
-          href="<?php echo $base_url; ?>/assets/img/favicon.ico">
+    <link rel="icon" type="image/x-icon" href="<?php echo base_url('/assets/img/favicon.ico'); ?>">
 
-    <?php
-        // ------------------------------------------------------------
-        // INCLUDE CSS FILES
-        // ------------------------------------------------------------ ?>
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo $base_url; ?>/assets/ext/bootstrap/css/bootstrap.min.css">
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui.min.css">
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo $base_url; ?>/assets/ext/jquery-qtip/jquery.qtip.min.css">
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo $base_url; ?>/assets/ext/jquery-jscrollpane/jquery.jscrollpane.css">
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo $base_url; ?>/assets/css/backend.css">
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo $base_url; ?>/assets/css/general.css">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('/assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('/assets/ext/jquery-ui/jquery-ui.min.css'); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('/assets/ext/jquery-qtip/jquery.qtip.min.css'); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('/assets/ext/jquery-jscrollpane/jquery.jscrollpane.css'); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('/assets/css/backend.css'); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('/assets/css/general.css'); ?>">
 
-    <?php
-        // ------------------------------------------------------------
-        // INCLUDE JAVASCRIPT FILES
-        // ------------------------------------------------------------ ?>
-    <script
-        type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/jquery/jquery.min.js"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui.min.js"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/jquery-qtip/jquery.qtip.min.js"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/datejs/date.js"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/jquery-jscrollpane/jquery.jscrollpane.min.js"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/jquery-mousewheel/jquery.mousewheel.js"></script>
+    <script src="<?php echo base_url('/assets/ext/jquery/jquery.min.js'); ?>"></script>
+    <script src="<?php echo base_url('/assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
+    <script src="<?php echo base_url('/assets/ext/jquery-ui/jquery-ui.min.js'); ?>"></script>
+    <script src="<?php echo base_url('/assets/ext/jquery-qtip/jquery.qtip.min.js'); ?>"></script>
+    <script src="<?php echo base_url('/assets/ext/datejs/date.js'); ?>"></script>
+    <script src="<?php echo base_url('/assets/ext/jquery-jscrollpane/jquery.jscrollpane.min.js'); ?>"></script>
+    <script src="<?php echo base_url('/assets/ext/jquery-mousewheel/jquery.mousewheel.js'); ?>"></script>
 
-    <script type="text/javascript">
+    <script>
     	// Global JavaScript Variables - Used in all backend pages.
     	var availableLanguages = <?php echo json_encode($this->config->item('available_languages')); ?>;
     	var EALang = <?php echo json_encode($this->lang->language); ?>;
@@ -75,7 +34,7 @@
     <div class="container-fluid">
         <div class="navbar-header">
             <div id="header-logo" class="navbar-brand">
-                <img src="<?php echo $base_url; ?>/assets/img/logo.png">
+                <img src="<?php echo basel_url('/assets/img/logo.png'); ?>">
                 <span><?php echo $company_name; ?></span>
             </div>
             
@@ -163,5 +122,5 @@
 <div id="notification" style="display: none;"></div>
 
 <div id="loading" style="display: none;">
-    <img src="<?php echo $base_url; ?>/assets/img/loading.gif" />
+    <img src="<?php echo base_url('/assets/img/loading.gif"'); ?>>
 </div>
diff --git a/src/application/views/backend/services.php b/src/application/views/backend/services.php
index 3198cb26..0e4e5e84 100644
--- a/src/application/views/backend/services.php
+++ b/src/application/views/backend/services.php
@@ -1,13 +1,7 @@
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_services_helper.js"></script>
-
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_categories_helper.js"></script>
-
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_services.js"></script>
-
-<script type="text/javascript">
+<script src="<?php echo base_url('/assets/js/backend_services_helper.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_categories_helper.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_services.js'); ?>"></script>
+<script>
     var GlobalVariables = {
         'csrfToken'     : <?php echo json_encode($this->security->get_csrf_hash()); ?>,
         'baseUrl'       : <?php echo json_encode($base_url); ?>,
@@ -33,13 +27,8 @@
         <li role="presentation" class="categories-tab tab"><a><?php echo $this->lang->line('categories'); ?></a></li>
     </ul>
 
-    <?php
-        // --------------------------------------------------------------
-        //
-        // SERVICES TAB
-        //
-        // --------------------------------------------------------------
-    ?>
+    <!-- SERVICES TAB -->
+
     <div id="services" class="tab-content">
         <?php // FILTER SERVICES ?>
         <div class="row">
@@ -148,13 +137,8 @@
         </div>
     </div>
 
-    <?php
-        // --------------------------------------------------------------
-        //
-        // CATEGORIES TAB
-        //
-        // --------------------------------------------------------------
-    ?>
+    <!-- CATEGORIES TAB -->
+
     <div id="categories" class="tab-content" style="display:none;">
         <div class="row">
             <div id="filter-categories" class="filter-records column col-xs-12 col-sm-5">
diff --git a/src/application/views/backend/settings.php b/src/application/views/backend/settings.php
index a65ea034..6398f9a7 100644
--- a/src/application/views/backend/settings.php
+++ b/src/application/views/backend/settings.php
@@ -1,17 +1,10 @@
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_settings_system.js"></script>
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_settings_user.js"></script>
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_settings.js"></script>
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/working_plan.js"></script>
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui-timepicker-addon.js"></script>
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/jquery-jeditable/jquery.jeditable.min.js"></script>
-
-<script type="text/javascript">
+<script src="<?php echo base_url('/assets/js/backend_settings_system.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_settings_user.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_settings.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/working_plan.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/ext/jquery-ui/jquery-ui-timepicker-addon.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/ext/jquery-jeditable/jquery.jeditable.min.js'); ?>"></script>
+<script>
     var GlobalVariables = {
         'csrfToken'     : <?php echo json_encode($this->security->get_csrf_hash()); ?>,
         'baseUrl'       : <?php echo json_encode($base_url); ?>,
@@ -51,13 +44,8 @@
         <li role="representation" class="about-tab tab"><a><?php echo $this->lang->line('about_ea'); ?></a></li>
     </ul>
 
-    <?php
-        // --------------------------------------------------------------
-        //
-        // GENERAL TAB
-        //
-        // --------------------------------------------------------------
-    ?>
+    <!-- GENERAL TAB -->
+
     <?php $hidden = ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE) ? '' : 'hidden'; ?>
     <div id="general" class="tab-content <?php echo $hidden; ?>">
         <form>
@@ -152,13 +140,8 @@
         </form>
     </div>
 
-    <?php
-        // --------------------------------------------------------------
-        //
-        // BUSINESS LOGIC TAB
-        //
-        // --------------------------------------------------------------
-    ?>
+    <!-- BUSINESS LOGIC TAB -->
+
     <?php $hidden = ($privileges[PRIV_SYSTEM_SETTINGS]['view'] == TRUE) ? '' : 'hidden'; ?>
     <div id="business-logic" class="tab-content <?php echo $hidden; ?>">
         <form>
@@ -322,13 +305,8 @@
         </form>
     </div>
 
-    <?php
-        // --------------------------------------------------------------
-        //
-        // USER TAB
-        //
-        // --------------------------------------------------------------
-    ?>
+    <!-- USER TAB -->
+
     <?php $hidden = ($privileges[PRIV_USER_SETTINGS]['view'] == TRUE) ? '' : 'hidden'; ?>
     <div id="user" class="tab-content <?php echo $hidden; ?>">
         <form class="row">
@@ -431,13 +409,8 @@
         </form>
     </div>
 
-    <?php
-        // --------------------------------------------------------------
-        //
-        // ABOUT TAB
-        //
-        // --------------------------------------------------------------
-    ?>
+    <!-- ABOUT TAB -->
+
     <div id="about" class="tab-content">
         <h3>Easy!Appointments</h3>
         <p>
diff --git a/src/application/views/backend/users.php b/src/application/views/backend/users.php
index 0cbfcbea..8680a2be 100644
--- a/src/application/views/backend/users.php
+++ b/src/application/views/backend/users.php
@@ -1,19 +1,11 @@
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_users_admins.js"></script>
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_users_providers.js"></script>
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_users_secretaries.js"></script>
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/backend_users.js"></script>
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/working_plan.js"></script>
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui-timepicker-addon.js"></script>
-<script type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/jquery-jeditable/jquery.jeditable.min.js"></script>
-
-<script type="text/javascript">
+<script src="<?php echo base_url('/assets/js/backend_users_admins.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_users_providers.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_users_secretaries.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/backend_users.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/js/working_plan.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/ext/jquery-ui/jquery-ui-timepicker-addon.js'); ?>"></script>
+<script src="<?php echo base_url('/assets/ext/jquery-jeditable/jquery.jeditable.min.js'); ?>"></script>
+<script>
     var GlobalVariables = {
         csrfToken     : <?php echo json_encode($this->security->get_csrf_hash()); ?>,
         baseUrl       : <?php echo json_encode($base_url); ?>,
@@ -38,26 +30,16 @@
 
 <div id="users-page" class="container-fluid backend-page">
 
-    <?php
-        // ---------------------------------------------------------------------
-        //
-        // Page Navigation
-        //
-        // ---------------------------------------------------------------------
-    ?>
+    <!-- PAGE NAVIGATION -->
+
     <ul class="nav nav-tabs">
         <li role="presentation" class="admins-tab tab active"><a><?php echo $this->lang->line('admins'); ?></a></li>
         <li role="presentation" class="providers-tab tab"><a><?php echo $this->lang->line('providers'); ?></a></li>
         <li role="presentation" class="secretaries-tab tab"><a><?php echo $this->lang->line('secretaries'); ?></a></li>
     </ul>
 
-    <?php
-        // ---------------------------------------------------------------------
-        //
-        // Admins Tab
-        //
-        // ---------------------------------------------------------------------
-    ?>
+    <!-- ADMINS TAB -->
+
     <div id="admins" class="tab-content">
         <div class="row">
             <div id="filter-admins" class="filter-records column col-xs-12 col-sm-5">
@@ -200,13 +182,8 @@
         </div>
     </div>
 
-    <?php
-        // ---------------------------------------------------------------------
-        //
-        // Providers Tab
-        //
-        // ---------------------------------------------------------------------
-    ?>
+    <!-- PROVIDERS TAB -->
+
     <div id="providers" class="tab-content" style="display:none;">
         <div class="row">
             <div id="filter-providers" class="filter-records column col-xs-12 col-sm-5">
@@ -482,13 +459,8 @@
         </div>
     </div>
 
-    <?php
-        // ---------------------------------------------------------------------
-        //
-        // Secretaries Tab
-        //
-        // ---------------------------------------------------------------------
-    ?>
+    <!-- SECRETARIES TAB -->
+
     <div id="secretaries" class="tab-content" style="display:none;">
         <div class="row">
             <div id="filter-secretaries" class="filter-records column col-xs-12 col-sm-5">
diff --git a/src/application/views/general/error404.php b/src/application/views/general/error404.php
index 0af274b2..18f99ca5 100644
--- a/src/application/views/general/error404.php
+++ b/src/application/views/general/error404.php
@@ -1,63 +1,24 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8" />
+    <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#35A768">
     <title><?php echo $this->lang->line('page_not_found') . ' - ' . $company_name; ?></title>
 
-    <?php
-        // ------------------------------------------------------------
-        // INCLUDE CSS FILES
-        // ------------------------------------------------------------ ?>
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
 
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
+    <link rel="icon" type="image/x-icon" href="<?php echo base_url('assets/img/favicon.ico'); ?>">
 
-    <?php
-        // ------------------------------------------------------------
-        // SET PAGE FAVICON
-        // ------------------------------------------------------------ ?>
-
-    <link
-        rel="icon"
-        type="image/x-icon"
-        href="<?php echo base_url('assets/img/favicon.ico'); ?>">
-
-    <?php
-        // ------------------------------------------------------------
-        // CUSTOM PAGE JS
-        // ------------------------------------------------------------ ?>
-
-    <script type="text/javascript">
+    <script>
         var EALang = <?php echo json_encode($this->lang->language); ?>;
     </script>
 
-    <?php
-        // ------------------------------------------------------------
-        // INCLUDE JS FILES
-        // ------------------------------------------------------------ ?>
-
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
-
-    <?php
-        // ------------------------------------------------------------
-        // CUSTOM PAGE CSS
-        // ------------------------------------------------------------ ?>
+    <script src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
 
     <style>
         body {
diff --git a/src/application/views/general/installation.php b/src/application/views/general/installation.php
index b394884b..b0ed9144 100755
--- a/src/application/views/general/installation.php
+++ b/src/application/views/general/installation.php
@@ -4,17 +4,10 @@
     <title>Easy!Appointments - Installation</title>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
-    <link rel="stylesheet" type="text/css"
-        href="<?php echo $base_url; ?>/assets/ext/bootstrap/css/bootstrap.min.css">
-
-    <link rel="icon" type="image/x-icon"
-        href="<?php echo $base_url; ?>/assets/img/favicon.ico">
-
-    <link rel="stylesheet" type="text/css"
-        href="<?php echo $base_url ?>/assets/ext/jquery-ui/jquery-ui.min.css">
-
-    <link rel="stylesheet" type="text/css"
-        href="<?php echo $base_url; ?>/assets/css/general.css">
+    <link rel="stylesheet" type="text/css" href="<?php echo $base_url; ?>/assets/ext/bootstrap/css/bootstrap.min.css">
+    <link rel="icon" type="image/x-icon" href="<?php echo $base_url; ?>/assets/img/favicon.ico">
+    <link rel="stylesheet" type="text/css" href="<?php echo $base_url ?>/assets/ext/jquery-ui/jquery-ui.min.css">
+    <link rel="stylesheet" type="text/css" href="<?php echo $base_url; ?>/assets/css/general.css">
 
     <style>
         header {
@@ -176,7 +169,7 @@
         Powered by <a href="http://easyappointments.org">Easy!Appointments</a>
     </footer>
 
-    <script type="text/javascript">
+    <script>
         var GlobalVariables = {
             'csrfToken': <?php echo json_encode($this->security->get_csrf_hash()); ?>,
             'baseUrl': <?php echo '"' . $base_url . '"'; ?>
@@ -185,28 +178,11 @@
         var EALang = <?php echo json_encode($this->lang->language); ?>;
     </script>
 
-    <script
-        type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/jquery/jquery.min.js"></script>
-
-    <script
-        type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery-ui/jquery-ui.min.js"></script>
-
-    <script
-        type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script>
-
-    <script
-        type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/general_functions.js"></script>
-
-    <script
-        type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/datejs/date.js"></script>
-
-    <script
-        type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/js/installation.js"></script>
+    <script src="<?php echo base_url('/assets/ext/jquery/jquery.min.js'); ?>"></script>
+    <script src="<?php echo base_url('/assets/ext/jquery-ui/jquery-ui.min.js'); ?>"></script>
+    <script src="<?php echo base_url('/assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
+    <script src="<?php echo base_url('/assets/js/general_functions.js'); ?>"></script>
+    <script src="<?php echo base_url('/assets/ext/datejs/date.js'); ?>"></script>
+    <script src="<?php echo base_url('/assets/js/installation.js'); ?>"></script>
 </body>
 </html>
diff --git a/src/application/views/user/forgot_password.php b/src/application/views/user/forgot_password.php
index 5e7ffe91..e9d4eaef 100644
--- a/src/application/views/user/forgot_password.php
+++ b/src/application/views/user/forgot_password.php
@@ -1,45 +1,25 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8" />
+    <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#35A768">
     <title><?php echo $this->lang->line('forgot_your_password') . ' - ' . $company_name; ?></title>
 
-    <?php // INCLUDE JS FILES ?>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
 
-    <script type="text/javascript">
+    <script>
         var EALang = <?php echo json_encode($this->lang->language); ?>;
     </script>
 
-    <?php // INCLUDE CSS FILES ?>
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.css'); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.css'); ?>">
 
-    <?php // SET FAVICON FOR PAGE ?>
-    <link
-        rel="icon"
-        type="image/x-icon"
-        href="<?php echo base_url('assets/img/favicon.ico'); ?>">
+    <link rel="icon" type="image/x-icon" href="<?php echo base_url('assets/img/favicon.ico'); ?>">
 
     <style>
         body {
@@ -70,7 +50,7 @@
         }
     </style>
 
-    <script type="text/javascript">
+    <script>
         $(document).ready(function() {
             var GlobalVariables = {
                 'csrfToken': <?php echo json_encode($this->security->get_csrf_hash()); ?>,
@@ -101,14 +81,12 @@
                 $('#get-new-password').prop('disabled', true);
 
                 $.post(postUrl, postData, function(response) {
-                    //////////////////////////////////////////////////////////
-                    console.log('Regenerate Password Response: ', response);
-                    //////////////////////////////////////////////////////////
-
                     $('.alert').removeClass('hidden alert-danger alert-success');
                     $('#get-new-password').prop('disabled', false);
 
-                    if (!GeneralFunctions.handleAjaxExceptions(response)) return;
+                    if (!GeneralFunctions.handleAjaxExceptions(response)) {
+                        return;
+                    }
 
                     if (response == GlobalVariables.AJAX_SUCCESS) {
                         $('.alert').addClass('alert-success');
@@ -149,8 +127,6 @@
                 <?php echo $this->lang->line('go_to_login'); ?></a>
         </form>
     </div>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
 </body>
 </html>
diff --git a/src/application/views/user/login.php b/src/application/views/user/login.php
index 945c0cfb..94af0d08 100644
--- a/src/application/views/user/login.php
+++ b/src/application/views/user/login.php
@@ -1,46 +1,22 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8" />
+    <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#35A768">
     <title><?php echo $this->lang->line('login') . ' - ' . $company_name; ?></title>
 
+    <script src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
 
-    <?php // INCLUDE JS FILES ?>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui.min.js"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.css'); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
+	<link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/css/general.css'); ?>">
 
-    <?php // INCLUDE CSS FILES ?>
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo $base_url; ?>/assets/ext/jquery-ui/jquery-ui.min.css">
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
-	<link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo base_url('assets/css/general.css'); ?>">
-
-    <?php // SET FAVICON FOR PAGE ?>
-    <link
-        rel="icon"
-        type="image/x-icon"
-        href="<?php echo base_url('assets/img/favicon.ico'); ?>">
+    <link rel="icon" type="image/x-icon" href="<?php echo base_url('assets/img/favicon.ico'); ?>">
 
     <style>
         body {
@@ -67,7 +43,7 @@
         }
     </style>
 
-    <script type="text/javascript">
+    <script>
         var GlobalVariables = {
             'csrfToken': <?php echo json_encode($this->security->get_csrf_hash()); ?>,
             'baseUrl': <?php echo json_encode($base_url); ?>,
@@ -101,11 +77,9 @@
                 $('.alert').addClass('hidden');
 
                 $.post(postUrl, postData, function(response) {
-                    //////////////////////////////////////////////////
-                    console.log('Check Login Response: ', response);
-                    //////////////////////////////////////////////////
-
-                    if (!GeneralFunctions.handleAjaxExceptions(response)) return;
+                    if (!GeneralFunctions.handleAjaxExceptions(response)) {
+                        return;
+                    }
 
                     if (response == GlobalVariables.AJAX_SUCCESS) {
                         window.location.href = GlobalVariables.destUrl;
@@ -156,8 +130,6 @@
         </form>
     </div>
 
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
 </body>
 </html>
diff --git a/src/application/views/user/logout.php b/src/application/views/user/logout.php
index 0be2b92d..8404b8b6 100644
--- a/src/application/views/user/logout.php
+++ b/src/application/views/user/logout.php
@@ -7,22 +7,15 @@
     <meta name="theme-color" content="#35A768">
     <title><?php echo $this->lang->line('log_out') . ' - ' . $company_name; ?></title>
 
-    <?php // SET FAVICON FOR PAGE ?>
     <link rel="icon" type="image/x-icon" href="<?php echo base_url('assets/img/favicon.ico'); ?>">
 
-    <?php // INCLUDE JS FILES ?>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
 
-    <script type="text/javascript">
+    <script>
         var EALang = <?php echo json_encode($this->lang->language); ?>;
     </script>
 
-    <?php // INCLUDE CSS FILES ?>
     <link
         rel="stylesheet"
         type="text/css"
diff --git a/src/application/views/user/no_privileges.php b/src/application/views/user/no_privileges.php
index 6337c5e7..8c2b44a1 100644
--- a/src/application/views/user/no_privileges.php
+++ b/src/application/views/user/no_privileges.php
@@ -1,31 +1,18 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8" />
+    <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#35A768">
     <title><?php echo $this->lang->line('no_privileges') . ' - ' . $company_name; ?></title>
 
-    <?php // INCLUDE JS FILES ?>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
-    <script
-        type="text/javascript"
-        src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
+    <script src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
 
-    <?php // INCLUDE CSS FILES ?>
-    <link
-        rel="stylesheet"
-        type="text/css"
-        href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
 
-    <?php // SET FAVICON FOR PAGE ?>
-    <link
-        rel="icon"
-        type="image/x-icon"
-        href="<?php echo base_url('assets/img/favicon.ico'); ?>">
+    <link rel="icon" type="image/x-icon" href="<?php echo base_url('assets/img/favicon.ico'); ?>">
 
     <style>
         body {
