diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php
index 458cdf53dd..ae653a24bd 100644
--- a/module/testcase/lang/de.php
+++ b/module/testcase/lang/de.php
@@ -263,7 +263,6 @@ $lang->testcase->featureBar['browse']['wait']        = 'Wartend';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
 $lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
-$lang->testcase->featureBar['browse']['browseunits'] = 'Unit Test';
 $lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index f6fedb0dd8..28b076f827 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -263,7 +263,6 @@ $lang->testcase->featureBar['browse']['wait']        = 'Waiting';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
 $lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
-$lang->testcase->featureBar['browse']['browseunits'] = 'Unit Test';
 $lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php
index b1de2c392c..3bae6384fb 100644
--- a/module/testcase/lang/fr.php
+++ b/module/testcase/lang/fr.php
@@ -263,7 +263,6 @@ $lang->testcase->featureBar['browse']['wait']        = 'En Attente';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
 $lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
-$lang->testcase->featureBar['browse']['browseunits'] = 'Unit Test';
 $lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
 $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 52417cb50f..766858f936 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -100,7 +100,7 @@ $lang->testcase->executionStatus  = '执行状态';
 $lang->testcase->caseType         = '用例类型';
 $lang->testcase->allType          = '所有类型';
 $lang->testcase->showAutoCase     = '显示自动化';
-$lang->testcase->automation       = '自动化测试';
+$lang->testcase->automation       = '自动化设置';
 
 $lang->case = $lang->testcase;  // 用于DAO检查时使用。因为case是系统关键字，所以无法定义该模块为case，只能使用testcase，但表还是使用的case。
 
@@ -125,13 +125,13 @@ $lang->testcase->batchChangeModule       = "批量修改模块";
 $lang->testcase->confirmLibcaseChange    = "同步用例库用例修改";
 $lang->testcase->ignoreLibcaseChange     = "忽略用例库用例修改";
 $lang->testcase->batchChangeBranch       = "批量修改分支";
-$lang->testcase->groupByStories          = "{$lang->SRCommon}分组";
+$lang->testcase->groupByStories          = "{$lang->common->story}分组";
 $lang->testcase->batchDelete             = "批量删除 ";
 $lang->testcase->batchConfirmStoryChange = "批量确认变更";
 $lang->testcase->batchCaseTypeChange     = "批量修改类型";
 $lang->testcase->browse                  = "用例列表";
 $lang->testcase->groupCase               = "分组浏览用例";
-$lang->testcase->zeroCase                = "零用例{$lang->SRCommon}";
+$lang->testcase->zeroCase                = "零用例{$lang->common->story}";
 $lang->testcase->import                  = "导入";
 $lang->testcase->importAction            = "导入用例";
 $lang->testcase->fileImport              = "导入CSV";
@@ -165,7 +165,7 @@ $lang->testcase->assignToMe   = '指派给我的用例';
 $lang->testcase->openedByMe   = '我建的用例';
 $lang->testcase->allCases     = '所有';
 $lang->testcase->allTestcases = '所有用例';
-$lang->testcase->needConfirm  = "{$lang->SRCommon}变动";
+$lang->testcase->needConfirm  = "{$lang->common->story}变动";
 $lang->testcase->bySearch     = '搜索';
 $lang->testcase->unexecuted   = '未执行';
 
@@ -263,7 +263,6 @@ $lang->testcase->featureBar['browse']['wait']        = '待评审';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
 $lang->testcase->featureBar['browse']['group']       = '分组查看';
 $lang->testcase->featureBar['browse']['zerocase']    = "零用例{$lang->SRCommon}";
-$lang->testcase->featureBar['browse']['browseunits'] = '单元测试';
 $lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['browse']['suite']       = '套件';
 $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 0adfd408b3..a2221989ac 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -18,22 +18,15 @@
 #byTypeTab li.split{border-top: 1px solid #eee;}
 </style>
 <div id='mainMenu' class='clearfix'>
-  <?php if(!($this->app->rawMethod == 'groupcase')):?>
+  <?php if(!in_array($this->app->rawMethod, array('groupcase', 'browseunits'))):?>
   <div id="sidebarHeader">
     <div class="title">
       <?php
-      if($this->app->rawMethod == 'browseunits')
+      echo !empty($moduleID) ? $moduleName : $this->lang->tree->all;
+      if(!empty($moduleID))
       {
-          echo $lang->testtask->unitTag[$browseType];
-      }
-      else
-      {
-          echo !empty($moduleID) ? $moduleName : $this->lang->tree->all;
-          if(!empty($moduleID))
-          {
-              $removeLink = $browseType == 'bymodule' ? $this->createLink($currentModule, $currentMethod, $projectParam . "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' data-app='{$this->app->tab}'");
-          }
+          $removeLink = $browseType == 'bymodule' ? $this->createLink($currentModule, $currentMethod, $projectParam . "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' data-app='{$this->app->tab}'");
       }
       ?>
     </div>
@@ -46,6 +39,12 @@
     $hasZeroPriv   = common::hasPriv('testcase', 'zerocase');
     $hasUnitPriv   = common::hasPriv('testtask', 'browseunits');
     ?>
+
+    <?php if($this->app->rawMethod == 'browseunits'):?>
+    <?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' data-app='{$this->app->tab}'");?>
+    <?php endforeach;?>
+    <?php else:?>
     <?php foreach(customModel::getFeatureMenu('testcase', 'browse') as $menuItem):?>
     <?php
     if(isset($menuItem->hidden)) continue;
@@ -76,12 +75,14 @@
 
         foreach($lang->testcase->typeList as $type => $typeName)
         {
-            if($type == 'unit') continue;
             echo '<li' . ($type == $caseType ? " class='active'" : '') . '>';
-            if(isset($groupBy))
+            if($hasUnitPriv and $type == 'unit')
+            {
+                echo html::a($this->createLink('testtask', 'browseUnits', "productID=$productID&browseType=newest&orderBy=id_desc&recTotal=0&recPerPage=20&pageID=1&projectID=$projectID"), "{$lang->testcase->browseUnits}", '', " data-app='{$this->app->tab}'");
+            }
+            elseif(isset($groupBy))
             {
                 echo html::a($this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=story&projectID=$projectID&caseType=$type"), $typeName);
-
             }
             else
             {
@@ -89,11 +90,16 @@
             }
             echo "</li>";
         }
-
-        echo "<li class='split'></li>";
-        echo html::checkbox('showAutoCase', array('1' => $lang->testcase->showAutoCase), '', $this->cookie->showAutoCase ? 'checked=checked' : '');
         echo '</ul></div>';
     }
+    elseif($hasBrowsePriv and $menuType == 'autocase')
+    {
+        if($this->moduleName == 'testtask' and $this->methodName == 'browseunits') continue;
+        if($this->moduleName == 'story' and $this->methodName == 'zerocase') continue;
+        if($browseType == 'bysuite' or $browseType == 'bysearch') continue;
+
+        echo html::checkbox('showAutoCase', array('1' => $lang->testcase->showAutoCase), '', $this->cookie->showAutoCase ? 'checked=checked' : '');
+    }
     elseif($hasBrowsePriv and ($menuType == 'all' or $menuType == 'needconfirm' or $menuType == 'wait'))
     {
         echo html::a($this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=$menuType&param=0&caseType=$caseType"), "<span class='text'>{$menuItem->text}</span>", '', "class='btn btn-link' id='{$menuType}Tab' data-app='{$this->app->tab}'");
@@ -142,15 +148,13 @@
         $projectID = $isProjectApp ? $this->session->project : 0;
         echo html::a($this->createLink('testcase', 'zeroCase', "productID=$productID&branch=$branch&orderBy=id_desc&projectID=$projectID"), "<span class='text'>{$lang->testcase->zeroCase}</span>", '', "class='btn btn-link' id='zerocaseTab' data-app='{$this->app->tab}'");
     }
-    elseif($hasUnitPriv and $menuType == 'browseunits' and !$caseType)
-    {
-        echo html::a($this->createLink('testtask', 'browseUnits', "productID=$productID&browseType=newest&orderBy=id_desc&recTotal=0&recPerPage=20&pageID=1&projectID=$projectID"), "<span class='text'>{$lang->testcase->browseUnits}</span>", '', "class='btn btn-link' id='browseunitsTab' data-app='{$this->app->tab}'");
-    }
+
     ?>
     <?php endforeach;?>
     <?php
     if($this->methodName == 'browse') echo "<a id='bysearchTab' class='btn btn-link querybox-toggle'><i class='icon-search icon'></i> {$lang->testcase->bySearch}</a>";
     ?>
+    <?php endif;?>
   </div>
   <?php if(!isonlybody()):?>
   <div class='btn-toolbar pull-right'>
diff --git a/module/testtask/view/browseunits.html.php b/module/testtask/view/browseunits.html.php
index cfc0c25e29..bf2d75c498 100644
--- a/module/testtask/view/browseunits.html.php
+++ b/module/testtask/view/browseunits.html.php
@@ -19,21 +19,6 @@
 #action-divider{display: inline-block; line-height: 0px; border-right: 2px solid #ddd}
 </style>
 <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' data-app='{$this->app->tab}'");?>
-        <?php endforeach;?>
-        </div>
-      </div>
-    </div>
-  </div>
-
   <div class="main-col main-table">
     <?php if(empty($tasks)):?>
     <div class="table-empty-tip">
@@ -94,8 +79,7 @@
 <script>
 $(function()
 {
-    $('#<?php echo $browseType?>UnitTab').addClass('selected');
-    $('#browseunitsTab').addClass('btn-active-text');
+    $('#<?php echo $browseType?>UnitTab').addClass('btn-active-text');
 })
 </script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/zanode/lang/zh-cn.php b/module/zanode/lang/zh-cn.php
index 6be9ce2a51..8109523a4e 100644
--- a/module/zanode/lang/zh-cn.php
+++ b/module/zanode/lang/zh-cn.php
@@ -43,7 +43,7 @@ $lang->zanode->actionSuccess   = '操作成功';
 $lang->zanode->deleted         = "已删除";
 $lang->zanode->scriptPath      = "脚本目录";
 $lang->zanode->shell           = "shell命令";
-$lang->zanode->automation      = "自动化测试";
+$lang->zanode->automation      = "自动化设置";
 $lang->zanode->install         = "安装";
 $lang->zanode->copy            = '复制';
 $lang->zanode->copied          = '复制成功';