diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index e62640dbfd..bc525b3178 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -150,7 +150,6 @@ $lang->story->legendChildStories   = 'Child story';
 $lang->story->legendSpec           = 'Spec';
 $lang->story->legendVerify         = 'Verify standard';
 $lang->story->legendHistory        = 'History';
-$lang->story->legendVersion        = 'Versions';
 $lang->story->legendMisc           = 'Misc';
 
 $lang->story->lblChange            = 'Change';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index dbacacfe3e..c0ca87da93 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -150,7 +150,6 @@ $lang->story->legendChildStories   = '细分需求';
 $lang->story->legendSpec           = '需求描述';
 $lang->story->legendVerify         = '验收标准';
 $lang->story->legendHistory        = '历史记录';
-$lang->story->legendVersion        = '历史版本';
 $lang->story->legendMisc           = '其他相关';
 
 $lang->story->lblChange            = '变更需求';
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 49067a15be..cf245872c0 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -13,7 +13,21 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <div id='titlebar'>
-  <div id='main' <?php if($story->deleted) echo "class='deleted'";?>>STORY #<?php echo $story->id . ' ' . $story->title;?></div>
+  <div id='main' <?php if($story->deleted) echo "class='deleted'";?>>STORY #<?php echo $story->id . ' ' . $story->title;?>
+  <?php if($story->version > 1):?>
+  <span class='f-12px gray'>
+    <?php
+    echo "("; 
+    for($i = $story->version; $i >= 1; $i --)
+    {
+        $class = $i == $version ? "class='blue'" : "class='gray'";
+        echo html::a(inlink('view', "storyID=$story->id&version=$i"), '#' . $i, '', "$class"); 
+    }
+    echo ")";
+    ?>
+  </span>
+  <?php endif;?>
+  </div>
   <div>
   <?php
   $browseLink  = $app->session->storyList != false ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product&moduleID=$story->module");
@@ -52,10 +66,6 @@
 <table class='cont-rt5'>
   <tr valign='top'>
     <td>
-      <fieldset>
-        <legend><?php echo $lang->story->legendVersion;?></legend>
-        <div><?php for($i = $story->version; $i >= 1; $i --) echo html::a(inlink('view', "storyID=$story->id&version=$i"), "#$i");?></div>
-      </fieldset>
       <fieldset>
         <legend><?php echo $lang->story->legendSpec;?></legend>
         <div class='content'><?php echo $story->spec;?></div>
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 72efe4e41b..83415b9aca 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -336,6 +336,7 @@ class testcase extends control
         $this->view->position[] = $this->lang->testcase->view;
 
         $this->view->case           = $case;
+        $this->view->version        = $version ? $version : $case->version;
         $this->view->productName    = $this->products[$productID];
         $this->view->modulePath     = $this->tree->getParents($case->module);
         $this->view->users          = $this->user->getPairs('noletter');
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index aa9b76d156..1589cdabee 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -97,7 +97,6 @@ $lang->testcase->legendAction       = 'Action';
 $lang->testcase->legendHistory      = 'History';
 $lang->testcase->legendComment      = 'Comment';
 $lang->testcase->legendProduct      = 'Product & module';
-$lang->testcase->legendVersion      = 'Versions';
 
 $lang->testcase->confirmDelete = 'Are you sure to delete this case?';
 $lang->testcase->same          = 'The same as above';
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 8d849b832f..5f821f53b8 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -97,7 +97,6 @@ $lang->testcase->legendAction       = '操作';
 $lang->testcase->legendHistory      = '历史记录';
 $lang->testcase->legendComment      = '备注';
 $lang->testcase->legendProduct      = '产品模块';
-$lang->testcase->legendVersion      = '版本历史';
 
 $lang->testcase->confirmDelete = '您确认要删除该测试用例吗？';
 $lang->testcase->same          = '同上';
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 648b377881..67e18db8aa 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -14,7 +14,22 @@
 <?php include '../../common/view/colorize.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <div id='titlebar'>
-  <div id='main' <?php if($case->deleted) echo "class='deleted'";?>>CASE #<?php echo $case->id . ' ' . $case->title;?></div>
+  <div id='main' <?php if($case->deleted) echo "class='deleted'";?>>
+    CASE #<?php echo $case->id . ' ' . $case->title;?>
+    <?php if($case->version > 1):?>
+    <span class='f-12px gray'>
+      <?php
+      echo "("; 
+      for($i = $case->version; $i >= 1; $i --)
+      {
+          $class = $i == $version ? "class='blue'" : "class='gray'";
+          echo html::a(inlink('view', "caseID=$case->id&version=$i"), '#' . $i, '', "$class"); 
+      }
+      echo ")";
+      ?>
+    </span>
+    <?php endif;?>
+  </div>
   <div>
     <?php
     $browseLink  = $app->session->caseList != false ? $app->session->caseList : $this->createLink('testcase', 'browse', "productID=$case->product");
@@ -52,12 +67,6 @@
 <table class='cont-rt5'>
   <tr valign='top'>
     <td>
-      <fieldset>
-        <legend><?php echo $lang->testcase->legendVersion;?></legend>
-        <div>
-          <?php for($i = $case->version; $i >= 1; $i --) echo html::a(inlink('view', "caseID=$case->id&version=$i"), '#' . $i) . ' ';?>    
-        </div>
-      </fieldset>
       <fieldset>
         <legend><?php echo $lang->testcase->precondition;?></legend>
         <?php echo $case->precondition;?>