diff --git a/module/testcase/control.php b/module/testcase/control.php
index a6df85f4ee..5d9b7b7c35 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -206,7 +206,7 @@ class testcase extends control
             }
         }
 
-        $this->app->loadLang('project');
+        $this->app->loadLang('execution');
         $this->app->loadLang('task');
 
         $this->view->title       = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->common;
diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php
index 1eaa586057..e7a6bb0a49 100644
--- a/module/testcase/lang/de.php
+++ b/module/testcase/lang/de.php
@@ -74,6 +74,8 @@ $lang->testcase->ignore           = 'Ignore';
 $lang->testcase->fromTesttask     = 'From Test Request';
 $lang->testcase->fromCaselib      = 'From CaseLib';
 $lang->testcase->deleted          = 'Deleted';
+$lang->testcase->browseUnits      = 'Unit Test';
+
 $lang->case = $lang->testcase;  // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
 
 $lang->testcase->stepID      = 'ID';
@@ -219,7 +221,8 @@ $lang->testcase->action->reviewed = array('main' => '$date, überprüft von <str
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;
 $lang->testcase->featureBar['browse']['wait']        = 'Wartend';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
-$lang->testcase->featureBar['browse']['group']       = '';
+$lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
-$lang->testcase->featureBar['browse']['zerocase']    = '';
+$lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
+$lang->testcase->featureBar['browse']['browseunits'] = 'Unit Test';
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index f6654283ee..54f198aa3e 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -74,6 +74,8 @@ $lang->testcase->ignore           = 'Ignore';
 $lang->testcase->fromTesttask     = 'From Test Request';
 $lang->testcase->fromCaselib      = 'From Case Library';
 $lang->testcase->deleted          = 'Deleted';
+$lang->testcase->browseUnits      = 'Unit Test';
+
 $lang->case = $lang->testcase;  // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
 
 $lang->testcase->stepID      = 'ID';
@@ -219,7 +221,8 @@ $lang->testcase->action->reviewed = array('main' => '$date, recorded by <strong>
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;
 $lang->testcase->featureBar['browse']['wait']        = 'Waiting';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
-$lang->testcase->featureBar['browse']['group']       = '';
+$lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
-$lang->testcase->featureBar['browse']['zerocase']    = '';
+$lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
+$lang->testcase->featureBar['browse']['browseunits'] = 'Unit Test';
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php
index a6c57bd588..7a445fe8fa 100644
--- a/module/testcase/lang/fr.php
+++ b/module/testcase/lang/fr.php
@@ -74,6 +74,8 @@ $lang->testcase->ignore           = 'Ignorer';
 $lang->testcase->fromTesttask     = 'De Campagne';
 $lang->testcase->fromCaselib      = 'De Library';
 $lang->testcase->deleted          = 'Deleted';
+$lang->testcase->browseUnits      = 'Unit Test';
+
 $lang->case = $lang->testcase;  // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
 
 $lang->testcase->stepID      = 'ID';
@@ -219,7 +221,8 @@ $lang->testcase->action->reviewed = array('main' => '$date, enregistré par <str
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;
 $lang->testcase->featureBar['browse']['wait']        = 'En Attente';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
-$lang->testcase->featureBar['browse']['group']       = '';
-$lang->testcase->featureBar['browse']['suite']       = 'Cahier Recette';
-$lang->testcase->featureBar['browse']['zerocase']    = '';
+$lang->testcase->featureBar['browse']['group']       = 'Group View';
+$lang->testcase->featureBar['browse']['suite']       = 'Suite';
+$lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
+$lang->testcase->featureBar['browse']['browseunits'] = 'Unit Test';
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/vi.php b/module/testcase/lang/vi.php
index 418693d528..bc4c152648 100644
--- a/module/testcase/lang/vi.php
+++ b/module/testcase/lang/vi.php
@@ -74,6 +74,8 @@ $lang->testcase->ignore           = 'Bỏ qua';
 $lang->testcase->fromTesttask     = 'Từ Yêu cầu Test';
 $lang->testcase->fromCaselib      = 'Từ thư viện tình huống';
 $lang->testcase->deleted          = 'Đã xóa';
+$lang->testcase->browseUnits      = 'Unit Test';
+
 $lang->case = $lang->testcase;  // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
 
 $lang->testcase->stepID      = 'ID';
@@ -219,7 +221,8 @@ $lang->testcase->action->reviewed = array('main' => '$date, ghi nhận bởi <st
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;
 $lang->testcase->featureBar['browse']['wait']        = 'Đang đợi';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
-$lang->testcase->featureBar['browse']['group']       = '';
+$lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
-$lang->testcase->featureBar['browse']['zerocase']    = '';
+$lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
+$lang->testcase->featureBar['browse']['browseunits'] = 'Unit Test';
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 0ce5bd5a56..4c376fabe4 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -74,6 +74,8 @@ $lang->testcase->ignore           = '忽略';
 $lang->testcase->fromTesttask     = '来自测试单用例';
 $lang->testcase->fromCaselib      = '来自用例库用例';
 $lang->testcase->deleted          = '是否删除';
+$lang->testcase->browseUnits      = '单元测试';
+
 $lang->case = $lang->testcase;  // 用于DAO检查时使用。因为case是系统关键字，所以无法定义该模块为case，只能使用testcase，但表还是使用的case。
 
 $lang->testcase->stepID      = '编号';
@@ -222,4 +224,5 @@ $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConf
 $lang->testcase->featureBar['browse']['group']       = '分组查看';
 $lang->testcase->featureBar['browse']['suite']       = '套件';
 $lang->testcase->featureBar['browse']['zerocase']    = "零用例{$lang->SRCommon}";
+$lang->testcase->featureBar['browse']['browseunits'] = '单元测试';
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 48e4229f78..68008aabad 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -5,11 +5,18 @@
   <div id="sidebarHeader">
     <div class="title">
       <?php
-      echo !empty($moduleID) ? $moduleName : $this->lang->tree->all;
-      if(!empty($moduleID))
+      if($this->app->rawMethod == 'browseunits')
       {
-          $removeLink = $browseType == 'bymodule' ? $this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("caseModule")';
-          echo html::a($removeLink, "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted'");
+          echo $lang->testtask->unitTag[$browseType];
+      }
+      else
+      {
+          echo !empty($moduleID) ? $moduleName : $this->lang->tree->all;
+          if(!empty($moduleID))
+          {
+              $removeLink = $browseType == 'bymodule' ? $this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("caseModule")';
+              echo html::a($removeLink, "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted'");
+          }
       }
       ?>
     </div>
@@ -19,6 +26,7 @@
     $hasBrowsePriv = common::hasPriv('testcase', 'browse');
     $hasGroupPriv  = common::hasPriv('testcase', 'groupcase');
     $hasZeroPriv   = common::hasPriv('story', 'zerocase');
+    $hasUnitPriv   = common::hasPriv('testtask', 'browseunits');
     ?>
     <?php foreach(customModel::getFeatureMenu('testcase', 'browse') as $menuItem):?>
     <?php
@@ -78,6 +86,10 @@
     {
         echo html::a($this->createLink('story', 'zeroCase', "productID=$productID&orderBy=id_desc&from={$this->lang->navGroup->testcase}"), "<span class='text'>{$lang->story->zeroCase}</span>", '', "class='btn btn-link' id='zerocaseTab'");
     }
+    elseif($hasUnitPriv and $menuType == 'browseunits')
+    {
+        echo html::a($this->createLink('testtask', 'browseUnits', "productID=$productID"), "<span class='text'>{$lang->testcase->browseUnits}</span>", '', "class='btn btn-link' id='browseunitsTab'");
+    }
     ?>
     <?php endforeach;?>
     <?php
@@ -136,6 +148,9 @@
         echo html::a($link, "<i class='icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-primary'");
     }
     ?>
+    <?php if($this->app->rawMethod == 'browseunits' and common::canModify('product', $product)):?>
+      <?php common::printLink('testtask', 'importUnitResult', "product=$productID", "<i class='icon icon-import'></i> " . $lang->testtask->importUnitResult, '', "class='btn btn-primary'");?>
+    <?php endif;?>
     <?php else:?>
     <div class='btn-group dropdown-hover'>
       <?php
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 80d6e4f104..c286536b89 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -135,6 +135,8 @@ class testtask extends control
     {
         /* Save session. */
         $this->session->set('testtaskList', $this->app->getURI(true));
+        $this->loadModel('testcase');
+        $this->app->loadLang('tree');
 
         /* Set menu. */
         $productID = $this->product->saveState($productID, $this->products);
@@ -162,6 +164,7 @@ class testtask extends control
         $this->view->users       = $this->loadModel('user')->getPairs('noclosed|noletter');
         $this->view->pager       = $pager;
         $this->view->product     = $this->product->getByID($productID);
+        $this->view->suiteList   = $this->loadModel('testsuite')->getSuites($productID);
 
         $this->display();
     }
diff --git a/module/testtask/view/browseunits.html.php b/module/testtask/view/browseunits.html.php
index c778e1ac7b..8055836e6f 100644
--- a/module/testtask/view/browseunits.html.php
+++ b/module/testtask/view/browseunits.html.php
@@ -12,83 +12,90 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
+<?php include '../../testcase/view/caseheader.html.php';?>
 <?php js::set('confirmDelete', $lang->testtask->confirmDelete)?>
 <?php js::set('flow', $config->global->flow);?>
 <style>
 #action-divider{display: inline-block; line-height: 0px; border-right: 2px solid #ddd}
 </style>
-<div id="mainMenu" class='clearfix'>
-  <div class="btn-toolbar pull-left">
-    <?php foreach($lang->testtask->unitTag as $key => $label):?>
-    <?php echo html::a(inlink('browseUnits', "productID=$productID&browseType=$key&orderBy=$orderBy"), "<span class='text'>$label</span>", '', "id='{$key}Tab' class='btn btn-link'");?>
-    <?php endforeach;?>
+<div id='mainContent' class='main-row'>
+  <div id="sidebar" class="side-col">
+    <div class="sidebar-toggle">
+      <i class="icon icon-angle-left"></i>
+    </div>
+    <div class="cell">
+      <div class='panel-body'>
+        <div class='list-group'>
+        <?php foreach($lang->testtask->unitTag as $key => $label):?>
+        <?php echo html::a(inlink('browseUnits', "productID=$productID&browseType=$key&orderBy=$orderBy"), "<span class='text'>$label</span>", '', "id='{$key}UnitTab' class='btn btn-link'");?>
+        <?php endforeach;?>
+        </div>
+      </div>
+    </div>
   </div>
-  <?php if(common::canModify('product', $product)):?>
-  <div class="btn-toolbar pull-right">
-    <?php common::printLink('testtask', 'importUnitResult', "product=$productID", "<i class='icon icon-import'></i> " . $lang->testtask->importUnitResult, '', "class='btn btn-primary'");?>
-  </div>
-  <?php endif;?>
-</div>
-<div id='mainContent' class='main-table' data-ride='table'>
-  <?php if(empty($tasks)):?>
-  <div class="table-empty-tip">
-    <p>
-      <span class="text-muted"><?php echo $lang->testtask->noTesttask;?></span>
-    </p>
-  </div>
-  <?php else:?>
-  <table class='table has-sort-head' id='taskList'>
-    <thead>
-    <?php $vars = "productID=$productID&browseType=$browseType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
-      <tr>
-        <th class='c-id text-left'>   <?php common::printOrderLink('id',        $orderBy, $vars, $lang->idAB);?></th>
-        <th class='w-300px text-left'><?php common::printOrderLink('name',      $orderBy, $vars, $lang->testtask->name);?></th>
-        <th class='text-left'>        <?php common::printOrderLink('execution', $orderBy, $vars, $lang->testtask->execution);?></th>
-        <th class='text-left'>        <?php common::printOrderLink('build',     $orderBy, $vars, $lang->testtask->build);?></th>
-        <th class='c-user text-left'> <?php common::printOrderLink('owner',     $orderBy, $vars, $lang->testtask->owner);?></th>
-        <th class='w-90px text-left'> <?php common::printOrderLink('begin',     $orderBy, $vars, $lang->testtask->execTime);?></th>
-        <th class='w-50px text-center'><?php echo $lang->testtask->caseCount;?></th>
-        <th class='w-40px text-center'><?php echo $lang->testtask->passCount;?></th>
-        <th class='w-40px text-center'><?php echo $lang->testtask->failCount;?></th>
-        <th class='c-actions-3 text-center'><?php echo $lang->actions;?></th>
+
+  <div class="main-col main-table">
+    <?php if(empty($tasks)):?>
+    <div class="table-empty-tip">
+      <p>
+        <span class="text-muted"><?php echo $lang->testtask->noTesttask;?></span>
+      </p>
+    </div>
+    <?php else:?>
+    <table class='table' data-ride='table' id='taskList'>
+      <thead>
+      <?php $vars = "productID=$productID&browseType=$browseType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
+        <tr>
+          <th class='c-id text-left'>   <?php common::printOrderLink('id',        $orderBy, $vars, $lang->idAB);?></th>
+          <th class='w-300px text-left'><?php common::printOrderLink('name',      $orderBy, $vars, $lang->testtask->name);?></th>
+          <th class='text-left'>        <?php common::printOrderLink('execution', $orderBy, $vars, $lang->testtask->execution);?></th>
+          <th class='text-left'>        <?php common::printOrderLink('build',     $orderBy, $vars, $lang->testtask->build);?></th>
+          <th class='c-user text-left'> <?php common::printOrderLink('owner',     $orderBy, $vars, $lang->testtask->owner);?></th>
+          <th class='w-90px text-left'> <?php common::printOrderLink('begin',     $orderBy, $vars, $lang->testtask->execTime);?></th>
+          <th class='w-50px text-center'><?php echo $lang->testtask->caseCount;?></th>
+          <th class='w-40px text-center'><?php echo $lang->testtask->passCount;?></th>
+          <th class='w-40px text-center'><?php echo $lang->testtask->failCount;?></th>
+          <th class='c-actions-3 text-center'><?php echo $lang->actions;?></th>
+        </tr>
+      </thead>
+      <tbody>
+      <?php foreach($tasks as $task):?>
+      <tr class='text-left'>
+        <td><?php printf('%03d', $task->id);?></td>
+        <td class='c-name' title="<?php echo $task->name?>"><?php echo html::a(inlink('unitCases', "taskID=$task->id"), $task->name);?></td>
+        <td class='c-name' title="<?php echo $task->executionName?>"><?php echo $task->executionName?></td>
+        <td class='c-name'><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build",'',true), $task->buildName);?></td>
+        <td><?php echo zget($users, $task->owner);?></td>
+        <td><?php echo $task->begin?></td>
+        <td class='text-center'><?php echo $task->caseCount?></td>
+        <td class='text-center pass'><?php echo $task->passCount?></td>
+        <td class='text-center fail'><?php echo $task->failCount?></td>
+        <td class='c-actions'>
+          <?php
+          common::printIcon('testtask',  'unitCases', "taskID=$task->id", '', 'list', 'list-alt', '', 'iframe', true, 'data-width="70%"');
+          common::printIcon('testtask',  'edit', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
+          if(common::hasPriv('testtask', 'delete', $task))
+          {
+              $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
+              echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-common-delete icon-trash"></i>', '', "title='{$lang->testtask->delete}' class='btn'");
+          }
+          ?>
+        </td>
       </tr>
-    </thead>
-    <tbody>
-    <?php foreach($tasks as $task):?>
-    <tr class='text-left'>
-      <td><?php printf('%03d', $task->id);?></td>
-      <td class='c-name' title="<?php echo $task->name?>"><?php echo html::a(inlink('unitCases', "taskID=$task->id"), $task->name);?></td>
-      <td class='c-name' title="<?php echo $task->executionName?>"><?php echo $task->executionName?></td>
-      <td class='c-name'><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build",'',true), $task->buildName);?></td>
-      <td><?php echo zget($users, $task->owner);?></td>
-      <td><?php echo $task->begin?></td>
-      <td class='text-center'><?php echo $task->caseCount?></td>
-      <td class='text-center pass'><?php echo $task->passCount?></td>
-      <td class='text-center fail'><?php echo $task->failCount?></td>
-      <td class='c-actions'>
-        <?php
-        common::printIcon('testtask',  'unitCases', "taskID=$task->id", '', 'list', 'list-alt', '', 'iframe', true, 'data-width="70%"');
-        common::printIcon('testtask',  'edit', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
-        if(common::hasPriv('testtask', 'delete', $task))
-        {
-            $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
-            echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-common-delete icon-trash"></i>', '', "title='{$lang->testtask->delete}' class='btn'");
-        }
-        ?>
-      </td>
-    </tr>
-    <?php endforeach;?>
-    </tbody>
-  </table>
-  <?php if($browseType != 'newest'):?>
-  <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
-  <?php endif;?>
-  <?php endif;?>
+      <?php endforeach;?>
+      </tbody>
+    </table>
+    <?php if($browseType != 'newest'):?>
+    <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
+    <?php endif;?>
+    <?php endif;?>
+  </div>
 </div>
 <script>
 $(function()
 {
-    $('#<?php echo $browseType?>Tab').addClass('btn-active-text').append(" <span class='label label-light label-badge'><?php echo ($browseType == 'newest' and $pager->recTotal >= $pager->recPerPage) ? $pager->recPerPage : $pager->recTotal;?></span>");
+    $('#<?php echo $browseType?>UnitTab').addClass('selected');
+    $('#browseunitsTab').addClass('btn-active-text');
 })
 </script>
 <?php include '../../common/view/footer.html.php';?>