diff --git a/web/list/backup/index.php b/web/list/backup/index.php
index 8431b61ba..38cc060dc 100644
--- a/web/list/backup/index.php
+++ b/web/list/backup/index.php
@@ -12,15 +12,11 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 top_panel($user,$TAB);
 
 // Data
-//if ($_SESSION['user'] == 'admin') {
-
-    exec (VESTA_CMD."v_list_user_backups $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/admin/list_backup.html');
-//}
+exec (VESTA_CMD."v_list_user_backups $user json", $output, $return_var);
+$data = json_decode(implode('', $output), true);
+$data = array_reverse($data);
+unset($output);
+include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_backup.html');
 
 // Footer
 include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/list/dns/index.php b/web/list/dns/index.php
index c5413f38b..46ab3cd58 100644
--- a/web/list/dns/index.php
+++ b/web/list/dns/index.php
@@ -16,14 +16,12 @@ if ($_SESSION['user'] == 'admin') {
 
     if (empty($_GET['domain'])){
         exec (VESTA_CMD."v_list_dns_domains $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/admin/list_dns.html');
     } else {
         exec (VESTA_CMD."v_list_dns_domain_records '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var);
-        check_error($return_var);
         $data = json_decode(implode('', $output), true);
         $data = array_reverse($data);
         unset($output);
@@ -32,14 +30,12 @@ if ($_SESSION['user'] == 'admin') {
 } else {
     if (empty($_GET['domain'])){
         exec (VESTA_CMD."v_list_dns_domains $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/list_dns.html');
     } else {
         exec (VESTA_CMD."v_list_dns_domain_records '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var);
-        check_error($return_var);
         $data = json_decode(implode('', $output), true);
         $data = array_reverse($data);
         unset($output);
diff --git a/web/list/ip/index.php b/web/list/ip/index.php
index 11332b316..9d0b30ca0 100644
--- a/web/list/ip/index.php
+++ b/web/list/ip/index.php
@@ -16,7 +16,6 @@ top_panel($user,$TAB);
 // Data
 if ($_SESSION['user'] == 'admin') {
     exec (VESTA_CMD."v_list_sys_ips json", $output, $return_var);
-    check_error($return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data);
     unset($output);
diff --git a/web/list/mail/index.php b/web/list/mail/index.php
index 5d80f3f63..add148b12 100644
--- a/web/list/mail/index.php
+++ b/web/list/mail/index.php
@@ -16,14 +16,12 @@ if ($_SESSION['user'] == 'admin') {
 
     if (empty($_GET['domain'])){
         exec (VESTA_CMD."v_list_mail_domains $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/admin/list_mail.html');
     } else {
         exec (VESTA_CMD."v_list_mail_accounts '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var);
-        check_error($return_var);
         $data = json_decode(implode('', $output), true);
         $data = array_reverse($data);
         unset($output);
@@ -33,7 +31,6 @@ if ($_SESSION['user'] == 'admin') {
 
     if (empty($_GET['domain'])){
         exec (VESTA_CMD."v_list_mail_domains $user json", $output, $return_var);
-        check_error($return_var);
         $data = json_decode(implode('', $output), true);
         $data = array_reverse($data);
         unset($output);
@@ -41,7 +38,6 @@ if ($_SESSION['user'] == 'admin') {
         include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_mail.html');
     } else {
         exec (VESTA_CMD."v_list_mail_accounts '".$user."' '".$_GET['domain']."' 'json'", $output, $return_var);
-        check_error($return_var);
         $data = json_decode(implode('', $output), true);
         $data = array_reverse($data);
         unset($output);
diff --git a/web/list/package/index.php b/web/list/package/index.php
index 040a6bae7..51b5ec4fb 100644
--- a/web/list/package/index.php
+++ b/web/list/package/index.php
@@ -14,7 +14,6 @@ top_panel($user,$TAB);
 // Data
 if ($_SESSION['user'] == 'admin') {
     exec (VESTA_CMD."v_list_user_packages json", $output, $return_var);
-    check_error($return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data);
     unset($output);
diff --git a/web/list/stats/index.php b/web/list/stats/index.php
index 4c661a67c..40b5de1b1 100644
--- a/web/list/stats/index.php
+++ b/web/list/stats/index.php
@@ -12,17 +12,11 @@ include($_SERVER['DOCUMENT_ROOT'].'/templates/header.html');
 top_panel($user,$TAB);
 
 // Data
-//if ($_SESSION['user'] == 'admin') {
-
-    exec (VESTA_CMD."v_list_user_stats $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/admin/menu_stats.html');
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_stats.html');
-//}
+exec (VESTA_CMD."v_list_user_stats $user json", $output, $return_var);
+$data = json_decode(implode('', $output), true);
+$data = array_reverse($data);
+unset($output);
+include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_stats.html');
 
 // Footer
 include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
diff --git a/web/list/web/index.php b/web/list/web/index.php
index 22c8dbaf5..30876a7a0 100644
--- a/web/list/web/index.php
+++ b/web/list/web/index.php
@@ -14,13 +14,11 @@ top_panel($user,$TAB);
 // Data
 if ($_SESSION['user'] == 'admin') {
     exec (VESTA_CMD."v_list_web_domains $user json", $output, $return_var);
-    check_error($return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data);
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_web.html');
 } else {
     exec (VESTA_CMD."v_list_web_domains $user json", $output, $return_var);
-    check_error($return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data);
     include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_web.html');
diff --git a/web/templates/admin/list_log.html b/web/templates/admin/list_log.html
index b58ff2805..559912c31 100644
--- a/web/templates/admin/list_log.html
+++ b/web/templates/admin/list_log.html
@@ -1,49 +1,77 @@
-<table class='data'>
 
-<?php
-foreach ($data as $key => $value) {
-    ++$i;
-    ?>
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 0 8px 16px">
+                                            <div style="float:left">
+                                            </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>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
 
-<tr class="data-row">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150px">
-        <table class="data-col1" width="150">
-            <tr><td style="padding: 18 0 4 4;"><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 style="padding: 0 0 0 4;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo $data[$key]['TIME']?></a></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
+                    <form id="vstobjects">
+                        <table class='data'>
 
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
+                            <?php
+                                foreach ($data as $key => $value) {
+                                    ++$i;
+                            ?>
 
-        <table class="data-col5" width="720px">
-            <tr><td class="log" style="padding: 0 0 20 0" ><?php echo $data[$key]['CMD'] ?> <a class="log-counter-value">
-            <?php echo "".$data[$key]['A1']." ".$data[$key]['A2']." ".$data[$key]['A3']." ".$data[$key]['A4']." ".$data[$key]['A5']." ".$data[$key]['A6']." ".$data[$key]['A7']." ".$data[$key]['A8']." ".$data[$key]['A9'] ?></td></tr>
-        </table>
-    </td>
-</tr>
+                            <tr class="data-row">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150px">
+                                    <table class="data-col1" width="150">
+                                        <tr><td style="padding: 18 0 4 4;"><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 style="padding: 0 0 0 4;"><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo $data[$key]['TIME']?></a></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-col5" width="720px">
+                                    <tr>
+                                        <td class="log" style="padding: 0 0 20 0" >
+                                            <?php echo $data[$key]['CMD'] ?> <a class="log-counter-value">
+                                            <?php echo "".$data[$key]['A1']." ".$data[$key]['A2']." ".$data[$key]['A3']." ".$data[$key]['A4']." ".$data[$key]['A5']." ".$data[$key]['A6']." ".$data[$key]['A7']." ".$data[$key]['A8']." ".$data[$key]['A9'] ?>
+                                        </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>→ 
-    <?php
-        if ( $i == 1) {
-            echo "1 log record ";
-        } else {
-            echo "$i log records ";
-        }
-    ?>
-    </td>
-</tr>
-</table>
-<?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?>
-<?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:216px\"><tr><td></td></tr></table>"; ?>
-<?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:125px\"><tr><td></td></tr></table>"; ?>
-<?php if ($i == 3) echo "<table class=\"data-spacer\" style=\"height:34px\"><tr><td></td></tr></table>"; ?>
+                        <?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 log record ";
+                                    } else {
+                                        echo "$i log records ";
+                                    }
+                                ?>
+                            </td>
+                        </tr>
+                    </table>
+                </form>
+
+                <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?>
+                <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:216px\"><tr><td></td></tr></table>"; ?>
+                <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:125px\"><tr><td></td></tr></table>"; ?>
+                <?php if ($i == 3) echo "<table class=\"data-spacer\" style=\"height:34px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/admin/list_rrd.html b/web/templates/admin/list_rrd.html
index de4e99ac3..304f9ad6c 100644
--- a/web/templates/admin/list_rrd.html
+++ b/web/templates/admin/list_rrd.html
@@ -1,46 +1,71 @@
-<table class='data'>
 
-<?php
-if (empty($_GET['period'])) {
-    $period='daily';
-} else {
-    $period=$_GET['period'];
-}
-
-foreach ($data as $key => $value) {
-?>
-
-<tr class="data-row">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <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'])) ?></td></tr>
-            <tr><td class="data-active"><b>active</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="80px"><img src="/images/download.png" width="8px" height="8px"><a href="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>" target="_blank"> download</a></td>
-        </tr></table>
-
-        <table class="data-col2" width="830px">
-            <tr><td colspan=3 class="domain" style="padding: 0 0 4 4;"><b><?php echo $data[$key]['TITLE'] ?></b></td></tr>
-            <tr>
-                <td style="vertical-align:top;" width="630px">
-                    <table width="630px">
-                	<td style="background: #7a766d;" width="630px" height="250px"><img style="padding: 0 0 0 30;" src="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>"></td>
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 0 8px 16px">
+                                            <div style="float:left">
+                                                <a class="add" <?php if ((empty($_GET['period'])) || ($_GET['period'] == 'daily')) echo "style='color: #34536A'" ?> href="?period=daily">Daily</a>
+                                                <a class="add" <?php if ($_GET['period'] == 'weekly') echo "style='color: #34536A'" ?> href="?period=weekly">Weekly</a>
+                                                <a class="add" <?php if ($_GET['period'] == 'monthly') echo "style='color: #34536A'" ?> href="?period=monthly">Monthly</a>
+                                                <a class="add" <?php if ($_GET['period'] == 'yearly') echo "style='color: #34536A'" ?> href="?period=yearly">Yearly</a>
+                                            </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>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
                     </table>
-                </td>
-                <td style="vertical-align:top;">
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
 
+                    <form id="vstobjects">
+                        <table class='data'>
+                            <?php
+                                if (empty($_GET['period'])) {
+                                    $period='daily';
+                                } else {
+                                    $period=$_GET['period'];
+                                }
+                                foreach ($data as $key => $value) {
+                            ?>
 
-    <?php
-}
-?>
-</table>
+                            <tr class="data-row">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <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'])) ?></td></tr>
+                                        <tr><td class="data-active"><b>active</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="80px"><img src="/images/download.png" width="8px" height="8px"><a href="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>" target="_blank"> download</a></td>
+                                        </tr>
+                                    </table>
+                                    <table class="data-col2" width="830px">
+                                        <tr><td colspan=3 class="domain" style="padding: 0 0 4 4;"><b><?php echo $data[$key]['TITLE'] ?></b></td></tr>
+                                        <tr>
+                                            <td style="vertical-align:top;" width="630px">
+                                                <table width="630px">
+                                                    </tr>
+                                                        <td style="background: #7a766d;" width="630px" height="250px">
+                                                            <img style="padding: 0 0 0 30;" src="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>">
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;">
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+
+                        <?php
+                            }
+                        ?> 
+                    </table>
+                </form>
diff --git a/web/templates/admin/list_stats.html b/web/templates/admin/list_stats.html
index 5b3181fba..2a8744fc9 100644
--- a/web/templates/admin/list_stats.html
+++ b/web/templates/admin/list_stats.html
@@ -1,95 +1,207 @@
-<table class='data'>
 
-<?php
-foreach ($data as $key => $value) {
-    ++$i;
-?>
-
-<tr class="data-row">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <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($key)) ?></td></tr>
-            <tr><td class="data-active"><b>active</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 colspan=3 class="username" style="padding: 10 0 0 4px;"><b><?php echo date("M Y", strtotime($key))?></b></td></tr>
-            <td style="vertical-align:top;" >
-                <table>
-                    <tr><td colspan=2 class="counter-name"  style="padding: 2px 0px 6px 2px;">[<?php echo $data[$key]['PACKAGE']?>] package</td></tr>
-                    <tr><td class="chart1" colspan=2 style="padding: 0 0 0 2px;">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 2px;">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 16px">
+                                            <div style="float:left">
+                                            </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>
+                                        </td>
+                                    </tr>
+                                </table>
                             </td>
-                        </tr></table></td>
-                    </tr>
-                </table>
-            </td>
-            <td style="vertical-align:top;" width="280">
-                <table width="280">
-                    <tr><td class="counter-name" width="37%">Web Domains:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_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]['U_WEB_ALIASES'] ?></td></tr>
-                    <tr><td class="counter-name">Dns Domains:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_DNS_DOMAINS'] ?></td></tr>
-                    <tr><td class="counter-name">Dns Records:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_DNS_RECORDS'] ?></td></tr>
-                </table></td>
-            <td style="vertical-align:top;" width="250">
-                <table class="data-col4" width="250">
-                    <tr><td class="counter-name" width="43%">Mail Domains:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?></td></tr>
-                    <tr><td class="counter-name">Mail Accounts:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_MAIL_ACCOUNTS'] ?></td></tr>
-                    <tr><td class="counter-name">Databases:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_DATABASES'] ?></td></tr>
-                    <tr><td class="counter-name">Cron Jobs:</td>
-                    <td class="counter-value"><?php echo $data[$key]['U_CRON_JOBS'] ?></td></tr>
-                    <tr><td class="counter-name">Dedicated IP:</td>
-                    <td class="counter-value"><?php echo $data[$key]['IP_OWNED'] ?></td></tr>
-                </table>
-            </td>
-        </tr>
-        </table>
-    </td>
-</tr>
+                        </tr>
+                    </table>
 
-    <?php
-}
-?>
-</table>
-<?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
+                    <form id="vstobjects">
+                        <table class='data'>
 
-<table class="data-count">
-<tr>
-    <td>→ 
-    <?php
-        if ( $i == 1) {
-            echo "1 month ";
-        } else {
-            echo "$i months ";
-        }
-    ?>
-    listed</td>
-</tr>
-</table>
-<?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?>
-<?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:123px\"><tr><td></td></tr></table>"; ?>
+                            <?php
+                                foreach ($data as $key => $value) {
+                                    ++$i;
+                            ?>
+
+                            <tr class="data-row">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <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($key)) ?></td></tr>
+                                        <tr><td class="data-active"><b>active</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 colspan=3 class="username" style="padding: 10 0 0 4px;">
+                                                <b><?php echo date("M Y", strtotime($key))?></b>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="vertical-align:top;" >
+                                                <table>
+                                                    <tr>
+                                                        <td colspan=2 class="counter-name"  style="padding: 2px 0px 6px 2px;">
+                                                            [<?php echo $data[$key]['PACKAGE']?>] package
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
+                                                            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 2px;">
+                                                            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="280">
+                                                <table width="280">
+                                                    <tr>
+                                                        <td class="counter-name" width="37%">
+                                                            Web Domains:
+                                                        </td>
+                                                        <td class="counter-value">
+                                                            <?php echo $data[$key]['U_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]['U_WEB_ALIASES'] ?> 
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">
+                                                            Dns Domains:
+                                                        </td>
+                                                        <td class="counter-value">
+                                                            <?php echo $data[$key]['U_DNS_DOMAINS'] ?> 
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">
+                                                            Dns Records:
+                                                        </td>
+                                                        <td class="counter-value">
+                                                            <?php echo $data[$key]['U_DNS_RECORDS'] ?>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;" width="250">
+                                                <table class="data-col4" width="250">
+                                                    <tr>
+                                                        <td class="counter-name" width="43%">
+                                                            Mail Domains:
+                                                        </td>
+                                                        <td class="counter-value">
+                                                            <?php echo $data[$key]['U_MAIL_DOMAINS'] ?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">
+                                                            Mail Accounts:
+                                                        </td>
+                                                        <td class="counter-value">
+                                                            <?php echo $data[$key]['U_MAIL_ACCOUNTS'] ?> 
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">
+                                                            Databases:
+                                                        </td>
+                                                        <td class="counter-value">
+                                                            <?php echo $data[$key]['U_DATABASES'] ?> 
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">
+                                                            Cron Jobs:
+                                                        </td>
+                                                        <td class="counter-value">
+                                                            <?php echo $data[$key]['U_CRON_JOBS'] ?>
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="counter-name">
+                                                            Dedicated IP:
+                                                        </td>
+                                                        <td class="counter-value">
+                                                            <?php echo $data[$key]['IP_OWNED'] ?> 
+                                                        </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 month ";
+                                        } else {
+                                            echo "$i months ";
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
+                        </table>
+                    </form>
+
+                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?>
+                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:123px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/admin/menu_log.html b/web/templates/admin/menu_log.html
deleted file mode 100644
index a68641121..000000000
--- a/web/templates/admin/menu_log.html
+++ /dev/null
@@ -1,29 +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: 24px 0 31px 6px">
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_stats.html b/web/templates/admin/menu_stats.html
deleted file mode 100644
index a68641121..000000000
--- a/web/templates/admin/menu_stats.html
+++ /dev/null
@@ -1,29 +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: 24px 0 31px 6px">
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
-</tr>
-</table>
diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html
index a2efc4985..7fb711236 100644
--- a/web/templates/admin/panel.html
+++ b/web/templates/admin/panel.html
@@ -6,7 +6,7 @@
                                         <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>
+                                        <td width="227px" style="padding: 0 28px 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">
diff --git a/web/templates/login.html b/web/templates/login.html
index a09c4ff74..b8c23a2a4 100644
--- a/web/templates/login.html
+++ b/web/templates/login.html
@@ -13,12 +13,16 @@
             }
 
             .forgot {
-                color: #484243;
+                color: #34536A;
                 font-family: Arial, sans-serif;
                 font-size: 8pt;
                 padding: 0 10px 0 0;
             }
 
+            .forgot:hover {
+                color: #7fa1cb;
+            }
+
             .login {
                 margin: 80px 0 80px 0;
                 padding: 0;
@@ -79,7 +83,7 @@
                 color: #DE6C5D;
             }
 
-            .loggin-input {
+            .login-input {
                 color: #555;
                 background-color: #FFFFFF;
                 border: 1px solid #999999;
@@ -91,7 +95,11 @@
                 width: 360px;
             }
 
-            .loggin-button {
+            .login-input:hover {
+                border: 1px solid #e5a907;
+            }
+
+            .login-button {
                 padding: 4px;
                 margin: 0 6px 0 0;
                 cursor: pointer;
@@ -104,11 +112,11 @@
                 width: 105px;
             }
 
-            .loggin-button:hover {
+            .login-button:hover {
                 background-color: #f0f0f0;
             }
 
-            .loggin-button:active {
+            .login-button:active {
                 background-color: #EBE9DC;
             }
         </style>
@@ -133,17 +141,17 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input tabindex="1" type="text" size="20px" style="width:200px;" name="user" class="loggin-input">
+                                                <input tabindex="1" type="text" size="20px" style="width:200px;" name="user" class="login-input">
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <p class="login-text1">Password <a tabindex="5" class="forgot" href="/reset/" >(forgot password)</a></p>
+                                                <p class="login-text1">Password <a tabindex="5" class="forgot" href="/reset/" >forgot passwor</a></p>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input tabindex="2" type="password" size="20px"  style="width:200px;" name="password" class="loggin-input">
+                                                <input tabindex="2" type="password" size="20px"  style="width:200px;" name="password" class="login-input">
                                             </td>
                                         </tr>
                                         <tr>
@@ -153,7 +161,7 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input tabindex="3" type="submit" value="Log In" class="loggin-button">
+                                                <input tabindex="3" type="submit" value="Log In" class="login-button">
                                             </td>
                                         </tr>
                                     </table>
@@ -163,12 +171,8 @@
                         <tr>
                             <td colspan=2>
                                 <table class="login-bottom">
-                                    <tr>
-                                        <td>.<?php if (isset($ERROR)) echo $ERROR ?></td>
-                                    </tr>
-                                    <tr>
-                                        <td> <a tabindex="6" class="vestacp" href="http://vestacp.com" >vestacp.com</a></td>
-                                    </tr>
+                                    <tr><td>.<?php if (isset($ERROR)) echo $ERROR ?></td></tr>
+                                    <tr><td> <a tabindex="6" class="vestacp" href="http://vestacp.com" >vestacp.com</a></td></tr>
                                 </table>
                             </td>
                         </tr>
diff --git a/web/templates/reset_1.html b/web/templates/reset_1.html
index b9227af4a..7e390a06b 100644
--- a/web/templates/reset_1.html
+++ b/web/templates/reset_1.html
@@ -1,145 +1,176 @@
-    <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-    <title> VestaCP - Reset Password </title>
-    <style type="text/css">
-    body {
-        padding: 0;
-        margin: 0;
-        margin-left: auto;
-        margin-right: auto;
-        background-image: url(/images/b.png);
-        font-family: Arial, sans-serif;
-    }
+<html>
+    <head>
+        <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
+        <title> Vesta - Reset Password </title>
+        <style type="text/css">
+            body {
+                padding: 0;
+                margin: 0;
+                margin-left: auto;
+                margin-right: auto;
+                background-image: url(/images/b.png);
+                font-family: Arial, sans-serif;
+            }
 
-    .forgot {
-        color: #484243;
-        font-family: Arial, sans-serif;
-        font-size: 8pt;
-        padding: 0 10px 0 0;
-    }
+            .forgot {
+                color: #484243;
+                font-family: Arial, sans-serif;
+                font-size: 8pt;
+                padding: 0 10px 0 0;
+            }
 
-    .login {
-        margin: 80px 0 80px 0;
-        padding: 0;
-        border-top: 1px solid #cccccc;
-        border-left: 1px solid #cccccc;
-        border-right: 1px solid #cccccc;
-        background: #ebe9dc;
-        text-align: left;
-        vertical-align:top;
-        width: 500px;
-        box-shadow: 0 0 8px 8px #d7d7d7;
-    }
+            .forgot:hover {
+                color: #7fa1cb;
+            }
 
-    .login-box {
-        width: 260px;
-        text-align: left;
-        vertical-align:top;
-        padding: 0 0 10px 40px;
-    }
+            .login {
+                margin: 80px 0 80px 0;
+                padding: 0;
+                border-top: 1px solid #cccccc;
+                border-left: 1px solid #cccccc;
+                border-right: 1px solid #cccccc;
+                background: #ebe9dc;
+                text-align: left;
+                vertical-align:top;
+                width: 500px;
+                box-shadow: 0 0 2px 2px #d7d7d7;
+            }
 
-    .login-text1 {
-        padding: 10px 0 0 2px;
-        color: #433832;
-        font-family: Arial, sans-serif;
-        font-size: 12pt;
-    }
-    .login-text1 a {
-        padding: 0 6px;
-        font-family: Arial, sans-serif;
-        font-size: 10pt;
-        text-shadow: none;
-    }
-    .login-text2 {
-        padding: 12px 0 10px 0;
-        color: #484243;
-    }
+            .login-box {
+                text-align: left;
+                vertical-align:top;
+                padding: 0 0 10px 40px;
+            }
 
-    .login-bottom {
-        color: #574F51;
-        text-align: right;
-        width: 500px;
-        height: 50px;
-        background: #484243;
-        padding: 0 8px 0 0;
-        margin: 0;
-    }
-    .vestacp{
-        font-size: 8pt;
-        color: #CCCCB4;
-        text-align: right;
-        padding: 20px 0 0 0;
-    }
-    .error {
-        font-size: 10pt;
-        color: #DE6C5D;
-    }
-    .loggin-input {
-        color: #555;
-        background-color: #FFFFFF;
-        border: 1px solid #999999;
-        border-radius: 3px 3px 3px 3px;
-        color: #555555;
-        font-family: Arial,sans-serif;
-        font-size: 14pt;
-        padding: 4px;
-        width: 360px;
-    }
+            .login-text1 {
+                padding: 10px 0 0 2px;
+                color: #433832;
+                font-family: Arial, sans-serif;
+                font-size: 12pt;
+            }
 
-    .loggin-button {
-        padding: 4px;
-        margin: 0 6px 0 0;
-        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;
-    }
+            .login-text1 a {
+                padding: 0 6px;
+                font-family: Arial, sans-serif;
+                font-size: 10pt;
+                text-shadow: none;
+            }
 
-    .loggin-button:hover {
-        background-color: #f0f0f0;
-    }
+            .login-text2 {
+                padding: 12px 0 10px 0;
+                color: #484243;
+            }
 
-    .loggin-button:active {
-        background-color: #EBE9DC;
-    }
-    </style>
-</head>
-<body>
-<center>
-<table class="login">
-<tr>
-    <td>
-    <table>
-    <tr>
-        <td style="padding: 0 10px 0 42px;">
-            <a href="/"><img border=0 src="/images/logo.png" width="124px" height="46px" alt="Vesta Control Panel" /></a>
-        </td>
-        <td style="padding: 20px 0 0 0;"><form method="post" action="/reset/" >
-            <table class="login-box">
-            <tr>
-                <td style="padding: 6px 0 10px 0;">To reset your password, enter your username and we'll send you instructions on how to create a new password.</td>
-            </tr><tr>
-                <td><p class="login-text1">Username</p></td>
-            </tr><tr>
-                <td><input tabindex="1" type="text" size="20px" style="width:200px" name="user" class="loggin-input"></td>
-            </tr><tr>
-                <td style="padding: 20px 0 0 0;"><input tabindex="2" type="submit" value="Submit" class="loggin-button"></td>
-            </tr>
+            .login-bottom {
+                color: #574F51;
+                text-align: right;
+                width: 500px;
+                height: 50px;
+                background: #484243;
+                padding: 0 8px 0 0;
+                margin: 0;
+            }
+
+            .vestacp{
+                font-size: 8pt;
+                color: #CCCCB4;
+                text-align: right;
+                padding: 20px 0 0 0;
+            }
+
+            .error {
+                font-size: 10pt;
+                color: #DE6C5D;
+            }
+
+            .login-input {
+                color: #555;
+                background-color: #FFFFFF;
+                border: 1px solid #999999;
+                border-radius: 3px 3px 3px 3px;
+                color: #555555;
+                font-family: Arial,sans-serif;
+                font-size: 14pt;
+                padding: 4px;
+                width: 360px;
+            }
+
+            .login-input:hover {
+                border: 1px solid #e5a907;
+            }
+
+            .login-button {
+                padding: 4px;
+                margin: 0 6px 0 0;
+                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;
+            }
+
+            .login-button:hover {
+                background-color: #f0f0f0;
+            }
+
+            .login-button:active {
+                background-color: #EBE9DC;
+            }
+        </style>
+    </head>
+    <body>
+        <center>
+            <table class="login">
+                <tr>
+                    <td>
+                        <table>
+                            <tr>
+                                <td style="padding: 0 10px 0 42px;">
+                                    <a href="/"><img border=0 src="/images/logo.png" width="124px" height="46px" alt="Vesta Control Panel" /></a>
+                                </td>
+                                <td style="padding: 20px 0 0 0;">
+                                    <form method="post" action="/reset/" >
+                                        <table class="login-box">
+                                            <tr>
+                                            <td style="padding: 6px 0 10px 0;">
+                                                To reset your password, enter your username and we'll send you instructions on how to create a new password.
+                                            </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <p class="login-text1">Username</p>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <input tabindex="1" type="text" size="20px" style="width:200px" name="user" class="login-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td style="padding: 20px 0 0 0;">
+                                                    <input tabindex="2" type="submit" value="Submit" class="login-button">
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </form>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan=2>
+                                    <table class="login-bottom">
+                                        <tr><td>.<?php if (isset($ERROR)) echo $ERROR ?></td></tr>
+                                        <tr><td><a tabindex="6" class="vestacp" href="http://vestacp.com" >vestacp.com</a></td></tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
             </table>
-            </form>
-        </td>
-    </tr><tr>
-    <td colspan=2>
-        <table class="login-bottom">
-            <tr><td>.<?php if (isset($ERROR)) echo $ERROR ?></td></tr>
-            <tr><td><a tabindex="6" class="vestacp" href="http://vestacp.com" >vestacp.com</a></td></tr>
-        </table>
-    </tr>
-    </table>
-</tr></table>
-</center>
-</body>
+        </center>
+    </body>
 </html>
+
diff --git a/web/templates/reset_2.html b/web/templates/reset_2.html
index 48848ee7c..7ac52e7c7 100644
--- a/web/templates/reset_2.html
+++ b/web/templates/reset_2.html
@@ -1,150 +1,176 @@
-    <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-    <title> VestaCP - Reset Password </title>
-    <style type="text/css">
-    body {
-        padding: 0;
-        margin: 0;
-        margin-left: auto;
-        margin-right: auto;
-        background-image: url(/images/b.png);
-        font-family: Arial, sans-serif;
-    }
+<html>
+    <head>
+        <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
+        <title> Vesta - Reset Password </title>
+        <style type="text/css">
+            body {
+                padding: 0;
+                margin: 0;
+                margin-left: auto;
+                margin-right: auto;
+                background-image: url(/images/b.png);
+                font-family: Arial, sans-serif;
+            }
 
-    .forgot {
-        color: #484243;
-        font-family: Arial, sans-serif;
-        font-size: 8pt;
-        padding: 0 10px 0 0;
-    }
+            .forgot {
+                color: #484243;
+                font-family: Arial, sans-serif;
+                font-size: 8pt;
+                padding: 0 10px 0 0;
+            }
 
-    .login {
-        margin: 80px 0 80px 0;
-        padding: 0;
-        border-top: 1px solid #cccccc;
-        border-left: 1px solid #cccccc;
-        border-right: 1px solid #cccccc;
-        background: #ebe9dc;
-        text-align: left;
-        vertical-align:top;
-        width: 500px;
-        box-shadow: 0 0 8px 8px #d7d7d7;
-    }
+            .forgot:hover {
+                color: #7fa1cb;
+            }
 
-    .login-box {
-        width: 260px;
-        text-align: left;
-        vertical-align:top;
-        padding: 0 0 10px 40px;
-    }
+            .login {
+                margin: 80px 0 80px 0;
+                padding: 0;
+                border-top: 1px solid #cccccc;
+                border-left: 1px solid #cccccc;
+                border-right: 1px solid #cccccc;
+                background: #ebe9dc;
+                text-align: left;
+                vertical-align:top;
+                width: 500px;
+                box-shadow: 0 0 2px 2px #d7d7d7;
+            }
 
-    .login-text1 {
-        padding: 10px 0 0 2px;
-        color: #433832;
-        font-family: Arial, sans-serif;
-        font-size: 12pt;
-    }
-    .login-text1 a {
-        padding: 0 6px;
-        font-family: Arial, sans-serif;
-        font-size: 10pt;
-        text-shadow: none;
-    }
-    .login-text2 {
-        padding: 12px 0 10px 0;
-        color: #484243;
-    }
+            .login-box {
+                text-align: left;
+                vertical-align:top;
+                padding: 0 0 10px 40px;
+            }
 
-    .login-bottom {
-        color: #574F51;
-        text-align: right;
-        width: 500px;
-        height: 50px;
-        background: #484243;
-        padding: 0 8px 0 0;
-        margin: 0;
-    }
-    .vestacp{
-        font-size: 8pt;
-        color: #CCCCB4;
-        text-align: right;
-        padding: 20px 0 0 0;
-    }
-    .error {
-        font-size: 10pt;
-        color: #DE6C5D;
-    }
-    .loggin-input {
-        color: #555;
-        background-color: #FFFFFF;
-        border: 1px solid #999999;
-        border-radius: 3px 3px 3px 3px;
-        color: #555555;
-        font-family: Arial,sans-serif;
-        font-size: 14pt;
-        padding: 4px;
-        width: 360px;
-    }
+            .login-text1 {
+                padding: 10px 0 0 2px;
+                color: #433832;
+                font-family: Arial, sans-serif;
+                font-size: 12pt;
+            }
 
-    .loggin-button {
-        padding: 4px;
-        margin: 0 6px 0 0;
-        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;
-    }
+            .login-text1 a {
+                padding: 0 6px;
+                font-family: Arial, sans-serif;
+                font-size: 10pt;
+                text-shadow: none;
+            }
 
-    .loggin-button:hover {
-        background-color: #f0f0f0;
-    }
+            .login-text2 {
+                padding: 12px 0 10px 0;
+                color: #484243;
+            }
 
-    .loggin-button:active {
-        background-color: #EBE9DC;
-    }
-    </style>
-</head>
-<body>
-<center>
-<table class="login">
-<tr>
-    <td>
-    <table>
-    <tr>
-        <td style="padding: 0 10px 0 42px;">
-            <a href="/"><img border=0 src="/images/logo.png" width="124px" height="46px" alt="Vesta Control Panel" /></a>
-        </td>
-        <td style="padding: 20px 0 0 0;"><form method="get" action="/reset/" >
-            <table class="login-box">
-            <tr>
-                <td style="padding: 6px 0 10px 0;">Reset code has been sent to your email address. Please copy and paste that code in the verification box below</td>
-            </tr><tr>
-                <td><p class="login-text1">Reset Code</p></td>
-            </tr><tr>
-                <td>
-                    <input type="hidden" name="action" value="confirm">
-                    <input type="hidden" name="user" value="<?php echo $_GET['user'];?>">
-                    <input tabindex="1" type="text" size="20px" style="width:200px" name="code" class="loggin-input">
+            .login-bottom {
+                color: #574F51;
+                text-align: right;
+                width: 500px;
+                height: 50px;
+                background: #484243;
+                padding: 0 8px 0 0;
+                margin: 0;
+            }
 
-                </td>
-            </tr><tr>
-                <td style="padding: 20px 0 0 0;"><input tabindex="2" type="submit" value="Confirm" class="loggin-button"></td>
-            </tr>
+            .vestacp{
+                font-size: 8pt;
+                color: #CCCCB4;
+                text-align: right;
+                padding: 20px 0 0 0;
+            }
+
+            .error {
+                font-size: 10pt;
+                color: #DE6C5D;
+            }
+
+            .login-input {
+                color: #555;
+                background-color: #FFFFFF;
+                border: 1px solid #999999;
+                border-radius: 3px 3px 3px 3px;
+                color: #555555;
+                font-family: Arial,sans-serif;
+                font-size: 14pt;
+                padding: 4px;
+                width: 360px;
+            }
+
+            .login-input:hover {
+                border: 1px solid #e5a907;
+            }
+
+            .login-button {
+                padding: 4px;
+                margin: 0 6px 0 0;
+                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;
+            }
+
+            .login-button:hover {
+                background-color: #f0f0f0;
+            }
+
+            .login-button:active {
+                background-color: #EBE9DC;
+            }
+        </style>
+    </head>
+    <body>
+        <center>
+            <table class="login">
+                <tr>
+                    <td>
+                        <table>
+                            <tr>
+                                <td style="padding: 0 10px 0 42px;">
+                                    <a href="/"><img border=0 src="/images/logo.png" width="124px" height="46px" alt="Vesta Control Panel" /></a>
+                                </td>
+                                <td style="padding: 20px 0 0 0;">
+                                    <form method="get" action="/reset/" >
+                                        <table class="login-box">
+                                            <tr>
+                                                <td style="padding: 6px 0 10px 0;">
+                                                    Reset code has been sent to your email address.
+                                                     Please copy and paste that code in the verification box below.
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td><p class="login-text1">Reset Code</p></td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <input type="hidden" name="action" value="confirm">
+                                                    <input type="hidden" name="user" value="<?php echo $_GET['user'];?>">
+                                                    <input tabindex="1" type="text" size="20px" style="width:200px" name="code" class="login-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td style="padding: 20px 0 0 0;">
+                                                    <input tabindex="2" type="submit" value="Confirm" class="login-button">
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </form>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan=2>
+                                    <table class="login-bottom">
+                                        <tr><td>.<?php if (isset($ERROR)) echo $ERROR ?></td></tr>
+                                        <tr><td><a tabindex="6" class="vestacp" href="http://vestacp.com" >vestacp.com</a></td></tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
             </table>
-            </form>
-        </td>
-    </tr><tr>
-    <td colspan=2>
-        <table class="login-bottom">
-            <tr><td>.<?php if (isset($ERROR)) echo $ERROR ?></td></tr>
-            <tr><td><a tabindex="6" class="vestacp" href="http://vestacp.com" >vestacp.com</a></td></tr>
-        </table>
-    </tr>
-    </table>
-</tr></table>
-</center>
-</body>
+        </center>
+    </body>
 </html>
diff --git a/web/templates/reset_3.html b/web/templates/reset_3.html
index 6d3fbd0e3..f1b6adff2 100644
--- a/web/templates/reset_3.html
+++ b/web/templates/reset_3.html
@@ -1,151 +1,185 @@
-    <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
-    <title> VestaCP - Reset Password </title>
-    <style type="text/css">
-    body {
-        padding: 0;
-        margin: 0;
-        margin-left: auto;
-        margin-right: auto;
-        background-image: url(/images/b.png);
-        font-family: Arial, sans-serif;
-    }
+<html>
+    <head>
+        <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
+        <title> Vesta - Reset Password </title>
+        <style type="text/css">
+            body {
+                padding: 0;
+                margin: 0;
+                margin-left: auto;
+                margin-right: auto;
+                background-image: url(/images/b.png);
+                font-family: Arial, sans-serif;
+            }
 
-    .forgot {
-        color: #484243;
-        font-family: Arial, sans-serif;
-        font-size: 8pt;
-        padding: 0 10px 0 0;
-    }
+            .forgot {
+                color: #484243;
+                font-family: Arial, sans-serif;
+                font-size: 8pt;
+                padding: 0 10px 0 0;
+            }
 
-    .login {
-        margin: 80px 0 80px 0;
-        padding: 0;
-        border-top: 1px solid #cccccc;
-        border-left: 1px solid #cccccc;
-        border-right: 1px solid #cccccc;
-        background: #ebe9dc;
-        text-align: left;
-        vertical-align:top;
-        width: 500px;
-        box-shadow: 0 0 8px 8px #d7d7d7;
-    }
+            .forgot:hover {
+                color: #7fa1cb;
+            }
 
-    .login-box {
-        text-align: left;
-        vertical-align:top;
-        padding: 0 0 10px 40px;
-    }
+            .login {
+                margin: 80px 0 80px 0;
+                padding: 0;
+                border-top: 1px solid #cccccc;
+                border-left: 1px solid #cccccc;
+                border-right: 1px solid #cccccc;
+                background: #ebe9dc;
+                text-align: left;
+                vertical-align:top;
+                width: 500px;
+                box-shadow: 0 0 2px 2px #d7d7d7;
+            }
 
-    .login-text1 {
-        padding: 10px 0 0 2px;
-        color: #433832;
-        font-family: Arial, sans-serif;
-        font-size: 12pt;
-    }
-    .login-text1 a {
-        padding: 0 6px;
-        font-family: Arial, sans-serif;
-        font-size: 10pt;
-        text-shadow: none;
-    }
-    .login-text2 {
-        padding: 12px 0 10px 0;
-        color: #484243;
-    }
+            .login-box {
+                text-align: left;
+                vertical-align:top;
+                padding: 0 0 10px 40px;
+            }
 
-    .login-bottom {
-        color: #574F51;
-        text-align: right;
-        width: 500px;
-        height: 50px;
-        background: #484243;
-        padding: 0 8px 0 0;
-        margin: 0;
-    }
-    .vestacp{
-        font-size: 8pt;
-        color: #CCCCB4;
-        text-align: right;
-        padding: 20px 0 0 0;
-    }
-    .error {
-        font-size: 10pt;
-        color: #DE6C5D;
-    }
-    .loggin-input {
-        color: #555;
-        background-color: #FFFFFF;
-        border: 1px solid #999999;
-        border-radius: 3px 3px 3px 3px;
-        color: #555555;
-        font-family: Arial,sans-serif;
-        font-size: 14pt;
-        padding: 4px;
-        width: 360px;
-    }
+            .login-text1 {
+                padding: 10px 0 0 2px;
+                color: #433832;
+                font-family: Arial, sans-serif;
+                font-size: 12pt;
+            }
 
-    .loggin-button {
-        padding: 4px;
-        margin: 0 6px 0 0;
-        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;
-    }
+            .login-text1 a {
+                padding: 0 6px;
+                font-family: Arial, sans-serif;
+                font-size: 10pt;
+                text-shadow: none;
+            }
 
-    .loggin-button:hover {
-        background-color: #f0f0f0;
-    }
+            .login-text2 {
+                padding: 12px 0 10px 0;
+                color: #484243;
+            }
 
-    .loggin-button:active {
-        background-color: #EBE9DC;
-    }
-    </style>
-</head>
-<body>
-<center>
-<table class="login">
-<tr>
-    <td>
-    <table>
-    <tr>
-        <td style="padding: 0 10 0 42;">
-            <a href="/"><img border=0 src="/images/logo.png" width="124px" height="46px" alt="Vesta Control Panel" /></a>
-        </td>
-        <td style="padding: 20px 0 0 0;"><form method="post">
-            <table class="login-box">
-            <tr>
-                <td>
-                    <input type="hidden" name="action" value="confirm">
-                    <input type="hidden" name="user" value="<?php echo $_GET['user'];?>">
-                    <input type="hidden" name="code" value="<?php echo $_GET['code'];?>">
-                    <p class="login-text1">New Password</p>
+            .login-bottom {
+                color: #574F51;
+                text-align: right;
+                width: 500px;
+                height: 50px;
+                background: #484243;
+                padding: 0 8px 0 0;
+                margin: 0;
+            }
+
+            .vestacp{
+                font-size: 8pt;
+                color: #CCCCB4;
+                text-align: right;
+                padding: 20px 0 0 0;
+            }
+
+            .error {
+                font-size: 10pt;
+                color: #DE6C5D;
+            }
+
+            .login-input {
+                color: #555;
+                background-color: #FFFFFF;
+                border: 1px solid #999999;
+                border-radius: 3px 3px 3px 3px;
+                color: #555555;
+                font-family: Arial,sans-serif;
+                font-size: 14pt;
+                padding: 4px;
+                width: 360px;
+            }
+
+            .login-input:hover {
+                border: 1px solid #e5a907;
+            }
+
+            .login-button {
+                padding: 4px;
+                margin: 0 6px 0 0;
+                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;
+            }
+
+            .login-button:hover {
+                background-color: #f0f0f0;
+            }
+
+            .login-button:active {
+                background-color: #EBE9DC;
+            }
+        </style>
+    </head>
+    <body>
+        <center>
+            <table class="login">
+                <tr>
+                    <td>
+                        <table>
+                            <tr>
+                                <td style="padding: 0 10 0 42;">
+                                    <a href="/"><img border=0 src="/images/logo.png" width="124px" height="46px" alt="Vesta Control Panel" /></a>
+                                </td>
+                                <td style="padding: 20px 0 0 0;">
+                                    <form method="post">
+                                        <table class="login-box">
+                                            <tr>
+                                                <td>
+                                                    <input type="hidden" name="action" value="confirm">
+                                                    <input type="hidden" name="user" value="<?php echo $_GET['user'];?>">
+                                                    <input type="hidden" name="code" value="<?php echo $_GET['code'];?>">
+                                                    <p class="login-text1">New Password</p>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <input tabindex="1" type="password" size="20px" style="width:200px;" name="password" class="login-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <p class="login-text1">
+                                                        Confirm Password <a tabindex="5" class="forgot" href="/reset/" ></a>
+                                                    </p>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <input tabindex="2" type="password" size="20px"  style="width:200px;" name="password_confirm" class="login-input">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td style="padding: 20px 0 28px 0;">
+                                                    <input tabindex="3" type="submit" value="Reset" class="login-button">
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </form>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan=2>
+                                    <table class="login-bottom">
+                                        <tr><td>.<?php if (isset($ERROR)) echo $ERROR ?></td></tr>
+                                        <tr><td> <a tabindex="6" class="vestacp" href="http://vestacp.com" >vestacp.com</a></td></tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
                     </td>
-            </tr><tr>
-                <td><input tabindex="1" type="password" size="20px" style="width:200px;" name="password" class="loggin-input"></td>
-            </tr><tr>
-                <td><p class="login-text1">Confirm Password <a tabindex="5" class="forgot" href="/reset/" ></a></p></td>
-            </tr><tr>
-                <td><input tabindex="2" type="password" size="20px"  style="width:200px;" name="password_confirm" class="loggin-input"></td>
-            </tr><tr>
-                <td style="padding: 20px 0 28px 0;"><input tabindex="3" type="submit" value="Reset" class="loggin-button"></td>
-            </tr>
+                </tr>
             </table>
-            </form>
-        </td>
-    </tr><tr>
-    <td colspan=2>
-        <table class="login-bottom">
-            <tr><td>.<?php if (isset($ERROR)) echo $ERROR ?></td></tr>
-            <tr><td> <a tabindex="6" class="vestacp" href="http://vestacp.com" >vestacp.com</a></td></tr>
-        </table>
-    </tr>
-    </table>
-</tr></table>
-</center>
-</body>
+        </center>
+    </body>
 </html>
diff --git a/web/templates/user/panel.html b/web/templates/user/panel.html
index f1f04c435..9df7ab8b2 100644
--- a/web/templates/user/panel.html
+++ b/web/templates/user/panel.html
@@ -6,7 +6,7 @@
                                         <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>
+                                        <td width="228px" style="padding: 0 28px 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">