diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index a95097a49d..6aa50dbfe9 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -74,8 +74,8 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
           <tr>
             <th><?php echo $lang->bug->openedBuild?></th>
             <td>
-              <div class='input-group'>
-                <div class='input-group' id='buildBox'><?php echo html::select('openedBuild[]', $builds, $buildID, "size=4 multiple=multiple class='chosen form-control'");?></div>
+              <div class='input-group' id='buildBox'>
+                <?php echo html::select('openedBuild[]', $builds, $buildID, "size=4 multiple=multiple class='chosen form-control'");?>
                 <span class='input-group-addon fix-border' id='buildBoxActions'></span>
                 <div class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn btn-default' data-toggle='tooltip' onclick='loadAllBuilds()'")?></div>
               </div>
diff --git a/module/group/view/managemember.html.php b/module/group/view/managemember.html.php
index 9cd4733f7c..14b83a9f80 100644
--- a/module/group/view/managemember.html.php
+++ b/module/group/view/managemember.html.php
@@ -22,13 +22,13 @@
     <div class="side-col">
       <div class='side-body'>
         <div class='panel panel-sm'>
-          <div class='panel-heading nobr'><?php echo html::icon($lang->icons['company']);?> <strong><?php echo $lang->dept->common;?></strong></div>
+          <div class='panel-heading nobr'><strong><?php echo $lang->dept->common;?></strong></div>
           <?php echo $deptTree;?>
         </div>
       </div>
     </div>
     <div class="main-col">
-      <form class='pdb-20' method='post' target='hiddenwin'>
+      <form class='main-table table-members' method='post' target='hiddenwin'>
         <table class='table table-form'> 
           <?php if($groupUsers):?>
           <tr>
@@ -59,10 +59,9 @@
             </td>
           </tr>
           <tr>
-            <th></th>
-            <td class='text-center'>
+            <td class='text-center' colspan='2'>
               <?php 
-              echo html::submitButton();
+              echo html::submitButton('', '', 'btn btn-wide btn-primary');
               echo html::linkButton($lang->goback, $this->createLink('group', 'browse'));
               echo html::hidden('foo'); // Just a var, to make sure $_POST is not empty.
               ?>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 403da55ade..33b627bb72 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -17,7 +17,7 @@
   <div class="center-block">
     <div class="main-header">
       <h2>
-        <span><?php echo html::icon($lang->icons['product']);?> <?php echo $product->id;?></span>
+        <span class='label label-id'><?php echo $product->id;?></span>
         <?php echo html::a($this->createLink('product', 'view', 'product=' . $product->id), $product->name);?>
         <small><?php echo $lang->arrow . ' ' . $lang->product->edit;?></small>
       </h2>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index c07bf34d99..6eac04518a 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -149,7 +149,6 @@ js::set('browseType', $browseType);
       $useDatatable = (isset($this->config->datatable->$datatableId->mode) and $this->config->datatable->$datatableId->mode == 'datatable');
       $vars         = "projectID=$project->id&status=$status&parma=$param&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage";
 
-      if($useDatatable) include '../../common/view/datatable.html.php';
       $customFields = $this->datatable->getSetting('project');
       if($project->type == 'ops')
       {
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 988580eec4..9a3fcfb559 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -19,9 +19,6 @@
         <?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title, '', 'class="story-title"');?>
         <small><?php echo $lang->arrow . ' ' . $lang->story->edit;?></small>
       </h2>
-      <div class="pull-right btn-toolbar">
-        <?php echo html::submitButton($lang->save)?>
-      </div>
     </div>
     <div class='main-row'>
       <div class='main-col col-8'>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 955017a43f..e944c4abb8 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -12,14 +12,14 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<?php $browseLink  = $app->session->storyList != false ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product&branch=$story->branch&moduleID=$story->module");?>
+<?php $browseLink = $app->session->storyList != false ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product&branch=$story->branch&moduleID=$story->module");?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-link'");?>
     <div class="divider"></div>
     <div class="page-title">
       <span class="label label-id"><?php echo $story->id?></span>
-      <span class="text" style='color: <?php echo $story->color; ?>'><?php echo $story->title;?></span>
+      <span class="text" style='color: <?php echo $story->color;?>'><?php echo $story->title;?></span>
       <?php if($story->version > 1):?>
       <small class='dropdown'>
         <a href='#' data-toggle='dropdown' class='text-muted'><?php echo '#' . $version;?> <span class='caret'></span></a>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 120047d811..3631c2f346 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -26,9 +26,6 @@
         <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name, '', "class='task-title'");?>
         <small><?php echo $lang->arrow . $lang->task->edit;?></small>
       </h2>
-      <div class='btn-toolbar pull-right'>
-        <?php echo html::submitButton($lang->save)?>
-      </div>
     </div>
     <div class='main-row'>
       <div class='main-col col-8'>
@@ -61,9 +58,11 @@
             <div class='detail-title'><?php echo $lang->files;?></div>
             <div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
           </div>
-          <div class='detail'>
+          <div class='detail text-center'>
             <?php echo html::hidden('lastEditedDate', $task->lastEditedDate);?>
-            <?php echo html::submitButton($lang->save) . html::linkButton($lang->goback, $this->inlink('view', "taskID=$task->id")) . html::hidden('consumed', $task->consumed);?>
+            <?php echo html::hidden('consumed', $task->consumed);?>
+            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
           </div>
           <?php include '../../common/view/action.html.php';?>
         </div>
diff --git a/module/testreport/view/blockbugs.html.php b/module/testreport/view/blockbugs.html.php
index 1ec4606615..87c5a9ecd3 100644
--- a/module/testreport/view/blockbugs.html.php
+++ b/module/testreport/view/blockbugs.html.php
@@ -1,10 +1,10 @@
 <?php $sysURL = $this->session->notHead ? common::getSysURL() : '';?>
 <table class='table main-table' id='bugs'>
   <thead>
-    <tr>
+    <tr class='text-center'>
       <th class='w-id'>   <?php echo $lang->idAB;?></th>
       <th class='w-pri'>  <?php echo $lang->priAB;?></th>
-      <th>                <?php echo $lang->testreport->bugTitle;?></th>
+      <th class='text-left'><?php echo $lang->testreport->bugTitle;?></th>
       <th class='w-user'> <?php echo $lang->openedByAB;?></th>
       <th class='w-user'><?php echo $lang->bug->resolvedBy;?></th>
       <th class='w-140px'><?php echo $lang->bug->resolvedDate;?></th>
@@ -16,12 +16,17 @@
     <?php foreach($bugs as $bug):?>
     <tr>
       <td><?php echo $bug->id . html::hidden('bugs[]', $bug->id)?></td>
-      <td><span class='pri<?php echo $bug->pri?>'><?php echo zget($lang->bug->priList, $bug->pri);?></span></td>
+      <td><span class='label-pri label-pri-<?php echo $bug->pri?>'><?php echo zget($lang->bug->priList, $bug->pri);?></span></td>
       <td class='text-left' title='<?php echo $bug->title?>'><?php echo html::a($sysURL . $this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
       <td><?php echo zget($users, $bug->openedBy);?></td>
       <td><?php echo zget($users, $bug->resolvedBy);?></td>
       <td><?php if($bug->resolvedDate != '0000-00-00 00:00:00') echo substr($bug->resolvedDate, 2);?></td>
-      <td><?php echo zget($lang->bug->statusList, $bug->status);?></td>
+      <td title='<?php echo zget($lang->bug->statusList, $bug->status);?>'>
+        <span class="bug-status-<?php echo $bug->status?>">
+          <span class="label label-dot"></span>
+          <span class='status-text'><?php echo zget($lang->bug->statusList, $bug->status);?></span>
+        </span>
+      </td>
     </tr>
     <?php endforeach;?>
   </tbody>
diff --git a/module/testreport/view/blockbuilds.html.php b/module/testreport/view/blockbuilds.html.php
index d021be0a73..627f88e917 100644
--- a/module/testreport/view/blockbuilds.html.php
+++ b/module/testreport/view/blockbuilds.html.php
@@ -1,9 +1,9 @@
 <?php $sysURL = $this->session->notHead ? common::getSysURL() : '';?>
 <table class='table main-table' id='builds'>
   <thead>
-    <tr>
+    <tr class='text-center'>
       <th class='w-id'>  <?php echo $lang->build->id;?></th>
-      <th>               <?php echo $lang->build->name;?></th>
+      <th class='text-left'><?php echo $lang->build->name;?></th>
       <th class='w-user'><?php echo $lang->build->builder;?></th>
       <th class='w-100px'><?php echo $lang->build->date;?></th>
     </tr>
diff --git a/module/testreport/view/blockcases.html.php b/module/testreport/view/blockcases.html.php
index 1e26b5499b..83109f4bd1 100644
--- a/module/testreport/view/blockcases.html.php
+++ b/module/testreport/view/blockcases.html.php
@@ -1,10 +1,10 @@
 <?php $sysURL = $this->session->notHead ? common::getSysURL() : '';?>
 <table class='table main-table' id='cases'>
   <thead>
-    <tr>
+    <tr class='text-center'>
       <th class='w-id'>    <?php echo $lang->idAB;?></th>
       <th class='w-pri'>   <?php echo $lang->priAB;?></th>
-      <th>                 <?php echo $lang->testcase->title;?></th>
+      <th class='text-left'><?php echo $lang->testcase->title;?></th>
       <th class='w-type'>  <?php echo $lang->testcase->type;?></th>
       <th class='w-user'>  <?php echo $lang->testtask->assignedTo;?></th>
       <th class='w-user'>  <?php echo $lang->testtask->lastRunAccount;?></th>
@@ -18,14 +18,19 @@
     <?php foreach($cases as $case):?>
     <tr>
       <td><?php echo $case->id . html::hidden('cases[]', $case->id)?></td>
-      <td><span class='pri<?php echo $case->pri?>'><?php echo zget($lang->testcase->priList, $case->pri);?></span></td>
+      <td><span class='label-pri label-pri-<?php echo $case->pri?>'><?php echo zget($lang->testcase->priList, $case->pri);?></span></td>
       <td class='text-left' title='<?php echo $case->title?>'><?php echo html::a($sysURL . $this->createLink('testcase', 'view', "caseID=$case->id", '', true), $case->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
       <td><?php echo zget($lang->testcase->typeList, $case->type);?></td>
       <td><?php echo zget($users, $case->assignedTo);?></td>
       <td><?php echo zget($users, $case->lastRunner);?></td>
       <td><?php echo substr($case->lastRunDate, 2);?></td>
       <td><?php echo zget($lang->testcase->resultList, $case->lastRunResult);?></td>
-      <td><?php echo zget($lang->testtask->statusList, $case->status);?></td>
+      <td title='<?php echo zget($lang->testtask->statusList, $case->status);?>'>
+        <span class="status-<?php echo $case->status?>">
+          <span class="label label-dot"></span>
+          <span class='status-text'><?php echo zget($lang->testtask->statusList, $case->status);?></span>
+        </span>
+      </td>
     </tr>
     <?php endforeach;?>
   </tbody>
diff --git a/module/testreport/view/blocklegacybugs.html.php b/module/testreport/view/blocklegacybugs.html.php
index 0e31c631a4..5f8aa136eb 100644
--- a/module/testreport/view/blocklegacybugs.html.php
+++ b/module/testreport/view/blocklegacybugs.html.php
@@ -1,10 +1,10 @@
 <?php $sysURL = $this->session->notHead ? common::getSysURL() : '';?>
 <table class='table main-table' id='legacyBugs'>
   <thead>
-    <tr>
+    <tr class='text-center'>
       <th class='w-id'>   <?php echo $lang->idAB;?></th>
       <th class='w-pri'>  <?php echo $lang->priAB;?></th>
-      <th>                <?php echo $lang->bug->title;?></th>
+      <th class='text-left'><?php echo $lang->bug->title;?></th>
       <th class='w-user'> <?php echo $lang->openedByAB;?></th>
       <th class='w-user'> <?php echo $lang->bug->resolvedBy;?></th>
       <th class='w-150px'><?php echo $lang->bug->resolvedDate;?></th>
@@ -16,12 +16,17 @@
     <?php foreach($legacyBugs as $bug):?>
     <tr>
       <td><?php echo $bug->id?></td>
-      <td><span class='pri<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?></span></td>
+      <td><span class='label-pri label-pri-<?php echo $bug->pri;?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?></span></td>
       <td class='text-left' title='<?php echo $bug->title?>'><?php echo html::a($sysURL . $this->createLink('bug', 'view', "bugID=$bug->id", '', true), $bug->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
       <td><?php echo zget($users, $bug->openedBy);?></td>
       <td><?php echo zget($users, $bug->resolvedBy);?></td>
       <td><?php if($bug->resolvedDate != '0000-00-00 00:00:00') echo substr($bug->resolvedDate, 2);?></td>
-      <td><?php echo zget($lang->bug->statusList, $bug->status);?></td>
+      <td title='<?php echo zget($lang->bug->statusList, $bug->status);?>'>
+        <span class="bug-status-<?php echo $bug->status?>">
+          <span class="label label-dot"></span>
+          <span class='status-text'><?php echo zget($lang->bug->statusList, $bug->status);?></span>
+        </span>
+      </td>
     </tr>
     <?php endforeach;?>
   </tbody>
diff --git a/module/testreport/view/blockstories.html.php b/module/testreport/view/blockstories.html.php
index 13b7c9bcd0..ba141c9ef6 100644
--- a/module/testreport/view/blockstories.html.php
+++ b/module/testreport/view/blockstories.html.php
@@ -1,10 +1,10 @@
 <?php $sysURL = $this->session->notHead ? common::getSysURL() : '';?>
 <table class='table main-table' id='stories'>
   <thead>
-    <tr>
+    <tr class='text-center'>
       <th class='w-id'>  <?php echo $lang->idAB;?></th>
       <th class='w-pri'> <?php echo $lang->priAB;?></th>
-      <th>               <?php echo $lang->testreport->storyTitle;?></th>
+      <th class='text-left'><?php echo $lang->testreport->storyTitle;?></th>
       <th class='w-user'><?php echo $lang->openedByAB;?></th>
       <th class='w-80px'><?php echo $lang->assignedToAB;?></th>
       <th class='w-hour'><?php echo $lang->story->estimateAB;?></th>
@@ -17,12 +17,17 @@
     <?php foreach($stories as $story):?>
     <tr>
       <td><?php echo $story->id . html::hidden('stories[]', $story->id)?></td>
-      <td><span class='pri<?php echo $story->pri?>'><?php echo zget($lang->story->priList, $story->pri);?></span></td>
+      <td><span class='label-pri lable-pri-<?php echo $story->pri?>'><?php echo zget($lang->story->priList, $story->pri);?></span></td>
       <td class='text-left' title='<?php echo $story->title?>'><?php echo html::a($sysURL . $this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");?></td>
       <td><?php echo zget($users, $story->openedBy);?></td>
       <td><?php echo zget($users, $story->assignedTo);?></td>
       <td><?php echo $story->estimate?></td>
-      <td><?php echo zget($lang->story->statusList, $story->status);?></td>
+      <td title='<?php echo zget($lang->story->statusList, $story->status);?>'>
+        <span class="story-status-<?php echo $story->status?>">
+          <span class="label label-dot"></span>
+          <span class='status-text'><?php echo zget($lang->story->statusList, $story->status);?></span>
+        </span>
+      </td>
       <td><?php echo zget($lang->story->stageList, $story->stage);?></td>
     </tr>
     <?php endforeach;?>
diff --git a/module/testreport/view/browse.html.php b/module/testreport/view/browse.html.php
index 58b751459a..b767001f02 100644
--- a/module/testreport/view/browse.html.php
+++ b/module/testreport/view/browse.html.php
@@ -23,13 +23,13 @@
   <table class='table has-sort-head table-fixed' id='reportList'>
     <?php $vars = "objectID=$objectID&objectType=$objectType&extra=$extra&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
     <thead>
-      <tr>
+      <tr class='text-center'>
         <th class='w-id'>   <?php common::printOrderLink('id',          $orderBy, $vars, $lang->idAB);?></th>
-        <th>                <?php common::printOrderLink('title',       $orderBy, $vars, $lang->testreport->title);?></th>
+        <th class='text-left'><?php common::printOrderLink('title',     $orderBy, $vars, $lang->testreport->title);?></th>
         <th class='w-user'> <?php common::printOrderLink('createdBy',   $orderBy, $vars, $lang->openedByAB);?></th>
         <th class='w-150px'><?php common::printOrderLink('createdDate', $orderBy, $vars, $lang->testreport->createdDate);?></th>
-        <th class='w-250px'><?php common::printOrderLink('project',     $orderBy, $vars, $lang->testreport->project);?></th>
-        <th class='w-250px'><?php echo $lang->testreport->testtask;?></th>
+        <th class='w-250px text-left'><?php common::printOrderLink('project', $orderBy, $vars, $lang->testreport->project);?></th>
+        <th class='w-250px text-left'><?php echo $lang->testreport->testtask;?></th>
         <th class='w-80px'> <?php echo $lang->actions;?></th>
       </tr>
     </thead>
diff --git a/module/testreport/view/edit.html.php b/module/testreport/view/edit.html.php
index 1b33d592b9..4d60b2c15e 100644
--- a/module/testreport/view/edit.html.php
+++ b/module/testreport/view/edit.html.php
@@ -75,8 +75,10 @@
             <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
           </tr>
           <tr>
-            <th></th>
-            <td><?php echo html::submitButton() . html::backButton();?></td>
+            <td class='text-center' colspan='3'>
+              <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+              <?php echo html::backButton('', '', 'btn btn-wide');?>
+            </td>
           </tr>
         </table>
       </div>
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index 00cf82c4f8..0577715670 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -76,7 +76,7 @@ $status = $this->session->testTaskVersionStatus;
       <?php if($this->config->global->flow != 'onlyTest'):?>
       <td title="<?php echo $task->projectName?>"><?php echo $task->projectName?></td>
       <?php endif;?>
-      <td><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build",'',true), $task->buildName, '','class="iframe"');?></td>
+      <td><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build",'',true), $task->buildName);?></td>
       <td><?php echo zget($users, $task->owner);?></td>
       <td><?php echo $task->begin?></td>
       <td><?php echo $task->end?></td>
@@ -100,7 +100,7 @@ $status = $this->session->testTaskVersionStatus;
         common::printIcon('testtask',   'view',     "taskID=$task->id", '', 'list', 'file','','iframe',true, 'data-width=800px');
         common::printIcon('testtask',   'linkCase', "taskID=$task->id", $task, 'list', 'link');
         common::printIcon('testreport', 'browse',   "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list','flag');
-        common::printIcon('testtask',   'edit',     "taskID=$task->id", $task, 'list','','','iframe',true);
+        common::printIcon('testtask',   'edit',     "taskID=$task->id", $task, 'list','','','',true);
         ?>
       </td>
     </tr>
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index e0630e34e4..d6f95a0ce3 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -87,7 +87,10 @@
           </td>
         </tr>
         <tr>
-          <td></td><td colspan='2'><?php echo html::submitButton() . html::backButton();?> </td>
+          <td class='text-center' colspan='3'>
+            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
+          </td>
         </tr>
       </table>
     </form>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index 705a3ebba8..6b1ea3830d 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -14,9 +14,10 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <div id='mainContent' class='main-content'>
-  <div class='center-block mw-1400px'>
+  <div class='center-block'>
     <div class='main-header'>
       <h2>
+        <span class='label label-id'><?php echo $task->id;?></span>
         <?php echo html::a($this->createLink('testtask', 'view', 'taskID=' . $task->id), $task->name, '_blank');?>
         <small class='text-muted'><?php echo $lang->arrow . $lang->testtask->edit;?></small>
       </h2>
@@ -79,7 +80,10 @@
           </td>
         </tr>
         <tr>
-          <td></td><td colspan='2'><?php echo html::submitButton() . html::backButton() . html::hidden('product', $task->product);?></td>
+          <td class='text-center' colspan='3'>
+            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
+          </td>
         </tr>
       </table>
     </form>
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index d98657e8c9..707783a2f3 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -12,77 +12,78 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div id='mainContent' class='main-content'>
-  <div class='center-block'>
-    <div class='main-header'>
-      <h2>
-        <span class='label label-id'><?php echo $task->id;?></span>
-        <?php echo $task->name;?>
-        <?php if($task->deleted):?>
-        <span class='label label-danger'><?php echo $lang->task->deleted;?></span>
-        <?php endif; ?>
-      </h2>
+<?php $browseLink = $this->session->testtaskList ? $this->session->testtaskList : $this->createLink('testtask', 'browse', "productID=$task->product");?>
+<div id='mainMenu' class='clearfix'>
+  <div class='btn-toolbar pull-left'>
+    <?php common::printBack($browseLink, 'btn btn-link');?>
+    <div class='divider'></div>
+    <div class='page-title'>
+      <span class='label label-id'><?php echo $task->id;?></span>
+      <span class='text'><?php echo $task->name;?></span>
+      <?php if($task->deleted):?>
+      <span class='label label-danger'><?php echo $lang->task->deleted;?></span>
+      <?php endif; ?>
     </div>
-    <div class="main-row">
-      <div class="col-8 main-col">
-        <div class="cell">
-          <div class="detail">
-            <div class="detail-title"><?php echo $lang->testtask->desc;?></div>
-            <div class="detail-content article-content"><?php echo !empty($task->desc) ? $task->desc : "<div class='text-center'>" . $lang->noData . '</div>';?></div>
-          </div>
-          <?php if($task->report):?>
-          <div class="detail">
-            <div class="detail-title"><?php echo $lang->testtask->report;?></div>
-            <div class="detail-content article-content"><?php echo $task->report;?></div>
-          </div>
-          <?php endif;?>
-          <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=testtask&objectID=$task->id");?>
-          <?php include '../../common/view/action.html.php';?>
-        </div>
+  </div>
+</div>
+<div id='mainContent' class='main-row'>
+  <div class="col-8 main-col">
+    <div class="cell">
+      <div class="detail">
+        <div class="detail-title"><?php echo $lang->testtask->desc;?></div>
+        <div class="detail-content article-content"><?php echo !empty($task->desc) ? $task->desc : $lang->noData;?></div>
       </div>
-      <div class="col-4 side-col">
-        <div class="cell">
-          <details class="detail" open>
-            <summary class="detail-title"><?php echo $lang->testtask->legendBasicInfo;?></summary>
-            <div class="detail-content">
-              <table class="table table-data">
-                <?php if($this->config->global->flow != 'onlyTest'):?>
-                <tr>
-                  <th class='w-80px'><?php echo $lang->testtask->project;?></th>
-                  <td><?php echo html::a($this->createLink('project', 'story', "projectID=$task->project"), $task->projectName);?></td>
-                </tr>  
-                <?php endif;?>
-                <tr>
-                  <th><?php echo $lang->testtask->build;?></th>
-                  <td><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
-                </tr>  
-                <tr>
-                  <th><?php echo $lang->testtask->owner;?></th>
-                  <td><?php echo zget($users, $task->owner);?></td>
-                </tr>  
-                <tr>
-                  <th><?php echo $lang->testtask->mailto;?></th>
-                  <td><?php $mailto = explode(',', str_replace(' ', '', $task->mailto)); foreach($mailto as $account) echo ' ' . zget($users, $account, $account);?></td> 
-                </tr>
-                <tr>
-                  <th><?php echo $lang->testtask->pri;?></th>
-                  <td><?php echo $task->pri;?></td>
-                </tr>  
-                <tr>
-                  <th><?php echo $lang->testtask->begin;?></th>
-                  <td><?php echo $task->begin;?></td>
-                </tr>  
-                <tr>
-                  <th><?php echo $lang->testtask->end;?></th>
-                  <td><?php echo $task->end;?></td>
-                </tr>  
-                <tr>
-                  <th><?php echo $lang->testtask->status;?></th>
-                  <td class='task-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
-                </tr>  
-              </table>
-            </div>
-          </details>
+      <?php if($task->report):?>
+      <div class="detail">
+        <div class="detail-title"><?php echo $lang->testtask->report;?></div>
+        <div class="detail-content article-content"><?php echo $task->report;?></div>
+      </div>
+      <?php endif;?>
+      <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=testtask&objectID=$task->id");?>
+      <?php include '../../common/view/action.html.php';?>
+    </div>
+  </div>
+  <div class="col-4 side-col">
+    <div class="cell">
+      <div class="detail">
+        <div class="detail-title"><?php echo $lang->testtask->legendBasicInfo;?></div>
+        <div class="detail-content">
+          <table class="table table-data">
+            <?php if($this->config->global->flow != 'onlyTest'):?>
+            <tr>
+              <th class='w-80px'><?php echo $lang->testtask->project;?></th>
+              <td><?php echo html::a($this->createLink('project', 'story', "projectID=$task->project"), $task->projectName);?></td>
+            </tr>  
+            <?php endif;?>
+            <tr>
+              <th><?php echo $lang->testtask->build;?></th>
+              <td><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
+            </tr>  
+            <tr>
+              <th><?php echo $lang->testtask->owner;?></th>
+              <td><?php echo zget($users, $task->owner);?></td>
+            </tr>  
+            <tr>
+              <th><?php echo $lang->testtask->mailto;?></th>
+              <td><?php $mailto = explode(',', str_replace(' ', '', $task->mailto)); foreach($mailto as $account) echo ' ' . zget($users, $account, $account);?></td> 
+            </tr>
+            <tr>
+              <th><?php echo $lang->testtask->pri;?></th>
+              <td><?php echo $task->pri;?></td>
+            </tr>  
+            <tr>
+              <th><?php echo $lang->testtask->begin;?></th>
+              <td><?php echo $task->begin;?></td>
+            </tr>  
+            <tr>
+              <th><?php echo $lang->testtask->end;?></th>
+              <td><?php echo $task->end;?></td>
+            </tr>  
+            <tr>
+              <th><?php echo $lang->testtask->status;?></th>
+              <td class='task-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
+            </tr>  
+          </table>
         </div>
       </div>
     </div>
@@ -90,7 +91,6 @@
 </div>
 
 <div id='mainActions'>
-  <?php $browseLink = $this->session->testtaskList ? $this->session->testtaskList : $this->createLink('testtask', 'browse', "productID=$task->product");?>
   <?php common::printPreAndNext($browseLink);?>
   <div class="btn-toolbar">
     <?php common::printBack($browseLink);?>