diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php
index 19c6b8b474..065ae3bae6 100644
--- a/module/task/view/activate.html.php
+++ b/module/task/view/activate.html.php
@@ -12,44 +12,48 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['task']);?> <strong><?php echo $task->id;?></strong></span>
-    <strong><?php echo html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?></strong>
-    <small class='text-success'> <?php echo $lang->task->activate;?> <?php echo html::icon($lang->icons['activate']);?></small>
+<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 isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <small> <?php echo $lang->arrow . $lang->task->activate;?></small>
+      </h2>
+    </div>
+    
+    <form method='post' target='hiddenwin'>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-70px'><?php echo $lang->task->assignedTo;?></th>
+          <td class='w-p25-f'><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control chosen'");?></td>
+          <td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->task->left;?></th>
+          <td>
+            <div class='input-group'>
+              <?php echo html::input('left', '', "class='form-control' autocomplete='off'");?>
+              <span class='input-group-addon'><?php echo $lang->task->hour;?></span>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->comment;?></th>
+          <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
+        </tr>
+        <tr>
+          <td colspan='3' class='text-center'>
+           <?php 
+           echo html::submitButton($lang->task->activate);
+           echo html::linkButton($lang->goback, $this->session->taskList);
+           ?>
+          </td>
+        </tr>
+      </table>
+    </form>
+    <hr class='small' />
+    <div class='main'><?php include '../../common/view/action.html.php';?></div>
   </div>
 </div>
-
-<form class='form-condensed' method='post' target='hiddenwin'>
-  <table class='table table-form'>
-    <tr>
-      <th class='w-70px'><?php echo $lang->task->assignedTo;?></th>
-      <td class='w-p25-f'><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control chosen'");?></td><td></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->task->left;?></th>
-      <td>
-        <div class='input-group'>
-          <?php echo html::input('left', '', "class='form-control' autocomplete='off'");?>
-          <span class='input-group-addon'><?php echo $lang->task->hour;?></span>
-        </div>
-      </td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->comment;?></th>
-      <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
-    </tr>
-    <tr>
-      <td colspan='3' class='text-center'>
-       <?php 
-       echo html::submitButton($lang->task->activate);
-       echo html::linkButton($lang->goback, $this->session->taskList);
-       ?>
-      </td>
-    </tr>
-  </table>
-</form>
-<div class='main'>
-  <?php include '../../common/view/action.html.php';?>
-</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php
index b1bcc59ed1..dc500c2b28 100644
--- a/module/task/view/assignto.html.php
+++ b/module/task/view/assignto.html.php
@@ -12,33 +12,40 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['task']);?> <strong><?php echo $task->id;?></strong></span>
-    <strong><?php echo html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?></strong>
-    <small class='text-muted'> <?php echo empty($task->team) ? $lang->task->assign : $lang->task->transfer;?></small>
+<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 isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <small> <?php echo $lang->arrow . (empty($task->team) ? $lang->task->assign : $lang->task->transfer);?></small>
+      </h2>
+    </div>
+    <form method='post' target='hiddenwin'>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-80px'><?php echo empty($task->team) ? $lang->task->assign : $lang->task->transferTo;?></th>
+          <td class='w-p25-f'><?php echo html::select('assignedTo', $members, $task->assignedTo, "class='form-control chosen'");?></td><td></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->task->left;?></th>
+          <td><div class='input-group'><?php echo html::input('left', $task->left, "class='form-control' autocomplete='off'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div></td><td></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->comment;?></th>
+          <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control w-p98'");?></td>
+        </tr>
+        <tr>
+          <th></th>
+          <td colspan='2'>
+            <?php echo html::submitButton();?>
+            <?php echo html::linkButton($lang->goback, $this->session->taskList);?>
+          </td>
+        </tr>
+      </table>
+    </form>
+    <hr class='small' />
+    <div class='main'><?php include '../../common/view/action.html.php';?></div>
   </div>
 </div>
-<form class='form-condensed' method='post' target='hiddenwin'>
-  <table class='table table-form'>
-    <tr>
-      <th class='w-80px'><?php echo empty($task->team) ? $lang->task->assign : $lang->task->transferTo;?></th>
-      <td class='w-p25-f'><?php echo html::select('assignedTo', $members, $task->assignedTo, "class='form-control chosen'");?></td><td></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->task->left;?></th>
-      <td><div class='input-group'><?php echo html::input('left', $task->left, "class='form-control' autocomplete='off'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div></td><td></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->comment;?></th>
-      <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control w-p98'");?></td>
-    </tr>
-    <tr>
-      <th></th><td colspan='2'><?php echo html::submitButton();?></td>
-    </tr>
-  </table>
-</form>
-<div class='main'>
-  <?php include '../../common/view/action.html.php';?>
-</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/browse.html.php b/module/task/view/browse.html.php
deleted file mode 100644
index 075e48a6c8..0000000000
--- a/module/task/view/browse.html.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * The browse view file of task module of ZenTaoPMS.
- *
- * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
- * @license     ZPL (http://zpl.pub/page/zplv12.html)
- * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
- * @package     task
- * @version     $Id: browse.html.php 4129 2013-01-18 01:58:14Z wwccss $
- * @link        http://www.zentao.net
- */
-?>
-<?php include '../../common/view/header.html.php';?>
-<div id='doc3'>
-  <table align='center' class='table-4'>
-    <caption><?php echo $lang->task->browse;?></caption>
-    <tr>
-      <th><?php echo $lang->task->id;?></th>
-      <th><?php echo $lang->task->name;?></th>
-      <th><?php echo $lang->task->assignedTo;?></th>
-    </tr>
-    <?php foreach($tasks as $task):?>
-    <tr>
-      <td><?php echo $task->id;?></td>
-      <td><?php echo $task->name;?></td>
-      <td><?php echo $task->assignedTo;?></td>
-    </tr>
-    <?php endforeach;?>
-  </table>
-  <?php 
-  $vars['project'] = $project;
-  $addLink = $this->createLink($this->moduleName, 'create', $vars);
-  echo "<a href='$addLink'>{$lang->task->create}</a>";
-  ?>
-</div>  
-<?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/cancel.html.php b/module/task/view/cancel.html.php
index 50284a7679..f49100f823 100644
--- a/module/task/view/cancel.html.php
+++ b/module/task/view/cancel.html.php
@@ -12,24 +12,33 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['task']);?> <strong><?php echo $task->id;?></strong></span>
-    <strong><?php echo html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?></strong>
-    <small class='text-muted'> <?php echo $lang->task->cancel;?> <?php echo html::icon($lang->icons['cancel']);?></small>
+<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 isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <small> <?php echo $lang->arrow . $lang->task->cancel;?></small>
+      </div>
+    </div>
+
+    <form method='post' target='hiddenwin'>
+      <table class='table table-form'>
+        <tr>
+          <th><?php echo $lang->comment;?></th>
+          <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
+        </tr>
+        <tr>
+          <th></th>
+          <td>
+            <?php echo html::submitButton($lang->task->cancel);?>
+            <?php echo html::linkButton($lang->goback, $this->session->taskList);?>
+          </td>
+        </tr>
+      </table>
+    </form>
+    <hr class='small' />
+    <div class='main'><?php include '../../common/view/action.html.php';?></div>
   </div>
 </div>
-
-<form class='form-condensed' method='post' target='hiddenwin'>
-  <table class='table table-form'>
-    <tr>
-      <th><?php echo $lang->comment;?></th>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
-    </tr>
-    <tr><th></th><td><?php echo html::submitButton($lang->task->cancel);?></td></tr>
-  </table>
-</form>
-<div class='main'>
-  <?php include '../../common/view/action.html.php';?>
-</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/close.html.php b/module/task/view/close.html.php
index 2c483bc613..f5d6bf407a 100644
--- a/module/task/view/close.html.php
+++ b/module/task/view/close.html.php
@@ -12,26 +12,33 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['task']);?> <strong><?php echo $task->id;?></strong></span>
-    <strong><?php echo html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?></strong>
-    <small class='text-danger'> <?php echo $lang->task->close;?> <?php echo html::icon($lang->icons['close']);?></small>
+<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 isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <small><?php echo $lang->arrow . $lang->task->close;?></small>
+      </h2>
+    </div>
+    
+    <form method='post' target='hiddenwin'>
+      <table class='table table-form'>
+        <tr>
+          <th><?php echo $lang->comment;?></th>
+          <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
+        </tr>
+        <tr>
+          <th></th>
+          <td>
+            <?php echo html::submitButton($lang->task->close);?>
+            <?php echo html::linkButton($lang->goback, $this->session->taskList);?>
+          </td>
+        </tr>
+      </table>
+    </form>
+    <hr class='small' />
+    <div class='main'><?php include '../../common/view/action.html.php';?></div>
   </div>
 </div>
-
-<form class='form-condensed' method='post' target='hiddenwin'>
-  <table class='table table-form'>
-    <tr>
-      <th><?php echo $lang->comment;?></th>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
-    </tr>
-    <tr>
-      <th></th><td><?php echo html::submitButton($lang->task->close);?></td>
-    </tr>
-  </table>
-</form>
-<div class='main'>
-  <?php include '../../common/view/action.html.php';?>
-</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/editestimate.html.php b/module/task/view/editestimate.html.php
index 0906b25a3c..5fc495b54b 100644
--- a/module/task/view/editestimate.html.php
+++ b/module/task/view/editestimate.html.php
@@ -13,37 +13,35 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::set('confirmRecord', $lang->task->confirmRecord);?>
-<div class='container mw-600px'>
-  <div id='titlebar'>
-    <div class='heading'>
-      <strong><?php echo $lang->task->editEstimate;?></strong>
-      <small class='text-muted'><?php echo html::icon($lang->icons['edit']);?></small>
+<div id='mainContent' class='main-content'>
+  <div class='center-block mw-600px'>
+    <div class='main-header'>
+      <h2><?php echo $lang->task->editEstimate;?></h2>
     </div>
+    <form method='post' target='hiddenwin' <?php if($estimate->isLast) echo "onsubmit='return confirmLeft();'"?>>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-80px'><?php echo $lang->task->date;?></th>
+          <td class='w-p45'><?php echo html::input('date', $estimate->date, 'class="form-control form-date"');?></td>
+          <td></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->task->record;?></th>
+          <td><?php echo html::input('consumed', $estimate->consumed, 'class="form-control" autocomplete="off"');?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->task->left;?></th>
+          <td><?php echo html::input('left', $estimate->left, 'class="form-control" autocomplete="off"');?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->comment;?></th>
+          <td colspan='2'><?php echo html::textarea('work', $estimate->work, "class=form-control");?></td>
+        </tr>  
+        <tr>
+          <td colspan='3' class='text-center'><?php echo html::submitButton() . html::backButton();?></td>
+        </tr>
+      </table>
+    </form>
   </div>
-  <form class='form-condensed' method='post' target='hiddenwin' <?php if($estimate->isLast) echo "onsubmit='return confirmLeft();'"?>>
-    <table class='table table-form'>
-      <tr>
-        <th class='w-80px'><?php echo $lang->task->date;?></th>
-        <td class='w-p45'><?php echo html::input('date', $estimate->date, 'class="form-control form-date"');?></td><td></td>
-      </tr>  
-      <tr>
-        <th><?php echo $lang->task->record;?></th>
-        <td><?php echo html::input('consumed', $estimate->consumed, 'class="form-control" autocomplete="off"');?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->task->left;?></th>
-        <td><?php echo html::input('left', $estimate->left, 'class="form-control" autocomplete="off"');?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->comment;?></th>
-        <td colspan='2'><?php echo html::textarea('work', $estimate->work, "class=form-control");?></td>
-      </tr>  
-      <tr>
-        <td></td><td colspan='2' class='text-center'>
-          <?php echo html::submitButton() . html::backButton();?>
-        </td>
-      </tr>
-    </table>
-  </form>
 </div>
 <?php include '../../common/view/footer.lite.html.php';?>
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index 74f5736fdc..bedc286c10 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -13,49 +13,59 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['task']);?> <strong><?php echo $task->id;?></strong></span>
-    <strong><?php echo html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?></strong>
-    <small class='text-success'> <?php echo $lang->task->finish;?> <?php echo html::icon($lang->icons['finish']);?></small>
+<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 isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <small> <?php echo $lang->arrow . $lang->task->finish;?></small>
+      </div>
+    </div>
+    <form method='post' enctype='multipart/form-data' target='hiddenwin'>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-80px'><?php echo !empty($task->team) ? $lang->task->common . $lang->task->consumed : $lang->task->hasConsumed;?></th>
+          <td class='w-p25-f'><?php echo $task->consumed;?> <?php echo $lang->workingHour;?></td>
+          <td></td>
+        </tr>
+        <?php if(!empty($task->team)):?>
+        <tr>
+          <th class='w-80px'><?php echo $lang->task->hasConsumed;?></th>
+          <td class='w-p25-f'><?php echo $task->myConsumed;?> <?php echo $lang->workingHour;?></td><td></td>
+        </tr>
+        <?php endif;?>
+        <tr>
+          <th><?php echo $lang->task->consumed;?></th>
+          <td><div class='input-group'><?php echo html::input('consumed', $task->consumed, "class='form-control' autocomplete='off'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div></td>
+        </tr>
+        <tr>
+          <th><?php echo empty($task->team) ? $lang->task->assign : $lang->task->transferTo;?></th>
+          <td><?php echo html::select('assignedTo', $members, $task->nextBy, "class='form-control chosen'");?></td><td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->task->finishedDate;?></th>
+          <td><div class='datepicker-wrapper'><?php echo html::input('finishedDate', helper::today(), "class='form-control form-date'");?></div></td><td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->files;?></th>
+          <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->comment;?></th>
+          <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
+        </tr>
+        <tr>
+          <th></th>
+          <td colspan='2'>
+            <?php echo html::submitButton($lang->task->finish);?>
+            <?php echo html::linkButton($lang->goback, $this->session->taskList);?>
+          </td>
+        </tr>
+      </table>
+    </form>
+    <hr class='small' />
+    <div class='main'><?php include '../../common/view/action.html.php';?></div>
   </div>
 </div>
-<form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
-  <table class='table table-form'>
-    <tr>
-      <th class='w-80px'><?php echo !empty($task->team) ? $lang->task->common . $lang->task->consumed : $lang->task->hasConsumed;?></th>
-      <td class='w-p25-f'><?php echo $task->consumed;?> <?php echo $lang->workingHour;?></td><td></td>
-    </tr>
-    <?php if(!empty($task->team)):?>
-    <tr>
-      <th class='w-80px'><?php echo $lang->task->hasConsumed;?></th>
-      <td class='w-p25-f'><?php echo $task->myConsumed;?> <?php echo $lang->workingHour;?></td><td></td>
-    </tr>
-    <?php endif;?>
-    <tr>
-      <th><?php echo $lang->task->consumed;?></th>
-      <td><div class='input-group'><?php echo html::input('consumed', $task->consumed, "class='form-control' autocomplete='off'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div></td>
-    </tr>
-    <tr>
-      <th><?php echo empty($task->team) ? $lang->task->assign : $lang->task->transferTo;?></th>
-      <td><?php echo html::select('assignedTo', $members, $task->nextBy, "class='form-control chosen'");?></td><td></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->task->finishedDate;?></th>
-      <td><div class='datepicker-wrapper'><?php echo html::input('finishedDate', helper::today(), "class='form-control form-date'");?></div></td><td></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->files;?></th>
-      <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->comment;?></th>
-      <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
-    </tr>
-    <tr>
-      <th></th><td colspan='2'><?php echo html::submitButton($lang->task->finish);?></td>
-    </tr>
-  </table>
-</form>
-<div class='main'><?php include '../../common/view/action.html.php';?></div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/pause.html.php b/module/task/view/pause.html.php
index e62b4ed6e0..b8861d551e 100644
--- a/module/task/view/pause.html.php
+++ b/module/task/view/pause.html.php
@@ -12,26 +12,33 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['task']);?> <strong><?php echo $task->id;?></strong></span>
-    <strong><?php echo html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?></strong>
-    <small class='text-danger'> <?php echo $lang->task->pause;?> <?php echo html::icon($lang->icons['pause']);?></small>
+<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 isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <small><?php echo $lang->arrow . $lang->task->pause;?></small>
+      </div>
+    </div>
+
+    <form method='post' target='hiddenwin'>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-60px'><?php echo $lang->comment;?></th>
+          <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
+        </tr>
+        <tr>
+          <th></th>
+          <td>
+            <?php echo html::submitButton();?>
+            <?php echo html::linkButton($lang->goback, $this->session->taskList);?>
+          </td>
+        </tr>
+      </table>
+    </form>
+    <hr class='small' />
+    <div class='main'><?php include '../../common/view/action.html.php';?></div>
   </div>
 </div>
-
-<form class='form-condensed' method='post' target='hiddenwin'>
-  <table class='table table-form'>
-    <tr>
-      <th class='w-60px'><?php echo $lang->comment;?></th>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
-    </tr>
-    <tr>
-      <th></th><td><?php echo html::submitButton();?></td>
-    </tr>
-  </table>
-</form>
-<div class='main'>
-  <?php include '../../common/view/action.html.php';?>
-</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index 697cfa17ed..50f2c4ba5f 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -14,74 +14,76 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::set('confirmRecord',    $lang->task->confirmRecord);?>
 <?php js::set('noticeSaveRecord', $lang->task->noticeSaveRecord);?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['task']);?> <strong><?php echo $task->id;?></strong></span>
-    <strong><?php echo html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?></strong>
-    <small class='text-muted'> <?php echo $lang->task->logEfforts;?> <?php echo html::icon($lang->icons['recordEstimate']);?></small>
+<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 isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <small><?php echo $lang->arrow . $lang->task->logEfforts;?></small>
+      </div>
+    </div>
+    <form id="recordForm" method='post' target='hiddenwin' style='margin-top:25px'>
+      <table class='table table-form table-fixed'>
+        <?php if(count($estimates)):?>
+        <thead>
+          <tr class='text-center'>
+            <th class="w-id"><?php echo $lang->idAB;?></th>
+            <th class="w-100px"><?php echo $lang->task->date;?></th>
+            <th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
+            <th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
+            <th><?php echo $lang->comment;?></th>
+            <th class="w-60px"><?php echo $lang->actions;?></th>
+          </tr>
+        </thead>
+        <?php foreach($estimates as $estimate):?>
+        <tr class="text-center">
+          <td><?php echo $estimate->id;?></td>
+          <td><?php echo $estimate->date;?></td>
+          <td><?php echo $estimate->consumed;?></td>
+          <td><?php echo $estimate->left;?></td>
+          <td class="text-left"><?php echo $estimate->work;?></td>
+          <td align='center'>
+            <?php
+            if($task->status == 'wait' or $task->status == 'pause' or $task->status == 'doing')
+            {
+                common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', 'pencil', '', 'showinonlybody', true);
+                common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'remove', 'hiddenwin', 'showinonlybody');
+            }
+            ?>
+          </td>
+        </tr>
+        <?php endforeach;?>
+        <?php endif;?>
+        <?php if(in_array($task->status, array('wait', 'pause', 'doing'))):?>
+        <?php if(empty($task->team) || (!empty($task->team) && in_array($task->assignedTo, array_keys($task->team)))) :?>
+        <thead>
+          <tr class='text-center'>
+            <th class="w-id"><?php echo $lang->idAB;?></th>
+            <th class="w-120px"><?php echo $lang->task->date;?></th>
+            <th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
+            <th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
+            <th><?php echo $lang->comment;?></th>
+            <th class='w-10px'></th>
+          </tr>
+        </thead>
+        <?php for($i = 1; $i <= 3; $i++):?>
+        <tr class="text-center">
+          <td><?php echo $i . html::hidden("id[$i]", $i);?></td>
+          <td><?php echo html::input("dates[$i]", '', "class='form-control text-center form-date'");?></td>
+          <td><?php echo html::input("consumed[$i]", '', "class='form-control text-center' autocomplete='off'");?></td>
+          <td><?php echo html::input("left[$i]", '', "class='form-control text-center left' autocomplete='off'");?></td>
+          <td class="text-left"><?php echo html::textarea("work[$i]", '', "class='form-control' style='height:50px;'");?></td>
+          <td></td>
+        </tr>
+        <?php endfor;?>
+        <tr>
+          <td colspan='6' class='text-center'><?php echo html::submitButton() . html::backButton();?></td>
+        </tr>
+      </table>
+      <?php endif;?>
+      <?php endif;?>
+    </form>
   </div>
 </div>
-<div class='main'>
-  <form class='form-condensed' id="recordForm" method='post' target='hiddenwin' style='margin-top:25px'>
-    <table class='table table-form table-fixed'>
-      <?php if(count($estimates)):?>
-      <thead>
-        <tr class='text-center'>
-          <th class="w-id"><?php echo $lang->idAB;?></th>
-          <th class="w-100px"><?php echo $lang->task->date;?></th>
-          <th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
-          <th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
-          <th><?php echo $lang->comment;?></th>
-          <th class="w-60px"><?php echo $lang->actions;?></th>
-        </tr>
-      </thead>
-      <?php foreach($estimates as $estimate):?>
-      <tr class="text-center">
-        <td><?php echo $estimate->id;?></td>
-        <td><?php echo $estimate->date;?></td>
-        <td><?php echo $estimate->consumed;?></td>
-        <td><?php echo $estimate->left;?></td>
-        <td class="text-left"><?php echo $estimate->work;?></td>
-        <td align='center'>
-          <?php
-          if($task->status == 'wait' or $task->status == 'pause' or $task->status == 'doing')
-          {
-              common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', 'pencil', '', 'showinonlybody', true);
-              common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'remove', 'hiddenwin', 'showinonlybody');
-          }
-          ?>
-        </td>
-      </tr>
-      <?php endforeach;?>
-      <?php endif;?>
-      <?php if(in_array($task->status, array('wait', 'pause', 'doing'))):?>
-      <?php if(empty($task->team) || (!empty($task->team) && in_array($task->assignedTo, array_keys($task->team)))) :?>
-      <thead>
-        <tr class='text-center'>
-          <th class="w-id"><?php echo $lang->idAB;?></th>
-          <th class="w-120px"><?php echo $lang->task->date;?></th>
-          <th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
-          <th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
-          <th><?php echo $lang->comment;?></th>
-          <th class='w-10px'></th>
-        </tr>
-      </thead>
-      <?php for($i = 1; $i <= 3; $i++):?>
-      <tr class="text-center">
-        <td><?php echo $i . html::hidden("id[$i]", $i);?></td>
-        <td><?php echo html::input("dates[$i]", '', "class='form-control text-center form-date'");?></td>
-        <td><?php echo html::input("consumed[$i]", '', "class='form-control text-center' autocomplete='off'");?></td>
-        <td><?php echo html::input("left[$i]", '', "class='form-control text-center left' autocomplete='off'");?></td>
-        <td class="text-left"><?php echo html::textarea("work[$i]", '', "class='form-control' style='height:50px;'");?></td>
-        <td></td>
-      </tr>
-      <?php endfor;?>
-      <tr>
-        <td colspan='6' class='text-center'><?php echo html::submitButton() . html::backButton();?></td>
-      </tr>
-    </table>
-    <?php endif;?>
-    <?php endif;?>
-  </form>
-</div>
 <?php include '../../common/view/footer.lite.html.php';?>
diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php
index fbb6beab8f..b9581e93b4 100644
--- a/module/task/view/start.html.php
+++ b/module/task/view/start.html.php
@@ -14,44 +14,53 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::set('confirmFinish', $lang->task->confirmFinish);?>
-<?php if(!empty($task->team) && key($task->team) != $this->app->user->account):?>
-<div class="alert with-icon">
-  <i class="icon-info-sign"></i>
-  <div class="content">
-    <p><?php echo $lang->task->deniedNotice;?></p>
+<div id='mainContent' class='main-content'>
+  <?php if(!empty($task->team) && key($task->team) != $this->app->user->account):?>
+  <div class="alert with-icon">
+    <i class="icon-info-sign"></i>
+    <div class="content">
+      <p><?php echo $lang->task->deniedNotice;?></p>
+    </div>
   </div>
-</div>
-<?php else:?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['task']);?> <strong><?php echo $task->id;?></strong></span>
-    <strong><?php echo html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?></strong>
-    <small class='text-muted'><?php echo $lang->task->start;?> <?php echo html::icon($lang->icons['start']);?></small>
+  <?php else:?>
+  <div class='center-block'>
+    <div class='main-header'>
+      <h2>
+        <span class='label label-id'><?php echo $task->id;?></span>
+        <?php echo isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <small><?php echo $lang->arrow . $lang->task->start;?></small>
+      </div>
+    </div>
+    <form method='post' target='hiddenwin' onsubmit='return checkLeft();'>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-80px'><?php echo $lang->task->realStarted;?></th>
+          <td class='w-p25-f'><div class='datepicker-wrapper datepicker-date'><?php echo html::input('realStarted', $task->realStarted == '0000-00-00' ? helper::today() : $task->realStarted, "class='form-control form-date'");?></div></td>
+          <td></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->task->consumed;?></th>
+          <td><div class='input-group'><?php echo html::input('consumed', $task->consumed, "class='form-control' autocomplete='off'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div></td><td></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->task->left;?></th>
+          <td><div class='input-group'><?php echo html::input('left', $task->left, "class='form-control' autocomplete='off'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div></td><td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->comment;?></th>
+          <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
+        </tr>
+        <tr>
+          <td colspan='2'>
+            <?php echo html::submitButton($lang->task->start);?>
+            <?php echo html::linkButton($lang->goback, $this->session->taskList);?>
+          </td>
+        </tr>
+      </table>
+    </form>
+    <hr class='small' />
+    <div class='main'><?php include '../../common/view/action.html.php';?></div>
   </div>
+  <?php endif;?>
 </div>
-<form class='form-condensed' method='post' target='hiddenwin' onsubmit='return checkLeft();'>
-  <table class='table table-form'>
-    <tr>
-      <th class='w-80px'><?php echo $lang->task->realStarted;?></th>
-      <td class='w-p25-f'><div class='datepicker-wrapper datepicker-date'><?php echo html::input('realStarted', $task->realStarted == '0000-00-00' ? helper::today() : $task->realStarted, "class='form-control form-date'");?></div></td><td></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->task->consumed;?></th>
-      <td><div class='input-group'><?php echo html::input('consumed', $task->consumed, "class='form-control' autocomplete='off'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div></td><td></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->task->left;?></th>
-      <td><div class='input-group'><?php echo html::input('left', $task->left, "class='form-control' autocomplete='off'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div></td><td></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->comment;?></th>
-      <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
-    </tr>
-    <tr>
-      <th></th><td colspan='2'><?php echo html::submitButton($lang->task->start); ?></td>
-    </tr>
-  </table>
-</form>
-<div class='main'><?php include '../../common/view/action.html.php';?></div>
-<?php endif;?>
 <?php include '../../common/view/footer.html.php';?>