diff --git a/module/bug/model.php b/module/bug/model.php
index c0c7c33233..40aa2a0507 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2472,7 +2472,6 @@ class bugModel extends model
             switch($id)
             {
             case 'id':
-                //if($mode == 'table' && $canBatchAction)
                 if($canBatchAction)
                 {
                     echo html::checkbox('bugIDList', array($bug->id => sprintf('%03d', $bug->id)));
diff --git a/module/datatable/model.php b/module/datatable/model.php
index 8d0a4d84b9..7bc9d4db7b 100644
--- a/module/datatable/model.php
+++ b/module/datatable/model.php
@@ -86,6 +86,7 @@ class datatableModel extends model
                     unset($setting[$key]);
                     continue;
                 }
+                if($set->id == 'actions') $set->width = $fieldList[$set->id]['width'];
                 $set->title = $fieldList[$set->id]['title'];
                 $set->sort  = isset($fieldList[$set->id]['sort']) ? $fieldList[$set->id]['sort'] : 'yes';
             }
diff --git a/module/datatable/view/ajaxcustom.html.php b/module/datatable/view/ajaxcustom.html.php
index 1e0e7e889a..5bab1aea2c 100644
--- a/module/datatable/view/ajaxcustom.html.php
+++ b/module/datatable/view/ajaxcustom.html.php
@@ -99,6 +99,7 @@ $(function()
     $cols.filter('.fixed-flex, .fixed-no').appendTo('#colsFixedFlex');
     $cols.filter('.fixed-right').appendTo('#colsFixedRight');
     $('#originCols').remove();
+    $('[data-key=actions] #width').attr('disabled', 'disabled');
 
     if(typeof setting[0] === 'string')
     {
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 3b5930ba33..cb98952bc2 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -55,7 +55,7 @@
           <th class='c-hours'>   <?php common::printOrderLink('left',        $orderBy, $vars, $lang->task->leftAB);?></th>
           <th class='c-date'>    <?php common::printOrderLink('deadline',    $orderBy, $vars, $lang->task->deadlineAB);?></th>
           <th class='c-status'>  <?php common::printOrderLink('status',      $orderBy, $vars, $lang->statusAB);?></th>
-          <th class='c-actions-4'><?php echo $lang->actions;?></th>
+          <th class='c-actions-6'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
@@ -94,17 +94,14 @@
             }
             else
             {
-                if($task->status == 'wait') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+                if($task->status != 'pause') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
                 if($task->status == 'pause') common::printIcon('task', 'restart', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-                if($task->status == 'done' or $task->status == 'cancel' or $task->status == 'closed') common::printIcon('task', 'close',  "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-                if($task->status == 'doing') common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+                common::printIcon('task', 'close',  "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+                common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
 
                 common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true);
                 common::printIcon('task', 'edit',   "taskID=$task->id", $task, 'list');
-                if(empty($task->team) or empty($task->children))
-                {
-                    common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'plus', '', '', '', '', $this->lang->task->children);
-                }
+                common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'plus', '', '', '', '', $this->lang->task->children);
             }
             ?>
           </td>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 763d547044..15ec523d71 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -159,7 +159,6 @@
       $vars         = "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
 
       if($useDatatable) include '../../common/view/datatable.html.php';
-
       $setting = $this->datatable->getSetting('product');
       $widths  = $this->datatable->setFixedFieldWidth($setting);
       $columns = 0;
diff --git a/module/task/config.php b/module/task/config.php
index 8893f55199..4c228f6583 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -197,5 +197,5 @@ $config->task->datatable->fieldList['lastEditedDate']['required'] = 'no';
 
 $config->task->datatable->fieldList['actions']['title']    = 'actions';
 $config->task->datatable->fieldList['actions']['fixed']    = 'right';
-$config->task->datatable->fieldList['actions']['width']    = '130';
+$config->task->datatable->fieldList['actions']['width']    = '170';
 $config->task->datatable->fieldList['actions']['required'] = 'yes';
diff --git a/module/task/model.php b/module/task/model.php
index d2fa544db4..ae821a7ba1 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2508,17 +2508,14 @@ class taskModel extends model
                         break;
                     }
 
-                    if($task->status == 'wait') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+                    if($task->status != 'pause') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
                     if($task->status == 'pause') common::printIcon('task', 'restart', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-                    if($task->status == 'done' or $task->status == 'cancel' or $task->status == 'closed') common::printIcon('task', 'close',  "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-                    if($task->status == 'doing') common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+                    common::printIcon('task', 'close',  "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+                    common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
 
                     common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true);
                     common::printIcon('task', 'edit',   "taskID=$task->id", $task, 'list');
-                    if(empty($task->team) or empty($task->children))
-                    {
-                        common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'plus', '', '', '', '', $this->lang->task->children);
-                    }
+                    common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'plus', '', '', '', '', $this->lang->task->children);
                     break;
             }
             echo '</td>';
diff --git a/module/testcase/config.php b/module/testcase/config.php
index ded5227827..a9dc8964dd 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -204,6 +204,6 @@ $config->testcase->datatable->fieldList['stepNumber']['name']     = $lang->testc
 
 $config->testcase->datatable->fieldList['actions']['title']    = 'actions';
 $config->testcase->datatable->fieldList['actions']['fixed']    = 'right';
-$config->testcase->datatable->fieldList['actions']['width']    = '180';
+$config->testcase->datatable->fieldList['actions']['width']    = '140';
 $config->testcase->datatable->fieldList['actions']['required'] = 'yes';
 $config->testcase->datatable->fieldList['actions']['sort']     = 'no';
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 302a4b953e..997ffae269 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1352,7 +1352,6 @@ class testcaseModel extends model
             switch($id)
             {
             case 'id':
-                //echo $mode == 'table' ? html::checkbox('caseIDList', array($case->id => sprintf('%03d', $case->id))) : sprintf('%03d', $case->id);
                 echo html::checkbox('caseIDList', array($case->id => sprintf('%03d', $case->id)));
                 break;
             case 'pri':
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 2945f08ce7..d8962b024a 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -67,6 +67,8 @@ js::set('suiteID',        $suiteID);
 
       if($useDatatable)  include '../../common/view/datatable.html.php';
       else               include '../../common/view/tablesorter.html.php';
+
+      if($config->testcase->needReview or !empty($config->testcase->forceReview)) $config->testcase->datatable->fieldList['actions']['width'] = '170';
       $setting = $this->datatable->getSetting('testcase');
       $widths  = $this->datatable->setFixedFieldWidth($setting);
       $columns = 0;
diff --git a/module/testtask/model.php b/module/testtask/model.php
index d178d4b51d..0143100407 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1170,7 +1170,7 @@ class testtaskModel extends model
         $id = $col->id;
         if($col->show)
         {
-            $class = '';
+            $class = "c-$id ";
             if($id == 'status') $class .= $run->status;
             if($id == 'title')  $class .= ' text-left';
             if($id == 'id')     $class .= ' cell-id';
@@ -1182,14 +1182,7 @@ class testtaskModel extends model
             switch ($id)
             {
             case 'id':
-                //if($mode == 'table')
-                //{
-                    echo html::checkbox('caseIDList', array($run->case => sprintf('%03d', $run->case)));
-                //}
-                //else
-                //{
-                //    echo $canView ? html::a($caseLink, sprintf('%03d', $run->case)) : sprintf('%03d', $run->case);
-                //}
+                echo html::checkbox('caseIDList', array($run->case => sprintf('%03d', $run->case)));
                 break;
             case 'pri':
                 echo "<span class='label-pri label-pri-" . $run->pri . "' title='" . zget($this->lang->testcase->priList, $run->pri, $run->pri) . "'>";
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index a151123ff6..8a12b4d8e6 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -33,7 +33,7 @@
         <nav class="btn-toolbar pull-right"></nav>
       </div>
       <?php
-      $vars         = "taskID=$task->id&browseType=$browseType&param=$param&orderBy=%s&recToal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
+      $vars = "taskID=$task->id&browseType=$browseType&param=$param&orderBy=%s&recToal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
 
       $canBatchEdit   = common::hasPriv('testcase', 'batchEdit');
       $canBatchUnlink = common::hasPriv('testtask', 'batchUnlinkCases');
@@ -45,7 +45,7 @@
       if(!$useDatatable) include '../../common/view/tablesorter.html.php';
 
       $config->testcase->datatable->defaultField = $config->testtask->datatable->defaultField;
-      $config->testcase->datatable->fieldList['actions']['width'] = '140';
+      $config->testcase->datatable->fieldList['actions']['width'] = '120';
 
       $setting = $this->datatable->getSetting('testtask');
       $widths  = $this->datatable->setFixedFieldWidth($setting);
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index d9a863fa86..03d3c0face 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -2412,7 +2412,7 @@ class upgradeModel extends model
      */
     public function removeCustomMenu()
     {
-        $customMenuMain = $this->dao->select('*')->from(TABLE_CONFIG)->where('module')->eq('common')->andWhere('section')->eq('customMenu')->andWhere('`key`')->eq('full_main')->fetchAll('id');
+        $customMenuMain = $this->dao->select('*')->from(TABLE_CONFIG)->where('module')->eq('common')->andWhere('section')->eq('customMenu')->andWhere("(`key`='full_main' OR `key`='onlyTask_main' OR `key`='onlyStory_main' OR `key`='onlyTest_main')")->fetchAll('id');
         foreach($customMenuMain as $mainMenu)
         {
             $mainMenuValue = json_decode($mainMenu->value);
@@ -2429,7 +2429,8 @@ class upgradeModel extends model
             }
         }
 
-        $this->dao->delete()->from(TABLE_CONFIG)->where('module')->eq('common')->andWhere('section')->eq('customMenu')->andWhere('key')->eq('full_project')->exec();
+        $this->dao->delete()->from(TABLE_CONFIG)->where('module')->eq('common')->andWhere('section')->eq('customMenu')->andWhere('`key`')->eq('full_project')->exec();
+        $this->dao->delete()->from(TABLE_CONFIG)->where('module')->eq('common')->andWhere('section')->eq('customMenu')->andWhere('`key`')->eq('onlyTask_project')->exec();
         return !dao::isError();
     }