diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php
index d9f5f27db7..d29f4cb09e 100644
--- a/module/bug/view/activate.html.php
+++ b/module/bug/view/activate.html.php
@@ -12,38 +12,43 @@
 ?>
 <?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['bug']);?> <strong><?php echo $bug->id;?></strong></span>
-    <strong><?php echo html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title, '_blank');?></strong>
-    <small class='text-success'> <?php echo $lang->bug->activate;?></small>
+<div id='mainContent' class='main-content'>
+  <div class='center-block'>
+    <div class='main-header'>
+      <h2>
+        <span class='label label-id'><?php echo $bug->id;?></span>
+        <?php echo isonlybody() ? $bug->title : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
+
+        <?php if(!isonlybody()):?>
+        <small><?php echo $lang->arrow . $lang->bug->activate;?></small>
+        <?php endif;?>
+      </h2>
+    </div>
+    <form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-70px'><?php echo $lang->bug->assignedTo;?></th>
+          <td class='w-p25-f'><?php echo html::select('assignedTo', $users, $bug->resolvedBy, "class='form-control chosen'");?></td><td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->bug->openedBuild;?></th>
+          <td><?php echo html::select('openedBuild[]', $builds, $bug->openedBuild, 'size=4 multiple=multiple class="form-control chosen"');?></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><?php echo $lang->bug->files;?></th>
+          <td colspan='2' class='text-left'><?php echo $this->fetch('file', 'buildform');?></td>
+        </tr>
+        <tr>
+          <th></th><td colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></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-70px'><?php echo $lang->bug->assignedTo;?></th>
-      <td class='w-p25-f'><?php echo html::select('assignedTo', $users, $bug->resolvedBy, "class='form-control chosen'");?></td><td></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->bug->openedBuild;?></th>
-      <td><?php echo html::select('openedBuild[]', $builds, $bug->openedBuild, 'size=4 multiple=multiple class="form-control chosen"');?></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><?php echo $lang->bug->files;?></th>
-      <td colspan='2' class='text-left'><?php echo $this->fetch('file', 'buildform');?></td>
-    </tr>
-    <tr>
-      <th></th><td colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></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/bug/view/assignto.html.php b/module/bug/view/assignto.html.php
index b06b1b2330..ce1fc14d4d 100644
--- a/module/bug/view/assignto.html.php
+++ b/module/bug/view/assignto.html.php
@@ -16,34 +16,39 @@ include '../../common/view/kindeditor.html.php';
 js::set('holders', $lang->bug->placeholder);
 js::set('page', 'assignedto');
 ?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['bug']);?>  <strong><?php echo $bug->id;?></strong></span>
-    <strong><?php echo html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title, '_blank');?></strong>
-    <small class='text-muted'> <?php echo $lang->bug->assignBug;?> <?php echo html::icon($lang->icons['assignTo']);?></small>
+<div id='mainContent' class='main-content'>
+  <div class='center-block'>
+    <div class='main-header'>
+      <h2>
+        <span class='label label-id'><?php echo $bug->id;?></span>
+        <?php echo isonlybody() ? $bug->title : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
+
+        <?php if(!isonlybody()):?>
+        <small><?php echo $lang->arrow . $lang->bug->assignBug;?></small>
+        <?php endif;?>
+      </h2>
+    </div>
+    <form class='form-condensed' method='post' target='hiddenwin'>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-80px'><?php echo $lang->bug->assignBug;?></th>
+          <td class='w-p25-f'><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='form-control chosen'");?></td><td></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->bug->mailto;?></th>
+          <td colspan='2'><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="form-control chosen" multiple');?></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() . html::linkButton($lang->goback, $this->server->http_referer);?></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 $lang->bug->assignBug;?></th>
-      <td class='w-p25-f'><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='form-control chosen'");?></td><td></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->bug->mailto;?></th>
-      <td colspan='2'><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="form-control chosen" multiple');?></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() . html::linkButton($lang->goback, $this->server->http_referer);?></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/bug/view/close.html.php b/module/bug/view/close.html.php
index 975bc16454..16606021e5 100644
--- a/module/bug/view/close.html.php
+++ b/module/bug/view/close.html.php
@@ -12,26 +12,31 @@
 ?>
 <?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['bug']);?>  <strong><?php echo $bug->id;?></strong></span>
-    <strong><?php echo html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title, '_blank');?></strong>
-    <small class='text-danger'> <?php echo $lang->bug->close;?></small>
+<div id='mainContent' class='main-content'>
+  <div class='center-block'>
+    <div class='main-header'>
+      <h2>
+        <span class='label label-id'><?php echo $bug->id;?></span>
+        <?php echo isonlybody() ? $bug->title : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
+
+        <?php if(!isonlybody()):?>
+        <small><?php echo $lang->arrow . $lang->bug->close;?></small>
+        <?php endif;?>
+      </h2>
+    </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='w-p98'");?></td>
+        </tr>
+        <tr>
+          <th></th><td><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></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='w-p98'");?></td>
-    </tr>
-    <tr>
-      <th></th><td><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></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/bug/view/confirmbug.html.php b/module/bug/view/confirmbug.html.php
index 905221cd1f..285d3e8b7c 100755
--- a/module/bug/view/confirmbug.html.php
+++ b/module/bug/view/confirmbug.html.php
@@ -16,43 +16,48 @@ include '../../common/view/kindeditor.html.php';
 js::set('holders', $lang->bug->placeholder);
 js::set('page', 'confirmbug');
 ?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['bug']);?> <strong><?php echo $bug->id;?></strong></span>
-    <strong><?php echo html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title, '_blank');?></strong>
-    <small class='text-muted'> <?php echo $lang->bug->confirmBug;?> <?php echo html::icon($lang->icons['confirm']);?></small>
+<div id='mainContent' class='main-content'>
+  <div class='center-block'>
+    <div class='main-header'>
+      <h2>
+        <span class='label label-id'><?php echo $bug->id;?></span>
+        <?php echo isonlybody() ? $bug->title : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
+
+        <?php if(!isonlybody()):?>
+        <small><?php echo $lang->arrow . $lang->bug->confirmBug;?></small>
+        <?php endif;?>
+      </h2>
+    </div>
+    <form class='form-condensed' method='post' target='hiddenwin'>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-80px'><?php echo $lang->bug->assignedTo;?></th>
+          <td class='w-p25-f'><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='select-2 chosen'");?></td>
+          <td></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->bug->type;?></th>
+          <td><?php echo html::select('type', $lang->bug->typeList, $bug->type, 'class=form-control');?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->bug->pri;?></th>
+          <td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, 'class=form-control');?></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->bug->mailto;?></th>
+          <td colspan='2'><?php echo html::select('mailto[]', $users, str_replace(' ' , '', $bug->mailto), 'class="form-control chosen" multiple');?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->comment;?></th>
+          <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p94'");?></td>
+        </tr>
+        <tr>
+          <th></th><td colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></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 $lang->bug->assignedTo;?></th>
-      <td class='w-p25-f'><?php echo html::select('assignedTo', $users, $bug->assignedTo, "class='select-2 chosen'");?></td>
-      <td></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->bug->type;?></th>
-      <td><?php echo html::select('type', $lang->bug->typeList, $bug->type, 'class=form-control');?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->bug->pri;?></th>
-      <td><?php echo html::select('pri', $lang->bug->priList, $bug->pri, 'class=form-control');?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->bug->mailto;?></th>
-      <td colspan='2'><?php echo html::select('mailto[]', $users, str_replace(' ' , '', $bug->mailto), 'class="form-control chosen" multiple');?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->comment;?></th>
-      <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p94'");?></td>
-    </tr>
-    <tr>
-      <th></th><td colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></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/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index f2efd953d5..16b548698a 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -17,65 +17,70 @@
 js::set('page'      , 'resolve');
 js::set('productID' , $bug->product);
 ?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['bug']);?> <strong><?php echo $bug->id;?></strong></span>
-    <strong><?php echo html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title, '_blank');?></strong>
-    <small class='text-success'> <?php echo $lang->bug->resolve;?> <?php echo html::icon($lang->icons['resolve']);?></small>
+<div id='mainContent' class='main-content'>
+  <div class='center-block'>
+    <div class='main-header'>
+      <h2>
+        <span class='label label-id'><?php echo $bug->id;?></span>
+        <?php echo isonlybody() ? $bug->title : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
+
+        <?php if(!isonlybody()):?>
+        <small><?php echo $lang->arrow . $lang->bug->resolve;?></small>
+        <?php endif;?>
+      </h2>
+    </div>
+    <form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-100px'><?php echo $lang->bug->resolution;?></th>
+          <td class='w-p35-f'><?php echo html::select('resolution', $lang->bug->resolutionList, '', 'class=form-control onchange=setDuplicate(this.value)');?></td>
+          <td></td>
+        </tr>
+        <tr id='duplicateBugBox' class='hide'>
+          <th><?php echo $lang->bug->duplicateBug;?></th>
+          <td><?php echo html::input('duplicateBug', '', "class='form-control'");?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->bug->resolvedBuild;?></th>
+          <td id='newBuildProjectBox' class='hidden'>
+            <div class='input-group'>
+              <span class='input-group-addon'><?php echo $lang->build->project;?></span>
+              <?php echo html::select('buildProject', $projects, '', "class='form-control chosen'");?>
+            </div>
+          </td>
+          <td>
+            <div class='input-group'>
+              <span id='resolvedBuildBox'><?php echo html::select('resolvedBuild', $builds, '', "class='form-control chosen'");?></span>
+              <?php if(common::hasPriv('build', 'create')):?>
+              <span id='newBuildBox' class='hidden'><?php echo html::input('buildName', '', "class='form-control' placeholder='{$lang->bug->placeholder->newBuildName}'");?></span>
+              <span class='input-group-addon'><label class="checkbox-inline"><input name="createBuild" value="1" id="createBuild" type="checkbox"> <?php echo $lang->bug->createBuild?></label></span>
+              <?php endif;?>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->bug->resolvedDate;?></th>
+          <td><?php echo html::input('resolvedDate', helper::now(), "class='form-control form-date'");?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->bug->assignedTo;?></th>
+          <td><?php echo html::select('assignedTo', $users, $assignedTo, "class='form-control chosen'");?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->bug->files;?></th>
+          <td colspan='2'><?php echo $this->fetch('file', 'buildform', 'fileCount=1&percent=0.85');?></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() . html::linkButton($lang->goback, $this->session->bugList);?></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-100px'><?php echo $lang->bug->resolution;?></th>
-      <td class='w-p35-f'><?php echo html::select('resolution', $lang->bug->resolutionList, '', 'class=form-control onchange=setDuplicate(this.value)');?></td>
-      <td></td>
-    </tr>
-    <tr id='duplicateBugBox' class='hide'>
-      <th><?php echo $lang->bug->duplicateBug;?></th>
-      <td><?php echo html::input('duplicateBug', '', "class='form-control'");?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->bug->resolvedBuild;?></th>
-      <td id='newBuildProjectBox' class='hidden'>
-        <div class='input-group'>
-          <span class='input-group-addon'><?php echo $lang->build->project;?></span>
-          <?php echo html::select('buildProject', $projects, '', "class='form-control chosen'");?>
-        </div>
-      </td>
-      <td>
-        <div class='input-group'>
-          <span id='resolvedBuildBox'><?php echo html::select('resolvedBuild', $builds, '', "class='form-control chosen'");?></span>
-          <?php if(common::hasPriv('build', 'create')):?>
-          <span id='newBuildBox' class='hidden'><?php echo html::input('buildName', '', "class='form-control' placeholder='{$lang->bug->placeholder->newBuildName}'");?></span>
-          <span class='input-group-addon'><label class="checkbox-inline"><input name="createBuild" value="1" id="createBuild" type="checkbox"> <?php echo $lang->bug->createBuild?></label></span>
-          <?php endif;?>
-        </div>
-      </td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->bug->resolvedDate;?></th>
-      <td><?php echo html::input('resolvedDate', helper::now(), "class='form-control form-date'");?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->bug->assignedTo;?></th>
-      <td><?php echo html::select('assignedTo', $users, $assignedTo, "class='form-control chosen'");?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->bug->files;?></th>
-      <td colspan='2'><?php echo $this->fetch('file', 'buildform', 'fileCount=1&percent=0.85');?></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() . html::linkButton($lang->goback, $this->session->bugList);?></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/testtask/control.php b/module/testtask/control.php
index b7bde4f94e..ed23ab1f4f 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -525,7 +525,7 @@ class testtask extends control
         if(!empty($_POST))
         {
             $changes = $this->testtask->activate($taskID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -533,8 +533,8 @@ class testtask extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            if(isonlybody()) die(js::reload('parent.parent'));
-            die(js::locate($this->createLink('testtask', 'view', "taskID=$taskID"), 'parent'));
+            if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); 
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('testtask', 'view', "taskID=$taskID")));
         }
 
         /* Get task info. */
@@ -609,7 +609,7 @@ class testtask extends control
         if(!empty($_POST))
         {
             $changes = $this->testtask->block($taskID);
-            if(dao::isError()) die(js::error(dao::getError()));
+            if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
             if($this->post->comment != '' or !empty($changes))
             {
@@ -617,8 +617,8 @@ class testtask extends control
                 $this->action->logHistory($actionID, $changes);
             }
 
-            if(isonlybody()) die(js::reload('parent.parent'));
-            die(js::locate($this->createLink('testtask', 'view', "taskID=$taskID"), 'parent'));
+            if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('testtask', 'view', "taskID=$taskID")));
         }
 
         /* Get task info. */
diff --git a/module/testtask/js/common.js b/module/testtask/js/common.js
index 31d2bf42c6..63032b82b1 100644
--- a/module/testtask/js/common.js
+++ b/module/testtask/js/common.js
@@ -1,6 +1,6 @@
 $(document).ready(function()
 {    
-    $('#startForm, #closeForm').ajaxForm(
+    $('#startForm, #closeForm, #activateForm, #blockForm').ajaxForm(
     {
         finish:function(response)
         {
diff --git a/module/testtask/view/activate.html.php b/module/testtask/view/activate.html.php
index 20ee5fe6d5..5ea910797a 100644
--- a/module/testtask/view/activate.html.php
+++ b/module/testtask/view/activate.html.php
@@ -12,31 +12,28 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<?php include '../../common/view/datepicker.html.php';?>
-<div class='container mw-800px'>
-  <div id='titlebar'>
-    <div class='heading'>
-      <span class='prefix'><?php echo html::icon($lang->icons['testtask']);?> <strong><?php echo $testtask->id;?></strong></span>
-      <strong><?php echo html::a($this->createLink('testtask', 'view', 'taskID=' . $testtask->id), $testtask->name, '_blank');?></strong>
-      <small class='text-success'> <?php echo $lang->testtask->activate;?> <?php echo html::icon($lang->icons['start']);?></small>
+<div id='mainContent' class='main-content'>
+  <div class='center-block'>
+    <div class='main-header'>
+      <h2>
+        <span class='label label-id'><?php echo $testtask->id;?></span>
+        <?php echo html::a($this->createLink('testtask', 'view', 'taskID=' . $testtask->id), $testtask->name, '_blank');?>
+        <small><?php echo $lang->arrow . $lang->testtask->activate;?></small>
+      </div>
     </div>
-  </div>
-
-  <form class='form-condensed' method='post' target='hiddenwin'>
-    <table class='table table-form'>
-      <tr>
-        <th class='text-left'><?php echo $lang->comment;?></th>
-      </tr>
-      <tr>
-        <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
-      </tr>
-      <tr>
-        <td class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
-      </tr>
-    </table>
-  </form>
-  <div class='main'>
-    <?php include '../../common/view/action.html.php';?>
+    <form class='load-indicator main-form' method='post' id='activateForm'>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-45px'><?php echo $lang->comment;?></th>
+          <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
+        </tr>
+        <tr>
+          <td colspan='2' class='text-center'><?php echo html::submitButton() . 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>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/view/block.html.php b/module/testtask/view/block.html.php
index 923366c582..7ff5e5419f 100644
--- a/module/testtask/view/block.html.php
+++ b/module/testtask/view/block.html.php
@@ -13,30 +13,29 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<div class='container mw-800px'>
-  <div id='titlebar'>
-    <div class='heading'>
-      <span class='prefix'><?php echo html::icon($lang->icons['testtask']);?> <strong><?php echo $testtask->id;?></strong></span>
-      <strong><?php echo html::a($this->createLink('testtask', 'view', 'taskID=' . $testtask->id), $testtask->name, '_blank');?></strong>
-      <small class='text-success'> <?php echo $lang->testtask->block;?> <?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 $testtask->id;?></span>
+        <?php echo html::a($this->createLink('testtask', 'view', 'taskID=' . $testtask->id), $testtask->name, '_blank');?>
+        <small> <?php echo $lang->arrow . $lang->testtask->block;?></small>
+      </h2>
     </div>
-  </div>
+    <form class='load-indicator main-form' method='post' id='blockForm'>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-45px'><?php echo $lang->comment;?></th>
+          <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
+        </tr>
+        <tr>
+          <td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
+        </tr>
+      </table>
+    </form>
 
-  <form class='form-condensed' method='post' target='hiddenwin'>
-    <table class='table table-form'>
-      <tr>
-        <th class='text-left'><?php echo $lang->comment;?></th>
-      </tr>
-      <tr>
-        <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
-      </tr>
-      <tr>
-        <td class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
-      </tr>
-    </table>
-  </form>
-  <div class='main'>
-    <?php include '../../common/view/action.html.php';?>
+    <hr class='small' />
+    <div class='main'><?php include '../../common/view/action.html.php';?></div>
   </div>
 </div>
 <?php include '../../common/view/footer.html.php';?>