diff --git a/web/add/cron/index.php b/web/add/cron/index.php
index 62cae8f1c..9280f25e3 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, 'admin/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 c64ca42e8..99e532d48 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, 'admin/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 bd890c875..ec9dcbfcf 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, 'admin/add_dns');
+} else {
+    // Display body for dns record
+
+    $v_domain = $_GET['domain'];
+    render_page($user, $TAB, 'admin/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 f0e97042a..25605e1c6 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, 'admin/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 caae650ce..305fee513 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, 'admin/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 5f48a081d..d97f0cde4 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, 'admin/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 12adde125..fcdbbaeba 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, 'admin/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, 'admin/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 f620b4711..849e839cb 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, 'admin/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 26de10209..5b8840793 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, 'admin/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 0be71f635..96ea822c8 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, 'admin/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 8bac32c16..7ab9ba911 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, 'admin/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 12d7e9f02..72a3afc17 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, 'admin/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 29d358f80..9730eb702 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, 'admin/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 6ceac64a5..39fd00a2e 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, 'admin/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 44346d09a..d45232dd1 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, 'admin/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 bec1ae58f..81c429197 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, 'admin/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 28d4da9b5..fc2004f0b 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, 'admin/edit_mail');
+} else {
+    // Display body for mail account
+    render_page($user, $TAB, 'admin/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 e5cc707a1..f8ea92726 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, 'admin/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 073dc97b3..1684410f5 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, 'admin/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 2fbd526a5..3c2288e13 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");
 
 
@@ -185,27 +184,13 @@ 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
+// Render page
 if ($_SESSION['user'] == 'admin') {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_user.html');
+    render_page($user, $TAB, 'admin/edit_user');
 } else {
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/user/edit_user.html');
+    render_page($user, $TAB, 'user/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 e28aa713a..cd6e2a361 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 4cc7180dc..3be7dd619 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, 'admin/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, 'admin/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, 'admin/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, 'admin/list_ssl');
+
 unset($_SESSION['ok_msg']);
diff --git a/web/inc/main.php b/web/inc/main.php
index 4df0ece95..f3f96b872 100644
--- a/web/inc/main.php
+++ b/web/inc/main.php
@@ -95,6 +95,33 @@ function check_return_code($return_var,$output) {
     }
 }
 
+function render_page($user, $TAB, $page) {
+    $__template_dir = dirname(__DIR__) . '/templates/';
+    $__template_base = $__template_dir . str_replace('*', $_SESSION['user'] === 'admin' ? 'admin' : 'user', $page);
+
+    // 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
+    @include($__template_base . '.html');
+
+    // Footer
+    $JS_FILE = $__template_base . '.js.html';
+    include($__template_dir . 'footer.html');
+}
+
 function top_panel($user, $TAB) {
     global $panel;
     $command = VESTA_CMD."v-list-user '".$user."' 'json'";
@@ -107,7 +134,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 +145,7 @@ function top_panel($user, $TAB) {
         }
     }
     unset($output);
-    
+
 
     if ( $user == 'admin' ) {
         include(dirname(__FILE__).'/../templates/admin/panel.html');
diff --git a/web/list/backup/exclusions/index.php b/web/list/backup/exclusions/index.php
index d03e98614..c533129cb 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, 'admin/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 a79205724..b25284eb1 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, 'admin/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, 'admin/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 19f66379c..5461ba0bf 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 4262b61fd..711560029 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 0b9951a7a..88bd8bf53 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 32393229c..a4964ef35 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, 'admin/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 62b8cbfdd..ea7826d15 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, 'admin/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 510da61aa..9360d5a11 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, 'admin/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 0d3f3b8bd..d5712b2ff 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, 'admin/list_log');
diff --git a/web/list/mail/index.php b/web/list/mail/index.php
index 6555ccbae..1c81ad193 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 1b6a0d1c5..0bc0aa4f9 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($url, $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 61e44c179..d2cfb881d 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, 'admin/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 725a584e9..42f389627 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, 'admin/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 97af7f9d2..89b19eb32 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, 'admin/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 ac97d4f22..18d1306f9 100644
--- a/web/list/stats/index.php
+++ b/web/list/stats/index.php
@@ -5,13 +5,7 @@ $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
+// Data & Render page
 if ($user == 'admin') {
     if (empty($_GET['user'])) {
         exec (VESTA_CMD."v-list-users-stats json", $output, $return_var);
@@ -30,17 +24,15 @@ if ($user == 'admin') {
     $users = json_decode(implode('', $output), true);
     unset($output);
 
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_stats.html');
+    render_page($user, $TAB, 'admin/list_stats');
 } 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($user, $TAB, 'user/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 f2c553087..8ead39610 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, 'admin/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 129a78c4a..d32ea6f16 100644
--- a/web/list/user/index.php
+++ b/web/list/user/index.php
@@ -1,37 +1,22 @@
 <?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);
+display_error_block();
+
+// 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 52b0c78e4..59e455d58 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 000000000..e974c40df
--- /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 e885cd7a5..5854df795 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_db.html b/web/templates/admin/add_db.html
index a69a6c140..ff202d33f 100644
--- a/web/templates/admin/add_db.html
+++ b/web/templates/admin/add_db.html
@@ -32,26 +32,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 +49,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Database');?> 
+                                    <?php print __('Database');?>
                                 </td>
                             </tr>
                             <tr>
@@ -79,7 +60,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('User');?> 
+                                    <?php print __('User');?>
                                 </td>
                             </tr>
                             <tr>
@@ -100,7 +81,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Type');?> 
+                                    <?php print __('Type');?>
                                 </td>
                             </tr>
                             <tr>
@@ -112,13 +93,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 +111,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 +164,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>
@@ -207,9 +188,3 @@
             </table>
         </form>
     </div>
-
-    <script type="text/javascript">
-        GLOBAL.DB_USER_PREFIX = '<?php echo $user; ?>_';
-        GLOBAL.DB_DBNAME_PREFIX = '<?php echo $user; ?>_';
-    </script>
-    <script type="text/javascript" src="/js/pages/add.db.js"></script>
diff --git a/web/templates/admin/add_db.js.html b/web/templates/admin/add_db.js.html
new file mode 100644
index 000000000..764f37967
--- /dev/null
+++ b/web/templates/admin/add_db.js.html
@@ -0,0 +1,21 @@
+    <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 src="/js/pages/add.db.js"></script>
diff --git a/web/templates/admin/add_dns.html b/web/templates/admin/add_dns.html
index 564ca5fa1..e559166b0 100644
--- a/web/templates/admin/add_dns.html
+++ b/web/templates/admin/add_dns.html
@@ -32,16 +32,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 +180,3 @@
             </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()
-                })
-
-                $('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.js.html b/web/templates/admin/add_dns.js.html
new file mode 100644
index 000000000..c3fefaadd
--- /dev/null
+++ b/web/templates/admin/add_dns.js.html
@@ -0,0 +1,35 @@
+    <script>
+        function elementHideShow(elementToHideOrShow){
+            var el = document.getElementById(elementToHideOrShow);
+            el.style.display = el.style.display === 'none' ? 'block' : 'none';
+        }
+
+        $(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()
+            })
+
+            $('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 76964b4c1..2e65de4a0 100644
--- a/web/templates/admin/add_dns_rec.html
+++ b/web/templates/admin/add_dns_rec.html
@@ -121,8 +121,3 @@
             </table>
         </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>
diff --git a/web/templates/admin/add_dns_rec.js.html b/web/templates/admin/add_dns_rec.js.html
new file mode 100644
index 000000000..55358442b
--- /dev/null
+++ b/web/templates/admin/add_dns_rec.js.html
@@ -0,0 +1,4 @@
+    <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 de3d63723..c884e85d2 100644
--- a/web/templates/admin/add_firewall.html
+++ b/web/templates/admin/add_firewall.html
@@ -32,16 +32,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 +44,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 +57,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Protocol') ?> 
+                                    <?php print __('Protocol') ?>
                                 </td>
                             </tr>
                             <tr>
@@ -128,4 +118,4 @@
             </table>
         </from>
 
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/admin/add_firewall.js.html b/web/templates/admin/add_firewall.js.html
new file mode 100644
index 000000000..438d2596f
--- /dev/null
+++ b/web/templates/admin/add_firewall.js.html
@@ -0,0 +1,6 @@
+    <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 9c09d8da6..3b1ae2bf9 100644
--- a/web/templates/admin/add_firewall_banlist.html
+++ b/web/templates/admin/add_firewall_banlist.html
@@ -32,16 +32,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 +44,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 +85,4 @@
                 </tr>
             </table>
         </from>
-      </div>
\ No newline at end of file
+      </div>
diff --git a/web/templates/admin/add_firewall_banlist.js.html b/web/templates/admin/add_firewall_banlist.js.html
new file mode 100644
index 000000000..438d2596f
--- /dev/null
+++ b/web/templates/admin/add_firewall_banlist.js.html
@@ -0,0 +1,6 @@
+    <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 43b37d5d2..47ca95dfe 100644
--- a/web/templates/admin/add_ip.html
+++ b/web/templates/admin/add_ip.html
@@ -32,16 +32,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">
diff --git a/web/templates/admin/add_ip.js.html b/web/templates/admin/add_ip.js.html
new file mode 100644
index 000000000..438d2596f
--- /dev/null
+++ b/web/templates/admin/add_ip.js.html
@@ -0,0 +1,6 @@
+    <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_acc.html b/web/templates/admin/add_mail_acc.html
index 2dd8c78d9..2b6333755 100644
--- a/web/templates/admin/add_mail_acc.html
+++ b/web/templates/admin/add_mail_acc.html
@@ -32,53 +32,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 +182,3 @@
     </table>
     </form>
   </div>
-  <script type="text/javascript" src="/js/pages/edit.package.js"></script>
diff --git a/web/templates/admin/add_mail_acc.js.html b/web/templates/admin/add_mail_acc.js.html
new file mode 100644
index 000000000..538b53951
--- /dev/null
+++ b/web/templates/admin/add_mail_acc.js.html
@@ -0,0 +1,46 @@
+    <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 ec4e675c3..d39a5a98b 100644
--- a/web/templates/admin/add_package.html
+++ b/web/templates/admin/add_package.html
@@ -72,11 +72,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 +96,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 +123,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 +147,7 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -170,7 +170,7 @@
                                             }
                                             echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -380,34 +380,3 @@
             </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()
-                })
-
-                $('input[name^=v_ns]').each(function(i, ns){
-                  i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
-                })
-
-            });
-        </script>
\ No newline at end of file
diff --git a/web/templates/admin/add_package.js.html b/web/templates/admin/add_package.js.html
new file mode 100644
index 000000000..b4de83b00
--- /dev/null
+++ b/web/templates/admin/add_package.js.html
@@ -0,0 +1,30 @@
+    <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();
+              }
+            });
+
+            $('.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>
+    <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 7f978c65e..069692c4b 100644
--- a/web/templates/admin/add_user.html
+++ b/web/templates/admin/add_user.html
@@ -34,24 +34,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 +94,7 @@
                                                 }
                                                 echo ">".htmlentities($key)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -188,4 +170,4 @@
                 </tr>
             </table>
         </form>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/admin/add_user.js.html b/web/templates/admin/add_user.js.html
new file mode 100644
index 000000000..4a3e7cb02
--- /dev/null
+++ b/web/templates/admin/add_user.js.html
@@ -0,0 +1,18 @@
+    <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 2a9170291..22b6a1dfa 100644
--- a/web/templates/admin/add_web.html
+++ b/web/templates/admin/add_web.html
@@ -33,44 +33,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 +104,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 +126,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 +204,7 @@
                                             }
                                             echo ">" . htmlentities(__($value)) . "</option>\n";
                                         }
-                                    ?> 
+                                    ?>
                                 </select>
                             </td>
                         </tr>
@@ -428,15 +390,3 @@
         </table>
         </div>
       </div>
-
-
-    <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');
-                });
-            });
-    </script>
-    <script type="text/javascript" src="/js/pages/add.web.js"></script>
diff --git a/web/templates/admin/add_web.js.html b/web/templates/admin/add_web.js.html
new file mode 100644
index 000000000..538a50092
--- /dev/null
+++ b/web/templates/admin/add_web.js.html
@@ -0,0 +1,45 @@
+    <script>
+        $(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.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 src="/js/pages/add.web.js"></script>
diff --git a/web/templates/admin/edit_db.html b/web/templates/admin/edit_db.html
index 296f8bef9..ded1c9b53 100644
--- a/web/templates/admin/edit_db.html
+++ b/web/templates/admin/edit_db.html
@@ -32,26 +32,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 +126,3 @@
             </table>
         </form>
     </div>
-    <script type="text/javascript">
-        GLOBAL.DB_USER_PREFIX = '<?php echo $user; ?>_';
-        GLOBAL.DB_DBNAME_PREFIX = '<?php echo $user; ?>_';
-    </script>
-    <script type="text/javascript" src="/js/pages/edit.db.js"></script>
diff --git a/web/templates/admin/edit_db.js.html b/web/templates/admin/edit_db.js.html
new file mode 100644
index 000000000..ae45fd7fe
--- /dev/null
+++ b/web/templates/admin/edit_db.js.html
@@ -0,0 +1,21 @@
+    <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 src="/js/pages/edit.db.js"></script>
diff --git a/web/templates/admin/edit_firewall.html b/web/templates/admin/edit_firewall.html
index 60a13e164..f95557ace 100644
--- a/web/templates/admin/edit_firewall.html
+++ b/web/templates/admin/edit_firewall.html
@@ -32,16 +32,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 +50,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 +63,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Protocol') ?> 
+                                    <?php print __('Protocol') ?>
                                 </td>
                             </tr>
                             <tr>
@@ -130,4 +120,4 @@
                 </tr>
             </table>
         </form>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/admin/edit_firewall.js.html b/web/templates/admin/edit_firewall.js.html
new file mode 100644
index 000000000..c55772c7e
--- /dev/null
+++ b/web/templates/admin/edit_firewall.js.html
@@ -0,0 +1,6 @@
+    <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 4d013f005..aef5f9929 100644
--- a/web/templates/admin/edit_ip.html
+++ b/web/templates/admin/edit_ip.html
@@ -32,16 +32,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 +50,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 +60,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Netmask');?> 
+                                    <?php print __('Netmask');?>
                                 </td>
                             </tr>
                             <tr>
@@ -80,7 +70,7 @@
                             </tr>
                             <tr>
                                 <td class="vst-text input-label">
-                                    <?php print __('Interface'); ?> 
+                                    <?php print __('Interface'); ?>
                                 </td>
                             </tr>
                             <tr>
@@ -153,4 +143,4 @@
                 </tr>
             </table>
         </form>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/web/templates/admin/edit_ip.js.html b/web/templates/admin/edit_ip.js.html
new file mode 100644
index 000000000..c55772c7e
--- /dev/null
+++ b/web/templates/admin/edit_ip.js.html
@@ -0,0 +1,6 @@
+    <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_acc.html b/web/templates/admin/edit_mail_acc.html
index c4ae09266..b22f2c325 100644
--- a/web/templates/admin/edit_mail_acc.html
+++ b/web/templates/admin/edit_mail_acc.html
@@ -32,26 +32,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 +143,3 @@
         </table>
     </form>
 </div>
-<script type="text/javascript" src="/js/pages/edit.mail_acc.js"></script>
diff --git a/web/templates/admin/edit_mail_acc.js.html b/web/templates/admin/edit_mail_acc.js.html
new file mode 100644
index 000000000..5c71cf16b
--- /dev/null
+++ b/web/templates/admin/edit_mail_acc.js.html
@@ -0,0 +1,18 @@
+    <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 4480fa825..f8519cd17 100644
--- a/web/templates/admin/edit_package.html
+++ b/web/templates/admin/edit_package.html
@@ -72,11 +72,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 +96,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 +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>";?>
@@ -145,7 +145,7 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -381,34 +381,3 @@
             </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()
-                })
-
-                $('input[name^=v_ns]').each(function(i, ns){
-                  i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
-                })
-
-            });
-    </script>
\ No newline at end of file
diff --git a/web/templates/admin/edit_package.js.html b/web/templates/admin/edit_package.js.html
new file mode 100644
index 000000000..ced6604c3
--- /dev/null
+++ b/web/templates/admin/edit_package.js.html
@@ -0,0 +1,31 @@
+    <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();
+              }
+            });
+
+            $('.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>
+    <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 20e494537..b6400e156 100644
--- a/web/templates/admin/edit_server.html
+++ b/web/templates/admin/edit_server.html
@@ -33,16 +33,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 +45,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 +73,7 @@
                                                 }
                                                 echo ">".$value."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                     <br><br>
                                 </td>
@@ -106,7 +97,7 @@
                                                 }
                                                 echo ">".$value."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                     <br><br>
                                 </td>
@@ -121,10 +112,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 +124,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 +136,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 +150,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Backend Pool Mode') ?> 
+                                                <?php print __('Backend Pool Mode') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -169,7 +160,7 @@
                                             </td>
                                         </tr>
 
-                                        <?php } ?> 
+                                        <?php } ?>
                                     </table>
                                 </td>
                             </tr>
@@ -187,7 +178,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 +206,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 +218,7 @@
                                                 <br><br>
                                             </td>
                                         </tr>
-                                        <?php }} ?> 
+                                        <?php }} ?>
                                     </table>
                                 </td>
                             </tr>
@@ -245,7 +236,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 +245,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 +257,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 +270,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 +315,7 @@
                                         <?php if ($v_mysql == 'yes') { ?>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('phpMyAdmin URL') ?> 
+                                                <?php print __('phpMyAdmin URL') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -338,10 +329,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 +343,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text step-left">
-                                                <?php print __('Password') ?> 
+                                                <?php print __('Password') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -364,7 +355,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 +366,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 +375,7 @@
                                                 <br><br><br><br>
                                             </td>
                                         </tr>
-                                        <?php }} ?> 
+                                        <?php }} ?>
 
 
                                         <tr>
@@ -404,7 +395,7 @@
                                         <?php if ($v_pgsql == 'yes') { ?>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('phpPgAdmin URL') ?> 
+                                                <?php print __('phpPgAdmin URL') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -418,10 +409,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 +423,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 +434,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 +443,7 @@
                                                 <br><br><br><br>
                                             </td>
                                         </tr>
-                                        <?php }} ?> 
+                                        <?php }} ?>
                                     </table>
                                 </td>
                             </tr>
@@ -470,7 +461,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 +475,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Compression level') ?> 
+                                                <?php print __('Compression level') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -505,7 +496,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Directory') ?> 
+                                                <?php print __('Directory') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -524,7 +515,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 +529,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text">
-                                                            <?php print __('Host') ?> 
+                                                            <?php print __('Host') ?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -549,7 +540,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text">
-                                                            <?php print __('Username') ?> 
+                                                            <?php print __('Username') ?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -560,7 +551,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text">
-                                                            <?php print __('Password') ?> 
+                                                            <?php print __('Password') ?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -571,7 +562,7 @@
                                                     </tr>
                                                     <tr>
                                                         <td class="vst-text">
-                                                            <?php print __('Directory') ?> 
+                                                            <?php print __('Directory') ?>
                                                         </td>
                                                     </tr>
                                                     <tr>
@@ -599,7 +590,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 +629,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Reseller Role') ?> 
+                                                <?php print __('Reseller Role') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -651,7 +642,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text">
-                                                <?php print __('Backup Migration Manager') ?> 
+                                                <?php print __('Backup Migration Manager') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -690,7 +681,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 +703,7 @@
 
                                         <tr>
                                             <td class="vst-text" id="module-filemanager">
-                                                <?php print __('File Manager') ?> 
+                                                <?php print __('File Manager') ?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -778,23 +769,3 @@
             </table>
         </form>
     </div>
-
-<script>
-    $(document).ready(function(){
-        $('select[name=v_filemanager]').change(function(){
-            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();
-            }
-        });
-     });
-</script>
\ No newline at end of file
diff --git a/web/templates/admin/edit_server.js.html b/web/templates/admin/edit_server.js.html
new file mode 100644
index 000000000..2582fc5c7
--- /dev/null
+++ b/web/templates/admin/edit_server.js.html
@@ -0,0 +1,24 @@
+    <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();
+                }
+            });
+
+            $('select[name=v_sftp]').change(function(){
+                if($(this).val() == 'yes'){
+                    $('.sftp.description').show();
+                } else {
+                    $('.sftp.description').hide();
+                }
+            });
+         });
+    </script>
diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html
index 8717ce3f6..6ccb03f3b 100644
--- a/web/templates/admin/edit_user.html
+++ b/web/templates/admin/edit_user.html
@@ -32,18 +32,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 +95,7 @@
                                                 }
                                                 echo ">".htmlentities($key)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -130,7 +119,7 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -171,7 +160,7 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -264,33 +253,3 @@
             </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()
-                })
-
-                $('input[name^=v_ns]').each(function(i, ns){
-                  i < 2 ? $(ns).parent().find('span').hide() : $(ns).parent().find('span').show();
-                })
-
-            });
-        </script>
\ No newline at end of file
diff --git a/web/templates/admin/edit_user.js.html b/web/templates/admin/edit_user.js.html
new file mode 100644
index 000000000..1b906fc13
--- /dev/null
+++ b/web/templates/admin/edit_user.js.html
@@ -0,0 +1,41 @@
+    <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;
+        }
+
+        $(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();
+            });
+
+            $('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 51822ec78..7ace1abca 100644
--- a/web/templates/admin/edit_web.html
+++ b/web/templates/admin/edit_web.html
@@ -32,40 +32,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 +108,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 +133,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 +167,7 @@
                                                             }
                                                             echo ">".htmlentities($value)."</option>\n";
                                                         }
-                                                    ?> 
+                                                    ?>
                                                 </select>
                                             </td>
                                         </tr>
@@ -217,7 +184,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 +214,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text input-label">
-                                                <?php print __('SSL Certificate');?> 
+                                                <?php print __('SSL Certificate');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -296,7 +263,7 @@
                                                 }
                                             echo ">". htmlentities(__($value)) ."</option>\n";
                                             }
-                                    ?> 
+                                    ?>
                                     </select>
                                 </td>
                             </tr>
@@ -430,7 +397,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 +452,3 @@
         </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>
-
diff --git a/web/templates/admin/edit_web.js.html b/web/templates/admin/edit_web.js.html
new file mode 100644
index 000000000..79e1b235d
--- /dev/null
+++ b/web/templates/admin/edit_web.js.html
@@ -0,0 +1,42 @@
+    <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/footer.html b/web/templates/footer.html
index b67ab41b8..e0bd4dea5 100644
--- a/web/templates/footer.html
+++ b/web/templates/footer.html
@@ -7,9 +7,12 @@
     <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>
-
-    <script> 
-    $(document).ready(function(){ hover_menu(); }); </script>
+    <script>
+      $(document).ready(function(){ hover_menu(); });
+    </script>
+<?php
+    @include($JS_FILE);
+?>
 
     <div title="Confirmation" class="confirmation-text-redirect hidden">
       <p class="confirmation"><?=__('LEAVE_PAGE_CONFIRMATION')?></p>
diff --git a/web/templates/user/edit_user.html b/web/templates/user/edit_user.html
index 66600bd95..80bf0e316 100644
--- a/web/templates/user/edit_user.html
+++ b/web/templates/user/edit_user.html
@@ -32,18 +32,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 +98,7 @@
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
                                             }
-                                        ?> 
+                                        ?>
                                     </select>
                                 </td>
                             </tr>
@@ -232,33 +221,3 @@
             </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()
-                })
-
-                $('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_user.js.html b/web/templates/user/edit_user.js.html
new file mode 100644
index 000000000..1b906fc13
--- /dev/null
+++ b/web/templates/user/edit_user.js.html
@@ -0,0 +1,41 @@
+    <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;
+        }
+
+        $(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();
+            });
+
+            $('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 878e91402..aef2cd674 100644
--- a/web/templates/user/edit_web.html
+++ b/web/templates/user/edit_web.html
@@ -32,40 +32,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 +91,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 +113,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 +143,7 @@
                                         </tr>
                                         <tr>
                                             <td class="vst-text input-label">
-                                                <?php print __('SSL Certificate');?> 
+                                                <?php print __('SSL Certificate');?>
                                             </td>
                                         </tr>
                                         <tr>
@@ -225,7 +192,7 @@
                                                 }
                                             echo ">". htmlentities(__($value)) ."</option>\n";
                                             }
-                                    ?> 
+                                    ?>
                                     </select>
                                 </td>
                             </tr>
@@ -359,7 +326,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 +381,3 @@
         </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>
-
diff --git a/web/templates/user/edit_web.js.html b/web/templates/user/edit_web.js.html
new file mode 100644
index 000000000..3546f0fd9
--- /dev/null
+++ b/web/templates/user/edit_web.js.html
@@ -0,0 +1,42 @@
+    <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>