diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 254f0d14e1..633fd06039 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -12,12 +12,12 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<?php $browseLink  = $app->session->caseList != false ? $app->session->caseList : $this->createLink('testcase', 'browse', "productID=$case->product");?>
+<?php $browseLink  = $app->session->caseList ? $app->session->caseList : $this->createLink('testcase', 'browse', "productID=$case->product");?>
 <?php js::set('sysurl', common::getSysUrl());?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <?php if(!isonlybody()):?>
-    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
+    <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary' data-app={$this->app->openApp}");?>
     <div class="divider"></div>
     <?php endif;?>
     <div class="page-title">
diff --git a/module/testtask/control.php b/module/testtask/control.php
index aacf722e68..316360a274 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -322,13 +322,16 @@ class testtask extends control
         $productID = $this->product->saveState($task->product, $this->products);
         if($this->app->openApp == 'project')
         {
+            $this->lang->scrum->menu->qa['subMenu']->testcase['subModule'] = 'testtask';
+            $this->lang->scrum->menu->qa['subMenu']->testtask['subModule'] = '';
             $this->loadModel('project')->setMenu($this->session->project);
+            $this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits');
         }
         else
         {
-            $this->loadModel('qa')->setMenu($this->products, $task->product);
+            $this->loadModel('qa')->setMenu($this->products, $productID);
+            $this->app->rawModule = 'testcase';
         }
-        $this->app->rawModule = 'testcase';
 
         /* Save session. */
         $this->session->set('caseList', $this->app->getURI(true), 'qa');
@@ -672,11 +675,15 @@ class testtask extends control
         /* Set menu. */
         if($this->app->openApp == 'project')
         {
+            $this->lang->scrum->menu->qa['subMenu']->testcase['subModule'] = 'testtask';
+            $this->lang->scrum->menu->qa['subMenu']->testtask['subModule'] = '';
             $this->loadModel('project')->setMenu($this->session->project);
+            $this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits');
         }
         else
         {
             $this->loadModel('qa')->setMenu($this->products, $productID, $task->branch, $taskID);
+            $this->app->rawModule = 'testcase';
         }
 
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->edit;
@@ -1279,19 +1286,23 @@ class testtask extends control
         }
 
         /* Set menu. */
+        $productID = $this->loadModel('product')->saveState($productID, $this->products);
         if($this->app->openApp == 'project')
         {
+            $this->lang->scrum->menu->qa['subMenu']->testcase['subModule'] = 'testtask';
+            $this->lang->scrum->menu->qa['subMenu']->testtask['subModule'] = '';
             $this->loadModel('project')->setMenu($this->session->project);
+            $this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits');
         }
         else
         {
             $this->loadModel('qa')->setMenu($this->products, $productID);
+            $this->app->rawModule = 'testcase';
         }
 
         $this->app->loadLang('job');
         $this->app->rawModule = 'testcase';
 
-        $productID  = $productID ? $productID : key($this->products);
         $projectID  = $this->app->openApp == 'qa' ? 0 : $this->session->project;
         $executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
         $builds     = empty($productID) ? array() : $this->loadModel('build')->getProductBuildPairs($productID, 0, 'notrunk');
diff --git a/module/testtask/view/browseunits.html.php b/module/testtask/view/browseunits.html.php
index 60bdf96b80..7e9c63ca74 100644
--- a/module/testtask/view/browseunits.html.php
+++ b/module/testtask/view/browseunits.html.php
@@ -27,7 +27,7 @@
       <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 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->openApp}'");?>
         <?php endforeach;?>
         </div>
       </div>
@@ -62,7 +62,7 @@
       <?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->name?>"><?php echo html::a(inlink('unitCases', "taskID=$task->id"), $task->name, '', "data-app={$this->app->openApp}");?></td>
         <td class='c-name' title="<?php echo $task->executionName?>"><?php echo $task->executionName?></td>
         <td class='c-name' title="<?php echo $task->buildName;?>"><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName, '', 'data-app="execution"');?></td>
         <td><?php echo zget($users, $task->owner);?></td>
@@ -72,12 +72,12 @@
         <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);
+          common::printIcon('testtask',  'unitCases', "taskID=$task->id", '', 'list', 'list-alt');
+          common::printIcon('testtask',  'edit', "taskID=$task->id", $task, 'list');
           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'");
+              echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-common-delete icon-trash"></i>', '', "title='{$lang->testcase->delete}' class='btn'");
           }
           ?>
         </td>
diff --git a/module/testtask/view/unitcases.html.php b/module/testtask/view/unitcases.html.php
index 7c15ede66c..d4056aa96c 100644
--- a/module/testtask/view/unitcases.html.php
+++ b/module/testtask/view/unitcases.html.php
@@ -24,7 +24,8 @@ js::set('flow', $config->global->flow);
 <?php if($config->global->flow == 'full'):?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php common::printBack($this->createLink('testtask', 'browseUnits'), 'btn btn-primary');?>
+    <?php $browseLink = $this->session->testtaskList ? $this->session->testtaskList : $this->createLink('testtask', 'browseUnits');?>
+    <?php echo html::a($browseLink, '<i class="icon-goback icon-back"></i> ' . $lang->goback, '', "class='btn btn-secondary' data-app={$this->app->openApp}");?>
     <?php if(isonlybody()) echo "<div class='page-title'>{$task->name}</div>";?>
   </div>
   <div class='btn-toolbar pull-right <?php if(isonlybody()) echo 'hidden';?>'>