diff --git a/web/templates/admin/add_cron.html b/web/templates/admin/add_cron.html
index 4d1ea2dad..c62ac77ed 100644
--- a/web/templates/admin/add_cron.html
+++ b/web/templates/admin/add_cron.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding Cron Job</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Adding Cron Job</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/add_db.html b/web/templates/admin/add_db.html
index 6c02d9d03..9a9528c08 100644
--- a/web/templates/admin/add_db.html
+++ b/web/templates/admin/add_db.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding Database</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Adding Database</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/add_dns.html b/web/templates/admin/add_dns.html
index 502243f06..703929a0b 100644
--- a/web/templates/admin/add_dns.html
+++ b/web/templates/admin/add_dns.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding DNS Domain</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Adding DNS Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
@@ -153,5 +153,4 @@
                                 </td>
                             </tr>
                         </table>
-                        <table class="data-spacer" style="height:68px"><tr><td></td></tr></table>
                     </form>
diff --git a/web/templates/admin/add_dns_rec.html b/web/templates/admin/add_dns_rec.html
index 43b5250fb..527e5ea82 100644
--- a/web/templates/admin/add_dns_rec.html
+++ b/web/templates/admin/add_dns_rec.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding DNS Record</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Adding DNS Record</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/add_ip.html b/web/templates/admin/add_ip.html
index 4248c6706..182f86161 100644
--- a/web/templates/admin/add_ip.html
+++ b/web/templates/admin/add_ip.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding IP Address</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Adding IP Address</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/add_mail.html b/web/templates/admin/add_mail.html
index 796f31fdd..6c28f7408 100644
--- a/web/templates/admin/add_mail.html
+++ b/web/templates/admin/add_mail.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding Mail Domain</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Adding Mail Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
@@ -83,6 +83,4 @@
                                 </td>
                             </tr>
                         </table>
-
-                        <table class="data-spacer" style="height:18px"><tr><td></td></tr></table>
                     </form>
diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html
index af0b8a0ca..e4be225c3 100644
--- a/web/templates/admin/add_mail_acc.html
+++ b/web/templates/admin/add_mail_acc.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding Mail Account</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Adding Mail Account</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
@@ -135,7 +135,4 @@
                         </td>
                     </tr>
                 </table>
-
-                <table class="data-spacer" style="height:5px"><tr><td></td></tr></table>
-
             </form>
diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html
index a80078dd0..b09c524aa 100644
--- a/web/templates/admin/add_package.html
+++ b/web/templates/admin/add_package.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding Package</b></a>
+                                        <td style="padding: 10x 2px 0 0;" ><a class="add-name"><b>Adding Package</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html
index 98f0b42ec..52132280d 100644
--- a/web/templates/admin/add_user.html
+++ b/web/templates/admin/add_user.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding User</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Adding User</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html
index 1efe65916..7ec0a9814 100644
--- a/web/templates/admin/add_web.html
+++ b/web/templates/admin/add_web.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding Domain</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Adding Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/edit_cron.html b/web/templates/admin/edit_cron.html
index 320cd4b1e..32e2f0aa9 100644
--- a/web/templates/admin/edit_cron.html
+++ b/web/templates/admin/edit_cron.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing Cron Job</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Editing Cron Job</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/edit_db.html b/web/templates/admin/edit_db.html
index 88ebbe9d1..15eae4e8e 100644
--- a/web/templates/admin/edit_db.html
+++ b/web/templates/admin/edit_db.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing Database</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Editing Database</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/edit_dns.html b/web/templates/admin/edit_dns.html
index 7018f36fa..365887cb6 100644
--- a/web/templates/admin/edit_dns.html
+++ b/web/templates/admin/edit_dns.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing DNS Domain</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Editing DNS Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/edit_dns_rec.html b/web/templates/admin/edit_dns_rec.html
index 7c1f5bc8e..d0dc68da6 100644
--- a/web/templates/admin/edit_dns_rec.html
+++ b/web/templates/admin/edit_dns_rec.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing DNS Record</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Editing DNS Record</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/edit_ip.html b/web/templates/admin/edit_ip.html
index bea6c4ba3..f37e9b11a 100644
--- a/web/templates/admin/edit_ip.html
+++ b/web/templates/admin/edit_ip.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing IP Address</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Editing IP Address</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/edit_mail.html b/web/templates/admin/edit_mail.html
index df871a822..20d460e84 100644
--- a/web/templates/admin/edit_mail.html
+++ b/web/templates/admin/edit_mail.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing Mail Domain</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Editing Mail Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html
index 272b3f9a6..0047e2520 100644
--- a/web/templates/admin/edit_mail_acc.html
+++ b/web/templates/admin/edit_mail_acc.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing Mail Account</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Editing Mail Account</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html
index e10a8c5dc..7ea1a8828 100644
--- a/web/templates/admin/edit_package.html
+++ b/web/templates/admin/edit_package.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing Package</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Editing Package</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html
index 4f8ea0a02..ba0731d34 100644
--- a/web/templates/admin/edit_user.html
+++ b/web/templates/admin/edit_user.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding User</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Adding User</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html
index 577f4425b..99434ee1b 100644
--- a/web/templates/admin/edit_web.html
+++ b/web/templates/admin/edit_web.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing Domain</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Editing Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html
index 2dfbdf494..93a5cdd6c 100644
--- a/web/templates/admin/list_backup.html
+++ b/web/templates/admin/list_backup.html
@@ -220,8 +220,6 @@
     
                         </table>
 
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?> 
-
                         <table class="data-count">
                             <tr>
                                 <td width="160px"></td>
@@ -238,6 +236,3 @@
                         </table>
                     </form>
 
-                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:174px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:38px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html
index f574ad31e..93e2d691e 100644
--- a/web/templates/admin/list_cron.html
+++ b/web/templates/admin/list_cron.html
@@ -197,8 +197,6 @@
                             ?>
                         </table>
 
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?> 
-
                         <table class="data-count">
                             <tr>
                                 <td width="160px"></td>
@@ -215,6 +213,3 @@
                         </table>
                     </form>
 
-                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?> 
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:193px\"><tr><td></td></tr></table>"; ?> 
-                    <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:76px\"><tr><td></td></tr></table>"; ?> 
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html
index 0b78e537c..bf8734968 100644
--- a/web/templates/admin/list_db.html
+++ b/web/templates/admin/list_db.html
@@ -178,8 +178,6 @@
                             ?>
                         </table>
 
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-
                         <table class="data-count">
                             <tr>
                                 <td width="160px"></td>
@@ -195,7 +193,3 @@
                             </tr>
                         </table>
                     </form>
-
-                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:187px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:64px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html
index d7ee227ba..5adb85d48 100644
--- a/web/templates/admin/list_dns.html
+++ b/web/templates/admin/list_dns.html
@@ -164,8 +164,6 @@
                             ?>
                         </table>
 
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-
                         <table class="data-count">
                             <tr>
                                 <td width="160px"></td>
@@ -182,6 +180,3 @@
                         </table>
                     </form>
 
-                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:178px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:46px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html
index 3cf138c53..da3885780 100644
--- a/web/templates/admin/list_dns_rec.html
+++ b/web/templates/admin/list_dns_rec.html
@@ -125,8 +125,6 @@
                         ?> 
                     </table>
 
-                    <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-
                     <table class="data-count">
                         <tr>
                             <td width="160px">
@@ -142,8 +140,3 @@
                         </tr>
                     </table>
                 </form>
-
-                <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:217px\"><tr><td></td></tr></table>"; ?>
-                <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:124px\"><tr><td></td></tr></table>"; ?>
-                <?php if ($i == 3) echo "<table class=\"data-spacer\" style=\"height:31px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html
index 9bd4f6b28..19d50137a 100644
--- a/web/templates/admin/list_ip.html
+++ b/web/templates/admin/list_ip.html
@@ -142,8 +142,6 @@
 
                         </table>
 
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?> 
-
                         <table class="data-count">
                             <tr>
                                 <td width="160px"></td>
@@ -159,7 +157,3 @@
                             </tr>
                         </table>
                     </form>
-
-                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:194px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:78px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/admin/list_log.html b/web/templates/admin/list_log.html
index 19a7838c1..8bffe3f8a 100644
--- a/web/templates/admin/list_log.html
+++ b/web/templates/admin/list_log.html
@@ -52,8 +52,6 @@
 
                     </table>
 
-                    <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-
                     <table class="data-count">
                         <tr>
                             <td width="160px"></td>
@@ -69,8 +67,3 @@
                         </tr>
                     </table>
                 </form>
-
-                <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:227px\"><tr><td></td></tr></table>"; ?>
-                <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:145px\"><tr><td></td></tr></table>"; ?>
-                <?php if ($i == 3) echo "<table class=\"data-spacer\" style=\"height:62px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html
index 38b873f28..0b95d6761 100644
--- a/web/templates/admin/list_mail.html
+++ b/web/templates/admin/list_mail.html
@@ -191,8 +191,6 @@
                             ?>
                         </table>
 
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-
                         <table class="data-count">
                             <tr>
                                 <td width="160px"></td>
@@ -208,7 +206,3 @@
                             </tr>
                         </table>
                     </form>
-
-                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:187px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:64px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
index d66a9d89e..f5b41e5db 100644
--- a/web/templates/admin/list_mail_acc.html
+++ b/web/templates/admin/list_mail_acc.html
@@ -173,8 +173,6 @@
                         ?>
                     </table>
 
-                    <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?> 
-
                     <table class="data-count">
                         <tr>
                             <td width="160px"></td>
@@ -189,9 +187,5 @@
                             </td>
                         </tr>
                     </table>
-
                 </form>
-                <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:194px\"><tr><td></td></tr></table>"; ?>
-                <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:78px\"><tr><td></td></tr></table>"; ?>
 
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html
index cc1bac250..1c57a391c 100644
--- a/web/templates/admin/list_packages.html
+++ b/web/templates/admin/list_packages.html
@@ -220,8 +220,6 @@
                         ?>
                     </table>
 
-                    <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?> 
-
                     <table class="data-count">
                         <tr>
                             <td width="160px"></td>
@@ -237,6 +235,3 @@
                         </tr>
                     </table>
                 </form>
-
-                <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?> 
-                <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:117px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/admin/list_stats.html b/web/templates/admin/list_stats.html
index 55899e436..14e453878 100644
--- a/web/templates/admin/list_stats.html
+++ b/web/templates/admin/list_stats.html
@@ -185,8 +185,6 @@
 
                         </table>
 
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-
                         <table class="data-count">
                             <tr>
                                 <td width="160px"></td>
@@ -203,5 +201,3 @@
                         </table>
                     </form>
 
-                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:117px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index ea1b7a241..0959549d9 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 0 8px 6px">
+                                        <td style="padding: 12px 0 0 6px">
                                             <div style="float:left">
                                                 <?php
                                                     if ($user == 'admin') {
@@ -12,20 +12,28 @@
                                                 ?> 
                                             </div>
                                             <div style="text-align: right; float: right;">
-                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;">
-                                                <button> Search </button>
+                                                <form action="/search/" method="get">
+                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;" name="q">
+                                                <input type="submit" name="search" value="Search" class="button" style="font-size: 12px;">
+                                                </form>
                                             </div>
                                             <div style="float:left; padding-left: 26px;">
-                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-                                                <select style="margin:0 2px 0 0px;" >
+                                                <form action="/bulk/user/" method="post" id="objects">
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> toggle all </a>
+                                                <select style="margin:0 2px 0 0px;" name="action">
                                                     <option>apply to selected</option>
                                                     <option>rebuild</option>
+                                                    <option>rebuild web</option>
+                                                    <option>rebuild dns</option>
+                                                    <option>rebuild mail</option>
+                                                    <option>rebuild db</option>
+                                                    <option>rebuild cron</option>
                                                     <option>update counters</option>
                                                     <option>suspend</option>
                                                     <option>unsuspend</option>
                                                     <option>delete</option>
                                                 </select>
-                                                <button style="width:27px;"> › </button>
+                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px;">
                                             </div>
                                         </td>
                                     </tr>
@@ -34,7 +42,7 @@
                         </tr>
                     </table>
 
-                    <form id="vstobjects">
+                    <div id="vstobjects">
                         <table class="data">
                             <?php
                                 foreach ($data as $key => $value) {
@@ -90,7 +98,7 @@
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px">
                                     <table class="data-col1">
-                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object"></td></tr>
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" 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 date("d M Y", strtotime($data[$key]['DATE']))?></a></td></tr>
                                         <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
                                     </table>
@@ -260,8 +268,7 @@
                                 }
                             ?> 
                         </table>
-
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
+                        </form>
 
                         <table class="data-count">
                             <tr>
@@ -277,6 +284,4 @@
                                 </td>
                             </tr>
                         </table>
-                    </form>
-
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:70px\"><tr><td></td></tr></table>"; ?>
+                    </div>
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html
index 34b66d86a..015f2a1a1 100644
--- a/web/templates/admin/list_web.html
+++ b/web/templates/admin/list_web.html
@@ -1,25 +1,26 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 0 8px 6px">
+                                        <td style="padding: 12px 0 0 6px">
                                             <div style="float:left">
                                                 <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/web/'"> Add Domain </button>
                                             </div>
                                             <div style="text-align: right; float: right;">
-                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;">
-                                                <button> Search </button>
+                                                <form action="/search/" method="get" >
+                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;" name="q">
+                                                <input type="submit" name="search" value="Search" class="button" style="font-size: 12px;">
+                                                </form>
                                             </div>
                                             <div style="float:left; padding-left: 26px;">
-                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-                                                <select style="margin:0 2px 0 0px;" >
+                                                <form action="/bulk/web/" method="post" id="objects">
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> toggle all </a>
+                                                <select style="margin:0 2px 0 0px;" name="action">
                                                     <option>apply to selected</option>
-                                                    <option>rebuild</option>
-                                                    <option>update counters</option>
                                                     <option>suspend</option>
                                                     <option>unsuspend</option>
                                                     <option>delete</option>
                                                 </select>
-                                                <button style="width:27px;"> › </button>
+                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px;font-size: 12px">
                                             </div>
                                         </td>
                                     </tr>
@@ -28,7 +29,7 @@
                         </tr>
                     </table>
 
-                    <form id="vstobjects">
+                    <div id="vstobjects">
                         <table class='data'>
                             <?php
                                 foreach ($data as $key => $value) {
@@ -102,7 +103,7 @@
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
-                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain" value="<?php echo "$key" ?>" ></td></tr>
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" 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 date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
                                         <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
                                     </table>
@@ -218,9 +219,7 @@
                                 }
                             ?> 
                         </table>
-
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-
+                        </form>
 
                         <table class="data-count">
                             <tr>
@@ -236,6 +235,4 @@
                                 </td>
                             </tr>
                         </table>
-                    </form>
-                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:138px\"><tr><td></td></tr></table>"; ?>
+                    </div>
diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html
index 7fb711236..3ca5d0db6 100644
--- a/web/templates/admin/panel.html
+++ b/web/templates/admin/panel.html
@@ -6,12 +6,12 @@
                                         <td width="120px"><a class="top-<?php if($TAB == 'RRD' ) echo 's' ?>link" href="/list/rrd/"><b>RRD Graphics</a></b></td>
                                         <td width="120px"><a class="top-<?php if($TAB == 'STATS' ) echo 's' ?>link" href="/list/stats/"><b>Statistics</a></b></td>
                                         <td width="120px"><a class="top-<?php if($TAB == 'LOG' ) echo 's' ?>link" href="/list/log/"><b>History Log</a></b></td>
-                                        <td width="227px" style="padding: 0 28px 0 0; text-align: right;"><b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b><a class="top-link" style="padding: 0 0 0 6" href="/logout/">Log out</a></td>
+                                        <td width="227px" style="padding: 0 24px 0 0; text-align: right;"><b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b><a class="top-link" style="padding: 0 0 0 6" href="/logout/">Log out</a></td>
                                     </tr>
                                 </table>
                                 <table class="nav">
                                     <tr id="nav-block">
-                                        <td class="logotd" style="padding: 22px 0px 0px 4px; float: left;">
+                                        <td class="logotd" style="padding: 24px 0px 0px 4px; float: left;">
                                             <img src="/images/logo.png" width="124px" height="46px" alt="Vesta logo">
                                         </td>
                                         <td>
diff --git a/web/templates/header.html b/web/templates/header.html
index df9cd4927..01a28a148 100644
--- a/web/templates/header.html
+++ b/web/templates/header.html
@@ -11,6 +11,10 @@
                 background-image: url(/images/b.png);
             }
 
+            form {
+                margin: 0;
+            }
+
             .main {
                 background: #ffffff;
                 box-shadow: 0 0 2px 2px #d7d7d7;
@@ -219,7 +223,7 @@
                 font-size: 9pt;
                 font-family: Arial, sans-serif;
                 color: #555;
-                padding: 8px 0 0 0;
+                padding: 8px 0 4px 0;
                 margin: 0;
             }
 
@@ -567,6 +571,7 @@
             }
 
             .button {
+                filter:chroma(color=#000000);
                 cursor: pointer;
                 color: #333;
                 background-color: #fafafa;
@@ -625,9 +630,10 @@
             }
 
             #vstobjects{
-                padding-top: 186px;
+                padding-top: 192px;
                 width: 996px;
                 padding-left: 3px;
+                min-height: 370px;
             }
 
         </style>
@@ -651,7 +657,10 @@
                 }
 
                 #vstobjects{
-                    padding-top: 186px;
+                    padding-top: 192px;
+                    min-height: 370px;
+                    height: auto !important;
+                    height: 370px;
                     width: 996px;
                 }
 
diff --git a/web/templates/user/add_dns.html b/web/templates/user/add_dns.html
index c0e7667aa..1f3209fa4 100644
--- a/web/templates/user/add_dns.html
+++ b/web/templates/user/add_dns.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding DNS Domain</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Adding DNS Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
@@ -130,5 +130,4 @@
                                 </td>
                             </tr>
                         </table>
-                        <table class="data-spacer" style="height:68px"><tr><td></td></tr></table>
                     </form>
diff --git a/web/templates/user/add_web.html b/web/templates/user/add_web.html
index e67c69a40..921eef0b6 100644
--- a/web/templates/user/add_web.html
+++ b/web/templates/user/add_web.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding Domain</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Adding Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/user/edit_dns.html b/web/templates/user/edit_dns.html
index 17df054ad..8633b203f 100644
--- a/web/templates/user/edit_dns.html
+++ b/web/templates/user/edit_dns.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing DNS Domain</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Editing DNS Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/user/edit_user.html b/web/templates/user/edit_user.html
index c06adb8a0..08a806db6 100644
--- a/web/templates/user/edit_user.html
+++ b/web/templates/user/edit_user.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing User</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Editing User</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/user/edit_web.html b/web/templates/user/edit_web.html
index 9267a8d8b..e110a408f 100644
--- a/web/templates/user/edit_web.html
+++ b/web/templates/user/edit_web.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing Domain</b></a>
+                                        <td style="padding: 10px 2px 0 0;" ><a class="add-name"><b>Editing Domain</b></a>
                                             <?php
                                                 if (!empty($_SESSION['error_msg'])) {
                                                     echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html
index 0ccbe6ca2..a21cf9f04 100644
--- a/web/templates/user/list_cron.html
+++ b/web/templates/user/list_cron.html
@@ -173,8 +173,6 @@
                             ?>
                         </table>
 
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?> 
-
                         <table class="data-count">
                             <tr>
                                 <td width="160px"></td>
@@ -191,6 +189,3 @@
                         </table>
                     </form>
 
-                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?> 
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:193px\"><tr><td></td></tr></table>"; ?> 
-                    <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:76px\"><tr><td></td></tr></table>"; ?> 
diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html
index fa1f3978b..cbbaa3005 100644
--- a/web/templates/user/list_db.html
+++ b/web/templates/user/list_db.html
@@ -154,8 +154,6 @@
                             ?>
                         </table>
 
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-
                         <table class="data-count">
                             <tr>
                                 <td width="160px"></td>
@@ -171,7 +169,3 @@
                             </tr>
                         </table>
                     </form>
-
-                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:187px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:64px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html
index 922f21ad0..15a857993 100644
--- a/web/templates/user/list_dns.html
+++ b/web/templates/user/list_dns.html
@@ -139,8 +139,6 @@
                             ?>
                         </table>
 
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-
                         <table class="data-count">
                             <tr>
                                 <td width="160px"></td>
@@ -157,6 +155,3 @@
                         </table>
                     </form>
 
-                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:178px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:46px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html
index 445e213dc..9c4f49443 100644
--- a/web/templates/user/list_dns_rec.html
+++ b/web/templates/user/list_dns_rec.html
@@ -101,8 +101,6 @@
                             ?>
                         </table>
 
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-
                         <table class="data-count">
                             <tr>
                                 <td width="160px">
@@ -119,7 +117,3 @@
                         </table>
                     </form>
 
-                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:217px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:124px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 3) echo "<table class=\"data-spacer\" style=\"height:31px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html
index 5a392f099..4c2294e7b 100644
--- a/web/templates/user/list_mail.html
+++ b/web/templates/user/list_mail.html
@@ -165,8 +165,6 @@
                             ?>
                         </table>
 
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-
                         <table class="data-count">
                             <tr>
                                 <td width="160px"></td>
@@ -183,6 +181,3 @@
                         </table>
                     </form>
 
-                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:187px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:64px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html
index 607f9f1df..3717ea5db 100644
--- a/web/templates/user/list_mail_acc.html
+++ b/web/templates/user/list_mail_acc.html
@@ -146,8 +146,6 @@
                         ?>
                     </table>
 
-                    <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?> 
-
                     <table class="data-count">
                         <tr>
                             <td width="160px"></td>
@@ -162,9 +160,5 @@
                             </td>
                         </tr>
                     </table>
-
                 </form>
-                <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:194px\"><tr><td></td></tr></table>"; ?>
-                <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:78px\"><tr><td></td></tr></table>"; ?>
 
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html
index ce39710a9..57c9be850 100644
--- a/web/templates/user/list_user.html
+++ b/web/templates/user/list_user.html
@@ -1,7 +1,7 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 0 8px 6px">
+                                        <td style="padding: 12px 0 0 6px">
                                             <div style="float:left">
                                                 <?php
                                                     if ($user == 'admin') {
@@ -12,16 +12,19 @@
                                                 ?> 
                                             </div>
                                             <div style="text-align: right; float: right;">
-                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;">
-                                                <button> Search </button>
+                                                <form action="/search/" method="get">
+                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;" name="q">
+                                                <input type="submit" name="search" value="Search" class="button" style="font-size: 12px;">
+                                                </form>
                                             </div>
                                             <div style="float:left; padding-left: 26px;">
-                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-                                                <select style="margin:0 2px 0 0px;" >
+                                                <form action="/bulk/user/" method="post" id="objects">
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> toggle all </a>
+                                                <select style="margin:0 2px 0 0px;" name="action">
                                                     <option>apply to selected</option>
                                                     <option>update counters</option>
                                                 </select>
-                                                <button style="width:27px;"> › </button>
+                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px;">
                                             </div>
                                         </td>
                                     </tr>
@@ -30,7 +33,7 @@
                         </tr>
                     </table>
 
-                    <form id="vstobjects">
+                    <div id="vstobjects">
                         <table class="data">
                             <?php
                                 foreach ($data as $key => $value) {
@@ -69,7 +72,7 @@
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px">
                                     <table class="data-col1">
-                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object"></td></tr>
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" 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 date("d M Y", strtotime($data[$key]['DATE']))?></a></td></tr>
                                         <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
                                     </table>
@@ -195,8 +198,7 @@
                                 }
                             ?> 
                         </table>
-
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
+                        </form>
 
                         <table class="data-count">
                             <tr>
@@ -212,6 +214,5 @@
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                    </div>
 
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:70px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html
index 90c8192d4..739188d41 100644
--- a/web/templates/user/list_web.html
+++ b/web/templates/user/list_web.html
@@ -1,25 +1,24 @@
 
                                 <table class="sub-menu" style="background: white;">
                                     <tr>
-                                        <td style="padding: 12px 0 8px 6px">
+                                        <td style="padding: 12px 0 0 6px">
                                             <div style="float:left">
                                                 <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/web/'"> Add Domain </button>
                                             </div>
                                             <div style="text-align: right; float: right;">
-                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;">
-                                                <button> Search </button>
+                                                <form action="/search/" method="get">
+                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;" name="q">
+                                                <input type="submit" name="search" value="Search" class="button" style="font-size: 12px;">
+                                                </form>
                                             </div>
                                             <div style="float:left; padding-left: 26px;">
-                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-                                                <select style="margin:0 2px 0 0px;" >
+                                                <form action="/bulk/web/" method="post" id="objects">
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("objects");'> toggle all </a>
+                                                <select style="margin:0 2px 0 0px;" name="action">
                                                     <option>apply to selected</option>
-                                                    <option>rebuild</option>
-                                                    <option>update counters</option>
-                                                    <option>suspend</option>
-                                                    <option>unsuspend</option>
                                                     <option>delete</option>
                                                 </select>
-                                                <button style="width:27px;"> › </button>
+                                                <input type="submit" name="ok" value="›" class="button" style="width: 37px;font-size: 12px">
                                             </div>
                                         </td>
                                     </tr>
@@ -28,7 +27,7 @@
                         </tr>
                     </table>
 
-                    <form id="vstobjects">
+                    <div id="vstobjects">
                         <table class='data'>
                             <?php
                                 foreach ($data as $key => $value) {
@@ -85,7 +84,7 @@
                             <tr class="data-row">
                                 <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
                                     <table class="data-col1">
-                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="domain" value="<?php echo "$key" ?>" ></td></tr>
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" 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 date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
                                         <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
                                     </table>
@@ -194,9 +193,7 @@
                                 }
                             ?> 
                         </table>
-
-                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-
+                        </form>
 
                         <table class="data-count">
                             <tr>
@@ -212,7 +209,5 @@
                                 </td>
                             </tr>
                         </table>
-                    </form>
+                    </div>
 
-                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:300px\"><tr><td></td></tr></table>"; ?>
-                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:138px\"><tr><td></td></tr></table>"; ?>
diff --git a/web/templates/user/panel.html b/web/templates/user/panel.html
index 9df7ab8b2..da0f0d0f4 100644
--- a/web/templates/user/panel.html
+++ b/web/templates/user/panel.html
@@ -6,12 +6,12 @@
                                         <td width="120px"></td>
                                         <td width="120px"></td>
                                         <td width="120px"></td>
-                                        <td width="228px" style="padding: 0 28px 0 0; text-align: right;"><b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b><a class="top-link" style="padding: 0 0 0 6" href="/logout/">Log out</a></td>
+                                        <td width="228px" style="padding: 0 26px 0 0; text-align: right;"><b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b><a class="top-link" style="padding: 0 0 0 6" href="/logout/">Log out</a></td>
                                     </tr>
                                 </table>
                                 <table class="nav">
                                     <tr id="nav-block">
-                                        <td class="logotd" style="padding: 20px 0px 0px 4px; float: left;">
+                                        <td class="logotd" style="padding: 24px 0px 0px 4px; float: left;">
                                             <img src="/images/logo.png" width="124px" height="46px" alt="Vesta logo">
                                         </td>
                                         <td>