diff --git a/VERSION b/VERSION
index be6d30b351..5576d55de8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.beta1
+6.0.stable
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 45415c0f59..64cef9810f 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -61,7 +61,7 @@ js::set('moduleID', $moduleID);
   <div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
 </div>
 <div class='side' id='treebox'>
-  <a class='side-handle' data-id='storyTree'><i class='icon-caret-left'></i></a>
+  <a class='side-handle' data-id='bugTree'><i class='icon-caret-left'></i></a>
   <div class='side-body'>
     <div class='panel panel-sm'>
       <div class='panel-heading nobr'>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 4b0d6ea0f9..e615a63f62 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -19,7 +19,7 @@
 <?php js::set('browseType', $browseType);?>
 
 <div class='side' id='taskTree'>
-  <a class='side-handle' data-id='storyTree'><i class='icon-caret-left'></i></a>
+  <a class='side-handle' data-id='projectTree'><i class='icon-caret-left'></i></a>
   <div class='side-body'>
     <div class='panel panel-sm'>
       <div class='panel-heading nobr'>
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index d72a99feca..1a62fc3f92 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -55,7 +55,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
   <div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
 </div>
 <div class='side' id='treebox'>
-  <a class='side-handle' data-id='storyTree'><i class='icon-caret-left'></i></a>
+  <a class='side-handle' data-id='testcaseTree'><i class='icon-caret-left'></i></a>
   <div class='side-body'>
     <div class='panel panel-sm'>
       <div class='panel-heading nobr'><?php echo html::icon($lang->icons['product']);?> <strong><?php echo $productName;?></strong></div>
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 34a6c65b64..ba5e83d9c9 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -205,7 +205,7 @@ class testtask extends control
      * @access public
      * @return void
      */
-    public function cases($taskID, $browseType = 'byModule', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function cases($taskID, $browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save the session. */
         $this->app->loadLang('testcase');
@@ -268,7 +268,7 @@ class testtask extends control
 
             $caseQuery = $this->loadModel('search')->replaceDynamic($caseQuery);
             $caseQuery = preg_replace('/`(\w+)`/', 't2.`$1`', $caseQuery);
-            $this->view->runs = $this->dao->select('t2.*,t1.*')->from(TABLE_TESTRUN)->alias('t1')
+            $this->view->runs = $this->dao->select('t2.*,t1.*, t2.version as caseVersion')->from(TABLE_TESTRUN)->alias('t1')
                 ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id')
                 ->where($caseQuery)
                 ->andWhere('t1.task')->eq($taskID)
diff --git a/module/testtask/js/cases.js b/module/testtask/js/cases.js
index d68454aa97..dcf9cc4af1 100644
--- a/module/testtask/js/cases.js
+++ b/module/testtask/js/cases.js
@@ -1,19 +1,3 @@
-function browseByModule(active)
-{
-    $('#bymoduleTab').addClass('active');
-    $('#' + active + 'Tab').removeClass('active');
-    $('#querybox').addClass('hidden');
-}
-
-/* Swtich to search module. */
-function browseBySearch(active)
-{
-    $('#querybox').removeClass('hidden');
-    $('#' + active + 'Tab').removeClass('active');
-    $('#bysearchTab').addClass('active');
-    $('#bymoduleTab').removeClass('active');
-}
-
 $(document).ready(function()
 {
     setModal4List('runCase', 'caseList', function(){$(".iframe").modalTrigger({width:1024, type:'iframe'});}, 1024);
@@ -21,9 +5,3 @@ $(document).ready(function()
     $('#module' + moduleID).addClass('active'); 
     if(browseType == 'bysearch') ajaxGetSearchForm();
 });
-
-$(document).ready(function()
-{
-    $('#' + browseType + 'Tab').addClass('active');
-    $('#module' + moduleID).addClass('active'); 
-});
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index f9ebd9f488..3770a97c5a 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -22,10 +22,9 @@ var moduleID   = '<?php echo $moduleID;?>';
   <div class='heading'><?php echo html::icon($lang->icons['usecase']);?></div>
   <nav class='nav'>
     <?php
-    echo "<li id='bymoduleTab' onclick=\"browseByModule('$browseType')\"><a href='#'>" . $lang->testtask->byModule . "</a></li> ";
     echo "<li id='allTab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=all&param=0"), $lang->testtask->allCases) . "</li>";
     echo "<li id='assignedtomeTab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=assignedtome&param=0"), $lang->testtask->assignedToMe) . "</li>";
-    echo "<li id='bysearchTab' onclick=\"browseBySearch('$browseType')\"><a href='#'><i class='icon-search icon'></i>&nbsp;{$lang->testcase->bySearch}</a></li> ";
+    echo "<li id='bysearchTab'><a href='#'><i class='icon-search icon'></i>&nbsp;{$lang->testcase->bySearch}</a></li> ";
     ?>
   </nav>
   <div class='actions'>
@@ -42,7 +41,7 @@ var moduleID   = '<?php echo $moduleID;?>';
   <div id='querybox' class='<?php if($browseType =='bysearch') echo 'show';?>'></div>
 </div>
 <div class='side' id='casesbox'>
-  <a class='side-handle' data-id='storyTree'><i class='icon-caret-left'></i></a>
+  <a class='side-handle' data-id='testtaskTree'><i class='icon-caret-left'></i></a>
   <div class='side-body'>
     <div class='panel panel-sm'>
       <div class='panel-heading nobr'><?php echo html::icon($lang->icons['product']);?> <strong><?php echo $productName;?></strong></div>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index a9ff529000..e4a9a2806b 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -432,6 +432,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 .sub-featurebar > .nav > li.active > a {color: #333; font-weight: bold;}
 
 #featurebar.with-sub > .nav > li.active > a {border: 1px solid #ddd; position: relative; border-bottom: none; background: #fff; padding: 2px 15px 5px}
+.treeview > li > a.active { font-weight:bold;}
 
 /* Title bar. */
 #titlebar {margin: -20px -20px 20px; background: #F8FAFE; border-bottom: 1px solid #e5e5e5; min-height: 46px; min-height: 20px\0; padding: 13px 20px; vertical-align: bottom; position: relative;}