diff --git a/src/application/controllers/appointments.php b/src/application/controllers/appointments.php
index 7636e11a..356f0d15 100755
--- a/src/application/controllers/appointments.php
+++ b/src/application/controllers/appointments.php
@@ -90,8 +90,7 @@ class Appointments extends CI_Controller {
                     $view = array(
                         'message_title' => $this->lang->line('appointment_not_found'),
                         'message_text'  => $this->lang->line('appointment_does_not_exist_in_db'),
-                        'message_icon'  => $this->config->item('base_url')
-                                         . '/assets/img/error.png'
+                        'message_icon'  => base_url('assets/img/error.png')
                     );
                     $this->load->view('appointments/message', $view);
                     return;
@@ -222,7 +221,7 @@ class Appointments extends CI_Controller {
         $view = array(
             'message_title' => $this->lang->line('appointment_cancelled_title'),
             'message_text' => $this->lang->line('appointment_cancelled'),
-            'message_icon' => $this->config->item('base_url') . '/assets/img/success.png'
+            'message_icon' => base_url('assets/img/success.png')
         );
 
         if (isset($exceptions)) {
diff --git a/src/application/views/appointments/book.php b/src/application/views/appointments/book.php
index 5050828d..4a6dd1d7 100644
--- a/src/application/views/appointments/book.php
+++ b/src/application/views/appointments/book.php
@@ -15,23 +15,23 @@
     <link
         rel="stylesheet"
         type="text/css"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css">
+        href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
     <link
         rel="stylesheet"
         type="text/css"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery-ui/jquery-ui.min.css">
+        href="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.css'); ?>">
     <link
         rel="stylesheet"
         type="text/css"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery-qtip/jquery.qtip.min.css">
+        href="<?php echo base_url('assets/ext/jquery-qtip/jquery.qtip.min.css'); ?>">
     <link
         rel="stylesheet"
         type="text/css"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/css/frontend.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/css/general.css">
+        href="<?php echo base_url('assets/css/general.css'); ?>">
 
     <?php
         // ------------------------------------------------------------
@@ -40,22 +40,22 @@
 
     <script
         type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script>
+        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>
+        src="<?php echo base_url('assets/ext/jquery-ui/jquery-ui.min.js'); ?>"></script>
     <script
         type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery-qtip/jquery.qtip.min.js"></script>
+        src="<?php echo base_url('assets/ext/jquery-qtip/jquery.qtip.min.js'); ?>"></script>
     <script
         type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/js/bootstrap.min.js"></script>
+        src="<?php echo 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>
+        src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
     <script
         type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/frontend_book.js"></script>
+        src="<?php echo base_url('assets/js/frontend_book.js'); ?>"></script>
 
     <?php
         // ------------------------------------------------------------
@@ -63,10 +63,10 @@
         // ------------------------------------------------------------ ?>
 
     <link rel="icon" type="image/x-icon"
-            href="<?php echo $this->config->item('base_url'); ?>/assets/img/favicon.ico">
+            href="<?php echo base_url('assets/img/favicon.ico'); ?>">
 
     <link rel="icon" sizes="192x192"
-            href="<?php echo $this->config->item('base_url'); ?>/assets/img/logo.png">
+            href="<?php echo base_url('assets/img/logo.png'); ?>">
 
     <?php
         // ------------------------------------------------------------
@@ -77,7 +77,7 @@
         var GlobalVariables = {
             availableServices   : <?php echo json_encode($available_services); ?>,
             availableProviders  : <?php echo json_encode($available_providers); ?>,
-            baseUrl             : <?php echo '"' . $this->config->item('base_url') . '"'; ?>,
+            baseUrl             : <?php echo json_encode($this->config->item('base_url')); ?>,
             manageMode          : <?php echo ($manage_mode) ? 'true' : 'false'; ?>,
             dateFormat          : <?php echo json_encode($date_format); ?>,
             appointmentData     : <?php echo json_encode($appointment_data); ?>,
@@ -433,7 +433,7 @@
 
     <script
         type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/general_functions.js"></script>
+        src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
 
     <?php google_analytics_script(); ?>
 </body>
diff --git a/src/application/views/appointments/book_success.php b/src/application/views/appointments/book_success.php
index b10289f5..9614837e 100755
--- a/src/application/views/appointments/book_success.php
+++ b/src/application/views/appointments/book_success.php
@@ -13,9 +13,9 @@
         // ------------------------------------------------------------ ?>
 
     <link rel="stylesheet" type="text/css"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css">
+        href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
     <link rel="stylesheet" type="text/css"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/css/frontend.css">
+        href="<?php echo base_url('assets/css/frontend.css'); ?>">
 
     <?php
         // ------------------------------------------------------------
@@ -23,10 +23,10 @@
         // ------------------------------------------------------------ ?>
 
     <link rel="icon" type="image/x-icon"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/img/favicon.ico">
+        href="<?php echo base_url('assets/img/favicon.ico'); ?>">
 
     <link rel="icon" sizes="192x192"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/img/logo.png">
+        href="<?php echo base_url('assets/img/logo.png'); ?>">
 </head>
 <body>
     <div id="main" class="container">
@@ -38,7 +38,7 @@
                     col-lg-offset-2 col-lg-8">
 
                 <div class="col-xs-12 col-sm-2">
-                    <img id="success-icon" class="pull-right" src="<?php echo $this->config->item('base_url'); ?>/assets/img/success.png" />
+                    <img id="success-icon" class="pull-right" src="<?php echo base_url('assets/img/success.png'); ?>" />
                 </div>
                 <div class="col-xs-12 col-sm-10">
                     <?php
@@ -81,13 +81,13 @@
 
     <script
         type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script>
+        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/bootstrap/js/bootstrap.min.js"></script>
+        src="<?php echo 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>
+        src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
     <script
         type="text/javascript"
         src="https://apis.google.com/js/client.js"></script>
@@ -114,11 +114,11 @@
 
     <script
         type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/frontend_book_success.js"></script>
+        src="<?php echo base_url('assets/js/frontend_book_success.js'); ?>"></script>
 
     <script
         type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/general_functions.js"></script>
+        src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
 
     <?php google_analytics_script(); ?>
 </body>
diff --git a/src/application/views/general/error404.php b/src/application/views/general/error404.php
index a6f5e43d..5b86ae78 100644
--- a/src/application/views/general/error404.php
+++ b/src/application/views/general/error404.php
@@ -15,7 +15,7 @@
     <link
         rel="stylesheet"
         type="text/css"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css">
+        href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
 
     <?php
         // ------------------------------------------------------------
@@ -25,7 +25,7 @@
     <link
         rel="icon"
         type="image/x-icon"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/img/favicon.ico">
+        href="<?php echo base_url('assets/img/favicon.ico'); ?>">
 
     <?php
         // ------------------------------------------------------------
@@ -43,16 +43,16 @@
 
     <script
         type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script>
+        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/bootstrap/js/bootstrap.min.js"></script>
+        src="<?php echo 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>
+        src="<?php echo 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>
+        src="<?php echo base_url('assets/js/general_functions.js'); ?>"></script>
 
     <?php
         // ------------------------------------------------------------
@@ -108,7 +108,7 @@
 
         <br>
 
-        <a href="<?php echo $this->config->item('base_url'); ?>" class="btn btn-primary btn-large">
+        <a href="<?php echo site_url(); ?>" class="btn btn-primary btn-large">
             <span class="glyphicon glyphicon-calendar"></span>
             <?php echo $this->lang->line('book_appointment_title'); ?>
         </a>
diff --git a/src/application/views/general/test.php b/src/application/views/general/test.php
index 498e4fa9..3b585e44 100644
--- a/src/application/views/general/test.php
+++ b/src/application/views/general/test.php
@@ -1,4 +1,4 @@
-<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 base_url('assets/ext/jquery/jquery.min.js'); ?>"></script>
 <script type="text/javascript">
     $(document).ready(function() {
         var passedTestsNumber = $('span').filter(function() {
@@ -30,8 +30,6 @@
         display: inline-block;
         margin-right: 21px;
         color: #DBFFA6;
-/*        color: #C0FFD9;
-        text-shadow: 0px 1px 1px #0D9E41;*/
     }
 
     #test-results {
diff --git a/src/application/views/user/forgot_password.php b/src/application/views/user/forgot_password.php
index e9e10bb1..576738cd 100644
--- a/src/application/views/user/forgot_password.php
+++ b/src/application/views/user/forgot_password.php
@@ -10,13 +10,13 @@
     <?php // INCLUDE JS FILES ?>
     <script
         type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script>
+        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/bootstrap/js/bootstrap.min.js"></script>
+        src="<?php echo 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>
+        src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
 
     <script type="text/javascript">
         var EALang = <?php echo json_encode($this->lang->language); ?>;
@@ -26,13 +26,13 @@
     <link
         rel="stylesheet"
         type="text/css"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.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 $this->config->item('base_url'); ?>/assets/img/favicon.ico">
+        href="<?php echo base_url('assets/img/favicon.ico'); ?>">
 
     <style>
         body {
@@ -67,7 +67,7 @@
         $(document).ready(function() {
             var GlobalVariables = {
                 'csrfToken': <?php echo json_encode($this->security->get_csrf_hash()); ?>,
-                'baseUrl': <?php echo '"' . $base_url . '"'; ?>,
+                'baseUrl': <?php echo json_encode($base_url); ?>,
                 'AJAX_SUCCESS': 'SUCCESS',
                 'AJAX_FAILURE': 'FAILURE'
             };
@@ -144,6 +144,6 @@
     </div>
     <script
         type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/general_functions.js"></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 1646546c..ff08ea81 100644
--- a/src/application/views/user/login.php
+++ b/src/application/views/user/login.php
@@ -11,29 +11,29 @@
     <?php // INCLUDE JS FILES ?>
     <script
         type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script>
+        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/bootstrap/js/bootstrap.min.js"></script>
+        src="<?php echo 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>
+        src="<?php echo base_url('assets/ext/datejs/date.js'); ?>"></script>
 
     <?php // INCLUDE CSS FILES ?>
     <link
         rel="stylesheet"
         type="text/css"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css">
+        href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
 	<link
         rel="stylesheet"
         type="text/css"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/css/general.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 $this->config->item('base_url'); ?>/assets/img/favicon.ico">
+        href="<?php echo base_url('assets/img/favicon.ico'); ?>">
 
     <style>
         body {
@@ -63,8 +63,8 @@
     <script type="text/javascript">
         var GlobalVariables = {
             'csrfToken': <?php echo json_encode($this->security->get_csrf_hash()); ?>,
-            'baseUrl': <?php echo '"' . $base_url . '"'; ?>,
-            'destUrl': <?php echo '"' . $dest_url . '"'; ?>,
+            'baseUrl': <?php echo json_encode($base_url); ?>,
+            'destUrl': <?php echo json_encode($dest_url); ?>,
             'AJAX_SUCCESS': 'SUCCESS',
             'AJAX_FAILURE': 'FAILURE'
         };
@@ -151,6 +151,6 @@
 
     <script
         type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/js/general_functions.js"></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 e3bac1b3..6bba945f 100644
--- a/src/application/views/user/logout.php
+++ b/src/application/views/user/logout.php
@@ -8,15 +8,15 @@
     <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 $this->config->item('base_url'); ?>/assets/img/favicon.ico">
+    <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 $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script>
+        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/bootstrap/js/bootstrap.min.js"></script>
+        src="<?php echo base_url('assets/ext/bootstrap/js/bootstrap.min.js'); ?>"></script>
 
     <script type="text/javascript">
         var EALang = <?php echo json_encode($this->lang->language); ?>;
@@ -26,7 +26,7 @@
     <link
         rel="stylesheet"
         type="text/css"
-        href="<?php echo $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.css">
+        href="<?php echo base_url('assets/ext/bootstrap/css/bootstrap.min.css'); ?>">
 
     <style>
         body {
diff --git a/src/application/views/user/no_privileges.php b/src/application/views/user/no_privileges.php
index f1723d3f..3143c5da 100644
--- a/src/application/views/user/no_privileges.php
+++ b/src/application/views/user/no_privileges.php
@@ -10,22 +10,22 @@
     <?php // INCLUDE JS FILES ?>
     <script
         type="text/javascript"
-        src="<?php echo $this->config->item('base_url'); ?>/assets/ext/jquery/jquery.min.js"></script>
+        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/bootstrap/js/bootstrap.min.js"></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 $this->config->item('base_url'); ?>/assets/ext/bootstrap/css/bootstrap.min.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 $this->config->item('base_url'); ?>/assets/img/favicon.ico">
+        href="<?php echo base_url('assets/img/favicon.ico'); ?>">
 
     <style>
         body {