From 4b24b4e1b23afd06183e4cf6b66b54817ac5dc84 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Tue, 4 Feb 2014 11:23:09 +0200
Subject: [PATCH] new html layout using border-collapse

---
 web/css/main.css                            | 50 +++++++++-------
 web/templates/admin/add_cron.html           | 23 +++-----
 web/templates/admin/add_db.html             | 27 ++++-----
 web/templates/admin/add_dns.html            | 23 +++-----
 web/templates/admin/add_dns_rec.html        | 21 +++----
 web/templates/admin/add_ip.html             | 23 +++-----
 web/templates/admin/add_mail.html           | 19 +++----
 web/templates/admin/add_mail_acc.html       | 39 ++++++-------
 web/templates/admin/add_package.html        | 47 +++++++--------
 web/templates/admin/add_user.html           | 30 ++++------
 web/templates/admin/add_web.html            | 55 ++++++++----------
 web/templates/admin/edit_cron.html          | 24 +++-----
 web/templates/admin/edit_db.html            | 23 +++-----
 web/templates/admin/edit_dns.html           | 25 ++++----
 web/templates/admin/edit_dns_rec.html       | 25 ++++----
 web/templates/admin/edit_ip.html            | 25 ++++----
 web/templates/admin/edit_mail.html          | 23 +++-----
 web/templates/admin/edit_mail_acc.html      | 33 +++++------
 web/templates/admin/edit_package.html       | 47 +++++++--------
 web/templates/admin/edit_user.html          | 32 +++++------
 web/templates/admin/edit_web.html           | 54 ++++++++----------
 web/templates/admin/generate_ssl.html       | 22 +++----
 web/templates/admin/list_backup.html        | 30 ++++------
 web/templates/admin/list_backup_detail.html | 55 +++++++++---------
 web/templates/admin/list_cron.html          | 16 +++---
 web/templates/admin/list_db.html            | 22 +++----
 web/templates/admin/list_dns.html           | 22 +++----
 web/templates/admin/list_dns_rec.html       | 20 +++----
 web/templates/admin/list_ip.html            | 16 +++---
 web/templates/admin/list_log.html           | 10 ++--
 web/templates/admin/list_mail.html          | 22 +++----
 web/templates/admin/list_mail_acc.html      | 29 ++++------
 web/templates/admin/list_packages.html      | 38 ++++++-------
 web/templates/admin/list_rrd.html           | 14 ++---
 web/templates/admin/list_search.html        | 20 +++----
 web/templates/admin/list_services.html      | 58 ++++++++-----------
 web/templates/admin/list_ssl.html           | 19 +++----
 web/templates/admin/list_stats.html         | 40 ++++++-------
 web/templates/admin/list_updates.html       | 40 +++++--------
 web/templates/admin/list_user.html          | 42 +++++++-------
 web/templates/admin/list_web.html           | 36 ++++++------
 web/templates/user/edit_dns.html            | 42 +++++++-------
 web/templates/user/edit_user.html           | 40 ++++++-------
 web/templates/user/edit_web.html            | 63 ++++++++++-----------
 web/templates/user/list_cron.html           | 20 ++++---
 web/templates/user/list_db.html             | 30 +++++-----
 web/templates/user/list_dns.html            | 31 +++++-----
 web/templates/user/list_dns_rec.html        | 28 ++++-----
 web/templates/user/list_mail.html           | 56 +++++++++---------
 web/templates/user/list_mail_acc.html       | 38 ++++++-------
 web/templates/user/list_search.html         | 63 ++++++++++++++-------
 web/templates/user/list_stats.html          | 42 +++++++-------
 web/templates/user/list_user.html           | 55 +++++++++---------
 web/templates/user/list_web.html            | 37 ++++++------
 54 files changed, 831 insertions(+), 953 deletions(-)

diff --git a/web/css/main.css b/web/css/main.css
index 9da8e43f8..d306de594 100644
--- a/web/css/main.css
+++ b/web/css/main.css
@@ -10,6 +10,16 @@ form {
     margin: 0;
 }
 
+
+table {
+    border-collapse: collapse;
+}
+
+td {
+    padding: 0;
+}
+
+
 .hidden {
     display: none;
 }
@@ -263,7 +273,7 @@ form {
 
 .submenu-select-block {
     float:left;
-    padding-left: 31px;
+    padding-left: 30px;
 }
 
 .submenu-select-link {
@@ -441,10 +451,9 @@ form {
 .data-dotted {
     text-align: left;
     vertical-align:top;
-    border-top:1px dotted #d3d3d3;
+    border-top: 1px dotted #d3d3d3;
     padding: 0 0 26px 0;
     margin: 0;
-    width: 166px;
 }
 
 .data-dotted td {
@@ -453,33 +462,33 @@ form {
 
 .data-col1 {
     text-align: left;
-    padding:0;
+    padding: 0;
+    width: 173px;
 }
 
 .data-col1 tr td {
-    padding:0 0 6px 24px;
+    padding:2px 0 6px 26px;
 }
 
 .data-col1 tr:first-child td {
-    padding:22px 0 0 24px;
+    padding:24px 0 0 26px;
 }
 
 .data-col2 {
     text-align: left;
-    padding: 0;
     overflow: hidden;
+    width: 827px;
 }
 
 .data-col5 {
-    table-layout: fixed;
     text-align: left;
-    padding: 0;
     overflow: hidden;
+    width: 817px;
+    table-layout: fixed;
     white-space: nowrap;
 }
 
 .data-date {
-    padding: 0 0 0 18;
     letter-spacing: 0.3em;
     font-size: 8pt;
     color: #6A6A6A
@@ -489,14 +498,12 @@ form {
     font-size: 8pt;
     letter-spacing: 0.1em;
     color: #81a64f;
-    padding: 0 0 13 18;
 }
 
 .data-suspended {
     font-size: 8pt;
     letter-spacing: 0.1em;
     color: #de5543;
-    padding: 0 0 13 18;
 }
 
 .data-controls {
@@ -504,7 +511,7 @@ form {
     height: 16px;
     border-left: 1px solid #d3d3d3;
     font-size: 8pt;
-    padding: 2px 12px 0 6px;
+    padding: 2px 12px 1px 6px;
     letter-spacing: 0.1em;
     color: #2361a1;
     text-decoration: none;
@@ -546,21 +553,25 @@ form {
 .username {
     color: #222;
     font-size: 14pt;
+    padding: 1px 0 2px 0;
 }
 
 .domain {
     color: #222;
     font-size: 14pt;
+    padding: 1px 0 2px 0;
 }
 
 .cron {
     color: #222;
     font-size: 18px;
+    padding: 1px 0 2px 0;
 }
 
 .log {
     color: #222;
     font-size: 12pt;
+    padding: 1px 0 2px 0;
 }
 
 .aliases {
@@ -587,14 +598,14 @@ form {
     line-height: 1.3em;
     font-size: 10pt;
     color: #222;
-    padding: 0 4px 0 0;
+    padding: 2px 4px 1px 0;
 }
 
 .cron-counter-name {
     vertical-align:top;
     line-height: 0.8em;
     font-size: 8pt;
-    padding: 4 0 0 0;
+    padding: 4px 0 0 0;
     color: #222;
 }
 
@@ -603,7 +614,7 @@ form {
     line-height: 1.3em;
     font-size: 10pt;
     color: #222;
-    padding: 0 0 0 2px;
+    padding: 2px 0 1px 2px;
 }
 
 .log-counter-value {
@@ -685,7 +696,7 @@ form {
     padding: 5px;
     width: 360px;
     height: 28px;
-    margin: 0 6px 0 0;
+    margin: 2px 6px 0 0;
 }
 
 .vst-input:hover {
@@ -706,6 +717,7 @@ form {
     color: #555;
     height: 30px;
     min-width: 138px;
+    margin: 2px 6px 0 0;
 }
 
 @-moz-document url-prefix() {
@@ -718,6 +730,7 @@ form {
     padding: 5px;
     font-size: 12pt;
     border: 1px solid #f7f6ed;
+    margin: 2px 6px 0 0;
 }
 
 .vst-checkbox:hover {
@@ -857,7 +870,6 @@ form {
     vertical-align:top;
     width: 500px;
     height: 50px;
-    padding: 0 8px 0 0;
     margin: 0;
 }
 
@@ -865,7 +877,7 @@ form {
     font-size: 8pt;
     color: #222;
     text-align: right;
-    padding: 20px 0 0 0;
+    padding: 0 8px 0 0;
 }
 
 .error {
diff --git a/web/templates/admin/add_cron.html b/web/templates/admin/add_cron.html
index 9c0c43d75..c988cba9b 100644
--- a/web/templates/admin/add_cron.html
+++ b/web/templates/admin/add_cron.html
@@ -8,7 +8,7 @@
             ?>
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding Cron Job');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding Cron Job');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,20 +26,15 @@
         <form id="vstobjects" name="v_add_cron" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
+                    <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Minute');?>
                                 </td>
                             </tr>
@@ -49,7 +44,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Hour');?>
                                 </td>
                             </tr>
@@ -59,7 +54,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Day');?>
                                 </td>
                             </tr>
@@ -69,7 +64,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Month');?>
                                 </td>
                             </tr>
@@ -79,7 +74,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Day of week');?>
                                 </td>
                             </tr>
@@ -89,7 +84,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Command');?>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/add_db.html b/web/templates/admin/add_db.html
index ad6952e91..438824ab3 100644
--- a/web/templates/admin/add_db.html
+++ b/web/templates/admin/add_db.html
@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding database');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding database');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -46,25 +46,20 @@
             </script>
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
+                    <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td style="padding: 20px 0 0 2px; color:#777;" >
+                                <td style="padding:24px 0 0 0; color:#777;" >
                                     <?php print __('Prefix will be automaticaly added to database name and database user',$user."_");?>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Database');?> 
                                 </td>
                             </tr>
@@ -75,7 +70,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('User');?> 
                                 </td>
                             </tr>
@@ -86,7 +81,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
@@ -96,7 +91,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Type');?> 
                                 </td>
                             </tr>
@@ -114,7 +109,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Host');?> 
                                 </td>
                             </tr>
@@ -133,7 +128,7 @@
                             </tr>
 
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Charset');?> 
                                 </td>
                             </tr>
@@ -179,7 +174,7 @@
                                     </select>
                                 </td>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Send login credentials to email address') ?> 
                                 </td>
                             </tr>
diff --git a/web/templates/admin/add_dns.html b/web/templates/admin/add_dns.html
index 727d1489a..c7d042594 100644
--- a/web/templates/admin/add_dns.html
+++ b/web/templates/admin/add_dns.html
@@ -8,7 +8,7 @@
             ?>
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding DNS Domain');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding DNS Domain');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -37,20 +37,15 @@
 
             <table class="data">
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
+                    <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -60,7 +55,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('IP address');?>
                                 </td>
                             </tr>
@@ -70,7 +65,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
                                 </td>
                             </tr>
@@ -78,7 +73,7 @@
                                 <td class="vst-text" style="padding: 10px 0 0 0px;">
                                     <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Expiration Date');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
                                             </td>
                                         </tr>
@@ -88,7 +83,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 TTL
                                             </td>
                                         </tr>
@@ -98,7 +93,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Name servers');?>
                                             </td>
                                         </tr>
diff --git a/web/templates/admin/add_dns_rec.html b/web/templates/admin/add_dns_rec.html
index 44024745c..2fe3be4db 100644
--- a/web/templates/admin/add_dns_rec.html
+++ b/web/templates/admin/add_dns_rec.html
@@ -8,7 +8,7 @@
             ?>
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding DNS Record'); ?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding DNS Record'); ?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,20 +26,15 @@
         <form id="vstobjects" name="v_add_dns_rec" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
+                    <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -49,7 +44,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Record');?>
                                 </td>
                             </tr>
@@ -59,7 +54,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Type');?>
                                 </td>
                             </tr>
@@ -82,7 +77,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('IP or Value');?>
                                 </td>
                             </tr>
@@ -92,7 +87,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Priority');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/add_ip.html b/web/templates/admin/add_ip.html
index fdf03a080..2957bd6c4 100644
--- a/web/templates/admin/add_ip.html
+++ b/web/templates/admin/add_ip.html
@@ -8,7 +8,7 @@
             ?>
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding IP address');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding IP address');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -37,20 +37,15 @@
 
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
+                    <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('IP address') ?> 
                                 </td>
                             </tr>
@@ -60,7 +55,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Netmask');?>
                                 </td>
                             </tr>
@@ -70,7 +65,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Interface');?>
                                 </td>
                             </tr>
@@ -88,7 +83,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Shared');?>
                                 </td>
                             </tr>
@@ -122,7 +117,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Assigned domain');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
@@ -132,7 +127,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('NAT IP association');?> <span class="optional"">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/add_mail.html b/web/templates/admin/add_mail.html
index 006648aef..3c839b482 100644
--- a/web/templates/admin/add_mail.html
+++ b/web/templates/admin/add_mail.html
@@ -8,7 +8,7 @@
             ?>
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding Mail Domain');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding Mail Domain');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,20 +26,15 @@
         <form id="vstobjects" name="v_add_mail" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
+                    <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -49,7 +44,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('AntiSpam Support');?>
                                 </td>
                             </tr>
@@ -59,7 +54,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('AntiVirus Support');?>
                                 </td>
                             </tr>
@@ -69,7 +64,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DKIM Support');?>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html
index 0ddb92d4c..bbf943e62 100644
--- a/web/templates/admin/add_mail_acc.html
+++ b/web/templates/admin/add_mail_acc.html
@@ -8,7 +8,7 @@
             ?>
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding Mail Account');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding Mail Account');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -47,20 +47,15 @@
 
             <table class='data'>
             <tr class="data-add">
-                <td class="data-dotted" width="150">
+                <td class="data-dotted">
                     <table class="data-col1">
                         <tr><td></td></tr>
                     </table>
                 </td>
-                <td class="data-dotted" width="830px">
-                    <table width="830px">
-                        <tr>
-                            <td></td>
-                        </tr>
-                    </table>
+                <td class="data-dotted">
                     <table class="data-col2" width="600px">
                         <tr>
-                            <td class="vst-text" style="padding: 20px 0 0 2px;">
+                            <td class="vst-text" style="padding: 24px 0 0 0;">
                                 <?php print __('Domain');?>
                             </td>
                         </tr>
@@ -70,7 +65,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Account');?>
                             </td>
                         </tr>
@@ -80,7 +75,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                             </td>
                         </tr>
@@ -90,16 +85,16 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <a href="javascript:elementHideShow('advtable');" class="vst-advanced"> <?php print __('Advanced options');?></a>
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 9px 0 0 0px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0px;">
                                 <table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                                     <tr>
-                                        <td class="vst-text" style="padding: 0 0 0 2px;">
-                                            <?php print __('Quota');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
+                                            <?php print __('Quota');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
                                         </td>
                                     </tr>
                                     <tr>
@@ -108,8 +103,8 @@
                                         </td>
                                     </tr>
                                 <tr>
-                                    <td class="vst-text" style="padding: 10 0 0 2px;">
-                                        <?php print __('Aliases');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
+                                    <td class="vst-text" style="padding: 12px 0 0 0;">
+                                        <?php print __('Aliases');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
                                     </td>
                                 </tr>
                                 <tr>
@@ -118,8 +113,8 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td class="vst-text" style="padding: 10 0 0 2px;">
-                                        <?php print __('Forward to');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
+                                    <td class="vst-text" style="padding: 12px 0 0 0">
+                                        <?php print __('Forward to');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
                                     </td>
                                 </tr>
                                 <tr>
@@ -128,7 +123,7 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td class="vst-text" style="padding: 10 0 0 2px;">
+                                    <td class="vst-text" style="padding: 12px 0 0 0;">
                                         <?php print __('Do not store forwarded mail');?>
                                     </td>
                                 </tr>
@@ -154,5 +149,5 @@
                 </table>
             </td>
         </tr>
-</table>
-        </form>
+    </table>
+    </form>
diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html
index 90ba8f02f..56777f656 100644
--- a/web/templates/admin/add_package.html
+++ b/web/templates/admin/add_package.html
@@ -9,7 +9,7 @@
 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding Package');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding Package');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -27,20 +27,15 @@
         <form id="vstobjects" name="v_add_package" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
+                    <td class="data-dotted">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Package Name');?>
                                 </td>
                             </tr>
@@ -50,7 +45,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Web Template');?>
                                 </td>
                             </tr>
@@ -73,7 +68,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Proxy Template');?>
                                 </td>
                             </tr>
@@ -96,7 +91,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DNS Template');?>
                                 </td>
                             </tr>
@@ -119,7 +114,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('SSH Access');?>
                                 </td>
                             </tr>
@@ -142,7 +137,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Web Domains');?>
                                 </td>
                             </tr>
@@ -152,7 +147,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Web Aliases');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -162,7 +157,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DNS domains');?>
                                 </td>
                             </tr>
@@ -172,7 +167,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DNS records');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -182,7 +177,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Mail Domains');?>
                                 </td>
                             </tr>
@@ -192,7 +187,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Mail Accounts');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -202,7 +197,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Databases');?>
                                 </td>
                             </tr>
@@ -212,7 +207,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Cron Jobs');?>
                                 </td>
                             </tr>
@@ -222,7 +217,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Backups');?>
                                 </td>
                             </tr>
@@ -232,7 +227,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Quota');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                 </td>
                             </tr>
@@ -242,7 +237,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Bandwidth');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                 </td>
                             </tr>
@@ -252,7 +247,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Name servers');?>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html
index fe1bc63eb..b645e7ac9 100644
--- a/web/templates/admin/add_user.html
+++ b/web/templates/admin/add_user.html
@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding User');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding User');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -45,21 +45,15 @@
 
             <table class="data">
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
+                    <td class="data-dotted">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Username');?>
                                 </td>
                             </tr>
@@ -69,7 +63,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Password');?> / <a href="javascript:randomString();" class="generate" ><?php print __('generate');?></a>
                                 </td>
                             </tr>
@@ -79,7 +73,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Email');?>
                                 </td>
                             </tr>
@@ -89,7 +83,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;" name="v_package">
+                                <td class="vst-text" style="padding: 12px 0 0 0;" name="v_package">
                                     <?php print __('Package');?>
                                 </td>
                             </tr>
@@ -113,7 +107,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;" >
+                                <td class="vst-text" style="padding: 12px 0 0 0;" >
                                     <?php print __('Language');?>
                                 </td>
                             </tr>
@@ -139,7 +133,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('First Name');?>
                                 </td>
                             </tr>
@@ -149,7 +143,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Last Name');?>
                                 </td>
                             </tr>
@@ -159,7 +153,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Send login credentials to email address');?>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html
index 920cdec92..c1ef3db55 100644
--- a/web/templates/admin/add_web.html
+++ b/web/templates/admin/add_web.html
@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Adding Domain');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Adding Domain');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -65,22 +65,17 @@
 
             <table class='data'>
                 <tr class="data-add">
-                <td class="data-dotted" width="150">
+                <td class="data-dotted">
                     <table class="data-col1">
                         <tr>
                             <td></td>
                         </tr>
                     </table>
                 </td>
-                <td class="data-dotted" width="830px">
-                    <table width="830px">
+                <td class="data-dotted">
+                    <table class="data-col2">
                         <tr>
-                            <td></td>
-                        </tr>
-                    </table>
-                    <table class="data-col2" width="600px">
-                        <tr>
-                            <td class="vst-text" style="padding: 20px 0 0 2px;">
+                            <td class="vst-text" style="padding: 24px 0 0 0;">
                                 <?php print __('Domain');?>
                             </td>
                         </tr>
@@ -90,7 +85,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('IP address');?>
                             </td>
                         </tr>
@@ -112,7 +107,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('DNS Support');?>
                             </td>
                         </tr>
@@ -122,7 +117,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Mail Support');?>
                             </td>
                         </tr>
@@ -132,14 +127,14 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print __('Advanced options');?></a>
                             </td>
                         </tr>
                     </table>
                     <table class="data-col2" width="600px" style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Aliases');?>
                             </td>
                         </tr>
@@ -149,7 +144,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Proxy Support');?>
                             </td>
                         </tr>
@@ -162,7 +157,7 @@
                             <td>
                                 <table style="display:<?php if ($v_proxy == 'off') { echo 'none';} else {echo 'block';}?>;" id="proxytable" >
                                     <tr>
-                                        <td class="vst-text" style="padding: 9px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('Proxy Extentions');?>
                                         </td>
                                     </tr>
@@ -175,7 +170,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('SSL Support');?> /
                                 <a class="generate" target="_blank" href="/generate/ssl/"><?php print __('Generate CSR') ?></a>
                             </td>
@@ -189,7 +184,7 @@
                             <td>
                                 <table style="display:<?php if (empty($v_ssl)) { echo 'none';} else {echo 'block';}?>;" id="ssltable">
                                     <tr>
-                                        <td class="vst-text" style="padding: 9px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('SSL Home Directory');?>
                                         </td>
                                     </tr>
@@ -206,7 +201,7 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('SSL Certificate');?>
                                         </td>
                                     </tr>
@@ -216,7 +211,7 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('SSL Key');?>
                                         </td>
                                     </tr>
@@ -226,7 +221,7 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('SSL Certificate Authority / Intermediate');?> <span class="optional">(<?php print __('optional');?>)</span>
                                         </td>
                                     </tr>
@@ -239,7 +234,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Web Statistics');?>
                             </td>
                         </tr>
@@ -261,7 +256,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Statistics Authorization');?>
                             </td>
                         </tr>
@@ -274,7 +269,7 @@
                             <td>
                                 <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
                                     <tr>
-                                        <td class="vst-text" style="padding: 9px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('Username');?>
                                         </td>
                                     </tr>
@@ -284,7 +279,7 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('Password');?> / <a href="javascript:WEBrandom();" class="generate"><?php print __('generate');?></a>
                                         </td>
                                     </tr>
@@ -297,7 +292,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Additional FTP Account');?>
                             </td>
                         </tr>
@@ -310,7 +305,7 @@
                             <td>
                                 <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('Username');?><br>
                                             <span style="font-size: 10pt; color:#777;"><?php print __('Prefix will be automaticaly added to username',$user."_");?></span>
                                         </td>
@@ -322,7 +317,7 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('Password');?> / <a href="javascript:FTPrandom();" class="generate" ><?php print __('generate');?></a>
                                         </td>
                                     </tr>
@@ -332,7 +327,7 @@
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td class="vst-text" style="padding: 10px 0 0 0;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                              <?php print __('Send FTP credentials to email');?>
                                         </td>
                                     </tr>
diff --git a/web/templates/admin/edit_cron.html b/web/templates/admin/edit_cron.html
index e578adb43..9a6cd1bcb 100644
--- a/web/templates/admin/edit_cron.html
+++ b/web/templates/admin/edit_cron.html
@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing Cron Job');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing Cron Job');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,7 +26,7 @@
         <form id="vstobjects" name="v_edit_cron" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -37,16 +37,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-
+                    <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Minute');?>
                                 </td>
                             </tr>
@@ -56,7 +50,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Hour');?>
                                 </td>
                             </tr>
@@ -66,7 +60,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Day');?>
                                 </td>
                             </tr>
@@ -76,7 +70,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Month');?>
                                 </td>
                             </tr>
@@ -86,7 +80,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Day of week');?>
                                 </td>
                             </tr>
@@ -96,7 +90,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Command');?>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/edit_db.html b/web/templates/admin/edit_db.html
index 28d36fc88..8a7af352d 100644
--- a/web/templates/admin/edit_db.html
+++ b/web/templates/admin/edit_db.html
@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing Database');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing Database');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -47,7 +47,7 @@
 
            <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -58,15 +58,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
+                    <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Database');?>
                                 </td>
                             </tr>
@@ -77,7 +72,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('User');?>
                                 </td>
                             </tr>
@@ -88,7 +83,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
@@ -98,7 +93,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Type');?>
                                 </td>
                             </tr>
@@ -108,7 +103,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Host');?>
                                 </td>
                             </tr>
@@ -118,7 +113,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Charset');?>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/edit_dns.html b/web/templates/admin/edit_dns.html
index b1832e1fb..017ffca65 100644
--- a/web/templates/admin/edit_dns.html
+++ b/web/templates/admin/edit_dns.html
@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing DNS Domain');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing DNS Domain');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,7 +26,7 @@
         <form id="vstobjects" name="v_edit_dns" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -37,15 +37,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
+                    <td class="data-dotted">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -55,7 +50,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('IP Address');?>
                                 </td>
                             </tr>
@@ -65,7 +60,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Template');?>
                                 </td>
                             </tr>
@@ -86,7 +81,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Expiration Date');?><span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
                                 </td>
                             </tr>
@@ -96,7 +91,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     SOA
                                 </td>
                             </tr>
@@ -106,7 +101,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     TTL
                                 </td>
                             </tr>
diff --git a/web/templates/admin/edit_dns_rec.html b/web/templates/admin/edit_dns_rec.html
index c66906b7c..ad900fa75 100644
--- a/web/templates/admin/edit_dns_rec.html
+++ b/web/templates/admin/edit_dns_rec.html
@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing DNS Record');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing DNS Record');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,7 +26,7 @@
         <form id="vstobjects" name="v_edit_dns_rec" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -37,15 +37,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
+                    <td class="data-dotted">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -56,7 +51,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Record');?>
                                 </td>
                             </tr>
@@ -66,7 +61,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Type');?>
                                 </td>
                             </tr>
@@ -76,7 +71,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('IP or Value');?>
                                 </td>
                             </tr>
@@ -86,7 +81,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Priority');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
@@ -96,7 +91,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Record Number');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('internal');?>)</span>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/edit_ip.html b/web/templates/admin/edit_ip.html
index e077e641e..49e97b1c5 100644
--- a/web/templates/admin/edit_ip.html
+++ b/web/templates/admin/edit_ip.html
@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing IP Address');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing IP Address');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -38,7 +38,7 @@
 
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -49,15 +49,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                        </table>
+                    <td class="data-dotted">
                         <table class="data-col2" width="600px">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('IP address'); ?> 
                                 </td>
                             </tr>
@@ -67,7 +62,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Netmask');?> 
                                 </td>
                             </tr>
@@ -77,7 +72,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Interface'); ?> 
                                 </td>
                             </tr>
@@ -87,7 +82,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Shared'); ?> 
                                 </td>
                             </tr>
@@ -97,7 +92,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Assigned user'); ?> 
                                 </td>
                             </tr>
@@ -115,7 +110,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Assigned domain');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
@@ -125,7 +120,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('NAT IP association');?> <span class="optional">(<?php print __('optional');?>)</span>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/edit_mail.html b/web/templates/admin/edit_mail.html
index b916b1358..4f4e82006 100644
--- a/web/templates/admin/edit_mail.html
+++ b/web/templates/admin/edit_mail.html
@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing Mail Domain');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing Mail Domain');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,7 +26,7 @@
         <form id="vstobjects" name="v_edit_mail" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -37,15 +37,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
+                    <td class="data-dotted">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -55,7 +50,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('AntiSpam Support');?>
                                 </td>
                             </tr>
@@ -65,7 +60,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('AntiVirus Support');?>
                                 </td>
                             </tr>
@@ -75,7 +70,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DKIM Support');?>
                                 </td>
                             </tr>
@@ -85,7 +80,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Catchall email');?>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html
index a2c9c828e..c427685b1 100644
--- a/web/templates/admin/edit_mail_acc.html
+++ b/web/templates/admin/edit_mail_acc.html
@@ -9,7 +9,7 @@
 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing Mail Account');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing Mail Account');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -48,7 +48,7 @@
 
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -59,15 +59,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
-                            <tr>
-                                <td></td>
-                            </tr>
-                    </table>
+                    <td class="data-dotted">
                     <table class="data-col2" width="600px">
                         <tr>
-                            <td class="vst-text" style="padding: 20px 0 0 2px;">
+                            <td class="vst-text" style="padding: 24px 0 0 0;">
                                 <?php print __('Account');?>
                             </td>
                         </tr>
@@ -79,7 +74,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                             </td>
                         </tr>
@@ -89,8 +84,8 @@
                             </td>
                          </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                <?php print __('Quota');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <?php print __('Quota');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('in megabytes');?>)</span>
                             </td>
                         </tr>
                         <tr>
@@ -99,8 +94,8 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10 0 0 2px;">
-                                <?php print __('Aliases');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <?php print __('Aliases');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('use local-part');?>)</span>
                             </td>
                         </tr>
                         <tr>
@@ -109,8 +104,8 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10 0 0 2px;">
-                                <?php print __('Forward to');?> <span style="padding: 0pt 0pt 0pt 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
+                                <?php print __('Forward to');?> <span style="padding: 0 0 0 6px; font-size: 10pt; color: rgb(85, 85, 85);">(<?php print __('one or more email addresses');?>)</span>
                             </td>
                         </tr>
                         <tr>
@@ -119,7 +114,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Do not store forwarded mail');?>
                             </td>
                         </tr>
@@ -129,7 +124,7 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                 <?php print __('Autoreply');?>
                             </td>
                         </tr>
@@ -142,7 +137,7 @@
                             <td>
                                 <table style="display:<?php if ($v_autoreply == 'no') { echo 'none';} else {echo 'block';}?> ;" id="autoreplytable">
                                     <tr>
-                                        <td class="vst-text" style="padding: 9px 0 0 2px;">
+                                        <td class="vst-text" style="padding: 12px 0 0 0;">
                                             <?php print __('Message');?>
                                         </td>
                                     </tr>
diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html
index f310dabab..079d637b5 100644
--- a/web/templates/admin/edit_package.html
+++ b/web/templates/admin/edit_package.html
@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing Package');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing Package');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,7 +26,7 @@
         <form id="vstobjects" name="v_edit_package" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -37,15 +37,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
+                    <td class="data-dotted">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Package Name');?>
                                 </td>
                             </tr>
@@ -56,7 +51,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Web Template');?>
                                 </td>
                             </tr>
@@ -79,7 +74,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Proxy Template');?>
                                 </td>
                             </tr>
@@ -102,7 +97,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DNS Template');?>
                                 </td>
                             </tr>
@@ -125,7 +120,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('SSH Access');?>
                                 </td>
                             </tr>
@@ -148,7 +143,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Web Domains');?>
                                 </td>
                             </tr>
@@ -158,7 +153,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Web Aliases');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -168,7 +163,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DNS domains');?>
                                 </td>
                             </tr>
@@ -178,7 +173,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('DNS records');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -188,7 +183,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Mail Domains');?>
                                 </td>
                             </tr>
@@ -198,7 +193,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Mail Accounts');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('per domain');?>)</span>
                                 </td>
                             </tr>
@@ -208,7 +203,7 @@
                                 <td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Databases');?>
                                 </td>
                             </tr>
@@ -218,7 +213,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Cron Jobs');?>
                                 </td>
                             </tr>
@@ -228,7 +223,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Backups');?>
                                 </td>
                             </tr>
@@ -238,7 +233,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Quota');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                 </td>
                             </tr>
@@ -248,7 +243,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Bandwidth');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('in megabytes');?>)</span>
                                 </td>
                             </tr>
@@ -258,7 +253,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Name Servers');?>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html
index 5c2615942..c1b93a3c5 100644
--- a/web/templates/admin/edit_user.html
+++ b/web/templates/admin/edit_user.html
@@ -8,7 +8,7 @@
             ?> 
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing User');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing User');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -38,7 +38,7 @@
             </script>
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -49,16 +49,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
+                    <td class="data-dotted">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 28px 0 0 0;">
                                     <?php print __('Username');?>
                                 </td>
                             </tr>
@@ -68,7 +62,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
@@ -78,7 +72,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Email');?>
                                 </td>
                             </tr>
@@ -88,7 +82,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;" >
+                                <td class="vst-text" style="padding: 12px 0 0 0;" >
                                     <?php print __('Package');?>
                                 </td>
                             </tr>
@@ -109,7 +103,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;" >
+                                <td class="vst-text" style="padding: 12px 0 0 0;" >
                                     <?php print __('Language');?>
                                 </td>
                             </tr>
@@ -133,7 +127,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('First Name');?>
                                 </td>
                             </tr>
@@ -143,7 +137,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Last Name');?>
                                 </td>
                             </tr>
@@ -153,7 +147,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;" >
+                                <td class="vst-text" style="padding: 12px 0 0 0;" >
                                     <?php print __('SSH Access');?>
                                 </td>
                             </tr>
@@ -174,7 +168,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Default Name Servers');?>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html
index bcee54c68..2466293fd 100644
--- a/web/templates/admin/edit_web.html
+++ b/web/templates/admin/edit_web.html
@@ -8,7 +8,7 @@
             ?>
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing Domain');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing Domain');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -58,7 +58,7 @@
             </script>
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -69,16 +69,10 @@
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
+                    <td class="data-dotted">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
-
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -88,7 +82,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('IP Address');?>
                                 </td>
                             </tr>
@@ -111,7 +105,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Aliases');?>
                                 </td>
                             </tr>
@@ -121,7 +115,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Web Template');?>
                                 </td>
                             </tr>
@@ -142,7 +136,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Proxy Support');?>
                                 </td>
                             </tr>
@@ -155,7 +149,7 @@
                                 <td>
                                     <table style="display:<?php if (empty($v_proxy)) { echo 'none';} else {echo 'block';}?> ;" id="proxytable">
                                         <tr>
-                                            <td class="vst-text" style="padding: 9px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Proxy Template');?>
                                             </td>
                                         </tr>
@@ -179,7 +173,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Proxy Extensions');?>
                                             </td>
                                         </tr>
@@ -192,7 +186,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('SSL Support');?> /
                                     <a class="generate" target="_blank" href="/generate/ssl/?domain=<?php echo $v_domain ?>"><?php print __('Generate CSR') ?></a>
                                 </td>
@@ -206,7 +200,7 @@
                                 <td>
                                     <table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
                                         <tr>
-                                            <td class="vst-text" style="padding: 9px 0 0 0;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('SSL Home Directory');?>
                                             </td>
                                         </tr>
@@ -224,7 +218,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('SSL Certificate');?> 
                                             </td>
                                         </tr>
@@ -234,7 +228,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('SSL Key');?>
                                             </td>
                                         </tr>
@@ -244,7 +238,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('SSL Certificate Authority / Intermediate');?> <span class="optional">(<?php print __('optional');?>)</span>
                                             </td>
                                         </tr>
@@ -257,7 +251,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Web Statistics');?>
                                 </td>
                             </tr>
@@ -279,7 +273,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Statistics Authorization');?>
                                 </td>
                             </tr>
@@ -292,7 +286,7 @@
                                 <td>
                                     <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
                                         <tr>
-                                            <td class="vst-text" style="padding: 9px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Username');?>
                                             </td>
                                         </tr>
@@ -302,7 +296,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Password');?> / <a href="javascript:WEBrandom();" class="generate"><?php print __('generate');?></a>
                                             </td>
                                         </tr>
@@ -315,7 +309,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Additional FTP Account');?>
                                 </td>
                             </tr>
@@ -328,7 +322,7 @@
                                 <td>
                                     <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Username');?>
                                                 <?php if (empty($v_ftp_user)) echo '<br><span style="font-size: 10pt; color:#777;">' . __('Prefix will be automaticaly added to username',$user."_") . '</span>' ?> 
                                             </td>
@@ -340,7 +334,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Password');?> / <a href="javascript:FTPrandom();" class="generate"><?php print __('generate');?></a>
                                             </td>
                                         </tr>
@@ -354,7 +348,7 @@
                                                 echo '';
                                          ?> 
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Send FTP credentials to email');?>
                                             </td>
                                         </tr>
diff --git a/web/templates/admin/generate_ssl.html b/web/templates/admin/generate_ssl.html
index 8b64a515f..1469265a4 100644
--- a/web/templates/admin/generate_ssl.html
+++ b/web/templates/admin/generate_ssl.html
@@ -8,7 +8,7 @@
             ?>
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Generating CSR');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Generating CSR');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,7 +26,7 @@
         <form id="vstobjects" name="v_generate_csr" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -34,15 +34,15 @@
                             </tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
+                    <td class="data-dotted">
+                        <table>
                             <tr>
                                 <td></td>
                             </tr>
                         </table>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -52,7 +52,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Email');?>
                                 </td>
                             </tr>
@@ -62,7 +62,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Country'); ?>
                                     <span class="optional">(<?php print __('2 letter code');?>)</span>
                                 </td>
@@ -73,7 +73,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('State / Province');?>
                                 </td>
                             </tr>
@@ -83,7 +83,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('City / Locality');?>
                                 </td>
                             </tr>
@@ -93,7 +93,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Organization');?>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html
index 046f98386..a888ef014 100644
--- a/web/templates/admin/list_backup.html
+++ b/web/templates/admin/list_backup.html
@@ -1,6 +1,6 @@
            <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/schedule/backup/'"> <?php print __('Create Backup');?> </button>
                         </div>
@@ -78,25 +78,25 @@
                                 <?php print __('download');?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                <td colspan=3 class="domain">
                                     <b><?php echo $key ?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="chart1" style="padding: 10px 0 0px 2px"><?php print __('Backup Size');?>: <?php echo humanize_usage($data[$key]['SIZE']) ?>
-                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['SIZE'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            <td class="chart1" style="padding: 4px 0 0 0"><?php print __('Backup Size');?>: <?php echo humanize_usage($data[$key]['SIZE']) ?>
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:100%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="250">
+                                <td style="vertical-align:top;" width="297px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -106,19 +106,9 @@
                                                 <?php echo $data[$key]['TYPE'] ?> 
                                             </td>
                                         </tr>
-                                        <tr>
-                                            <td class="counter-name">
-                                                <?php print __('Consistent');?>:
-                                            </td>
-                                            <td class="counter-value">
-                                                <a class="counter-value" title="<?php echo str_replace(',', ', ', $data[$key]['WEB']) ?>">
-                                                    <?php print __($web) ?> 
-                                                </a>
-                                            </td>
-                                        </tr>
                                     </table>
                                 </td>
-                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                <td style="vertical-align:top;">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -144,7 +134,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="168px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html
index 763987c93..9c0209596 100644
--- a/web/templates/admin/list_backup_detail.html
+++ b/web/templates/admin/list_backup_detail.html
@@ -1,6 +1,6 @@
            <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/schedule/restore/?backup=<?php echo $_GET['backup'] ?>'"> <?php print __('Restore All');?> </button>
                         </div>
@@ -27,18 +27,15 @@
         </div>
 
         <div id="vstobjects">
-            <div style="height:10px; font-size:0;"></div>
             <table class="data" style="background: #ebe9dc;">
                 <tr>
-                    <td style="padding: 8px 2px 8px 0;">
+                    <td style="padding: 10px 4px">
                         <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['backup'] ?> </b></a>
                     </td>
                 </tr>
             </table>
-            <div style="height:10px; font-size:0;"></div>
             <table class="data">
 
-
                 <?php
                     $backup = $_GET['backup'];
                     $web = explode(',',$data[$backup]['WEB']);
@@ -52,19 +49,19 @@
                             <tr><td><input type="checkbox" class="ch-toggle" name="web[]" value="<?php echo $key ?>" ></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=web&object=<?php echo $key ?>" class="data-controls">
                             <span>
                                 <img src="/images/restore.png" width="6px" height="8px">
                                 <?php print __('restore');?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td class="cron" style="width: 170px; font-size: 14px;">
+                                <td class="cron" width="239px">
                                     <?php echo 'web ' . __('domain') ?> 
                                 </td>
-                                <td class="domain" style="padding: 0 0 0 4px;">
+                                <td class="domain">
                                     <b><?php echo $key ?></b>
                                 </td>
                             </tr>
@@ -89,19 +86,19 @@
                             <tr><td><input type="checkbox" class="ch-toggle" name="dns[]" value="<?php echo $key ?>" ></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=dns&object=<?php echo $key ?>" class="data-controls">
                             <span>
                                 <img src="/images/restore.png" width="6px" height="8px">
                                 <?php print __('restore');?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td class="cron" style="width: 170px; font-size: 14px;">
+                                <td class="cron" width="239px">
                                     <?php echo 'dns ' . __('domain') ?>
                                 </td>
-                                <td class="domain" style="padding: 0 0 0 4px;">
+                                <td class="domain">
                                     <b><?php echo $key ?></b>
                                 </td>
                             </tr>
@@ -126,19 +123,19 @@
                             <tr><td><input type="checkbox" class="ch-toggle" name="mail[]" value="<?php echo $key ?>" ></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=mail&object=<?php echo $key ?>" class="data-controls">
                             <span>
                                 <img src="/images/restore.png" width="6px" height="8px">
                                 <?php print __('restore');?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td class="cron" style="width: 170px; font-size: 14px;">
+                                <td class="cron" width="239px">
                                     <?php echo 'mail ' . __('domain') ?>
                                 </td>
-                                <td class="domain" style="padding: 0 0 0 4px;">
+                                <td class="domain">
                                     <b><?php echo $key ?></b>
                                 </td>
                             </tr>
@@ -163,19 +160,19 @@
                             <tr><td><input type="checkbox" class="ch-toggle" name="db[]" value="<?php echo $key ?>" ></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=db&object=<?php echo $key ?>" class="data-controls">
                             <span>
                                 <img src="/images/restore.png" width="6px" height="8px">
                                 <?php print __('restore');?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td class="cron" style="width: 170px; font-size: 14px;">
+                                <td class="cron" width="239px">
                                     <?php echo __('database') ?>
                                 </td>
-                                <td class="domain" style="padding: 0 0 0 4px;">
+                                <td class="domain">
                                     <b><?php echo $key ?></b>
                                 </td>
                             </tr>
@@ -200,19 +197,19 @@
                             <tr><td><input type="checkbox" class="ch-toggle" name="cron[]" value="<?php echo 'yes' ?>" ></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=cron&object=records" class="data-controls">
                             <span>
                                 <img src="/images/restore.png" width="6px" height="8px">
                                 <?php print __('restore');?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td class="cron" style="width: 170px; font-size: 14px;">
+                                <td class="cron" width="239px">
                                     <?php echo __('cron') ?>
                                 </td>
-                                <td class="domain" style="padding: 0 0 0 4px;">
+                                <td class="domain">
                                     <b><?php echo 'cron ' . __('records') ?></b>
                                 </td>
                             </tr>
@@ -237,19 +234,19 @@
                             <tr><td><input type="checkbox" class="ch-toggle" name="udir[]" value="<?php echo $key ?>" ></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a href="/schedule/restore/?backup=<?php echo $backup ?>&type=udir&object=<?php echo $key ?>" class="data-controls">
                             <span>
                                 <img src="/images/restore.png" width="6px" height="8px">
                                 <?php print __('restore');?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td class="cron" style="width: 170px; font-size: 14px;">
+                                <td class="cron" width="239px">
                                     <?php echo __('user dir') ?>
                                 </td>
-                                <td class="domain" style="padding: 0 0 0 4px;">
+                                <td class="domain">
                                     <b><?php echo $key ?></b>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html
index e5225aea3..14ea68c5a 100644
--- a/web/templates/admin/list_cron.html
+++ b/web/templates/admin/list_cron.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/cron/'"> <?php print __('Add Cron Job');?> </button>
                         </div>
@@ -79,14 +79,14 @@
                                 <?php print __('edit');?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="800px">
+                        <table class="data-col2">
                             <tr>
                                 <td colspan=6 class="cron">
                                     <b><?php echo htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES) ?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top; width:80px">
+                                <td style="vertical-align:top; padding: 4px 0 0 1px" width="118px">
                                     <div class="cron-counter-name">
                                         <?php print __('Min');?> 
                                     </div>
@@ -94,7 +94,7 @@
                                         <?php echo $data[$key]['MIN'] ?> 
                                     </div>
                                 </td>
-                                <td style="vertical-align:top; width:80px">
+                                <td style="vertical-align:top; padding: 4px 0 0 0" width="120px">
                                     <div class="cron-counter-name">
                                         <?php print __('Hour');?> 
                                     </div>
@@ -102,7 +102,7 @@
                                         <?php echo $data[$key]['HOUR'] ?> 
                                     </div>
                                 </td>
-                                <td style="vertical-align:top; width:80px">
+                                <td style="vertical-align:top; padding: 4px 0 0 0" width="120px">
                                     <div class="cron-counter-name">
                                         <?php print __('Day');?> 
                                     </div>
@@ -110,7 +110,7 @@
                                         <?php echo $data[$key]['DAY'] ?> 
                                     </div>
                                 </td>
-                                <td style="vertical-align:top; width:80px">
+                                <td style="vertical-align:top; padding: 4px 0 0 0" width="119px">
                                     <div class="cron-counter-name">
                                         <?php print __('Month');?> 
                                     </div>
@@ -118,7 +118,7 @@
                                         <?php echo $data[$key]['MONTH'] ?> 
                                     </div>
                                 </td>
-                                <td style="vertical-align:top; width:180px">
+                                <td style="vertical-align:top; padding: 4px 0 0 0" width="120px">
                                     <div class="cron-counter-name">
                                         <?php print __('Day of week');?> 
                                     </div>
@@ -140,7 +140,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="168px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html
index f83c29dba..0d475f622 100644
--- a/web/templates/admin/list_db.html
+++ b/web/templates/admin/list_db.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/db/'"> <?php print __('Add Database');?> </button>
                         </div>
@@ -58,7 +58,7 @@
                             <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                             <span class="do_delete">
                                 <img src="/images/delete.png" width="7px" height="7px">
@@ -91,25 +91,25 @@
                                 <?php print __('open %s',$db_admin);?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                <td colspan=3 class="domain">
                                     <b><?php echo $key ?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="chart1" style="padding: 10px 0 0px 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            <td class="chart1" style="padding: 4px 0 0 0"><?php print __('Disk');?>: <?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'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="260">
+                                <td style="vertical-align:top;" width="297px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -129,7 +129,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                <td style="vertical-align:top;">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -161,7 +161,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="168px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html
index 3bd0e9e6f..db3d2f70d 100644
--- a/web/templates/admin/list_dns.html
+++ b/web/templates/admin/list_dns.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/dns/'"> <?php print __('Add DNS Domain');?> </button>
                         </div>
@@ -45,12 +45,12 @@
                 <tr class="data-row">
                     <td class="data-dotted">
                         <table class="data-col1">
-                            <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo "$key" ?>" > </td></tr>
+                            <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo $key ?>" ></td></tr>
                             <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %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">
+                    <td class="data-dotted">
                         <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                             <span class="do_delete">
                                 <img src="/images/delete.png" width="7px" height="7px">
@@ -89,28 +89,28 @@
                                 <?php print __('list records',$data[$key]['RECORDS']); ?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                <td colspan=3 class="domain">
                                     <b><?php echo $key ?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="counter-name" style="padding: 0 0 0 2px;">
+                                            <td class="counter-name">
                                                 <?php echo $data[$key]['IP'] ?> 
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name" style="padding: 0 0 0 2px;">
+                                            <td class="counter-name">
                                                 <?php print $data[$key]['SRC'] ?> 
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="270">
+                                <td style="vertical-align:top;" width="297px">
                                     <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Template') ?>:</td>
@@ -122,7 +122,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                <td style="vertical-align:top;">
                                     <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('TTL') ?>:</td>
@@ -146,7 +146,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="168px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html
index 2028e9d2c..536a6d147 100644
--- a/web/templates/admin/list_dns_rec.html
+++ b/web/templates/admin/list_dns_rec.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add DNS Record');?> </button>
                         </div>
@@ -28,15 +28,13 @@
         </div>
 
         <div id="vstobjects">
-            <div style="height:10px; font-size:0;"></div>
                 <table class="data" style="background: #ebe9dc;">
                     <tr>
-                        <td style="padding: 8px 2px 8px 0;">
+                        <td style="padding: 10px 4px">
                             <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
                         </td>
                     </tr>
                 </table>
-                <div style="height:10px; font-size:0;"></div>
                 <table class="data">
                     <?php
                         foreach ($data as $key => $value) {
@@ -58,7 +56,7 @@
                                 <tr><td></td></tr>
                             </table>
                         </td>
-                        <td class="data-dotted" width="830px">
+                        <td class="data-dotted">
                             <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                 <span class="do_delete">
                                     <img src="/images/delete.png" width="7px" height="7px">
@@ -75,11 +73,11 @@
                                     <?php print __('edit');?> 
                                 </span>
                             </a>
-                            <table class="data-col5" width="806px">
+                            <table class="data-col5">
                                 <tr>
-                                    <td class="log" style="padding: 0 0 0 4px;" width="200"><b><?php echo $data[$key]['RECORD'] ?></b></td>
-                                    <td class="log-counter-value" width="80"><?php echo $data[$key]['TYPE'] ?></td>
-                                    <td class="log-counter-value" width="80"><?php echo $data[$key]['PRIORITY'] ?></td>
+                                    <td class="log" width="239px"><b><?php echo $data[$key]['RECORD'] ?></b></td>
+                                    <td class="log-counter-value" width="57px"><?php echo $data[$key]['TYPE'] ?></td>
+                                    <td class="log-counter-value" width="62px"><?php echo $data[$key]['PRIORITY'] ?></td>
                                     <td class="log-counter-value" ><?php echo $data[$key]['VALUE'] ?></td>
                                 </tr>
                             </table>
@@ -87,12 +85,12 @@
                     </tr>
                     <?php
                         }
-                    ?>
+                    ?> 
                 </table>
             </form>
             <table class="data-count">
                 <tr>
-                    <td width="168px">
+                    <td width="174px">
                     </td>
                     <td>
                         <?php
diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html
index 3766e629b..58c3fb506 100644
--- a/web/templates/admin/list_ip.html
+++ b/web/templates/admin/list_ip.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/ip/'"> <?php print __('Add IP');?> </button>
                         </div>
@@ -42,7 +42,7 @@
                             <tr><td class="data-active"><b><?php print __('active');?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                             <span class="do_delete">
                                 <img src="/images/delete.png" width="7px" height="7px">
@@ -60,16 +60,16 @@
                             </span>
                         </a>
 
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                <td colspan=3 class="domain">
                                     <b><?php echo $key ?></b>
                                     <?php if (!empty($data[$key]['NAT'])) echo ' → <b>' . $data[$key]['NAT'] . '</b>'; ?>
                                     <a class="aliases" style="padding:0 0 0 8px;"><?php echo  $data[$key]['NAME'] ?></a>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -83,7 +83,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="250">
+                                <td style="vertical-align:top;" width="297px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -103,7 +103,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                <td style="vertical-align:top;">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -137,7 +137,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="168px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/admin/list_log.html b/web/templates/admin/list_log.html
index 92a0f6e27..2905de5b5 100644
--- a/web/templates/admin/list_log.html
+++ b/web/templates/admin/list_log.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
                             <input type="text" name="q" class="submenu-search-field">
@@ -28,11 +28,11 @@
                             <tr><td><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">
+                    <td class="data-dotted">
                         <div style="height:20px; width:20px;"></div>
-                    <table class="data-col5" width="806px">
+                    <table class="data-col5">
                         <tr>
-                            <td class="username" style="padding: 0 0 20 0" >
+                            <td class="username">
                                 <?php echo $data[$key]['CMD'] ?>
                             </td>
                         </tr>
@@ -48,7 +48,7 @@
 
         <table class="data-count">
             <tr>
-                <td width="168px"></td>
+                <td width="174px"></td>
                 <td>
                     <?php
                         if ( $i == 1) {
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html
index e0c72787d..ba285720f 100644
--- a/web/templates/admin/list_mail.html
+++ b/web/templates/admin/list_mail.html
@@ -1,6 +1,6 @@
            <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/mail/'"> <?php print __('Add Mail Domain');?> </button>
                         </div>
@@ -57,7 +57,7 @@
                             <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                             <span class="do_delete">
                                 <img src="/images/delete.png" width="7px" height="7px">
@@ -102,26 +102,26 @@
                                 <?php print __('list accounts',$data[$key]['ACCOUNTS']); ?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                <td colspan=3 class="domain">
                                     <b><?php echo $key ?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="chart1" style="padding: 10px 0 2px 0">
+                                            <td class="chart1" style="padding: 4px 0 0 0">
                                                 <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="260">
+                                <td style="vertical-align:top;" width="297px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -141,7 +141,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                <td style="vertical-align:top;" widht="200px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -172,7 +172,7 @@
             </form>
             <table class="data-count">
                 <tr>
-                    <td width="168px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
index 7ead68d7d..b59060165 100644
--- a/web/templates/admin/list_mail_acc.html
+++ b/web/templates/admin/list_mail_acc.html
@@ -1,6 +1,6 @@
            <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add Mail Account');?> </button>
                         </div>
@@ -28,15 +28,13 @@
         </div>
 
         <div id="vstobjects">
-            <div style="height:10px; font-size:0;"></div>
             <table class="data" style="background: #ebe9dc;">
                 <tr>
-                    <td style="padding: 8px 2px 8px 0;">
+                    <td style="padding: 10px 4px;">
                         <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
                     </td>
                 </tr>
             </table>
-            <div style="height:10px; font-size:0;"></div>
             <table class="data">
                 <?php
                     foreach ($data as $key => $value) {
@@ -60,7 +58,7 @@
                             <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                             <span class="do_delete">
                                 <img src="/images/delete.png" width="7px" height="7px">
@@ -87,25 +85,22 @@
                                 <?php print __('edit');?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
-                            <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+                        <table class="data-col2">
+                            <tr><td colspan=3 class="domain"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="counter-name" style="padding: 4px 0 0 0;">
-                                            </td>
-                                        <tr>
-                                            <td class="chart1" style="padding: 2px 0 2px 0">
+                                            <td class="chart1" style="padding: 4px 0 0 0">
                                                 <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                <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]['QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="200">
+                                <td style="vertical-align:top;" width="297px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -125,7 +120,7 @@
                                             </tr>
                                     </table>
                                 </td>
-                                <td rowspan=4 style="vertical-align:top;" width="350">
+                                <td style="vertical-align:top;">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -149,7 +144,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="168px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html
index 8728485a9..d595d43a6 100644
--- a/web/templates/admin/list_packages.html
+++ b/web/templates/admin/list_packages.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/package/'"> <?php print __('Add Package');?> </button>
                         </div>
@@ -40,7 +40,7 @@
                             <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                             <span class="do_delete">
                                 <img src="/images/delete.png" width="7px" height="7px" >
@@ -58,14 +58,14 @@
                             <?php print __('edit');?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="username" style="padding: 10px 0 0 4px;">
+                                <td colspan=3 class="username">
                                     <b><?php echo $key?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Web Template');?>:</td>
@@ -80,27 +80,27 @@
                                             <td class="counter-value"><?php echo $data[$key]['DNS_TEMPLATE'] ?> </td>
                                         </tr>
                                         <tr>
-                                            <td class="chart1" colspan=2 style="padding: 8px 0 0 2px;">
+                                            <td class="chart1" colspan=2 style="padding: 8px 0 0 0">
                                                 <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['BANDWIDTH']) ?> 
-                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:0%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:0%; 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;">
+                                            <td class="chart1" colspan=2>
                                                 <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['DISK_QUOTA']) ?> 
-                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:0%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:0%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="300">
-                                    <table width="300">
+                                <td style="vertical-align:top;" width="297px">
+                                    <table>
                                         <tr>
-                                            <td class="counter-name" width="37%"><?php print __('Web Domains');?>:</td>
+                                            <td class="counter-name"><?php print __('Web Domains');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['WEB_DOMAINS'] ?> </td>
                                         </tr>
                                         <tr>
@@ -117,14 +117,14 @@
                                         </tr>
                                         <tr>
                                             <td class="counter-name"><?php print __('Name Servers');?>:</td>
-                                            <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?> </td>
+                                            <td class="counter-value"><?php echo str_replace(',', '<br>',$data[$key]['NS']) ?> </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="280">
-                                    <table class="data-col4" width="280">
+                                <td style="vertical-align:top;">
+                                    <table>
                                         <tr>
-                                            <td class="counter-name" width="48%"><?php print __('Mail Domains');?>:</td>
+                                            <td class="counter-name"><?php print __('Mail Domains');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['MAIL_DOMAINS'] ?> </td>
                                         </tr>
                                         <tr>
@@ -161,7 +161,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="168px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/admin/list_rrd.html b/web/templates/admin/list_rrd.html
index 13132323c..1481b395d 100644
--- a/web/templates/admin/list_rrd.html
+++ b/web/templates/admin/list_rrd.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 16px">
                         <div style="submenu-button-block">
                             <a class="vst<?php if ((empty($_GET['period'])) || ($_GET['period'] == 'daily')) echo "-selected" ?>" href="?period=daily"><?php print __('Daily');?></a>
                             <a class="vst<?php if ((!empty($_GET['period'])) && ($_GET['period'] == 'weekly')) echo "-selected" ?>" href="?period=weekly"><?php print __('Weekly');?></a>
@@ -32,23 +32,23 @@
 
                 <tr class="data-row">
                     <td class="data-dotted">
-                        <table class="data-col1" width="150">
+                        <table class="data-col1">
                             <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a></td></tr>
                             <tr><td><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">
+                    <td class="data-dotted">
                         <a href="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>" target="_blank" class="data-controls">
                             <span>
                                 <img src="/images/download.png" width="8px" height="8px">
                                 <?php print __('download');?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
-                            <tr><td colspan=3 class="domain" style="padding: 0 0 4px 4px;"><b><?php echo __($data[$key]['TITLE']); ?></b></td></tr>
+                        <table class="data-col2">
+                            <tr><td colspan=3 class="domain"><b><?php echo __($data[$key]['TITLE']); ?></b></td></tr>
                             <tr>
-                                <td style="vertical-align:top;" width="630px">
-                                    <table width="630px">
+                                <td style="vertical-align:top; padding:4px 0 0 0;" width="630px">
+                                    <table>
                                         </tr>
                                             <td style="background: #7a766d;" width="630px" height="250px">
                                                 <img style="padding: 0 0 0 36px;" src="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>">
diff --git a/web/templates/admin/list_search.html b/web/templates/admin/list_search.html
index 871b9a318..726c4051e 100644
--- a/web/templates/admin/list_search.html
+++ b/web/templates/admin/list_search.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div style="submenu-button-block">
                             <a style="float:left; font-size: 16pt; color: #555;"><b><?php print __('Search Results');?></b></a>
                         </div>
@@ -37,12 +37,12 @@
 
                 <tr class="data-row">
                     <td class="data-dotted">
-                        <table class="data-col1" width="150">
+                        <table class="data-col1">
                             <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %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">
+                    <td class="data-dotted">
                         <?php
                             if ($data[$key]['KEY'] == 'RECORD') {
                                 $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
@@ -147,10 +147,10 @@
                             }
                         ?> 
 
-                        <table class="data-col2" width="830px">
-                            <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $data[$key]['RESULT'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+                        <table class="data-col2">
+                            <tr><td colspan=3 class="domain"><b><?php echo $data[$key]['RESULT'] ?></b> <a class="aliases"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
                                             <td class="counter-value">
@@ -159,7 +159,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="200">
+                                <td style="vertical-align:top;" width="297px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -171,13 +171,13 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="350">
+                                <td style="vertical-align:top;">
                                     <table >
                                         <tr>
                                             <td class="counter-name">
                                                 <?php print __('Status');?>:
                                             </td>
-                                            <td class="counter-value" style="padding: 0 0 0 8px;">
+                                            <td class="counter-value">
                                                 <?php echo __($status); ?> 
                                             </td>
                                         </tr>
@@ -195,7 +195,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="168px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1){
diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html
index 73e16d2f8..b6edd6646 100644
--- a/web/templates/admin/list_services.html
+++ b/web/templates/admin/list_services.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
                             <input type="text" name="q" class="submenu-search-field">
@@ -33,21 +33,21 @@
                             <tr><td class="data-active"><b><?php print __('running') ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a href="/restart/system/?hostname=<?php echo $sys['sysinfo']['HOSTNAME'] ?>" class="data-controls">
                             <span>
                                 <img src="/images/reload.png" width="6px" height="7px">
                                 <?php print __('restart'); ?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=4 class="domain" style="padding: 0 0 0 4px;">
+                                <td colspan=4 class="domain">
                                     <b><?php echo $sys['sysinfo']['HOSTNAME'] ?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" width="354px">
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
                                             <td>
@@ -61,36 +61,26 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="142px">
+                                <td style="vertical-align:top;" width="358px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
                                                 <?php print __('LoadAverage');?>:
                                             </td>
-                                            <td>
-                                                <a class="counter-value"> <?php echo $sys['sysinfo']['LOADAVERAGE'] ?></a>
+                                            <td class="counter-value">
+                                                <?php echo $sys['sysinfo']['LOADAVERAGE'] ?> 
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="34px">
-                                    <table>
-                                        <tr>
-                                            <td class="counter-name">
-                                            </td>
-                                            <td>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                                <td style="vertical-align:top;" widht="280px">
+                                <td style="vertical-align:top;">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
                                                 <?php print __('Uptime');?>:
                                             </td>
-                                            <td>
-                                                <a class="counter-value"><?php echo humanize_time($sys['sysinfo']['UPTIME']) ?> </a>
+                                            <td class="counter-value">
+                                                <?php echo humanize_time($sys['sysinfo']['UPTIME']) ?> 
                                             </td>
                                         </tr>
                                     </table>
@@ -139,42 +129,42 @@
                             </span>
                         </a>
 
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=4 class="domain" style="padding: 0 0 0 4px;">
+                                <td colspan=4 class="domain">
                                     <b><?php echo $key ?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" width="200px">
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="counter-name" style="padding: 2px 0 0 0">
+                                            <td class="counter-name">
                                                 <?php echo __($data[$key]['SYSTEM']) ?> 
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="150px">
+                                <td style="vertical-align:top;" width="119px">
                                     <table>
                                         <tr>
-                                            <td class="counter-name" widht="">
+                                            <td class="counter-name">
                                                 <?php print __('CPU');?>:
                                             </td>
-                                            <td>
-                                                <a class="counter-value"> <?php echo $cpu ?>%</a>
+                                            <td class="counter-value">
+                                                <?php echo $cpu ?>%
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="180px">
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
                                                 <?php print __('Memory');?>:
                                             </td>
-                                            <td>
-                                                <a class="counter-value"><?php echo $data[$key]['MEM'] ?> <?php print __('mb');?></a>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['MEM'] ?> <?php print __('mb');?> 
                                             </td>
                                         </tr>
                                     </table>
@@ -185,8 +175,8 @@
                                             <td class="counter-name">
                                                 <?php print __('Uptime');?>:
                                             </td>
-                                            <td>
-                                                <a class="counter-value"><?php echo humanize_time($data[$key]['RTIME']) ?> </a>
+                                            <td class="counter-value">
+                                                <?php echo humanize_time($data[$key]['RTIME']) ?> 
                                             </td>
                                         </tr>
                                     </table>
diff --git a/web/templates/admin/list_ssl.html b/web/templates/admin/list_ssl.html
index a88134f81..8f583b093 100644
--- a/web/templates/admin/list_ssl.html
+++ b/web/templates/admin/list_ssl.html
@@ -8,7 +8,7 @@
             ?>
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Generating CSR');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Generating CSR');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -26,7 +26,7 @@
         <form id="vstobjects" name="v_generate_csr" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
@@ -34,15 +34,10 @@
                             </tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
+                    <td class="data-dotted">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('SSL CSR');?>
                                 </td>
                             </tr>
@@ -52,7 +47,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;"><?php print __('SSL Certificate');?>
+                                <td class="vst-text" style="padding: 12px 0 0 0;"><?php print __('SSL Certificate');?>
                                 </td>
                             </tr>
                             <tr>
@@ -61,7 +56,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('SSL Key');?>
                                 </td>
                             </tr>
diff --git a/web/templates/admin/list_stats.html b/web/templates/admin/list_stats.html
index 34d6ac3bf..b553e7439 100644
--- a/web/templates/admin/list_stats.html
+++ b/web/templates/admin/list_stats.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
                             <input type="text" name="q" class="submenu-search-field">
@@ -40,39 +40,39 @@
 
                 <tr class="data-row">
                     <td class="data-dotted">
-                        <table class="data-col1" width="150">
+                        <table class="data-col1">
                             <tr><td><a class="data-date" ><?php echo strftime("%d %b %Y", strtotime($key))?></a></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <div style="height:20px; width:20px;"></div>
-                        <table class="data-col2" width="830px">
+                    <td class="data-dotted">
+                        <div style="height:19px"></div>
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="username" style="padding: 0 0 0 4px">
+                                <td colspan=3 class="username">
                                     <b><?php echo strftime("%b %Y", strtotime($key))?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="chart1" colspan=2 style="padding: 4px 0 0 2px;">
+                                            <td class="chart1" colspan=2 style="padding: 14px 0 0 0px;">
                                                 <?php print __('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:7px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:8px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
+                                            <td class="chart1" colspan=2>
                                                 <?php print __('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:7px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                <div style="width:160px; height:8px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:8px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td colspan=2>
+                                            <td class="chart1" colspan=2 style="padding: 4px 0 0 1px;">
                                                 <table class="chart2">
                                                     <tr>
                                                         <td>
@@ -95,10 +95,10 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="280">
-                                    <table width="280">
+                                <td style="vertical-align:top;" width="297px">
+                                    <table>
                                         <tr>
-                                            <td class="counter-name" width="37%">
+                                            <td class="counter-name">
                                                 <?php print __('Web Domains');?>:
                                             </td>
                                             <td class="counter-value">
@@ -139,10 +139,10 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="250">
-                                    <table class="data-col4" width="250">
+                                <td style="vertical-align:top;">
+                                    <table>
                                         <tr>
-                                            <td class="counter-name" width="50%">
+                                            <td class="counter-name">
                                                 <?php print __('Mail Domains');?>:
                                             </td>
                                             <td class="counter-value">
@@ -196,7 +196,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="168px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/admin/list_updates.html b/web/templates/admin/list_updates.html
index 67aba1883..130d7864a 100644
--- a/web/templates/admin/list_updates.html
+++ b/web/templates/admin/list_updates.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
                             <input type="text" name="q" class="submenu-search-field">
@@ -44,10 +44,10 @@
                             <tr><td class="data-<?php echo $status ?>"><b><?php echo $upd_status ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <?php
                             if ($data[$key]['UPDATED'] == 'no') {
-                        ?>
+                        ?> 
                         <a href="/update/vesta/?pkg=<?php echo $key ?>" class="data-controls">
                             <span>
                                 <img src="/images/update.png" width="6px" height="7px">
@@ -56,17 +56,17 @@
                         </a>
                         <?php
                             }
-                        ?>
-                        <div style="height:20px; width:20px; float:right;"></div>
+                        ?> 
+                        <div style="height:20px;"></div>
 
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=4 class="domain" style="padding: 0 0 0 4px;">
+                                <td colspan=4 class="domain">
                                     <b><?php echo $key ?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" width="200px">
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
                                             <td class="counter-name" style="padding: 2px 0 0 0">
@@ -75,38 +75,26 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="180px">
+                                <td style="vertical-align:top;" width="297px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
                                                 <?php print __('Version') ?>:
                                             </td>
-                                            <td>
-                                                <a class="counter-value"> <?php echo $data[$key]['VERSION'] ?></a>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['VERSION'] ?> (<?php echo $data[$key]['ARCH'] ?>)
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="170px">
+                                <td style="vertical-align:top;">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
                                                 <?php print __('Release') ?>:
                                             </td>
-                                            <td>
-                                                <a class="counter-value"><?php echo $data[$key]['RELEASE'] ?></a>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </td>
-                                <td style="vertical-align:top;" >
-                                    <table>
-                                        <tr>
-                                            <td class="counter-name">
-                                                <?php print __('Architecture') ?>:
-                                            </td>
-                                            <td>
-                                                <a class="counter-value"><?php echo $data[$key]['ARCH'] ?> </a>
+                                            <td class="counter-value">
+                                                <?php echo $data[$key]['RELEASE'] ?> 
                                             </td>
                                         </tr>
                                     </table>
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index fea210e44..c99b1a42d 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <?php
                                 if ($user == 'admin') {
@@ -60,10 +60,10 @@
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="user[]" value="<?php echo $key ?>" ></td></tr>
                             <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a></td></tr>
-                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                             <span class="do_delete">
                                 <img src="/images/delete.png" width="7px" height="7px">
@@ -131,47 +131,47 @@
                             </span>
                         </a>
 
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <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>
+                                <td colspan=3 class="username"><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="260">
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
-                                        <tr><td colspan=2 class="counter-name"  style="padding: 0 0 0 2px;"><?php echo $data[$key]['CONTACT']?></td></tr>
-                                        <tr><td colspan=2 class="counter-name"  style="padding: 0 0 8px 2px;">[<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?></td></tr>
+                                        <tr><td colspan=2 class="counter-name"><?php echo $data[$key]['CONTACT']?></td></tr>
+                                        <tr><td colspan=2 class="counter-name" style="padding: 2px 0 14px 0;">[<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?></td></tr>
                                         <tr>
-                                            <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
+                                            <td class="chart1" colspan=2><?php print __('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:7px; font-size:0;background-color:#c7d5b3;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
+                                            <td class="chart1" colspan=2 style="padding: 0px 0 0 0;"><?php print __('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:7px; font-size:0;background-color:#c7d5b3;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td colspan=2 style="padding: 2px 0 0 0;">
+                                            <td colspan=2 style="padding: 4px 0 0 1px;">
                                                 <table class="chart2">
                                                     <tr>
                                                         <td>
-                                                            <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?>
+                                                            <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?> 
                                                         </td>
-                                                        <td style="padding: 0px 0px 0px 4px">
-                                                            <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?>
+                                                        <td style="padding: 2px 0px 2px 4px">
+                                                            <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td>
-                                                            <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?>
+                                                            <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?> 
 
                                                         </td>
                                                         <td style="padding: 0px 0px 0px 4px">
-                                                            <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?>
+                                                            <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -179,8 +179,8 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="300">
-                                    <table width="290">
+                                <td style="vertical-align:top;" width="297px">
+                                    <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Web Domains');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?> / <?php echo $data[$key]['WEB_DOMAINS'] ?></td>
@@ -203,12 +203,12 @@
                                         </tr>
                                         <tr>
                                             <td class="counter-name"><?php print __('Name Servers');?>:<br></td>
-                                            <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?></td>
+                                            <td class="counter-value"><?php echo str_replace(',', '<br>',$data[$key]['NS']) ?></td>
                                         </tr>
                                     </table>
                                 </td>
                                 <td style="vertical-align:top;">
-                                    <table class="data-col4">
+                                    <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Mail Domains');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td>
@@ -251,7 +251,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="168px">
+                    <td width="174px">
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html
index 060dfc093..006f7064d 100644
--- a/web/templates/admin/list_web.html
+++ b/web/templates/admin/list_web.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain');?> </button>
                         </div>
@@ -78,10 +78,10 @@
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo $key ?>" ></td></tr>
                             <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                             <span class="do_delete">
                                 <img src="/images/delete.png" width="7px" height="7px">
@@ -127,38 +127,38 @@
                         <?php
                                 }
                          ?> 
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                                    <b><?php echo $key ?></b> <a class="aliases" style="padding: 0 30px 0 8px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
+                                <td colspan=3 class="domain">
+                                    <b><?php echo $key ?></b> <a class="aliases"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="counter-name" style="padding: 0 0 0 2px">
+                                            <td class="counter-name">
                                                 <?php echo $data[$key]['IP'] ?> 
                                             </td>
                                         <tr>
                                         <tr>
-                                            <td class="chart1" style="padding: 4px 0 0 2px">
+                                            <td class="chart1" style="padding: 8px 0 0 0">
                                                 <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
-                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="chart1" style="padding: 2px 0 0 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            <td class="chart1" style="padding: 4px 0 0 0"><?php print __('Disk');?>: <?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'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                             </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="260">
+                                <td style="vertical-align:top;" width="297px">
                                     <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Web Template');?>:</td>
@@ -179,7 +179,7 @@
 
                                     </table>
                                 </td>
-                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                <td rowspan=4 style="vertical-align:top;">
                                     <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Proxy Support');?>:</td>
@@ -189,12 +189,10 @@
                                             <td class="counter-name"><?php print __('Proxy Template');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['PROXY'];?></td>
                                         </tr>
-
                                         <tr>
                                             <td class="counter-name"><?php print __('Proxy Extentions');?>:</td>
                                             <td class="counter-value" <?php if (!empty($proxy_ext_title)) echo "title='".$proxy_ext_title."'" ?>><?php echo $proxy_ext ?></td>
                                         </tr>
-
                                         <tr>
                                             <td class="counter-name"> <?php print __('Additional FTP Account');?>:</td>
                                             <td class="counter-value"> <?php print __($ftp_user) ?></td>
@@ -213,7 +211,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="168px">
+                    <td width="174px">
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/user/edit_dns.html b/web/templates/user/edit_dns.html
index bc259f46e..33ff79bd5 100644
--- a/web/templates/user/edit_dns.html
+++ b/web/templates/user/edit_dns.html
@@ -6,19 +6,18 @@
                     $back = "location.href='".$back."'";
                 }
             ?> 
-
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing DNS Domain');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing DNS Domain');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
-                                echo "<a class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
                             } else {
                                 if (!empty($_SESSION['ok_msg'])) {
-                                    echo "<a class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                 }
                             }
-                        ?>
+                        ?> 
                     </td>
                 </tr>
             </table>
@@ -27,26 +26,21 @@
         <form id="vstobjects" name="v_edit_dns" method="post">
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date" ?><?php echo $v_time?></a>
+                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date"><?php echo $v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
+                    <td class="data-dotted">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -56,7 +50,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('IP Address');?>
                                 </td>
                             </tr>
@@ -66,7 +60,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Expiration Date');?><span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print __('YYYY-MM-DD');?>)</span>
                                 </td>
                             </tr>
@@ -76,7 +70,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     SOA
                                 </td>
                             </tr>
@@ -86,7 +80,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     TTL
                                 </td>
                             </tr>
@@ -95,9 +89,13 @@
                                     <input type="text" size="20" class="vst-input" name="v_ttl" <?php if (!empty($v_ttl)) echo "value=".$v_ttl; ?>>
                                 </td>
                             </tr>
+                        </table>
+                        <table class="data-col2">
                             <tr>
-                                <td style="padding: 24px 0 0 0;">
+                                <td style="padding: 24px 0 0 0;" width="116px">
                                     <input type="submit" class="button" name="save" value="<?php print __('Save');?>">
+                                </td>
+                                <td style="padding: 24px 0 0 0;">
                                     <input type="button" class="button" value="<?php print __('Back');?>" onclick="<?php echo $back ?>">
                                 </td>
                             </tr>
diff --git a/web/templates/user/edit_user.html b/web/templates/user/edit_user.html
index 1508c59f7..0e5c8e4a3 100644
--- a/web/templates/user/edit_user.html
+++ b/web/templates/user/edit_user.html
@@ -6,16 +6,15 @@
                     $back = "location.href='".$back."'";
                 }
             ?> 
-
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing User');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing User');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
-                                echo "<a class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
+                                echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
                             } else {
                                 if (!empty($_SESSION['ok_msg'])) {
-                                    echo "<a class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
+                                    echo "<span class=\"vst-ok\"> → ".$_SESSION['ok_msg']."</span>";
                                 }
                             }
                         ?> 
@@ -39,26 +38,21 @@
             </script>
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date" ?><?php echo $v_time?></a>
+                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date"><?php echo $v_time?></a>
                                 </td>
                             </tr>
-                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
+                            <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status); ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
+                    <td class="data-dotted">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 28px 0 0 0;">
                                     <?php print __('Username');?>
                                 </td>
                             </tr>
@@ -68,7 +62,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Password');?> / <a href="javascript:randomString();" class="generate"><?php print __('generate');?></a>
                                 </td>
                             </tr>
@@ -78,8 +72,8 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Email');?> 
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                    <?php print __('Email');?>
                                 </td>
                             </tr>
                             <tr>
@@ -88,7 +82,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;" >
+                                <td class="vst-text" style="padding: 12px 0 0 0;" >
                                     <?php print __('Language');?>
                                 </td>
                             </tr>
@@ -107,13 +101,13 @@
                                                 }
                                                 echo ">".$value."</option>\n";
                                             }
-                                        ?>
+                                        ?> 
                                     </select>
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                    <?php print __('Default Name Servers');?> 
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
+                                    <?php print __('Default Name Servers');?>
                                 </td>
                             </tr>
                             <tr>
diff --git a/web/templates/user/edit_web.html b/web/templates/user/edit_web.html
index 7263128b7..4b51deed9 100644
--- a/web/templates/user/edit_web.html
+++ b/web/templates/user/edit_web.html
@@ -6,10 +6,9 @@
                     $back = "location.href='".$back."'";
                 }
             ?>
-
             <table class="submenu">
                 <tr>
-                    <td style="padding: 18px 8px;" ><a class="name"><b><?php print __('Editing Domain');?></b></a>
+                    <td style="padding: 20px 10px;" ><a class="name"><b><?php print __('Editing Domain');?></b></a>
                         <?php
                             if (!empty($_SESSION['error_msg'])) {
                                 echo "<span class=\"vst-error\"> → ".$_SESSION['error_msg']."</span>";
@@ -59,26 +58,21 @@
             </script>
             <table class='data'>
                 <tr class="data-add">
-                    <td class="data-dotted" width="150">
+                    <td class="data-dotted">
                         <table class="data-col1">
                             <tr>
                                 <td>
-                                    <a class="data-date" ?><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
-                                    <a class="data-date" ?><?php echo $v_time?></a>
+                                    <a class="data-date"><?php echo strftime("%d %b %Y", strtotime($v_date))?></a><br>
+                                    <a class="data-date"><?php echo $v_time?></a>
                                 </td>
                             </tr>
                             <tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <table width="830px">
+                    <td class="data-dotted">
+                        <table class="data-col2">
                             <tr>
-                                <td></td>
-                            </tr>
-                        </table>
-                        <table class="data-col2" width="830px">
-                            <tr>
-                                <td class="vst-text" style="padding: 20px 0 0 2px;">
+                                <td class="vst-text" style="padding: 24px 0 0 0;">
                                     <?php print __('Domain');?>
                                 </td>
                             </tr>
@@ -88,7 +82,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('IP Address');?>
                                 </td>
                             </tr>
@@ -111,7 +105,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Aliases');?>
                                 </td>
                             </tr>
@@ -121,7 +115,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Proxy Support');?>
                                 </td>
                             </tr>
@@ -134,7 +128,7 @@
                                 <td>
                                     <table style="display:<?php if (empty($v_proxy)) { echo 'none';} else {echo 'block';}?> ;" id="proxytable">
                                         <tr>
-                                            <td class="vst-text" style="padding: 9px 0 0 0;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Proxy Extensions');?>
                                             </td>
                                         </tr>
@@ -147,7 +141,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('SSL Support');?> /
                                     <a class="generate" target="_blank" href="/generate/ssl/?domain=<?php echo $v_domain ?>"><?php print __('Generate CSR') ?></a>
                                 </td>
@@ -161,13 +155,14 @@
                                 <td>
                                     <table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
                                         <tr>
-                                            <td class="vst-text" style="padding: 9px 0 0 0;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('SSL Home Directory');?>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
                                                 <select class="vst-list" name="v_ssl_home">
+
                                                     <option value='same' <?php if ($v_ssl_home == 'same') echo "selected";?>>
                                                          public_html
                                                     </option>
@@ -178,8 +173,8 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
-                                                <?php print __('SSL Certificate');?>
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
+                                                <?php print __('SSL Certificate');?> 
                                             </td>
                                         </tr>
                                         <tr>
@@ -188,7 +183,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('SSL Key');?>
                                             </td>
                                         </tr>
@@ -198,7 +193,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('SSL Certificate Authority / Intermediate');?> <span class="optional">(<?php print __('optional');?>)</span>
                                             </td>
                                         </tr>
@@ -211,7 +206,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Web Statistics');?>
                                 </td>
                             </tr>
@@ -233,7 +228,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Statistics Authorization');?>
                                 </td>
                             </tr>
@@ -246,7 +241,7 @@
                                 <td>
                                     <table style="display:<?php if (empty($v_stats_user)) { echo 'none';} else {echo 'block';}?> ;" id="statstable" name="v-add-web-domain-stats-user">
                                         <tr>
-                                            <td class="vst-text" style="padding: 9px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Username');?>
                                             </td>
                                         </tr>
@@ -256,7 +251,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Password');?> / <a href="javascript:WEBrandom();" class="generate"><?php print __('generate');?></a>
                                             </td>
                                         </tr>
@@ -269,7 +264,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="vst-text" style="padding: 10px 0 0 2px;">
+                                <td class="vst-text" style="padding: 12px 0 0 0;">
                                     <?php print __('Additional FTP Account');?>
                                 </td>
                             </tr>
@@ -282,25 +277,25 @@
                                 <td>
                                     <table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" id="ftptable" name="v_add_domain_ftp">
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Username');?>
                                                 <?php if (empty($v_ftp_user)) echo '<br><span style="font-size: 10pt; color:#777;">' . __('Prefix will be automaticaly added to username',$user."_") . '</span>' ?> 
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user;  ?>>
+                                                <input type="text" size="20" class="vst-input" name="v_ftp_user" <?php if (!empty($v_ftp_user)) echo "value=".$v_ftp_user;?>>
                                                 <small class="hint"></small>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0;">
-                                                <?php print __('Password');?> / <a href="javascript:FTPrandom();" class="generate" ><?php print __('generate');?></a>
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
+                                                <?php print __('Password');?> / <a href="javascript:FTPrandom();" class="generate"><?php print __('generate');?></a>
                                             </td>
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text"  class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password;  ?>>
+                                                <input type="text"  class="vst-input" name="v_ftp_password" <?php if (!empty($v_ftp_password)) echo "value=".$v_ftp_password;?>>
                                             </td>
                                         </tr>
                                         <?php
@@ -308,7 +303,7 @@
                                                 echo '';
                                          ?> 
                                         <tr>
-                                            <td class="vst-text" style="padding: 10px 0 0 0;">
+                                            <td class="vst-text" style="padding: 12px 0 0 0;">
                                                 <?php print __('Send FTP credentials to email');?>
                                             </td>
                                         </tr>
diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html
index 68cc693c8..b2169f395 100644
--- a/web/templates/user/list_cron.html
+++ b/web/templates/user/list_cron.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/cron/'"> <?php print __('Add Cron Job');?> </button>
                         </div>
@@ -33,8 +33,12 @@
                         ++$i;
                         if ($data[$key]['SUSPENDED'] == 'yes') {
                             $status = 'suspended';
+                            $spnd_action = 'unsuspend';
+                            $spnd_confirmation = 'UNSUSPEND_CRON_CONFIRMATION' ;
                         } else {
                             $status = 'active';
+                            $spnd_action = 'suspend';
+                            $spnd_confirmation = 'SUSPEND_CRON_CONFIRMATION' ;
                         }
                 ?> 
 
@@ -63,14 +67,14 @@
                                 <?php print __('edit');?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="800px">
+                        <table class="data-col2">
                             <tr>
                                 <td colspan=6 class="cron">
                                     <b><?php echo htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES) ?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top; width:80px">
+                                <td style="vertical-align:top; padding: 4px 0 0 1px" width="118px">
                                     <div class="cron-counter-name">
                                         <?php print __('Min');?> 
                                     </div>
@@ -78,7 +82,7 @@
                                         <?php echo $data[$key]['MIN'] ?> 
                                     </div>
                                 </td>
-                                <td style="vertical-align:top; width:80px">
+                                <td style="vertical-align:top; padding: 4px 0 0 0" width="120px">
                                     <div class="cron-counter-name">
                                         <?php print __('Hour');?> 
                                     </div>
@@ -86,7 +90,7 @@
                                         <?php echo $data[$key]['HOUR'] ?> 
                                     </div>
                                 </td>
-                                <td style="vertical-align:top; width:80px">
+                                <td style="vertical-align:top; padding: 4px 0 0 0" width="120px">
                                     <div class="cron-counter-name">
                                         <?php print __('Day');?> 
                                     </div>
@@ -94,7 +98,7 @@
                                         <?php echo $data[$key]['DAY'] ?> 
                                     </div>
                                 </td>
-                                <td style="vertical-align:top; width:80px">
+                                <td style="vertical-align:top; padding: 4px 0 0 0" width="119px">
                                     <div class="cron-counter-name">
                                         <?php print __('Month');?> 
                                     </div>
@@ -102,7 +106,7 @@
                                         <?php echo $data[$key]['MONTH'] ?> 
                                     </div>
                                 </td>
-                                <td style="vertical-align:top; width:180px">
+                                <td style="vertical-align:top; padding: 4px 0 0 0" width="120px">
                                     <div class="cron-counter-name">
                                         <?php print __('Day of week');?> 
                                     </div>
@@ -124,7 +128,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="168px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html
index 8159563ee..6a3939ab1 100644
--- a/web/templates/user/list_db.html
+++ b/web/templates/user/list_db.html
@@ -1,13 +1,13 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/db/'"> <?php print __('Add Database');?> </button>
                         </div>
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
-                                <input type="text" name="q" class="submenu-search-field">
-                                <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                             </form>
                         </div>
                         <div class="submenu-select-block">
@@ -28,15 +28,17 @@
         <div id="vstobjects">
             <table class='data'>
                 <?php
-                    list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"] . ":");
+                    list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
                     foreach ($data as $key => $value) {
                         ++$i;
                         if ($data[$key]['SUSPENDED'] == 'yes') {
                             $status = 'suspended';
                             $spnd_action = 'unsuspend' ;
+                            $spnd_confirmation = 'UNSUSPEND_DATABASE_CONFIRMATION' ;
                         } else {
                             $status = 'active';
                             $spnd_action = 'suspend' ;
+                            $spnd_confirmation = 'SUSPEND_DATABASE_CONFIRMATION' ;
                         }
                         if ($data[$key]['HOST'] != 'localhost' ) $http_host = $data[$key]['HOST'];
                         if ($data[$key]['TYPE'] == 'mysql') $db_admin = "phpMyAdmin";
@@ -54,7 +56,7 @@
                             <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                             <span class="do_delete">
                                 <img src="/images/delete.png" width="7px" height="7px">
@@ -77,25 +79,25 @@
                                 <?php print __('open %s',$db_admin);?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                <td colspan=3 class="domain">
                                     <b><?php echo $key ?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="chart1" style="padding: 10px 0 0px 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            <td class="chart1" style="padding: 4px 0 0 0"><?php print __('Disk');?>: <?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'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="260">
+                                <td style="vertical-align:top;" width="297px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -115,7 +117,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                <td style="vertical-align:top;">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -147,7 +149,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="160px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html
index 084d3e223..c6f4dbcad 100644
--- a/web/templates/user/list_dns.html
+++ b/web/templates/user/list_dns.html
@@ -1,13 +1,13 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/dns/'"> <?php print __('Add DNS Domain');?> </button>
                         </div>
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
-                                <input type="text" name="q" class="submenu-search-field">
-                                <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                             </form>
                         </div>
                         <div class="submenu-select-block">
@@ -24,6 +24,7 @@
                 </tr>
             </table>
         </div>
+
         <div id="vstobjects">
             <table class="data">
                 <?php
@@ -32,20 +33,22 @@
                         if ($data[$key]['SUSPENDED'] == 'yes') {
                             $status = 'suspended';
                             $spnd_action = 'unsuspend' ;
+                            $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
                         } else {
                             $status = 'active';
                             $spnd_action = 'suspend' ;
+                            $spnd_confirmation = 'SUSPEND_DOMAIN_CONFIRMATION' ;
                         }
                 ?> 
                 <tr class="data-row">
                     <td class="data-dotted">
                         <table class="data-col1">
-                            <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo "$key" ?>" ></td></tr>
+                            <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo $key ?>" ></td></tr>
                             <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %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">
+                    <td class="data-dotted">
                         <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                             <span class="do_delete">
                                 <img src="/images/delete.png" width="7px" height="7px">
@@ -74,31 +77,31 @@
                                 <?php print __('list records',$data[$key]['RECORDS']); ?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                <td colspan=3 class="domain">
                                     <b><?php echo $key ?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="counter-name" style="padding: 0 0 0 2px;">
+                                            <td class="counter-name">
                                                 <?php echo $data[$key]['IP'] ?> 
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="counter-name" style="padding: 0 0 0 2px;">
+                                            <td class="counter-name">
                                                 <?php print $data[$key]['SRC'] ?> 
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="270">
+                                <td style="vertical-align:top;" width="297px">
                                     <table>
                                         <tr>
-                                            <td class="counter-name"><?php print __('Template');?>:</td>
+                                            <td class="counter-name"><?php print __('Template') ?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['TPL'] ?></td>
                                         </tr>
                                         <tr>
@@ -107,7 +110,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                <td style="vertical-align:top;">
                                     <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('TTL') ?>:</td>
@@ -131,7 +134,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="160px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html
index 2e8f2bccb..e957dd778 100644
--- a/web/templates/user/list_dns_rec.html
+++ b/web/templates/user/list_dns_rec.html
@@ -1,13 +1,13 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
-                            <button class="submenu-button-main" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add DNS Record') ?> </button>
+                            <button class="submenu-button-main" onclick="location.href='/add/dns/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add DNS Record');?> </button>
                         </div>
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
-                                <input type="text" name="q" class="submenu-search-field">
-                                <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                             </form>
                         </div>
                         <div class="submenu-select-block">
@@ -26,15 +26,13 @@
         </div>
 
         <div id="vstobjects">
-            <div style="height:10px; font-size:0;"></div>
                 <table class="data" style="background: #ebe9dc;">
                     <tr>
-                        <td style="padding: 8px 2px 8px 0;">
+                        <td style="padding: 10px 4px">
                             <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
                         </td>
                     </tr>
                 </table>
-                <div style="height:10px; font-size:0;"></div>
                 <table class="data">
                     <?php
                         foreach ($data as $key => $value) {
@@ -42,9 +40,11 @@
                             if ($data[$key]['SUSPENDED'] == 'yes') {
                                 $status = 'suspended';
                                 $spnd_action = 'unsuspend' ;
+                                $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ;
                             } else {
                                 $status = 'active';
                                 $spnd_action = 'suspend' ;
+                                $spnd_confirmation = 'UNSUSPEND_RECORD_CONFIRMATION' ;
                             }
                     ?> 
                     <tr class="data-row">
@@ -54,7 +54,7 @@
                                 <tr><td></td></tr>
                             </table>
                         </td>
-                        <td class="data-dotted" width="830px">
+                        <td class="data-dotted">
                             <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                                 <span class="do_delete">
                                     <img src="/images/delete.png" width="7px" height="7px">
@@ -71,11 +71,11 @@
                                     <?php print __('edit');?> 
                                 </span>
                             </a>
-                            <table class="data-col5" width="806px">
+                            <table class="data-col5">
                                 <tr>
-                                    <td class="log" style="padding: 0 0 0 4px;" width="200"><b><?php echo $data[$key]['RECORD'] ?></b></td>
-                                    <td class="log-counter-value" width="80"><?php echo $data[$key]['TYPE'] ?></td>
-                                    <td class="log-counter-value" width="80"><?php echo $data[$key]['PRIORITY'] ?></td>
+                                    <td class="log" width="239px"><b><?php echo $data[$key]['RECORD'] ?></b></td>
+                                    <td class="log-counter-value" width="57px"><?php echo $data[$key]['TYPE'] ?></td>
+                                    <td class="log-counter-value" width="62px"><?php echo $data[$key]['PRIORITY'] ?></td>
                                     <td class="log-counter-value" ><?php echo $data[$key]['VALUE'] ?></td>
                                 </tr>
                             </table>
@@ -83,12 +83,12 @@
                     </tr>
                     <?php
                         }
-                    ?>
+                    ?> 
                 </table>
             </form>
             <table class="data-count">
                 <tr>
-                    <td width="160px">
+                    <td width="174px">
                     </td>
                     <td>
                         <?php
diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html
index 60cb6b4e9..a5d9b74d4 100644
--- a/web/templates/user/list_mail.html
+++ b/web/templates/user/list_mail.html
@@ -1,22 +1,22 @@
-                <table class="submenu">
-                    <tr>
-                        <td style="padding: 12px 8px">
-                            <div class="submenu-button-block">
-                                <button class="submenu-button-main" onclick="location.href='/add/mail/'"> <?php print __('Add Mail Domain');?> </button>
-                            </div>
-                            <div class="submenu-search-block">
-                                <form action="/search/" method="get">
-                                <input type="text" name="q" class="submenu-search-field">
-                                <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
-                                </form>
-                            </div>
+           <table class="submenu">
+                <tr>
+                    <td style="padding: 14px 10px">
+                        <div class="submenu-button-block">
+                            <button class="submenu-button-main" onclick="location.href='/add/mail/'"> <?php print __('Add Mail Domain');?> </button>
+                        </div>
+                        <div class="submenu-search-block">
+                            <form action="/search/" method="get">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            </form>
+                        </div>
                         <div class="submenu-select-block">
                             <form action="/bulk/mail/" method="post" id="objects">
                             <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
-                            <select class="submenu-select-dropdown" name="action">
-                                <option value=""><?php print __('apply to selected');?></option>
-                                <option value="delete"><?php print __('delete');?></option>
-                            </select>
+                                <select class="submenu-select-dropdown" name="action">
+                                    <option value=""><?php print __('apply to selected');?></option>
+                                    <option value="delete"><?php print __('delete');?></option>
+                                </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
                         </div>
                         <?php display_error_block(); ?> 
@@ -28,7 +28,7 @@
         <div id="vstobjects">
             <table class="data">
                 <?php
-                    list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"] . ":");
+                    list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
                     $webmail = "http://".$http_host."/webmail/";
                     if (!empty($sys['config']['MAIL_URL'])) $webmail = $sys['config']['MAIL_URL'];
 
@@ -37,9 +37,11 @@
                         if ($data[$key]['SUSPENDED'] == 'yes') {
                             $status = 'suspended';
                             $spnd_action = 'unsuspend' ;
+                            $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
                         } else {
                             $status = 'active';
                             $spnd_action = 'suspend' ;
+                            $spnd_confirmation = 'UNSUSPEND_DOMAIN_CONFIRMATION' ;
                         }
                         if (empty($data[$key]['CATCHALL'])) {
                             $data[$key]['CATCHALL'] = '/dev/null';
@@ -53,7 +55,7 @@
                             <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                             <span class="do_delete">
                                 <img src="/images/delete.png" width="7px" height="7px">
@@ -88,26 +90,26 @@
                                 <?php print __('list accounts',$data[$key]['ACCOUNTS']); ?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
+                                <td colspan=3 class="domain">
                                     <b><?php echo $key ?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="chart1" style="padding: 10px 0 2px 0">
+                                            <td class="chart1" style="padding: 4px 0 0 0">
                                                 <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="260">
+                                <td style="vertical-align:top;" width="297px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -127,7 +129,7 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                <td style="vertical-align:top;" widht="200px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -158,7 +160,7 @@
             </form>
             <table class="data-count">
                 <tr>
-                    <td width="160px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html
index 35abfef1f..0f9875ffe 100644
--- a/web/templates/user/list_mail_acc.html
+++ b/web/templates/user/list_mail_acc.html
@@ -1,20 +1,20 @@
            <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/mail/?domain=<?php echo $_GET['domain'] ?>'"> <?php print __('Add Mail Account');?> </button>
                         </div>
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
-                                <input type="text" name="q" class="submenu-search-field">
-                                <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                             </form>
                         </div>
                         <div class="submenu-select-block">
                             <form action="/bulk/mail/" method="post" id="objects">
                             <a class="submenu-select-link" href='javascript:checkedAll("objects");'> <?php print __('toggle all');?> </a>
                             <select class="submenu-select-dropdown" name="action">
-                                <option value="apply to selected"><?php print __('apply to selected');?></option>
+                                <option value=""><?php print __('apply to selected');?></option>
                                 <option value="delete"><?php print __('delete');?></option>
                             </select>
                             <input type="submit" name="ok" value="›" class="submenu-button" style="width: 36px;">
@@ -26,15 +26,13 @@
         </div>
 
         <div id="vstobjects">
-            <div style="height:10px; font-size:0;"></div>
             <table class="data" style="background: #ebe9dc;">
                 <tr>
-                    <td style="padding: 8px 2px 8px 0;">
+                    <td style="padding: 10px 4px;">
                         <a class="name" style="color: #555; font-size: 10pt;"><b><?php print __('Listing');?>  <?php echo $_GET['domain'] ?></b></a>
                     </td>
                 </tr>
             </table>
-            <div style="height:10px; font-size:0;"></div>
             <table class="data">
                 <?php
                     foreach ($data as $key => $value) {
@@ -42,9 +40,11 @@
                         if ($data[$key]['SUSPENDED'] == 'yes') {
                             $status = 'suspended';
                             $spnd_action = 'unsuspend' ;
+                            $spnd_confirmation = 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' ;
                         } else {
                             $status = 'active';
                             $spnd_action = 'suspend';
+                            $spnd_confirmation = 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' ;
                         }
                 ?>
 
@@ -56,7 +56,7 @@
                             <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                             <span class="do_delete">
                                 <img src="/images/delete.png" width="7px" height="7px">
@@ -73,26 +73,22 @@
                                 <?php print __('edit');?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
-                            <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+                        <table class="data-col2">
+                            <tr><td colspan=3 class="domain"><b><?php echo $key."@".$_GET['domain'] ?></b> <a class="aliases"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="counter-name" style="padding: 4px 0 0 0;">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td class="chart1" style="padding: 2px 0 2px 0">
+                                            <td class="chart1" style="padding: 4px 0 0 0">
                                                 <?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                <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]['QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="200">
+                                <td style="vertical-align:top;" width="297px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -112,7 +108,7 @@
                                             </tr>
                                     </table>
                                 </td>
-                                <td rowspan=4 style="vertical-align:top;" width="350">
+                                <td style="vertical-align:top;">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -136,7 +132,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="160px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/user/list_search.html b/web/templates/user/list_search.html
index 413625d23..0c01bf057 100644
--- a/web/templates/user/list_search.html
+++ b/web/templates/user/list_search.html
@@ -1,13 +1,13 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div style="submenu-button-block">
                             <a style="float:left; font-size: 16pt; color: #555;"><b><?php print __('Search Results');?></b></a>
                         </div>
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
-                                <input type="text" name="q" class="submenu-search-field">
-                                <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
+                            <input type="text" name="q" class="submenu-search-field">
+                            <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                             </form>
                         </div>
                         <?php display_error_block(); ?> 
@@ -37,32 +37,32 @@
 
                 <tr class="data-row">
                     <td class="data-dotted">
-                        <table class="data-col1" width="150">
+                        <table class="data-col1">
                             <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %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">
+                    <td class="data-dotted">
                         <?php
                             if ($data[$key]['KEY'] == 'RECORD') {
                                 $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                $cnfrm = 'DELETE_RECORD_CONFIRMATION';
+                                $cnfrm = 'RECORD_ACTION_CONFIRMATION';
                             }
                             if ($data[$key]['KEY'] == 'ACCOUNT') {
                                 $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                $cnfrm = 'DELETE_USER_CONFIRMATION';
+                                $cnfrm = 'USER_ACTION_CONFIRMATION';
                             }
                             if ($data[$key]['KEY'] == 'JOB') {
                                 $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
-                                $cnfrm = 'DELETE_CRON_CONFIRMATION';
+                                $cnfrm = 'CRON_ACTION_CONFIRMATION';
                             }
                             if ($data[$key]['KEY'] == 'DATABASE') {
                                 $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
-                                $cnfrm = 'DELETE_DATABASE_CONFIRMATION';
+                                $cnfrm = 'DATABASE_ACTION_CONFIRMATION';
                             }
                             if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
                                 $delete_lnk = '/delete/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
-                                $cnfrm = 'DELETE_DOMAIN_CONFIRMATION';
+                                $cnfrm = 'DOMAIN_ACTION_CONFIRMATION';
                             }
                         ?> 
                         <a id="delete_link_<?php echo $i ?>" class="do_delete">
@@ -71,11 +71,35 @@
                                 <?php print __('delete');?> 
                                 <input type="hidden" name="delete_url" value="<?php echo $delete_lnk; ?>" />
                                 <div id="delete_dialog_<?php echo $i ?>" class="confirmation-text-delete hidden" title="Confirmation">
-                                    <p class="counter-value"><?php print __($cnfrm,$data[$key]['RESULT']);?></p>
+                                    <p class="counter-value"><?php print __($cnfrm,__('delete'),$data[$key]['RESULT']);?></p>
                                 </div>
                             </span>
                         </a>
 
+                        <?php
+
+                            if ($data[$key]['KEY'] == 'RECORD') {
+                                $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'RECORD_ACTION_CONFIRMATION';
+                            }
+                            if ($data[$key]['KEY'] == 'ACCOUNT') {
+                                $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&account='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'USER_ACTION_CONFIRMATION';
+                            }
+                            if ($data[$key]['KEY'] == 'JOB') {
+                                $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?job='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'CRON_ACTION_CONFIRMATION';
+                            }
+                            if ($data[$key]['KEY'] == 'DATABASE') {
+                                $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?database='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'DATABASE_ACTION_CONFIRMATION';
+                            }
+                            if (($data[$key]['KEY'] != 'RECORD') && ($data[$key]['KEY'] != 'ACCOUNT') && ($data[$key]['KEY'] != 'JOB') && ($data[$key]['KEY'] != 'DATABASE') ) {
+                                $spnd_lnk = '/'.$spnd_action.'/'.$data[$key]['TYPE'].'/?'.strtolower($data[$key]['KEY']).'='.$data[$key]['RESULT'].'&user='.$data[$key]['USER'];
+                                $cnfrm = 'DOMAIN_ACTION_CONFIRMATION';
+                            }
+                        ?> 
+
                         <?php
                             if ($data[$key]['KEY'] == 'RECORD') {
                                 $edit_lnk = '/edit/'.$data[$key]['TYPE'].'/?domain='.$data[$key]['PARENT'].'&record_id='.$data[$key]['LINK'].'&user='.$data[$key]['USER'];
@@ -100,22 +124,19 @@
                             </span>
                         </a>
 
-                        <table class="data-col2" width="830px">
-                            <tr><td colspan=3 class="domain" style="padding: 0 0 0 4px;"><b><?php echo $data[$key]['RESULT'] ?></b> <a class="aliases" style="padding: 0 20px 0 4px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
+                        <table class="data-col2">
+                            <tr><td colspan=3 class="domain"><b><?php echo $data[$key]['RESULT'] ?></b> <a class="aliases"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a></td></tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="counter-name">
-                                                <?php print __('Object');?>:
-                                            </td>
                                             <td class="counter-value">
                                                 <?php echo $object ?> 
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="200">
+                                <td style="vertical-align:top;" width="297px">
                                     <table>
                                         <tr>
                                             <td class="counter-name">
@@ -127,13 +148,13 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="350">
+                                <td style="vertical-align:top;">
                                     <table >
                                         <tr>
                                             <td class="counter-name">
                                                 <?php print __('Status');?>:
                                             </td>
-                                            <td class="counter-value" style="padding: 0 0 0 8px;">
+                                            <td class="counter-value">
                                                 <?php echo __($status); ?> 
                                             </td>
                                         </tr>
@@ -151,7 +172,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="160px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1){
diff --git a/web/templates/user/list_stats.html b/web/templates/user/list_stats.html
index 122d471b4..43e5f02e4 100644
--- a/web/templates/user/list_stats.html
+++ b/web/templates/user/list_stats.html
@@ -1,12 +1,14 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
                             <input type="text" name="q" class="submenu-search-field">
                             <input type="submit" value="<?php print __('Search');?>" class="submenu-button" style="width: 96px;">
                             </form>
                         </div>
+                        <div class="submenu-select-block" style="padding-left:8px;">
+                        </div>
                         <?php display_error_block(); ?> 
                     </td>
                 </tr>
@@ -23,39 +25,39 @@
 
                 <tr class="data-row">
                     <td class="data-dotted">
-                        <table class="data-col1" width="150">
+                        <table class="data-col1">
                             <tr><td><a class="data-date" ><?php echo strftime("%d %b %Y", strtotime($key))?></a></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <div style="height:20px; width:20px;"></div>
-                        <table class="data-col2" width="830px">
+                    <td class="data-dotted">
+                        <div style="height:19px"></div>
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="username" style="padding: 0 0 0 4px">
+                                <td colspan=3 class="username">
                                     <b><?php echo strftime("%b %Y", strtotime($key))?></b>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="chart1" colspan=2 style="padding: 4px 0 0 2px;">
+                                            <td class="chart1" colspan=2 style="padding: 14px 0 0 0px;">
                                                 <?php print __('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:7px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:8px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="chart1" colspan=2 style="padding: 0 0 0 2px;">
+                                            <td class="chart1" colspan=2>
                                                 <?php print __('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:7px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                <div style="width:160px; height:8px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:8px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td colspan=2>
+                                            <td class="chart1" colspan=2 style="padding: 4px 0 0 1px;">
                                                 <table class="chart2">
                                                     <tr>
                                                         <td>
@@ -78,10 +80,10 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="280">
-                                    <table width="280">
+                                <td style="vertical-align:top;" width="297px">
+                                    <table>
                                         <tr>
-                                            <td class="counter-name" width="37%">
+                                            <td class="counter-name">
                                                 <?php print __('Web Domains');?>:
                                             </td>
                                             <td class="counter-value">
@@ -122,10 +124,10 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="250">
-                                    <table class="data-col4" width="250">
+                                <td style="vertical-align:top;">
+                                    <table>
                                         <tr>
-                                            <td class="counter-name" width="50%">
+                                            <td class="counter-name">
                                                 <?php print __('Mail Domains');?>:
                                             </td>
                                             <td class="counter-value">
@@ -179,7 +181,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="160px"></td>
+                    <td width="174px"></td>
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html
index 4427bca3c..261779791 100644
--- a/web/templates/user/list_user.html
+++ b/web/templates/user/list_user.html
@@ -1,8 +1,8 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
-                            <button class="submenu-button-main" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain') ?> </button>
+                            <button class="submenu-button-main" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain');?> </button>
                         </div>
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">
@@ -24,6 +24,7 @@
                 </tr>
             </table>
         </div>
+
         <div id="vstobjects">
             <table class="data">
                 <?php
@@ -32,68 +33,70 @@
                         if ($data[$key]['SUSPENDED'] == 'yes') {
                             $status = 'suspended';
                             $spnd_action = 'unsuspend' ;
+                            $spnd_confirmation = 'UNSUSPEND_USER_CONFIRMATION' ;
                         } else {
                             $status = 'active';
                             $spnd_action = 'suspend' ;
+                            $spnd_confirmation = 'SUSPEND_USER_CONFIRMATION' ;
                         }
-                    ?>
-
+                    ?> 
                 <tr class="data-row">
                     <td class="data-dotted">
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="user[]" value="<?php echo $key ?>" ></td></tr>
                             <tr><td><a class="data-date" title="<?php echo $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE']))?></a></td></tr>
-                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
-                        <a href="/edit/user/?user=<?php echo "$key" ?>" class="data-controls">
+                    <td class="data-dotted">
+                        <a href="/edit/user/?user=<?php echo $key; ?>" class="data-controls">
                             <span>
                                 <img src="/images/edit.png" width="8px" height="8px">
-                                <?php print __('edit');?> 
+                                <?php print __('edit'); ?> 
                             </span>
                         </a>
-                        <table class="data-col2" width="830px">
+
+                        <table class="data-col2">
                             <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>
+                                <td colspan=3 class="username"><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="260">
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
-                                        <tr><td colspan=2 class="counter-name"  style="padding: 0 0 0 2px;"><?php echo $data[$key]['CONTACT']?></td></tr>
-                                        <tr><td colspan=2 class="counter-name"  style="padding: 0 0 8px 2px;">[<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?></td></tr>
+                                        <tr><td colspan=2 class="counter-name"><?php echo $data[$key]['CONTACT']?></td></tr>
+                                        <tr><td colspan=2 class="counter-name" style="padding: 2px 0 14px 0;">[<?php echo $data[$key]['PACKAGE']?>] <?php print __('package');?></td></tr>
                                         <tr>
-                                            <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Bandwidth');?>: <?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>% (<?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?>)
+                                            <td class="chart1" colspan=2><?php print __('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:7px; font-size:0;background-color:#c7d5b3;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$data[$key]['BANDWIDTH']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="chart1" colspan=2 style="padding: 0 0 0 3px;"><?php print __('Disk');?>: <?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>% (<?php echo humanize_usage($data[$key]['U_DISK']) ?>)
+                                            <td class="chart1" colspan=2 style="padding: 0px 0 0 0;"><?php print __('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:7px; font-size:0;background-color:#c7d5b3;">
                                                     <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$data[$key]['DISK_QUOTA']) ?>%; height:7px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td colspan=2 style="padding: 2px 0 0 0;">
+                                            <td colspan=2 style="padding: 4px 0 0 1px;">
                                                 <table class="chart2">
                                                     <tr>
                                                         <td>
-                                                            <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?>
+                                                            <?php print __('Web');?>: <?php echo humanize_usage($data[$key]['U_DISK_WEB'])?> 
                                                         </td>
-                                                        <td style="padding: 0px 0px 0px 4px">
-                                                            <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?>
+                                                        <td style="padding: 2px 0px 2px 4px">
+                                                            <?php print __('Databases');?>: <?php echo humanize_usage($data[$key]['U_DISK_DB'])?> 
                                                         </td>
                                                     </tr>
                                                     <tr>
                                                         <td>
-                                                            <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?>
+                                                            <?php print __('Mail');?>: <?php echo humanize_usage($data[$key]['U_DISK_MAIL'])?> 
 
                                                         </td>
                                                         <td style="padding: 0px 0px 0px 4px">
-                                                            <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?>
+                                                            <?php print __('User Directories');?>: <?php echo humanize_usage($data[$key]['U_DISK_DIRS'])?> 
                                                         </td>
                                                     </tr>
                                                 </table>
@@ -101,8 +104,8 @@
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="300">
-                                    <table width="290">
+                                <td style="vertical-align:top;" width="297px">
+                                    <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Web Domains');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['U_WEB_DOMAINS'] ?> / <?php echo $data[$key]['WEB_DOMAINS'] ?></td>
@@ -125,12 +128,12 @@
                                         </tr>
                                         <tr>
                                             <td class="counter-name"><?php print __('Name Servers');?>:<br></td>
-                                            <td class="counter-value"><?php echo str_replace(',', ', ',$data[$key]['NS']) ?></td>
+                                            <td class="counter-value"><?php echo str_replace(',', '<br>',$data[$key]['NS']) ?></td>
                                         </tr>
                                     </table>
                                 </td>
                                 <td style="vertical-align:top;">
-                                    <table class="data-col4">
+                                    <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Mail Domains');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['U_MAIL_DOMAINS'] ?> / <?php echo $data[$key]['MAIL_DOMAINS'] ?></td>
@@ -173,7 +176,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="160px"></td>
+                    <td width="174px">
                     <td>
                         <?php
                             if ( $i == 1) {
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html
index 1f73d72d3..16d759bed 100644
--- a/web/templates/user/list_web.html
+++ b/web/templates/user/list_web.html
@@ -1,6 +1,6 @@
             <table class="submenu">
                 <tr>
-                    <td style="padding: 12px 8px">
+                    <td style="padding: 14px 10px">
                         <div class="submenu-button-block">
                             <button class="submenu-button-main" onclick="location.href='/add/web/'"> <?php print __('Add Web Domain');?> </button>
                         </div>
@@ -76,10 +76,10 @@
                         <table class="data-col1">
                             <tr><td><input type="checkbox" class="ch-toggle" name="domain[]" value="<?php echo $key ?>" ></td></tr>
                             <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo strftime("%d %b %Y", strtotime($data[$key]['DATE'])) ?></a></td></tr>
-                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status); ?></b></td></tr>
+                            <tr><td class="data-<?php echo $status ?>"><b><?php echo __($status) ?></b></td></tr>
                         </table>
                     </td>
-                    <td class="data-dotted" width="830px">
+                    <td class="data-dotted">
                         <a id="delete_link_<?php echo $i ?>" class="data-controls do_delete">
                             <span class="do_delete">
                                 <img src="/images/delete.png" width="7px" height="7px">
@@ -102,6 +102,7 @@
                                 <?php print __('view logs');?> 
                             </span>
                         </a>
+
                         <?php
                             if (!empty($data[$key]['STATS'])) {
                         ?> 
@@ -114,38 +115,38 @@
                         <?php
                                 }
                          ?> 
-                        <table class="data-col2" width="830px">
+                        <table class="data-col2">
                             <tr>
-                                <td colspan=3 class="domain" style="padding: 0 0 0 4px;">
-                                    <b><?php echo $key ?></b> <a class="aliases" style="padding: 0 30px 0 8px"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
+                                <td colspan=3 class="domain">
+                                    <b><?php echo $key ?></b> <a class="aliases"><?php echo str_replace(',', ', ', $data[$key]['ALIAS']) ?></a>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="vertical-align:top;" >
+                                <td style="vertical-align:top;" width="239px">
                                     <table>
                                         <tr>
-                                            <td class="counter-name" style="padding: 0 0 0 2px;">
+                                            <td class="counter-name">
                                                 <?php echo $data[$key]['IP'] ?> 
                                             </td>
                                         <tr>
                                         <tr>
-                                            <td class="chart1" style="padding: 4px 0 0 2px">
+                                            <td class="chart1" style="padding: 8px 0 0 0">
                                                 <?php print __('Bandwidth');?>: <?php echo humanize_usage($data[$key]['U_BANDWIDTH']) ?> 
-                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                                <div style="width:160px; height:6px; font-size:0;background-color:#c7d5b3;">
+                                                    <div style="width:<?php echo get_percentage($data[$key]['U_BANDWIDTH'],$panel[$user]['BANDWIDTH']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                                 </div>
                                             </td>
                                         </tr>
                                         <tr>
-                                            <td class="chart1" style="padding: 2px 0 0 2px"><?php print __('Disk');?>: <?php echo humanize_usage($data[$key]['U_DISK']) ?> 
-                                                <div style="width:160px; height:5px; font-size:0;background-color:#c7d5b3;">
-                                                    <div style="width:<?php echo get_percentage($data[$key]['U_DISK'],$panel[$user]['DISK_QUOTA']) ?>%; height:5px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
+                                            <td class="chart1" style="padding: 4px 0 0 0"><?php print __('Disk');?>: <?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'],$panel[$user]['DISK_QUOTA']) ?>%; height:6px; background-color:#9bbb62; border-right:1px #9bbb62 solid;"></div>
                                             </div>
                                             </td>
                                         </tr>
                                     </table>
                                 </td>
-                                <td style="vertical-align:top;" width="260">
+                                <td style="vertical-align:top;" width="297px">
                                     <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Web Template');?>:</td>
@@ -166,7 +167,7 @@
 
                                     </table>
                                 </td>
-                                <td rowspan=4 style="vertical-align:top;" width="300">
+                                <td rowspan=4 style="vertical-align:top;">
                                     <table>
                                         <tr>
                                             <td class="counter-name"><?php print __('Proxy Support');?>:</td>
@@ -176,12 +177,10 @@
                                             <td class="counter-name"><?php print __('Proxy Template');?>:</td>
                                             <td class="counter-value"><?php echo $data[$key]['PROXY'];?></td>
                                         </tr>
-
                                         <tr>
                                             <td class="counter-name"><?php print __('Proxy Extentions');?>:</td>
                                             <td class="counter-value" <?php if (!empty($proxy_ext_title)) echo "title='".$proxy_ext_title."'" ?>><?php echo $proxy_ext ?></td>
                                         </tr>
-
                                         <tr>
                                             <td class="counter-name"> <?php print __('Additional FTP Account');?>:</td>
                                             <td class="counter-value"> <?php print __($ftp_user) ?></td>
@@ -200,7 +199,7 @@
 
             <table class="data-count">
                 <tr>
-                    <td width="160px">
+                    <td width="174px">
                     <td>
                         <?php
                             if ( $i == 1) {