diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index f05ca3d184..826b40902a 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -291,7 +291,8 @@ $lang->my->workMenu->task        = 'Task|my|work|mode=task';
 $lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
 $lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement";
 $lang->my->workMenu->bug         = 'Bug|my|work|mode=bug';
-$lang->my->workMenu->testtask    = 'Test Case|my|work|mode=testtask';
+$lang->my->workMenu->testcase    = 'Test Case|my|work|mode=testcase&type=assigntome';
+$lang->my->workMenu->testtask    = 'Test Task|my|work|mode=testtask&type=wait';
 $lang->my->workMenu->issue       = 'Issue|my|work|mode=issue';
 $lang->my->workMenu->risk        = 'Risk|my|work|mode=risk';
 
@@ -300,7 +301,8 @@ $lang->my->contributeMenu->task        = 'Task|my|contribute|mode=task';
 $lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=story";
 $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement";
 $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
-$lang->my->contributeMenu->testtask    = 'Test Case|my|contribute|mode=testtask';
+$lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
+$lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
 $lang->my->contributeMenu->issue       = 'Issue|my|contribute|mode=issue';
 $lang->my->contributeMenu->risk        = 'Risk|my|contribute|mode=risk';
 
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 6ebf58f402..c9c0b5579b 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -291,7 +291,8 @@ $lang->my->workMenu->task        = 'Task|my|work|mode=task';
 $lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
 $lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement";
 $lang->my->workMenu->bug         = 'Bug|my|work|mode=bug';
-$lang->my->workMenu->testtask    = 'Test Case|my|work|mode=testtask';
+$lang->my->workMenu->testcase    = 'Test Case|my|work|mode=testcase&type=assigntome';
+$lang->my->workMenu->testtask    = 'Test Task|my|work|mode=testtask&type=wait';
 $lang->my->workMenu->issue       = 'Issue|my|work|mode=issue';
 $lang->my->workMenu->risk        = 'Risk|my|work|mode=risk';
 
@@ -300,7 +301,8 @@ $lang->my->contributeMenu->task        = 'Task|my|contribute|mode=task';
 $lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=story";
 $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement";
 $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
-$lang->my->contributeMenu->testtask    = 'Test Case|my|contribute|mode=testtask';
+$lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
+$lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
 $lang->my->contributeMenu->issue       = 'Issue|my|contribute|mode=issue';
 $lang->my->contributeMenu->risk        = 'Risk|my|contribute|mode=risk';
 
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 61a983098d..3c4a2d0b5e 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -291,7 +291,8 @@ $lang->my->workMenu->task        = 'Task|my|work|mode=task';
 $lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
 $lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement";
 $lang->my->workMenu->bug         = 'Bug|my|work|mode=bug';
-$lang->my->workMenu->testtask    = 'Test Case|my|work|mode=testtask';
+$lang->my->workMenu->testcase    = 'Test Case|my|work|mode=testcase&type=assigntome';
+$lang->my->workMenu->testtask    = 'Test Task|my|work|mode=testtask&type=wait';
 $lang->my->workMenu->issue       = 'Issue|my|work|mode=issue';
 $lang->my->workMenu->risk        = 'Risk|my|work|mode=risk';
 
@@ -300,7 +301,8 @@ $lang->my->contributeMenu->task        = 'Task|my|contribute|mode=task';
 $lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=story";
 $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement";
 $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
-$lang->my->contributeMenu->testtask    = 'Test Case|my|contribute|mode=testtask';
+$lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
+$lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
 $lang->my->contributeMenu->issue       = 'Issue|my|contribute|mode=issue';
 $lang->my->contributeMenu->risk        = 'Risk|my|contribute|mode=risk';
 
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index fdf7196c08..fdc0812517 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -291,7 +291,8 @@ $lang->my->workMenu->task        = 'Task|my|work|mode=task';
 $lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
 $lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement";
 $lang->my->workMenu->bug         = 'Bug|my|work|mode=bug';
-$lang->my->workMenu->testtask    = 'Test Case|my|work|mode=testtask';
+$lang->my->workMenu->testcase    = 'Test Case|my|work|mode=testcase&type=assigntome';
+$lang->my->workMenu->testtask    = 'Test Task|my|work|mode=testtask&type=wait';
 $lang->my->workMenu->issue       = 'Issue|my|work|mode=issue';
 $lang->my->workMenu->risk        = 'Risk|my|work|mode=risk';
 
@@ -300,7 +301,8 @@ $lang->my->contributeMenu->task        = 'Task|my|contribute|mode=task';
 $lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=story";
 $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement";
 $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
-$lang->my->contributeMenu->testtask    = 'Test Case|my|contribute|mode=testtask';
+$lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
+$lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
 $lang->my->contributeMenu->issue       = 'Issue|my|contribute|mode=issue';
 $lang->my->contributeMenu->risk        = 'Risk|my|contribute|mode=risk';
 
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 2aa48a095c..9b4f09cb62 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -296,7 +296,8 @@ $lang->my->workMenu->task        = '任务|my|work|mode=task';
 $lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement";
 $lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
 $lang->my->workMenu->bug         = 'Bug|my|work|mode=bug';
-$lang->my->workMenu->testtask    = '测试|my|work|mode=testtask&type=wait';
+$lang->my->workMenu->testcase    = '用例|my|work|mode=testcase&type=assigntome';
+$lang->my->workMenu->testtask    = '测试单|my|work|mode=testtask&type=wait';
 $lang->my->workMenu->issue       = '问题|my|work|mode=issue';
 $lang->my->workMenu->risk        = '风险|my|work|mode=risk';
 
@@ -305,7 +306,8 @@ $lang->my->contributeMenu->task        = '任务|my|contribute|mode=task';
 $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement";
 $lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=story";
 $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
-$lang->my->contributeMenu->testtask    = '用例|my|contribute|mode=testtask&type=done';
+$lang->my->contributeMenu->testcase    = '用例|my|contribute|mode=testcase&type=openedbyme';
+$lang->my->contributeMenu->testtask    = '测试单|my|contribute|mode=testtask&type=done';
 $lang->my->contributeMenu->issue       = '问题|my|contribute|mode=issue';
 $lang->my->contributeMenu->risk        = '风险|my|contribute|mode=risk';
 
diff --git a/module/my/control.php b/module/my/control.php
index 7327fdffdf..c8bfaa9eaf 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -358,6 +358,11 @@ class my extends control
     /**
      * My test task.
      *
+     * @param  string $type wait|done
+     * @param  string $orderBy
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
      * @access public
      * @return void
      */
@@ -393,7 +398,7 @@ class my extends control
     /**
      * My test case.
      *
-     * @param  string $type
+     * @param  string $type assigntome|openedbyme
      * @param  string $orderBy
      * @param  int    $recTotal
      * @param  int    $recPerPage
diff --git a/module/my/js/common.js b/module/my/js/common.js
index 251d0390a4..37a1292422 100644
--- a/module/my/js/common.js
+++ b/module/my/js/common.js
@@ -2,7 +2,6 @@ $(function()
 {
     if(typeof mode === 'string')
     {
-        if(mode == 'testcase') mode = 'testtask';
         $('#subNavbar li[data-id=' + mode + ']').addClass('active');
     }
     var scp  = $('[data-id="changePassword"] a');
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index e4185fe55f..39735521c4 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -20,9 +20,6 @@
   <div class="btn-toolbar pull-left">
     <?php
     $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-    if($app->rawMethod == 'work') echo html::a(inlink($app->rawMethod, "mode=testtask&type=wait"), "<span class='text'>{$lang->testtask->wait}</span>", '', "class='btn btn-link'");
-    if($app->rawMethod == 'contribute') echo html::a(inlink($app->rawMethod, "mode=testtask&type=done"), "<span class='text'>{$lang->testtask->done}</span>", '', "class='btn btn-link'");
-    echo "<span class='divider'></span>";
     if($app->rawMethod == 'work') echo html::a(inlink($app->rawMethod, "mode=$mode&type=assigntome"), "<span class='text'>{$lang->testcase->assignToMe}</span>" . ($type == 'assigntome' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assigntome' ? ' btn-active-text' : '') . "'");
     if($app->rawMethod == 'contribute') echo html::a(inlink($app->rawMethod, "mode=$mode&type=openedbyme"), "<span class='text'>{$lang->testcase->openedByMe}</span>" . ($type == 'openedbyme' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedbyme' ? ' btn-active-text' : '') . "'");
     ?>
diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php
index ae349ee7c4..9eabf844e7 100644
--- a/module/my/view/testtask.html.php
+++ b/module/my/view/testtask.html.php
@@ -19,9 +19,6 @@
     $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
     if($app->rawMethod == 'work') echo html::a(inlink($app->rawMethod, "mode=$mode&type=wait"), "<span class='text'>{$lang->testtask->wait}</span>" . ($type == 'wait' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'wait' ? ' btn-active-text' : '') . "'");
     if($app->rawMethod == 'contribute') echo html::a(inlink($app->rawMethod, "mode=$mode&type=done"), "<span class='text'>{$lang->testtask->done}</span>" . ($type == 'done' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'done' ? ' btn-active-text' : '') . "'");
-    echo "<span class='divider'></span>";
-    if($app->rawMethod == 'work') echo html::a(inlink($app->rawMethod, "mode=testcase&type=assigntome"), "<span class='text'>{$lang->testcase->assignToMe}</span>", '', "class='btn btn-link'");
-    if($app->rawMethod == 'contribute') echo html::a(inlink($app->rawMethod, "mode=testcase&type=openedbyme"), "<span class='text'>{$lang->testcase->openedByMe}</span>", '', "class='btn btn-link'");
     ?>
   </div>
 </div>
diff --git a/module/story/config.php b/module/story/config.php
index 1f334ad7b7..14bad73301 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -97,7 +97,7 @@ $config->story->datatable->fieldList['status']['required'] = 'no';
 
 $config->story->datatable->fieldList['estimate']['title']    = 'estimateAB';
 $config->story->datatable->fieldList['estimate']['fixed']    = 'no';
-$config->story->datatable->fieldList['estimate']['width']    = '65';
+$config->story->datatable->fieldList['estimate']['width']    = '80';
 $config->story->datatable->fieldList['estimate']['required'] = 'no';
 
 $config->story->datatable->fieldList['stage']['title']    = 'stageAB';
diff --git a/module/story/model.php b/module/story/model.php
index 0e1a75594e..aef6483d5e 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2392,6 +2392,7 @@ class storyModel extends model
         $branches = array();
         foreach($stories as $story)
         {
+            $story->estimate .= ' ' . $this->lang->story->hour;
             if(empty($story->branch) and $story->productType != 'normal') $branches[$story->productBranch][$story->id] = $story->id;
         }
         foreach($branches as $branchID => $storyIdList)
@@ -3384,7 +3385,7 @@ class storyModel extends model
                 echo '</span>';
                 break;
             case 'estimate':
-                echo $story->estimate;
+                echo $story->estimate . ' ' . $this->lang->story->hour;
                 break;
             case 'stage':
                 if(isset($storyStages[$story->id]) and !empty($branches))