diff --git a/web/add/cron/index.php b/web/add/cron/index.php
index 62cae8f1..c9302ae6 100644
--- a/web/add/cron/index.php
+++ b/web/add/cron/index.php
@@ -1,10 +1,9 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'CRON';
 
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Check POST request
@@ -62,18 +61,9 @@ if (!empty($_POST['ok'])) {
     }
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Display body
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_cron.html');
+// Render
+render_page($user, $TAB, 'add_cron');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/add/db/index.php b/web/add/db/index.php
index c64ca42e..ef325704 100644
--- a/web/add/db/index.php
+++ b/web/add/db/index.php
@@ -1,9 +1,9 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'DB';
+
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Check POST request
@@ -107,17 +107,11 @@ if (!empty($_POST['ok'])) {
     }
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // Get user email
 $v_db_email = $panel[$user]['CONTACT'];
 
 // List avaiable database types
-$db_types = split(",",$_SESSION['DB_SYSTEM']);
+$db_types = split(',', $_SESSION['DB_SYSTEM']);
 
 // List available database servers
 $db_hosts = array();
@@ -127,13 +121,8 @@ $db_hosts = array_merge($db_hosts, $db_hosts_tmp);
 unset($db_hosts_tmp);
 unset($output);
 
-// Display body
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_db.html');
+render_page($user, $TAB, 'add_db');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
-?>
diff --git a/web/add/dns/index.php b/web/add/dns/index.php
index bd890c87..7c18faab 100644
--- a/web/add/dns/index.php
+++ b/web/add/dns/index.php
@@ -1,10 +1,9 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'DNS';
 
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Check POST request for dns domain
@@ -138,12 +137,6 @@ if (!empty($_POST['ok_rec'])) {
 }
 
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 $v_ns1 = str_replace("'", "", $v_ns1);
 $v_ns2 = str_replace("'", "", $v_ns2);
 $v_ns3 = str_replace("'", "", $v_ns3);
@@ -154,8 +147,9 @@ $v_ns7 = str_replace("'", "", $v_ns7);
 $v_ns8 = str_replace("'", "", $v_ns8);
 
 
-// Display body for dns domain
 if (empty($_GET['domain'])) {
+    // Display body for dns domain
+
     if (empty($v_ttl)) $v_ttl = 14400;
     if (empty($v_exp)) $v_exp = date('Y-m-d', strtotime('+1 year'));
     if (empty($v_ns1)) {
@@ -171,18 +165,16 @@ if (empty($_GET['domain'])) {
         $v_ns8 = str_replace("'", "", $nameservers[7]);
         unset($output);
     }
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns.html');
+
+    render_page($user, $TAB, 'add_dns');
+} else {
+    // Display body for dns record
+
+    $v_domain = $_GET['domain'];
+    render_page($user, $TAB, 'add_dns_rec');
 }
 
-// Display body for dns record
-if (!empty($_GET['domain'])) {
-    $v_domain = $_GET['domain'];
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_dns_rec.html');
-}
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/add/firewall/banlist/index.php b/web/add/firewall/banlist/index.php
index f0e97042..774421e6 100644
--- a/web/add/firewall/banlist/index.php
+++ b/web/add/firewall/banlist/index.php
@@ -1,8 +1,6 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'FIREWALL';
 
 // Main include
@@ -49,18 +47,9 @@ if (!empty($_POST['ok'])) {
     }
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Display body
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_firewall_banlist.html');
+// Render
+render_page($user, $TAB, 'add_firewall_banlist');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/add/firewall/index.php b/web/add/firewall/index.php
index caae650c..9aab3ff5 100644
--- a/web/add/firewall/index.php
+++ b/web/add/firewall/index.php
@@ -1,8 +1,6 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'FIREWALL';
 
 // Main include
@@ -65,18 +63,9 @@ if (!empty($_POST['ok'])) {
     }
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Display body
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_firewall.html');
+// Render
+render_page($user, $TAB, 'add_firewall');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/add/ip/index.php b/web/add/ip/index.php
index 5f48a081..8746ed08 100644
--- a/web/add/ip/index.php
+++ b/web/add/ip/index.php
@@ -1,10 +1,9 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'IP';
 
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Check user
@@ -75,12 +74,6 @@ if (!empty($_POST['ok'])) {
     }
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // List network interfaces
 exec (VESTA_CMD."v-list-sys-interfaces 'json'", $output, $return_var);
 $interfaces = json_decode(implode('', $output), true);
@@ -91,12 +84,9 @@ exec (VESTA_CMD."v-list-sys-users 'json'", $output, $return_var);
 $users = json_decode(implode('', $output), true);
 unset($output);
 
-// Display body
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_ip.html');
+// Render
+render_page($user, $TAB, 'add_ip');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/add/mail/index.php b/web/add/mail/index.php
index 12adde12..02f765de 100644
--- a/web/add/mail/index.php
+++ b/web/add/mail/index.php
@@ -1,10 +1,9 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'MAIL';
 
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 
@@ -179,26 +178,18 @@ if (!empty($_POST['ok_acc'])) {
     }
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
+// Render page
+if (empty($_GET['domain'])) {
+    // Display body for mail domain
 
-// Panel
-top_panel($user,$TAB);
+    render_page($user, $TAB, 'add_mail');
+} else {
+    // Display body for mail account
 
-// Display body for mail domain
-if (empty($_GET['domain']))  {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_mail.html');
-}
-
-// Display body for mail account
-if (!empty($_GET['domain']))  {
     $v_domain = $_GET['domain'];
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_mail_acc.html');
+    render_page($user, $TAB, 'add_mail_acc');
 }
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/add/package/index.php b/web/add/package/index.php
index f620b471..b0d8be71 100644
--- a/web/add/package/index.php
+++ b/web/add/package/index.php
@@ -1,10 +1,9 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'PACKAGE';
 
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Check user
@@ -140,7 +139,7 @@ if (!empty($_POST['ok'])) {
         unset($output);
     }
 
-    // Remove tmpdir 
+    // Remove tmpdir
     exec ('rm -rf '.$tmpdir, $output, $return_var);
     unset($output);
 
@@ -153,12 +152,6 @@ if (!empty($_POST['ok'])) {
 }
 
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // List web temmplates
 exec (VESTA_CMD."v-list-web-templates json", $output, $return_var);
 $web_templates = json_decode(implode('', $output), true);
@@ -208,12 +201,9 @@ if (empty($v_bandwidth)) $v_bandwidth = "'1000'";
 if (empty($v_ns1)) $v_ns1 = 'ns1.example.ltd';
 if (empty($v_ns2)) $v_ns2 = 'ns2.example.ltd';
 
-// Display body
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_package.html');
+// Render page
+render_page($user, $TAB, 'add_package');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/add/user/index.php b/web/add/user/index.php
index 26de1020..2cc79287 100644
--- a/web/add/user/index.php
+++ b/web/add/user/index.php
@@ -1,10 +1,9 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'USER';
 
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Check user
@@ -111,12 +110,6 @@ if (!empty($_POST['ok'])) {
 }
 
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // List hosting packages
 exec (VESTA_CMD."v-list-user-packages json", $output, $return_var);
 check_error($return_var);
@@ -128,12 +121,9 @@ exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var);
 $languages = json_decode(implode('', $output), true);
 unset($output);
 
-// Display body
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_user.html');
+// Render page
+render_page($user, $TAB, 'add_user');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/add/web/index.php b/web/add/web/index.php
index 0be71f63..59f4b5db 100644
--- a/web/add/web/index.php
+++ b/web/add/web/index.php
@@ -1,10 +1,9 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'WEB';
 
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Check POST request
@@ -272,7 +271,7 @@ if (!empty($_POST['ok'])) {
                     $fp = fopen($v_ftp_password, "w");
                     fwrite($fp, $v_ftp_user_data['v_ftp_password']."\n");
                     fclose($fp);
-                    exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var); 
+                    exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var);
                     check_return_code($return_var,$output);
                     unset($output);
                     unlink($v_ftp_password);
@@ -333,12 +332,6 @@ if (!empty($_POST['ok'])) {
 }
 
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // Define user variables
 $v_ftp_user_prepath = $panel[$user]['HOME'] . "/web";
 $v_ftp_email = $panel[$user]['CONTACT'];
@@ -353,12 +346,9 @@ exec (VESTA_CMD."v-list-web-stats json", $output, $return_var);
 $stats = json_decode(implode('', $output), true);
 unset($output);
 
-// Display body
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_web.html');
+// Render page
+render_page($user, $TAB, 'add_web');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/edit/backup/exclusions/index.php b/web/edit/backup/exclusions/index.php
index 8bac32c1..bbbb4b3e 100644
--- a/web/edit/backup/exclusions/index.php
+++ b/web/edit/backup/exclusions/index.php
@@ -2,7 +2,6 @@
 // Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'BACKUP';
 
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
@@ -123,18 +122,9 @@ if (!empty($_POST['save'])) {
 }
 
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Display body
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_backup_exclusions.html');
+// Render page
+render_page($user, $TAB, 'edit_backup_exclusions');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/edit/cron/index.php b/web/edit/cron/index.php
index 12d7e9f0..c66ca85c 100644
--- a/web/edit/cron/index.php
+++ b/web/edit/cron/index.php
@@ -54,7 +54,7 @@ if (!empty($_POST['save'])) {
     }
 
     $v_username = $user;
-    $v_job = escapeshellarg($_GET['job']); 
+    $v_job = escapeshellarg($_GET['job']);
     $v_min = escapeshellarg($_POST['v_min']);
     $v_hour = escapeshellarg($_POST['v_hour']);
     $v_day = escapeshellarg($_POST['v_day']);
@@ -75,18 +75,9 @@ if (!empty($_POST['save'])) {
     }
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Display body
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_cron.html');
+// Render page
+render_page($user, $TAB, 'edit_cron');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/edit/db/index.php b/web/edit/db/index.php
index 29d358f8..21d394f0 100644
--- a/web/edit/db/index.php
+++ b/web/edit/db/index.php
@@ -2,16 +2,10 @@
 // Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'DB';
 
-include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
-
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
+// Main include
+include($_SERVER['DOCUMENT_ROOT'].'/inc/main.php');
 
 // Check database id
 if (empty($_GET['database'])) {
@@ -75,7 +69,7 @@ if (!empty($_POST['save'])) {
         fwrite($fp, $_POST['v_password']."\n");
         fclose($fp);
         exec (VESTA_CMD."v-change-database-password ".$v_username." ".$v_database." ".$v_password, $output, $return_var);
-        check_return_code($return_var,$output);    
+        check_return_code($return_var,$output);
         unset($output);
         unlink($v_password);
         $v_password = escapeshellarg($_POST['v_password']);
@@ -87,12 +81,9 @@ if (!empty($_POST['save'])) {
     }
 }
 
-// Display body
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_db.html');
+// Render page
+render_page($user, $TAB, 'edit_db');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/edit/dns/index.php b/web/edit/dns/index.php
index 6ceac64a..3c2e1e5c 100644
--- a/web/edit/dns/index.php
+++ b/web/edit/dns/index.php
@@ -1,10 +1,9 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'DNS';
 
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Check domain name
@@ -195,30 +194,16 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['reco
     }
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 
-// Panel
-top_panel($user,$TAB);
-
-// Display body for dns domain
-if ((!empty($_GET['domain'])) && (empty($_GET['record_id'])))  {
-    if ($_SESSION['user'] == 'admin') {
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_dns.html');
-    } else {
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/user/edit_dns.html');
-    }
-}
-
-// List dns record
-if ((!empty($_GET['domain'])) && (!empty($_GET['record_id'])))  {
+// Render page
+if (empty($_GET['record_id']))  {
+    // Display body for dns domain
+    render_page($user, $TAB, 'edit_dns');
+} else {
     // Display body for dns record
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_dns_rec.html');
+    render_page($user, $TAB, 'edit_dns_rec');
 }
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/edit/firewall/index.php b/web/edit/firewall/index.php
index 44346d09..18b4be4c 100644
--- a/web/edit/firewall/index.php
+++ b/web/edit/firewall/index.php
@@ -1,8 +1,6 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'FIREWALL';
 
 // Main include
@@ -82,18 +80,9 @@ if (!empty($_POST['save'])) {
     }
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Display body
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_firewall.html');
+// Render page
+render_page($user, $TAB, 'edit_firewall');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/edit/ip/index.php b/web/edit/ip/index.php
index bec1ae58..b9eaa581 100644
--- a/web/edit/ip/index.php
+++ b/web/edit/ip/index.php
@@ -1,10 +1,9 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'IP';
 
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Check user
@@ -59,7 +58,7 @@ if (!empty($_POST['save'])) {
         exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'dedicated'", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
-        $v_dedicated = 'yes'; 
+        $v_dedicated = 'yes';
     }
     if (($v_ipstatus == 'dedicated') && (!empty($_POST['v_shared'])) && (empty($_SESSION['error_msg']))) {
         exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'shared'", $output, $return_var);
@@ -99,18 +98,9 @@ if (!empty($_POST['save'])) {
     }
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Display body
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_ip.html');
+// Render page
+render_page($user, $TAB, 'edit_ip');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/edit/mail/index.php b/web/edit/mail/index.php
index 28d4da9b..f5e1bd07 100644
--- a/web/edit/mail/index.php
+++ b/web/edit/mail/index.php
@@ -1,18 +1,11 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'MAIL';
 
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // Check domain argument
 if (empty($_GET['domain'])) {
     header("Location: /list/mail/");
@@ -205,7 +198,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco
     // Change quota
     if (($v_quota != $_POST['v_quota']) && (empty($_SESSION['error_msg']))) {
         if (empty($_POST['v_quota'])) {
-            $v_quota = 0; 
+            $v_quota = 0;
         } else {
             $v_quota = escapeshellarg($_POST['v_quota']);
         }
@@ -310,19 +303,16 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco
     }
 }
 
-// Display body for mail domain
-if ((!empty($_GET['domain'])) && (empty($_GET['account'])))  {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_mail.html');
-}
 
-// Display body for mail account
-if ((!empty($_GET['domain'])) && (!empty($_GET['account'])))  {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_mail_acc.html');
+// Render page
+if (empty($_GET['account']))  {
+    // Display body for mail domain
+    render_page($user, $TAB, 'edit_mail');
+} else {
+    // Display body for mail account
+    render_page($user, $TAB, 'edit_mail_acc');
 }
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/edit/package/index.php b/web/edit/package/index.php
index e5cc707a..763bfdf4 100644
--- a/web/edit/package/index.php
+++ b/web/edit/package/index.php
@@ -1,10 +1,9 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'PACKAGE';
 
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 
@@ -224,18 +223,9 @@ if (!empty($_POST['save'])) {
 }
 
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Display body
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_package.html');
+// Render page
+render_page($user, $TAB, 'edit_package');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/edit/server/index.php b/web/edit/server/index.php
index 073dc97b..78a6e62f 100644
--- a/web/edit/server/index.php
+++ b/web/edit/server/index.php
@@ -1,8 +1,8 @@
 <?php
-// Init
 error_reporting(NULL);
 $TAB = 'SERVER';
 
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Check user
@@ -421,18 +421,9 @@ foreach ($sys_arr as $key => $value) {
     $_SESSION[$key] = $value;
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Display body
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_server.html');
+// Render page
+render_page($user, $TAB, 'edit_server');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/edit/user/index.php b/web/edit/user/index.php
index 2fbd526a..049ee20d 100644
--- a/web/edit/user/index.php
+++ b/web/edit/user/index.php
@@ -1,10 +1,9 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 $TAB = 'USER';
 
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 
@@ -184,28 +183,9 @@ if (!empty($_POST['save'])) {
     }
 }
 
-
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-
-// Panel
-if (!empty($_SESSION['look'])) {
-    top_panel($user,$TAB);
-} else {
-    top_panel($_SESSION['user'],$TAB);
-}
-
-// Display body
-if ($_SESSION['user'] == 'admin') {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_user.html');
-} else {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/user/edit_user.html');
-}
+// Render page
+render_page($user, $TAB, 'edit_user');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/edit/web/index.php b/web/edit/web/index.php
index e28aa713..06c379a9 100644
--- a/web/edit/web/index.php
+++ b/web/edit/web/index.php
@@ -1,11 +1,10 @@
 <?php
-// Init
 error_reporting(NULL);
 ob_start();
-session_start();
 unset($_SESSION['error_msg']);
 $TAB = 'WEB';
 
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Check domain argument
@@ -694,22 +693,9 @@ if (isset($v_ftp_users_updated)) {
     }
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Display body
-if ($_SESSION['user'] == 'admin') {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_web.html');
-} else {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/user/edit_web.html');
-}
+// Render page
+render_page($user, $TAB, 'edit_web');
 
 // Flush session messages
 unset($_SESSION['error_msg']);
 unset($_SESSION['ok_msg']);
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/generate/ssl/index.php b/web/generate/ssl/index.php
index 4cc7180d..990fbc66 100644
--- a/web/generate/ssl/index.php
+++ b/web/generate/ssl/index.php
@@ -1,16 +1,10 @@
 <?php
-// Init
 error_reporting(NULL);
-session_start();
 $TAB = 'WEB';
+
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // Prepare values
 if (!empty($_GET['domain'])) {
     $v_domain = $_GET['domain'];
@@ -29,9 +23,8 @@ $_SESSION['back'] = '';
 
 // Check POST
 if (!isset($_POST['generate'])) {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/generate_ssl.html');
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
-    exit();
+    render_page($user, $TAB, 'generate_ssl');
+    exit;
 }
 
 // Check input
@@ -58,10 +51,9 @@ if (!empty($errors[0])) {
         }
     }
     $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/generate_ssl.html');
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+    render_page($user, $TAB, 'generate_ssl');
     unset($_SESSION['error_msg']);
-    exit();
+    exit;
 }
 
 // Protect input
@@ -87,10 +79,9 @@ if ($return_var != 0) {
     $error = implode('<br>', $output);
     if (empty($error)) $error = __('Error code:',$return_var);
     $_SESSION['error_msg'] = $error;
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/generate_ssl.html');
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+    render_page($user, $TAB, 'generate_ssl');
     unset($_SESSION['error_msg']);
-    exit();
+    exit;
 }
 
 // OK message
@@ -106,6 +97,7 @@ $v_csr = $data[$v_domain]['CSR'];
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
 
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_ssl.html');
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+// Render page
+render_page($user, $TAB, 'list_ssl');
+
 unset($_SESSION['ok_msg']);
diff --git a/web/inc/main.php b/web/inc/main.php
index 4df0ece9..03446849 100644
--- a/web/inc/main.php
+++ b/web/inc/main.php
@@ -95,6 +95,41 @@ function check_return_code($return_var,$output) {
     }
 }
 
+function insert_scripts() {
+    @include_once(dirname(__DIR__) . '/templates/scripts.html');
+}
+
+function render_page($user, $TAB, $page) {
+    $__template_dir = dirname(__DIR__) . '/templates/';
+
+    // Header
+    include($__template_dir . 'header.html');
+
+    // Panel
+    top_panel(empty($_SESSION['look']) ? $_SESSION['user'] : $_SESSION['look'], $TAB);
+
+    // Extarct global variables
+    // I think those variables should be passed via arguments
+    //*
+    extract($GLOBALS, EXTR_SKIP);
+    /*/
+    $variables = array_filter($GLOBALS, function($key){return preg_match('/^(v_|[a-z])[a-z\d]+$/', $key);}, ARRAY_FILTER_USE_KEY);
+    extract($variables, EXTR_OVERWRITE);
+    //*/
+
+    // Body
+    if (($_SESSION['user'] !== 'admin') && (@include($__template_dir . "user/$page.html"))) {
+        // User page loaded
+    } else {
+        // Not admin or user page doesn't exist
+        // Load admin page
+        @include($__template_dir . "admin/$page.html");
+    }
+
+    // Footer
+    include($__template_dir . 'footer.html');
+}
+
 function top_panel($user, $TAB) {
     global $panel;
     $command = VESTA_CMD."v-list-user '".$user."' 'json'";
@@ -107,7 +142,7 @@ function top_panel($user, $TAB) {
     unset($output);
 
 
-    // getting notifications 
+    // getting notifications
     $command = VESTA_CMD."v-list-user-notifications '".$user."' 'json'";
     exec ($command, $output, $return_var);
     $notifications = json_decode(implode('', $output), true);
@@ -118,7 +153,7 @@ function top_panel($user, $TAB) {
         }
     }
     unset($output);
-    
+
 
     if ( $user == 'admin' ) {
         include(dirname(__FILE__).'/../templates/admin/panel.html');
@@ -241,36 +276,6 @@ function send_email($to,$subject,$mailtext,$from) {
     mail($to, $subject, $message, $header);
 }
 
-function display_error_block() {
-    if (!empty($_SESSION['error_msg'])) {
-        echo '
-            <div>
-                <script type="text/javascript">
-                    $(function() {
-                        $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                        $( "#dialog-message" ).dialog({
-                            modal: true,
-                            buttons: {
-                                Ok: function() {
-                                    $( this ).dialog( "close" );
-                                }
-                            },
-                            create:function () {
-                                $(this).closest(".ui-dialog")
-                                .find(".ui-button:first")
-                                .addClass("submit");
-                            }
-                        });
-                    });
-                </script>
-                <div id="dialog-message" title="">
-                    <p>'. htmlentities($_SESSION['error_msg']) .'</p>
-                </div>
-            </div>'."\n";
-        unset($_SESSION['error_msg']);
-    }
-}
-
 function list_timezones() {
     $tz = new DateTimeZone('HAST');
     $timezone_offsets['HAST'] = $tz->getOffset(new DateTime);
diff --git a/web/list/backup/exclusions/index.php b/web/list/backup/exclusions/index.php
index d03e9861..8089e8d7 100644
--- a/web/list/backup/exclusions/index.php
+++ b/web/list/backup/exclusions/index.php
@@ -3,22 +3,15 @@ error_reporting(NULL);
 $TAB = 'BACKUP';
 
 // Main include
-include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
-
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
+include($_SERVER['DOCUMENT_ROOT'].'/inc/main.php');
 
 // Data
 exec (VESTA_CMD."v-list-user-backup-exclusions $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_backup_exclusions.html');
+
+// Render page
+render_page($user, $TAB, 'list_backup_exclusions');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/list/backup/index.php b/web/list/backup/index.php
index a7920572..2e29a50a 100644
--- a/web/list/backup/index.php
+++ b/web/list/backup/index.php
@@ -3,31 +3,24 @@ error_reporting(NULL);
 $TAB = 'BACKUP';
 
 // Main include
-include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
+include($_SERVER['DOCUMENT_ROOT'].'/inc/main.php');
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Data
+// Data & Render page
 if (empty($_GET['backup'])){
     exec (VESTA_CMD."v-list-user-backups $user json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data,true);
     unset($output);
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_backup.html');
+
+    render_page($user, $TAB, 'list_backup');
 } else {
-    exec (VESTA_CMD."v-list-user-backup $user '".escapeshellarg($_GET['backup'])."' json", $output, $return_var);
+    exec (VESTA_CMD."v-list-user-backup $user ".escapeshellarg($_GET['backup'])." json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data,true);
     unset($output);
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_backup_detail.html');
+
+    render_page($user, $TAB, 'list_backup_detail');
 }
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/list/cron/index.php b/web/list/cron/index.php
index 19f66379..230483cb 100644
--- a/web/list/cron/index.php
+++ b/web/list/cron/index.php
@@ -1,16 +1,9 @@
 <?php
 error_reporting(NULL);
-
 $TAB = 'CRON';
 
 // Main include
-include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
-
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
+include($_SERVER['DOCUMENT_ROOT'].'/inc/main.php');
 
 // Data
 exec (VESTA_CMD."v-list-cron-jobs $user json", $output, $return_var);
@@ -18,15 +11,8 @@ $data = json_decode(implode('', $output), true);
 $data = array_reverse($data,true);
 unset($output);
 
-if ($_SESSION['user'] == 'admin') {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_cron.html');
-} else {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_cron.html');
-}
+// Render page
+render_page($user, $TAB, 'list_cron');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
-
diff --git a/web/list/db/index.php b/web/list/db/index.php
index 4262b61f..42129064 100644
--- a/web/list/db/index.php
+++ b/web/list/db/index.php
@@ -5,27 +5,14 @@ $TAB = 'DB';
 // Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // Data
 exec (VESTA_CMD."v-list-databases $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 $data = array_reverse($data, true);
 unset($output);
 
-if ($_SESSION['user'] == 'admin') {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_db.html');
-} else {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_db.html');
-}
+// Render page
+render_page($user, $TAB, 'list_db');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
-
diff --git a/web/list/dns/index.php b/web/list/dns/index.php
index 0b9951a7..df5b4a83 100644
--- a/web/list/dns/index.php
+++ b/web/list/dns/index.php
@@ -1,42 +1,26 @@
 <?php
 error_reporting(NULL);
-
 $TAB = 'DNS';
 
 // Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Data
+// Data & Render page
 if (empty($_GET['domain'])){
     exec (VESTA_CMD."v-list-dns-domains $user json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data, true);
     unset($output);
-    if ($_SESSION['user'] == 'admin') {
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_dns.html');
-    } else {
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_dns.html');
-    }
+
+    render_page($user, $TAB, 'list_dns');
 } else {
     exec (VESTA_CMD."v-list-dns-records '".$user."' '".escapeshellarg($_GET['domain'])."' 'json'", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data, true);
     unset($output);
-    if ($_SESSION['user'] == 'admin') {
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_dns_rec.html');
-    } else {
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_dns_rec.html');
-    }
+
+    render_page($user, $TAB, 'list_dns_rec');
 }
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/list/firewall/banlist/index.php b/web/list/firewall/banlist/index.php
index 32393229..6d8cddb4 100644
--- a/web/list/firewall/banlist/index.php
+++ b/web/list/firewall/banlist/index.php
@@ -1,6 +1,5 @@
 <?php
 error_reporting(NULL);
-
 $TAB = 'FIREWALL';
 
 // Main include
@@ -12,22 +11,14 @@ if ($_SESSION['user'] != 'admin') {
     exit;
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // Data
 exec (VESTA_CMD."v-list-firewall-ban json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 $data = array_reverse($data, true);
 unset($output);
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_firewall_banlist.html');
+
+// Render page
+render_page($user, $TAB, 'list_firewall_banlist');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
-
diff --git a/web/list/firewall/index.php b/web/list/firewall/index.php
index 62b8cbfd..e4e3d4df 100644
--- a/web/list/firewall/index.php
+++ b/web/list/firewall/index.php
@@ -1,6 +1,5 @@
 <?php
 error_reporting(NULL);
-
 $TAB = 'FIREWALL';
 
 // Main include
@@ -12,22 +11,14 @@ if ($_SESSION['user'] != 'admin') {
     exit;
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // Data
 exec (VESTA_CMD."v-list-firewall json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 $data = array_reverse($data, true);
 unset($output);
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_firewall.html');
+
+// Render page
+render_page($user, $TAB, 'list_firewall');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
-
diff --git a/web/list/ip/index.php b/web/list/ip/index.php
index 510da61a..04f4fbe7 100644
--- a/web/list/ip/index.php
+++ b/web/list/ip/index.php
@@ -1,27 +1,25 @@
 <?php
 error_reporting(NULL);
+
 $TAB = 'IP';
 
 // Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
+// Check user
+if ($_SESSION['user'] != 'admin') {
+    header('Location: /list/user');
+    exit;
+}
 
 // Data
-if ($_SESSION['user'] == 'admin') {
-    exec (VESTA_CMD."v-list-sys-ips json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data, true);
-    unset($output);
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_ip.html');
-}
+exec (VESTA_CMD."v-list-sys-ips json", $output, $return_var);
+$data = json_decode(implode('', $output), true);
+$data = array_reverse($data, true);
+unset($output);
+
+// Render page
+render_page($user, $TAB, 'list_ip');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/list/log/index.php b/web/list/log/index.php
index 0d3f3b8b..5c70e96e 100644
--- a/web/list/log/index.php
+++ b/web/list/log/index.php
@@ -1,15 +1,10 @@
 <?php
-// Init
 error_reporting(NULL);
 $TAB = 'LOG';
+
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // Data
 exec (VESTA_CMD."v-list-user-log $user json", $output, $return_var);
 check_error($return_var);
@@ -17,7 +12,5 @@ $data = json_decode(implode('', $output), true);
 $data = array_reverse($data);
 unset($output);
 
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_log.html');
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+// Render page
+render_page($user, $TAB, 'list_log');
diff --git a/web/list/mail/index.php b/web/list/mail/index.php
index 6555ccba..6b767768 100644
--- a/web/list/mail/index.php
+++ b/web/list/mail/index.php
@@ -1,42 +1,26 @@
 <?php
 error_reporting(NULL);
-
 $TAB = 'MAIL';
 
 // Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-// Data
+// Data & Render page
 if (empty($_GET['domain'])){
     exec (VESTA_CMD."v-list-mail-domains $user json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data, true);
     unset($output);
-    if ($_SESSION['user'] == 'admin') {
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_mail.html');
-    } else {
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_mail.html');
-    }
+
+    render_page($user, $TAB, 'list_mail');
 } else {
     exec (VESTA_CMD."v-list-mail-accounts '".$user."' '".escapeshellarg($_GET['domain'])."' json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data, true);
     unset($output);
-    if ($_SESSION['user'] == 'admin') {
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_mail_acc.html');
-    } else {
-        include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_mail_acc.html');
-    }
+
+    render_page($user, $TAB, 'list_mail_acc');
 }
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/list/notifications/index.php b/web/list/notifications/index.php
index 1b6a0d1c..1323b532 100644
--- a/web/list/notifications/index.php
+++ b/web/list/notifications/index.php
@@ -15,30 +15,20 @@ if($_REQUEST['ajax'] == 1){
         $data[$key] = $note;
     }
     echo json_encode($data);
-    exit();
+    exit;
 }
 
 
 
 $TAB = 'NOTIFICATIONS';
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
 
 // Data
 exec (VESTA_CMD."v-list-user-notifications $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 $data = array_reverse($data,true);
-if ($_SESSION['user'] == 'admin') {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_notifications.html');
-} else {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_notifications.html');
-}
+
+// Render page
+render_page($user, $TAB, 'list_notifications');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/list/package/index.php b/web/list/package/index.php
index 61e44c17..7d7f35e5 100644
--- a/web/list/package/index.php
+++ b/web/list/package/index.php
@@ -1,5 +1,6 @@
 <?php
 error_reporting(NULL);
+
 $TAB = 'PACKAGE';
 
 // Main include
@@ -11,20 +12,13 @@ if ($_SESSION['user'] != 'admin') {
     exit;
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // Data
 exec (VESTA_CMD."v-list-user-packages json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_packages.html');
+
+// Render page
+render_page($user, $TAB, 'list_packages');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/list/rrd/index.php b/web/list/rrd/index.php
index 725a584e..7a13b78b 100644
--- a/web/list/rrd/index.php
+++ b/web/list/rrd/index.php
@@ -5,22 +5,19 @@ $TAB = 'RRD';
 // Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
+// Check user
+if ($_SESSION['user'] != 'admin') {
+    header('Location: /list/user');
+    exit;
+}
 
 // Data
-if ($_SESSION['user'] == 'admin') {
-    exec (VESTA_CMD."v-list-sys-rrd json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    unset($output);
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_rrd.html');
-}
+exec (VESTA_CMD."v-list-sys-rrd json", $output, $return_var);
+$data = json_decode(implode('', $output), true);
+unset($output);
+
+// Render page
+render_page($user, $TAB, 'list_rrd');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/list/server/index.php b/web/list/server/index.php
index 97af7f9d..c37448ae 100644
--- a/web/list/server/index.php
+++ b/web/list/server/index.php
@@ -112,13 +112,6 @@ if (isset($_GET['db'])) {
     exit();
 }
 
-
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // Data
 exec (VESTA_CMD."v-list-sys-info json", $output, $return_var);
 $sys = json_decode(implode('', $output), true);
@@ -126,10 +119,9 @@ unset($output);
 exec (VESTA_CMD."v-list-sys-services json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 unset($output);
-include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_services.html');
+
+// Render page
+render_page($user, $TAB, 'list_services');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/list/stats/index.php b/web/list/stats/index.php
index ac97d4f2..c758705a 100644
--- a/web/list/stats/index.php
+++ b/web/list/stats/index.php
@@ -5,12 +5,6 @@ $TAB = 'STATS';
 // Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // Data
 if ($user == 'admin') {
     if (empty($_GET['user'])) {
@@ -29,18 +23,15 @@ if ($user == 'admin') {
     exec (VESTA_CMD."v-list-sys-users 'json'", $output, $return_var);
     $users = json_decode(implode('', $output), true);
     unset($output);
-
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_stats.html');
 } else {
     exec (VESTA_CMD."v-list-user-stats $user json", $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data, true);
     unset($output);
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_stats.html');
 }
 
+// Render page
+render_page($user, $TAB, 'list_stats');
+
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/list/updates/index.php b/web/list/updates/index.php
index f2c55308..ef1f9b17 100644
--- a/web/list/updates/index.php
+++ b/web/list/updates/index.php
@@ -5,26 +5,22 @@ $TAB = 'UPDATES';
 // Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
+// Check user
+if ($_SESSION['user'] != 'admin') {
+    header('Location: /list/user');
+    exit;
+}
 
 // Data
-if ($_SESSION['user'] == 'admin') {
-    exec (VESTA_CMD."v-list-sys-vesta-updates json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    unset($output);
-    exec (VESTA_CMD."v-list-sys-vesta-autoupdate plain", $output, $return_var);
-    $autoupdate = $output['0'];
-    unset($output);
+exec (VESTA_CMD."v-list-sys-vesta-updates json", $output, $return_var);
+$data = json_decode(implode('', $output), true);
+unset($output);
+exec (VESTA_CMD."v-list-sys-vesta-autoupdate plain", $output, $return_var);
+$autoupdate = $output['0'];
+unset($output);
 
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_updates.html');
-}
+// Render page
+render_page($user, $TAB, 'list_updates');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/list/user/index.php b/web/list/user/index.php
index 129a78c4..302e8c14 100644
--- a/web/list/user/index.php
+++ b/web/list/user/index.php
@@ -1,37 +1,21 @@
 <?php
 error_reporting(NULL);
-session_start();
 $TAB = 'USER';
 
 // Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // Data
-if ($_SESSION['user'] == 'admin') {
-    if ($user == 'admin') {
-        exec (VESTA_CMD . "v-list-users json", $output, $return_var);
-    } else {
-        exec (VESTA_CMD . "v-list-user ".$user." json", $output, $return_var);
-    }
-    $data = json_decode(implode('', $output), true);
-    $data = array_reverse($data,true);
-    display_error_block();
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_user.html');
+if ($user == 'admin') {
+    exec (VESTA_CMD . "v-list-users json", $output, $return_var);
 } else {
     exec (VESTA_CMD . "v-list-user ".$user." json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    display_error_block();
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_user.html');
 }
+$data = json_decode(implode('', $output), true);
+$data = array_reverse($data,true);
+
+// Render page
+render_page($user, $TAB, 'list_user');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/list/web/index.php b/web/list/web/index.php
index 52b0c78e..1db6c29c 100644
--- a/web/list/web/index.php
+++ b/web/list/web/index.php
@@ -5,24 +5,13 @@ $TAB = 'WEB';
 // Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
 // Data
 exec (VESTA_CMD."v-list-web-domains $user json", $output, $return_var);
 $data = json_decode(implode('', $output), true);
 $data = array_reverse($data,true);
-if ($_SESSION['user'] == 'admin') {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_web.html');
-} else {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_web.html');
-}
+
+// Render page
+render_page($user, $TAB, 'list_web');
 
 // Back uri
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
-
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/phpinfo.php b/web/phpinfo.php
new file mode 100644
index 00000000..e974c40d
--- /dev/null
+++ b/web/phpinfo.php
@@ -0,0 +1 @@
+<?php phpinfo();
\ No newline at end of file
diff --git a/web/search/index.php b/web/search/index.php
index e885cd7a..808b6f41 100644
--- a/web/search/index.php
+++ b/web/search/index.php
@@ -1,9 +1,11 @@
 <?php
 // Init
 error_reporting(NULL);
-session_start();
 $TAB = 'SEARCH';
+
 $_SESSION['back'] = $_SERVER['REQUEST_URI'];
+
+// Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Check query
@@ -18,26 +20,14 @@ if (empty($q)) {
     exit;
 }
 
-// Header
-include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
-
-// Panel
-top_panel($user,$TAB);
-
-$lang = 'ru_RU.utf8';
-//setlocale(LC_ALL, $lang);
-
 // Data
 $q = escapeshellarg($q);
-if ($_SESSION['user'] == 'admin') {
-    exec (VESTA_CMD."v-search-object ".$q." json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_search.html');
-} else {
-    exec (VESTA_CMD."v-search-user-object ".$user." ".$q." json", $output, $return_var);
-    $data = json_decode(implode('', $output), true);
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_search.html');
-}
+$command = $_SESSION['user'] == 'admin'
+           ? "v-search-object $q json"
+           : "v-search-user-object $user $q json";
 
-// Footer
-include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
+exec (VESTA_CMD . $command, $output, $return_var);
+$data = json_decode(implode('', $output), true);
+
+// Render page
+render_page($user, $TAB, 'list_search');
diff --git a/web/templates/admin/add_cron.html b/web/templates/admin/add_cron.html
index f0ba4f96..12a56e3f 100644
--- a/web/templates/admin/add_cron.html
+++ b/web/templates/admin/add_cron.html
@@ -12,9 +12,7 @@
                     }
                   ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -438,4 +436,4 @@
                 </tr>
             </table>
         </form>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/admin/add_db.html b/web/templates/admin/add_db.html
index a69a6c14..a1e6cc2d 100644
--- a/web/templates/admin/add_db.html
+++ b/web/templates/admin/add_db.html
@@ -12,9 +12,7 @@
                     }
                   ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -32,26 +30,7 @@
         <form id="vstobjects" name="v_add_db" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="ok" value="Add" />
-            <script type="text/javascript">
-                function elementHideShow(elementToHideOrShow) {
-                    var el = document.getElementById(elementToHideOrShow);
-                    if (el.style.display == "block") {
-                        el.style.display = "none";
-                    } else {
-                        el.style.display = "block";
-                    }
-                }
-                function randomString() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var randomstring = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        randomstring += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_add_db.v_password.value = randomstring;
-                }
-            </script>
+
             <table class="data mode-add">
                 <tr class="data-add">
                     <td class="data-dotted">
@@ -68,7 +47,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Database');?> 
+                                    <?php print __('Database');?>
                                 </td>
                             </tr>
                             <tr>
@@ -79,7 +58,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('User');?> 
+                                    <?php print __('User');?>
                                 </td>
                             </tr>
                             <tr>
@@ -100,7 +79,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Type');?> 
+                                    <?php print __('Type');?>
                                 </td>
                             </tr>
                             <tr>
@@ -112,13 +91,13 @@
                                                 if ((!empty($v_type)) && ( $value == $v_type )) echo ' selected';
                                                 echo ">".htmlentities($value)."</option>";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Host');?> 
+                                    <?php print __('Host');?>
                                 </td>
                             </tr>
                             <tr>
@@ -130,14 +109,14 @@
                                                 if ((!empty($v_host)) && ( $key == $v_host )) echo ' selected';
                                                 echo ">".htmlentities($key)."</option>";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
 
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Charset');?> 
+                                    <?php print __('Charset');?>
                                 </td>
                             </tr>
                             <tr>
@@ -183,7 +162,7 @@
                                 </td>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Send login credentials to email address') ?> 
+                                    <?php print __('Send login credentials to email address') ?>
                                 </td>
                             </tr>
                             <tr>
@@ -208,8 +187,25 @@
         </form>
     </div>
 
-    <script type="text/javascript">
-        GLOBAL.DB_USER_PREFIX = '<?php echo $user; ?>_';
-        GLOBAL.DB_DBNAME_PREFIX = '<?php echo $user; ?>_';
+<?php insert_scripts(); ?>
+    <script>
+      function elementHideShow(elementToHideOrShow){
+        var el = document.getElementById(elementToHideOrShow);
+        el.style.display = el.style.display === 'none' ? 'block' : 'none';
+      }
+
+      function randomString() {
+        var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
+        var string_length = 10;
+        var randomstring = '';
+        for (var i = 0; i < string_length; i++) {
+          var rnum = Math.floor(Math.random() * chars.length);
+          randomstring += chars.substr(rnum, 1);
+        }
+        document.v_add_db.v_password.value = randomstring;
+      }
+
+      GLOBAL.DB_USER_PREFIX = <?=json_encode($user.'_')?>;
+      GLOBAL.DB_DBNAME_PREFIX = <?=json_encode($user.'_')?>;
     </script>
-    <script type="text/javascript" src="/js/pages/add.db.js"></script>
+    <script src="/js/pages/add.db.js"></script>
diff --git a/web/templates/admin/add_dns.html b/web/templates/admin/add_dns.html
index 564ca5fa..10285e23 100644
--- a/web/templates/admin/add_dns.html
+++ b/web/templates/admin/add_dns.html
@@ -12,9 +12,7 @@
                     }
                   ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -32,16 +30,6 @@
         <form id="vstobjects" name="v_add_dns" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="ok" value="Add" />
-            <script language="javascript">
-                function elementHideShow(elementToHideOrShow){
-                    var el = document.getElementById(elementToHideOrShow);
-                        if (el.style.display == "block") {
-                            el.style.display = "none";
-                        } else {
-                            el.style.display = "block";
-                        }
-                }
-            </script>
 
             <table class="data mode-add">
                 <tr class="data-add">
@@ -190,33 +178,40 @@
             </table>
         </form>
     </div>
-        <script type="text/javascript">
-            $(document).ready(function(){
-                $('.add-ns-button').click(function(){
-                  var n = $("input[name^=v_ns]").length;
-                  if(n < 8){
-                    var t = $($('input[name=v_ns1]').parents('tr')[0]).clone(true, true);
-                    t.find('input').attr({value:'', name:'v_ns'+(n+1)});
-                    t.find('span').show();
-                    $('tr.add-ns').before(t);
-                  }
-                  if( n == 7 ) {
-                    $('.add-ns').hide();
-                  }
-                });
 
-                $('.remove-ns').click(function(){
-                    $(this).parents('tr')[0].remove();
-                    $('input[name^=v_ns]').each(function(i, ns){
-                        $(ns).attr({name: 'v_ns'+(i+1)});
-                        i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
-                    })
-                    $('.add-ns').show()
-                })
+<?php insert_scripts(); ?>
+    <script>
+      function elementHideShow(elementToHideOrShow){
+        var el = document.getElementById(elementToHideOrShow);
+        el.style.display = el.style.display === 'none' ? 'block' : 'none';
+      }
 
-                $('input[name^=v_ns]').each(function(i, ns){
-                  i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
-                })
+      $(document).ready(function(){
+        $('.add-ns-button').click(function(){
+          var n = $('input[name^=v_ns]').length;
+          if(n < 8){
+          var t = $($('input[name=v_ns1]').parents('tr')[0]).clone(true, true);
+          t.find('input').attr({value:'', name:'v_ns'+(n+1)});
+          t.find('span').show();
+          $('tr.add-ns').before(t);
+          }
+          if( n == 7 ) {
+          $('.add-ns').hide();
+          }
+        });
 
-            });
-        </script>
+        $('.remove-ns').click(function(){
+          $(this).parents('tr')[0].remove();
+          $('input[name^=v_ns]').each(function(i, ns){
+            $(ns).attr({name: 'v_ns'+(i+1)});
+            i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
+          })
+          $('.add-ns').show()
+        });
+
+        $('input[name^=v_ns]').each(function(i, ns){
+          i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
+        });
+
+      });
+    </script>
diff --git a/web/templates/admin/add_dns_rec.html b/web/templates/admin/add_dns_rec.html
index 76964b4c..ddee3a00 100644
--- a/web/templates/admin/add_dns_rec.html
+++ b/web/templates/admin/add_dns_rec.html
@@ -12,9 +12,7 @@
                     }
                   ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -122,7 +120,8 @@
         </form>
       </div>
 
-        <script type="text/javascript">
-            GLOBAL.DNS_REC_PREFIX = '<?php echo $_GET['domain']; ?>';
-        </script>
-        <script type="text/javascript" src="/js/pages/add.dns.record.js"></script>
+<?php insert_scripts(); ?>
+    <script>
+      GLOBAL.DNS_REC_PREFIX = <?=json_encode($_GET['domain'])?>;
+    </script>
+    <script src="/js/pages/add.dns.record.js"></script>
diff --git a/web/templates/admin/add_firewall.html b/web/templates/admin/add_firewall.html
index de3d6372..710ae297 100644
--- a/web/templates/admin/add_firewall.html
+++ b/web/templates/admin/add_firewall.html
@@ -12,9 +12,7 @@
                     }
                   ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -32,16 +30,6 @@
         <form id="vstobjects" name="v_add_ip" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="ok" value="Add" />
-            <script type="text/javascript">
-                function elementHideShow(elementToHideOrShow) {
-                    var el = document.getElementById(elementToHideOrShow);
-                    if (el.style.display == "block") {
-                        el.style.display = "none";
-                    } else {
-                        el.style.display = "block";
-                    }
-                }
-            </script>
 
             <table class="data mode-add">
                 <tr class="data-add">
@@ -54,7 +42,7 @@
                         <table class="data-col2" width="600px">
                             <tr>
                                 <td class="vst-text step-top">
-                                    <?php print __('Action') ?> 
+                                    <?php print __('Action') ?>
                                 </td>
                             </tr>
                             <tr>
@@ -67,7 +55,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Protocol') ?> 
+                                    <?php print __('Protocol') ?>
                                 </td>
                             </tr>
                             <tr>
@@ -128,4 +116,12 @@
             </table>
         </from>
 
-    </div>
\ No newline at end of file
+    </div>
+
+<?php insert_scripts(); ?>
+    <script>
+      function elementHideShow(elementToHideOrShow) {
+        var el = document.getElementById(elementToHideOrShow);
+        el.style.display = el.style.display === 'none' ? 'block' : 'none';
+      }
+    </script>
diff --git a/web/templates/admin/add_firewall_banlist.html b/web/templates/admin/add_firewall_banlist.html
index 9c09d8da..ed06693e 100644
--- a/web/templates/admin/add_firewall_banlist.html
+++ b/web/templates/admin/add_firewall_banlist.html
@@ -12,9 +12,7 @@
                     }
                   ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -32,16 +30,6 @@
         <form id="vstobjects" name="v_add_ip" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="ok" value="Add" />
-            <script type="text/javascript">
-                function elementHideShow(elementToHideOrShow) {
-                    var el = document.getElementById(elementToHideOrShow);
-                    if (el.style.display == "block") {
-                        el.style.display = "none";
-                    } else {
-                        el.style.display = "block";
-                    }
-                }
-            </script>
 
             <table class="data mode-add">
                 <tr class="data-add">
@@ -54,7 +42,7 @@
                         <table class="data-col2" width="600px">
                             <tr>
                                 <td class="vst-text step-top">
-                                    <?php print __('Banlist') ?> 
+                                    <?php print __('Banlist') ?>
                                 </td>
                             </tr>
                             <tr>
@@ -95,4 +83,12 @@
                 </tr>
             </table>
         </from>
-      </div>
\ No newline at end of file
+      </div>
+
+<?php insert_scripts(); ?>
+    <script>
+      function elementHideShow(elementToHideOrShow) {
+        var el = document.getElementById(elementToHideOrShow);
+        el.style.display = el.style.display === 'none' ? 'block' : 'none';
+      }
+    </script>
diff --git a/web/templates/admin/add_ip.html b/web/templates/admin/add_ip.html
index 43b37d5d..4c3b0be0 100644
--- a/web/templates/admin/add_ip.html
+++ b/web/templates/admin/add_ip.html
@@ -12,9 +12,7 @@
                     }
                   ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -32,16 +30,6 @@
         <form id="vstobjects" name="v_add_ip" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="ok" value="Add" />
-            <script type="text/javascript">
-                function elementHideShow(elementToHideOrShow) {
-                    var el = document.getElementById(elementToHideOrShow);
-                    if (el.style.display == "block") {
-                        el.style.display = "none";
-                    } else {
-                        el.style.display = "block";
-                    }
-                }
-            </script>
 
             <table class="data mode-add">
                 <tr class="data-add">
@@ -157,3 +145,11 @@
             </table>
         </form>
       </div>
+
+<?php insert_scripts(); ?>
+    <script>
+      function elementHideShow(elementToHideOrShow) {
+        var el = document.getElementById(elementToHideOrShow);
+        el.style.display = el.style.display === 'none' ? 'block' : 'none';
+      }
+    </script>
diff --git a/web/templates/admin/add_mail.html b/web/templates/admin/add_mail.html
index c736f586..057e8165 100644
--- a/web/templates/admin/add_mail.html
+++ b/web/templates/admin/add_mail.html
@@ -12,9 +12,7 @@
                     }
                   ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -81,4 +79,4 @@
                 </tr>
             </table>
         </form>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html
index 2dd8c78d..08aaf74d 100644
--- a/web/templates/admin/add_mail_acc.html
+++ b/web/templates/admin/add_mail_acc.html
@@ -12,9 +12,7 @@
                     }
                   ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -32,53 +30,6 @@
         <form id="vstobjects" name="v_add_mail_acc" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="ok_acc" value="add" />
-            <script type="text/javascript">
-                function elementHideShow(elementToHideOrShow) {
-                    var el = document.getElementById(elementToHideOrShow);
-                    if (el.style.display == "block") {
-                        el.style.display = "none";
-                    } else {
-                        el.style.display = "block";
-                    }
-                }
-                function randomString() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var randomstring = '';
-                    for (var i=0; i<string_length; i++) {
-                      var rnum = Math.floor(Math.random() * chars.length);
-                      randomstring += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_add_mail_acc.v_password.value = randomstring;
-
-                    if($('input[name=v_password]').attr('type') == 'text')
-                      $('#v_password').text(randomstring);
-                    else
-                      $('#v_password').text(Array(randomstring.length+1).join('*'));
-                  }
-                $(document).ready(function() {
-                    $('#v_account').text($('input[name=v_account]').val());
-                    $('#v_password').text($('input[name=v_password]').val());
-
-                    $('input[name=v_account]').change(function(){
-                      $('#v_account').text($(this).val());
-                    });
-
-                    $('input[name=v_password]').change(function(){
-                      if($('input[name=v_password]').attr('type') == 'text')
-                        $('#v_password').text($(this).val());
-                      else
-                        $('#v_password').text(Array($(this).val().length+1).join('*'));
-                    });
-
-                    $('.toggle-psw-visibility-icon').click(function(){
-                      if($('input[name=v_password]').attr('type') == 'text')
-                        $('#v_password').text($('input[name=v_password]').val());
-                      else
-                        $('#v_password').text(Array($('input[name=v_password]').val().length+1).join('*'));
-                    });
-                });
-            </script>
 
             <table class="data mode-add">
             <tr class="data-add">
@@ -229,4 +180,51 @@
     </table>
     </form>
   </div>
-  <script type="text/javascript" src="/js/pages/edit.package.js"></script>
+
+<?php insert_scripts(); ?>
+    <script>
+      function elementHideShow(elementToHideOrShow) {
+        var el = document.getElementById(elementToHideOrShow);
+        el.style.display = el.style.display === 'none' ? 'block' : 'none';
+      }
+
+      function randomString() {
+        var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
+        var string_length = 10;
+        var randomstring = '';
+        for (var i = 0; i < string_length; i++) {
+          var rnum = Math.floor(Math.random() * chars.length);
+          randomstring += chars.substr(rnum, 1);
+        }
+        document.v_add_mail_acc.v_password.value = randomstring;
+
+        if($('input[name=v_password]').attr('type') == 'text')
+          $('#v_password').text(randomstring);
+        else
+          $('#v_password').text(Array(randomstring.length+1).join('*'));
+      }
+
+      $(document).ready(function() {
+        $('#v_account').text($('input[name=v_account]').val());
+        $('#v_password').text($('input[name=v_password]').val());
+
+        $('input[name=v_account]').change(function(){
+          $('#v_account').text($(this).val());
+        });
+
+        $('input[name=v_password]').change(function(){
+          if($('input[name=v_password]').attr('type') == 'text')
+          $('#v_password').text($(this).val());
+          else
+          $('#v_password').text(Array($(this).val().length+1).join('*'));
+        });
+
+        $('.toggle-psw-visibility-icon').click(function(){
+          if($('input[name=v_password]').attr('type') == 'text')
+          $('#v_password').text($('input[name=v_password]').val());
+          else
+          $('#v_password').text(Array($('input[name=v_password]').val().length+1).join('*'));
+        });
+      });
+    </script>
+    <script src="/js/pages/edit.package.js"></script>
diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html
index ec4e675c..72b9bfd1 100644
--- a/web/templates/admin/add_package.html
+++ b/web/templates/admin/add_package.html
@@ -12,9 +12,7 @@
                     }
                   ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -72,11 +70,11 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
-                            <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?> 
+                            <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Backend Template') . "<span class='optional'>" . strtoupper($_SESSION['WEB_BACKEND']). "</span>" ;?>
@@ -96,13 +94,13 @@
                                                 }
                                                 echo ">".$value."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
-                            <?php echo ""; }?> 
+                            <?php echo ""; }?>
 
-                            <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?> 
+                            <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Proxy Template')  . "<span class='optional'>" .strtoupper($_SESSION['PROXY_SYSTEM']) . "</span>" ;?>
@@ -123,11 +121,11 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
-                            <?php echo ""; }?> 
+                            <?php echo ""; }?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('DNS Template') . "<span class='optional'>" .strtoupper($_SESSION['DNS_SYSTEM']) . "</span>" ;?>
@@ -147,7 +145,7 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -170,7 +168,7 @@
                                             }
                                             echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -380,34 +378,35 @@
             </table>
         </form>
       </div>
-        <script type="text/javascript" src="/js/pages/add.package.js"></script>
-        <script type="text/javascript">
-            $(document).ready(function(){
-                $('.add-ns-button').click(function(){
-                  var n = $("input[name^=v_ns]").length;
-                  if(n < 8){
-                    var t = $($('input[name=v_ns1]').parents('tr')[0]).clone(true, true);
-                    t.find('input').attr({value:'', name:'v_ns'+(n+1)});
-                    t.find('span').show();
-                    $('tr.add-ns').before(t);
-                  }
-                  if( n == 7 ) {
-                    $('.add-ns').hide();
-                  }
-                });
 
-                $('.remove-ns').click(function(){
-                    $(this).parents('tr')[0].remove();
-                    $('input[name^=v_ns]').each(function(i, ns){
-                        $(ns).attr({name: 'v_ns'+(i+1)});
-                        i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
-                    })
-                    $('.add-ns').show()
-                })
+<?php insert_scripts(); ?>
+    <script>
+      $(document).ready(function(){
+        $('.add-ns-button').click(function(){
+          var n = $('input[name^=v_ns]').length;
+          if(n < 8){
+          var t = $($('input[name=v_ns1]').parents('tr')[0]).clone(true, true);
+          t.find('input').attr({value:'', name:'v_ns'+(n+1)});
+          t.find('span').show();
+          $('tr.add-ns').before(t);
+          }
+          if( n == 7 ) {
+          $('.add-ns').hide();
+          }
+        });
 
-                $('input[name^=v_ns]').each(function(i, ns){
-                  i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
-                })
+        $('.remove-ns').click(function(){
+          $(this).parents('tr')[0].remove();
+          $('input[name^=v_ns]').each(function(i, ns){
+            $(ns).attr({name: 'v_ns'+(i+1)});
+            i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
+          });
+          $('.add-ns').show();
+        });
 
-            });
-        </script>
\ No newline at end of file
+        $('input[name^=v_ns]').each(function(i, ns){
+          i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
+        });
+      });
+    </script>
+    <script src="/js/pages/add.package.js"></script>
diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html
index 7f978c65..aafdf253 100644
--- a/web/templates/admin/add_user.html
+++ b/web/templates/admin/add_user.html
@@ -12,9 +12,7 @@
                     }
                   ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
 
@@ -34,24 +32,6 @@
         <form id="vstobjects" name="v_add_user" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="ok" value="Add" />
-            <script type="text/javascript">
-                $(function() {
-                    $("#v_email").change(function() {
-                        document.getElementById('v_notify').value = document.getElementById('v_email').value;
-                    });
-                });
-
-                function randomString() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var randomstring = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        randomstring += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_add_user.v_password.value = randomstring;
-                }
-            </script>
 
             <table class="data mode-add">
                 <tr class="data-add">
@@ -112,7 +92,7 @@
                                                 }
                                                 echo ">".htmlentities($key)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -188,4 +168,24 @@
                 </tr>
             </table>
         </form>
-    </div>
\ No newline at end of file
+    </div>
+
+<?php insert_scripts(); ?>
+    <script>
+      $(function() {
+        $('#v_email').change(function() {
+          document.getElementById('v_notify').value = document.getElementById('v_email').value;
+        });
+      });
+
+      function randomString() {
+        var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
+        var string_length = 10;
+        var randomstring = '';
+        for (var i = 0; i < string_length; i++) {
+          var rnum = Math.floor(Math.random() * chars.length);
+          randomstring += chars.substr(rnum, 1);
+        }
+        document.v_add_user.v_password.value = randomstring;
+      }
+    </script>
diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html
index 2a917029..5b9ecf47 100644
--- a/web/templates/admin/add_web.html
+++ b/web/templates/admin/add_web.html
@@ -12,9 +12,7 @@
                     }
                   ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -33,44 +31,6 @@
         <form id="vstobjects" name="v_add_web" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="ok" value="Add" />
-            <script type="text/javascript">
-                $(function() {
-                    $("#v_domain").change(function() {
-                        var prefix = 'www.';
-                        document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
-                    });
-                });
-                function WEBrandom() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var webrandom = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        webrandom += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_add_web.v_stats_password.value = webrandom;
-                }
-
-                function FTPrandom(elm) {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var ftprandomstring = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        ftprandomstring += chars.substring(rnum,rnum+1);
-                    }
-                    $(elm).parents('.ftptable').find('.v-ftp-user-psw').val(ftprandomstring);
-                }
-
-                function elementHideShow(elementToHideOrShow){
-                    var el = document.getElementById(elementToHideOrShow);
-                    if (el.style.display == "block") {
-                        el.style.display = "none";
-                    } else {
-                        el.style.display = "block";
-                    }
-                }
-            </script>
 
             <table class="data mode-add">
                 <tr class="data-add">
@@ -142,7 +102,7 @@
                                 <textarea size="20" class="vst-textinput" name="v_aliases" id="v_aliases" ><?php if (!empty($v_aliases)) echo htmlentities($v_aliases);  ?></textarea>
                             </td>
                         </tr>
-                        <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?> 
+                        <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
                         <tr>
                             <td class="vst-text step-top" >
                                 <label><input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if ($v_proxy !== 'off') echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');"> <?php print __('Proxy Support');?></label>
@@ -164,7 +124,7 @@
                                 </table>
                             </td>
                         </tr>
-                        <?php echo ""; }?> 
+                        <?php echo ""; }?>
                         <tr>
                             <td class="step-top vst-text">
                                 <label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if($v_ssl == 'yes' || $v_ssl == 'on') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label> /
@@ -242,7 +202,7 @@
                                             }
                                             echo ">" . htmlentities(__($value)) . "</option>\n";
                                         }
-                                    ?> 
+                                    ?>
                                 </select>
                             </td>
                         </tr>
@@ -429,14 +389,49 @@
         </div>
       </div>
 
+<?php insert_scripts(); ?>
+    <script>
+      $(function() {
+        $('#v_domain').change(function() {
+          var prefix = 'www.';
+          document.getElementById('v_aliases').value = prefix + document.getElementById('v_domain').value;
+        });
+      });
 
-    <script type="text/javascript">
-        GLOBAL.FTP_USER_PREFIX  = '<?php echo $user; ?>_';
-        GLOBAL.FTP_USER_PREPATH = '<?php echo $v_ftp_user_prepath; ?>';
-        $('#vstobjects').bind('submit', function(evt) {
-                $('input[disabled]').each(function(i, elm) {
-                    $(elm).removeAttr('disabled');
-                });
-            });
+      function WEBrandom() {
+        var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
+        var string_length = 10;
+        var webrandom = '';
+        for (var i = 0; i < string_length; i++) {
+          var rnum = Math.floor(Math.random() * chars.length);
+          webrandom += chars.substr(rnum, 1);
+        }
+        document.v_add_web.v_stats_password.value = webrandom;
+      }
+
+      function FTPrandom(elm) {
+        var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
+        var string_length = 10;
+        var ftprandomstring = '';
+        for (var i = 0; i < string_length; i++) {
+          var rnum = Math.floor(Math.random() * chars.length);
+          ftprandomstring += chars.substr(rnum, 1);
+        }
+        $(elm).parents('.ftptable').find('.v-ftp-user-psw').val(ftprandomstring);
+      }
+
+      function elementHideShow(elementToHideOrShow){
+        var el = document.getElementById(elementToHideOrShow);
+        el.style.display = el.style.display === 'none' ? 'block' : 'none';
+      }
+
+      $('#vstobjects').bind('submit', function(evt) {
+        $('input[disabled]').each(function(i, elm) {
+          $(elm).removeAttr('disabled');
+        });
+      });
+
+      GLOBAL.FTP_USER_PREFIX  = <?=json_encode($user)?>;
+      GLOBAL.FTP_USER_PREPATH = <?=json_encode($v_ftp_user_prepath)?>;
     </script>
-    <script type="text/javascript" src="/js/pages/add.web.js"></script>
+    <script src="/js/pages/add.web.js"></script>
diff --git a/web/templates/admin/edit_backup_exclusions.html b/web/templates/admin/edit_backup_exclusions.html
index 4dd5995c..6bb489ea 100644
--- a/web/templates/admin/edit_backup_exclusions.html
+++ b/web/templates/admin/edit_backup_exclusions.html
@@ -12,9 +12,7 @@
                     }
                   ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -100,4 +98,4 @@
                 </tr>
             </table>
         </form>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/admin/edit_cron.html b/web/templates/admin/edit_cron.html
index 9eb7f106..91baee27 100644
--- a/web/templates/admin/edit_cron.html
+++ b/web/templates/admin/edit_cron.html
@@ -12,9 +12,7 @@
               }
             ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -32,7 +30,7 @@
 
                                 <div class="vst-text step-top helper-container">
                                     <div id="tabs"  class="cron-helper-tabs">
-                                      <ul>      
+                                      <ul>
                                         <li><a href="#tabs-1"><?=__('Minutes')?></a></li>
                                         <li><a href="#tabs-2"><?=__('Hourly')?></a></li>
                                         <li><a href="#tabs-3"><?=__('Daily')?></a></li>
@@ -232,7 +230,7 @@
                                         </form>
                                       </div>
 
-                                      
+
                                       <div id="tabs-5">
                                         <form>
                                             <input type="hidden" name="h_wday" value="*" />
diff --git a/web/templates/admin/edit_db.html b/web/templates/admin/edit_db.html
index 296f8bef..1b27ab38 100644
--- a/web/templates/admin/edit_db.html
+++ b/web/templates/admin/edit_db.html
@@ -12,9 +12,7 @@
               }
             ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -32,26 +30,6 @@
         <form id="vstobjects" name="v_edit_db" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
-            <script type="text/javascript">
-                function elementHideShow(elementToHideOrShow) {
-                    var el = document.getElementById(elementToHideOrShow);
-                    if (el.style.display == "block") {
-                        el.style.display = "none";
-                    } else {
-                        el.style.display = "block";
-                    }
-                }
-                function randomString() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var randomstring = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        randomstring += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_edit_db.v_password.value = randomstring;
-                }
-            </script>
 
            <table class='data'>
                 <tr class="data-add">
@@ -146,8 +124,26 @@
             </table>
         </form>
     </div>
-    <script type="text/javascript">
-        GLOBAL.DB_USER_PREFIX = '<?php echo $user; ?>_';
-        GLOBAL.DB_DBNAME_PREFIX = '<?php echo $user; ?>_';
+
+<?php insert_scripts(); ?>
+    <script>
+      function elementHideShow(elementToHideOrShow){
+        var el = document.getElementById(elementToHideOrShow);
+        el.style.display = el.style.display === 'none' ? 'block' : 'none';
+      }
+
+      function randomString() {
+        var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
+        var string_length = 10;
+        var randomstring = '';
+        for (var i = 0; i < string_length; i++) {
+          var rnum = Math.floor(Math.random() * chars.length);
+          randomstring += chars.substr(rnum, 1);
+        }
+        document.v_edit_db.v_password.value = randomstring;
+      }
+
+      GLOBAL.DB_USER_PREFIX = <?=json_encode($user.'_')?>;
+      GLOBAL.DB_DBNAME_PREFIX = <?=json_encode($user.'_')?>;
     </script>
-    <script type="text/javascript" src="/js/pages/edit.db.js"></script>
+    <script src="/js/pages/edit.db.js"></script>
diff --git a/web/templates/admin/edit_dns.html b/web/templates/admin/edit_dns.html
index 780270c1..df8ef25e 100644
--- a/web/templates/admin/edit_dns.html
+++ b/web/templates/admin/edit_dns.html
@@ -12,9 +12,7 @@
               }
             ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -84,7 +82,7 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -133,4 +131,4 @@
                 </tr>
             </table>
         </form>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/admin/edit_dns_rec.html b/web/templates/admin/edit_dns_rec.html
index 446fda6b..698cb657 100644
--- a/web/templates/admin/edit_dns_rec.html
+++ b/web/templates/admin/edit_dns_rec.html
@@ -12,9 +12,7 @@
               }
             ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -125,4 +123,4 @@
                 </tr>
             </table>
         </form>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/admin/edit_firewall.html b/web/templates/admin/edit_firewall.html
index 60a13e16..1b6bf359 100644
--- a/web/templates/admin/edit_firewall.html
+++ b/web/templates/admin/edit_firewall.html
@@ -12,9 +12,7 @@
               }
             ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -32,16 +30,6 @@
         <form id="vstobjects" name="v_edit_firewall" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
-            <script type="text/javascript">
-                function elementHideShow(elementToHideOrShow) {
-                    var el = document.getElementById(elementToHideOrShow);
-                    if (el.style.display == "block") {
-                        el.style.display = "none";
-                    } else {
-                        el.style.display = "block";
-                    }
-                }
-            </script>
 
             <table class='data'>
                 <tr class="data-add">
@@ -60,7 +48,7 @@
                         <table class="data-col2" width="600px">
                             <tr>
                                 <td class="vst-text step-top">
-                                    <?php print __('Action'); ?> 
+                                    <?php print __('Action'); ?>
                                 </td>
                             </tr>
                             <tr>
@@ -73,7 +61,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Protocol') ?> 
+                                    <?php print __('Protocol') ?>
                                 </td>
                             </tr>
                             <tr>
@@ -130,4 +118,12 @@
                 </tr>
             </table>
         </form>
-    </div>
\ No newline at end of file
+    </div>
+
+<?php insert_scripts(); ?>
+    <script>
+      function elementHideShow(elementToHideOrShow){
+        var el = document.getElementById(elementToHideOrShow);
+        el.style.display = el.style.display === 'none' ? 'block' : 'none';
+      }
+    </script>
diff --git a/web/templates/admin/edit_ip.html b/web/templates/admin/edit_ip.html
index 4d013f00..811457b3 100644
--- a/web/templates/admin/edit_ip.html
+++ b/web/templates/admin/edit_ip.html
@@ -12,9 +12,7 @@
               }
             ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -32,16 +30,6 @@
         <form id="vstobjects" name="v_edit_ip" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
-            <script type="text/javascript">
-                function elementHideShow(elementToHideOrShow) {
-                    var el = document.getElementById(elementToHideOrShow);
-                    if (el.style.display == "block") {
-                        el.style.display = "none";
-                    } else {
-                        el.style.display = "block";
-                    }
-                }
-            </script>
 
             <table class='data'>
                 <tr class="data-add">
@@ -60,7 +48,7 @@
                         <table class="data-col2" width="600px">
                             <tr>
                                 <td class="vst-text step-top">
-                                    <?php print __('IP address'); ?> 
+                                    <?php print __('IP address'); ?>
                                 </td>
                             </tr>
                             <tr>
@@ -70,7 +58,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Netmask');?> 
+                                    <?php print __('Netmask');?>
                                 </td>
                             </tr>
                             <tr>
@@ -80,7 +68,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Interface'); ?> 
+                                    <?php print __('Interface'); ?>
                                 </td>
                             </tr>
                             <tr>
@@ -153,4 +141,12 @@
                 </tr>
             </table>
         </form>
-    </div>
\ No newline at end of file
+    </div>
+
+<?php insert_scripts(); ?>
+    <script>
+      function elementHideShow(elementToHideOrShow){
+        var el = document.getElementById(elementToHideOrShow);
+        el.style.display = el.style.display === 'none' ? 'block' : 'none';
+      }
+    </script>
diff --git a/web/templates/admin/edit_mail.html b/web/templates/admin/edit_mail.html
index 7bcfa18a..141725c7 100644
--- a/web/templates/admin/edit_mail.html
+++ b/web/templates/admin/edit_mail.html
@@ -12,9 +12,7 @@
               }
             ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -97,4 +95,4 @@
                 </tr>
             </table>
         </form>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html
index c4ae0926..52b66d7b 100644
--- a/web/templates/admin/edit_mail_acc.html
+++ b/web/templates/admin/edit_mail_acc.html
@@ -12,9 +12,7 @@
               }
             ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -32,26 +30,6 @@
         <form id="vstobjects" name="v_edit_mail_acc" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
-            <script type="text/javascript">
-                function elementHideShow(elementToHideOrShow) {
-                    var el = document.getElementById(elementToHideOrShow);
-                    if (el.style.display == "block") {
-                        el.style.display = "none";
-                    } else {
-                        el.style.display = "block";
-                    }
-                }
-                function randomString() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var randomstring = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        randomstring += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_edit_mail_acc.v_password.value = randomstring;
-                }
-            </script>
 
             <table class='data'>
                 <tr class="data-add">
@@ -163,4 +141,23 @@
         </table>
     </form>
 </div>
-<script type="text/javascript" src="/js/pages/edit.mail_acc.js"></script>
+
+<?php insert_scripts(); ?>
+    <script>
+      function elementHideShow(elementToHideOrShow){
+        var el = document.getElementById(elementToHideOrShow);
+        el.style.display = el.style.display === 'none' ? 'block' : 'none';
+      }
+
+      function randomString() {
+        var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
+        var string_length = 10;
+        var randomstring = '';
+        for (var i = 0; i < string_length; i++) {
+          var rnum = Math.floor(Math.random() * chars.length);
+          randomstring += chars.substr(rnum, 1);
+        }
+        document.v_edit_mail_acc.v_password.value = randomstring;
+      }
+    </script>
+    <script src="/js/pages/edit.mail_acc.js"></script>
diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html
index 4480fa82..8db16864 100644
--- a/web/templates/admin/edit_package.html
+++ b/web/templates/admin/edit_package.html
@@ -12,9 +12,7 @@
               }
             ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -72,11 +70,11 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
-                            <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?> 
+                            <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Backend Template')  . "<span class='optional'>" .strtoupper($_SESSION['WEB_BACKEND']) . "</span>";?>
@@ -96,12 +94,12 @@
                                                 }
                                                 echo ">".$value."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
-                            <?php echo ""; }?> 
-                            <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?> 
+                            <?php echo ""; }?>
+                            <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Proxy Template')  . "<span class='optional'>" .strtoupper($_SESSION['PROXY_SYSTEM']) . "</span>";?>
@@ -121,11 +119,11 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
-                            <?php echo ""; }?> 
+                            <?php echo ""; }?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('DNS Template')  . "<span class='optional'>" .strtoupper($_SESSION['DNS_SYSTEM']) . "</span>";?>
@@ -145,7 +143,7 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -381,34 +379,36 @@
             </table>
         </form>
     </div>
-    <script type="text/javascript" src="/js/pages/edit.package.js"></script>
-    <script type="text/javascript">
-              $(document).ready(function(){
-                $('.add-ns-button').click(function(){
-                  var n = $("input[name^=v_ns]").length;
-                  if(n < 8){
-                    var t = $($('input[name=v_ns1]').parents('tr')[0]).clone(true, true);
-                    t.find('input').attr({value:'', name:'v_ns'+(n+1)});
-                    t.find('span').show();
-                    $('tr.add-ns').before(t);
-                  }
-                  if( n == 7 ) {
-                    $('.add-ns').hide();
-                  }
-                });
 
-                $('.remove-ns').click(function(){
-                    $(this).parents('tr')[0].remove();
-                    $('input[name^=v_ns]').each(function(i, ns){
-                        $(ns).attr({name: 'v_ns'+(i+1)});
-                        i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
-                    })
-                    $('.add-ns').show()
-                })
+<?php insert_scripts(); ?>
+    <script>
+        $(document).ready(function(){
+        $('.add-ns-button').click(function(){
+          var n = $('input[name^=v_ns]').length;
+          if(n < 8){
+          var t = $($('input[name=v_ns1]').parents('tr')[0]).clone(true, true);
+          t.find('input').attr({value:'', name:'v_ns'+(n+1)});
+          t.find('span').show();
+          $('tr.add-ns').before(t);
+          }
+          if( n == 7 ) {
+          $('.add-ns').hide();
+          }
+        });
 
-                $('input[name^=v_ns]').each(function(i, ns){
-                  i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
-                })
+        $('.remove-ns').click(function(){
+          $(this).parents('tr')[0].remove();
+          $('input[name^=v_ns]').each(function(i, ns){
+            $(ns).attr({name: 'v_ns'+(i+1)});
+            i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
+          });
+          $('.add-ns').show();
+        });
 
-            });
-    </script>
\ No newline at end of file
+        $('input[name^=v_ns]').each(function(i, ns){
+          i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
+        });
+
+      });
+    </script>
+    <script src="/js/pages/edit.package.js"></script>
diff --git a/web/templates/admin/edit_server.html b/web/templates/admin/edit_server.html
index 20e49453..5272750c 100644
--- a/web/templates/admin/edit_server.html
+++ b/web/templates/admin/edit_server.html
@@ -12,9 +12,7 @@
               }
             ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -33,16 +31,7 @@
         <form id="vstobjects" name="v_configure_server" method="post">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
-            <script type="text/javascript">
-                function elementHideShow(elementToHideOrShow) {
-                    var el = document.getElementById(elementToHideOrShow);
-                    if (el.style.display == "block") {
-                        el.style.display = "none";
-                    } else {
-                        el.style.display = "block";
-                    }
-                }
-            </script>
+
             <table class="data mode-add">
                 <tr class="data-add">
                     <td class="data-dotted">
@@ -54,7 +43,7 @@
                         <table class="data-col2" width="600px">
                             <tr>
                                 <td class="vst-text step-top">
-                                    <?php print __('Hostname') ?> 
+                                    <?php print __('Hostname') ?>
                                 </td>
                             </tr>
                             <tr>
@@ -82,7 +71,7 @@
                                                 }
                                                 echo ">".$value."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                     <br><br>
                                 </td>
@@ -106,7 +95,7 @@
                                                 }
                                                 echo ">".$value."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                     <br><br>
                                 </td>
@@ -121,10 +110,10 @@
                             <tr>
                                 <td class="vst-text input-label step-left">
                                     <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="web">
-                                        <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { ?> 
+                                        <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { ?>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Proxy Server') ?> 
+                                                <?php print __('Proxy Server') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -133,10 +122,10 @@
                                                 <br><br>
                                             </td>
                                         </tr>
-                                        <?php } ?> 
+                                        <?php } ?>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Web Server') ?> 
+                                                <?php print __('Web Server') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -145,10 +134,10 @@
                                                 <br><br>
                                             </td>
                                         </tr>
-                                        <?php if (!empty($_SESSION['WEB_BACKEND'])) { ?> 
+                                        <?php if (!empty($_SESSION['WEB_BACKEND'])) { ?>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Backend Server') ?> 
+                                                <?php print __('Backend Server') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -159,7 +148,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Backend Pool Mode') ?> 
+                                                <?php print __('Backend Pool Mode') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -169,7 +158,7 @@
                                             </td>
                                         </tr>
 
-                                        <?php } ?> 
+                                        <?php } ?>
                                     </table>
                                 </td>
                             </tr>
@@ -187,7 +176,7 @@
                                     <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="dns">
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('DNS Server') ?> 
+                                                <?php print __('DNS Server') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -215,10 +204,10 @@
                                                   $i = 0;
                                                   foreach ($dns_cluster as $key => $value) {
                                                       $i++;
-                                         ?> 
+                                         ?>
                                         <tr>
                                             <td class="vst-text step-left">
-                                                <?php print __('Host'). ' #'.$i  ?> 
+                                                <?php print __('Host'). ' #'.$i  ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -227,7 +216,7 @@
                                                 <br><br>
                                             </td>
                                         </tr>
-                                        <?php }} ?> 
+                                        <?php }} ?>
                                     </table>
                                 </td>
                             </tr>
@@ -245,7 +234,7 @@
                                     <table style="display:<?php if (empty($v_mail_adv)) echo 'none';?> ;" id="mail">
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('MAIL Server') ?> 
+                                                <?php print __('MAIL Server') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -254,10 +243,10 @@
                                                 <br><br>
                                             </td>
                                         </tr>
-                                        <?php if (!empty($_SESSION['ANTIVIRUS_SYSTEM'])) { ?> 
+                                        <?php if (!empty($_SESSION['ANTIVIRUS_SYSTEM'])) { ?>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Antivirus') ?> 
+                                                <?php print __('Antivirus') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -266,11 +255,11 @@
                                                 <br><br>
                                             </td>
                                         </tr>
-                                        <?php } ?> 
-                                        <?php if (!empty($_SESSION['ANTISPAM_SYSTEM'])) { ?> 
+                                        <?php } ?>
+                                        <?php if (!empty($_SESSION['ANTISPAM_SYSTEM'])) { ?>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('AntiSpam') ?> 
+                                                <?php print __('AntiSpam') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -279,10 +268,10 @@
                                                 <br><br>
                                             </td>
                                         </tr>
-                                        <?php } ?> 
+                                        <?php } ?>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Webmail URL') ?> 
+                                                <?php print __('Webmail URL') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -324,7 +313,7 @@
                                         <?php if ($v_mysql == 'yes') { ?>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('phpMyAdmin URL') ?> 
+                                                <?php print __('phpMyAdmin URL') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -338,10 +327,10 @@
                                                   $i = 0;
                                                   foreach ($v_mysql_hosts as $key => $value) {
                                                       $i++;
-                                         ?> 
+                                         ?>
                                         <tr>
                                             <td class="vst-text step-left">
-                                                <?php print __('Host'). ' #'.$i  ?> 
+                                                <?php print __('Host'). ' #'.$i  ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -352,7 +341,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text step-left">
-                                                <?php print __('Password') ?> 
+                                                <?php print __('Password') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -364,7 +353,7 @@
 
                                         <tr>
                                             <td class="vst-text step-left">
-                                                <?php print __('Maximum Number Of Databases') ?> 
+                                                <?php print __('Maximum Number Of Databases') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -375,7 +364,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text step-left">
-                                                <?php print __('Current Number Of Databases') ?> 
+                                                <?php print __('Current Number Of Databases') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -384,7 +373,7 @@
                                                 <br><br><br><br>
                                             </td>
                                         </tr>
-                                        <?php }} ?> 
+                                        <?php }} ?>
 
 
                                         <tr>
@@ -404,7 +393,7 @@
                                         <?php if ($v_pgsql == 'yes') { ?>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('phpPgAdmin URL') ?> 
+                                                <?php print __('phpPgAdmin URL') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -418,10 +407,10 @@
                                                   $i = 0;
                                                   foreach ($v_pgsql_hosts as $key => $value) {
                                                       $i++;
-                                         ?> 
+                                         ?>
                                         <tr>
                                             <td class="vst-text step-left">
-                                                <?php print __('Host'). ' #'.$i  ?> 
+                                                <?php print __('Host'). ' #'.$i  ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -432,7 +421,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text step-left">
-                                                <?php print __('Maximum Number Of Databases') ?> 
+                                                <?php print __('Maximum Number Of Databases') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -443,7 +432,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text step-left">
-                                                <?php print __('Current Number Of Databases') ?> 
+                                                <?php print __('Current Number Of Databases') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -452,7 +441,7 @@
                                                 <br><br><br><br>
                                             </td>
                                         </tr>
-                                        <?php }} ?> 
+                                        <?php }} ?>
                                     </table>
                                 </td>
                             </tr>
@@ -470,7 +459,7 @@
                                     <table style="display:<?php if (empty($v_backup_adv)) echo 'none';?> ;" id="backup">
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Local backup') ?> 
+                                                <?php print __('Local backup') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -484,7 +473,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Compression level') ?> 
+                                                <?php print __('Compression level') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -505,7 +494,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Directory') ?> 
+                                                <?php print __('Directory') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -524,7 +513,7 @@
                                             <td class="vst-text input-label step-left">
                                                 <table style="display:<?php if (empty($v_backup_remote_adv)) echo 'none';?> ;" id="remote_backup">
                                                     <td class="vst-text">
-                                                        <?php print __('Protocol') ?> 
+                                                        <?php print __('Protocol') ?>
                                                     </td>
                                                     </tr>
                                                     <tr>
@@ -538,7 +527,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text">
-                                                            <?php print __('Host') ?> 
+                                                            <?php print __('Host') ?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -549,7 +538,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text">
-                                                            <?php print __('Username') ?> 
+                                                            <?php print __('Username') ?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -560,7 +549,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text">
-                                                            <?php print __('Password') ?> 
+                                                            <?php print __('Password') ?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -571,7 +560,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text">
-                                                            <?php print __('Directory') ?> 
+                                                            <?php print __('Directory') ?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -599,7 +588,7 @@
                                     <table style="display:<?php if (empty($v_adv) && $_GET['lead'] != 'filemanager' && $_GET['lead'] != 'sftp') echo 'none';?> ;" id="vesta">
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Version') ?> 
+                                                <?php print __('Version') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -638,7 +627,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Reseller Role') ?> 
+                                                <?php print __('Reseller Role') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -651,7 +640,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Backup Migration Manager') ?> 
+                                                <?php print __('Backup Migration Manager') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -690,7 +679,7 @@
                                                                 '.__('Licence Key').': <input type="text" class="vst-input" name="v_sftp_licence" value="'.$licence_key.'" /><br>
                                                             </div>';
                                                     } else {
-                                                        echo 
+                                                        echo
                                                             __('Restrict users so that they cannot use SSH and access only their home directory.').' '.__('This is a commercial module, you would need to purchace license key to enable it.').
                                                             '<div class="licence">
                                                                 '.__('Enter License Key').': <input type="text" class="vst-input" name="v_sftp_licence" /><br>
@@ -712,7 +701,7 @@
 
                                         <tr>
                                             <td class="vst-text" id="module-filemanager">
-                                                <?php print __('File Manager') ?> 
+                                                <?php print __('File Manager') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -779,22 +768,28 @@
         </form>
     </div>
 
-<script>
-    $(document).ready(function(){
+<?php insert_scripts(); ?>
+    <script>
+      function elementHideShow(elementToHideOrShow){
+        var el = document.getElementById(elementToHideOrShow);
+        el.style.display = el.style.display === 'none' ? 'block' : 'none';
+      }
+
+      $(document).ready(function(){
         $('select[name=v_filemanager]').change(function(){
-            if($(this).val() == 'yes'){
-                $('.filemanager.description').show();
-            } else {
-                $('.filemanager.description').hide();
-            }
+          if($(this).val() == 'yes'){
+            $('.filemanager.description').show();
+          } else {
+            $('.filemanager.description').hide();
+          }
         });
 
         $('select[name=v_sftp]').change(function(){
-            if($(this).val() == 'yes'){
-                $('.sftp.description').show();
-            } else {
-                $('.sftp.description').hide();
-            }
+          if($(this).val() == 'yes'){
+            $('.sftp.description').show();
+          } else {
+            $('.sftp.description').hide();
+          }
         });
-     });
-</script>
\ No newline at end of file
+       });
+    </script>
diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html
index 8717ce3f..aa017d41 100644
--- a/web/templates/admin/edit_user.html
+++ b/web/templates/admin/edit_user.html
@@ -12,9 +12,7 @@
               }
             ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -32,18 +30,7 @@
         <form id="vstobjects" method="post" name="v_edit_user" class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
-            <script type="text/javascript">
-                function randomString() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var randomstring = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        randomstring += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_edit_user.v_password.value = randomstring;
-                }
-            </script>
+
             <table class='data'>
                 <tr class="data-add">
                     <td class="data-dotted">
@@ -106,7 +93,7 @@
                                                 }
                                                 echo ">".htmlentities($key)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -130,7 +117,7 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -171,7 +158,7 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -264,33 +251,46 @@
             </table>
         </form>
     </div>
-        <script type="text/javascript">
-            $(document).ready(function(){
-                $('.add-ns-button').click(function(){
-                  var n = $("input[name^=v_ns]").length;
-                  if(n < 8){
-                    var t = $($('input[name=v_ns1]').parents('tr')[0]).clone(true, true);
-                    t.find('input').attr({value:'', name:'v_ns'+(n+1)});
-                    t.find('span').show();
-                    $('tr.add-ns').before(t);
-                  }
-                  if( n == 7 ) {
-                    $('.add-ns').hide();
-                  }
-                });
 
-                $('.remove-ns').click(function(){
-                    $(this).parents('tr')[0].remove();
-                    $('input[name^=v_ns]').each(function(i, ns){
-                        $(ns).attr({name: 'v_ns'+(i+1)});
-                        i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
-                    })
-                    $('.add-ns').show()
-                })
+<?php insert_scripts(); ?>
+    <script>
+      function randomString() {
+        var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
+        var string_length = 10;
+        var randomstring = '';
+        for (var i = 0; i < string_length; i++) {
+          var rnum = Math.floor(Math.random() * chars.length);
+          randomstring += chars.substr(rnum, 1);
+        }
+        document.v_edit_user.v_password.value = randomstring;
+      }
 
-                $('input[name^=v_ns]').each(function(i, ns){
-                  i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
-                })
+      $(document).ready(function(){
+        $('.add-ns-button').click(function(){
+          var n = $('input[name^=v_ns]').length;
+          if(n < 8){
+          var t = $($('input[name=v_ns1]').parents('tr')[0]).clone(true, true);
+          t.find('input').attr({value:'', name:'v_ns'+(n+1)});
+          t.find('span').show();
+          $('tr.add-ns').before(t);
+          }
+          if( n == 7 ) {
+          $('.add-ns').hide();
+          }
+        });
 
-            });
-        </script>
\ No newline at end of file
+        $('.remove-ns').click(function(){
+          $(this).parents('tr')[0].remove();
+          $('input[name^=v_ns]').each(function(i, ns){
+            $(ns).attr({name: 'v_ns'+(i+1)});
+            i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
+          });
+          $('.add-ns').show();
+        });
+
+        $('input[name^=v_ns]').each(function(i, ns){
+          i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
+        });
+
+      });
+    </script>
diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html
index 51822ec7..f8593186 100644
--- a/web/templates/admin/edit_web.html
+++ b/web/templates/admin/edit_web.html
@@ -12,9 +12,7 @@
               }
             ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -32,40 +30,7 @@
         <form id="vstobjects" name="v_edit_web" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
-            <script language="javascript">
-                function WEBrandom() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var webrandom = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        webrandom += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_edit_web.v_stats_password.value = webrandom;
-                }
 
-                function FTPrandom(elm) {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var ftprandomstring = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        ftprandomstring += chars.substring(rnum,rnum+1);
-                    }
-
-                    $(elm).parents('.ftptable').find('.v-ftp-user-psw').val(ftprandomstring);
-                    App.Actions.WEB.randomPasswordGenerated && App.Actions.WEB.randomPasswordGenerated(elm);
-                }
-
-                function elementHideShow(elementToHideOrShow){
-                    var el = document.getElementById(elementToHideOrShow);
-                    if (el.style.display == "block") {
-                        el.style.display = "none";
-                    } else {
-                        el.style.display = "block";
-                    }
-                }
-            </script>
             <table class='data'>
                 <tr class="data-add">
                     <td class="data-dotted">
@@ -141,11 +106,11 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
-                            <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?> 
+                            <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
                             <tr>
                                 <td class="vst-text input-label">
                                     <?php print __('Backend Template') . " <span class='optional'>" . strtoupper($_SESSION['WEB_BACKEND']) . "</span>";?>
@@ -166,12 +131,12 @@
                                                 }
                                                 echo ">".$value."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
-                            <?php echo ""; }?> 
-                            <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?> 
+                            <?php echo ""; }?>
+                            <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
                             <tr>
                                 <td class="vst-text step-top">
                                     <label><input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');"> <?php print __('Proxy Support') . "<span class='optional'>" . strtoupper($_SESSION['PROXY_SYSTEM']) . "</span>";?></label>
@@ -200,7 +165,7 @@
                                                             }
                                                             echo ">".htmlentities($value)."</option>\n";
                                                         }
-                                                    ?> 
+                                                    ?>
                                                 </select>
                                             </td>
                                         </tr>
@@ -217,7 +182,7 @@
                                     </table>
                                 </td>
                             </tr>
-                            <?php echo ""; }?> 
+                            <?php echo ""; }?>
                             <tr>
                                 <td class="vst-text step-top">
                                     <label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label> /
@@ -247,7 +212,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text input-label">
-                                                <?php print __('SSL Certificate');?> 
+                                                <?php print __('SSL Certificate');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -296,7 +261,7 @@
                                                 }
                                             echo ">". htmlentities(__($value)) ."</option>\n";
                                             }
-                                    ?> 
+                                    ?>
                                     </select>
                                 </td>
                             </tr>
@@ -430,7 +395,7 @@
 
         <div id="templates" class="hidden">
             <table class="ftptable ftptable-nrm" name="v_add_domain_ftp">
-                <tr> 
+                <tr>
                     <td class="vst-text input-label">
                         <?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?=__('delete')?>)</a>
                         <input type="hidden"  class="v-ftp-user-deleted" name="v_ftp_user[%INDEX%][delete]" value="0" />
@@ -485,16 +450,47 @@
         </table>
         </div>
     </div>
-        <script type="text/javascript">
-            GLOBAL.FTP_USER_PREFIX = '<?php echo $user; ?>_';
-            $('#vstobjects').bind('submit', function(evt) {
-                $('input[disabled]').each(function(i, elm) {
-                    var copy_elm = $(elm).clone(true);
-                    $(copy_elm).attr('type', 'hidden');
-                    $(copy_elm).removeAttr('disabled');
-                    $(elm).after(copy_elm);
-                });
-            });
-        </script>
-        <script type="text/javascript" src="/js/pages/edit.web.js"></script>
 
+<?php insert_scripts(); ?>
+    <script>
+      function WEBrandom() {
+        var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
+        var string_length = 10;
+        var webrandom = '';
+        for (var i = 0; i < string_length; i++) {
+          var rnum = Math.floor(Math.random() * chars.length);
+          webrandom += chars.substr(rnum, 1);
+        }
+        document.v_edit_web.v_stats_password.value = webrandom;
+      }
+
+      function FTPrandom(elm) {
+        var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
+        var string_length = 10;
+        var ftprandomstring = '';
+        for (var i = 0; i < string_length; i++) {
+          var rnum = Math.floor(Math.random() * chars.length);
+          ftprandomstring += chars.substr(rnum, 1);
+        }
+
+        $(elm).parents('.ftptable').find('.v-ftp-user-psw').val(ftprandomstring);
+        App.Actions.WEB.randomPasswordGenerated && App.Actions.WEB.randomPasswordGenerated(elm);
+      }
+
+      function elementHideShow(elementToHideOrShow){
+        var el = document.getElementById(elementToHideOrShow);
+        el.style.display = el.style.display === 'none' ? 'block' : 'none';
+      }
+
+      $('#vstobjects').bind('submit', function(evt) {
+        $('input[disabled]').each(function(i, elm) {
+          var copy_elm = $(elm).clone(true);
+          $(copy_elm).attr('type', 'hidden');
+          $(copy_elm).removeAttr('disabled');
+          $(elm).after(copy_elm);
+        });
+      });
+
+      GLOBAL.FTP_USER_PREFIX = <?=json_encode($user.'_')?>;
+    </script>
+    <script src="/js/pages/edit.web.js"></script>
diff --git a/web/templates/admin/generate_ssl.html b/web/templates/admin/generate_ssl.html
index a5c9a558..a9e490bb 100644
--- a/web/templates/admin/generate_ssl.html
+++ b/web/templates/admin/generate_ssl.html
@@ -12,9 +12,7 @@
                     }
                   ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -125,4 +123,4 @@
                 </tr>
             </table>
         </form>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html
index 365a816f..0dcac926 100644
--- a/web/templates/admin/list_backup.html
+++ b/web/templates/admin/list_backup.html
@@ -32,11 +32,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html
index 2c721ba7..cabcec76 100644
--- a/web/templates/admin/list_backup_detail.html
+++ b/web/templates/admin/list_backup_detail.html
@@ -30,11 +30,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -397,4 +393,4 @@
           </div>
         </div>
       </div>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/admin/list_backup_exclusions.html b/web/templates/admin/list_backup_exclusions.html
index d9de3763..2593510f 100644
--- a/web/templates/admin/list_backup_exclusions.html
+++ b/web/templates/admin/list_backup_exclusions.html
@@ -29,11 +29,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html
index c05aa8ed..4ec2de21 100644
--- a/web/templates/admin/list_cron.html
+++ b/web/templates/admin/list_cron.html
@@ -51,11 +51,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block() ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -79,8 +75,8 @@
           }
       ?>
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['CRON'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="cron" 
-sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>" 
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['CRON'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="cron"
+sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>"
 sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo '0';  ?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html
index 4e5e5140..63fdcae1 100644
--- a/web/templates/admin/list_db.html
+++ b/web/templates/admin/list_db.html
@@ -72,11 +72,7 @@
           </table>
           <!--  -->
         </div>
-
       </div>
-
-      <? display_error_block() ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -109,8 +105,8 @@
       ?>
 
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['DB'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="db" 
-sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>" 
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['DB'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="db"
+sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>"
 sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" sort-star="<? if($_SESSION['favourites']['DB'][$key] == 1) echo '1'; else echo '0'; ?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html
index 7f25b0d3..649e3073 100644
--- a/web/templates/admin/list_dns.html
+++ b/web/templates/admin/list_dns.html
@@ -42,11 +42,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -69,8 +65,8 @@
           }
       ?>
 
-      <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['DNS'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" 
-v_section="dns" sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" 
+      <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['DNS'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>"
+v_section="dns" sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>"
 sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$key]['RECORDS']?>" sort-star="<?if($_SESSION['favourites']['DNS'][$key] == 1) echo '1'; else echo '0';?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html
index e4b55877..00b7be54 100644
--- a/web/templates/admin/list_dns_rec.html
+++ b/web/templates/admin/list_dns_rec.html
@@ -32,11 +32,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
diff --git a/web/templates/admin/list_firewall.html b/web/templates/admin/list_firewall.html
index 73990d58..ab24069a 100644
--- a/web/templates/admin/list_firewall.html
+++ b/web/templates/admin/list_firewall.html
@@ -45,11 +45,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -72,8 +68,8 @@
           }
       ?>
 
-      <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['FIREWALL'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="firewall" 
-sort-action="<?=$data[$key]['ACTION']?>" sort-protocol="<?=$data[$key]['PROTOCOL']?>" sort-port="<?=$data[$key]['PORT']?>" 
+      <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['FIREWALL'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="firewall"
+sort-action="<?=$data[$key]['ACTION']?>" sort-protocol="<?=$data[$key]['PROTOCOL']?>" sort-port="<?=$data[$key]['PORT']?>"
 sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$key]['COMMENT']?>" sort-star="<? if($_SESSION['favourites']['FIREWALL'][$key] == 1) echo '1'; else echo '2'; ?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
diff --git a/web/templates/admin/list_firewall_banlist.html b/web/templates/admin/list_firewall_banlist.html
index ae6f835d..40193198 100644
--- a/web/templates/admin/list_firewall_banlist.html
+++ b/web/templates/admin/list_firewall_banlist.html
@@ -30,11 +30,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -47,7 +43,7 @@
         foreach ($data as $key => $value) {
           ++$i;
           list($ip,$chain) = explode(":",$key);
-          
+
       ?>
 
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended';?>">
diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html
index ada609a2..1875f7bb 100644
--- a/web/templates/admin/list_ip.html
+++ b/web/templates/admin/list_ip.html
@@ -42,11 +42,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
diff --git a/web/templates/admin/list_log.html b/web/templates/admin/list_log.html
index cc9011e2..34a676c6 100644
--- a/web/templates/admin/list_log.html
+++ b/web/templates/admin/list_log.html
@@ -14,9 +14,6 @@
           </table>
         </div>
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html
index 27285db5..21a68ef5 100644
--- a/web/templates/admin/list_mail.html
+++ b/web/templates/admin/list_mail.html
@@ -50,11 +50,7 @@
           </table>
           <!--  -->
         </div>
-
       </div>
-
-      <? display_error_block() ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -86,8 +82,8 @@
       ?>
 
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['MAIL'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="mail" 
-sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>" 
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['MAIL'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="mail"
+sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>"
 sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favourites']['MAIL'][$key] == 1) echo "1"; else echo "0"; ?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
index 9607d127..28e1f90b 100644
--- a/web/templates/admin/list_mail_acc.html
+++ b/web/templates/admin/list_mail_acc.html
@@ -49,11 +49,7 @@
           </table>
           <!--  -->
         </div>
-
       </div>
-
-      <? display_error_block() ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -83,7 +79,7 @@
 
 
       <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] == 1) echo ' l-unit--starred'; ?>"
- v_unit_id="<?=$key."@".$_GET['domain']?>" v_section="mail_acc" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?$data[$key]['U_DISK']?>" 
+ v_unit_id="<?=$key."@".$_GET['domain']?>" v_section="mail_acc" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?$data[$key]['U_DISK']?>"
 sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] == 1) echo '1'; else echo '0'; ?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html
index d06f0608..1812bd84 100644
--- a/web/templates/admin/list_packages.html
+++ b/web/templates/admin/list_packages.html
@@ -37,11 +37,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -56,8 +52,8 @@
       ?>
 
 
-      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_SESSION['favourites']['PACKAGE'][$key] == 1) echo ' l-unit--starred'; ?>" 
-v_unit_id="<?=$key?>" v_section="package" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" 
+      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_SESSION['favourites']['PACKAGE'][$key] == 1) echo ' l-unit--starred'; ?>"
+v_unit_id="<?=$key?>" v_section="package" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>"
 sort-star="<?if($_SESSION['favourites']['PACKAGE'][$key] == 1) echo '1'; else echo '0'; ?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
diff --git a/web/templates/admin/list_rrd.html b/web/templates/admin/list_rrd.html
index 756193fb..9245ada4 100644
--- a/web/templates/admin/list_rrd.html
+++ b/web/templates/admin/list_rrd.html
@@ -41,11 +41,7 @@
             </tr>
           </table>
         </div -->
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -115,4 +111,4 @@
         <div class="l-separator"></div>
     <div class="l-center">
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/web/templates/admin/list_search.html b/web/templates/admin/list_search.html
index 3db736d3..6aa243e9 100644
--- a/web/templates/admin/list_search.html
+++ b/web/templates/admin/list_search.html
@@ -23,9 +23,6 @@
           </table>
         </div>
       </div>
-
-      <? display_error_block() ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -75,29 +72,9 @@
                 if ($key == $user) {
             ?>
                   <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
-                <?
-                  if (!empty($_SESSION['look_alert'])) {
-                ?>
-                    <script type="text/javascript">
-                      $(function() {
-                        $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                        $( "#dialog-message" ).dialog({
-                          modal: true,
-                          buttons: {
-                            Ok: function() {
-                              $( this ).dialog( "close" );
-                            },
-                          }
-                        });
-                      });
-                    </script>
-                    <div id="dialog-message" title="<?=__('Welcome')?>">
-                      <p class="confirmation"><?=__('LOGGED_IN_AS',$key)?></p>
-                    </div>
-                    <?
-                      unset($_SESSION['look_alert']);
-                  }
-                } else { ?>
+<?php
+                } else {
+?>
                   <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/login/?loginas=<?=$data[$key]['USER']?>&token=<?=$_SESSION['token']?>""><?=__('login as')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
             <?  }
               }
diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html
index aa85671c..0be6efe4 100644
--- a/web/templates/admin/list_services.html
+++ b/web/templates/admin/list_services.html
@@ -36,9 +36,6 @@
           </table>
         </div>
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
diff --git a/web/templates/admin/list_ssl.html b/web/templates/admin/list_ssl.html
index aa2addf9..41541904 100644
--- a/web/templates/admin/list_ssl.html
+++ b/web/templates/admin/list_ssl.html
@@ -12,9 +12,7 @@
                     }
                   ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -84,4 +82,4 @@
                 </tr>
             </table>
         </form>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/admin/list_stats.html b/web/templates/admin/list_stats.html
index 46bd11a3..bc3192d2 100644
--- a/web/templates/admin/list_stats.html
+++ b/web/templates/admin/list_stats.html
@@ -37,11 +37,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -265,4 +261,4 @@
           </div>
       </div>
     </div>
-  </div>
\ No newline at end of file
+  </div>
diff --git a/web/templates/admin/list_updates.html b/web/templates/admin/list_updates.html
index 86e3c96c..4529dc24 100644
--- a/web/templates/admin/list_updates.html
+++ b/web/templates/admin/list_updates.html
@@ -35,11 +35,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index ae0651af..d52d80986 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -54,11 +54,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -81,8 +77,8 @@
           }
       ?>
 
-      <div class="l-unit  <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['USER'][$key] == 1) echo ' l-unit--starred';?>" v_section="user" 
-v_unit_id="<?=$key?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" 
+      <div class="l-unit  <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['USER'][$key] == 1) echo ' l-unit--starred';?>" v_section="user"
+v_unit_id="<?=$key?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>"
 sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<? if($_SESSION['favourites']['USER'][$key] == 1) echo '1'; else echo '0'; ?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
@@ -96,38 +92,9 @@ sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DI
               if ($key == $user) {
             ?>
                 <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
-              <?
-                if (!empty($_SESSION['look_alert'])) {
-              ?>
-                  <script type="text/javascript">
-                    $(function() {
-                      $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                      $( "#dialog-message" ).dialog({
-                        modal: true,
-                        buttons: {
-                          Ok: function() {
-                            $( this ).dialog( "close" );
-                          },
-                        },
-                        create:function () {
-                            $(this).closest(".ui-dialog")
-                                .find(".ui-button:first")
-                                .addClass("submit");
-                            $(this).closest(".ui-dialog")
-                                .find(".ui-button")
-                                .eq(1) // the first button
-                                .addClass("cancel");
-                            }
-                      });
-                    });
-                  </script>
-                  <div id="dialog-message" title="<?=__('Welcome')?>">
-                    <p class="confirmation"><?=__('LOGGED_IN_AS',$key)?></p>
-                  </div>
-                  <?
-                    unset($_SESSION['look_alert']);
-                }
-              } else { ?>
+<?php
+              } else {
+?>
                 <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>""><?=__('login as').' '.$key?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
               <?}?>
               <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html
index 7f610b1a..94556eb5 100644
--- a/web/templates/admin/list_web.html
+++ b/web/templates/admin/list_web.html
@@ -38,16 +38,13 @@
                   </select>
                 </div>
                 <input type="submit" class="l-sort-toolbar__filter-apply" value=""/>
-                </div>
               </td>
             </tr>
           </table>
           <!--  -->
         </div>
+        <!-- /.l-sort -->
       </div>
-      <? display_error_block() ?>
-
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
@@ -120,9 +117,9 @@
                         }
                     ?>
 
-      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_SESSION['favourites']['WEB'][$key] == 1) echo ' l-unit--starred'; ?>" v_section="web" v_unit_id="<?=$key?>" 
-id="web-unit-<?=$i?>"  sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" 
-sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" 
+      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_SESSION['favourites']['WEB'][$key] == 1) echo ' l-unit--starred'; ?>" v_section="web" v_unit_id="<?=$key?>"
+id="web-unit-<?=$i?>"  sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>"
+sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>"
 sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<? if($_SESSION['WEB'][$key] == 1) echo '1'; else echo '0';?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
@@ -210,7 +207,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
                   </div>
                 </td>
                 <td>
-                  <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?> 
+                  <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
                   <? if($proxy_support == 'no'){ ?>
                     <div class="l-unit__stat-cols clearfix disabled last"><?=__('Proxy Support')?></div>
                   <? } else {?>
@@ -222,7 +219,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
                     </div>
                   <? } ?>
                   <? } ?>
-                  <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?> 
+                  <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
                   <? if($backend_support == 'no'){ ?>
                     <div class="l-unit__stat-cols clearfix disabled last"><?=__('Backend Support')?></div>
                   <? } else {?>
@@ -251,7 +248,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
                   <? } ?>
                 </td>
                 <td>
-                  <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?> 
+                  <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
                   <div class="l-unit__stat-cols clearfix last">
                     <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Proxy Template')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
@@ -259,7 +256,7 @@ sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
                     </div>
                   </div>
                   <? } ?>
-                  <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?> 
+                  <?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
                   <div class="l-unit__stat-cols clearfix last">
                     <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Backend Template')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
diff --git a/web/templates/footer.html b/web/templates/footer.html
index b67ab41b..a98c6d1b 100644
--- a/web/templates/footer.html
+++ b/web/templates/footer.html
@@ -1,49 +1,103 @@
+<?php
+    // Insert script elements if it isn't loaded yet
+    insert_scripts();
+?>
+  </div>
+
+  <script>
+    $(function() {
+      hover_menu();
+    });
+  </script>
+
+<?php
+// Dialogs
+// todo: display all the dialogs?
+
+if (!empty($_SESSION['look_alert'])):
+?>
+  <script>
+    $(function() {
+      $('#dialog:ui-dialog').dialog('destroy');
+      $('#dialog-message').dialog({
+        modal: true,
+        buttons: {
+          Ok: function() {
+            $(this).dialog('close');
+          }
+        }
+      });
+    });
+  </script>
+  <div id="dialog-message" title="<?=__('Welcome')?>">
+    <p class="confirmation"><?=__('LOGGED_IN_AS', $_SESSION['look'])?></p>
+  </div>
+<?php
+  unset($_SESSION['look_alert']);
+elseif (!empty($_SESSION['error_msg'])):
+?>
+  <div>
+    <script>
+      $(function() {
+        $('#dialog:ui-dialog').dialog('destroy');
+        $('#dialog-message').dialog({
+          modal: true,
+          buttons: {
+            Ok: function() {
+              $(this).dialog('close');
+            }
+          },
+          create: function() {
+            $(this)
+            .closest('.ui-dialog')
+            .find('.ui-button:first')
+            .addClass('submit');
+          }
+        });
+      });
+    </script>
+    <div id="dialog-message" title="">
+      <p><?=htmlentities($_SESSION['error_msg'])?></p>
     </div>
-    <script type="text/javascript" src="/js/jquery-1.7.2.min.js?1446554103"></script>
-    <script type="text/javascript" src="/js/jquery.cookie.js?1446554103"></script>
-    <script type="text/javascript" src="/js/jquery-ui-1.8.20.custom.min.js?1467113876"></script>
-    <script type="text/javascript" src="/js/hotkeys.js?1446554103"></script>
-    <script type="text/javascript" src="/js/events.js?1446554103"></script>
-    <script type="text/javascript" src="/js/app.js?1446554103"></script>
-    <script type="text/javascript" src="/js/templates.js?1446554103"></script>
-    <script src="/js/jquery.finder.js"></script>
+  </div>
+<?php
+  unset($_SESSION['error_msg']);
+endif;
+?>
 
-    <script> 
-    $(document).ready(function(){ hover_menu(); }); </script>
+  <div title="Confirmation" class="confirmation-text-redirect hidden">
+    <p class="confirmation"><?=__('LEAVE_PAGE_CONFIRMATION')?></p>
+  </div>
 
-    <div title="Confirmation" class="confirmation-text-redirect hidden">
-      <p class="confirmation"><?=__('LEAVE_PAGE_CONFIRMATION')?></p>
+  <div class="shortcuts" style="display:none">
+    <div class="header">
+      <div class="title">Shortcuts</div>
+      <div class="close"></div>
     </div>
+    <ul>
+      <li><span class="key">a</span><?=__('Add New object')?></li>
+      <li><span class="key">Ctrl + Enter</span><?=__('Save Form')?></li>
+      <li><span class="key">Ctrl + Backspace</span><?=__('Cancel saving form')?></li>
 
-    <div class="shortcuts" style="display:none">
-      <div class="header">
-        <div class="title">Shortcuts</div>
-        <div class="close"></div>
-      </div>
-      <ul>
-        <li><span class="key">a</span><?=__('Add New object')?></li>
-        <li><span class="key">Ctrl + Enter</span><?=__('Save Form')?></li>
-        <li><span class="key">Ctrl + Backspace</span><?=__('Cancel saving form')?></li>
+      <li class="step-top"><span class="key">1</span><?=__('Go to USER list')?></li>
+      <li><span class="key">2</span><?=__('Go to WEB list')?></li>
+      <li><span class="key">3</span><?=__('Go to DNS list')?></li>
+      <li><span class="key">4</span><?=__('Go to MAIL list')?></li>
+      <li><span class="key">5</span><?=__('Go to DB list')?></li>
+      <li><span class="key">6</span><?=__('Go to CRON list')?></li>
+      <li><span class="key">7</span><?=__('Go to BACKUP list')?></li>
+    </ul>
+    <ul>
+      <li><span class="key">f</span><?=__('Focus on search')?></li>
+      <li class="step-top"><span class="key">h</span><?=__('Display/Close shortcuts')?></li>
 
-        <li class="step-top"><span class="key">1</span><?=__('Go to USER list')?></li>
-        <li><span class="key">2</span><?=__('Go to WEB list')?></li>
-        <li><span class="key">3</span><?=__('Go to DNS list')?></li>
-        <li><span class="key">4</span><?=__('Go to MAIL list')?></li>
-        <li><span class="key">5</span><?=__('Go to DB list')?></li>
-        <li><span class="key">6</span><?=__('Go to CRON list')?></li>
-        <li><span class="key">7</span><?=__('Go to BACKUP list')?></li>
-      </ul>
-      <ul>
-        <li><span class="key">f</span><?=__('Focus on search')?></li>
-        <li class="step-top"><span class="key">h</span><?=__('Display/Close shortcuts')?></li>
+      <li class="step-top"><span class="key bigger">&larr;</span><?=__('Move backward through top menu')?></li>
+      <li><span class="key bigger">&rarr;</span><?=__('Move forward through top menu')?></li>
+      <li><span class="key">Enter</span><?=__('Enter focused element')?></li>
 
-        <li class="step-top"><span class="key bigger">&larr;</span><?=__('Move backward through top menu')?></li>
-        <li><span class="key bigger">&rarr;</span><?=__('Move forward through top menu')?></li>
-        <li><span class="key">Enter</span><?=__('Enter focused element')?></li>
-
-        <li class="step-top"><span class="key bigger">&uarr;</span><?=__('Move up through elements list')?></li>
-        <li><span class="key bigger">&darr;</span><?=__('Move down through elements list')?></li>
-      </ul>
-    </div>
-    </body>
+      <li class="step-top"><span class="key bigger">&uarr;</span><?=__('Move up through elements list')?></li>
+      <li><span class="key bigger">&darr;</span><?=__('Move down through elements list')?></li>
+    </ul>
+  </div>
+</body>
 </html>
diff --git a/web/templates/scripts.html b/web/templates/scripts.html
new file mode 100644
index 00000000..723bc3ca
--- /dev/null
+++ b/web/templates/scripts.html
@@ -0,0 +1,8 @@
+    <script src="/js/jquery-1.7.2.min.js?1446554103"></script>
+    <script src="/js/jquery.cookie.js?1446554103"></script>
+    <script src="/js/jquery-ui-1.8.20.custom.min.js?1467113876"></script>
+    <script src="/js/hotkeys.js?1446554103"></script>
+    <script src="/js/events.js?1446554103"></script>
+    <script src="/js/app.js?1446554103"></script>
+    <script src="/js/templates.js?1446554103"></script>
+    <script src="/js/jquery.finder.js"></script>
diff --git a/web/templates/user/edit_dns.html b/web/templates/user/edit_dns.html
index d49c3330..dc55fa24 100644
--- a/web/templates/user/edit_dns.html
+++ b/web/templates/user/edit_dns.html
@@ -12,9 +12,7 @@
               }
             ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -112,4 +110,4 @@
                 </tr>
             </table>
         </form>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/user/edit_user.html b/web/templates/user/edit_user.html
index 66600bd9..9caa9503 100644
--- a/web/templates/user/edit_user.html
+++ b/web/templates/user/edit_user.html
@@ -12,9 +12,7 @@
               }
             ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -32,18 +30,7 @@
         <form id="vstobjects" method="post" name="v_edit_user"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
-            <script type="text/javascript">
-                function randomString() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var randomstring = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        randomstring += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_edit_user.v_password.value = randomstring;
-                }
-            </script>
+
             <table class='data'>
                 <tr class="data-add">
                     <td class="data-dotted">
@@ -109,7 +96,7 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -232,33 +219,46 @@
             </table>
         </form>
     </div>
-        <script type="text/javascript">
-            $(document).ready(function(){
-                $('.add-ns-button').click(function(){
-                  var n = $("input[name^=v_ns]").length;
-                  if(n < 8){
-                    var t = $($('input[name=v_ns1]').parents('tr')[0]).clone(true, true);
-                    t.find('input').attr({value:'', name:'v_ns'+(n+1)});
-                    t.find('span').show();
-                    $('tr.add-ns').before(t);
-                  }
-                  if( n == 7 ) {
-                    $('.add-ns').hide();
-                  }
-                });
 
-                $('.remove-ns').click(function(){
-                    $(this).parents('tr')[0].remove();
-                    $('input[name^=v_ns]').each(function(i, ns){
-                        $(ns).attr({name: 'v_ns'+(i+1)});
-                        i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
-                    })
-                    $('.add-ns').show()
-                })
+<?php insert_scripts(); ?>
+    <script>
+      function randomString() {
+        var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
+        var string_length = 10;
+        var randomstring = '';
+        for (var i = 0; i < string_length; i++) {
+          var rnum = Math.floor(Math.random() * chars.length);
+          randomstring += chars.substr(rnum, 1);
+        }
+        document.v_edit_user.v_password.value = randomstring;
+      }
 
-                $('input[name^=v_ns]').each(function(i, ns){
-                  i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
-                })
+      $(document).ready(function(){
+        $('.add-ns-button').click(function(){
+          var n = $('input[name^=v_ns]').length;
+          if(n < 8){
+          var t = $($('input[name=v_ns1]').parents('tr')[0]).clone(true, true);
+          t.find('input').attr({value:'', name:'v_ns'+(n+1)});
+          t.find('span').show();
+          $('tr.add-ns').before(t);
+          }
+          if( n == 7 ) {
+          $('.add-ns').hide();
+          }
+        });
 
-            });
-        </script>
+        $('.remove-ns').click(function(){
+          $(this).parents('tr')[0].remove();
+          $('input[name^=v_ns]').each(function(i, ns){
+            $(ns).attr({name: 'v_ns'+(i+1)});
+            i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
+          });
+          $('.add-ns').show();
+        });
+
+        $('input[name^=v_ns]').each(function(i, ns){
+          i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
+        });
+
+      });
+    </script>
diff --git a/web/templates/user/edit_web.html b/web/templates/user/edit_web.html
index 878e9140..a40fe88e 100644
--- a/web/templates/user/edit_web.html
+++ b/web/templates/user/edit_web.html
@@ -12,9 +12,7 @@
               }
             ?>
         </div>
-
       </div>
-      <? display_error_block() ?>
     </div>
 
     <div class="l-separator"></div>
@@ -32,40 +30,7 @@
         <form id="vstobjects" name="v_edit_web" method="post"  class="<?=$v_status?>">
             <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
             <input type="hidden" name="save" value="save" />
-            <script language="javascript">
-                function WEBrandom() {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var webrandom = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        webrandom += chars.substring(rnum,rnum+1);
-                    }
-                    document.v_edit_web.v_stats_password.value = webrandom;
-                }
 
-                function FTPrandom(elm) {
-                    var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-                    var string_length = 10;
-                    var ftprandomstring = '';
-                    for (var i=0; i<string_length; i++) {
-                        var rnum = Math.floor(Math.random() * chars.length);
-                        ftprandomstring += chars.substring(rnum,rnum+1);
-                    }
-
-                    $(elm).parents('.ftptable').find('.v-ftp-user-psw').val(ftprandomstring);
-                    App.Actions.WEB.randomPasswordGenerated && App.Actions.WEB.randomPasswordGenerated(elm);
-                }
-
-                function elementHideShow(elementToHideOrShow){
-                    var el = document.getElementById(elementToHideOrShow);
-                    if (el.style.display == "block") {
-                        el.style.display = "none";
-                    } else {
-                        el.style.display = "block";
-                    }
-                }
-            </script>
             <table class='data'>
                 <tr class="data-add">
                     <td class="data-dotted">
@@ -124,7 +89,7 @@
                                     <textarea size="20" class="vst-textinput" name="v_aliases"><?php if (!empty($v_aliases)) echo htmlentities($v_aliases);  ?></textarea>
                                 </td>
                             </tr>
-                            <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?> 
+                            <?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
                             <tr>
                                 <td class="vst-text step-top">
                                     <label><input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');"> <?php print __('Proxy Support');?></label>
@@ -146,7 +111,7 @@
                                     </table>
                                 </td>
                             </tr>
-                            <?php echo ""; }?> 
+                            <?php echo ""; }?>
                             <tr>
                                 <td class="vst-text step-top">
                                     <label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label> /
@@ -176,7 +141,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text input-label">
-                                                <?php print __('SSL Certificate');?> 
+                                                <?php print __('SSL Certificate');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -225,7 +190,7 @@
                                                 }
                                             echo ">". htmlentities(__($value)) ."</option>\n";
                                             }
-                                    ?> 
+                                    ?>
                                     </select>
                                 </td>
                             </tr>
@@ -359,7 +324,7 @@
 
         <div id="templates" class="hidden">
             <table class="ftptable ftptable-nrm" name="v_add_domain_ftp">
-                <tr> 
+                <tr>
                     <td class="vst-text input-label">
                         <?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?=__('delete')?>)</a>
                         <input type="hidden"  class="v-ftp-user-deleted" name="v_ftp_user[%INDEX%][delete]" value="0" />
@@ -414,16 +379,47 @@
         </table>
         </div>
     </div>
-        <script type="text/javascript">
-            GLOBAL.FTP_USER_PREFIX = '<?php echo $user; ?>_';
-            $('#vstobjects').bind('submit', function(evt) {
-                $('input[disabled]').each(function(i, elm) {
-                    var copy_elm = $(elm).clone(true);
-                    $(copy_elm).attr('type', 'hidden');
-                    $(copy_elm).removeAttr('disabled');
-                    $(elm).after(copy_elm);
-                });
-            });
-        </script>
-        <script type="text/javascript" src="/js/pages/edit.web.js"></script>
 
+<?php insert_scripts(); ?>
+    <script>
+      function WEBrandom() {
+        var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
+        var string_length = 10;
+        var webrandom = '';
+        for (var i = 0; i < string_length; i++) {
+          var rnum = Math.floor(Math.random() * chars.length);
+          webrandom += chars.substr(rnum, 1);
+        }
+        document.v_edit_web.v_stats_password.value = webrandom;
+      }
+
+      function FTPrandom(elm) {
+        var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz';
+        var string_length = 10;
+        var webrandom = '';
+        for (var i = 0; i < string_length; i++) {
+          var rnum = Math.floor(Math.random() * chars.length);
+          webrandom += chars.substr(rnum, 1);
+        }
+
+        $(elm).parents('.ftptable').find('.v-ftp-user-psw').val(ftprandomstring);
+        App.Actions.WEB.randomPasswordGenerated && App.Actions.WEB.randomPasswordGenerated(elm);
+      }
+
+      function elementHideShow(elementToHideOrShow){
+        var el = document.getElementById(elementToHideOrShow);
+        el.style.display = el.style.display === 'none' ? 'block' : 'none';
+      }
+
+      $('#vstobjects').bind('submit', function(evt) {
+        $('input[disabled]').each(function(i, elm) {
+          var copy_elm = $(elm).clone(true);
+          $(copy_elm).attr('type', 'hidden');
+          $(copy_elm).removeAttr('disabled');
+          $(elm).after(copy_elm);
+        });
+      });
+
+      GLOBAL.FTP_USER_PREFIX = <?=json_encode($user.'_')?>;
+    </script>
+    <script src="/js/pages/edit.web.js"></script>
diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html
index 757725ad..568d045c 100644
--- a/web/templates/user/list_cron.html
+++ b/web/templates/user/list_cron.html
@@ -49,11 +49,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block() ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -78,7 +74,7 @@
       ?>
 
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites'][CRON][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="cron" 
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites'][CRON][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="cron"
 sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>" sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo '0'; ?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html
index 2a80f7ab..f4e13f29 100644
--- a/web/templates/user/list_db.html
+++ b/web/templates/user/list_db.html
@@ -71,11 +71,7 @@
           </table>
           <!--  -->
         </div>
-
       </div>
-
-      <? display_error_block() ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -108,8 +104,8 @@
       ?>
 
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['DB'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="db" 
-sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>" 
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['DB'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="db"
+sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>"
 sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" sort-star="<? if($_SESSION['favourites']['DB'][$key] == 1) echo '1'; else echo '0'; ?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html
index ce5c12a5..22dcbc55 100644
--- a/web/templates/user/list_dns.html
+++ b/web/templates/user/list_dns.html
@@ -41,11 +41,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -68,8 +64,8 @@
           }
       ?>
 
-      <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['DNS'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="dns" 
-sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" 
+      <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['DNS'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="dns"
+sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>"
 sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$key]['RECORDS']?>" sort-star="<? if($_SESSION['favourites']['DNS'][$key] == 1) echo '1'; else echo '0';?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html
index 2cf428a4..71b15abd 100644
--- a/web/templates/user/list_dns_rec.html
+++ b/web/templates/user/list_dns_rec.html
@@ -30,11 +30,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html
index 09afc610..2d3dd836 100644
--- a/web/templates/user/list_mail.html
+++ b/web/templates/user/list_mail.html
@@ -48,11 +48,7 @@
           </table>
           <!--  -->
         </div>
-
       </div>
-
-      <? display_error_block() ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -84,8 +80,8 @@
       ?>
 
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['MAIL'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="mail" 
-sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>" 
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['MAIL'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="mail"
+sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>"
 sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favourites']['MAIL'][$key] == 1) echo '1'; else echo '0'; ?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html
index 70bc38dc..a7ff6e7a 100644
--- a/web/templates/user/list_mail_acc.html
+++ b/web/templates/user/list_mail_acc.html
@@ -47,11 +47,7 @@
           </table>
           <!--  -->
         </div>
-
       </div>
-
-      <? display_error_block() ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -81,8 +77,8 @@
       ?>
 
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key."@".$_GET['domain']?>" v_section="mail_acc" 
-sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?$data[$key]['U_DISK']?>" 
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key."@".$_GET['domain']?>" v_section="mail_acc"
+sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?$data[$key]['U_DISK']?>"
 sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] == 1) echo '1'; else echo '0'; ?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
diff --git a/web/templates/user/list_search.html b/web/templates/user/list_search.html
index a8909b29..889cd094 100644
--- a/web/templates/user/list_search.html
+++ b/web/templates/user/list_search.html
@@ -23,9 +23,6 @@
           </table>
         </div>
       </div>
-
-      <? display_error_block() ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -74,29 +71,9 @@
                 if ($key == $user) {
             ?>
                   <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
-                <?
-                  if (!empty($_SESSION['look_alert'])) {
-                ?>
-                    <script type="text/javascript">
-                      $(function() {
-                        $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                        $( "#dialog-message" ).dialog({
-                          modal: true,
-                          buttons: {
-                            Ok: function() {
-                              $( this ).dialog( "close" );
-                            },
-                          }
-                        });
-                      });
-                    </script>
-                    <div id="dialog-message" title="<?=__('Welcome')?>">
-                      <p class="confirmation"><?=__('LOGGED_IN_AS',$key)?></p>
-                    </div>
-                    <?
-                      unset($_SESSION['look_alert']);
-                  }
-                } else { ?>
+<?php
+                } else {
+ ?>
                   <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/login/?loginas=<?=$data[$key]['USER']?>&token=<?=$_SESSION['token']?>""><?=__('login as')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
             <?  }
               }
@@ -235,4 +212,4 @@
           </div>
         </div>
       </div>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/user/list_stats.html b/web/templates/user/list_stats.html
index dc9419b4..aa70d794 100644
--- a/web/templates/user/list_stats.html
+++ b/web/templates/user/list_stats.html
@@ -37,11 +37,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -268,4 +264,4 @@
           </div>
       </div>
     </div>
-  </div>
\ No newline at end of file
+  </div>
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html
index e71d286a..3087bc65 100644
--- a/web/templates/user/list_user.html
+++ b/web/templates/user/list_user.html
@@ -52,11 +52,7 @@
             </tr>
           </table>
         </div>
-
       </div>
-
-      <? display_error_block(); ?>
-
       <!-- /.l-sort -->
     </div>
 
@@ -79,8 +75,8 @@
           }
       ?>
 
-      <div class="l-unit  <? if($status == 'suspended') echo 'l-unit--suspended';  if($_SESSION['favourites']['USER'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="user" 
-sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" 
+      <div class="l-unit  <? if($status == 'suspended') echo 'l-unit--suspended';  if($_SESSION['favourites']['USER'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="user"
+sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>"
 sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<?if($_SESSION['favourites']['USER'][$key] == 1) echo '1'; else echo '0'; ?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
@@ -94,38 +90,9 @@ sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<?if($_SESSION['favourites']['
               if ($key == $user) {
             ?>
                 <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/logout"><?=__('logout')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
-              <?
-                if (!empty($_SESSION['look_alert'])) {
-              ?>
-                  <script type="text/javascript">
-                    $(function() {
-                      $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                      $( "#dialog-message" ).dialog({
-                        modal: true,
-                        buttons: {
-                          Ok: function() {
-                            $( this ).dialog( "close" );
-                          },
-                        },
-                        create:function () {
-                          $(this).closest(".ui-dialog")
-                            .find(".ui-button:first")
-                            .addClass("submit");
-                          $(this).closest(".ui-dialog")
-                            .find(".ui-button")
-                            .eq(1) // the first button
-                            .addClass("cancel");
-                        }
-                      });
-                    });
-                  </script>
-                  <div id="dialog-message" title="<?=__('Welcome')?>">
-                    <p class="confirmation"><?=__('LOGGED_IN_AS',$key)?></p>
-                  </div>
-                  <?
-                    unset($_SESSION['look_alert']);
-                }
-              } else { ?>
+<?php
+              } else {
+?>
                 <div class="actions-panel__col actions-panel__loginas shortcut-l" key-action="href"><a href="/login/?loginas=<?=$key?>""><?=__('login as')?> <i></i></a><span class="shortcut">&nbsp;L</span></div>
               <?}?>
               <div class="actions-panel__col actions-panel__edit shortcut-enter" key-action="href"><a href="/edit/user/?user=<?=$key?>"><?=__('edit')?> <i></i></a><span class="shortcut enter">&nbsp;&#8629;</span></div>
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html
index 9f08d0ab..fefe74d1 100644
--- a/web/templates/user/list_web.html
+++ b/web/templates/user/list_web.html
@@ -36,18 +36,13 @@
                   </select>
                 </div>
                 <input type="submit" class="l-sort-toolbar__filter-apply" value=""/>
-                </div>
               </td>
             </tr>
           </table>
           <!--  -->
         </div>
-
+        <!-- /.l-sort -->
       </div>
-
-      <? display_error_block() ?>
-
-      <!-- /.l-sort -->
     </div>
 
     <div class="l-separator"></div>
@@ -122,8 +117,8 @@
 
 
 
-      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_SESSION['favourites']['WEB'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="web" 
-id="web-unit-<?=$i?>" sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-date="<?=strtotime($data[$key]['DATE'])?>" sort-name="<?=$key?>"  
+      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_SESSION['favourites']['WEB'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="web"
+id="web-unit-<?=$i?>" sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-date="<?=strtotime($data[$key]['DATE'])?>" sort-name="<?=$key?>"
 sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<? if($_SESSION['favourites']['WEB'][$key] == 1) echo '1'; else echo '0'; ?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">