diff --git a/bin/v_list_sys_users b/bin/v_list_sys_users
deleted file mode 100755
index a5f523c9a..000000000
--- a/bin/v_list_sys_users
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-# info: list system users
-# options: [format]
-#
-# The function for obtaining the list of system users.
-
-
-#----------------------------------------------------------#
-#                    Variable&Function                     #
-#----------------------------------------------------------#
-
-# Argument defenition
-format=${1-shell}
-
-# Includes
-source $VESTA/func/main.sh
-
-# Json function
-json_list_users() {
-    users=$(grep @ /etc/passwd|cut -f 1 -d :)
-    int_counter=$(echo "$users" | wc -l)
-    i=1
-    echo '['
-    for user in $users; do
-        if [ "$i" -lt "$int_counter" ]; then
-            echo -e  "\t\"$user\","
-        else
-            echo -e  "\t\"$user\""
-        fi
-        (( ++i))
-    done
-    echo "]"
-}
-
-# Shell function
-shell_list_users() {
-    if [ -z "$nohead" ]; then
-        echo "USERS"
-        echo "----------"
-    fi
-    for user in $(grep @ /etc/passwd|cut -f 1 -d :); do
-        echo "$user"
-    done
-}
-
-
-#----------------------------------------------------------#
-#                       Action                             #
-#----------------------------------------------------------#
-
-# Listing domains
-case $format in 
-    json)   json_list_users ;;
-    plain)  nohead=1; shell_list_users ;;
-    shell)  shell_list_users ;;
-    *)      check_args '1' '0' '[format]' ;;
-esac
-
-
-#----------------------------------------------------------#
-#                       Vesta                              #
-#----------------------------------------------------------#
-
-exit
diff --git a/web/add/ip/index.php b/web/add/ip/index.php
index a4659ed88..0f4207a2a 100644
--- a/web/add/ip/index.php
+++ b/web/add/ip/index.php
@@ -74,7 +74,7 @@ if ($_SESSION['user'] == 'admin') {
     $interfaces = json_decode(implode('', $output), true);
     unset($output);
 
-    exec (VESTA_CMD."v_list_sys_users 'json'", $output, $return_var);
+    exec (VESTA_CMD."v_list_users 'json'", $output, $return_var);
     $users = json_decode(implode('', $output), true);
     unset($output);
 
diff --git a/web/add/user/index.php b/web/add/user/index.php
index b4d0f44e5..7fee600e6 100644
--- a/web/add/user/index.php
+++ b/web/add/user/index.php
@@ -87,7 +87,6 @@ if ($_SESSION['user'] == 'admin') {
     $data = json_decode(implode('', $output), true);
     unset($output);
 
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_add_user.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_user.html');
     unset($_SESSION['error_msg']);
     unset($_SESSION['ok_msg']);
diff --git a/web/css/csshover3.htc b/web/css/csshover3.htc
index 7e5c57b33..1c368895f 100644
--- a/web/css/csshover3.htc
+++ b/web/css/csshover3.htc
@@ -1,12 +1,14 @@
 <public:attach event="ondocumentready" onevent="CSSHover()" />
 <script>
 /**
- * Whatever:hover - V3.11
- * http://www.xs4all.nl/~peterned/
- *	
- * Copyright (c) 2009 Peter Nederlof
- * Licensed under the LGPL license
- * http://creativecommons.org/licenses/LGPL/2.1
+ *	Whatever:hover - V3.00.081222
+ *	--------------------------------------------------------
+ *	Author  - Peter Nederlof, http://www.xs4all.nl/~peterned
+ *	License - http://creativecommons.org/licenses/LGPL/2.1
+ *	Packed  - http://dean.edwards.name/packer
+ *
+ *	howto: body { behavior:url("csshover3.htc"); }
  */
-window.CSSHover=(function(){var m=/(^|\s)((([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(hover|active|focus))/i;var n=/(.*?)\:(hover|active|focus)/i;var o=/[^:]+:([a-z\-]+).*/i;var p=/(\.([a-z0-9_\-]+):[a-z]+)|(:[a-z]+)/gi;var q=/\.([a-z0-9_\-]*on(hover|active|focus))/i;var s=/msie (5|6|7)/i;var t=/backcompat/i;var u={index:0,list:['text-kashida','text-kashida-space','text-justify'],get:function(){return this.list[(this.index++)%this.list.length]}};var v=function(c){return c.replace(/-(.)/mg,function(a,b){return b.toUpperCase()})};var w={elements:[],callbacks:{},init:function(){if(!s.test(navigator.userAgent)&&!t.test(window.document.compatMode)){return}var a=window.document.styleSheets,l=a.length;for(var i=0;i<l;i++){this.parseStylesheet(a[i])}},parseStylesheet:function(a){if(a.imports){try{var b=a.imports;var l=b.length;for(var i=0;i<l;i++){this.parseStylesheet(a.imports[i])}}catch(securityException){}}try{var c=a.rules;var r=c.length;for(var j=0;j<r;j++){this.parseCSSRule(c[j],a)}}catch(someException){}},parseCSSRule:function(a,b){var c=a.selectorText;if(m.test(c)){var d=a.style.cssText;var e=n.exec(c)[1];var f=c.replace(o,'on$1');var g=c.replace(p,'.$2'+f);var h=q.exec(g)[1];var i=e+h;if(!this.callbacks[i]){var j=u.get();var k=v(j);b.addRule(e,j+':expression(CSSHover(this, "'+f+'", "'+h+'", "'+k+'"))');this.callbacks[i]=true}b.addRule(g,d)}},patch:function(a,b,c,d){try{var f=a.parentNode.currentStyle[d];a.style[d]=f}catch(e){a.runtimeStyle[d]=''}if(!a.csshover){a.csshover=[]}if(!a.csshover[c]){a.csshover[c]=true;var g=new CSSHoverElement(a,b,c);this.elements.push(g)}return b},unload:function(){try{var l=this.elements.length;for(var i=0;i<l;i++){this.elements[i].unload()}this.elements=[];this.callbacks={}}catch(e){}}};var x={onhover:{activator:'onmouseenter',deactivator:'onmouseleave'},onactive:{activator:'onmousedown',deactivator:'onmouseup'},onfocus:{activator:'onfocus',deactivator:'onblur'}};function CSSHoverElement(a,b,c){this.node=a;this.type=b;var d=new RegExp('(^|\\s)'+c+'(\\s|$)','g');this.activator=function(){a.className+=' '+c};this.deactivator=function(){a.className=a.className.replace(d,' ')};a.attachEvent(x[b].activator,this.activator);a.attachEvent(x[b].deactivator,this.deactivator)}CSSHoverElement.prototype={unload:function(){this.node.detachEvent(x[this.type].activator,this.activator);this.node.detachEvent(x[this.type].deactivator,this.deactivator);this.activator=null;this.deactivator=null;this.node=null;this.type=null}};window.attachEvent('onbeforeunload',function(){w.unload()});return function(a,b,c,d){if(a){return w.patch(a,b,c,d)}else{w.init()}}})();
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('r.R=(8(){4 f=/(^|\\s)((([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(C|D|E))/i,S=/(.*?)\\:(C|D|E)/i,T=/[^:]+:([a-z-]+).*/i,U=/(\\.([a-V-W-]+):[a-z]+)|(:[a-z]+)/1c,X=/\\.([a-V-W-]*Y(C|D|E))/i,Z=/1d (5|6|7)/i,10=/1e/i;4 g=\'1f-\';4 h={p:[],t:{},11:8(){n(!Z.F(1g.1h)&&!10.F(r.12.1i))u;4 a=r.12.1j,l=a.v;w(4 i=0;i<l;i++){3.G(a[i])}},G:8(a){n(a.H){I{4 b=a.H,l=b.v;w(4 i=0;i<l;i++){3.G(a.H[i])}}J(13){}}I{4 c=a.1k,l=c.v;w(4 j=0;j<l;j++){3.14(c[j],a)}}J(13){}},14:8(a,b){4 c=a.1l;n(f.F(c)){4 d=a.K.1m,L=S.15(c)[1],M=c.N(T,\'Y$1\'),O=c.N(U,\'.$2\'+M),o=X.15(O)[1];4 e=L+o;n(!3.t[e]){b.16(L,g+o+\':1n(R(3, "\'+M+\'", "\'+o+\'"))\');3.t[e]=17}b.16(O,d)}},18:8(a,b,c){4 d=g+c;n(a.K[d]){a.K[d]=q}n(!a.x)a.x=[];n(!a.x[c]){a.x[c]=17;4 e=19 P(a,b,c);3.p.1o(e)}u b},y:8(){I{4 l=3.p.v;w(4 i=0;i<l;i++){3.p[i].y()}3.p=[];3.t={}}J(e){}}};r.Q(\'1p\',8(){h.y()});4 k={1q:{9:\'1r\',m:\'1s\'},1t:{9:\'1u\',m:\'1v\'},1a:{9:\'1a\',m:\'1w\'}};8 P(a,b,c){3.A=a;3.B=b;4 d=19 1x(\'(^|\\\\s)\'+c+\'(\\\\s|$)\',\'g\');3.9=8(){a.o+=\' \'+c};3.m=8(){a.o=a.o.N(d,\' \')};a.Q(k[b].9,3.9);a.Q(k[b].m,3.m)}P.1y={y:8(){3.A.1b(k[3.B].9,3.9);3.A.1b(k[3.B].m,3.m);3.9=q;3.m=q;3.A=q;3.B=q}};u 8(a,b,c){n(a){u h.18(a,b,c)}1z{h.11()}}})();',62,98,'|||this|var||||function|activator|||||||||||||deactivator|if|className|elements|null|window||callbacks|return|length|for|csshover|unload||node|type|hover|active|focus|test|parseStylesheet|imports|try|catch|style|affected|pseudo|replace|newSelect|CSSHoverElement|attachEvent|CSSHover|REG_AFFECTED|REG_PSEUDO|REG_SELECT|z0|9_|REG_CLASS|on|REG_MSIE|REG_COMPAT|init|document|securityException|parseCSSRule|exec|addRule|true|patch|new|onfocus|detachEvent|gi|msie|backcompat|csh|navigator|userAgent|compatMode|styleSheets|rules|selectorText|cssText|expression|push|onbeforeunload|onhover|onmouseenter|onmouseleave|onactive|onmousedown|onmouseup|onblur|RegExp|prototype|else'.split('|'),0,{}));
+
 </script>
diff --git a/web/edit/ip/index.php b/web/edit/ip/index.php
index b780e470a..0f2e52fb1 100644
--- a/web/edit/ip/index.php
+++ b/web/edit/ip/index.php
@@ -48,7 +48,7 @@ if ($_SESSION['user'] == 'admin') {
             $v_status =  'active';
         }
 
-        exec (VESTA_CMD."v_list_sys_users 'json'", $output, $return_var);
+        exec (VESTA_CMD."v_list_users 'json'", $output, $return_var);
         $users = json_decode(implode('', $output), true);
         unset($output);
 
diff --git a/web/edit/user/index.php b/web/edit/user/index.php
index 3468fce86..5c457d412 100644
--- a/web/edit/user/index.php
+++ b/web/edit/user/index.php
@@ -168,7 +168,6 @@ if ($_SESSION['user'] == 'admin') {
             $_SESSION['ok_msg'] = "OK: changes has been saved.";
         }
     }
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_user.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_user.html');
     unset($_SESSION['error_msg']);
     unset($_SESSION['ok_msg']);
@@ -240,19 +239,6 @@ if ($_SESSION['user'] == 'admin') {
             unset($output);
         }
 
-        // Change Name
-        if (($v_fname != $_POST['v_fname']) || ($v_lname != $_POST['v_lname']) && (empty($_SESSION['error_msg']))) {
-            $v_fname = escapeshellarg($_POST['v_fname']);
-            $v_lname = escapeshellarg($_POST['v_lname']);
-            exec (VESTA_CMD."v_change_user_name ".$v_username." ".$v_fname." ".$v_lname, $output, $return_var);
-            if ($return_var != 0) {
-                $error = implode('<br>', $output);
-                if (empty($error)) $error = 'Error: vesta did not return any output.';
-                $_SESSION['error_msg'] = $error;
-            }
-            unset($output);
-        }
-
         // Change NameServers
         if (($v_ns1 != $_POST['v_ns1']) || ($v_ns2 != $_POST['v_ns2']) || ($v_ns3 != $_POST['v_ns3']) || ($v_ns4 != $_POST['v_ns4']) && (empty($_SESSION['error_msg']))) {
             $v_ns1 = escapeshellarg($_POST['v_ns1']);
@@ -275,7 +261,6 @@ if ($_SESSION['user'] == 'admin') {
             $_SESSION['ok_msg'] = "OK: changes has been saved.";
         }
     }
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_edit_user.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/user/edit_user.html');
     unset($_SESSION['error_msg']);
     unset($_SESSION['ok_msg']);
diff --git a/web/inc/main.php b/web/inc/main.php
index ae9538ac1..677a88f9d 100644
--- a/web/inc/main.php
+++ b/web/inc/main.php
@@ -62,17 +62,17 @@ function humanize_usage($usage) {
                 if ( $usage > 1000 ) {
                     $usage = $usage / 1000 ;
                     $usage = number_format($usage, 2);
-                    $usage = $usage." Pb";
+                    $usage = $usage." pb";
                 } else {
                     $usage = number_format($usage, 2);
-                    $usage = $usage." Tb";
+                    $usage = $usage." tb";
                 }
         } else {
             $usage = number_format($usage, 2);
-            $usage = $usage." Gb";
+            $usage = $usage." gb";
         }
     } else {
-        $usage = $usage." Mb";
+        $usage = $usage." mb";
     }
     return $usage;
 }
@@ -114,4 +114,27 @@ function send_email($to,$subject,$mailtext,$from) {
     mail($to, $subject, $message, $header);
 }
 
+function display_error_block() {
+    if (!empty($_SESSION['error_msg'])) {
+        echo '
+                        <script type="text/javascript">
+                            $(function() {
+                                $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                                $( "#dialog-message" ).dialog({
+                                    modal: true,
+                                    buttons: {
+                                        Ok: function() {
+                                            $( this ).dialog( "close" );
+                                        }
+                                    }
+                                });
+                            });
+                    </script>
+                    <div id="dialog-message" title="Error">
+                        <p>';
+        echo $_SESSION['error_msg'];
+        echo "</p>\n                        </div>\n";
+        unset($_SESSION['error_msg']);
+    }
+}
 ?>
diff --git a/web/list/user/index.php b/web/list/user/index.php
index 79dcf385f..9e532d762 100644
--- a/web/list/user/index.php
+++ b/web/list/user/index.php
@@ -1,8 +1,11 @@
 <?php
+
 // Init
 error_reporting(NULL);
 session_start();
 $TAB = 'USER';
+
+// Inlcude functions
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
 // Header
@@ -13,30 +16,20 @@ 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);
-    }
-    check_error($return_var);
+    $cmd = "v_list_user '".$user."' json";
+    if ($user == 'admin') $cmd = "v_list_users json";
+    exec (VESTA_CMD.$cmd, $output, $return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data);
-    unset($output);
-
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_user.html');
+    display_error_block;
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_user.html');
 } else {
     exec (VESTA_CMD."v_list_user ".$user." json", $output, $return_var);
-    check_error($return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data);
-    unset($output);
-
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/user/menu_user.html');
+    display_error_block;
     include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_user.html');
 }
 
-
 // Footer
 include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html
index 8de111051..91bcbd8ab 100644
--- a/web/templates/admin/add_user.html
+++ b/web/templates/admin/add_user.html
@@ -1,60 +1,140 @@
-<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_add_user.v_password.value = randomstring;
-}
-</script>
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
 
-        <table class="data-col2" width="830px">
-            <form method="post" name="v_add_user">
-            <tr><td class="add-text" style="padding: 10 0 0 2px;">Username</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_username" <?php if (!empty($v_username)) echo "value=".$v_username;  ?> ></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">
-                Password <a href="javascript:randomString();" class="genpass">generate</a></td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_password"</tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Email</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_email" <?php if (!empty($v_email)) echo "value=".$v_email; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;" name="v_package">Package</td></tr>
-            <tr><td><select class="add-list" name="v_package">
-            <?php
-                foreach ($data as $key => $value) {
-                    echo "\t\t\t\t<option value=\"".$key."\"";
-                    if ((!empty($v_package)) && ( $key == $_POST['v_package'])){
-                        echo 'selected' ;
-                    }
-                    echo ">".$key."</option>\n";
-                }
-            ?>
-                </select></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Frist Name</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_fname" <?php if (!empty($v_fname)) echo "value=".$v_fname; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Last Name</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=".$v_lname; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Send login credentials to the user's email address</td></tr>
-            <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_notify" <?php if (empty($v_notify)) echo "checked=yes"; ?>></tr>
-            <tr><td style="padding: 24px 0 0 0;">
-                <input type="submit" name="ok" value="OK" class="add-button">
-                </form>
-                <input type="button" class="add-button" value="Cancel" onClick="location.href='/list/user/'">
-            </td></tr>
-        </table>
-    </td>
-</tr>
-</table>
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding User</b></a>
+                                            <?php
+                                                if (!empty($_SESSION['error_msg'])) {
+                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                    }
+                                                }
+                                            ?> 
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+
+                    <form id="vstobjects" name="v_add_user" method="post">
+                        <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_add_user.v_password.value = randomstring;
+                            }
+                        </script>
+
+                        <table class="data">
+                            <tr class="data-add">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 18 0 4 18;"></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td class="add-text" style="padding: 10 0 0 2px;">
+                                                Username
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_username" <?php if (!empty($v_username)) echo "value=".$v_username;  ?> >
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Password <a href="javascript:randomString();" class="genpass">generate</a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_password"
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Email
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_email" <?php if (!empty($v_email)) echo "value=".$v_email; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;" name="v_package">
+                                                Package
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="add-list" name="v_package">
+                                                    <?php
+                                                        foreach ($data as $key => $value) {
+                                                            echo "\n\t\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
+                                                            if ((!empty($v_package)) && ( $key == $_POST['v_package'])){
+                                                                echo 'selected' ;
+                                                            }
+                                                            echo ">".$key."</option>\n";
+                                                        }
+                                                    ?> 
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Frist Name
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_fname" <?php if (!empty($v_fname)) echo "value=".$v_fname; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Last Name
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=".$v_lname; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Send login credentials to the user's email address
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="checkbox" size="20" class="add-checkbox" name="v_notify" <?php if (empty($v_notify)) echo "checked=yes"; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="padding: 24px 0 0 0;">
+                                                <input type="submit" name="ok" value="OK" class="button">
+                                                <input type="button" class="button" value="Cancel" onclick="location.href='/list/user/'">
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </form>
diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html
index d3c64c274..4f8ea0a02 100644
--- a/web/templates/admin/edit_user.html
+++ b/web/templates/admin/edit_user.html
@@ -1,94 +1,199 @@
-<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" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
-            <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
-            <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-        <form method="post" name="v_edit_user">
-        <table class="data-col2" width="830px">
-            <tr><td class="add-text" style="padding: 10 0 0 2px;">Username</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_user" <?php if (!empty($v_username)) echo "value=".$v_username;  ?> disabled> <input type="hidden" name="v_username" <?php if (!empty($v_username)) echo "value=".$v_username;  ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">
-                Password <a href="javascript:randomString();" class="genpass">generate</a></td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_password" <?php if (!empty($v_password)) echo "value=".$v_password;  ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Email</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_email" <?php if (!empty($v_email)) echo "value=".$v_email; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;" >Package</td></tr>
-            <tr><td><select class="add-list" name="v_package">
-            <?php
-                foreach ($packages as $key => $value) {
-                    echo "\t\t\t\t<option value=\"".$key."\"";
-                    $skey = "'".$key."'";
-                    if (( $key == $v_package ) || ( $skey == $v_package)){
-                        echo 'selected' ;
-                    }
-                    echo ">".$key."</option>\n";
-                }
-            ?>
-                </select></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Frist Name</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_fname" <?php if (!empty($v_fname)) echo "value=".$v_fname; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Last Name</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=".$v_lname; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;" >Default Template</td></tr>
-            <tr><td><select class="add-list" name="v_template">
-            <?php
-                foreach ($templates as $key => $value) {
-                    echo "\t\t\t\t<option value=\"".$value."\"";
-                    $svalue = "'".$value."'";
-                    if (( $value == $v_template ) || ($svalue == $v_template )){
-                        echo 'selected' ;
-                    }
 
-                    echo ">".$value."</option>\n";
-                }
-            ?>
-                </select></td></tr>
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding User</b></a>
+                                            <?php
+                                                if (!empty($_SESSION['error_msg'])) {
+                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                    }
+                                                }
+                                            ?>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
 
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;" >Shell</td></tr>
-            <tr><td><select class="add-list" name="v_shell">
-            <?php
-                foreach ($shells as $key => $value) {
-                    echo "\t\t\t\t<option value=\"".$value."\"";
-                    $svalue = "'".$value."'";
-                    if (( $value == $v_shell ) || ($svalue == $v_shell )){
-                        echo 'selected' ;
-                    }
+                    <form id="vstobjects" method="post" name="v_edit_user">
+                        <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" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
+                                        <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
+                                        <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                        </tr>
+                                    </table>
 
-                    echo ">".$value."</option>\n";
-                }
-            ?>
-                </select></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Default Name Servers </td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>></tr>
-            <tr><td style="padding: 24px 0 0 0;">
-                <input type="submit" class="add-button" name="save" value="Save">
-                </form>
-                <input type="button" class="add-button" value="Cancel" onClick="location.href='/list/user/'">
-            </td></tr>
-        </table>
-    </td>
-</tr>
-</table>
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td class="add-text" style="padding: 10 0 0 2px;">
+                                                Username
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_user" <?php if (!empty($v_username)) echo "value=".$v_username;  ?> disabled> <input type="hidden" name="v_username" <?php if (!empty($v_username)) echo "value=".$v_username;  ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Password <a href="javascript:randomString();" class="genpass">generate</a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_password" <?php if (!empty($v_password)) echo "value=".$v_password;  ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Email
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_email" <?php if (!empty($v_email)) echo "value=".$v_email; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;" >
+                                                Package
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="add-list" name="v_package">
+                                                    <?php
+                                                        foreach ($packages as $key => $value) {
+                                                            echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
+                                                            $skey = "'".$key."'";
+                                                            if (( $key == $v_package ) || ( $skey == $v_package)){
+                                                                echo 'selected' ;
+                                                            }
+                                                            echo ">".$key."</option>\n";
+                                                        }
+                                                    ?> 
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Frist Name
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_fname" <?php if (!empty($v_fname)) echo "value=".$v_fname; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Last Name
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=".$v_lname; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;" >
+                                                Default Template
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="add-list" name="v_template">
+                                                    <?php
+                                                        foreach ($templates as $key => $value) {
+                                                            echo "\n\t\t\t\t\t\t\t\t\t\t<option value=\"".$value."\"";
+                                                            $svalue = "'".$value."'";
+                                                            if (( $value == $v_template ) || ($svalue == $v_template )){
+                                                                echo 'selected' ;
+                                                            }
+                                                            echo ">".$value."</option>\n";
+                                                        }
+                                                    ?> 
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;" >
+                                                Shell
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <select class="add-list" name="v_shell">
+                                                    <?php
+                                                        foreach ($shells as $key => $value) {
+                                                            echo "\t\t\t\t<option value=\"".$value."\"";
+                                                            $svalue = "'".$value."'";
+                                                            if (( $value == $v_shell ) || ($svalue == $v_shell )){
+                                                                echo 'selected' ;
+                                                            }
+                                                            echo ">".$value."</option>\n";
+                                                        }
+                                                    ?> 
+                                                </select>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Default Name Servers
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="padding: 24px 0 0 0;">
+                                                <input type="submit" class="button" name="save" value="Save">
+                                                <input type="button" class="button" value="Cancel" onclick="location.href='/list/user/'">
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </form>
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index eb28bdaa3..ea1b7a241 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -1,194 +1,282 @@
-<table class='data'>
 
-<?php
-foreach ($data as $key => $value) {
-    ++$i;
-    if ($data[$key]['SUSPENDED'] == 'yes') {
-        $status = 'suspended';
-        $spnd_action = 'unsuspend' ;
-    } else {
-        $status = 'active';
-        $spnd_action = 'suspend' ;
-    }
-    ?>
-<script type="text/javascript">
-    $(function(){
-        $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog({
-            modal: true,
-            autoOpen: false,
-            width: 360,
-            buttons: {
-                "Ok": function(event, ui) {
-                     location.href = '/<?php echo $spnd_action ?>/user/?user=<?php echo "$key" ?>';
-                },
-                "Cancel": function() {
-                    $(this).dialog("close");
-                }
-            }
-        });
-        $('#<?php echo $spnd_action ?>_link_<?php echo "$i" ?>').click(function(){
-            $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog('open');
-            return false;
-        });
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 0 8px 6px">
+                                            <div style="float:left">
+                                                <?php
+                                                    if ($user == 'admin') {
+                                                        echo "<button style=\"width:120px; padding: 2px 0px;\" onclick=\"location.href='/add/user/'\"> Add User </button>";
+                                                    } else {
+                                                        echo "<button style=\"width:120px; padding: 2px 0px;\" onclick=\"location.href='/add/web/'\"> Add Domain </button>";
+                                                    }
+                                                ?> 
+                                            </div>
+                                            <div style="text-align: right; float: right;">
+                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;">
+                                                <button> Search </button>
+                                            </div>
+                                            <div style="float:left; padding-left: 26px;">
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+                                                <select style="margin:0 2px 0 0px;" >
+                                                    <option>apply to selected</option>
+                                                    <option>rebuild</option>
+                                                    <option>update counters</option>
+                                                    <option>suspend</option>
+                                                    <option>unsuspend</option>
+                                                    <option>delete</option>
+                                                </select>
+                                                <button style="width:27px;"> › </button>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+
+                    <form id="vstobjects">
+                        <table class="data">
+                            <?php
+                                foreach ($data as $key => $value) {
+                                    ++$i;
+                                    if ($data[$key]['SUSPENDED'] == 'yes') {
+                                        $status = 'suspended';
+                                        $spnd_action = 'unsuspend' ;
+                                    } else {
+                                        $status = 'active';
+                                        $spnd_action = 'suspend' ;
+                                    }
+                                ?>
 
-        $('#delete_dialog_<?php echo "$i" ?>').dialog({
-            modal: true,
-            autoOpen: false,
-            width: 360,
-            buttons: {
-                "Ok": function(event, ui) {
-                     location.href = '/delete/user/?user=<?php echo "$key" ?>';
-                },
-                "Cancel": function() {
-                    $(this).dialog("close");
-                }
-            }
-        });
-        $('#delete_link_<?php echo "$i" ?>').click(function(){
-            $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
-            return false;
-        });
-    });
-</script>
-<tr class="data-row">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object"></td></tr>
-            <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE']))?></a></td></tr>
-            <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-            <td class="data-controls" width="70px"><img src="/images/login-as.png" width="7px" height="8px">
-                <?php
-                    if ($key == $user) {
-                        echo "<a href=\"/logout/\">logout</a>";
-                        if (!empty($_SESSION['look_alert'])) {
-                            ?>
                             <script type="text/javascript">
-                                $(function() {
-                                    $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                                    $( "#dialog-message" ).dialog({
+                                $(function(){
+                                    $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog({
                                         modal: true,
+                                        autoOpen: false,
+                                        width: 360,
                                         buttons: {
-                                            Ok: function() {
-                                                $( this ).dialog( "close" );
+                                            "Ok": function(event, ui) {
+                                                 location.href = '/<?php echo $spnd_action ?>/user/?user=<?php echo "$key" ?>';
+                                            },
+                                            "Cancel": function() {
+                                                $(this).dialog("close");
                                             }
                                         }
                                     });
+                                    $('#<?php echo $spnd_action ?>_link_<?php echo "$i" ?>').click(function(){
+                                        $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog('open');
+                                        return false;
+                                    });
+                                    $('#delete_dialog_<?php echo "$i" ?>').dialog({
+                                        modal: true,
+                                        autoOpen: false,
+                                        width: 360,
+                                        buttons: {
+                                            "Ok": function(event, ui) {
+                                                 location.href = '/delete/user/?user=<?php echo "$key" ?>';
+                                            },
+                                            "Cancel": function() {
+                                                $(this).dialog("close");
+                                            }
+                                        }
+                                    });
+                                    $('#delete_link_<?php echo "$i" ?>').click(function(){
+                                        $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
+                                        return false;
+                                    });
                                 });
                             </script>
-                            <div id="dialog-message" title="Wellcome">
-                                <p>You have logged in as user <?php echo "$key" ?>.</p>
-                            </div>
+
+                            <tr class="data-row">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object"></td></tr>
+                                        <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE']))?></a></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                            <td class="data-controls" width="70px"><img src="/images/login-as.png" width="7px" height="8px">
+                                                <?php
+                                                    if ($key == $user) {
+                                                        echo "<a href=\"/logout/\">logout</a>";
+                                                        if (!empty($_SESSION['look_alert'])) {
+                                                ?> 
+                                                    <script type="text/javascript">
+                                                        $(function() {
+                                                            $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                                                            $( "#dialog-message" ).dialog({
+                                                                modal: true,
+                                                                buttons: {
+                                                                    Ok: function() {
+                                                                        $( this ).dialog( "close" );
+                                                                    }
+                                                                }
+                                                            });
+                                                        });
+                                                    </script>
+                                                    <div id="dialog-message" title="Wellcome">
+                                                        <p>You have logged in as user <?php echo "$key" ?>.</p>
+                                                    </div>
+                                                <?php
+                                                            unset($_SESSION['look_alert']);
+                                                        }
+                                                    } else {
+                                                        echo "<a href=\"/login/?loginas=$key\">login as</a>";
+                                                    }
+                                                 ?>
+                                            </td>
+                                            <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/user/?user=<?php echo "$key" ?>"> edit</a></td>
+                                            <td class="data-controls" width="80px">
+                                                <img src="/images/suspend.png" width="7px" height="8px">
+                                                <a href="#" id="<?php echo $spnd_action ?>_link_<?php echo $i ?>"> <?php echo $spnd_action ?></a>
+                                                <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" title="Confirmation">
+                                                    <p class="counter-value">Are you sure you want to <?php echo $spnd_action ?> <b><?php echo "$key" ?></b> user account?</p>
+                                                </div>
+                                            </td>
+                                            <td class="data-controls" width="70px">
+                                                <img src="/images/delete.png" width="7px" height="7px">
+                                                <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
+                                                <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
+                                                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> user account?</p>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
+
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td colspan=3 class="username" style="padding: 0 0 0 4px;"><b><?php echo $key ?></b><a class="fullname"><?php echo $data[$key]['FNAME']?> <?php echo $data[$key]['LNAME']?></a></td>
+                                        </tr>
+                                        <tr>
+                                            <td style="vertical-align:top;"  width="240">
+                                                <table>
+                                                    <tr><td colspan=2 class="counter-name"  style="padding: 2px 0 0 2px;"><?php echo $data[$key]['CONTACT']?></td></tr>
+                                                    <tr><td colspan=2 class="counter-name"  style="padding: 0 0 18px 2px;">[<?php echo $data[$key]['PACKAGE']?>] package</td></tr>
+                                                    <tr>
+                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;">Bandwidth: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
+                                                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                                <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;">Disk: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
+                                                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan=2>
+                                                            <table class="chart2">
+                                                                <tr>
+                                                                    <td>
+                                                                        Web: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
+                                                                        Mail: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
+                                                                    </td>
+                                                                    <td style="padding: 0px 10px 0px 8px">
+                                                                        Databases: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?><br>
+                                                                        User Dirs: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?><br>
+                                                                    </td>
+                                                                </tr>
+                                                            </table>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;" width="320">
+                                                <table width="300">
+                                                    <tr>
+                                                        <td class="counter-name" width="36%">Template:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['TEMPLATE'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Web Domains:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?> / <?php echo $data[$key]['WEB_DOMAINS'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Web SSL:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['U_WEB_SSL'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Web Aliases:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> per domain</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Dns Domains:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['U_DNS_DOMAINS'] ?> / <?php echo $data[$key]['DNS_DOMAINS'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Dns Records:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> per domain</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Name Servers:<br></td>
+                                                        <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?></td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;">
+                                                <table class="data-col4">
+                                                    <tr>
+                                                        <td class="counter-name">Mail Domains:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Mail Accounts:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> per domain</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Databases:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['U_DATABASES'] ?> / <?php echo $data[$key]['DATABASES'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Cron Jobs:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['U_CRON_JOBS'] ?> / <?php echo $data[$key]['CRON_JOBS'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Shell:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['SHELL'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Dedicated IP:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['IP_OWNED'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Backups:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['U_BACKUPS'] ?> / <?php echo $data[$key]['BACKUPS'] ?></td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
                             <?php
-                            unset($_SESSION['look_alert']);
-                        }
-                    } else {
-                        echo "<a href=\"/login/?loginas=$key\">login as</a>";
-                    }
-                 ?>
-            </td>
-            <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/user/?user=<?php echo "$key" ?>"> edit</a></td>
-            <td class="data-controls" width="80px">
-                <img src="/images/suspend.png" width="7px" height="8px">
-                <a href="#" id="<?php echo $spnd_action ?>_link_<?php echo $i ?>"> <?php echo $spnd_action ?></a>
-                <div id="<?php echo $spnd_action ?>_dialog_<?php echo $i ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to <?php echo $spnd_action ?> <b><?php echo "$key" ?></b> user account?</p>
-                </div>
-            </td>
-            <td class="data-controls" width="70px">
-                <img src="/images/delete.png" width="7px" height="7px">
-                <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
-                <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to delete <b><?php echo "$key" ?></b> user account?</p>
-                </div>
-            </td>
-        </tr></table>
+                                }
+                            ?> 
+                        </table>
 
-        <table class="data-col2" width="830px">
-            <tr><td colspan=3 class="username" style="padding: 0 0 0 4px;"><b><?php echo $key ?></b><a class="fullname"><?php echo $data[$key]['FNAME']?> <?php echo $data[$key]['LNAME']?></a></td></tr>
-            <td style="vertical-align:top;"  width="240">
-                <table>
-                    <tr><td colspan=2 class="counter-name"  style="padding: 2px 0 0 2px;"><?php echo $data[$key]['CONTACT']?></td></tr>
-                    <tr><td colspan=2 class="counter-name"  style="padding: 0 0 18px 2px;">[<?php echo $data[$key]['PACKAGE']?>] package</td></tr>
-                    <tr><td class="chart1" colspan=2 style="padding: 0 0 0 3px;">Bandwidth: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
-                        <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;"><div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div></div></td></tr>
-                    <tr><td class="chart1" colspan=2 style="padding: 0 0 0 3px;">Disk: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
-                        <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;"><div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div></div></td></tr>
-                    <tr><td colspan=2>
-                        <table class="chart2"><tr>
-                            <td>
-                                Web: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
-                                Mail: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
-                            </td><td style="padding: 0px 10px 0px 8px">
-                                Databases: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?><br>
-                                User Dirs: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?><br>
-                            </td>
-                        </tr></table></td>
-                    </tr>
-                </table>
-            </td>
-            <td style="vertical-align:top;" width="320">
-                <table width="300">
-                    <tr><td class="counter-name" width="36%">Template:</td>
-                    <td class="counter-value"><?php echo $data[$key]['TEMPLATE'] ?></td></tr>
-                    <tr><td class="counter-name">Web Domains:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?> / <?php echo $data[$key]['WEB_DOMAINS'] ?></td></tr>
-                    <tr><td class="counter-name">Web SSL:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_WEB_SSL'] ?></td></tr>
-                    <tr><td class="counter-name">Web Aliases:</td>
-                    <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> per domain</td></tr>
-                    <tr><td class="counter-name">Dns Domains:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_DNS_DOMAINS'] ?> / <?php echo $data[$key]['DNS_DOMAINS'] ?></td></tr>
-                    <tr><td class="counter-name">Dns Records:</td>
-                    <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> per domain</td></tr>
-                    <tr><td class="counter-name">Name Servers:<br></td>
-                    <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?></td></tr>
-                </table></td>
-            <td style="vertical-align:top;">
-                <table class="data-col4">
-                    <tr><td class="counter-name">Mail Domains:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td></tr>
-                    <tr><td class="counter-name">Mail Accounts:</td>
-                    <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> per domain</td></tr>
-                    <tr><td class="counter-name">Databases:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_DATABASES'] ?> / <?php echo $data[$key]['DATABASES'] ?></td></tr>
-                    <tr><td class="counter-name">Cron Jobs:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_CRON_JOBS'] ?> / <?php echo $data[$key]['CRON_JOBS'] ?></td></tr>
-                    <tr><td class="counter-name">Shell:</td>
-                    <td class="counter-value"><?php echo $data[$key]['SHELL'] ?></td></tr>
-                    <tr><td class="counter-name">Dedicated IP:</td>
-                    <td class="counter-value"><?php echo $data[$key]['IP_OWNED'] ?></td></tr>
-                    <tr><td class="counter-name">Backups:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_BACKUPS'] ?> / <?php echo $data[$key]['BACKUPS'] ?></td></tr>
-                </table>
-            </td>
-        </tr>
-        </table>
-    </td>
-</tr>
+                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
 
-    <?php
-}
-?>
+                        <table class="data-count">
+                            <tr>
+                                <td width="160px"></td>
+                                <td>
+                                    <?php
+                                        if ( $i == 1) {
+                                            echo "1 user account ";
+                                        } else {
+                                            echo "$i user accounts ";
+                                        }
+                                    ?> 
+                                </td>
+                            </tr>
+                        </table>
+                    </form>
 
-</table>
-<?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-<table class="data-count">
-<tr>
-    <td>→ 
-    <?php
-        if ( $i == 1) {
-            echo "1 user account ";
-        } else {
-            echo "$i user accounts ";
-        }
-    ?>
-    </td>
-</tr>
-</table>
-</form>
-<?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:70px\"><tr><td></td></tr></table>"; ?>
+                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:70px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/admin/menu_add_user.html b/web/templates/admin/menu_add_user.html
deleted file mode 100644
index 69d23bbe1..000000000
--- a/web/templates/admin/menu_add_user.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 14px 2px 24px 0;" ><a class="add-name"><b>Adding User</b></a>
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_edit_user.html b/web/templates/admin/menu_edit_user.html
deleted file mode 100644
index dd5c9b462..000000000
--- a/web/templates/admin/menu_edit_user.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 14px 0 24px 0;" ><a class="add-name"><b>Editing User</b></a>
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_user.html b/web/templates/admin/menu_user.html
deleted file mode 100644
index 3e25540b3..000000000
--- a/web/templates/admin/menu_user.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-    if (!empty($_SESSION['error_msg'])) {
-?>
-        <script type="text/javascript">
-            $(function() {
-                $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                $( "#dialog-message" ).dialog({
-                    modal: true,
-                    buttons: {
-                        Ok: function() {
-                            $( this ).dialog( "close" );
-                        }
-                    }
-                });
-            });
-        </script>
-        <div id="dialog-message" title="Error">
-        <p><?php echo $_SESSION['error_msg'] ?>.</p>
-        </div>
-<?php
-        unset($_SESSION['error_msg']);
-    }
-?>
-
-<table class="sub-menu">
-<tr>
-    <td width="142px" style="padding: 16px 0 16px 6px">
-    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/user/'">Add User</button>
-    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 0px">
-        <option>apply to selected</option>
-        <option>rebuild</option>
-        <option>update counters</option>
-        <option>suspend</option>
-        <option>unsuspend</option>
-        <option>delete</option>
-    </select> <button> > </button></td>
-</td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-</tr>
-</table>
-<form id="vstobjects">
diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html
index 4c961eac3..a2efc4985 100644
--- a/web/templates/admin/panel.html
+++ b/web/templates/admin/panel.html
@@ -1,47 +1,69 @@
-<table class="main"><tr><td>
-<table class="top">
-<tr>
-    <td width="196px"><p class="hostname"><?php echo exec('hostname') ?></p></td>
-    <td width="88px"><b><a class="top-<?php if($TAB == 'PACKAGE' ) echo 's' ?>link" href="/list/package/">Packages </a></b></td>
-    <td width="100px"><b><a class="top-<?php if($TAB == 'IP' ) echo 's' ?>link" href="/list/ip/">IP Adresses </a></b></td>
-    <td width="110px"><b><a class="top-<?php if($TAB == 'RRD' ) echo 's' ?>link" href="/list/rrd/">RRD Graphics</a></b></td>
-    <td width="78px"><b><a class="top-<?php if($TAB == 'STATS' ) echo 's' ?>link" href="/list/stats/">Statistics</a></b></td>
-    <td width="90px"><b><a class="top-<?php if($TAB == 'LOG' ) echo 's' ?>link" href="/list/log/">History Log</a></b></td>
-    <td></td>
-    <td width="260px"><b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b><a class="top-link" style="padding: 0 0 0 6" href="/logout/">Log out</a></td>
-</tr>
-</table>
-<table class="nav">
-<tr>
-    <td style="padding: 34px 30px 0px 26px;">
-        <img src="/images/logo.png" width="124px" height="46px">
-    </td>
-    <td><div id="nav-block"><ul>
-        <li><b><a class="nav-<?php if($TAB == 'USER' ) echo 's' ?>link" href="/list/user/">USER</b></a><p class="counters">
-            users: <? echo $panel[$user]['U_USERS'] ?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_USERS']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'WEB' ) echo 's' ?>link" href="/list/web/">WEB</a></b><p class="counters">
-            domains: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
-            aliases: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
-            webssl: <? echo $panel[$user]['U_WEB_SSL']?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_WEB']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'DNS' ) echo 's' ?>link" href="/list/dns/">DNS</a></b><p class="counters">
-            domains: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
-            records: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_DNS']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'MAIL' ) echo 's' ?>link" href="/list/mail/">MAIL</a></b><p class="counters">
-            domains: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
-            dkim: <? echo $panel[$user]['U_MAIL_DKIM']?><br>
-            accounts: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_MAIL']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'DB' ) echo 's' ?>link" href="/list/db/">DB</a></b><p class="counters">
-            databases: <? echo $panel[$user]['U_DATABASES']?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_DB']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'CRON' ) echo 's' ?>link" href="/list/cron/">CRON</a></b><p class="counters">
-            jobs: <? echo $panel[$user]['U_CRON_JOBS']?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_CRON']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'BACKUP' ) echo 's' ?>link" href="/list/backup/">BACKUP</a></a></b><p class="counters">
-            backups: <? echo $panel[$user]['U_BACKUPS']?><br>
-    <ul></div></td>
-</tr>
-</table>
+                                <table class="top">
+                                    <tr>
+                                        <td width="179px"></td>
+                                        <td width="120px"><a class="top-<?php if($TAB == 'PACKAGE' ) echo 's' ?>link" href="/list/package/"><b>Packages</a></b></td>
+                                        <td width="120px"><a class="top-<?php if($TAB == 'IP' ) echo 's' ?>link" href="/list/ip/"><b>IP Adresses</a></b></td>
+                                        <td width="120px"><a class="top-<?php if($TAB == 'RRD' ) echo 's' ?>link" href="/list/rrd/"><b>RRD Graphics</a></b></td>
+                                        <td width="120px"><a class="top-<?php if($TAB == 'STATS' ) echo 's' ?>link" href="/list/stats/"><b>Statistics</a></b></td>
+                                        <td width="120px"><a class="top-<?php if($TAB == 'LOG' ) echo 's' ?>link" href="/list/log/"><b>History Log</a></b></td>
+                                        <td width="247px" style="padding: 0 5px 0 0; text-align: right;"><b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b><a class="top-link" style="padding: 0 0 0 6" href="/logout/">Log out</a></td>
+                                    </tr>
+                                </table>
+                                <table class="nav">
+                                    <tr id="nav-block">
+                                        <td class="logotd" style="padding: 22px 0px 0px 4px; float: left;">
+                                            <img src="/images/logo.png" width="124px" height="46px" alt="Vesta logo">
+                                        </td>
+                                        <td>
+                                            <a class="nav-<?php if($TAB == 'USER' ) echo 's' ?>link" href="/list/user/"><b>USER</b></a>
+                                            <p class="counters">
+                                                users: <? echo $panel[$user]['U_USERS'] ?><br>
+                                                suspended: <? echo $panel[$user]['SUSPENDED_USERS']?> 
+                                            </p>
+                                        </td>
+                                        <td>
+                                            <a class="nav-<?php if($TAB == 'WEB' ) echo 's' ?>link" href="/list/web/"><b>WEB</b></a>
+                                            <p class="counters">
+                                                domains: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
+                                                aliases: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
+                                                suspended: <? echo $panel[$user]['SUSPENDED_WEB']?> 
+                                            </p>
+                                        </td>
+                                        <td>
+                                            <a class="nav-<?php if($TAB == 'DNS' ) echo 's' ?>link" href="/list/dns/"><b>DNS</b></a>
+                                            <p class="counters">
+                                                domains: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
+                                                records: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
+                                                suspended: <? echo $panel[$user]['SUSPENDED_DNS']?> 
+                                            </p>
+                                        </td>
+                                        <td>
+                                            <a class="nav-<?php if($TAB == 'MAIL' ) echo 's' ?>link" href="/list/mail/"><b>MAIL</b></a>
+                                            <p class="counters">
+                                                domains: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
+                                                accounts: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
+                                                suspended: <? echo $panel[$user]['SUSPENDED_MAIL']?> 
+                                            </p>
+                                        </td>
+                                        <td>
+                                            <a class="nav-<?php if($TAB == 'DB' ) echo 's' ?>link" href="/list/db/"><b>DB</b></a>
+                                            <p class="counters">
+                                                databases: <? echo $panel[$user]['U_DATABASES']?><br>
+                                                suspended: <? echo $panel[$user]['SUSPENDED_DB']?> 
+                                            </p>
+                                        </td>
+                                        <td>
+                                            <a class="nav-<?php if($TAB == 'CRON' ) echo 's' ?>link" href="/list/cron/"><b>CRON</b></a>
+                                            <p class="counters">
+                                                jobs: <? echo $panel[$user]['U_CRON_JOBS']?><br>
+                                                suspended: <? echo $panel[$user]['SUSPENDED_CRON']?> 
+                                            </p>
+                                        </td>
+                                        <td>
+                                            <a class="nav-<?php if($TAB == 'BACKUP' ) echo 's' ?>link" href="/list/backup/"><b>BACKUP</b></a>
+                                            <p class="counters">
+                                                backups: <? echo $panel[$user]['U_BACKUPS']?><br> 
+                                            </p>
+                                        </td>
+                                    </tr>
+                                </table>
diff --git a/web/templates/footer.html b/web/templates/footer.html
index 2705b5718..caf828f83 100644
--- a/web/templates/footer.html
+++ b/web/templates/footer.html
@@ -1,13 +1,15 @@
-    <table class="bottom">
-    <tr>
-        <td>Powered by Vesta Control Panel</td>
-    </tr><tr>
-        <td><a href="http://vestacp.com">vestacp.com</a></td>
-    </tr>
-    </table>
-</td>
-</tr>
-</table>
-</center>
-</body>
+
+                    <table class="bottom">
+                        <tr>
+                            <td>Powered by Vesta Control Panel</td>
+                        </tr>
+                        <tr>
+                            <td><a href="http://vestacp.com">vestacp.com</a></td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
+    </center>
+    </body>
 </html>
diff --git a/web/templates/header.html b/web/templates/header.html
index d5185a53c..2537256a9 100644
--- a/web/templates/header.html
+++ b/web/templates/header.html
@@ -1,625 +1,678 @@
 <html>
-<head>
-    <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-    <title>Vesta - <?php echo "$TAB"; ?> </title>
-    <style type="text/css">
-    img {
-        border: none;
-    }
-
-    body {
-        margin: 0;
-        margin-left: auto;
-        margin-right: auto;
-        background-image: url(/images/b.png);
-        behavior: url(/css/csshover3.htc) 
-    }
-    .main {
-        background: #ffffff;
-        border-left: 1px solid #cccccc;
-        border-right: 1px solid #cccccc;
-        box-shadow: 0 0 8px 8px #d7d7d7;
-<?php
-if (!empty($_SESSION['look'])) {
-    echo "        border-left: 2px solid #f79b44;";
-    echo "    border-right: 2px solid #f79b44;";
-}
-?>
-     }
-    .top {
-        background: #555;
-        color: #cce4f0;
-        padding: 0 10 0 0;
-        margin-left: auto;
-        margin-right: auto;
-        width: 990px;
-        font-family: Arial, sans-serif;
-        font-size: 10pt;
-        text-align: right;
-        line-height: 1.2em;
-     }
-
-    .top-link {
-        font-family: Arial, sans-serif;
-        text-decoration: none;
-        color: #e6e6e6;
-     }
-
-    .top-link:visited {
-        text-decoration: none;
-        color: #e6e6e6;
-     }
-
-    .top-link:hover {
-        text-decoration: underline;
-        color: white;
-     }
-
-    .top-link:active{
-        text-decoration: underline;
-        color: #f5edb6;
-     }
-
-    .top-slink {
-        text-decoration: none;
-        color: #f5edb6;
-     }
-
-    .bottom {
-        background: #ebe9dc;
-        color: #777;
-        margin: 30 0 0 0;
-        padding: 4 20 8 0;
-        margin-left: auto;
-        margin-right: auto;
-        width: 990px;
-        font-family: Arial, sans-serif;
-        font-size: 8pt;
-        text-align: center;
-        vertical-align:top;
-        line-height: 0.8em;
-        border-top: 4px solid #d6d4c9;
-     }
-
-    .bottom a:link {
-        font-size: 8pt;
-        text-decoration: none;
-        color: #777;
-     }
-
-    .bottom a:visited {
-        text-decoration: none;
-        color: #777;
-     }
-
-    .bottom a:hover {
-        text-decoration: underline;
-        color: #333;
-     }
-
-    .nav {
-        background: #ebe9dc;
-        margin-left: auto;
-        margin-right: auto;
-        width: 990px;
-        text-align: left;
-        vertical-align:top;
-        padding: 0;
-        border-bottom: 8px solid #F7F6ED;
-     }
-    .nav td {
-        text-align: left;
-        vertical-align:top;
-        margin: 0;
-        padding: 0;
-    }
-
-    #nav-block {
-        padding: 0;
-        float: left;
-    }
-
-
-    #nav-block ul {
-        margin-top: 0;
-    }
-
-    #nav-block li {
-        display: inline;
-        list-style: none outside none;
-        float: left;
-        height: 102px;
-        width: 95px;
-        padding: 20px 0 2px 15px;
-        line-height: 1.0em;
-
-        font-size: 9pt;
-        font-family: Arial, sans-serif;
-        color: #2d2d2d;
-        background: url(/images/transparent-image.png) no-repeat;
-    }
-
-    #nav-block li:first-child { 
-         margin-left:-10px   
-    }
-
-    #nav-block li:hover {
-        background: #f6f6f6;
-        color: black;
-    }
-
-    .nav-link {
-        letter-spacing: -1.2px;
-        font-size: 16pt;
-        color: #555;
-        font-family: Arial, sans-serif;
-        text-decoration: none;
-    }
-
-    .nav-link:hover {
-        text-decoration: underline;
-    }
-
-
-    .nav-link:active {
-        color: #68797d;
-        text-decoration: underline;
-    }
-
-    .nav-slink {
-        letter-spacing: -1.2px;
-        font-size: 16pt;
-        color: #7ba1aa;
-        font-family: Arial, sans-serif;
-        text-decoration: none;
-    }
-
-    .nav-slink:active {
-        color: #68797d;
-        text-decoration: underline;
-    }
-
-    .sub-menu {
-        margin-left: auto;
-        margin-right: auto;
-        width: 990px;
-        font-family: Arial, sans-serif;
-        font-size: 10pt;
-        text-align: left;
-        vertical-align:top;
-        padding: 10px 10px 16px 0;
-     }
-
-
-    .select-controls {
-        color: #6A6A6A;
-        font-size: 8pt;
-        font-family: Arial, sans-serif;
-        letter-spacing: 0.1em;
-        text-decoration: none;
-    }
-
-    .select-controls:hover {
-	text-decoration: underline;
-    }
-
-    .add {
-        padding: 0 8px 0 3px;
-        margin: 0;
-        font-family: Arial, sans-serif;
-        text-decoration: none;
-        color: #8B99A2;
-        font-size: 12pt;
-     }
-
-    .add:hover {
-        text-decoration: underline;
-     }
-
-    .add:active {
-        color: #34536A;
-     }
-
-    .counters {
-        line-height: 1.4em;
-        font-size: 9pt;
-        font-family: Arial, sans-serif;
-        color: #2d2d2d;
-        padding: 6px 0 0 0;
-        margin: 0;
-        height:73px;
-    }
-
-    .hostname {
-        font-size: 8pt;
-        font-family: Arial, sans-serif;
-        text-align: left;
-        padding: 0 5;
-        color: #cccccc;
-    }
-
-    .data {
-        border-collapse:collapse;
-        margin-left: auto;
-        margin-right: auto;
-        width: 990px;
-        color: #e5a907;
-        font-family: Arial, serif;
-        font-size: 12pt;
-        text-align: left;
-        vertical-align:top;
-        margin: 0;
-     }
-
-    .data-row:hover {
-        margin: 0;
-        background-color: #f7f6ed;
-    }
-
-    .data-null {
-        margin: 0;
-        width: 990px;
-        height: 10px;
-        border-top:1px dotted #dce8f5;
-    }
-
-    .data-spacer {
-        margin: 0;
-        width: 990px;
-    }
-
-    .data-add {
-        margin: 0;
-        background-color: #f7f6ed;
-    }
-
-    .data-dotted {
-        text-align: left;
-        vertical-align:top;
-        border-top:1px dotted #dce8f5;
-        padding: 0 0 26px 0;
-        margin: 0;
-    }
-
-    .data-dotted td {
-        margin: 0;
-    }
-
-    .data-col1 {
-        text-align: left;
-        padding: 0;
-    }
-
-    .data-col2 {
-        text-align: left;
-        padding: 0;
-        overflow: hidden;
-    }
-
-    .data-col5 {
-        table-layout: fixed;
-        text-align: left;
-        padding: 0;
-        overflow: hidden;
-        white-space: nowrap;
-    }
-
-    .data-date {
-        padding: 0 0 0 18;
-        letter-spacing: 0.3em;
-        font-size: 8pt;
-        font-family: Tahoma;
-        color: #6A6A6A
-    }
-
-    .data-active {
-        font-size: 8pt;
-        font-family: Arial;
-        letter-spacing: 0.1em;
-        color: #9ba68c;
-        padding: 0 0 13 18;
-    }
-
-    .data-suspended {
-        font-size: 8pt;
-        font-family: Arial;
-        letter-spacing: 0.1em;
-        color: #de6c5d;
-        padding: 0 0 13 18;
-    }
-
-    .data-controls {
-        border-left: 1px solid #E6E6E6;
-        font-size: 8pt;
-        font-family: Arial, sans-serif;
-        padding: 2 5 0 5;
-        letter-spacing: 0.1em;
-    }
-
-    .data-controls:hover {
-        background: #f79b44;
-    }
-
-    .data-controls a:link {
-        color: #34536A;
-        text-decoration: none;
-    }
-
-    .data-controls a:visited {
-        color: #34536A;
-        text-decoration: none;
-    }
-
-    .data-controls a:hover {
-        color: #ffffff;
-        text-decoration: none;
-    }
-
-    .data-controls a:active {
-        color: #433832;
-        text-decoration: none;
-    }
-
-    .data-count {
-        background: #ebe9dc;
-        color: #555;
-        font-size: 10pt;
-        font-family: Arial;
-        margin: 22px 0 0 0;
-        padding: 0 12px 0 163px;
-    }
-
-    .chart1 {
-        font-family: Arial, sans-serif;
-        font-size: 10pt;
-    }
-
-    .chart2 {
-        color: #484243;
-        font-family: Arial, sans-serif;
-        font-size: 8pt;
-    }
-
-    .username {
-        color: #555555;
-        font-family: Arial, sans-serif;
-        font-size: 16pt;
-        line-height: 0.8em;
-    }
-
-    .domain {
-        color: #555555;
-        font-family: Arial, sans-serif;
-        font-size: 16pt;
-        line-height: 0.8em;
-    }
-
-    .cron {
-        color: #555555;
-        font-family: Arial, sans-serif;
-        font-size: 14pt;
-    }
-
-    .log {
-        color: #555555;
-        font-family: Arial, sans-serif;
-        font-size: 12pt;
-    }
-
-    .aliases {
-        font-family: Arial;
-        font-size: 12pt;
-        color: #99a7af;
-        padding: 0 0 0 8px;
-    }
-
-    .nginx-ext {
-        color: black;
-        vertical-align:top;
-        font-family: Arial, sans-serif;
-        font-size: 10pt;
-    }
-
-    .fullname {
-        font-family: Arial;
-        font-size: 14pt;
-        color: #99a7af;
-        padding: 0 0 0 8px;
-    }
-
-    .counter-name {
-        vertical-align:top;
-        line-height: 1.2em;
-        font-family: Arial, sans-serif;
-        font-size: 10pt;
-        color: #484243;
-        color: #5c5455;
-    }
-
-    .cron-counter-name {
-        vertical-align:top;
-        line-height: 0.8em;
-        font-family: Arial, sans-serif;
-        font-size: 8pt;
-        padding: 4 0 0 0;
-        color: #484243;
-        color: #5c5455;
-    }
-
-    .counter-value {
-        vertical-align:top;
-        line-height: 1.2em;
-        font-family: Arial, sans-serif;
-        font-size: 10pt;
-        color: black;
-    }
-
-    .log-counter-value {
-        vertical-align:top;
-        font-family: Arial, sans-serif;
-        font-size: 12pt;
-        color: #484243;
-    }
-
-    .cron-counter-value {
-        vertical-align:top;
-        line-height: 1.2em;
-        font-family: Arial, sans-serif;
-        font-size: 12pt;
-        color: #484243;
-    }
-
-    .add-name {
-        font-family: Arial;
-        font-size: 16pt;
-        color: #777;
-        padding: 0 0 0 28px;
-    }
-
-    .add-ok {
-        font-family: Arial;
-        font-size: 14pt;
-        color: #62a358;
-        padding: 0 0 0 6px;
-    }
-
-    .add-error {
-        font-family: Arial;
-        font-size: 14pt;
-        color: #de6c5d;
-        padding: 0 0 0 6px;
-    }
-
-    .add-text {
-        font-family: Arial, sans-serif;
-        font-size: 12pt;
-    }
-
-    .add-textinput {
-        background-color: #FFFFFF;
-        border: 1px solid #999999;
-        border-radius: 3px 3px 3px 3px;
-        color: #555555;
-        font-family: Arial,sans-serif;
-        font-size: 14pt;
-        padding: 6px;
-        width: 360px;
-        height: 120px;
-    }
-    .add-textinput:disabled {
-        background-color: #F1F1F1;
-    }
-
-    .add-input {
-        background-color: #FFFFFF;
-        border: 1px solid #999999;
-        border-radius: 3px 3px 3px 3px;
-        color: #555555;
-        font-family: Arial,sans-serif;
-        font-size: 14pt;
-        padding: 6px;
-        width: 360px;
-    }
-    .add-input:disabled {
-        background-color: #F1F1F1;
-    }
-
-    .add-list {
-        padding: 4px;
-        font-size: 12pt;
-        color: #555;
-    }
-
-    .add-checkbox {
-        padding: 4px;
-        font-size: 12pt;
-    }
-
-    .add-button {
-        cursor: pointer;
-        background-color: #f6f6f6;
-        border: 1px solid #ACACAC;
-        border-radius: 3px 3px 3px 3px;
-        color: #555555;
-        font-size: 12px;
-        font-weight: bold;
-        padding: 3px 16px;
-        width: 105px;
-        padding: 4px;
-        margin: 0 6px 0 0;
-    }
-
-    .add-button:hover {
-        background-color: #f0f0f0;
-    }
-
-    .add-button:active {
-        background-color: #EBE9DC;
-    }
-
-    button {
-        cursor: pointer;
-        color: #333333;
-        background-color: #f6f6f6;
-        border: 1px solid #ACACAC;
-        border-radius: 3px 3px 3px 3px;
-        font-size: 12px;
-        padding: 3px 16px;
-        width: 105px;
-    }
-    button:hover {
-        background-color: #f0f0f0;
-
-    }
-    button:active {
-        background-color: #EBE9DC;
-    }
-
-    .genpass {
-        color: #34536A;
-        font-size: 8pt;
-        font-family: Arial, sans-serif;
-        padding: 0 5px 0 8px;
-        letter-spacing: 0.1em;
-        text-decoration: underline;
-    }
-
-    .genpass:hover {
-        color: #9ba68c;
-    }
-
-
-    .add-advanced {
-        color: #34536A;
-        font-size: 10pt;
-        font-family: Arial, sans-serif;
-        letter-spacing: 0.1em;
-    }
-
-    .add-advanced:hover {
-        color: #9ba68c;
-    }
-
-
-    </style>
-    <link type="text/css" href="/css/jquery-custom-dialogs.css" rel="stylesheet" />
-    <script type="text/javascript" src="/js/jquery-1.7.2.min.js"></script>
-    <script type="text/javascript" src="/js/jquery-ui-1.8.20.custom.min.js"></script>
-    <script language="JavaScript">
-    var checked=false;
-    var frmname='';
-    function checkedAll(frmname) {
-        var valus= document.getElementById(frmname);
-        if (checked==false) {
-            checked=true;
-        } else {
-            checked = false;
-        }
-        for (var i =0; i < valus.elements.length; i++) {
-            valus.elements[i].checked=checked;
-        }
-    }
-    </script>
-</head>
-<body>
-<center>
+    <head>
+        <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
+        <title>Vesta - <?php echo "$TAB"; ?> </title>
+        <style type="text/css">
+
+            body {
+                margin: 0;
+                margin-left: auto;
+                margin-right: auto;
+                background-image: url(/images/b.png);
+            }
+
+            .main {
+                background: #ffffff;
+                box-shadow: 0 0 2px 2px #d7d7d7;
+                border-right: 1px solid #cccccc;
+            <?php
+            if (!empty($_SESSION['look'])) {
+                echo "    border-left: 2px solid #f79b44;\n";
+                echo "                border-right: 2px solid #f79b44;\n";
+            }
+            ?> 
+            }
+
+            .top {
+                background: #555;
+                color: #cce4f0;
+                padding: 0;
+                margin-left: auto;
+                margin-right: auto;
+                width: 990px;
+                font-family: Arial, sans-serif;
+                font-size: 10pt;
+                text-align: left;
+                line-height: 1.2em;
+                border-top: 3px solid white;
+            }
+
+            .top-link {
+                text-decoration: none;
+                color: #e6e6e6;
+            }
+
+            .top-link:hover {
+                text-decoration: underline;
+                color: white;
+            }
+
+            .top-link:active{
+                text-decoration: underline;
+                color: #f5edb6;
+            }
+
+            .top-slink {
+                text-decoration: none;
+                color: #f5edb6;
+            }
+
+            .bottom {
+                background: #ebe9dc;
+                color: #777;
+                margin: 30 0 0 0;
+                padding: 4 20 8 0;
+                margin-left: auto;
+                margin-right: auto;
+                width: 990px;
+                font-family: Arial, sans-serif;
+                font-size: 8pt;
+                text-align: center;
+                vertical-align:top;
+                line-height: 0.8em;
+                border-top: 4px solid #d6d4c9;
+            }
+
+            .bottom a:link {
+                font-size: 8pt;
+                text-decoration: none;
+                color: #777;
+            }
+
+            .bottom a:visited {
+                text-decoration: none;
+                color: #777;
+            }
+
+            .bottom a:hover {
+                text-decoration: underline;
+                color: #333;
+            }
+
+            .nav {
+                background: #ebe9dc;
+                margin-left: auto;
+                margin-right: auto;
+                width: 990px;
+                text-align: left;
+                vertical-align:top;
+                padding: 0;
+                border-bottom: 8px solid #F7F6ED;
+            }
+
+            .nav td {
+                text-align: left;
+                vertical-align:top;
+                margin: 0;
+                padding: 0;
+                width: 103px;
+            }
+
+            #nav-block {
+                padding: 0;
+            }
+
+            .logotd{
+                width: 152px !important;
+            }
+
+            .logotd:hover{
+                background: #ebe9dc !important;
+            }
+
+            #nav-block td {
+                display: inline;
+                list-style: none outside none;
+                float: left;
+                padding: 16px 7 2px 8px;
+                line-height: 1.0em;
+                font-size: 9pt;
+                font-family: Arial, sans-serif;
+                color: #2d2d2d;
+                background: url(/images/transparent-image.png) no-repeat;
+            }
+
+            #nav-block td:hover {
+                background: #fafafa;
+                color: black;
+            }
+
+            .nav-active{
+                background: #fafafa !important;
+            }
+
+            .nav-link {
+                letter-spacing: -1.2px;
+                font-size: 16pt;
+                color: #555;
+                font-family: Arial, sans-serif;
+                text-decoration: none;
+            }
+
+            .nav-link:hover {
+                color: #333;
+                text-decoration: underline;
+
+            }
+
+            .nav-link:active {
+                color: #ccc;
+                text-decoration: underline;
+            }
+
+            .nav-slink {
+                letter-spacing: -1.2px;
+                font-size: 16pt;
+                color: #7fa1cb;
+                font-family: Arial, sans-serif;
+                text-decoration: none;
+            }
+
+            .nav-slink:active {
+                color: #ccc;
+                text-decoration: underline;
+            }
+
+            .sub-menu {
+                margin-left: auto;
+                margin-right: auto;
+                width: 990px;
+                font-family: Arial, sans-serif;
+                font-size: 10pt;
+                text-align: left;
+                vertical-align:top;
+                padding: 0px 10px 0px 0;
+            }
+
+            .select-controls {
+                color: #6A6A6A;
+                font-size: 8pt;
+                font-family: Arial, sans-serif;
+                letter-spacing: 0.1em;
+                text-decoration: none;
+            }
+
+            .select-controls:hover {
+                text-decoration: underline;
+            }
+
+            .add {
+                padding: 0 8px 0 3px;
+                margin: 0;
+                font-family: Arial, sans-serif;
+                text-decoration: none;
+                color: #8B99A2;
+                font-size: 12pt;
+            }
+
+            .add:hover {
+                text-decoration: underline;
+            }
+
+            .add:active {
+                color: #34536A;
+            }
+
+            .counters {
+                height: 58px;
+                line-height: 1.4em;
+                font-size: 9pt;
+                font-family: Arial, sans-serif;
+                color: #2d2d2d;
+                padding: 8px 0 0 0;
+                margin: 0;
+            }
+
+            .data {
+                border-collapse:collapse;
+                margin-left: auto;
+                margin-right: auto;
+                width: 990px;
+                color: #e5a907;
+                font-family: Arial, serif;
+                font-size: 12pt;
+                text-align: left;
+                vertical-align:top;
+                margin: 0;
+                behavior:url("/css/csshover3.htc");
+            }
+
+            .data-row:hover {
+                margin: 0;
+                background-color: #f7f6ed;
+            }
+
+            .datarowhover {
+                margin: 0;
+                background-color: #f7f6ed;
+            }
+
+            .data-null {
+                margin: 0;
+                width: 990px;
+                height: 10px;
+                border-top:1px dotted #dce8f5;
+            }
+
+            .data-spacer {
+                margin: 0;
+                width: 990px;
+            }
+
+            .data-add {
+                margin: 0;
+                background-color: #f7f6ed;
+            }
+
+            .data-dotted {
+                text-align: left;
+                vertical-align:top;
+                border-top:1px dotted #dce8f5;
+                padding: 0 0 26px 0;
+                margin: 0;
+            }
+
+            .data-dotted td {
+                margin: 0;
+            }
+
+            .data-col1 {
+                text-align: left;
+                padding: 0;
+            }
+
+            .data-col2 {
+                text-align: left;
+                padding: 0;
+                overflow: hidden;
+            }
+
+            .data-col5 {
+                table-layout: fixed;
+                text-align: left;
+                padding: 0;
+                overflow: hidden;
+                white-space: nowrap;
+            }
+
+            .data-date {
+                padding: 0 0 0 18;
+                letter-spacing: 0.3em;
+                font-size: 8pt;
+                font-family: Tahoma;
+                color: #6A6A6A
+            }
+
+            .data-active {
+                font-size: 8pt;
+                font-family: Arial;
+                letter-spacing: 0.1em;
+                color: #9ba68c;
+                padding: 0 0 13 18;
+            }
+
+            .data-suspended {
+                font-size: 8pt;
+                font-family: Arial;
+                letter-spacing: 0.1em;
+                color: #de6c5d;
+                padding: 0 0 13 18;
+            }
+
+            .data-controls {
+                border-left: 1px solid #E6E6E6;
+                font-size: 8pt;
+                font-family: Arial, sans-serif;
+                padding: 2 5 0 5;
+                letter-spacing: 0.1em;
+            }
+
+            .data-controls:hover {
+                background: #f79b44;
+            }
+
+            .data-controls a:link {
+                color: #34536A;
+                text-decoration: none;
+            }
+
+            .data-controls a:visited {
+                color: #34536A;
+                text-decoration: none;
+            }
+
+            .data-controls a:hover {
+                color: #ffffff;
+                text-decoration: none;
+            }
+
+            .data-controls a:active {
+                color: #433832;
+                text-decoration: none;
+            }
+
+            .data-count {
+                background: #ebe9dc;
+                color: #555;
+                font-size: 8pt;
+                font-family: Arial;
+                margin: 18px 0 0 0;
+                text-align:right;
+                padding: 0 16px 0 0;
+            }
+
+            .chart1 {
+                font-family: Arial, sans-serif;
+                font-size: 10pt;
+            }
+
+            .chart2 {
+                color: #484243;
+                font-family: Arial, sans-serif;
+                font-size: 8pt;
+            }
+
+            .username {
+                color: #555555;
+                font-family: Arial, sans-serif;
+                font-size: 16pt;
+                line-height: 1.2em;
+            }
+
+            .domain {
+                color: #555555;
+                font-family: Arial, sans-serif;
+                font-size: 16pt;
+                line-height: 0.8em;
+            }
+
+            .cron {
+                color: #555555;
+                font-family: Arial, sans-serif;
+                font-size: 14pt;
+            }
+
+            .log {
+                color: #555555;
+                font-family: Arial, sans-serif;
+                font-size: 12pt;
+            }
+
+            .aliases {
+                font-family: Arial;
+                font-size: 12pt;
+                color: #99a7af;
+                padding: 0 0 0 8px;
+            }
+
+            .nginx-ext {
+                color: black;
+                vertical-align:top;
+                font-family: Arial, sans-serif;
+                font-size: 10pt;
+            }
+
+            .fullname {
+                font-family: Arial;
+                font-size: 14pt;
+                color: #99a7af;
+                padding: 0 0 0 8px;
+            }
+
+            .counter-name {
+                vertical-align:top;
+                line-height: 1.2em;
+                font-family: Arial, sans-serif;
+                font-size: 10pt;
+                color: #484243;
+                color: #5c5455;
+            }
+
+            .cron-counter-name {
+                vertical-align:top;
+                line-height: 0.8em;
+                font-family: Arial, sans-serif;
+                font-size: 8pt;
+                padding: 4 0 0 0;
+                color: #484243;
+                color: #5c5455;
+            }
+
+            .counter-value {
+                vertical-align:top;
+                line-height: 1.2em;
+                font-family: Arial, sans-serif;
+                font-size: 10pt;
+                color: black;
+            }
+
+            .log-counter-value {
+                vertical-align:top;
+                font-family: Arial, sans-serif;
+                font-size: 12pt;
+                color: #484243;
+            }
+
+            .cron-counter-value {
+                vertical-align:top;
+                line-height: 1.2em;
+                font-family: Arial, sans-serif;
+                font-size: 12pt;
+                color: #484243;
+            }
+
+            .add-name {
+                font-family: Arial;
+                font-size: 16pt;
+                color: #777;
+                padding: 0 0 0 10px;
+            }
+
+            .add-ok {
+                font-family: Arial;
+                font-size: 14pt;
+                color: #62a358;
+                padding: 0 0 0 6px;
+            }
+
+            .add-error {
+                font-family: Arial;
+                font-size: 14pt;
+                color: #de6c5d;
+                padding: 0 0 0 6px;
+            }
+
+            .add-text {
+                font-family: Arial, sans-serif;
+                font-size: 12pt;
+            }
+
+            .add-textinput {
+                background-color: #FFFFFF;
+                border: 1px solid #999999;
+                border-radius: 3px 3px 3px 3px;
+                color: #555555;
+                font-family: Arial,sans-serif;
+                font-size: 14pt;
+                padding: 6px;
+                width: 360px;
+                height: 120px;
+            }
+
+            .add-textinput:disabled {
+                background-color: #F1F1F1;
+            }
+
+            .add-input {
+                background-color: #FFFFFF;
+                border: 1px solid #999999;
+                border-radius: 3px 3px 3px 3px;
+                color: #555555;
+                font-family: Arial,sans-serif;
+                font-size: 14pt;
+                padding: 6px;
+                width: 360px;
+            }
+
+            .add-input:disabled {
+                background-color: #F1F1F1;
+            }
+
+            .add-list {
+                padding: 4px;
+                font-size: 12pt;
+                color: #555;
+            }
+
+            .add-checkbox {
+                padding: 4px;
+                font-size: 12pt;
+            }
+
+            button {
+                cursor: pointer;
+                color: #333;
+                background-color: #fafafa;
+                border: 1px solid #ACACAC;
+                border-radius: 3px 3px 3px 3px;
+                font-size: 12px;
+                padding: 2px 16px;
+                width: 108px;
+            }
+
+            button:hover {
+                background-color: #f0f0f0;
+            }
+
+            button:active {
+                background-color: #EBE9DC;
+            }
+
+            .button {
+                cursor: pointer;
+                color: #333;
+                background-color: #fafafa;
+                border: 1px solid #ACACAC;
+                border-radius: 3px 3px 3px 3px;
+                font-size: 14px;
+                padding: 2px 16px;
+                width: 108px;
+            }
+
+            .button:hover {
+                background-color: #f0f0f0;
+            }
+
+            .button:active {
+                background-color: #EBE9DC;
+            }
+
+            .genpass {
+                color: #34536A;
+                font-size: 8pt;
+                font-family: Arial, sans-serif;
+                padding: 0 5px 0 8px;
+                letter-spacing: 0.1em;
+                text-decoration: underline;
+            }
+
+            .genpass:hover {
+                color: #9ba68c;
+            }
+
+            .add-advanced {
+                color: #34536A;
+                font-size: 10pt;
+                font-family: Arial, sans-serif;
+                letter-spacing: 0.1em;
+            }
+
+            .add-advanced:hover {
+                color: #9ba68c;
+            }
+
+            /* fixed header */
+            .fixed{
+                position: fixed;
+                border: none;
+                top: -3px;
+            }
+
+            *html .fixed{
+                position:absolute;
+                position:fixed; _position:absolute; top:0; _top:expression( eval(document.body.scrollTop) + 'px' );
+            }
+
+            #vstobjects{
+                padding-top: 186px;
+                width: 996px;
+                padding-left: 3px;
+            }
+
+        </style>
+        <!--[if IE]>
+            <style type="text/css">
+                html, body, div, span, applet, object, iframe {
+                    margin: 0;
+                    padding: 0;
+                    border: 0;
+                    font-size: 100%;
+                    font: inherit;
+                    vertical-align: baseline;
+                }
+
+                .top {
+                    border-top: 5px solid white;
+                }
+
+                .fixed {
+                    margin-top: -3px;
+                }
+
+                #vstobjects{
+                    padding-top: 186px;
+                    width: 996px;
+                }
+
+                #nav-block td {
+                    display: inline;
+                    list-style: none outside none;
+                    float: left;
+                    height: 94px;
+                    padding: 20px 11px 12px 13px;
+                    line-height: 1.0em;
+                    font-size: 9pt;
+                    font-family: Arial, sans-serif;
+                    color: #2d2d2d;
+                    background: url(/images/transparent-image.png) no-repeat;
+                }
+
+            </style>
+        <![endif]-->
+        <link type="text/css" href="/css/jquery-custom-dialogs.css" rel="stylesheet" />
+        <script type="text/javascript" src="/js/jquery-1.7.2.min.js"></script>
+        <script type="text/javascript" src="/js/jquery-ui-1.8.20.custom.min.js"></script>
+        <script language="JavaScript">
+            var checked=false;
+            var frmname='';
+            function checkedAll(frmname) {
+                var valus= document.getElementById(frmname);
+                if (checked==false) {
+                    checked=true;
+                } else {
+                    checked = false;
+                }
+                for (var i =0; i < valus.elements.length; i++) {
+                    valus.elements[i].checked=checked;
+                }
+            }
+        </script>
+    </head>
+    <body>
+    <center>
+        <table class="main">
+            <tr>
+                <td>
+                    <table class="fixed" >
+                        <tr>
+                            <td>
diff --git a/web/templates/login.html b/web/templates/login.html
index ef4db9eb0..e236482b8 100644
--- a/web/templates/login.html
+++ b/web/templates/login.html
@@ -1,5 +1,5 @@
     <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-    <title> VestaCP - Login </title>
+    <title> Vesta - Login </title>
     <style type="text/css">
     body {
         padding: 0;
diff --git a/web/templates/user/edit_user.html b/web/templates/user/edit_user.html
index ad1826340..c06adb8a0 100644
--- a/web/templates/user/edit_user.html
+++ b/web/templates/user/edit_user.html
@@ -1,48 +1,115 @@
-<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" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
-            <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
-            <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-        <form method="post" name="v_edit_user">
-        <table class="data-col2" width="830px">
-            <tr><td class="add-text" style="padding: 10 0 0 2px;">Username</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_user" <?php if (!empty($v_username)) echo "value=".$v_username;  ?> disabled> <input type="hidden" name="v_username" <?php if (!empty($v_username)) echo "value=".$v_username;  ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">
-                Password <a href="javascript:randomString();" class="genpass">generate</a></td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_password" <?php if (!empty($v_password)) echo "value=".$v_password;  ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Email</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_email" <?php if (!empty($v_email)) echo "value=".$v_email; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Default Name Servers </td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>></tr>
-            <tr><td style="padding: 24px 0 0 0;">
-                <input type="submit" class="add-button" name="save" value="Save">
-                </form>
-                <input type="button" class="add-button" value="Cancel" onClick="location.href='/list/user/'">
-            </td></tr>
-        </table>
-    </td>
-</tr>
-</table>
+
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing User</b></a>
+                                            <?php
+                                                if (!empty($_SESSION['error_msg'])) {
+                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                    }
+                                                }
+                                            ?>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+
+                    <form id="vstobjects" method="post" name="v_edit_user">
+                        <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" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
+                                        <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
+                                        <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td class="add-text" style="padding: 10 0 0 2px;">
+                                                Username
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_user" <?php if (!empty($v_username)) echo "value=".$v_username;  ?> disabled> <input type="hidden" name="v_username" <?php if (!empty($v_username)) echo "value=".$v_username;  ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Password <a href="javascript:randomString();" class="genpass">generate</a>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_password" <?php if (!empty($v_password)) echo "value=".$v_password;  ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Email
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_email" <?php if (!empty($v_email)) echo "value=".$v_email; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Default Name Servers
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns1" <?php if (!empty($v_ns1)) echo "value=".$v_ns1; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns2" <?php if (!empty($v_ns2)) echo "value=".$v_ns2; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns3" <?php if (!empty($v_ns3)) echo "value=".$v_ns3; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_ns4" <?php if (!empty($v_ns4)) echo "value=".$v_ns4; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="padding: 24px 0 0 0;">
+                                                <input type="submit" class="button" name="save" value="Save">
+                                                <input type="button" class="button" value="Cancel" onClick="location.href='/list/user/'">
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </form>
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html
index 22a44a30b..c3ca84075 100644
--- a/web/templates/user/list_user.html
+++ b/web/templates/user/list_user.html
@@ -1,150 +1,234 @@
-<table class='data'>
 
-<?php
-foreach ($data as $key => $value) {
-    ++$i;
-    if ($data[$key]['SUSPENDED'] == 'yes') {
-        $status = 'suspended';
-        $spnd_action = 'unsuspend' ;
-    } else {
-        $status = 'active';
-        $spnd_action = 'suspend' ;
-    }
-    ?>
-<script type="text/javascript">
-    $(function(){
-        $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog({
-            modal: true,
-            autoOpen: false,
-            width: 360,
-            buttons: {
-                "Ok": function(event, ui) {
-                     location.href = '/<?php echo $spnd_action ?>/user/?user=<?php echo "$key" ?>';
-                },
-                "Cancel": function() {
-                    $(this).dialog("close");
-                }
-            }
-        });
-        $('#<?php echo $spnd_action ?>_link_<?php echo "$i" ?>').click(function(){
-            $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog('open');
-            return false;
-        });
-
-        $('#delete_dialog_<?php echo "$i" ?>').dialog({
-            modal: true,
-            autoOpen: false,
-            width: 360,
-            buttons: {
-                "Ok": function(event, ui) {
-                     location.href = '/delete/user/?user=<?php echo "$key" ?>';
-                },
-                "Cancel": function() {
-                    $(this).dialog("close");
-                }
-            }
-        });
-        $('#delete_link_<?php echo "$i" ?>').click(function(){
-            $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
-            return false;
-        });
-    });
-</script>
-<tr class="data-row">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object"></td></tr>
-            <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE']))?></a></td></tr>
-            <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-            <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/user/?user=<?php echo "$key" ?>"> edit</a></td>
-        </tr></table>
-
-        <table class="data-col2" width="830px">
-            <tr><td colspan=3 class="username" style="padding: 0 0 0 4px;"><b><?php echo $key ?></b><a class="fullname"><?php echo $data[$key]['FNAME']?> <?php echo $data[$key]['LNAME']?></a></td></tr>
-            <td style="vertical-align:top;"  width="240">
-                <table>
-                    <tr><td colspan=2 class="counter-name"  style="padding: 2px 0 0 2px;"><?php echo $data[$key]['CONTACT']?></td></tr>
-                    <tr><td colspan=2 class="counter-name"  style="padding: 0 0 18px 2px;">[<?php echo $data[$key]['PACKAGE']?>] package</td></tr>
-                    <tr><td class="chart1" colspan=2 style="padding: 0 0 0 3px;">Bandwidth: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
-                        <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;"><div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div></div></td></tr>
-                    <tr><td class="chart1" colspan=2 style="padding: 0 0 0 3px;">Disk: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
-                        <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;"><div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div></div></td></tr>
-                    <tr><td colspan=2>
-                        <table class="chart2"><tr>
-                            <td>
-                                Web: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
-                                Mail: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
-                            </td><td style="padding: 0px 10px 0px 8px">
-                                Databases: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?><br>
-                                User Dirs: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?><br>
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 0 8px 6px">
+                                            <div style="float:left">
+                                                <?php
+                                                    if ($user == 'admin') {
+                                                        echo "<button style=\"width:120px; padding: 2px 0px;\" onclick=\"location.href='/add/user/'\"> Add User </button>";
+                                                    } else {
+                                                        echo "<button style=\"width:120px; padding: 2px 0px;\" onclick=\"location.href='/add/web/'\"> Add Domain </button>";
+                                                    }
+                                                ?> 
+                                            </div>
+                                            <div style="text-align: right; float: right;">
+                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;">
+                                                <button> Search </button>
+                                            </div>
+                                            <div style="float:left; padding-left: 26px;">
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+                                                <select style="margin:0 2px 0 0px;" >
+                                                    <option>apply to selected</option>
+                                                    <option>update counters</option>
+                                                </select>
+                                                <button style="width:27px;"> › </button>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
                             </td>
-                        </tr></table></td>
-                    </tr>
-                </table>
-            </td>
-            <td style="vertical-align:top;" width="320">
-                <table width="300">
-                    <tr><td class="counter-name" width="36%">Predefined Template:</td>
-                    <td class="counter-value"><?php echo $data[$key]['TEMPLATE'] ?></td></tr>
-                    <tr><td class="counter-name">Web Domains:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?> / <?php echo $data[$key]['WEB_DOMAINS'] ?></td></tr>
-                    <tr><td class="counter-name">Web SSL:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_WEB_SSL'] ?></td></tr>
-                    <tr><td class="counter-name">Web Aliases:</td>
-                    <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> per domain</td></tr>
-                    <tr><td class="counter-name">Dns Domains:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_DNS_DOMAINS'] ?> / <?php echo $data[$key]['DNS_DOMAINS'] ?></td></tr>
-                    <tr><td class="counter-name">Dns Records:</td>
-                    <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> per domain</td></tr>
-                    <tr><td class="counter-name">Name Servers:<br></td>
-                    <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?></td></tr>
-                </table></td>
-            <td style="vertical-align:top;">
-                <table class="data-col4">
-                    <tr><td class="counter-name">Mail Domains:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td></tr>
-                    <tr><td class="counter-name">Mail Accounts:</td>
-                    <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> per domain</td></tr>
-                    <tr><td class="counter-name">Databases:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_DATABASES'] ?> / <?php echo $data[$key]['DATABASES'] ?></td></tr>
-                    <tr><td class="counter-name">Cron Jobs:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_CRON_JOBS'] ?> / <?php echo $data[$key]['CRON_JOBS'] ?></td></tr>
-                    <tr><td class="counter-name">Shell:</td>
-                    <td class="counter-value"><?php echo $data[$key]['SHELL'] ?></td></tr>
-                    <tr><td class="counter-name">Dedicated IP:</td>
-                    <td class="counter-value"><?php echo $data[$key]['IP_OWNED'] ?></td></tr>
-                    <tr><td class="counter-name">Backups:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_BACKUPS'] ?> / <?php echo $data[$key]['BACKUPS'] ?></td></tr>
-                </table>
-            </td>
-        </tr>
-        </table>
-    </td>
-</tr>
+                        </tr>
+                    </table>
 
-    <?php
-}
-?>
+                    <form id="vstobjects">
+                        <table class="data">
+                            <?php
+                                foreach ($data as $key => $value) {
+                                    ++$i;
+                                    if ($data[$key]['SUSPENDED'] == 'yes') {
+                                        $status = 'suspended';
+                                        $spnd_action = 'unsuspend' ;
+                                    } else {
+                                        $status = 'active';
+                                        $spnd_action = 'suspend' ;
+                                    }
+                                ?>
 
-</table>
-<?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-<table class="data-count">
-<tr>
-    <td>→ 
-    <?php
-        if ( $i == 1) {
-            echo "1 user account ";
-        } else {
-            echo "$i user accounts ";
-        }
-    ?>
-    </td>
-</tr>
-</table>
-</form>
-<?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:70px\"><tr><td></td></tr></table>"; ?>
+                            <script type="text/javascript">
+                                $(function(){
+                                    $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog({
+                                        modal: true,
+                                        autoOpen: false,
+                                        width: 360,
+                                        buttons: {
+                                            "Ok": function(event, ui) {
+                                                 location.href = '/<?php echo $spnd_action ?>/user/?user=<?php echo "$key" ?>';
+                                            },
+                                            "Cancel": function() {
+                                                $(this).dialog("close");
+                                            }
+                                        }
+                                    });
+                                    $('#<?php echo $spnd_action ?>_link_<?php echo "$i" ?>').click(function(){
+                                        $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog('open');
+                                        return false;
+                                    });
+                                    $('#delete_dialog_<?php echo "$i" ?>').dialog({
+                                        modal: true,
+                                        autoOpen: false,
+                                        width: 360,
+                                        buttons: {
+                                            "Ok": function(event, ui) {
+                                                 location.href = '/delete/user/?user=<?php echo "$key" ?>';
+                                            },
+                                            "Cancel": function() {
+                                                $(this).dialog("close");
+                                            }
+                                        }
+                                    });
+                                    $('#delete_link_<?php echo "$i" ?>').click(function(){
+                                        $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
+                                        return false;
+                                    });
+                                });
+                            </script>
+
+                            <tr class="data-row">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object"></td></tr>
+                                        <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE']))?></a></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                            <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/user/?user=<?php echo "$key" ?>"> edit</a></td>
+                                        </tr>
+                                    </table>
+
+                                    <table class="data-col2" width="830px">
+                                        <tr>
+                                            <td colspan=3 class="username" style="padding: 0 0 0 4px;"><b><?php echo $key ?></b><a class="fullname"><?php echo $data[$key]['FNAME']?> <?php echo $data[$key]['LNAME']?></a></td>
+                                        </tr>
+                                        <tr>
+                                            <td style="vertical-align:top;"  width="240">
+                                                <table>
+                                                    <tr><td colspan=2 class="counter-name"  style="padding: 2px 0 0 2px;"><?php echo $data[$key]['CONTACT']?></td></tr>
+                                                    <tr><td colspan=2 class="counter-name"  style="padding: 0 0 18px 2px;">[<?php echo $data[$key]['PACKAGE']?>] package</td></tr>
+                                                    <tr>
+                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;">Bandwidth: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
+                                                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                                <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 3px;">Disk: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
+                                                            <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                                <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td colspan=2>
+                                                            <table class="chart2">
+                                                                <tr>
+                                                                    <td>
+                                                                        Web: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?><br>
+                                                                        Mail: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?><br>
+                                                                    </td>
+                                                                    <td style="padding: 0px 10px 0px 8px">
+                                                                        Databases: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?><br>
+                                                                        User Dirs: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?><br>
+                                                                    </td>
+                                                                </tr>
+                                                            </table>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;" width="320">
+                                                <table width="300">
+                                                    <tr>
+                                                        <td class="counter-name" width="36%">Template:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['TEMPLATE'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Web Domains:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?> / <?php echo $data[$key]['WEB_DOMAINS'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Web SSL:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['U_WEB_SSL'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Web Aliases:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['WEB_ALIASES'] ?> per domain</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Dns Domains:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['U_DNS_DOMAINS'] ?> / <?php echo $data[$key]['DNS_DOMAINS'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Dns Records:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['DNS_RECORDS'] ?> per domain</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Name Servers:<br></td>
+                                                        <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?></td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;">
+                                                <table class="data-col4">
+                                                    <tr>
+                                                        <td class="counter-name">Mail Domains:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Mail Accounts:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['MAIL_ACCOUNTS'] ?> per domain</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Databases:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['U_DATABASES'] ?> / <?php echo $data[$key]['DATABASES'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Cron Jobs:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['U_CRON_JOBS'] ?> / <?php echo $data[$key]['CRON_JOBS'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Shell:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['SHELL'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Dedicated IP:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['IP_OWNED'] ?></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">Backups:</td>
+                                                        <td class="counter-value"><?php echo $data[$key]['U_BACKUPS'] ?> / <?php echo $data[$key]['BACKUPS'] ?></td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            <?php
+                                }
+                            ?> 
+                        </table>
+
+                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
+
+                        <table class="data-count">
+                            <tr>
+                                <td width="160px"></td>
+                                <td>
+                                    <?php
+                                        if ( $i == 1) {
+                                            echo "1 user account ";
+                                        } else {
+                                            echo "$i user accounts ";
+                                        }
+                                    ?> 
+                                </td>
+                            </tr>
+                        </table>
+                    </form>
+
+                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:70px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/user/menu_user.html b/web/templates/user/menu_user.html
deleted file mode 100644
index ebc4ba903..000000000
--- a/web/templates/user/menu_user.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td width="142px" style="padding: 16px 0 16px 6px">
-    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/web/'">Add Domain</button>
-</td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-</tr>
-</table>
-<form id="vstobjects">
diff --git a/web/templates/user/panel.html b/web/templates/user/panel.html
index 23a2686e3..f1f04c435 100644
--- a/web/templates/user/panel.html
+++ b/web/templates/user/panel.html
@@ -1,44 +1,70 @@
-<table class="main"><tr><td>
-<table class="top">
-<tr>
-    <td width="196px"><p class="hostname"><?php echo exec('hostname') ?></p></td>
-    <td width="76px"><b><a class="top-<?php if($TAB == 'STATS' ) echo 's' ?>link" href="/list/stats/">Statistics</a></b></td>
-    <td width="90px"><b><a class="top-<?php if($TAB == 'LOG' ) echo 's' ?>link" href="/list/log/">History Log</a></b></td>
-    <td></td>
-    <td width="260px"><b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b><a class="top-link" style="padding: 0 0 0 6" href="/logout/">Log out</a></td>
-</tr>
-</table>
-<table class="nav">
-<tr>
-    <td style="padding: 34px 30px 0px 26px;">
-        <img src="/images/logo.png" width="124px" height="46px">
-    </td>
-    <td><div id="nav-block"><ul>
-        <li><b><a class="nav-<?php if($TAB == 'USER' ) echo 's' ?>link" href="/list/user/">USER</b></a><p class="counters">
-            users: <? echo $panel[$user]['U_USERS'] ?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_USERS']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'WEB' ) echo 's' ?>link" href="/list/web/">WEB</a></b><p class="counters">
-            domains: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
-            aliases: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
-            webssl: <? echo $panel[$user]['U_WEB_SSL']?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_WEB']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'DNS' ) echo 's' ?>link" href="/list/dns/">DNS</a></b><p class="counters">
-            domains: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
-            records: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_DNS']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'MAIL' ) echo 's' ?>link" href="/list/mail/">MAIL</a></b><p class="counters">
-            domains: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
-            dkim: <? echo $panel[$user]['U_MAIL_DKIM']?><br>
-            accounts: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_MAIL']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'DB' ) echo 's' ?>link" href="/list/db/">DB</a></b><p class="counters">
-            databases: <? echo $panel[$user]['U_DATABASES']?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_DB']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'CRON' ) echo 's' ?>link" href="/list/cron/">CRON</a></b><p class="counters">
-            jobs: <? echo $panel[$user]['U_CRON_JOBS']?><br>
-            suspended: <? echo $panel[$user]['SUSPENDED_CRON']?></p></li>
-        <li><b><a class="nav-<?php if($TAB == 'BACKUP' ) echo 's' ?>link" href="/list/backup/">BACKUP</a></a></b><p class="counters">
-            backups: <? echo $panel[$user]['U_BACKUPS']?><br>
-    <ul></div></td>
-</tr>
-</table>
+                                <table class="top">
+                                    <tr>
+                                        <td width="174px"></td>
+                                        <td width="118px"><a class="top-<?php if($TAB == 'STATS' ) echo 's' ?>link" href="/list/stats/"><b>Statistics</a></b></td>
+                                        <td width="120px"><a class="top-<?php if($TAB == 'LOG' ) echo 's' ?>link" href="/list/log/"><b>History Log</a></b></td>
+                                        <td width="120px"></td>
+                                        <td width="120px"></td>
+                                        <td width="120px"></td>
+                                        <td width="250px" style="padding: 0 5px 0 0; text-align: right;"><b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b><a class="top-link" style="padding: 0 0 0 6" href="/logout/">Log out</a></td>
+                                    </tr>
+                                </table>
+                                <table class="nav">
+                                    <tr id="nav-block">
+                                        <td class="logotd" style="padding: 20px 0px 0px 4px; float: left;">
+                                            <img src="/images/logo.png" width="124px" height="46px" alt="Vesta logo">
+                                        </td>
+                                        <td>
+                                            <a class="nav-<?php if($TAB == 'USER' ) echo 's' ?>link" href="/list/user/"><b>USER</b></a>
+                                            <p class="counters">
+                                                disk: <? echo humanize_usage($panel[$user]['U_DISK']) ?> <br>
+                                                traffic: <? echo humanize_usage($panel[$user]['U_BANDWIDTH']) ?><br>
+                                                suspended: <? echo $panel[$user]['SUSPENDED']?> 
+                                            </p>
+                                        </td>
+                                        <td>
+                                            <a class="nav-<?php if($TAB == 'WEB' ) echo 's' ?>link" href="/list/web/"><b>WEB</b></a>
+                                            <p class="counters">
+                                                domains: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
+                                                aliases: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
+                                                suspended: <? echo $panel[$user]['SUSPENDED_WEB']?> 
+                                            </p>
+                                        </td>
+                                        <td>
+                                            <a class="nav-<?php if($TAB == 'DNS' ) echo 's' ?>link" href="/list/dns/"><b>DNS</b></a>
+                                            <p class="counters">
+                                                domains: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
+                                                records: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
+                                                suspended: <? echo $panel[$user]['SUSPENDED_DNS']?> 
+                                            </p>
+                                        </td>
+                                        <td>
+                                            <a class="nav-<?php if($TAB == 'MAIL' ) echo 's' ?>link" href="/list/mail/"><b>MAIL</b></a>
+                                            <p class="counters">
+                                                domains: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
+                                                accounts: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
+                                                suspended: <? echo $panel[$user]['SUSPENDED_MAIL']?> 
+                                            </p>
+                                        </td>
+                                        <td>
+                                            <a class="nav-<?php if($TAB == 'DB' ) echo 's' ?>link" href="/list/db/"><b>DB</b></a>
+                                            <p class="counters">
+                                                databases: <? echo $panel[$user]['U_DATABASES']?><br>
+                                                suspended: <? echo $panel[$user]['SUSPENDED_DB']?> 
+                                            </p>
+                                        </td>
+                                        <td>
+                                            <a class="nav-<?php if($TAB == 'CRON' ) echo 's' ?>link" href="/list/cron/"><b>CRON</b></a>
+                                            <p class="counters">
+                                                jobs: <? echo $panel[$user]['U_CRON_JOBS']?><br>
+                                                suspended: <? echo $panel[$user]['SUSPENDED_CRON']?> 
+                                            </p>
+                                        </td>
+                                        <td>
+                                            <a class="nav-<?php if($TAB == 'BACKUP' ) echo 's' ?>link" href="/list/backup/"><b>BACKUP</b></a>
+                                            <p class="counters">
+                                                backups: <? echo $panel[$user]['U_BACKUPS']?><br> 
+                                            </p>
+                                        </td>
+                                    </tr>
+                                </table>