diff --git a/ui/ui/admin-edit.tpl b/ui/ui/admin-edit.tpl
index f04d71be..f4679171 100644
--- a/ui/ui/admin-edit.tpl
+++ b/ui/ui/admin-edit.tpl
@@ -12,8 +12,8 @@
                 <div class="panel-body">
                     <input type="hidden" name="id" value="{$d['id']}">
                     <center>
-                        <img src="{$UPLOAD_PATH}{$d['photo']}.thumb.jpg" width="200"
-                            onerror="this.src='{$UPLOAD_PATH}/admin.default.png'" class="img-circle img-responsive" alt="Foto"
+                        <img src="{$app_url}/{$UPLOAD_PATH}{$d['photo']}.thumb.jpg" width="200"
+                            onerror="this.src='{$app_url}/{$UPLOAD_PATH}/admin.default.png'" class="img-circle img-responsive" alt="Foto"
                             onclick="return deletePhoto({$d['id']})">
                     </center><br>
                     <div class="form-group">
diff --git a/ui/ui/admin-login.tpl b/ui/ui/admin-login.tpl
index 76e05f06..63c57a46 100644
--- a/ui/ui/admin-login.tpl
+++ b/ui/ui/admin-login.tpl
@@ -5,10 +5,10 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <title>{Lang::T('Login')} - {$_c['CompanyName']}</title>
-    <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
+    <link rel="shortcut icon" href="{$app_url}/ui/ui/images/logo.png" type="image/x-icon" />
 
-    <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/bootstrap.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/modern-AdminLTE.min.css">
 
 
 </head>
diff --git a/ui/ui/admin-view.tpl b/ui/ui/admin-view.tpl
index 549d0032..002255ed 100644
--- a/ui/ui/admin-view.tpl
+++ b/ui/ui/admin-view.tpl
@@ -9,9 +9,9 @@
                     <div class="panel-heading">{$d['fullname']}</div>
                     <div class="panel-body">
                         <center>
-                            <a href="{$UPLOAD_PATH}{$d['photo']}" target="foto">
-                                <img src="{$UPLOAD_PATH}{$d['photo']}.thumb.jpg" width="200"
-                                    onerror="this.src='{$UPLOAD_PATH}/admin.default.png'" class="img-circle img-responsive" alt="Foto">
+                            <a href="{$app_url}/{$UPLOAD_PATH}{$d['photo']}" target="foto">
+                                <img src="{$app_url}/{$UPLOAD_PATH}{$d['photo']}.thumb.jpg" width="200"
+                                    onerror="this.src='{$app_url}/{$UPLOAD_PATH}/admin.default.png'" class="img-circle img-responsive" alt="Foto">
                             </a>
                         </center><br>
                         <ul class="list-group list-group-unbordered">
diff --git a/ui/ui/alert.tpl b/ui/ui/alert.tpl
index d322108f..6c34c4f8 100644
--- a/ui/ui/alert.tpl
+++ b/ui/ui/alert.tpl
@@ -6,9 +6,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>{ucwords(Lang::T($type))} - {$_c['CompanyName']}</title>
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-    <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
-    <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
+    <link rel="shortcut icon" href="{$app_url}/ui/ui/images/logo.png" type="image/x-icon" />
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/bootstrap.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/modern-AdminLTE.min.css">
     <meta http-equiv="refresh" content="{$time}; url={$url}">
 </head>
 
diff --git a/ui/ui/customer/dashboard.tpl b/ui/ui/customer/dashboard.tpl
index 001c2d41..77571da3 100644
--- a/ui/ui/customer/dashboard.tpl
+++ b/ui/ui/customer/dashboard.tpl
@@ -258,7 +258,7 @@
                     <tr>
                         <td class="small text-primary text-uppercase text-normal">{Lang::T('Login Status')}</td>
                         <td class="small mb15" id="login_status_{$_bill['id']}">
-                            <img src="ui/ui/images/loading.gif">
+                            <img src="{$app_url}/ui/ui/images/loading.gif">
                         </td>
                     </tr>
                     {/if}
diff --git a/ui/ui/customer/error.tpl b/ui/ui/customer/error.tpl
index 9c2c9be5..8f6dfc1b 100644
--- a/ui/ui/customer/error.tpl
+++ b/ui/ui/customer/error.tpl
@@ -6,9 +6,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>{ucwords(Lang::T("Error"))} - {$_c['CompanyName']}</title>
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-    <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
-    <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
+    <link rel="shortcut icon" href="{$app_url}/ui/ui/images/logo.png" type="image/x-icon" />
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/bootstrap.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/modern-AdminLTE.min.css">
 </head>
 
 <body class="hold-transition lockscreen">
diff --git a/ui/ui/customer/footer-public.tpl b/ui/ui/customer/footer-public.tpl
index 8d31991c..f990889c 100644
--- a/ui/ui/customer/footer-public.tpl
+++ b/ui/ui/customer/footer-public.tpl
@@ -33,7 +33,7 @@
         </script>
         <!--End of Tawk.to Script-->
     {/if}
-    <script src="ui/ui/scripts/vendors.js?v=1"></script>
+    <script src="{$app_url}/ui/ui/scripts/vendors.js?v=1"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/ui/ui/customer/footer.tpl b/ui/ui/customer/footer.tpl
index f850d52a..019f130c 100644
--- a/ui/ui/customer/footer.tpl
+++ b/ui/ui/customer/footer.tpl
@@ -42,12 +42,12 @@
 
 
 
-<script src="ui/ui/scripts/jquery.min.js"></script>
-<script src="ui/ui/scripts/bootstrap.min.js"></script>
-<script src="ui/ui/scripts/adminlte.min.js"></script>
+<script src="{$app_url}/ui/ui/scripts/jquery.min.js"></script>
+<script src="{$app_url}/ui/ui/scripts/bootstrap.min.js"></script>
+<script src="{$app_url}/ui/ui/scripts/adminlte.min.js"></script>
 
-<script src="ui/ui/scripts/plugins/select2.min.js"></script>
-<script src="ui/ui/scripts/custom.js?v=2"></script>
+<script src="{$app_url}/ui/ui/scripts/plugins/select2.min.js"></script>
+<script src="{$app_url}/ui/ui/scripts/custom.js?v=2"></script>
 
 {if isset($xfooter)}
     {$xfooter}
diff --git a/ui/ui/customer/header-public.tpl b/ui/ui/customer/header-public.tpl
index d9a478b2..4aca520d 100644
--- a/ui/ui/customer/header-public.tpl
+++ b/ui/ui/customer/header-public.tpl
@@ -5,12 +5,12 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <title>{$_title} - {$_c['CompanyName']}</title>
-    <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
+    <link rel="shortcut icon" href="{$app_url}/ui/ui/images/logo.png" type="image/x-icon" />
 
-    <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/sweetalert2.min.css" />
-    <script src="ui/ui/scripts/sweetalert2.all.min.js"></script>
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/bootstrap.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/modern-AdminLTE.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/sweetalert2.min.css" />
+    <script src="{$app_url}/ui/ui/scripts/sweetalert2.all.min.js"></script>
 
 
 
diff --git a/ui/ui/customer/header.tpl b/ui/ui/customer/header.tpl
index 0706d709..667e8604 100644
--- a/ui/ui/customer/header.tpl
+++ b/ui/ui/customer/header.tpl
@@ -5,15 +5,15 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{$_title} - {$_c['CompanyName']}</title>
-    <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
+    <link rel="shortcut icon" href="{$app_url}/ui/ui/images/logo.png" type="image/x-icon" />
 
-    <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/bootstrap.min.css">
 
-    <link rel="stylesheet" href="ui/ui/fonts/ionicons/css/ionicons.min.css">
-    <link rel="stylesheet" href="ui/ui/fonts/font-awesome/css/font-awesome.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/sweetalert2.min.css" />
-    <script src="ui/ui/scripts/sweetalert2.all.min.js"></script>
+    <link rel="stylesheet" href="{$app_url}/ui/ui/fonts/ionicons/css/ionicons.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/fonts/font-awesome/css/font-awesome.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/modern-AdminLTE.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/sweetalert2.min.css" />
+    <script src="{$app_url}/ui/ui/scripts/sweetalert2.all.min.js"></script>
 
 
     <style>
@@ -828,14 +828,14 @@
                                 {else}
                                     <span>{$_user['fullname']}</span>
                                 {/if}
-                                <img src="{$UPLOAD_PATH}{$_user['photo']}.thumb.jpg"
-                                    onerror="this.src='{$UPLOAD_PATH}/user.default.jpg'" class="user-image"
+                                <img src="{$app_url}/{$UPLOAD_PATH}{$_user['photo']}.thumb.jpg"
+                                    onerror="this.src='{$app_url}/{$UPLOAD_PATH}/user.default.jpg'" class="user-image"
                                     alt="User Image">
                             </a>
                             <ul class="dropdown-menu">
                                 <li class="user-header">
-                                    <img src="{$UPLOAD_PATH}{$_user['photo']}.thumb.jpg"
-                                        onerror="this.src='{$UPLOAD_PATH}/user.default.jpg'" class="img-circle"
+                                    <img src="{$app_url}/{$UPLOAD_PATH}{$_user['photo']}.thumb.jpg"
+                                        onerror="this.src='{$app_url}/{$UPLOAD_PATH}/user.default.jpg'" class="img-circle"
                                         alt="User Image">
 
                                     <p>
diff --git a/ui/ui/customer/login.tpl b/ui/ui/customer/login.tpl
index 56c72f5f..16717f84 100644
--- a/ui/ui/customer/login.tpl
+++ b/ui/ui/customer/login.tpl
@@ -55,7 +55,7 @@
                     </div>
 
                     <div class="clearfix hidden">
-                        <div class="ui-checkbox ui-checkbox-primary right">
+                        <div class="{$app_url}/ui-checkbox ui-checkbox-primary right">
                             <label>
                                 <input type="checkbox">
                                 <span>Remember me</span>
diff --git a/ui/ui/customer/profile.tpl b/ui/ui/customer/profile.tpl
index d2ce3264..5846c2b9 100644
--- a/ui/ui/customer/profile.tpl
+++ b/ui/ui/customer/profile.tpl
@@ -10,8 +10,8 @@
                     <input type="hidden" name="csrf_token" value="{$csrf_token}">
                     <input type="hidden" name="id" value="{$_user['id']}">
                     <center>
-                        <img src="{$UPLOAD_PATH}{$_user['photo']}.thumb.jpg" width="200"
-                            onerror="this.src='{$UPLOAD_PATH}/user.default.jpg'" class="img-circle img-responsive"
+                        <img src="{$app_url}/{$UPLOAD_PATH}{$_user['photo']}.thumb.jpg" width="200"
+                            onerror="this.src='{$app_url}/{$UPLOAD_PATH}/user.default.jpg'" class="img-circle img-responsive"
                             alt="Foto" onclick="return deletePhoto({$d['id']})">
                     </center><br>
                     <div class="form-group">
diff --git a/ui/ui/customers-edit.tpl b/ui/ui/customers-edit.tpl
index b309ceec..59b58b45 100644
--- a/ui/ui/customers-edit.tpl
+++ b/ui/ui/customers-edit.tpl
@@ -9,8 +9,8 @@
                 <div class="panel-heading">{Lang::T('Edit Contact')}</div>
                 <div class="panel-body">
                     <center>
-                        <img src="{$UPLOAD_PATH}{$d['photo']}.thumb.jpg" width="200"
-                            onerror="this.src='{$UPLOAD_PATH}/user.default.jpg'" class="img-circle img-responsive"
+                        <img src="{$app_url}/{$UPLOAD_PATH}{$d['photo']}.thumb.jpg" width="200"
+                            onerror="this.src='{$app_url}/{$UPLOAD_PATH}/user.default.jpg'" class="img-circle img-responsive"
                             alt="Photo" onclick="return deletePhoto({$d['id']})">
                     </center><br>
                     <input type="hidden" name="id" value="{$d['id']}">
diff --git a/ui/ui/customers-view.tpl b/ui/ui/customers-view.tpl
index 5995e00c..41fb9f01 100644
--- a/ui/ui/customers-view.tpl
+++ b/ui/ui/customers-view.tpl
@@ -5,9 +5,9 @@
         <div class="box box-{if $d['status']=='Active'}primary{else}danger{/if}">
             <div class="box-body box-profile">
                 <img class="profile-user-img img-responsive img-circle"
-                    onclick="window.location.href = '{$UPLOAD_PATH}{$d['photo']}'"
-                    src="{$UPLOAD_PATH}{$d['photo']}.thumb.jpg"
-                    onerror="this.src='{$UPLOAD_PATH}/user.default.jpg'" alt="avatar">
+                    onclick="window.location.href = '{$app_url}/{$UPLOAD_PATH}{$d['photo']}'"
+                    src="{$app_url}/{$UPLOAD_PATH}{$d['photo']}.thumb.jpg"
+                    onerror="this.src='{$app_url}/{$UPLOAD_PATH}/user.default.jpg'" alt="avatar">
                 <h3 class="profile-username text-center">{$d['fullname']}</h3>
                 <ul class="list-group list-group-unbordered">
                     <li class="list-group-item">
diff --git a/ui/ui/customers.tpl b/ui/ui/customers.tpl
index 38111418..5feb42ca 100644
--- a/ui/ui/customers.tpl
+++ b/ui/ui/customers.tpl
@@ -116,8 +116,8 @@
                                     <td onclick="window.location.href = '{$_url}customers/view/{$ds['id']}'"
                                         style="cursor:pointer;">{$ds['username']}</td>
                                     <td>
-                                        <a href="{$UPLOAD_PATH}{$ds['photo']}" target="photo">
-                                            <img src="{$UPLOAD_PATH}{$ds['photo']}.thumb.jpg" width="32" alt="">
+                                        <a href="{$app_url}/{$UPLOAD_PATH}{$ds['photo']}" target="photo">
+                                            <img src="{$app_url}/{$UPLOAD_PATH}{$ds['photo']}.thumb.jpg" width="32" alt="">
                                         </a>
                                     </td>
                                     <td>{$ds['account_type']}</td>
diff --git a/ui/ui/error.tpl b/ui/ui/error.tpl
index 81a8f2ca..72b1e663 100644
--- a/ui/ui/error.tpl
+++ b/ui/ui/error.tpl
@@ -5,14 +5,14 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <title>Error - PHPNuxBill</title>
-    <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
+    <link rel="shortcut icon" href="{$app_url}/ui/ui/images/logo.png" type="image/x-icon" />
 
-    <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/bootstrap.min.css">
 
-    <link rel="stylesheet" href="ui/ui/fonts/ionicons/css/ionicons.min.css">
-    <link rel="stylesheet" href="ui/ui/fonts/font-awesome/css/font-awesome.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/fonts/ionicons/css/ionicons.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/fonts/font-awesome/css/font-awesome.min.css">
 
-    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/modern-AdminLTE.min.css">
 
     <style>
         ::-moz-selection {
diff --git a/ui/ui/invoice-print.tpl b/ui/ui/invoice-print.tpl
index 07b0647d..05a08373 100644
--- a/ui/ui/invoice-print.tpl
+++ b/ui/ui/invoice-print.tpl
@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{$_title}</title>
-    <link rel="shortcut icon" type="image/x-icon" href="ui/ui/images/favicon.ico">
+    <link rel="shortcut icon" type="image/x-icon" href="{$app_url}/ui/ui/images/favicon.ico">
     <style>
         body {
             font-family: Arial, sans-serif;
@@ -203,8 +203,8 @@
         </div>
     </div>
 
-    <script src="ui/ui/scripts/jquery.min.js"></script>
-    <script src="ui/ui/scripts/bootstrap.min.js"></script>
+    <script src="{$app_url}/ui/ui/scripts/jquery.min.js"></script>
+    <script src="{$app_url}/ui/ui/scripts/bootstrap.min.js"></script>
     {if isset($xfooter)} {$xfooter} {/if}
 </body>
 
diff --git a/ui/ui/print-by-date.tpl b/ui/ui/print-by-date.tpl
index f11745a0..c9e42d42 100644
--- a/ui/ui/print-by-date.tpl
+++ b/ui/ui/print-by-date.tpl
@@ -4,8 +4,8 @@
     <title>{$_title}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <link href="ui/ui/styles/bootstrap.min.css" rel="stylesheet">
-    <link rel="shortcut icon" type="image/x-icon" href="ui/ui/images/favicon.ico">
+    <link href="{$app_url}/ui/ui/styles/bootstrap.min.css" rel="stylesheet">
+    <link rel="shortcut icon" type="image/x-icon" href="{$app_url}/ui/ui/images/favicon.ico">
 
     <style type="text/css">
         @media print
@@ -55,8 +55,8 @@
         <button type="button" id="actprint" class="btn btn-default btn-sm no-print">{Lang::T('Click Here to Print')}</button>
     </div>
 </div>
-<script src="ui/ui/scripts/jquery.min.js"></script>
-<script src="ui/ui/scripts/bootstrap.min.js"></script>
+<script src="{$app_url}/ui/ui/scripts/jquery.min.js"></script>
+<script src="{$app_url}/ui/ui/scripts/bootstrap.min.js"></script>
 {if isset($xfooter)}
     {$xfooter}
 {/if}
diff --git a/ui/ui/print-by-period.tpl b/ui/ui/print-by-period.tpl
index a10225d0..78f20828 100644
--- a/ui/ui/print-by-period.tpl
+++ b/ui/ui/print-by-period.tpl
@@ -4,8 +4,8 @@
     <title>{$_title}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <link href="ui/ui/styles/bootstrap.min.css" rel="stylesheet">
-    <link rel="shortcut icon" type="image/x-icon" href="ui/ui/images/favicon.ico">
+    <link href="{$app_url}/ui/ui/styles/bootstrap.min.css" rel="stylesheet">
+    <link rel="shortcut icon" type="image/x-icon" href="{$app_url}/ui/ui/images/favicon.ico">
 
     <style type="text/css">
         @media print
@@ -55,8 +55,8 @@
         <button type="button" id="actprint" class="btn btn-default btn-sm no-print">{Lang::T('Click Here to Print')}</button>
     </div>
 </div>
-<script src="ui/ui/scripts/jquery.min.js"></script>
-<script src="ui/ui/scripts/bootstrap.min.js"></script>
+<script src="{$app_url}/ui/ui/scripts/jquery.min.js"></script>
+<script src="{$app_url}/ui/ui/scripts/bootstrap.min.js"></script>
 {if isset($xfooter)}
     {$xfooter}
 {/if}
diff --git a/ui/ui/print-voucher.tpl b/ui/ui/print-voucher.tpl
index c090fa07..68e9a3a1 100644
--- a/ui/ui/print-voucher.tpl
+++ b/ui/ui/print-voucher.tpl
@@ -4,7 +4,7 @@
 <head>
     <title>{$_title}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="shortcut icon" type="image/x-icon" href="ui/ui/images/favicon.ico">
+    <link rel="shortcut icon" type="image/x-icon" href="{$app_url}/ui/ui/images/favicon.ico">
     <style>
         .ukuran {
             size: A4;
@@ -105,7 +105,7 @@
             {/if} {/foreach}
         </div>
     </page>
-    <script src="ui/ui/scripts/jquery.min.js"></script>
+    <script src="{$app_url}/ui/ui/scripts/jquery.min.js"></script>
     {if isset($xfooter)} {$xfooter} {/if}
     <script>
         jQuery(document).ready(function() {
diff --git a/ui/ui/sections/footer.tpl b/ui/ui/sections/footer.tpl
index 0619154e..8eb193f4 100644
--- a/ui/ui/sections/footer.tpl
+++ b/ui/ui/sections/footer.tpl
@@ -7,13 +7,13 @@
         target="_blank">AdminLTE</a>
 </footer>
 </div>
-<script src="ui/ui/scripts/jquery.min.js"></script>
-<script src="ui/ui/scripts/bootstrap.min.js"></script>
-<script src="ui/ui/scripts/adminlte.min.js"></script>
-<script src="ui/ui/scripts/plugins/select2.min.js"></script>
-<script src="ui/ui/scripts/pace.min.js"></script>
-<script src="ui/ui/summernote/summernote.min.js"></script>
-<script src="ui/ui/scripts/custom.js"></script>
+<script src="{$app_url}/ui/ui/scripts/jquery.min.js"></script>
+<script src="{$app_url}/ui/ui/scripts/bootstrap.min.js"></script>
+<script src="{$app_url}/ui/ui/scripts/adminlte.min.js"></script>
+<script src="{$app_url}/ui/ui/scripts/plugins/select2.min.js"></script>
+<script src="{$app_url}/ui/ui/scripts/pace.min.js"></script>
+<script src="{$app_url}/ui/ui/summernote/summernote.min.js"></script>
+<script src="{$app_url}/ui/ui/scripts/custom.js"></script>
 
 <script>
     document.getElementById('openSearch').addEventListener('click', function () {
diff --git a/ui/ui/sections/header.tpl b/ui/ui/sections/header.tpl
index 20d81202..629a26c9 100644
--- a/ui/ui/sections/header.tpl
+++ b/ui/ui/sections/header.tpl
@@ -5,19 +5,19 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <title>{$_title} - {$_c['CompanyName']}</title>
-    <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
+    <link rel="shortcut icon" href="{$app_url}/ui/ui/images/logo.png" type="image/x-icon" />
 
-    <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/bootstrap.min.css">
 
-    <link rel="stylesheet" href="ui/ui/fonts/ionicons/css/ionicons.min.css">
-    <link rel="stylesheet" href="ui/ui/fonts/font-awesome/css/font-awesome.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
-    <link rel="stylesheet" href="ui/ui/styles/select2.min.css" />
-    <link rel="stylesheet" href="ui/ui/styles/select2-bootstrap.min.css" />
-    <link rel="stylesheet" href="ui/ui/styles/sweetalert2.min.css" />
-    <link rel="stylesheet" href="ui/ui/styles/plugins/pace.css" />
-    <link rel="stylesheet" href="ui/ui/summernote/summernote.min.css" />
-    <script src="ui/ui/scripts/sweetalert2.all.min.js"></script>
+    <link rel="stylesheet" href="{$app_url}/ui/ui/fonts/ionicons/css/ionicons.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/fonts/font-awesome/css/font-awesome.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/modern-AdminLTE.min.css">
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/select2.min.css" />
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/select2-bootstrap.min.css" />
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/sweetalert2.min.css" />
+    <link rel="stylesheet" href="{$app_url}/ui/ui/styles/plugins/pace.css" />
+    <link rel="stylesheet" href="{$app_url}/ui/ui/summernote/summernote.min.css" />
+    <script src="{$app_url}/ui/ui/scripts/sweetalert2.all.min.js"></script>
     <style>
         /* New Customize Interface Start Here */
         @import url(https://fonts.googleapis.com/css?family=Open+Sans);
@@ -1147,7 +1147,7 @@
         /* dark mode styles start ends here */
     </style>
     {if isset($xheader)}
-    {$xheader}
+        {$xheader}
     {/if}
 
 </head>
@@ -1155,7 +1155,7 @@
 <body class="hold-transition modern-skin-dark sidebar-mini {if $_kolaps}sidebar-collapse{/if}">
     <div class="wrapper">
         <header class="main-header">
-            <a href="{$_url}dashboard" class="logo">
+            <a href="{Text::url('dashboard')}" class="logo">
                 <span class="logo-mini"><b>N</b>uX</span>
                 <span class="logo-lg">{$_c['CompanyName']}</span>
             </a>
@@ -1170,7 +1170,6 @@
                                 <button id="openSearch" class="search"><i class="fa fa-search x2"></i></button>
                             </div>
                         </div>
-
                         <div id="searchOverlay" class="search-overlay">
                             <div class="search-container">
                                 <input type="text" id="searchTerm" class="searchTerm"
@@ -1188,15 +1187,15 @@
                         </li>
                         <li class="dropdown user user-menu">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                <img src="{$UPLOAD_PATH}{$_admin['photo']}.thumb.jpg"
-                                    onerror="this.src='{$UPLOAD_PATH}/admin.default.png'" class="user-image"
+                                <img src="{$app_url}/{$UPLOAD_PATH}{$_admin['photo']}.thumb.jpg"
+                                    onerror="this.src='{$app_url}/{$UPLOAD_PATH}/admin.default.png'" class="user-image"
                                     alt="Avatar">
                                 <span class="hidden-xs">{$_admin['fullname']}</span>
                             </a>
                             <ul class="dropdown-menu">
                                 <li class="user-header">
-                                    <img src="{$UPLOAD_PATH}{$_admin['photo']}.thumb.jpg"
-                                        onerror="this.src='{$UPLOAD_PATH}/admin.default.png'" class="img-circle"
+                                    <img src="{$app_url}/{$UPLOAD_PATH}{$_admin['photo']}.thumb.jpg"
+                                        onerror="this.src='{$app_url}/{$UPLOAD_PATH}/admin.default.png'" class="img-circle"
                                         alt="Avatar">
                                     <p>
                                         {$_admin['fullname']}
@@ -1206,11 +1205,12 @@
                                 <li class="user-body">
                                     <div class="row">
                                         <div class="col-xs-7 text-center text-sm">
-                                            <a href="{$_url}settings/change-password"><i class="ion ion-settings"></i>
+                                            <a href="{Text::url('settings/change-password')}"><i
+                                                    class="ion ion-settings"></i>
                                                 {Lang::T('Change Password')}</a>
                                         </div>
                                         <div class="col-xs-5 text-center text-sm">
-                                            <a href="{$_url}settings/users-view/{$_admin['id']}">
+                                            <a href="{Text::url('settings/users-view/', $_admin['id'])}">
                                                 <i class="ion ion-person"></i> {Lang::T('My Account')}</a>
                                         </div>
                                     </div>
@@ -1231,96 +1231,96 @@
             <section class="sidebar">
                 <ul class="sidebar-menu" data-widget="tree">
                     <li {if $_system_menu eq 'dashboard' }class="active" {/if}>
-                        <a href="{$_url}dashboard">
+                        <a href="{Text::url('dashboard')}">
                             <i class="ion ion-monitor"></i>
                             <span>{Lang::T('Dashboard')}</span>
                         </a>
                     </li>
                     {$_MENU_AFTER_DASHBOARD}
                     {if !in_array($_admin['user_type'],['Report'])}
-                    <li class="{if in_array($_system_menu, ['customers', 'map'])}active{/if} treeview">
-                        <a href="#">
-                            <i class="fa fa-user"></i> <span>{Lang::T('Customer')}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            <li {if $_system_menu eq 'customers' }class="active" {/if}><a
-                                    href="{$_url}customers">{Lang::T('Lists')}</a></li>
-                            <li {if $_system_menu eq 'map' }class="active" {/if}><a
-                                    href="{$_url}map/customer">{Lang::T('Location')}</a></li>
-                            {$_MENU_CUSTOMERS}
-                        </ul>
-                    </li>
-                    {$_MENU_AFTER_CUSTOMERS}
-                    <li class="{if $_routes[0] eq 'plan' || $_routes[0] eq 'coupons'}active{/if} treeview">
-                        <a href="#">
-                            <i class="fa fa-ticket"></i> <span>{Lang::T('Services')}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            <li {if $_routes[1] eq 'list' }class="active" {/if}><a
-                                    href="{$_url}plan/list">{Lang::T('Active Customers')}</a></li>
-                            {if $_c['disable_voucher'] != 'yes'}
-                            <li {if $_routes[1] eq 'refill' }class="active" {/if}><a
-                                    href="{$_url}plan/refill">{Lang::T('Refill Customer')}</a></li>
-                            {/if}
-                            {if $_c['disable_voucher'] != 'yes'}
-                            <li {if $_routes[1] eq 'voucher' }class="active" {/if}><a
-                                    href="{$_url}plan/voucher">{Lang::T('Vouchers')}</a></li>
-                            {/if}
-                            {if $_c['enable_coupons'] == 'yes'}
-                            <li {if $_routes[0] eq 'coupons' }class="active" {/if}><a
-                                    href="{$_url}coupons">{Lang::T('Coupons')}</a></li>
-                            {/if}
-                            <li {if $_routes[1] eq 'recharge' }class="active" {/if}><a
-                                    href="{$_url}plan/recharge">{Lang::T('Recharge Customer')}</a></li>
-                            {if $_c['enable_balance'] == 'yes'}
-                            <li {if $_routes[1] eq 'deposit' }class="active" {/if}><a
-                                    href="{$_url}plan/deposit">{Lang::T('Refill Balance')}</a></li>
-                            {/if}
-                            {$_MENU_SERVICES}
-                        </ul>
-                    </li>
+                        <li class="{if in_array($_system_menu, ['customers', 'map'])}active{/if} treeview">
+                            <a href="#">
+                                <i class="fa fa-user"></i> <span>{Lang::T('Customer')}</span>
+                                <span class="pull-right-container">
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </span>
+                            </a>
+                            <ul class="treeview-menu">
+                                <li {if $_system_menu eq 'customers' }class="active" {/if}><a
+                                        href="{$_url}customers">{Lang::T('Lists')}</a></li>
+                                <li {if $_system_menu eq 'map' }class="active" {/if}><a
+                                        href="{$_url}map/customer">{Lang::T('Location')}</a></li>
+                                {$_MENU_CUSTOMERS}
+                            </ul>
+                        </li>
+                        {$_MENU_AFTER_CUSTOMERS}
+                        <li class="{if $_routes[0] eq 'plan' || $_routes[0] eq 'coupons'}active{/if} treeview">
+                            <a href="#">
+                                <i class="fa fa-ticket"></i> <span>{Lang::T('Services')}</span>
+                                <span class="pull-right-container">
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </span>
+                            </a>
+                            <ul class="treeview-menu">
+                                <li {if $_routes[1] eq 'list' }class="active" {/if}><a
+                                        href="{$_url}plan/list">{Lang::T('Active Customers')}</a></li>
+                                {if $_c['disable_voucher'] != 'yes'}
+                                    <li {if $_routes[1] eq 'refill' }class="active" {/if}><a
+                                            href="{$_url}plan/refill">{Lang::T('Refill Customer')}</a></li>
+                                {/if}
+                                {if $_c['disable_voucher'] != 'yes'}
+                                    <li {if $_routes[1] eq 'voucher' }class="active" {/if}><a
+                                            href="{$_url}plan/voucher">{Lang::T('Vouchers')}</a></li>
+                                {/if}
+                                {if $_c['enable_coupons'] == 'yes'}
+                                    <li {if $_routes[0] eq 'coupons' }class="active" {/if}><a
+                                            href="{$_url}coupons">{Lang::T('Coupons')}</a></li>
+                                {/if}
+                                <li {if $_routes[1] eq 'recharge' }class="active" {/if}><a
+                                        href="{$_url}plan/recharge">{Lang::T('Recharge Customer')}</a></li>
+                                {if $_c['enable_balance'] == 'yes'}
+                                    <li {if $_routes[1] eq 'deposit' }class="active" {/if}><a
+                                            href="{$_url}plan/deposit">{Lang::T('Refill Balance')}</a></li>
+                                {/if}
+                                {$_MENU_SERVICES}
+                            </ul>
+                        </li>
                     {/if}
                     {$_MENU_AFTER_SERVICES}
                     {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                    <li class="{if $_system_menu eq 'services'}active{/if} treeview">
-                        <a href="#">
-                            <i class="ion ion-cube"></i> <span>{Lang::T('Internet Plan')}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            <li {if $_routes[1] eq 'hotspot' }class="active" {/if}><a
-                                    href="{$_url}services/hotspot">Hotspot</a></li>
-                            <li {if $_routes[1] eq 'pppoe' }class="active" {/if}><a
-                                    href="{$_url}services/pppoe">PPPOE</a></li>
-                            <li {if $_routes[1] eq 'vpn' }class="active" {/if}><a href="{$_url}services/vpn">VPN</a>
-                            </li>
-                            <li {if $_routes[1] eq 'list' }class="active" {/if}><a
-                                    href="{$_url}bandwidth/list">Bandwidth</a></li>
-                            {if $_c['enable_balance'] == 'yes'}
-                            <li {if $_routes[1] eq 'balance' }class="active" {/if}><a
-                                    href="{$_url}services/balance">{Lang::T('Customer Balance')}</a></li>
-                            {/if}
-                            {$_MENU_PLANS}
-                        </ul>
-                    </li>
+                        <li class="{if $_system_menu eq 'services'}active{/if} treeview">
+                            <a href="#">
+                                <i class="ion ion-cube"></i> <span>{Lang::T('Internet Plan')}</span>
+                                <span class="pull-right-container">
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </span>
+                            </a>
+                            <ul class="treeview-menu">
+                                <li {if $_routes[1] eq 'hotspot' }class="active" {/if}><a
+                                        href="{$_url}services/hotspot">Hotspot</a></li>
+                                <li {if $_routes[1] eq 'pppoe' }class="active" {/if}><a
+                                        href="{$_url}services/pppoe">PPPOE</a></li>
+                                <li {if $_routes[1] eq 'vpn' }class="active" {/if}><a href="{$_url}services/vpn">VPN</a>
+                                </li>
+                                <li {if $_routes[1] eq 'list' }class="active" {/if}><a
+                                        href="{$_url}bandwidth/list">Bandwidth</a></li>
+                                {if $_c['enable_balance'] == 'yes'}
+                                    <li {if $_routes[1] eq 'balance' }class="active" {/if}><a
+                                            href="{$_url}services/balance">{Lang::T('Customer Balance')}</a></li>
+                                {/if}
+                                {$_MENU_PLANS}
+                            </ul>
+                        </li>
                     {/if}
                     {$_MENU_AFTER_PLANS}
                     <li class="{if $_system_menu eq 'reports'}active{/if} treeview">
                         {if in_array($_admin['user_type'],['SuperAdmin','Admin', 'Report'])}
-                        <a href="#">
-                            <i class="ion ion-clipboard"></i> <span>{Lang::T('Reports')}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
+                            <a href="#">
+                                <i class="ion ion-clipboard"></i> <span>{Lang::T('Reports')}</span>
+                                <span class="pull-right-container">
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </span>
+                            </a>
                         {/if}
                         <ul class="treeview-menu">
                             <li {if $_routes[1] eq 'reports' }class="active" {/if}><a
@@ -1348,70 +1348,70 @@
                     </li>
                     {$_MENU_AFTER_MESSAGE}
                     {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                    <li class="{if $_system_menu eq 'network'}active{/if} treeview">
-                        <a href="#">
-                            <i class="ion ion-network"></i> <span>{Lang::T('Network')}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            <li {if $_routes[0] eq 'routers' and $_routes[1] eq '' }class="active" {/if}><a
-                                    href="{$_url}routers">Routers</a></li>
-                            <li {if $_routes[0] eq 'pool' and $_routes[1] eq 'list' }class="active" {/if}><a
-                                    href="{$_url}pool/list">IP Pool</a></li>
-                            <li {if $_routes[0] eq 'pool' and $_routes[1] eq 'port' }class="active" {/if}><a
-                                    href="{$_url}pool/port">Port Pool</a></li>
-                            <li {if $_routes[0] eq 'routers' and $_routes[1] eq 'maps' }class="active" {/if}><a
-                                    href="{$_url}routers/maps">{Lang::T('Routers Maps')}</a></li>
-                            {$_MENU_NETWORK}
-                        </ul>
-                    </li>
-                    {$_MENU_AFTER_NETWORKS}
-                    {if $_c['radius_enable']}
-                    <li class="{if $_system_menu eq 'radius'}active{/if} treeview">
-                        <a href="#">
-                            <i class="fa fa-database"></i> <span>{Lang::T('Radius')}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            <li {if $_routes[0] eq 'radius' and $_routes[1] eq 'nas-list' }class="active" {/if}><a
-                                    href="{$_url}radius/nas-list">{Lang::T('Radius NAS')}</a></li>
-                            {$_MENU_RADIUS}
-                        </ul>
-                    </li>
-                    {/if}
-                    {$_MENU_AFTER_RADIUS}
-                    <li class="{if $_system_menu eq 'pages'}active{/if} treeview">
-                        <a href="#">
-                            <i class="ion ion-document"></i> <span>{Lang::T("Static Pages")}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            <li {if $_routes[1] eq 'Order_Voucher' }class="active" {/if}><a
-                                    href="{$_url}pages/Order_Voucher">{Lang::T('Order Voucher')}</a></li>
-                            <li {if $_routes[1] eq 'Voucher' }class="active" {/if}><a
-                                    href="{$_url}pages/Voucher">{Lang::T('Theme Voucher')}</a></li>
-                            <li {if $_routes[1] eq 'Announcement' }class="active" {/if}><a
-                                    href="{$_url}pages/Announcement">{Lang::T('Announcement')}</a></li>
-                            <li {if $_routes[1] eq 'Announcement_Customer' }class="active" {/if}><a
-                                    href="{$_url}pages/Announcement_Customer">{Lang::T('Customer Announcement')}</a>
+                        <li class="{if $_system_menu eq 'network'}active{/if} treeview">
+                            <a href="#">
+                                <i class="ion ion-network"></i> <span>{Lang::T('Network')}</span>
+                                <span class="pull-right-container">
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </span>
+                            </a>
+                            <ul class="treeview-menu">
+                                <li {if $_routes[0] eq 'routers' and $_routes[1] eq '' }class="active" {/if}><a
+                                        href="{$_url}routers">Routers</a></li>
+                                <li {if $_routes[0] eq 'pool' and $_routes[1] eq 'list' }class="active" {/if}><a
+                                        href="{$_url}pool/list">IP Pool</a></li>
+                                <li {if $_routes[0] eq 'pool' and $_routes[1] eq 'port' }class="active" {/if}><a
+                                        href="{$_url}pool/port">Port Pool</a></li>
+                                <li {if $_routes[0] eq 'routers' and $_routes[1] eq 'maps' }class="active" {/if}><a
+                                        href="{$_url}routers/maps">{Lang::T('Routers Maps')}</a></li>
+                                {$_MENU_NETWORK}
+                            </ul>
+                        </li>
+                        {$_MENU_AFTER_NETWORKS}
+                        {if $_c['radius_enable']}
+                            <li class="{if $_system_menu eq 'radius'}active{/if} treeview">
+                                <a href="#">
+                                    <i class="fa fa-database"></i> <span>{Lang::T('Radius')}</span>
+                                    <span class="pull-right-container">
+                                        <i class="fa fa-angle-left pull-right"></i>
+                                    </span>
+                                </a>
+                                <ul class="treeview-menu">
+                                    <li {if $_routes[0] eq 'radius' and $_routes[1] eq 'nas-list' }class="active" {/if}><a
+                                            href="{$_url}radius/nas-list">{Lang::T('Radius NAS')}</a></li>
+                                    {$_MENU_RADIUS}
+                                </ul>
                             </li>
-                            <li {if $_routes[1] eq 'Registration_Info' }class="active" {/if}><a
-                                    href="{$_url}pages/Registration_Info">{Lang::T('Registration Info')}</a></li>
-                            <li {if $_routes[1] eq 'Payment_Info' }class="active" {/if}><a
-                                    href="{$_url}pages/Payment_Info">{Lang::T('Payment Info')}</a></li>
-                            <li {if $_routes[1] eq 'Privacy_Policy' }class="active" {/if}><a
-                                    href="{$_url}pages/Privacy_Policy">{Lang::T('Privacy Policy')}</a></li>
-                            <li {if $_routes[1] eq 'Terms_and_Conditions' }class="active" {/if}><a
-                                    href="{$_url}pages/Terms_and_Conditions">{Lang::T('Terms and Conditions')}</a></li>
-                            {$_MENU_PAGES}
-                        </ul>
-                    </li>
+                        {/if}
+                        {$_MENU_AFTER_RADIUS}
+                        <li class="{if $_system_menu eq 'pages'}active{/if} treeview">
+                            <a href="#">
+                                <i class="ion ion-document"></i> <span>{Lang::T("Static Pages")}</span>
+                                <span class="pull-right-container">
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </span>
+                            </a>
+                            <ul class="treeview-menu">
+                                <li {if $_routes[1] eq 'Order_Voucher' }class="active" {/if}><a
+                                        href="{$_url}pages/Order_Voucher">{Lang::T('Order Voucher')}</a></li>
+                                <li {if $_routes[1] eq 'Voucher' }class="active" {/if}><a
+                                        href="{$_url}pages/Voucher">{Lang::T('Theme Voucher')}</a></li>
+                                <li {if $_routes[1] eq 'Announcement' }class="active" {/if}><a
+                                        href="{$_url}pages/Announcement">{Lang::T('Announcement')}</a></li>
+                                <li {if $_routes[1] eq 'Announcement_Customer' }class="active" {/if}><a
+                                        href="{$_url}pages/Announcement_Customer">{Lang::T('Customer Announcement')}</a>
+                                </li>
+                                <li {if $_routes[1] eq 'Registration_Info' }class="active" {/if}><a
+                                        href="{$_url}pages/Registration_Info">{Lang::T('Registration Info')}</a></li>
+                                <li {if $_routes[1] eq 'Payment_Info' }class="active" {/if}><a
+                                        href="{$_url}pages/Payment_Info">{Lang::T('Payment Info')}</a></li>
+                                <li {if $_routes[1] eq 'Privacy_Policy' }class="active" {/if}><a
+                                        href="{$_url}pages/Privacy_Policy">{Lang::T('Privacy Policy')}</a></li>
+                                <li {if $_routes[1] eq 'Terms_and_Conditions' }class="active" {/if}><a
+                                        href="{$_url}pages/Terms_and_Conditions">{Lang::T('Terms and Conditions')}</a></li>
+                                {$_MENU_PAGES}
+                            </ul>
+                        </li>
                     {/if}
                     {$_MENU_AFTER_PAGES}
                     <li
@@ -1424,80 +1424,80 @@
                         </a>
                         <ul class="treeview-menu">
                             {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                            <li {if $_routes[1] eq 'app' }class="active" {/if}><a
-                                    href="{$_url}settings/app">{Lang::T('General Settings')}</a></li>
-                            <li {if $_routes[1] eq 'localisation' }class="active" {/if}><a
-                                    href="{$_url}settings/localisation">{Lang::T('Localisation')}</a></li>
-                            <li {if $_routes[0] eq 'customfield' }class="active" {/if}><a
-                                    href="{$_url}customfield">{Lang::T('Custom Fields')}</a></li>
-                            <li {if $_routes[1] eq 'miscellaneous' }class="active" {/if}><a
-                                    href="{$_url}settings/miscellaneous">{Lang::T('Miscellaneous')}</a></li>
-                            <li {if $_routes[1] eq 'maintenance' }class="active" {/if}><a
-                                    href="{$_url}settings/maintenance">{Lang::T('Maintenance Mode')}</a></li>
-                            <li {if $_routes[1] eq 'notifications' }class="active" {/if}><a
-                                    href="{$_url}settings/notifications">{Lang::T('User Notification')}</a></li>
-                            <li {if $_routes[1] eq 'devices' }class="active" {/if}><a
-                                    href="{$_url}settings/devices">{Lang::T('Devices')}</a></li>
+                                <li {if $_routes[1] eq 'app' }class="active" {/if}><a
+                                        href="{$_url}settings/app">{Lang::T('General Settings')}</a></li>
+                                <li {if $_routes[1] eq 'localisation' }class="active" {/if}><a
+                                        href="{$_url}settings/localisation">{Lang::T('Localisation')}</a></li>
+                                <li {if $_routes[0] eq 'customfield' }class="active" {/if}><a
+                                        href="{$_url}customfield">{Lang::T('Custom Fields')}</a></li>
+                                <li {if $_routes[1] eq 'miscellaneous' }class="active" {/if}><a
+                                        href="{$_url}settings/miscellaneous">{Lang::T('Miscellaneous')}</a></li>
+                                <li {if $_routes[1] eq 'maintenance' }class="active" {/if}><a
+                                        href="{$_url}settings/maintenance">{Lang::T('Maintenance Mode')}</a></li>
+                                <li {if $_routes[1] eq 'notifications' }class="active" {/if}><a
+                                        href="{$_url}settings/notifications">{Lang::T('User Notification')}</a></li>
+                                <li {if $_routes[1] eq 'devices' }class="active" {/if}><a
+                                        href="{$_url}settings/devices">{Lang::T('Devices')}</a></li>
                             {/if}
                             {if in_array($_admin['user_type'],['SuperAdmin','Admin','Agent'])}
-                            <li {if $_routes[1] eq 'users' }class="active" {/if}><a
-                                    href="{$_url}settings/users">{Lang::T('Administrator Users')}</a></li>
+                                <li {if $_routes[1] eq 'users' }class="active" {/if}><a
+                                        href="{$_url}settings/users">{Lang::T('Administrator Users')}</a></li>
                             {/if}
                             {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                            <li {if $_routes[1] eq 'dbstatus' }class="active" {/if}><a
-                                    href="{$_url}settings/dbstatus">{Lang::T('Backup/Restore')}</a></li>
-                            <li {if $_system_menu eq 'paymentgateway' }class="active" {/if}>
-                                <a href="{$_url}paymentgateway">
-                                    <span class="text">{Lang::T('Payment Gateway')}</span>
-                                </a>
-                            </li>
-                            {$_MENU_SETTINGS}
-                            <li {if $_routes[0] eq 'pluginmanager' }class="active" {/if}>
-                                <a href="{$_url}pluginmanager"><i class="glyphicon glyphicon-tasks"></i>
-                                    {Lang::T('Plugin Manager')}</a>
-                            </li>
+                                <li {if $_routes[1] eq 'dbstatus' }class="active" {/if}><a
+                                        href="{$_url}settings/dbstatus">{Lang::T('Backup/Restore')}</a></li>
+                                <li {if $_system_menu eq 'paymentgateway' }class="active" {/if}>
+                                    <a href="{$_url}paymentgateway">
+                                        <span class="text">{Lang::T('Payment Gateway')}</span>
+                                    </a>
+                                </li>
+                                {$_MENU_SETTINGS}
+                                <li {if $_routes[0] eq 'pluginmanager' }class="active" {/if}>
+                                    <a href="{$_url}pluginmanager"><i class="glyphicon glyphicon-tasks"></i>
+                                        {Lang::T('Plugin Manager')}</a>
+                                </li>
                             {/if}
                         </ul>
                     </li>
                     {$_MENU_AFTER_SETTINGS}
                     {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                    <li class="{if $_system_menu eq 'logs' }active{/if} treeview">
-                        <a href="#">
-                            <i class="ion ion-clock"></i> <span>{Lang::T('Logs')}</span>
-                            <span class="pull-right-container">
-                                <i class="fa fa-angle-left pull-right"></i>
-                            </span>
-                        </a>
-                        <ul class="treeview-menu">
-                            <li {if $_routes[1] eq 'list' }class="active" {/if}><a
-                                    href="{$_url}logs/phpnuxbill">PhpNuxBill</a></li>
-                            {if $_c['radius_enable']}
-                            <li {if $_routes[1] eq 'radius' }class="active" {/if}><a
-                                    href="{$_url}logs/radius">Radius</a>
-                            </li>
-                            {/if}
-                            {$_MENU_LOGS}
-                        </ul>
-                    </li>
+                        <li class="{if $_system_menu eq 'logs' }active{/if} treeview">
+                            <a href="#">
+                                <i class="ion ion-clock"></i> <span>{Lang::T('Logs')}</span>
+                                <span class="pull-right-container">
+                                    <i class="fa fa-angle-left pull-right"></i>
+                                </span>
+                            </a>
+                            <ul class="treeview-menu">
+                                <li {if $_routes[1] eq 'list' }class="active" {/if}><a
+                                        href="{$_url}logs/phpnuxbill">PhpNuxBill</a></li>
+                                {if $_c['radius_enable']}
+                                    <li {if $_routes[1] eq 'radius' }class="active" {/if}><a
+                                            href="{$_url}logs/radius">Radius</a>
+                                    </li>
+                                {/if}
+                                {$_MENU_LOGS}
+                            </ul>
+                        </li>
                     {/if}
                     {$_MENU_AFTER_LOGS}
                     {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
-                    <li {if $_routes[1] eq 'docs' }class="active" {/if}>
-                        <a href="{if $_c['docs_clicked'] != 'yes'}{$_url}settings/docs{else}./docs/{/if}">
-                            <i class="ion ion-ios-bookmarks"></i>
-                            <span class="text">{Lang::T('Documentation')}</span>
-                            {if $_c['docs_clicked'] != 'yes'}
-                            <span class="pull-right-container"><small
-                                    class="label pull-right bg-green">New</small></span>
-                            {/if}
-                        </a>
-                    </li>
-                    <li {if $_system_menu eq 'community' }class="active" {/if}>
-                        <a href="{$_url}community">
-                            <i class="ion ion-chatboxes"></i>
-                            <span class="text">Community</span>
-                        </a>
-                    </li>
+                        <li {if $_routes[1] eq 'docs' }class="active" {/if}>
+                            <a href="{if $_c['docs_clicked'] != 'yes'}{$_url}settings/docs{else}./docs/{/if}">
+                                <i class="ion ion-ios-bookmarks"></i>
+                                <span class="text">{Lang::T('Documentation')}</span>
+                                {if $_c['docs_clicked'] != 'yes'}
+                                    <span class="pull-right-container"><small
+                                            class="label pull-right bg-green">New</small></span>
+                                {/if}
+                            </a>
+                        </li>
+                        <li {if $_system_menu eq 'community' }class="active" {/if}>
+                            <a href="{$_url}community">
+                                <i class="ion ion-chatboxes"></i>
+                                <span class="text">Community</span>
+                            </a>
+                        </li>
                     {/if}
                     {$_MENU_AFTER_COMMUNITY}
                 </ul>
@@ -1505,11 +1505,11 @@
         </aside>
 
         {if $_c['maintenance_mode'] == 1}
-        <div class="notification-top-bar">
-            <p>{Lang::T('The website is currently in maintenance mode, this means that some or all functionality may be
+            <div class="notification-top-bar">
+                <p>{Lang::T('The website is currently in maintenance mode, this means that some or all functionality may be
                 unavailable to regular users during this time.')}<small> &nbsp;&nbsp;<a
-                        href="{$_url}settings/maintenance">{Lang::T('Turn Off')}</a></small></p>
-        </div>
+                            href="{$_url}settings/maintenance">{Lang::T('Turn Off')}</a></small></p>
+            </div>
         {/if}
 
         <div class="content-wrapper">
@@ -1521,19 +1521,19 @@
 
             <section class="content">
                 {if isset($notify)}
-                <script>
-                    // Display SweetAlert toast notification
-                    Swal.fire({
-                        icon: '{if $notify_t == "s"}success{else}error{/if}',
-                        title: '{$notify}',
-                        position: 'top-end',
-                        showConfirmButton: false,
-                        timer: 5000,
-                        timerProgressBar: true,
-                        didOpen: (toast) => {
-                            toast.addEventListener('mouseenter', Swal.stopTimer)
-                            toast.addEventListener('mouseleave', Swal.resumeTimer)
-                        }
-                    });
-                </script>
-                {/if}
\ No newline at end of file
+                    <script>
+                        // Display SweetAlert toast notification
+                        Swal.fire({
+                            icon: '{if $notify_t == "s"}success{else}error{/if}',
+                            title: '{$notify}',
+                            position: 'top-end',
+                            showConfirmButton: false,
+                            timer: 5000,
+                            timerProgressBar: true,
+                            didOpen: (toast) => {
+                                toast.addEventListener('mouseenter', Swal.stopTimer)
+                                toast.addEventListener('mouseleave', Swal.resumeTimer)
+                            }
+                        });
+                    </script>
+{/if}
\ No newline at end of file