diff --git a/web/templates/admin/list_backup.html b/web/templates/admin/list_backup.html
index 13a6e9ed..81182e8c 100644
--- a/web/templates/admin/list_backup.html
+++ b/web/templates/admin/list_backup.html
@@ -44,7 +44,7 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?
         foreach ($data as $key => $value) {
           ++$i;
@@ -142,7 +142,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div -->
       <!-- /.l-separator -->
       <? } ?>
 
@@ -154,6 +154,7 @@
       <div class="l-separator"></div>
       <div class="l-center">
         <div class="l-unit-ft">
+          <table class='data'></table>
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html
index 50015d5c..a87bbae8 100644
--- a/web/templates/admin/list_backup_detail.html
+++ b/web/templates/admin/list_backup_detail.html
@@ -42,15 +42,11 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
-
-
+    <div class="l-center units">
     <div class="l-unit">
       <div class="subtitle"><?=__('Listing')?>  <?=htmlentities($_GET['backup'])?></div>
     </div>
 
-    <div class="l-separator"></div>
-
       <?
         $backup = $_GET['backup'];
         $web = explode(',',$data[$backup]['WEB']);
@@ -97,7 +93,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <? }} ?>
 
@@ -144,7 +140,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <? }} ?>
 
@@ -192,7 +188,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <? }} ?>
 
@@ -239,7 +235,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <? }} ?>
 
@@ -287,7 +283,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <? }} ?>
 
@@ -335,7 +331,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div-->
       <!-- /.l-separator -->
       <? }} ?>
     </div>
diff --git a/web/templates/admin/list_backup_exclusions.html b/web/templates/admin/list_backup_exclusions.html
index fd01287c..1c4f599c 100644
--- a/web/templates/admin/list_backup_exclusions.html
+++ b/web/templates/admin/list_backup_exclusions.html
@@ -41,7 +41,7 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?
         foreach ($data as $key => $value) {
       ?>
@@ -101,7 +101,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <? } ?>
 
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html
index 5ca43c9c..5cce2249 100644
--- a/web/templates/admin/list_cron.html
+++ b/web/templates/admin/list_cron.html
@@ -1,6 +1,10 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <a href="/add/cron/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Cron Job'))?>"></a>
+        <ul class="context-menu sort-order" style="display:none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-name"><span class="name"><?=__('Command')?></span><span class="up">&nbsp;</span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -26,7 +30,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td class="step-right">
                 <form action="/bulk/cron/" method="post" id="objects">
@@ -59,7 +63,7 @@
 
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?
         foreach ($data as $key => $value) {
           ++$i;
@@ -75,7 +79,7 @@
       ?>
 
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE['cron-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="cron-<?=sha1($key)?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="job[]" value="<?php echo $key ?>">
@@ -117,6 +121,9 @@
             <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -140,7 +147,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
@@ -151,6 +158,7 @@
       <div class="l-separator"></div>
       <div class="l-center">
         <div class="l-unit-ft">
+          <table class='data'></table>
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html
index 030085be..fe642916 100644
--- a/web/templates/admin/list_db.html
+++ b/web/templates/admin/list_db.html
@@ -1,7 +1,13 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <a href="/add/db/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Database'))?>"></a>
-
+        <ul class="context-menu sort-order" style="display:none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-name"><span class="name"><?=__('Database')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-disk" sort_as_int="1"><span class="name"><?=__('Disk')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-user"><span class="name"><?=__('User')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-server"><span class="name"><?=__('Host')?></span><span class="up">&nbsp;</span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -18,20 +24,20 @@
 
                   $db_admin_link = "http://".$http_host."/phpmyadmin/";
                   if (!empty($_SESSION['DB_PMA_URL']))
-                    $db_admin_link = $_SESSION['DB_PMA_URL'];
+                    $db_myadmin_link = $_SESSION['DB_PMA_URL'];
                 }
                 if ($data[$key]['TYPE'] == 'pgsql'){
                   $pgsql = 1;
                   $db_admin_link = "http://".$http_host."/phppgadmin/";
                   if (!empty($_SESSION['DB_PGA_URL']))
-                    $db_admin_link = $_SESSION['DB_PGA_URL'];
+                    $db_pgadmin_link = $_SESSION['DB_PGA_URL'];
                 }
               }
               if($mysql){
-                echo '<td class="step-right"><a class="vst" href="'.$db_admin_link.'">phpMyAdmin</td>';
+                echo '<td class="step-right"><a class="vst" href="'.$db_myadmin_link.'" target="_blank">phpMyAdmin</td>';
               }
               if($pgsql){
-                echo '<td class="step-right"><a class="vst" href="'.$db_admin_link.'">phpPgAdmin</td>';
+                echo '<td class="step-right"><a class="vst" href="'.$db_pgadmin_link.'" target="_blank">phpPgAdmin</td>';
               }
             ?>
               <td class="l-sort-toolbar__search-box step-left">
@@ -46,7 +52,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td>
                 <form action="/bulk/db/" method="post" id="objects">
@@ -78,7 +84,7 @@
 
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?
         list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
         foreach ($data as $key => $value) {
@@ -102,7 +108,7 @@
       ?>
 
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE['db-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="db-<?=sha1($key)?>"" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>" sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="database[]" value="<?php echo $key ?>">
@@ -142,6 +148,9 @@
             <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -170,7 +179,7 @@
                   <div class="l-unit__stat-cols clearfix">
                     <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('User')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=__($data[$key]['DBUSER'])?></b>
+                      <b><?=$data[$key]['DBUSER']?></b>
                     </div>
                   </div>
                 </td>
@@ -209,7 +218,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
@@ -220,6 +229,7 @@
       <div class="l-separator"></div>
       <div class="l-center">
         <div class="l-unit-ft">
+          <table class='data'></table>
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html
index ed4aa80e..990ea2a2 100644
--- a/web/templates/admin/list_dns.html
+++ b/web/templates/admin/list_dns.html
@@ -1,6 +1,13 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <a href="/add/dns/" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Domain'))?>" class="l-sort__create-btn"></a>
+        <ul class="context-menu sort-order" style="display:none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-expire" sort_as_int="1"><span class="name"><?=__('Expire')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-ip"><span class="name"><?=__('IP address')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-records"><span class="name"><?=__('Records')?></span><span class="up">&nbsp;</span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -16,7 +23,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td>
                 <form action="/bulk/dns/" method="post">
@@ -46,7 +53,7 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?
         foreach ($data as $key => $value) {
           ++$i;
@@ -61,7 +68,7 @@
           }
       ?>
 
-      <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended';?>">
+      <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_COOKIE['dns-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="dns-<?=sha1($key)?>" sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$key]['RECORDS']?>" >
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
@@ -103,24 +110,27 @@
             <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
+
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
-          <div class="l-unit__name">
+          <div class="l-unit__name separate">
             <?=$key?> <? if(!empty($data[$key]['SRC'])) echo "<span>⇢ ".$data[$key]['SRC']."</span>&nbsp; &nbsp; ";  if($data[$key]['RECORDS']) echo '<span>/ '.$data[$key]['RECORDS'].'</span>';?>
           </div>
-          <div class="l-unit__ip">
-            <?=str_replace('.', '<span>.</span>', $data[$key]['IP'])?>
-          </div>
+          <!--div class="l-unit__ip">
+            <?=str_replace('.', '<span>.</span>', $data[$key]['IP'])?> <b class="step-left"><?=$data[$key]['SOA']?></b>
+          </div -->
           <!-- /.l-unit__ip -->
 
           <div class="l-unit__stats">
             <table>
                <tr>
                 <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><b><?=$data[$key]['SOA']?></b></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--right"></div>
+                  <div class="l-unit__stat-cols display-ip clearfix">
+                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=str_replace('.', '<span>.</span>', $data[$key]['IP'])?></div>
                   </div>
                 </td>
                 <td>
@@ -139,18 +149,37 @@
                     </div>
                   </div>
                 </td>
-              </tr>
-              <tr>
+               </tr>
+               <tr>
                 <td>
-                  <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Expire')?>:</div>
+                  <div class="l-unit__stat-cols clearfix">
+                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><b><?=$data[$key]['SOA']?></b></div>
+                  </div>
+                </td>
+                <td>
+                  <div class="l-unit__stat-cols clearfix">
+                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Expire')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
                       <b><?=translate_date($data[$key]['EXP'])?></b>
                     </div>
                   </div>
                 </td>
                 <td>
+                </td>
               </tr>
+
+
+              <!-- tr>
+                <td>
+                  <div class="l-unit__stat-cols clearfix last">
+                    <div class="l-unit__stat-col l-unit__stat-col--left "><?=$data[$key]['SOA']?></div>
+                    <div class="l-unit__stat-col l-unit__stat-col--right">
+                      <b><?=translate_date($data[$key]['EXP'])?></b>
+                    </div>
+                  </div>
+                </td>
+                <td>
+              </tr-->
             </table>
           </div>
           <!-- /.l-unit__stats -->
@@ -158,7 +187,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div-->
       <!-- /.l-separator -->
       <? } ?>
 
@@ -170,6 +199,7 @@
       <div class="l-separator"></div>
       <div class="l-center">
         <div class="l-unit-ft">
+          <table class='data'></table>
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/admin/list_dns_rec.html b/web/templates/admin/list_dns_rec.html
index 75c32d2d..8489a13e 100644
--- a/web/templates/admin/list_dns_rec.html
+++ b/web/templates/admin/list_dns_rec.html
@@ -46,7 +46,7 @@
 
 
 
-    <div class="l-center">
+    <div class="l-center units">
 
     <div class="l-unit-ft">
       <div class="subtitle"><?=__('Listing')?>  <?=htmlentities($_GET['domain'])?></div>
@@ -113,7 +113,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
diff --git a/web/templates/admin/list_firewall.html b/web/templates/admin/list_firewall.html
index 579d0ef3..51d73f81 100644
--- a/web/templates/admin/list_firewall.html
+++ b/web/templates/admin/list_firewall.html
@@ -1,7 +1,13 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <a href="/add/firewall/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Rule'))?>"></a>
-
+        <ul class="context-menu sort-order" style="display:none;">
+          <li entity="sort-action"><span class="name active"><?=__('Action')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-protocol"><span class="name"><?=__('Protocol')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-port"><span class="name"><?=__('Port')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-ip" sort_as_int="1"><span class="name"><?=__('IP address')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-comment"><span class="name"><?=__('Comment')?></span><span class="up">&nbsp;</span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -21,6 +27,9 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Action')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
               <td>
                 <form action="/bulk/firewall/" method="post">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -47,7 +56,7 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
+    <div class="l-center units compact">
       <?php
         foreach ($data as $key => $value) {
           ++$i;
@@ -62,8 +71,7 @@
           }
       ?>
 
-
-      <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended';?>">
+      <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_COOKIE['firewall-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="firewall-<?=sha1($key)?>" sort-action="<?=$data[$key]['ACTION']?>" sort-protocol="<?=$data[$key]['PROTOCOL']?>" sort-port="<?=$data[$key]['PORT']?>" sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$key]['COMMENT']?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="rule[]" value="<?php echo $key ?>">
@@ -101,6 +109,9 @@
 
         <div class="l-unit__col l-unit__col--left clearfix">
           <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -116,7 +127,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
diff --git a/web/templates/admin/list_firewall_banlist.html b/web/templates/admin/list_firewall_banlist.html
index eb900151..fa3a488d 100644
--- a/web/templates/admin/list_firewall_banlist.html
+++ b/web/templates/admin/list_firewall_banlist.html
@@ -13,14 +13,14 @@
                 </form>
               </td>
               <td class="toggle-all">
-                <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all">
+                <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all"  onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td>
                 <form action="/bulk/firewall/banlist/" method="post">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
                 <div class="l-select">
-                  <select name="" id="">
+                  <select name="action" id="">
                     <option value=""><?=__('apply to selected')?></option>
                     <option value="delete"><?php print __('delete') ?></option>
                   </select>
@@ -42,7 +42,7 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?php
         foreach ($data as $key => $value) {
           ++$i;
@@ -52,7 +52,7 @@
       <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended';?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="check" value="check<?php echo $i ?>">
+            <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="ipchain[]" value="<?php echo $ip . ':' . $chain ?>">
             <label for="check<?php echo $i ?>" class="check-label"></label>
           </div>
           <!-- l-unit-toolbar__col -->
@@ -61,7 +61,7 @@
               <div class="actions-panel__col actions-panel__delete">
                 <a id="delete_link_<?=$i?>" class="data-controls do_delete">
                   <?=__('delete')?> <i class="do_delete"></i>
-                  <input type="hidden" name="delete_url" value="/delete/firewall/banlist/?ip=<?=$ip?>&token=<?=$_SESSION['token']?>" />
+                  <input type="hidden" name="delete_url" value="/delete/firewall/banlist/?ip=<?=$ip?>&chain=<?=$chain?>&token=<?=$_SESSION['token']?>" />
                   <div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
                     <p class="confirmation"><?=__('DELETE_IP_CONFIRMATION',$key)?></p>
                   </div>
@@ -89,7 +89,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html
index 44af79aa..b7e041d8 100644
--- a/web/templates/admin/list_ip.html
+++ b/web/templates/admin/list_ip.html
@@ -1,7 +1,14 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <a href="/add/ip/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add IP'))?>"></a>
-
+        <ul class="context-menu sort-order" style="display:none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-ip"><span class="name"><?=__('ip')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-netmask"><span class="name"><?=__('Netmask')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-interface"><span class="name"><?=__('Interface')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-domains" sort_as_int="1"><span class="name"><?=__('Domains')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-owner"><span class="name"><?=__('Owner')?></span><span class="up">&nbsp;</span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -17,7 +24,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td>
                 <form action="/bulk/ip/" method="post" id="objects">
@@ -46,16 +53,13 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?php
         foreach ($data as $key => $value) {
            ++$i;
       ?>
 
-
-
-
-      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended';?>">
+      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_COOKIE['ip-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="ip-<?=sha1($key)?>" sort-ip="<?=str_replace('.', '', $key)?>" sort-date="<?=strtotime($data[$key]['DATE'] .' '. $data[$key]['TIME'] )?>" sort-netmask="<?=str_replace('.', '', $data[$key]['NETMASK'])?>" sort-interface="<?=__($data[$key]['INTERFACE'])?>" sort-domains="<?=$data[$key]['U_WEB_DOMAINS']?>" sort-owner="<?=__($data[$key]['OWNER'])?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="ip[]" value="<?=$key?>">
@@ -86,6 +90,9 @@
             <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -110,7 +117,7 @@
                 </td>
                 <td>
                   <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Domains')?>:</div>
+                    <div class="l-unit__stat-col l-unit__stat-col--left compact-2"><?=__('Domains')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
                       <b><?=$data[$key]['U_WEB_DOMAINS']?></b>
                     </div>
@@ -118,7 +125,7 @@
                 </td>
                 <td>
                   <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Owner')?>:</div>
+                    <div class="l-unit__stat-col l-unit__stat-col--left compact-2"><?=__('Owner')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
                       <b><?=__($data[$key]['OWNER'])?></b>
                     </div>
@@ -137,7 +144,7 @@
                 </td>
                 <td>
                   <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Status')?>:</div>
+                    <div class="l-unit__stat-col l-unit__stat-col--left compact-2"><?=__('Status')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
                       <b><?=__($data[$key]['STATUS'])?></b>
                     </div>
@@ -145,7 +152,7 @@
                 </td>
                 <td>
                   <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Users')?>:</div>
+                    <div class="l-unit__stat-col l-unit__stat-col--left compact-2"><?=__('Users')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
                       <b><?=str_replace(',', ', ', $data[$key]['U_SYS_USERS'])?></b>
                     </div>
@@ -164,7 +171,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
diff --git a/web/templates/admin/list_log.html b/web/templates/admin/list_log.html
index d0673da3..cc9011e2 100644
--- a/web/templates/admin/list_log.html
+++ b/web/templates/admin/list_log.html
@@ -24,7 +24,7 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?php
         foreach ($data as $key => $value) {
            ++$i;
@@ -66,7 +66,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html
index 94bb2c41..18226cfc 100644
--- a/web/templates/admin/list_mail.html
+++ b/web/templates/admin/list_mail.html
@@ -1,7 +1,12 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <a href="/add/mail/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Domain'))?>"></a>
-
+        <ul class="context-menu sort-order" style="display:none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-accounts" sort_as_int="1"><span class="name"><?=__('Accounts')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-disk" sort_as_int="1"><span class="name"><?=__('Disk')?></span><span class="up">&nbsp;</span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -25,7 +30,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td>
                 <form action="/bulk/mail/" method="post" id="objects">
@@ -57,7 +62,7 @@
 
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?
         list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
         $webmail = "http://".$http_host."/webmail/";
@@ -80,7 +85,7 @@
       ?>
 
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE['mail-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="mail-<?=sha1($key)?>"  sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>" sort-accounts="<?=$data[$key]['ACCOUNTS']?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
@@ -124,6 +129,9 @@
             <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -203,7 +211,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
@@ -214,6 +222,7 @@
       <div class="l-separator"></div>
       <div class="l-center">
         <div class="l-unit-ft">
+          <table class='data'></table>
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
index df25e625..bd0adf81 100644
--- a/web/templates/admin/list_mail_acc.html
+++ b/web/templates/admin/list_mail_acc.html
@@ -1,6 +1,11 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <a href="/add/mail/?domain=<?=$_GET['domain']?>" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Account'))?>"></a>
+        <ul class="context-menu sort-order" style="display:none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-name"><span class="name"><?=__('Account')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-disk" sort_as_int="1"><span class="name"><?=__('Disk')?></span><span class="up">&nbsp;</span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -24,7 +29,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td>
                 <form action="/bulk/mail/" method="post" id="objects">
@@ -56,15 +61,11 @@
 
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <div class="l-unit">
         <div class="subtitle"><?=__('Listing')?>  <?=htmlentities($_GET['domain'])?></div>
       </div>
 
-      <div class="l-separator"></div>
-      <!-- /.l-separator -->
-
-
       <?
         foreach ($data as $key => $value) {
           ++$i;
@@ -80,7 +81,7 @@
       ?>
 
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE['mail-acc-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="mail-acc-<?=sha1($key)?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?$data[$key]['U_DISK']?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="account[]" value="<?php echo $key ?>">
@@ -121,6 +122,9 @@
             <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -184,7 +188,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
@@ -195,6 +199,7 @@
       <div class="l-separator"></div>
       <div class="l-center">
         <div class="l-unit-ft">
+          <table class='data'></table>
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html
index 4f6fdf5e..773b4387 100644
--- a/web/templates/admin/list_packages.html
+++ b/web/templates/admin/list_packages.html
@@ -1,7 +1,10 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <a href="/add/package/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Package'))?>"></a>
-
+        <ul class="context-menu sort-order" style="display:none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-name"><span class="name"><?=__('Package Name')?></span><span class="up">&nbsp;</span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -17,7 +20,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td>
                 <form action="/bulk/package/" method="post" id="objects">
@@ -45,14 +48,14 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?php
         foreach ($data as $key => $value) {
            ++$i;
       ?>
 
 
-      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended';?>">
+      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_COOKIE['packages-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="packages-<?=sha1($key)?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="package[]" value="<?php echo $key ?>">
@@ -84,6 +87,9 @@
             <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -254,7 +260,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
diff --git a/web/templates/admin/list_rrd.html b/web/templates/admin/list_rrd.html
index 81cf8637..756193fb 100644
--- a/web/templates/admin/list_rrd.html
+++ b/web/templates/admin/list_rrd.html
@@ -52,7 +52,7 @@
     <div class="l-separator"></div>
     <!-- /.l-separator -->
 
-    <div class="l-center">
+    <div class="l-center units">
       <?php
         if (empty($_GET['period'])) {
           $period='daily';
@@ -105,7 +105,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div -->
       <!-- /.l-separator -->
       <?}?>
 
diff --git a/web/templates/admin/list_search.html b/web/templates/admin/list_search.html
index 08e17044..ab48babe 100644
--- a/web/templates/admin/list_search.html
+++ b/web/templates/admin/list_search.html
@@ -16,9 +16,9 @@
                   <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
                 </form>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
+              <!-- td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td -->
             </tr>
           </table>
         </div>
@@ -235,7 +235,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div -->
       <!-- /.l-separator -->
       <?}?>
 
@@ -246,6 +246,7 @@
       <div class="l-separator"></div>
       <div class="l-center">
         <div class="l-unit-ft">
+          <table class='data'></table>
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/admin/list_services.html b/web/templates/admin/list_services.html
index 92f243a6..ad1ee6f1 100644
--- a/web/templates/admin/list_services.html
+++ b/web/templates/admin/list_services.html
@@ -43,11 +43,7 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
-
-
-
-
+    <div class="l-center units">
       <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
@@ -111,12 +107,6 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
-      <!-- /.l-separator -->
-
-
-
-
 
 
 
@@ -198,7 +188,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div -->
       <!-- /.l-separator -->
       <?}?>
 
diff --git a/web/templates/admin/list_stats.html b/web/templates/admin/list_stats.html
index f0ee1d23..c5a8ad23 100644
--- a/web/templates/admin/list_stats.html
+++ b/web/templates/admin/list_stats.html
@@ -49,14 +49,14 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?php
         foreach ($data as $key => $value) {
            ++$i;
       ?>
 
 
-      <div class="l-unit">
+      <div class="l-unit <? if($_COOKIE['stats-'.sha1($key)] == 1) echo ' l-unit--starred';?>" uniq-id="stats-<?=sha1($key)?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
           </div>
@@ -74,6 +74,9 @@
           <div class="l-unit__date">
             <?=translate_date($key)?>
           </div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -242,7 +245,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
diff --git a/web/templates/admin/list_updates.html b/web/templates/admin/list_updates.html
index f86fbc40..54bf28aa 100644
--- a/web/templates/admin/list_updates.html
+++ b/web/templates/admin/list_updates.html
@@ -5,9 +5,9 @@
             <tr>
               <td class="step-right">
                 <? if($autoupdate == 'Enabled') {
-                     echo '<a class="vst" href="/delete/cron/autoupdate/?&token='.$_SESSION['token'].'">'.__('disable autoupdate').'</a>';
+                     echo '<a class="vst" href="/delete/cron/autoupdate/?token='.$_SESSION['token'].'">'.__('disable autoupdate').'</a>';
                    } else {
-                     echo '<a class="vst" href="/add/cron/autoupdate/?&token='.$_SESSION['token'].'">'.__('enable autoupdate').'</a>';
+                     echo '<a class="vst" href="/add/cron/autoupdate/?token='.$_SESSION['token'].'">'.__('enable autoupdate').'</a>';
                    } ?>
               </td>
               <td class="l-sort-toolbar__search-box step-left">
@@ -21,9 +21,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/vesta/" method="post">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -50,7 +47,7 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?php
         foreach ($data as $key => $value) {
           ++$i;
@@ -137,7 +134,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div -->
       <!-- /.l-separator -->
       <?}?>
 
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index 3d849a24..0dfee157 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -7,6 +7,12 @@
             echo '<a class="l-sort__create-btn" href="/add/web/" title="'.str_replace(' ', '&nbsp;', __('Add Web Domain')).'"></a>';
           }
         ?>
+        <ul class="context-menu sort-order" style="display:none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-name"><span class="name"><?=__('Username')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-disk" sort_as_int="1"><span class="name"><?=__('Disk')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=__('Bandwidth')?></span><span class="up">&nbsp;</span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -22,7 +28,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td>
                 <form action="/bulk/user/" method="post" id="objects">
@@ -59,7 +65,7 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?php
         foreach ($data as $key => $value) {
           ++$i;
@@ -74,7 +80,7 @@
           }
       ?>
 
-      <div class="l-unit  <? if($status == 'suspended') echo 'l-unit--suspended'; ?>">
+      <div class="l-unit  <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE['user-'.sha1($key)] == 1) echo ' l-unit--starred';?>" uniq-id="user-<?=sha1($key)?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DISK']?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="user[]" value="<?php echo $key ?>">
@@ -143,6 +149,11 @@
             <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
+
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
+
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -327,7 +338,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html
index 93fbba0b..b55609a9 100644
--- a/web/templates/admin/list_web.html
+++ b/web/templates/admin/list_web.html
@@ -2,9 +2,11 @@
       <div class="l-sort clearfix noselect">
         <a href="/add/web/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Web Domain'))?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
-          <li entity="date"><span class="name active">date</span><span class="up">&nbsp;</span></li>
-          <li entity="name"><span class="name">name</span><span class="up">&nbsp;</span></li>
-          <li entity="ip"><span class="name">ip</span><span class="up">&nbsp;</span></li>
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-ip" sort_as_int="1"><span class="name"><?=__('IP address')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-disk" sort_as_int="1"><span class="name"><?=__('Disk')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=__('Bandwidth')?></span><span class="up">&nbsp;</span></li>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
@@ -21,7 +23,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td>
                 <form action="/bulk/web/" method="post" id="objects">
@@ -55,7 +57,7 @@
 
 
 
-    <div class="l-center units">
+    <div class="l-center units narrow">
                 <?php
                     foreach ($data as $key => $value) {
                         ++$i;
@@ -112,9 +114,7 @@
                         }
                     ?>
 
-
-
-      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended';?>" id="web-unit-<?=$i?>">
+      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_COOKIE['web-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="web-<?=sha1($key)?>" id="web-unit-<?=$i?>" sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DISK']?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?=$key?>">
@@ -155,10 +155,13 @@
         <!-- /.l-unit-toolbar -->
 
         <div class="l-unit__col l-unit__col--left clearfix">
-          <div class="l-unit__date" u_date="<?=strtotime('1/1/2011')?>">
+          <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -276,7 +279,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div -->
       <!-- /.l-separator -->
       <?}?>
 
@@ -287,6 +290,7 @@
       <div class="l-separator"></div>
       <div class="l-center">
         <div class="l-unit-ft">
+          <table class='data'></table>
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/footer.html b/web/templates/footer.html
index 42144e23..06310804 100644
--- a/web/templates/footer.html
+++ b/web/templates/footer.html
@@ -9,21 +9,62 @@
             $(window).scroll(function(){hover_menu()});
 
             $('.l-sort-toolbar .sort-by').click(function(){
-              $('.context-menu.sort-order').toggle();
+              $('.context-menu.sort-order').toggle().css({left: $(this).position().left - 10});
             });
 
-//** SORTING **/
-/*
-          var units_arr = $('.units .l-unit');
-          var units = [];
-          units_arr.each(function(i, elm){
-            units[i] = {}
-            units[i]['id'] = elm.id;
-            units[i]['ip'] = parseInt($('#'+elm.id).find('.l-unit__ip').html().replace(/[^0-9]+/g,""));
-            units[i]['name'] = $('#'+elm.id).find('.l-unit__name').attr('u_name');
-            units[i]['date'] = parseInt($($('#'+elm.id).find('.l-unit__date')).attr('u_date'));
-          });
-*/
+
+
+            // SORTING
+
+            V = {
+              sort_par: 'sort-name',
+              sort_direction: -1,
+              sort_as_int: 0
+            };
+
+            $('.sort-order span').click(function(){
+              $('.context-menu.sort-order').toggle();
+              if($(this).hasClass('active'))
+                return;
+
+              $('.sort-order span').removeClass('active');
+              $(this).addClass('active');
+              V.sort_par = $(this).parent('li').attr('entity');
+              V.sort_as_int = $(this).parent('li').attr('sort_as_int');
+              V.sort_direction = $(this).hasClass('up')*1 || -1;
+
+              $('.l-sort .sort-by span b').html($(this).parent('li').find('.name').html());
+              $('.l-sort .sort-by i').removeClass('l-icon-up-arrow l-icon-down-arrow');
+              $(this).hasClass('up') ? $('.l-sort .sort-by i').addClass('l-icon-up-arrow') : $('.l-sort .sort-by i').addClass('l-icon-down-arrow');
+
+
+              $('.l-unit').sort(function (a, b) {
+                if(V.sort_as_int)
+                  return parseInt($(a).attr(V.sort_par)) >= parseInt($(b).attr(V.sort_par)) ? V.sort_direction : V.sort_direction * -1;
+                else
+                  return $(a).attr(V.sort_par) <= $(b).attr(V.sort_par) ? V.sort_direction : V.sort_direction * -1;
+                }).appendTo(".l-center.units");
+              });
+
+
+
+              // STARS
+
+              $('.l-unit .l-icon-star').click(function(){
+                var l_unit = $(this).parents('.l-unit');
+
+                if(l_unit.hasClass('l-unit--starred')){
+                  // removing star
+                  $.removeCookie(l_unit.attr('uniq-id'));
+                  l_unit.removeClass('l-unit--starred');
+                }
+                else{
+                  $.cookie(l_unit.attr('uniq-id'), 1, {expires: 3650});
+                  l_unit.addClass('l-unit--starred');
+                }
+              });
+
+
 
             /*jQuery('.ch-toggle').bind('change', function(evt) {
                 evt.stopImmediatePropagation();
diff --git a/web/templates/header.html b/web/templates/header.html
index 1c51d27e..16b73ffd 100644
--- a/web/templates/header.html
+++ b/web/templates/header.html
@@ -5,6 +5,7 @@
   <link rel="icon" href="/images/favicon.ico" type="image/x-icon">
   <title>Vesta - <?="$TAB"?> </title>
   <link rel="stylesheet" href="/css/styles.min.css">
+  <link rel="stylesheet" href="/css/custom.css">
 
   <link type="text/css" href="/css/jquery-custom-dialogs.css" rel="stylesheet" />
   <script type="text/javascript" src="/js/jquery-1.7.2.min.js"></script>
diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html
index 6f7fd9dc..6683ff19 100644
--- a/web/templates/user/list_cron.html
+++ b/web/templates/user/list_cron.html
@@ -1,6 +1,10 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <a href="/add/cron/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Cron Job'))?>"></a>
+        <ul class="context-menu sort-order" style="display:none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-name"><span class="name"><?=__('Command')?></span><span class="up">&nbsp;</span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -26,7 +30,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td class="step-right">
                 <form action="/bulk/cron/" method="post" id="objects">
@@ -59,7 +63,7 @@
 
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?
         foreach ($data as $key => $value) {
           ++$i;
@@ -75,7 +79,7 @@
       ?>
 
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE['cron-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="cron-<?=sha1($key)?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="job[]" value="<?php echo $key ?>">
@@ -117,6 +121,9 @@
             <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -140,7 +147,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
@@ -151,6 +158,7 @@
       <div class="l-separator"></div>
       <div class="l-center">
         <div class="l-unit">
+          <table class='data'></table>
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html
index 7f900213..fe642916 100644
--- a/web/templates/user/list_db.html
+++ b/web/templates/user/list_db.html
@@ -1,11 +1,17 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <a href="/add/db/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Database'))?>"></a>
-
+        <ul class="context-menu sort-order" style="display:none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-name"><span class="name"><?=__('Database')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-disk" sort_as_int="1"><span class="name"><?=__('Disk')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-user"><span class="name"><?=__('User')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-server"><span class="name"><?=__('Host')?></span><span class="up">&nbsp;</span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-           <?
+            <?
               $mysql = 0;
               $pgsql = 0;
 
@@ -18,24 +24,23 @@
 
                   $db_admin_link = "http://".$http_host."/phpmyadmin/";
                   if (!empty($_SESSION['DB_PMA_URL']))
-                    $db_admin_link = $_SESSION['DB_PMA_URL'];
+                    $db_myadmin_link = $_SESSION['DB_PMA_URL'];
                 }
                 if ($data[$key]['TYPE'] == 'pgsql'){
                   $pgsql = 1;
                   $db_admin_link = "http://".$http_host."/phppgadmin/";
                   if (!empty($_SESSION['DB_PGA_URL']))
-                    $db_admin_link = $_SESSION['DB_PGA_URL'];
+                    $db_pgadmin_link = $_SESSION['DB_PGA_URL'];
                 }
               }
               if($mysql){
-                echo '<td class="step-right"><a class="vst" href="'.$db_admin_link.'" target="_blank">phpMyAdmin</td>';
+                echo '<td class="step-right"><a class="vst" href="'.$db_myadmin_link.'" target="_blank">phpMyAdmin</td>';
               }
               if($pgsql){
-                echo '<td class="step-right"><a class="vst" href="'.$db_admin_link.'" target="_blank">phpPgAdmin</td>';
+                echo '<td class="step-right"><a class="vst" href="'.$db_pgadmin_link.'" target="_blank">phpPgAdmin</td>';
               }
-
             ?>
-              <td class="l-sort-toolbar__search-box">
+              <td class="l-sort-toolbar__search-box step-left">
                 <form action="/search/" method="get">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
                   <input type="text" name="q" class="search-input" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" />
@@ -47,7 +52,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td>
                 <form action="/bulk/db/" method="post" id="objects">
@@ -79,7 +84,7 @@
 
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?
         list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
         foreach ($data as $key => $value) {
@@ -103,7 +108,7 @@
       ?>
 
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE['db-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="db-<?=sha1($key)?>"" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>" sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="database[]" value="<?php echo $key ?>">
@@ -113,11 +118,10 @@
           <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
             <div class="actions-panel clearfix">
               <div class="actions-panel__col actions-panel__edit"><a href="/edit/db/?database=<?=$key?>"><?=__('edit')?> <i></i></a></div>
-              <div class="actions-panel__col actions-panel__db"><a href="<?=$db_admin_link?>" target="_blank"><?=__('%s',$db_admin)?> <i></i></a></div>
               <div class="actions-panel__col actions-panel__suspend">
                 <a id="<?=$spnd_action ?>_link_<?=$i?>" class="data-controls do_<?=$spnd_action?>">
                   <?=__($spnd_action)?> <i class="do_<?=$spnd_action?>"></i>
-                  <input type="hidden" name="<?=$spnd_action?>_url" value="/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" />
+                  <input type="hidden" name="<?=$spnd_action?>_url" value="/<?=$spnd_action?>/db/?database=<?=$key?>&token=<?=$_SESSION['token']?>" />
                   <div id="<?=$spnd_action?>_dialog_<?=$i?>" class="confirmation-text-suspention hidden" title="<?=__('Confirmation')?>">
                     <p class="confirmation"><?=__($spnd_confirmation,$key)?></p>
                   </div>
@@ -132,8 +136,6 @@
                   </div>
                 </a>
               </div>
-
-
             </div>
             <!-- /.actiona-panel -->
           </div>
@@ -145,7 +147,10 @@
           <div class="l-unit__date">
             <?=translate_date($data[$key]['DATE'])?>
           </div>
-          <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="l-unit__suspended""><?=__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -172,15 +177,15 @@
                 </td>
                 <td>
                   <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('User')?>:</div>
+                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('User')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
-                      <b><?=__($data[$key]['DBUSER'])?></b>
+                      <b><?=$data[$key]['DBUSER']?></b>
                     </div>
                   </div>
                 </td>
                 <td>
                     <div class="l-unit__stat-cols clearfix last">
-                      <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Host')?>:</div>
+                      <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Host')?>:</div>
                       <div class="l-unit__stat-col l-unit__stat-col--right">
                         <b><?=$data[$key]['HOST']?></b>
                       </div>
@@ -191,7 +196,7 @@
                 <td></td>
                 <td>
                     <div class="l-unit__stat-cols clearfix">
-                      <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Charset')?>:</div>
+                      <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Charset')?>:</div>
                       <div class="l-unit__stat-col l-unit__stat-col--right">
                         <b><?=$data[$key]['CHARSET']?></b>
                       </div>
@@ -199,7 +204,7 @@
                 </td>
                 <td>
                   <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Type')?>:</div>
+                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Type')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
                       <b><?=$data[$key]['TYPE']?></b>
                     </div>
@@ -213,7 +218,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!-- div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
@@ -223,7 +228,8 @@
     <div id="vstobjects">
       <div class="l-separator"></div>
       <div class="l-center">
-        <div class="l-unit">
+        <div class="l-unit-ft">
+          <table class='data'></table>
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html
index 57394412..089a4b1f 100644
--- a/web/templates/user/list_dns.html
+++ b/web/templates/user/list_dns.html
@@ -1,6 +1,14 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <a href="/add/dns/" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Domain'))?>" class="l-sort__create-btn"></a>
+        <a href="/add/dns/" title="<?=str_replace(' ', '&nbsp;', __('Add DNS Domain'))?>" class="l-sort__create-btn"></a>
+        <ul class="context-menu sort-order" style="display:none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-expire" sort_as_int="1"><span class="name"><?=__('Expire')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-ip"><span class="name"><?=__('IP Address')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-records"><span class="name"><?=__('Records')?></span><span class="up">&nbsp;</span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -16,7 +24,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td>
                 <form action="/bulk/dns/" method="post">
@@ -46,7 +54,7 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?
         foreach ($data as $key => $value) {
           ++$i;
@@ -61,7 +69,7 @@
           }
       ?>
 
-      <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended';?>">
+      <div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_COOKIE['dns-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="dns-<?=sha1($key)?>" sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$key]['RECORDS']?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
@@ -103,6 +111,9 @@
             <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -143,7 +154,7 @@
               <tr>
                 <td>
                   <div class="l-unit__stat-cols clearfix last">
-                    <div class="l-unit__stat-col l-unit__stat-col--left compact"><?=__('Expire')?>:</div>
+                    <div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Expire')?>:</div>
                     <div class="l-unit__stat-col l-unit__stat-col--right">
                       <b><?=translate_date($data[$key]['EXP'])?></b>
                     </div>
@@ -158,7 +169,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <? } ?>
 
@@ -170,6 +181,7 @@
       <div class="l-separator"></div>
       <div class="l-center">
         <div class="l-unit">
+          <table class='data'></table>
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/user/list_dns_rec.html b/web/templates/user/list_dns_rec.html
index af0b3181..03350d7e 100644
--- a/web/templates/user/list_dns_rec.html
+++ b/web/templates/user/list_dns_rec.html
@@ -46,15 +46,12 @@
 
 
 
-    <div class="l-center">
+    <div class="l-center units">
 
     <div class="l-unit">
       <div class="subtitle"><?=__('Listing')?>  <?=htmlentities($_GET['domain'])?></div>
     </div>
 
-    <div class="l-separator"></div>
-    <!-- /.l-separator -->
-
       <?php
         foreach ($data as $key => $value) {
           ++$i;
@@ -113,7 +110,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
@@ -124,7 +121,6 @@
     <div class="l-center">
         <div class="l-unit">
           <table class='data'></table>
-          <!-- /form -->
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html
index fc5b037b..561d6dab 100644
--- a/web/templates/user/list_mail.html
+++ b/web/templates/user/list_mail.html
@@ -1,7 +1,12 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <a href="/add/mail/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Domain'))?>"></a>
-
+        <ul class="context-menu sort-order" style="display:none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-accounts" sort_as_int="1"><span class="name"><?=__('Accounts')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-disk" sort_as_int="1"><span class="name"><?=__('Disk')?></span><span class="up">&nbsp;</span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -25,7 +30,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td>
                 <form action="/bulk/mail/" method="post" id="objects">
@@ -57,7 +62,7 @@
 
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?
         list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
         $webmail = "http://".$http_host."/webmail/";
@@ -80,7 +85,7 @@
       ?>
 
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE['mail-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="mail-<?=sha1($key)?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>" sort-accounts="<?=$data[$key]['ACCOUNTS']?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?php echo $key ?>">
@@ -124,6 +129,9 @@
             <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -203,7 +211,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
@@ -214,6 +222,7 @@
       <div class="l-separator"></div>
       <div class="l-center">
         <div class="l-unit">
+          <table class='data'></table>
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html
index cf1b23c5..d7fea7f6 100644
--- a/web/templates/user/list_mail_acc.html
+++ b/web/templates/user/list_mail_acc.html
@@ -1,6 +1,11 @@
     <div class="l-center">
       <div class="l-sort clearfix noselect">
         <a href="/add/mail/?domain=<?=$_GET['domain']?>" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Mail Account'))?>"></a>
+        <ul class="context-menu sort-order" style="display:none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-name"><span class="name"><?=__('Account')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-disk" sort_as_int="1"><span class="name"><?=__('Disk')?></span><span class="up">&nbsp;</span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -24,7 +29,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td>
                 <form action="/bulk/mail/" method="post" id="objects">
@@ -56,14 +61,11 @@
 
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <div class="l-unit">
         <div class="subtitle"><?=__('Listing')?>  <?=htmlentities($_GET['domain'])?></div>
       </div>
 
-      <div class="l-separator"></div>
-      <!-- /.l-separator -->
-
 
       <?
         foreach ($data as $key => $value) {
@@ -80,7 +82,7 @@
       ?>
 
 
-      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
+      <div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE['mail-acc-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="mail-acc-<?=sha1($key)?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?$data[$key]['U_DISK']?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="check" value="check<?php echo $i ?>">
@@ -120,6 +122,9 @@
             <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -183,7 +188,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
@@ -194,6 +199,7 @@
       <div class="l-separator"></div>
       <div class="l-center">
         <div class="l-unit">
+          <table class='data'></table>
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/user/list_search.html b/web/templates/user/list_search.html
index 59495fd8..83e7d487 100644
--- a/web/templates/user/list_search.html
+++ b/web/templates/user/list_search.html
@@ -16,9 +16,9 @@
                   <input type="submit" value="" class="l-sort-toolbar__search" onClick="return doSearch('/search/')" />
                 </form>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
+              <!-- td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td -->
             </tr>
           </table>
         </div>
@@ -235,7 +235,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
@@ -246,6 +246,7 @@
       <div class="l-separator"></div>
       <div class="l-center">
         <div class="l-unit">
+          <table class='data'></table>
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/user/list_stats.html b/web/templates/user/list_stats.html
index fe5b92a2..dc9419b4 100644
--- a/web/templates/user/list_stats.html
+++ b/web/templates/user/list_stats.html
@@ -49,14 +49,14 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?php
         foreach ($data as $key => $value) {
            ++$i;
       ?>
 
 
-      <div class="l-unit">
+      <div class="l-unit <?if($_COOKIE['stats-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="stats-<?=sha1($key)?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
           </div>
@@ -74,6 +74,9 @@
           <div class="l-unit__date">
             <?=translate_date($key)?>
           </div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -242,7 +245,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
@@ -253,7 +256,6 @@
     <div class="l-center">
         <div class="l-unit">
           <table class='data'></table>
-          <!-- /form -->
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html
index 5dd9887f..198c6a44 100644
--- a/web/templates/user/list_user.html
+++ b/web/templates/user/list_user.html
@@ -7,6 +7,12 @@
             echo '<a class="l-sort__create-btn" href="/add/web/" title="'.str_replace(' ', '&nbsp;', __('Add Web Domain')).'"></a>';
           }
         ?>
+        <ul class="context-menu sort-order" style="display:none;">
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-name"><span class="name"><?=__('Username')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-disk" sort_as_int="1"><span class="name"><?=__('Disk')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=__('Bandwidth')?></span><span class="up">&nbsp;</span></li>
+        </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
@@ -22,7 +28,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td>
                 <form action="/bulk/user/" method="post" id="objects">
@@ -59,7 +65,7 @@
     <!-- /.l-separator -->
 
 
-    <div class="l-center">
+    <div class="l-center units">
       <?php
         foreach ($data as $key => $value) {
           ++$i;
@@ -74,7 +80,7 @@
           }
       ?>
 
-      <div class="l-unit  <? if($status == 'suspended') echo 'l-unit--suspended'; ?>">
+      <div class="l-unit  <? if($status == 'suspended') echo 'l-unit--suspended';  if($_COOKIE['user-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="user-<?=sha1($key)?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DISK']?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="user[]" value="<?=$key?>">
@@ -143,6 +149,9 @@
             <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -328,7 +337,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html
index 5501a742..791389e6 100644
--- a/web/templates/user/list_web.html
+++ b/web/templates/user/list_web.html
@@ -2,9 +2,11 @@
       <div class="l-sort clearfix noselect">
         <a href="/add/web/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Web Domain'))?>"></a>
         <ul class="context-menu sort-order" style="display:none;">
-          <li entity="date"><span class="name active">date</span><span class="up">&nbsp;</span></li>
-          <li entity="name"><span class="name">name</span><span class="up">&nbsp;</span></li>
-          <li entity="ip"><span class="name">ip</span><span class="up">&nbsp;</span></li>
+          <li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-name"><span class="name"><?=__('Domain')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-ip" sort_as_int="1"><span class="name"><?=__('IP Address')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-disk" sort_as_int="1"><span class="name"><?=__('Disk')?></span><span class="up">&nbsp;</span></li>
+          <li entity="sort-bandwidth" sort_as_int="1"><span class="name"><?=__('Bandwidth')?></span><span class="up">&nbsp;</span></li>
         </ul>
         <div class="l-sort-toolbar clearfix">
           <table>
@@ -21,7 +23,7 @@
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
               <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td>
                 <form action="/bulk/web/" method="post" id="objects">
@@ -116,7 +118,7 @@
 
 
 
-      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended';?>" id="web-unit-<?=$i?>">
+      <div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_COOKIE['web-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="web-<?=sha1($key)?>" id="web-unit-<?=$i?>" sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-date="<?=strtotime($data[$key]['DATE'])?>" sort-name="<?=$key?>"  sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DISK']?>">
         <div class="l-unit-toolbar clearfix">
           <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
             <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="domain[]" value="<?=$key?>">
@@ -162,6 +164,9 @@
             <?=translate_date($data[$key]['DATE'])?>
           </div>
           <div class="l-unit__suspended""><?__('suspended')?></div>
+          <div class="text-center">
+            <i class="l-icon-star"></i>
+          </div>
         </div>
         <!-- /.l-unit__col -->
         <div class="l-unit__col l-unit__col--right">
@@ -279,7 +284,7 @@
         <!-- /.l-unit__col -->
       </div>
       <!-- /.l-unit -->
-      <div class="l-separator"></div>
+      <!--div class="l-separator"></div-->
       <!-- /.l-separator -->
       <?}?>
 
@@ -290,6 +295,7 @@
       <div class="l-separator"></div>
       <div class="l-center">
         <div class="l-unit">
+          <table class='data'></table>
           <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php