diff --git a/module/task/js/create.js b/module/task/js/create.js
index 3937dcb3bb..7f614dd300 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -49,7 +49,7 @@ function loadProjectStories(projectID)
     {
         $('#story_chosen').remove();
         $('#story').replaceWith(data);
-        $('#story').chosen();
+        $('#story').addClass('filled').chosen();
     });
 }
 
@@ -226,7 +226,7 @@ function setStories(moduleID, projectID)
         $('#story').val(storyID);
         setPreview();
         $('#story_chosen').remove();
-        $("#story").chosen();
+        $("#story").addClass('filled').chosen();
     });
 }
 
diff --git a/module/task/model.php b/module/task/model.php
index 5a76b90919..8c05de8d9f 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -111,27 +111,30 @@ class taskModel extends model
             {
                 $testStoryIdList = array();
                 $this->loadModel('action');
-                foreach($this->post->testStory as $storyID)
+                if($this->post->testStory)
                 {
-                    if($storyID) $testStoryIdList[$storyID] = $storyID;
-                }
-                $testStories = $this->dao->select('id,title')->from(TABLE_STORY)->where('id')->in($testStoryIdList)->fetchPairs('id', 'title');
-                foreach($this->post->testStory as $i => $storyID)
-                {
-                    if(!isset($testStories[$storyID])) continue;
+                    foreach($this->post->testStory as $storyID)
+                    {
+                        if($storyID) $testStoryIdList[$storyID] = $storyID;
+                    }
+                    $testStories = $this->dao->select('id,title')->from(TABLE_STORY)->where('id')->in($testStoryIdList)->fetchPairs('id', 'title');
+                    foreach($this->post->testStory as $i => $storyID)
+                    {
+                        if(!isset($testStories[$storyID])) continue;
 
-                    $task->parent     = $taskID;
-                    $task->story      = $storyID;
-                    $task->name       = $this->lang->task->lblTestStory . " #{$storyID} " . zget($testStories, $storyID);
-                    $task->pri        = $this->post->testPri[$i];
-                    $task->estStarted = $this->post->testEstStarted[$i];
-                    $task->deadline   = $this->post->testDeadline[$i];
-                    $task->assignedTo = $this->post->testAssignedTo[$i];
-                    $task->estimate   = $this->post->testEstimate[$i];
-                    $this->dao->insert(TABLE_TASK)->data($task)->exec();
+                        $task->parent     = $taskID;
+                        $task->story      = $storyID;
+                        $task->name       = $this->lang->task->lblTestStory . " #{$storyID} " . zget($testStories, $storyID);
+                        $task->pri        = $this->post->testPri[$i];
+                        $task->estStarted = $this->post->testEstStarted[$i];
+                        $task->deadline   = $this->post->testDeadline[$i];
+                        $task->assignedTo = $this->post->testAssignedTo[$i];
+                        $task->estimate   = $this->post->testEstimate[$i];
+                        $this->dao->insert(TABLE_TASK)->data($task)->exec();
 
-                    $childTaskID = $this->dao->lastInsertID();
-                    $this->action->create('task', $childTaskID, 'Opened');
+                        $childTaskID = $this->dao->lastInsertID();
+                        $this->action->create('task', $childTaskID, 'Opened');
+                    }
                 }
 
                 $this->computeWorkingHours($taskID);
@@ -1386,13 +1389,14 @@ class taskModel extends model
             ->remove('comment,files,labels,currentConsumed')
             ->get();
 
-        if(!is_numeric($this->post->currentConsumed))
+        $currentConsumed = trim($this->post->currentConsumed);
+        if(!is_numeric($currentConsumed))
         {
             dao::$errors[] = $this->lang->task->error->consumedNumber;
             return false;
         }
 
-        if(!$this->post->currentConsumed)
+        if(empty($currentConsumed))
         {
             dao::$errors[] = $this->lang->task->error->consumedEmpty;
             return false;
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 37fbeb868d..e7c0bb5379 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -505,8 +505,11 @@ class testcase extends control
 
             $results = $this->testtask->getResults($run->id);
             $result  = array_shift($results);
-            $case->xml      = $result->xml;
-            $case->duration = $result->duration;
+            if($result)
+            {
+                $case->xml      = $result->xml;
+                $case->duration = $result->duration;
+            }
         }
 
         $branches  = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($case->product);
diff --git a/module/testcase/css/view.css b/module/testcase/css/view.css
index 8c667e34d5..f99291b58e 100644
--- a/module/testcase/css/view.css
+++ b/module/testcase/css/view.css
@@ -1,6 +1,2 @@
-#steps {margin-bottom: 15px}
-.outer .col-side{transition: all 0.1s;position: relative;}
-.outer.hide-side .col-side{width:0px;}
-.outer .col-side .side-handle{right:0px;top:10px;}
-.outer.hide-side .main-side{display:none;}
 .table-fixed td{white-space: unset;}
+#tabsNav .tab-pane>.cell + .cell {border-top:1px solid #cbd0db; border-radius:4px;}
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 47967a8ebc..b6728e46ae 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -52,294 +52,300 @@
   <?php endif;?>
 </div>
 
-<div id="mainContent" class="main-row">
-  <div class='main-col col-8'>
-    <div class='cell' style='word-break:break-all'>
-      <?php if($case->auto != 'unit'):?>
-      <div class='detail'>
-        <div class='detail-title'><?php echo $lang->testcase->precondition;?></div>
-        <div class="detail-content article-content"><?php echo nl2br($case->precondition);?></div>
-      </div>
-      <?php endif;?>
-      <div class='detail'>
-        <div class='detail-title'><?php echo $lang->testcase->steps;?></div>
-        <div class="detail-content">
-          <table class='table table-condensed table-hover table-striped table-bordered' id='steps'>
-            <thead>
-              <tr>
-                <th class='w-50px'><?php echo $lang->testcase->stepID;?></th>
-                <th class='w-p60 text-left'><?php echo $lang->testcase->stepDesc;?></th>
-                <th class='text-left'><?php echo $lang->testcase->stepExpect;?></th>
-              </tr>
-            </thead>
-            <?php
-            $stepId = $childId = 0;
-            foreach($case->steps as $stepID => $step)
-            {
-                $stepClass = "step-{$step->type}";
-                if($step->type == 'group' or $step->type == 'step')
+<div id="mainContent" class="main-content">
+  <div class='tabs' id='tabsNav'>
+    <ul class='nav nav-tabs'>
+      <li class='active'><a href='#steps' data-toggle='tab'><?php echo $lang->testcase->steps;?></a></li>
+      <li><a href='#basic' data-toggle='tab'><?php echo  $lang->testcase->legendBasicInfo;?></a></li>
+    </ul>
+    <div class='tab-content'>
+      <div id='steps' class='tab-pane active'>
+        <div class='cell' style='word-break:break-all'>
+          <?php if($case->auto != 'unit'):?>
+          <div class='detail'>
+            <div class='detail-title'><?php echo $lang->testcase->precondition;?></div>
+            <div class="detail-content article-content"><?php echo nl2br($case->precondition);?></div>
+          </div>
+          <?php endif;?>
+          <div class='detail'>
+            <div class='detail-title'><?php echo $lang->testcase->steps;?></div>
+            <div class="detail-content">
+              <table class='table table-condensed table-hover table-striped table-bordered' id='steps'>
+                <thead>
+                  <tr>
+                    <th class='w-50px'><?php echo $lang->testcase->stepID;?></th>
+                    <th class='w-p60 text-left'><?php echo $lang->testcase->stepDesc;?></th>
+                    <th class='text-left'><?php echo $lang->testcase->stepExpect;?></th>
+                  </tr>
+                </thead>
+                <?php
+                $stepId = $childId = 0;
+                foreach($case->steps as $stepID => $step)
                 {
-                    $stepId++;
-                    $childId = 0;
+                    $stepClass = "step-{$step->type}";
+                    if($step->type == 'group' or $step->type == 'step')
+                    {
+                        $stepId++;
+                        $childId = 0;
+                    }
+                    if($step->type == 'step') $stepClass = 'step-group';
+                    echo "<tr class='step {$stepClass}'>";
+                    echo "<th class='step-id'>$stepId</th>";
+                    echo "<td class='text-left'><div class='input-group'>";
+                    if($step->type == 'item') echo "<span class='step-item-id'>{$stepId}.{$childId}</span>";
+                    echo nl2br(str_replace(' ', '&nbsp;', $step->desc)) . "</td>";
+                    echo "<td class='text-left'>" . nl2br(str_replace(' ', '&nbsp;', $step->expect)) . "</div></td>";
+                    echo "</tr>";
+                    $childId ++;
                 }
-                if($step->type == 'step') $stepClass = 'step-group';
-                echo "<tr class='step {$stepClass}'>";
-                echo "<th class='step-id'>$stepId</th>";
-                echo "<td class='text-left'><div class='input-group'>";
-                if($step->type == 'item') echo "<span class='step-item-id'>{$stepId}.{$childId}</span>";
-                echo nl2br(str_replace(' ', '&nbsp;', $step->desc)) . "</td>";
-                echo "<td class='text-left'>" . nl2br(str_replace(' ', '&nbsp;', $step->expect)) . "</div></td>";
-                echo "</tr>";
-                $childId ++;
-            }
-            ?>
-          </table>
+                ?>
+              </table>
+            </div>
+          </div>
+          <?php if(!empty($case->xml)):?>
+          <div class='detail'>
+            <div class='detail-title'><?php echo $lang->testcase->xml;?></div>
+            <div class="detail-content article-content"><?php echo nl2br(htmlspecialchars($case->xml));?></div>
+          </div>
+          <?php endif;?>
+          <?php echo $this->fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?>
         </div>
+        <?php $this->printExtendFields($case, 'div', "position=left&inForm=0&inCell=1");?>
+        <div class='cell'><?php include '../../common/view/action.html.php';?></div>
       </div>
-      <?php if(isset($case->xml)):?>
-      <div class='detail'>
-        <div class='detail-title'><?php echo $lang->testcase->xml;?></div>
-        <div class="detail-content article-content"><?php echo nl2br(htmlspecialchars($case->xml));?></div>
-      </div>
-      <?php endif;?>
-      <?php echo $this->fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?>
-    </div>
-    <?php $this->printExtendFields($case, 'div', "position=left&inForm=0&inCell=1");?>
-    <div class='cell'><?php include '../../common/view/action.html.php';?></div>
-    <div class='main-actions'>
-      <div class="btn-toolbar">
-        <?php common::printBack($browseLink);?>
-        <?php if(!$case->deleted):?>
-        <?php if(!isonlybody()) echo "<div class='divider'></div>";?>
-        <?php
-        if(!$isLibCase)
-        {
-            if(!isonlybody()) echo "<div class='divider'></div>";
-            common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", $case, 'button', '', '', 'showinonlybody iframe', false, "data-width='95%'");
-            common::printIcon('testtask', 'results', "runID=$runID&caseID=$case->id&version=$case->version", $case, 'button', '', '', 'showinonlybody iframe', false, "data-width='95%'");
+      <div id='basic' class='tab-pane'>
+        <div class="cell">
+          <details class="detail" open>
+            <summary class="detail-title"><?php echo $lang->testcase->legendBasicInfo;?></summary>
+            <div class="detail-content">
+              <table class='table table-data'>
+                <?php if($isLibCase):?>
+                <tr>
+                  <th class='thWidth'><?php echo $lang->testcase->lib;?></th>
+                  <td><?php if(!common::printLink('caselib', 'browse', "libID=$case->lib", $libName)) echo $libName;?></td>
+                </tr>
+                <?php else:?>
+                <tr>
+                  <th class='thWidth'><?php echo $lang->testcase->product;?></th>
+                  <td><?php if(!common::printLink('testcase', 'browse', "productID=$case->product", $productName)) echo $productName;?></td>
+                </tr>
+                <?php if($this->session->currentProductType != 'normal'):?>
+                <tr>
+                  <th><?php echo $lang->product->branch;?></th>
+                  <td><?php if(!common::printLink('testcase', 'browse', "productID=$case->product&branch=$case->branch", $branchName)) echo $branchName;?></td>
+                </tr>
+                <?php endif;?>
+                <?php endif;?>
+                <tr>
+                  <th><?php echo $lang->testcase->module;?></th>
+                  <td>
+                    <?php
+                    if(empty($modulePath))
+                    {
+                        echo "/";
+                    }
+                    else
+                    {
+                        if($caseModule->branch and isset($branches[$caseModule->branch]))
+                        {
+                            echo $branches[$caseModule->branch] . $lang->arrow;
+                        }
 
-            if($caseFails > 0) common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=$runID", $case, 'button', 'bug', '', 'iframe', '', "data-width='90%'");
-        }
-        if($config->testcase->needReview or !empty($config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'button', '', '', 'iframe', '', '', $lang->testcase->reviewAB);
-        ?>
-
-        <?php echo $this->buildOperateMenu($case, 'view');?>
-
-        <?php
-        common::printIcon('testcase', 'edit',"caseID=$case->id", $case, 'button', '', '', 'showinonlybody');
-        if(!$isLibCase and $case->auto != 'unit') common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$case->id", $case, 'button', 'copy');
-        if($isLibCase and common::hasPriv('caselib', 'createCase')) echo html::a($this->createLink('caselib', 'createCase', "libID=$case->lib&moduleID=$case->module&param=$case->id", $case), "<i class='icon-copy'></i>", '', "class='btn' title='{$lang->testcase->copy}'");
-        common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'button', 'trash', 'hiddenwin', 'showinonlybody');
-        ?>
+                        foreach($modulePath as $key => $module)
+                        {
+                            if(!common::printLink('testcase', 'browse', "productID=$case->product&branch=$module->branch&browseType=byModule&param=$module->id", $module->name)) echo $module->name;
+                            if(isset($modulePath[$key + 1])) echo $lang->arrow;
+                        }
+                    }
+                    ?>
+                  </td>
+                </tr>
+                <?php if(!$isLibCase and $config->global->flow != 'onlyTest'):?>
+                <tr class='nofixed'>
+                  <th><?php echo $lang->testcase->story;?></th>
+                  <td>
+                    <?php
+                    if(isset($case->storyTitle)) echo html::a($this->createLink('story', 'view', "storyID=$case->story", '', true), "#$case->story:$case->storyTitle", '', "class='iframe' data-width='80%'");
+                    if($case->story and $case->storyStatus == 'active' and $case->latestStoryVersion > $case->storyVersion)
+                    {
+                        echo "(<span class='warning'>{$lang->story->changed}</span> ";
+                        if(common::hasPriv('testcase', 'confirmStoryChange')) echo html::a($this->createLink('testcase', 'confirmStoryChange', "caseID=$case->id"), $lang->confirm, 'hiddenwin');
+                        echo ")";
+                    }
+                    ?>
+                  </td>
+                </tr>
+                <?php endif;?>
+                <tr>
+                  <th><?php echo $lang->testcase->type;?></th>
+                  <td><?php echo $lang->testcase->typeList[$case->type];?></td>
+                </tr>
+                <tr>
+                  <th><?php echo $lang->testcase->stage;?></th>
+                  <td>
+                    <?php
+                    if($case->stage)
+                    {
+                        $stags = explode(',', $case->stage);
+                        foreach($stags as $stage)
+                        {
+                            if(empty($stage)) continue;
+                            isset($lang->testcase->stageList[$stage]) ? print($lang->testcase->stageList[$stage]) : print($stage);
+                            echo "<br />";
+                        }
+                    }
+                    ?>
+                  </td>
+                </tr>
+                <tr>
+                  <th><?php echo $lang->testcase->pri;?></th>
+                  <td><span class='label-pri label-pri-<?php echo $case->pri;?>' title='<?php echo zget($lang->testcase->priList, $case->pri);?>'><?php echo zget($lang->testcase->priList, $case->pri)?></span></td>
+                </tr>
+                <tr>
+                  <th><?php echo $lang->testcase->status;?></th>
+                  <td>
+                    <?php
+                    echo $this->processStatus($from != 'testtask' ? 'testcase' : 'testtask', $case);
+                    if($case->version > $case->currentVersion and $from == 'testtask')
+                    {
+                        echo "(<span class='warning' title={$lang->testcase->fromTesttask}>{$lang->testcase->changed}</span> ";
+                        if(common::hasPriv('testcase', 'confirmchange')) echo html::a($this->createLink('testcase', 'confirmchange', "caseID=$case->id&taskID=$taskID"), $lang->testcase->sync, 'hiddenwin', "class='btn btn-mini btn-info'");
+                        echo ")";
+                    }
+                    if(isset($case->fromCaseVersion) and $case->fromCaseVersion > $case->version and $from != 'testtask')
+                    {
+                        echo "(<span class='warning' title={$lang->testcase->fromCaselib}>{$lang->testcase->changed}</span> ";
+                        if(common::hasPriv('testcase', 'confirmLibcaseChange')) echo html::a($this->createLink('testcase', 'confirmLibcaseChange', "caseID=$case->id&libcaseID=$case->fromCaseID"), $lang->testcase->sync, 'hiddenwin', "class='btn btn-mini btn-info'");
+                        if(common::hasPriv('testcase', 'ignoreLibcaseChange')) echo html::a($this->createLink('testcase', 'ignoreLibcaseChange', "caseID=$case->id"), $lang->testcase->ignore, 'hiddenwin', "class='btn btn-mini btn-info'");
+                        echo ")";
+                    }
+                    ?>
+                  </td>
+                </tr>
+                <?php if(!$isLibCase):?>
+                 <tr>
+                  <th><?php echo $this->app->loadLang('testtask')->testtask->lastRunTime;?></th>
+                  <td><?php if(!helper::isZeroDate($case->lastRunDate)) echo $case->lastRunDate;?></td>
+                </tr>
+                <tr>
+                  <th><?php echo $this->app->loadLang('testtask')->testtask->lastRunResult;?></th>
+                  <td><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
+                </tr>
+                <?php endif;?>
+                <tr>
+                  <th><?php echo $lang->testcase->keywords;?></th>
+                  <td><?php echo $case->keywords;?></td>
+                </tr>
+                <?php if(!$isLibCase):?>
+                <tr>
+                  <th><?php echo $lang->testcase->linkCase;?></th>
+                  <td>
+                    <?php
+                    if(isset($case->linkCaseTitles))
+                    {
+                        foreach($case->linkCaseTitles as $linkCaseID => $linkCaseTitle)
+                        {
+                            echo html::a($this->createLink('testcase', 'view', "caseID=$linkCaseID", '', true), "#$linkCaseID $linkCaseTitle", '', "class='iframe' data-width='80%'") . '<br />';
+                        }
+                    }
+                    ?>
+                  </td>
+                </tr>
+                <?php endif;?>
+              </table>
+            </div>
+          </details>
+        </div>
+        <?php if(!$isLibCase):?>
+        <div class="cell">
+          <details class="detail" open>
+            <summary class="detail-title"><?php echo $lang->testcase->legendLinkBugs;?></summary>
+            <div class="detail-content">
+              <table class='table table-data'>
+                <?php if($case->fromBug):?>
+                <tr>
+                  <th class='thWidth'><?php echo $lang->testcase->fromBug;?></th>
+                  <td><?php echo html::a($this->createLink('bug', 'view', "bugID=$case->fromBug", '', true), $case->fromBugTitle, '', "class='iframe' data-width='80%'");?></td>
+                </tr>
+                <?php endif;?>
+                <?php if($case->toBugs):?>
+                <tr>
+                  <th class='thWidth' valign="top"><?php echo $lang->testcase->toBug;?></th>
+                  <td>
+                  <?php
+                  foreach($case->toBugs as $bugID => $bugTitle)
+                  {
+                      echo '<p style="margin-bottom:0;">' . html::a($this->createLink('bug', 'view', "bugID=$bugID", '', true), $bugTitle, '', "class='iframe' data-width='80%'") . '</p>';
+                  }
+                  ?>
+                  </td>
+                </tr>
+                <?php endif;?>
+              </table>
+            </div>
+          </details>
+        </div>
         <?php endif;?>
+        <div class="cell">
+          <details class="detail" open>
+            <summary class="detail-title"><?php echo $lang->testcase->legendOpenAndEdit;?></summary>
+            <div class="detail-content">
+              <table class='table table-data'>
+                <tr>
+                  <th class='lifeThWidth'><?php echo $lang->testcase->openedBy;?></th>
+                  <td><?php echo zget($users, $case->openedBy) . $lang->at . $case->openedDate;?></td>
+                </tr>
+                <?php if($config->testcase->needReview or !empty($config->testcase->forceReview)):?>
+                <tr>
+                  <th><?php echo $lang->testcase->reviewedBy;?></th>
+                  <td><?php $reviewedBy = explode(',', $case->reviewedBy); foreach($reviewedBy as $account) echo ' ' . zget($users, trim($account)); ?></td>
+                </tr>
+                <tr>
+                  <th><?php echo $lang->testcase->reviewedDate;?></th>
+                  <td><?php if($case->reviewedBy) echo $case->reviewedDate;?></td>
+                </tr>
+                <?php endif;?>
+                <tr>
+                  <th><?php echo $lang->testcase->lblLastEdited;?></th>
+                  <td><?php if($case->lastEditedBy) echo zget($users, $case->lastEditedBy) . $lang->at . $case->lastEditedDate;?></td>
+                </tr>
+              </table>
+            </div>
+          </details>
+        </div>
+        <?php $this->printExtendFields($case, 'div', "position=right&inForm=0&inCell=1");?>
       </div>
     </div>
   </div>
-  <div class='side-col col-4'>
-    <div class="cell">
-      <details class="detail" open>
-        <summary class="detail-title"><?php echo $lang->testcase->legendBasicInfo;?></summary>
-        <div class="detail-content">
-          <table class='table table-data'>
-            <?php if($isLibCase):?>
-            <tr>
-              <th class='thWidth'><?php echo $lang->testcase->lib;?></th>
-              <td><?php if(!common::printLink('caselib', 'browse', "libID=$case->lib", $libName)) echo $libName;?></td>
-            </tr>
-            <?php else:?>
-            <tr>
-              <th class='thWidth'><?php echo $lang->testcase->product;?></th>
-              <td><?php if(!common::printLink('testcase', 'browse', "productID=$case->product", $productName)) echo $productName;?></td>
-            </tr>
-            <?php if($this->session->currentProductType != 'normal'):?>
-            <tr>
-              <th><?php echo $lang->product->branch;?></th>
-              <td><?php if(!common::printLink('testcase', 'browse', "productID=$case->product&branch=$case->branch", $branchName)) echo $branchName;?></td>
-            </tr>
-            <?php endif;?>
-            <?php endif;?>
-            <tr>
-              <th><?php echo $lang->testcase->module;?></th>
-              <td>
-                <?php
-                if(empty($modulePath))
-                {
-                    echo "/";
-                }
-                else
-                {
-                    if($caseModule->branch and isset($branches[$caseModule->branch]))
-                    {
-                        echo $branches[$caseModule->branch] . $lang->arrow;
-                    }
-
-                    foreach($modulePath as $key => $module)
-                    {
-                        if(!common::printLink('testcase', 'browse', "productID=$case->product&branch=$module->branch&browseType=byModule&param=$module->id", $module->name)) echo $module->name;
-                        if(isset($modulePath[$key + 1])) echo $lang->arrow;
-                    }
-                }
-                ?>
-              </td>
-            </tr>
-            <?php if(!$isLibCase and $config->global->flow != 'onlyTest'):?>
-            <tr class='nofixed'>
-              <th><?php echo $lang->testcase->story;?></th>
-              <td>
-                <?php
-                if(isset($case->storyTitle)) echo html::a($this->createLink('story', 'view', "storyID=$case->story", '', true), "#$case->story:$case->storyTitle", '', "class='iframe' data-width='80%'");
-                if($case->story and $case->storyStatus == 'active' and $case->latestStoryVersion > $case->storyVersion)
-                {
-                    echo "(<span class='warning'>{$lang->story->changed}</span> ";
-                    if(common::hasPriv('testcase', 'confirmStoryChange')) echo html::a($this->createLink('testcase', 'confirmStoryChange', "caseID=$case->id"), $lang->confirm, 'hiddenwin');
-                    echo ")";
-                }
-                ?>
-              </td>
-            </tr>
-            <?php endif;?>
-            <tr>
-              <th><?php echo $lang->testcase->type;?></th>
-              <td><?php echo $lang->testcase->typeList[$case->type];?></td>
-            </tr>
-            <tr>
-              <th><?php echo $lang->testcase->stage;?></th>
-              <td>
-                <?php
-                if($case->stage)
-                {
-                    $stags = explode(',', $case->stage);
-                    foreach($stags as $stage)
-                    {
-                        if(empty($stage)) continue;
-                        isset($lang->testcase->stageList[$stage]) ? print($lang->testcase->stageList[$stage]) : print($stage);
-                        echo "<br />";
-                    }
-                }
-                ?>
-              </td>
-            </tr>
-            <tr>
-              <th><?php echo $lang->testcase->pri;?></th>
-              <td><span class='label-pri label-pri-<?php echo $case->pri;?>' title='<?php echo zget($lang->testcase->priList, $case->pri);?>'><?php echo zget($lang->testcase->priList, $case->pri)?></span></td>
-            </tr>
-            <tr>
-              <th><?php echo $lang->testcase->status;?></th>
-              <td>
-                <?php
-                echo $this->processStatus($from != 'testtask' ? 'testcase' : 'testtask', $case);
-                if($case->version > $case->currentVersion and $from == 'testtask')
-                {
-                    echo "(<span class='warning' title={$lang->testcase->fromTesttask}>{$lang->testcase->changed}</span> ";
-                    if(common::hasPriv('testcase', 'confirmchange')) echo html::a($this->createLink('testcase', 'confirmchange', "caseID=$case->id&taskID=$taskID"), $lang->testcase->sync, 'hiddenwin', "class='btn btn-mini btn-info'");
-                    echo ")";
-                }
-                if(isset($case->fromCaseVersion) and $case->fromCaseVersion > $case->version and $from != 'testtask')
-                {
-                    echo "(<span class='warning' title={$lang->testcase->fromCaselib}>{$lang->testcase->changed}</span> ";
-                    if(common::hasPriv('testcase', 'confirmLibcaseChange')) echo html::a($this->createLink('testcase', 'confirmLibcaseChange', "caseID=$case->id&libcaseID=$case->fromCaseID"), $lang->testcase->sync, 'hiddenwin', "class='btn btn-mini btn-info'");
-                    if(common::hasPriv('testcase', 'ignoreLibcaseChange')) echo html::a($this->createLink('testcase', 'ignoreLibcaseChange', "caseID=$case->id"), $lang->testcase->ignore, 'hiddenwin', "class='btn btn-mini btn-info'");
-                    echo ")";
-                }
-                ?>
-              </td>
-            </tr>
-            <?php if(!$isLibCase):?>
-             <tr>
-              <th><?php echo $this->app->loadLang('testtask')->testtask->lastRunTime;?></th>
-              <td><?php if(!helper::isZeroDate($case->lastRunDate)) echo $case->lastRunDate;?></td>
-            </tr>
-            <tr>
-              <th><?php echo $this->app->loadLang('testtask')->testtask->lastRunResult;?></th>
-              <td><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
-            </tr>
-            <?php endif;?>
-            <tr>
-              <th><?php echo $lang->testcase->keywords;?></th>
-              <td><?php echo $case->keywords;?></td>
-            </tr>
-            <?php if(!$isLibCase):?>
-            <tr>
-              <th><?php echo $lang->testcase->linkCase;?></th>
-              <td>
-                <?php
-                if(isset($case->linkCaseTitles))
-                {
-                    foreach($case->linkCaseTitles as $linkCaseID => $linkCaseTitle)
-                    {
-                        echo html::a($this->createLink('testcase', 'view', "caseID=$linkCaseID", '', true), "#$linkCaseID $linkCaseTitle", '', "class='iframe' data-width='80%'") . '<br />';
-                    }
-                }
-                ?>
-              </td>
-            </tr>
-            <?php endif;?>
-          </table>
-        </div>
-      </details>
-    </div>
-    <?php if(!$isLibCase):?>
-    <div class="cell">
-      <details class="detail" open>
-        <summary class="detail-title"><?php echo $lang->testcase->legendLinkBugs;?></summary>
-        <div class="detail-content">
-          <table class='table table-data'>
-            <?php if($case->fromBug):?>
-            <tr>
-              <th class='thWidth'><?php echo $lang->testcase->fromBug;?></th>
-              <td><?php echo html::a($this->createLink('bug', 'view', "bugID=$case->fromBug", '', true), $case->fromBugTitle, '', "class='iframe' data-width='80%'");?></td>
-            </tr>
-            <?php endif;?>
-            <?php if($case->toBugs):?>
-            <tr>
-              <th class='thWidth' valign="top"><?php echo $lang->testcase->toBug;?></th>
-              <td>
-              <?php
-              foreach($case->toBugs as $bugID => $bugTitle)
-              {
-                  echo '<p style="margin-bottom:0;">' . html::a($this->createLink('bug', 'view', "bugID=$bugID", '', true), $bugTitle, '', "class='iframe' data-width='80%'") . '</p>';
-              }
-              ?>
-              </td>
-            </tr>
-            <?php endif;?>
-          </table>
-        </div>
-      </details>
-    </div>
-    <?php endif;?>
-    <div class="cell">
-      <details class="detail" open>
-        <summary class="detail-title"><?php echo $lang->testcase->legendOpenAndEdit;?></summary>
-        <div class="detail-content">
-          <table class='table table-data'>
-            <tr>
-              <th class='lifeThWidth'><?php echo $lang->testcase->openedBy;?></th>
-              <td><?php echo zget($users, $case->openedBy) . $lang->at . $case->openedDate;?></td>
-            </tr>
-            <?php if($config->testcase->needReview or !empty($config->testcase->forceReview)):?>
-            <tr>
-              <th><?php echo $lang->testcase->reviewedBy;?></th>
-              <td><?php $reviewedBy = explode(',', $case->reviewedBy); foreach($reviewedBy as $account) echo ' ' . zget($users, trim($account)); ?></td>
-            </tr>
-            <tr>
-              <th><?php echo $lang->testcase->reviewedDate;?></th>
-              <td><?php if($case->reviewedBy) echo $case->reviewedDate;?></td>
-            </tr>
-            <?php endif;?>
-            <tr>
-              <th><?php echo $lang->testcase->lblLastEdited;?></th>
-              <td><?php if($case->lastEditedBy) echo zget($users, $case->lastEditedBy) . $lang->at . $case->lastEditedDate;?></td>
-            </tr>
-          </table>
-        </div>
-      </details>
-    </div>
-    <?php $this->printExtendFields($case, 'div', "position=right&inForm=0&inCell=1");?>
-  </div>
 </div>
 <div id="mainActions" class='main-actions'>
   <?php common::printPreAndNext($preAndNext, $this->createLink('testcase', 'view', "caseID=%s&version=&from=$from&taskID=$taskID"));?>
+  <div class="btn-toolbar">
+    <?php common::printBack($browseLink);?>
+    <?php if(!$case->deleted):?>
+    <?php if(!isonlybody()) echo "<div class='divider'></div>";?>
+    <?php
+    if(!$isLibCase)
+    {
+        if(!isonlybody()) echo "<div class='divider'></div>";
+        common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", $case, 'button', '', '', 'showinonlybody iframe', false, "data-width='95%'");
+        common::printIcon('testtask', 'results', "runID=$runID&caseID=$case->id&version=$case->version", $case, 'button', '', '', 'showinonlybody iframe', false, "data-width='95%'");
+
+        if($caseFails > 0) common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=$runID", $case, 'button', 'bug', '', 'iframe', '', "data-width='90%'");
+    }
+    if($config->testcase->needReview or !empty($config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'button', '', '', 'iframe', '', '', $lang->testcase->reviewAB);
+    ?>
+
+    <?php echo $this->buildOperateMenu($case, 'view');?>
+
+    <?php
+    common::printIcon('testcase', 'edit',"caseID=$case->id", $case, 'button', '', '', 'showinonlybody');
+    if(!$isLibCase and $case->auto != 'unit') common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$case->id", $case, 'button', 'copy');
+    if($isLibCase and common::hasPriv('caselib', 'createCase')) echo html::a($this->createLink('caselib', 'createCase', "libID=$case->lib&moduleID=$case->module&param=$case->id", $case), "<i class='icon-copy'></i>", '', "class='btn' title='{$lang->testcase->copy}'");
+    common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'button', 'trash', 'hiddenwin', 'showinonlybody');
+    ?>
+    <?php endif;?>
+  </div>
 </div>
 <script>
 $(function()
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index ec09157524..52f077bece 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -57,7 +57,7 @@
               <table class='table table-condensed resultSteps'>
                 <thead>
                   <tr>
-                    <th class='w-50px'><?php echo $lang->testcase->stepID;?></th>
+                    <th class='w-60px'><?php echo $lang->testcase->stepID;?></th>
                     <th class='text-left'><?php echo $lang->testcase->stepDesc;?></th>
                     <th class='w-p25 text-left'><?php echo $lang->testcase->stepExpect;?></th>
                     <th class='w-p5 text-left'><?php echo $lang->testcase->stepVersion;?></th>