diff --git a/web/add/cron/index.php b/web/add/cron/index.php
index 7384a914..d0a1a1e3 100644
--- a/web/add/cron/index.php
+++ b/web/add/cron/index.php
@@ -68,7 +68,6 @@ top_panel($user,$TAB);
     $db_types = json_decode(implode('', $output), true);
     unset($output);
 
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_add_cron.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_cron.html');
     unset($_SESSION['error_msg']);
     unset($_SESSION['ok_msg']);
diff --git a/web/list/cron/index.php b/web/list/cron/index.php
index 7f826a33..6d8a32ae 100644
--- a/web/list/cron/index.php
+++ b/web/list/cron/index.php
@@ -13,26 +13,18 @@ top_panel($user,$TAB);
 
 // Data
 if ($_SESSION['user'] == 'admin') {
-
     exec (VESTA_CMD."v_list_cron_jobs $user json", $output, $return_var);
-    check_error($return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data);
     unset($output);
-
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/menu_cron.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/list_cron.html');
 } else {
 
     exec (VESTA_CMD."v_list_cron_jobs $user json", $output, $return_var);
-    check_error($return_var);
     $data = json_decode(implode('', $output), true);
     $data = array_reverse($data);
     unset($output);
-
-    include($_SERVER['DOCUMENT_ROOT'].'/templates/user/menu_cron.html');
     include($_SERVER['DOCUMENT_ROOT'].'/templates/user/list_cron.html');
-
 }
 
 // Footer
diff --git a/web/templates/admin/add_cron.html b/web/templates/admin/add_cron.html
index ca1c760a..4d1ea2da 100644
--- a/web/templates/admin/add_cron.html
+++ b/web/templates/admin/add_cron.html
@@ -1,57 +1,106 @@
-<script type="text/javascript">
-  function elementHideShow(elementToHideOrShow) {
-      var el = document.getElementById(elementToHideOrShow);
-      if (el.style.display == "block") {
-        el.style.display = "none";
-      } else {
-        el.style.display = "block";
-      }
-    }
 
-    function randomString() {
-      var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-      var string_length = 10;
-      var randomstring = '';
-      for (var i=0; i<string_length; i++) {
-        var rnum = Math.floor(Math.random() * chars.length);
-        randomstring += chars.substring(rnum,rnum+1);
-      }
-      document.v_add_user.v_password.value = randomstring;
-    }
-</script>
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Adding Cron Job</b></a>
+                                            <?php
+                                                if (!empty($_SESSION['error_msg'])) {
+                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                    }
+                                                }
+                                            ?>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
 
-
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-        <table class="data-col2" width="600px">
-            <form method="post" name="v_add_user">
-            <tr><td class="add-text" style="padding: 10 0 0 2px;">Minute</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_min" <?php if (!empty($v_min)) echo "value=".$v_min; ?>></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Hour</td></tr>
-            <tr><td></span><input type="text" size="20" class="add-input" name="v_hour" <?php if (!empty($v_hour)) echo "value=".$v_hour; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Day</td></tr>
-            <tr><td></span><input type="text" size="20" class="add-input" name="v_day" <?php if (!empty($v_day)) echo "value=".$v_day; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Month</td></tr>
-            <tr><td></span><input type="text" size="20" class="add-input" name="v_month" <?php if (!empty($v_month)) echo "value=".$v_month; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Day of Week</td></tr>
-            <tr><td></span><input type="text" size="20" class="add-input" name="v_wday" <?php if (!empty($v_wday)) echo "value=".$v_wday; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Command</td></tr>
-            <tr><td></span><input type="text" size="20" class="add-input" name="v_cmd" <?php if (!empty($v_cmd)) echo "value='".$v_cmd."'"; ?>></tr>
-
-            <tr><td style="padding: 24px 0 0 0;">
-                <input type="submit" name="ok" value="OK" class="add-button"></form>
-                <input type="button" class="add-button" value="Cancel" onClick="location.href='/list/cron/'">
-            </td></tr>
-        </table>
-    </td>
-</tr>
-</table>
+                    <form id="vstobjects" name="v_add_cron" method="post">
+                        <table class='data'>
+                            <tr class="data-add">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 18 0 4 18;"></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                        </tr>
+                                    </table>
+                                    <table class="data-col2" width="600px">
+                                        <tr>
+                                            <td class="add-text" style="padding: 10 0 0 2px;">
+                                                Minute
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_min" <?php if (!empty($v_min)) echo "value=".$v_min; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Hour
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_hour" <?php if (!empty($v_hour)) echo "value=".$v_hour; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Day
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_day" <?php if (!empty($v_day)) echo "value=".$v_day; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Month
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_month" <?php if (!empty($v_month)) echo "value=".$v_month; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Day of Week
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_wday" <?php if (!empty($v_wday)) echo "value=".$v_wday; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Command
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_cmd" <?php if (!empty($v_cmd)) echo "value='".$v_cmd."'"; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="padding: 24px 0 0 0;">
+                                                <input type="submit" name="ok" value="OK" class="button">
+                                                <input type="button" class="button" value="Cancel" onclick="location.href='/list/cron/'">
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </form>
diff --git a/web/templates/admin/edit_cron.html b/web/templates/admin/edit_cron.html
index 85b629b2..320cd4b1 100644
--- a/web/templates/admin/edit_cron.html
+++ b/web/templates/admin/edit_cron.html
@@ -1,59 +1,109 @@
-<script type="text/javascript">
-  function elementHideShow(elementToHideOrShow) {
-      var el = document.getElementById(elementToHideOrShow);
-      if (el.style.display == "block") {
-        el.style.display = "none";
-      } else {
-        el.style.display = "block";
-      }
-    }
 
-    function randomString() {
-      var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
-      var string_length = 10;
-      var randomstring = '';
-      for (var i=0; i<string_length; i++) {
-        var rnum = Math.floor(Math.random() * chars.length);
-        randomstring += chars.substring(rnum,rnum+1);
-      }
-      document.v_add_user.v_password.value = randomstring;
-    }
-</script>
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 2px 16px 0;" ><a class="add-name"><b>Editing Cron Job</b></a>
+                                            <?php
+                                                if (!empty($_SESSION['error_msg'])) {
+                                                    echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
+                                                } else {
+                                                    if (!empty($_SESSION['ok_msg'])) {
+                                                        echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
+                                                    }
+                                                }
+                                            ?>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
 
+                    <form id="vstobjects" name="v_edit_cron" method="post">
+                        <table class='data'>
+                            <tr class="data-add">
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
+                                        <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
+                                        <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                        </tr>
+                                    </table>
 
-<table class='data'>
-<tr class="data-add">
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 24px 0 2px 4px;"><a class="data-date" ?><?php echo date("d M Y", strtotime($v_date))?></a></td></tr>
-            <tr><td style="padding: 0 0 6px 4px;"><a class="data-date" ?><?php echo $v_time?></a></td></tr>
-            <tr><td style="padding: 0 0 0 21px;" class="data-<?php echo $v_status ?>"><b><?php echo $v_status ?></b></td></tr>
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-        <table width="830px"><tr>
-            <td></td>
-        </tr></table>
-        <table class="data-col2" width="600px">
-            <form method="post" name="v_add_user">
-            <tr><td class="add-text" style="padding: 10 0 0 2px;">Minute</td></tr>
-            <tr><td><input type="text" size="20" class="add-input" name="v_min" <?php if (!empty($v_min)) echo "value=".$v_min; ?>></td></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Hour</td></tr>
-            <tr><td></span><input type="text" size="20" class="add-input" name="v_hour" <?php if (!empty($v_hour)) echo "value=".$v_hour; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Day</td></tr>
-            <tr><td></span><input type="text" size="20" class="add-input" name="v_day" <?php if (!empty($v_day)) echo "value=".$v_day; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Month</td></tr>
-            <tr><td></span><input type="text" size="20" class="add-input" name="v_month" <?php if (!empty($v_month)) echo "value=".$v_month; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Day of Week</td></tr>
-            <tr><td></span><input type="text" size="20" class="add-input" name="v_wday" <?php if (!empty($v_wday)) echo "value=".$v_wday; ?>></tr>
-            <tr><td class="add-text" style="padding: 10px 0 0 2px;">Command</td></tr>
-            <tr><td></span><input type="text" size="20" class="add-input" name="v_cmd" <?php if (!empty($v_cmd)) echo "value='".$v_cmd."'"; ?>></tr>
-
-            <tr><td style="padding: 24px 0 0 0;">
-                <input type="submit" name="save" value="Save" class="add-button"></form>
-                <input type="button" class="add-button" value="Cancel" onClick="location.href='/list/cron/'">
-            </td></tr>
-        </table>
-    </td>
-</tr>
-</table>
+                                    <table class="data-col2" width="600px">
+                                        <tr>
+                                            <td class="add-text" style="padding: 10 0 0 2px;">
+                                                Minute
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_min" <?php if (!empty($v_min)) echo "value=".$v_min; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Hour
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_hour" <?php if (!empty($v_hour)) echo "value=".$v_hour; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Day
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_day" <?php if (!empty($v_day)) echo "value=".$v_day; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Month
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_month" <?php if (!empty($v_month)) echo "value=".$v_month; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Day of Week
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_wday" <?php if (!empty($v_wday)) echo "value=".$v_wday; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="add-text" style="padding: 10px 0 0 2px;">
+                                                Command
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <input type="text" size="20" class="add-input" name="v_cmd" <?php if (!empty($v_cmd)) echo "value='".$v_cmd."'"; ?>>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="padding: 24px 0 0 0;">
+                                                <input type="submit" name="save" value="Save" class="button">
+                                                <input type="button" class="button" value="Cancel" onclick="location.href='/list/cron/'">
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                    </form>
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html
index b83f1422..a0c60161 100644
--- a/web/templates/admin/list_cron.html
+++ b/web/templates/admin/list_cron.html
@@ -1,151 +1,220 @@
-<table class='data'>
-
-<?php
-foreach ($data as $key => $value) {
-    ++$i;
-    if ($data[$key]['SUSPENDED'] == 'yes') {
-        $status = 'suspended';
-        $spnd_action = 'unsuspend' ;
-    } else {
-        $status = 'active';
-        $spnd_action = 'suspend';
-    }
-
-    if (empty($data[$key]['CATCHALL'])) {
-        $data[$key]['CATCHALL'] = 'null';
-    }
-    ?>
-
-<tr class="data-row">
-    <script type="text/javascript">
-    $(function(){
-        $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog({
-            modal: true,
-            autoOpen: false,
-            width: 360,
-            buttons: {
-                "Ok": function(event, ui) {
-                     location.href = '/<?php echo $spnd_action ?>/cron/?job=<?php echo $data[$key]['JOB']; ?>';
-                },
-                "Cancel": function() {
-                    $(this).dialog("close");
-                }
-            }
-        });
-        $('#<?php echo $spnd_action ?>_link_<?php echo "$i" ?>').click(function(){
-            $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog('open');
-            return false;
-        });
-
-        $('#delete_dialog_<?php echo "$i" ?>').dialog({
-            modal: true,
-            autoOpen: false,
-            width: 360,
-            buttons: {
-                "Ok": function(event, ui) {
-                     location.href = '/delete/cron/?job=<?php echo $data[$key]['JOB']; ?>';
-                },
-                "Cancel": function() {
-                    $(this).dialog("close");
-                }
-            }
-        });
-        $('#delete_link_<?php echo "$i" ?>').click(function(){
-            $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
-            return false;
-        });
-    });
-    </script>
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object" ></td></tr>
-            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-            <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
-
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-
-        <table width="830px"><tr>
-            <td></td>
-            <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/cron/?job=<?php echo $data[$key]['JOB'] ?>"> edit</a></td>
-            <td class="data-controls" width="80px">
-                <img src="/images/suspend.png" width="7px" height="8px">
-                <a href="#" id="<?php echo $spnd_action ?>_link_<?php echo "$i" ?>"> <?php echo $spnd_action ?></a>
-                <div id="<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to <?php echo $spnd_action ?> cron job?</p>
-                </div>
-            </td>
-            <td class="data-controls" width="70px">
-                <img src="/images/delete.png" width="7px" height="7px">
-                <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
-                <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to delete cron job?</p>
-                </div>
-            </td>
-        </tr></table>
-
-        <table class="data-col2" width="800px">
-            <tr><td colspan=5 class="cron" style="padding: 0 0 0 4px;"><b><?php echo $data[$key]['CMD'] ?></b></td></tr>
-            <tr>
-                <td style="vertical-align:top;"  width="80px">
-                    <table>
-                        <tr><td class="cron-counter-name">Min</td></tr>
-                        <tr><td class="cron-counter-value"><?php echo $data[$key]['MIN'] ?></tr>
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 0 8px 6px">
+                                            <div style="float:left">
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/cron/'"> Add Cron Job </button>
+                                            </div>
+                                            <div style="text-align: right; float: right;">
+                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;">
+                                                <button> Search </button>
+                                            </div>
+                                            <div style="float:left; padding-left: 26px;">
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+                                                <select style="margin:0 2px 0 0px;" >
+                                                    <option>apply to selected</option>
+                                                    <option>rebuild</option>
+                                                    <option>update counters</option>
+                                                    <option>suspend</option>
+                                                    <option>unsuspend</option>
+                                                    <option>delete</option>
+                                                </select>
+                                                <button style="width:27px;"> › </button>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
                     </table>
-                </td>
-                <td style="vertical-align:top;"  width="80px">
-                    <table>
-                        <tr><td class="cron-counter-name">Hour</td></tr>
-                        <tr><td class="cron-counter-value"><?php echo $data[$key]['HOUR'] ?></tr>
-                    </table>
-                </td>
 
-                <td style="vertical-align:top;"  width="80px">
-                    <table>
-                        <tr><td class="cron-counter-name">Day</td></tr>
-                        <tr><td class="cron-counter-value"><?php echo $data[$key]['DAY'] ?></tr>
-                    </table>
-                </td>
+                    <form id="vstobjects">
+                        <table class='data'>
 
-                <td style="vertical-align:top;"  width="80px">
-                    <table>
-                        <tr><td class="cron-counter-name">Month</td></tr>
-                        <tr><td class="cron-counter-value"><?php echo $data[$key]['MONTH'] ?></tr>
-                    </table>
-                </td>
+                            <?php
+                                foreach ($data as $key => $value) {
+                                    ++$i;
+                                    if ($data[$key]['SUSPENDED'] == 'yes') {
+                                        $status = 'suspended';
+                                        $spnd_action = 'unsuspend' ;
+                                    } else {
+                                        $status = 'active';
+                                        $spnd_action = 'suspend';
+                                    }
+                            ?>
 
-                <td style="vertical-align:top;">
-                    <table>
-                        <tr><td class="cron-counter-name">Day of Week</td></tr>
-                        <tr><td class="cron-counter-value"><?php echo $data[$key]['WDAY'] ?></tr>
-                    </table>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
+                            <tr class="data-row">
+                                <script type="text/javascript">
+                                    $(function(){
+                                        $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog({
+                                            modal: true,
+                                            autoOpen: false,
+                                            width: 360,
+                                            buttons: {
+                                                "Ok": function(event, ui) {
+                                                     location.href = '/<?php echo $spnd_action ?>/cron/?job=<?php echo $data[$key]['JOB']; ?>';
+                                                },
+                                                "Cancel": function() {
+                                                    $(this).dialog("close");
+                                                }
+                                            }
+                                        });
+                                        $('#<?php echo $spnd_action ?>_link_<?php echo "$i" ?>').click(function(){
+                                            $('#<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>').dialog('open');
+                                            return false;
+                                        });
+                                        $('#delete_dialog_<?php echo "$i" ?>').dialog({
+                                            modal: true,
+                                            autoOpen: false,
+                                            width: 360,
+                                            buttons: {
+                                                "Ok": function(event, ui) {
+                                                     location.href = '/delete/cron/?job=<?php echo $data[$key]['JOB']; ?>';
+                                                },
+                                                "Cancel": function() {
+                                                    $(this).dialog("close");
+                                                }
+                                            }
+                                        });
+                                        $('#delete_link_<?php echo "$i" ?>').click(function(){
+                                            $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
+                                            return false;
+                                        });
+                                    });
+                                </script>
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object" ></td></tr>
+                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                            <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/cron/?job=<?php echo $data[$key]['JOB'] ?>"> edit</a></td>
+                                            <td class="data-controls" width="80px">
+                                                <img src="/images/suspend.png" width="7px" height="8px">
+                                                <a href="#" id="<?php echo $spnd_action ?>_link_<?php echo "$i" ?>"> <?php echo $spnd_action ?></a>
+                                                <div id="<?php echo $spnd_action ?>_dialog_<?php echo "$i" ?>" title="Confirmation">
+                                                    <p class="counter-value">Are you sure you want to <?php echo $spnd_action ?> cron job?</p>
+                                                </div>
+                                            </td>
+                                            <td class="data-controls" width="70px">
+                                                <img src="/images/delete.png" width="7px" height="7px">
+                                                <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
+                                                <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
+                                                    <p class="counter-value">Are you sure you want to delete cron job?</p>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
 
+                                    <table class="data-col2" width="800px">
+                                        <tr>
+                                            <td colspan=5 class="cron" style="padding: 0 0 0 4px;">
+                                                <b><?php echo $data[$key]['CMD'] ?></b>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="vertical-align:top;"  width="80px">
+                                                <table>
+                                                    <tr>
+                                                        <td class="cron-counter-name">
+                                                            Min
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="cron-counter-value">
+                                                            <?php echo $data[$key]['MIN'] ?> 
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;"  width="80px">
+                                                <table>
+                                                    <tr>
+                                                        <td class="cron-counter-name">
+                                                            Hour
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="cron-counter-value">
+                                                            <?php echo $data[$key]['HOUR'] ?> 
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;"  width="80px">
+                                                <table>
+                                                    <tr>
+                                                        <td class="cron-counter-name">
+                                                            Day
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="cron-counter-value">
+                                                            <?php echo $data[$key]['DAY'] ?> 
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;"  width="80px">
+                                                <table>
+                                                    <tr>
+                                                        <td class="cron-counter-name">
+                                                            Month
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="cron-counter-value">
+                                                            <?php echo $data[$key]['MONTH'] ?>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;">
+                                                <table>
+                                                    <tr>
+                                                        <td class="cron-counter-name">
+                                                            Day of Week
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="cron-counter-value">
+                                                            <?php echo $data[$key]['WDAY'] ?>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
 
-    <?php
-}
-?>
-</table>
-<?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-<table class="data-count">
-<tr>
-    <td>→ 
-    <?php
-        if ( $i == 1) {
-            echo "1 cron job ";
-        } else {
-            echo "$i cron jobs ";
-        }
-    ?>
-    </td>
-</tr>
-</table>
-</form>
-<?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?>
-<?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:172px\"><tr><td></td></tr></table>"; ?>
-<?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:55px\"><tr><td></td></tr></table>"; ?>
+                            <?php
+                                }
+                            ?>
+                        </table>
+
+                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?> 
+
+                        <table class="data-count">
+                            <tr>
+                                <td width="160px"></td>
+                                <td>
+                                    <?php
+                                        if ( $i == 1) {
+                                            echo "1 cron job ";
+                                        } else {
+                                            echo "$i cron jobs ";
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
+                        </table>
+                    </form>
+
+                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?> 
+                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:172px\"><tr><td></td></tr></table>"; ?> 
+                    <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:55px\"><tr><td></td></tr></table>"; ?> 
diff --git a/web/templates/admin/menu_add_cron.html b/web/templates/admin/menu_add_cron.html
deleted file mode 100644
index e332401a..00000000
--- a/web/templates/admin/menu_add_cron.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 14px 0 24px 0;" ><a class="add-name"><b>Adding Cron Job</b></a>
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/admin/menu_cron.html b/web/templates/admin/menu_cron.html
deleted file mode 100644
index bc359fa5..00000000
--- a/web/templates/admin/menu_cron.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-    if (!empty($_SESSION['error_msg'])) {
-?>
-        <script type="text/javascript">
-            $(function() {
-                $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                $( "#dialog-message" ).dialog({
-                    modal: true,
-                    buttons: {
-                        Ok: function() {
-                            $( this ).dialog( "close" );
-                        }
-                    }
-                });
-            });
-        </script>
-        <div id="dialog-message" title="Error">
-        <p><?php echo $_SESSION['error_msg'] ?>.</p>
-        </div>
-<?php
-        unset($_SESSION['error_msg']);
-    }
-?>
-<table class="sub-menu">
-<tr>
-    <td width="142px" style="padding: 16px 0 16px 6px">
-    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/cron/'">Add Job</button>
-    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 0px">
-        <option>apply to selected</option>
-        <option>rebuild</option>
-        <option>suspend</option>
-        <option>unsuspend</option>
-        <option>delete</option>
-    </select> <button> > </button></td>
-</td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-</tr>
-</table>
-<form id="vstobjects">
diff --git a/web/templates/admin/menu_edit_cron.html b/web/templates/admin/menu_edit_cron.html
deleted file mode 100644
index 78e1ad2a..00000000
--- a/web/templates/admin/menu_edit_cron.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td style="padding: 14px 0 24px 0;" ><a class="add-name"><b>Editing Cron Job</b></a>
-    <?php 
-        if (!empty($_SESSION['error_msg'])) {
-            echo "<a class=\"add-error\"> → ".$_SESSION['error_msg']."</a>";
-        } else {
-            if (!empty($_SESSION['ok_msg'])) {
-                echo "<a class=\"add-ok\"> → ".$_SESSION['ok_msg']."</a>";
-            }
-        }
-    ?>
-    </td>
-</tr>
-</table>
diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html
index 515d357b..11ded7a3 100644
--- a/web/templates/user/list_cron.html
+++ b/web/templates/user/list_cron.html
@@ -1,126 +1,196 @@
-<table class='data'>
-
-<?php
-foreach ($data as $key => $value) {
-    ++$i;
-    if ($data[$key]['SUSPENDED'] == 'yes') {
-        $status = 'suspended';
-        $spnd_action = 'unsuspend' ;
-    } else {
-        $status = 'active';
-        $spnd_action = 'suspend';
-    }
-
-    if (empty($data[$key]['CATCHALL'])) {
-        $data[$key]['CATCHALL'] = 'null';
-    }
-    ?>
-
-<tr class="data-row">
-    <script type="text/javascript">
-    $(function(){
-        $('#delete_dialog_<?php echo "$i" ?>').dialog({
-            modal: true,
-            autoOpen: false,
-            width: 360,
-            buttons: {
-                "Ok": function(event, ui) {
-                     location.href = '/delete/cron/?job=<?php echo $data[$key]['JOB']; ?>';
-                },
-                "Cancel": function() {
-                    $(this).dialog("close");
-                }
-            }
-        });
-        $('#delete_link_<?php echo "$i" ?>').click(function(){
-            $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
-            return false;
-        });
-    });
-    </script>
-    <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
-        <table class="data-col1">
-            <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object" ></td></tr>
-            <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
-            <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
-
-        </table>
-    </td>
-    <td class="data-dotted" width="830px" style="vertical-align:top;">
-
-        <table width="830px"><tr>
-            <td></td>
-            <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/cron/?job=<?php echo $data[$key]['JOB'] ?>"> edit</a></td>
-            <td class="data-controls" width="70px">
-                <img src="/images/delete.png" width="7px" height="7px">
-                <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
-                <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
-                    <p class="counter-value">Are you sure you want to delete cron job?</p>
-                </div>
-            </td>
-        </tr></table>
-
-        <table class="data-col2" width="800px">
-            <tr><td colspan=5 class="cron" style="padding: 0 0 0 4px;"><b><?php echo $data[$key]['CMD'] ?></b></td></tr>
-            <tr>
-                <td style="vertical-align:top;"  width="80px">
-                    <table>
-                        <tr><td class="cron-counter-name">Min</td></tr>
-                        <tr><td class="cron-counter-value"><?php echo $data[$key]['MIN'] ?></tr>
+                                <table class="sub-menu" style="background: white;">
+                                    <tr>
+                                        <td style="padding: 12px 0 8px 6px">
+                                            <div style="float:left">
+                                                <button style="width:120px; padding: 2px 0px;" onclick="location.href='/add/cron/'"> Add Cron Job </button>
+                                            </div>
+                                            <div style="text-align: right; float: right;">
+                                                <input type="text" size="30" style="padding: 3px 80px 3px 0; margin: 0 2px 0 0;">
+                                                <button> Search </button>
+                                            </div>
+                                            <div style="float:left; padding-left: 26px;">
+                                                <a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
+                                                <select style="margin:0 2px 0 0px;" >
+                                                    <option>apply to selected</option>
+                                                    <option>rebuild</option>
+                                                    <option>update counters</option>
+                                                    <option>suspend</option>
+                                                    <option>unsuspend</option>
+                                                    <option>delete</option>
+                                                </select>
+                                                <button style="width:27px;"> › </button>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
                     </table>
-                </td>
-                <td style="vertical-align:top;"  width="80px">
-                    <table>
-                        <tr><td class="cron-counter-name">Hour</td></tr>
-                        <tr><td class="cron-counter-value"><?php echo $data[$key]['HOUR'] ?></tr>
-                    </table>
-                </td>
 
-                <td style="vertical-align:top;"  width="80px">
-                    <table>
-                        <tr><td class="cron-counter-name">Day</td></tr>
-                        <tr><td class="cron-counter-value"><?php echo $data[$key]['DAY'] ?></tr>
-                    </table>
-                </td>
+                    <form id="vstobjects">
+                        <table class='data'>
 
-                <td style="vertical-align:top;"  width="80px">
-                    <table>
-                        <tr><td class="cron-counter-name">Month</td></tr>
-                        <tr><td class="cron-counter-value"><?php echo $data[$key]['MONTH'] ?></tr>
-                    </table>
-                </td>
+                            <?php
+                                foreach ($data as $key => $value) {
+                                    ++$i;
+                                    if ($data[$key]['SUSPENDED'] == 'yes') {
+                                        $status = 'suspended';
+                                        $spnd_action = 'unsuspend' ;
+                                    } else {
+                                        $status = 'active';
+                                        $spnd_action = 'suspend';
+                                    }
+                            ?>
 
-                <td style="vertical-align:top;">
-                    <table>
-                        <tr><td class="cron-counter-name">Day of Week</td></tr>
-                        <tr><td class="cron-counter-value"><?php echo $data[$key]['WDAY'] ?></tr>
-                    </table>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
+                            <tr class="data-row">
+                                <script type="text/javascript">
+                                    $(function(){
+                                        $('#delete_dialog_<?php echo "$i" ?>').dialog({
+                                            modal: true,
+                                            autoOpen: false,
+                                            width: 360,
+                                            buttons: {
+                                                "Ok": function(event, ui) {
+                                                     location.href = '/delete/cron/?job=<?php echo $data[$key]['JOB']; ?>';
+                                                },
+                                                "Cancel": function() {
+                                                    $(this).dialog("close");
+                                                }
+                                            }
+                                        });
+                                        $('#delete_link_<?php echo "$i" ?>').click(function(){
+                                            $('#delete_dialog_<?php echo "$i" ?>').dialog('open');
+                                            return false;
+                                        });
+                                    });
+                                </script>
+                                <td class="data-dotted" style="padding: 0px 10px 0px 0px" width="150">
+                                    <table class="data-col1">
+                                        <tr><td style="padding: 18 0 4 18;"><input type="checkbox" name="object" ></td></tr>
+                                        <tr><td><a class="data-date" title="<?php echo  $data[$key]['DATE']."  ".$data[$key]['TIME'] ?>"><?php echo date("d M Y", strtotime($data[$key]['DATE'])) ?></td></tr>
+                                        <tr><td class="data-<?php echo $status ?>"><b><?php echo $status ?></b></td></tr>
+                                    </table>
+                                </td>
+                                <td class="data-dotted" width="830px" style="vertical-align:top;">
+                                    <table width="830px">
+                                        <tr>
+                                            <td></td>
+                                            <td class="data-controls" width="50px"><img src="/images/edit.png" width="8px" height="8px"><a href="/edit/cron/?job=<?php echo $data[$key]['JOB'] ?>"> edit</a></td>
+                                            <td class="data-controls" width="70px">
+                                                <img src="/images/delete.png" width="7px" height="7px">
+                                                <a href="#" id="delete_link_<?php echo $i ?>"> delete</a>
+                                                <div id="delete_dialog_<?php echo $i ?>" title="Confirmation">
+                                                    <p class="counter-value">Are you sure you want to delete cron job?</p>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    </table>
 
+                                    <table class="data-col2" width="800px">
+                                        <tr>
+                                            <td colspan=5 class="cron" style="padding: 0 0 0 4px;">
+                                                <b><?php echo $data[$key]['CMD'] ?></b>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td style="vertical-align:top;"  width="80px">
+                                                <table>
+                                                    <tr>
+                                                        <td class="cron-counter-name">
+                                                            Min
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="cron-counter-value">
+                                                            <?php echo $data[$key]['MIN'] ?> 
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;"  width="80px">
+                                                <table>
+                                                    <tr>
+                                                        <td class="cron-counter-name">
+                                                            Hour
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="cron-counter-value">
+                                                            <?php echo $data[$key]['HOUR'] ?> 
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;"  width="80px">
+                                                <table>
+                                                    <tr>
+                                                        <td class="cron-counter-name">
+                                                            Day
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="cron-counter-value">
+                                                            <?php echo $data[$key]['DAY'] ?> 
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;"  width="80px">
+                                                <table>
+                                                    <tr>
+                                                        <td class="cron-counter-name">
+                                                            Month
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="cron-counter-value">
+                                                            <?php echo $data[$key]['MONTH'] ?>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="vertical-align:top;">
+                                                <table>
+                                                    <tr>
+                                                        <td class="cron-counter-name">
+                                                            Day of Week
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="cron-counter-value">
+                                                            <?php echo $data[$key]['WDAY'] ?>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
 
-    <?php
-}
-?>
-</table>
-<?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?>
-<table class="data-count">
-<tr>
-    <td>→ 
-    <?php
-        if ( $i == 1) {
-            echo "1 cron job ";
-        } else {
-            echo "$i cron jobs ";
-        }
-    ?>
-    </td>
-</tr>
-</table>
-</form>
-<?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?>
-<?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:172px\"><tr><td></td></tr></table>"; ?>
-<?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:55px\"><tr><td></td></tr></table>"; ?>
+                            <?php
+                                }
+                            ?>
+                        </table>
+
+                        <?php if ($i == 0) echo "<table class=\"data-null\"><tr><td></td></tr></table>"; ?> 
+
+                        <table class="data-count">
+                            <tr>
+                                <td width="160px"></td>
+                                <td>
+                                    <?php
+                                        if ( $i == 1) {
+                                            echo "1 cron job ";
+                                        } else {
+                                            echo "$i cron jobs ";
+                                        }
+                                    ?>
+                                </td>
+                            </tr>
+                        </table>
+                    </form>
+
+                    <?php if ($i == 0) echo "<table class=\"data-spacer\" style=\"height:279px\"><tr><td></td></tr></table>"; ?> 
+                    <?php if ($i == 1) echo "<table class=\"data-spacer\" style=\"height:172px\"><tr><td></td></tr></table>"; ?> 
+                    <?php if ($i == 2) echo "<table class=\"data-spacer\" style=\"height:55px\"><tr><td></td></tr></table>"; ?> 
diff --git a/web/templates/user/menu_cron.html b/web/templates/user/menu_cron.html
deleted file mode 100644
index b16d2428..00000000
--- a/web/templates/user/menu_cron.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="sub-menu">
-<tr>
-    <td width="142px" style="padding: 16px 0 16px 6px">
-    <button style="width:120px; padding: 2px 0px 2px 0px;" onclick="location.href='/add/cron/'">Add Job</button>
-    <td><a style="padding: 0 4px 0 12px" class="select-controls" href='javascript:checkedAll("vstobjects");'> toggle all </a>
-    <select style="margin:0 0 0 0px">
-        <option>apply to selected</option>
-        <option>delete</option>
-    </select> <button> > </button></td>
-</td>
-    <td style="text-align: right;"><input type="text" size="30" style="padding: 3px 80px 3px 0;"> <button> Search </button></td>
-</tr><tr>
-</tr>
-</table>
-<form id="vstobjects">