diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php
index 9b71a2d80b..95ac73f3a8 100644
--- a/module/testcase/view/batchedit.html.php
+++ b/module/testcase/view/batchedit.html.php
@@ -12,122 +12,128 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('dittoNotice', $this->lang->testcase->dittoNotice);?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['testcase']);?></span>
-    <strong><small class='text-muted'><?php echo html::icon($lang->icons['batchEdit']);?></small> <?php echo $lang->testcase->common . $lang->colon . $lang->testcase->batchEdit;?></strong>
-    <div class='actions'>
-      <button type="button" class="btn btn-default" data-toggle="customModal"><i class='icon icon-cog'></i> </button>
+<div id="mainContent" class="main-content">
+  <div class="main-header">
+    <h2><?php echo $lang->testcase->common . $lang->colon . $lang->testcase->batchEdit;?></h2>
+    <div class="pull-right btn-toolbar">
+      <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=testcase&section=custom&key=batchEditFields')?>
+      <?php include '../../common/view/customfield.html.php';?>
     </div>
   </div>
-</div>
-<?php if(isset($suhosinInfo)):?>
-<div class='alert alert-info'><?php echo $suhosinInfo;?></div>
-<?php else:?>
-<?php
-$visibleFields  = array();
-$requiredFields = array();
-foreach(explode(',', $showFields) as $field)
-{
-    if($field)$visibleFields[$field] = '';
-}
-foreach(explode(',', $this->config->testcase->edit->requiredFields) as $field)
-{
-    if($field)
-    {
-        $requiredFields[$field] = '';
-        if(strpos(",{$config->testcase->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = '';
-    }
-}
-?>
-<form class='form-condensed' method='post' target='hiddenwin' action="<?php echo inLink('batchEdit');?>">
-  <table class='table table-form table-fixed'>
-    <thead>
-      <tr>
-        <th class='w-50px'><?php  echo $lang->idAB;?></th> 
-        <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden')?>'>
-          <?php echo $lang->priAB;?>
-          <?php if(isset($requiredFields['pri'])) echo " <span class='required'></span>";?>
-        </th>
-        <th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden')?>'>
-          <?php echo $lang->statusAB;?>
-          <?php if(isset($requiredFields['status'])) echo " <span class='required'></span>";?>
-        </th>
-        <?php if($branchProduct):?>
-        <th class='w-150px<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->testcase->branch;?></th>
-        <?php endif;?>
-        <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
-        <th class='w-150px<?php echo zget($visibleFields, 'story', ' hidden')?>'>
-          <?php echo $lang->testcase->story;?>
-          <?php if(isset($requiredFields['story'])) echo " <span class='required'></span>";?>
-        </th>
-        <th><?php echo $lang->testcase->title;?> <span class='required'></span></th>
-        <th class='w-120px'><?php echo $lang->testcase->type;?> <span class='required'></span></th>
-        <th class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'>
-          <?php echo $lang->testcase->precondition;?>
-          <?php if(isset($requiredFields['precondition'])) echo " <span class='required'></span>";?>
-        </th>
-        <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden')?>'>
-          <?php echo $lang->testcase->keywords;?>
-          <?php if(isset($requiredFields['keywords'])) echo " <span class='required'></span>";?>
-        </th>
-        <th class='w-300px<?php echo zget($visibleFields, 'stage', ' hidden')?>'>
-          <?php echo $lang->testcase->stage;?>
-          <?php if(isset($requiredFields['stage'])) echo " <span class='required'></span>";?>
-        </th>
-      </tr>
-    </thead>
-    <tbody>
-      <?php foreach($caseIDList as $caseID):?>
-      <?php
-      if(!isset($cases[$caseID])) continue;
-      if(!$productID and $branchProduct)
+  <?php if(isset($suhosinInfo)):?>
+  <div class='alert alert-info'><?php echo $suhosinInfo;?></div>
+  <?php else:?>
+  <?php
+  $visibleFields  = array();
+  $requiredFields = array();
+  foreach(explode(',', $showFields) as $field)
+  {
+      if($field)$visibleFields[$field] = '';
+  }
+  foreach(explode(',', $this->config->testcase->edit->requiredFields) as $field)
+  {
+      if($field)
       {
-          $product = $this->product->getByID($cases[$caseID]->product);
-
-          $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id);
-          if($product->type != 'normal')
-          {
-              foreach($branches as $branchID => $branchName) $branches[$branchID] = '/' . $product->name . '/' . $branchName;
-              $branches = array('ditto' => $this->lang->story->ditto) + $branches;
-          }
-
-          $modules = $this->tree->getOptionMenu($cases[$caseID]->product, $viewType = 'case', 0, $cases[$caseID]->branch);
-          $modules = array('ditto' => $this->lang->story->ditto) + $modules;
+          $requiredFields[$field] = '';
+          if(strpos(",{$config->testcase->customBatchEditFields},", ",{$field},") !== false) $visibleFields[$field] = '';
       }
-      ?>
-      <tr class='text-center'>
-        <td><?php echo $caseID . html::hidden("caseIDList[$caseID]", $caseID);?></td>
-        <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>   <?php echo html::select("pris[$caseID]",     $priList, $cases[$caseID]->pri, 'class=form-control');?></td>
-        <td class='<?php echo zget($visibleFields, 'status', 'hidden')?>'><?php echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control');?></td>
-        <?php if($branchProduct):?>
-        <td class='text-left<?php echo zget($visibleFields, 'branch', ' hidden')?>' style='overflow:visible'>
-          <?php $branchProductID = $productID ? $productID : $product->id;?>
-          <?php $disabled        = (isset($product) and $product->type == 'normal') ? "disabled='disabled'" : '';?>
-          <?php echo html::select("branches[$caseID]",  $branches,   $cases[$caseID]->branch, "class='form-control chosen' onchange='loadBranches($branchProductID, this.value, $caseID)', $disabled");?>
-        </td>
-        <?php endif;?>
-        <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$caseID]",  $modules,   $cases[$caseID]->module, "class='form-control chosen'");?></td>
-        <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden')?>' style='overflow:visible'><?php echo html::select("stories[$caseID]",  $stories,   $cases[$caseID]->story, "class='form-control chosen'");?></td>
-        <td style='overflow:visible' title='<?php echo $cases[$caseID]->title?>'>
-          <div class='input-group'>
-          <?php echo html::hidden("colors[$caseID]", $cases[$caseID]->color, "data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->testcase->colorTag}' data-update-text='#titles\\[{$caseID}\\]'");?>
-          <?php echo html::input("titles[$caseID]", $cases[$caseID]->title, "class='form-control' autocomplete='off'"); echo "<span class='star'>*</span>";?>
-          </div>
-        </td>
-        <td><?php echo html::select("types[$caseID]", $typeList, $cases[$caseID]->type, 'class=form-control');?></td>
-        <td class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[$caseID]", $cases[$caseID]->precondition, "rows='1' class='form-control autosize'")?></td>
-        <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[$caseID]", $cases[$caseID]->keywords, "class='form-control' autocomplete='off'");?></td>
-        <td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stages[$caseID][]", $lang->testcase->stageList, $cases[$caseID]->stage, "class='form-control chosen' multiple data-placeholder='{$lang->testcase->stage}'");?></td>
-      </tr>
-      <?php endforeach;?>
-    </tbody>
-    <tfoot>
-      <tr><td colspan='<?php echo $branchProduct ? (count($visibleFields) + 3) : (count($visibleFields) + 2);?>' class='text-center'><?php echo html::submitButton();?></td></tr>
-    </tfoot>
-  </table>
-</form>
+  }
+  ?>
+  <form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit');?>">
+    <table class='table table-form table-fixed'>
+      <thead>
+        <tr>
+          <th class='w-50px'><?php  echo $lang->idAB;?></th>
+          <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden')?>'>
+            <?php echo $lang->priAB;?>
+            <?php if(isset($requiredFields['pri'])) echo " <span class='required'></span>";?>
+          </th>
+          <th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden')?>'>
+            <?php echo $lang->statusAB;?>
+            <?php if(isset($requiredFields['status'])) echo " <span class='required'></span>";?>
+          </th>
+          <?php if($branchProduct):?>
+          <th class='w-150px<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->testcase->branch;?></th>
+          <?php endif;?>
+          <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
+          <th class='w-150px<?php echo zget($visibleFields, 'story', ' hidden')?>'>
+            <?php echo $lang->testcase->story;?>
+            <?php if(isset($requiredFields['story'])) echo " <span class='required'></span>";?>
+          </th>
+          <th><?php echo $lang->testcase->title;?> <span class='required'></span></th>
+          <th class='w-120px'><?php echo $lang->testcase->type;?> <span class='required'></span></th>
+          <th class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'>
+            <?php echo $lang->testcase->precondition;?>
+            <?php if(isset($requiredFields['precondition'])) echo " <span class='required'></span>";?>
+          </th>
+          <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden')?>'>
+            <?php echo $lang->testcase->keywords;?>
+            <?php if(isset($requiredFields['keywords'])) echo " <span class='required'></span>";?>
+          </th>
+          <th class='w-300px<?php echo zget($visibleFields, 'stage', ' hidden')?>'>
+            <?php echo $lang->testcase->stage;?>
+            <?php if(isset($requiredFields['stage'])) echo " <span class='required'></span>";?>
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach($caseIDList as $caseID):?>
+        <?php
+        if(!isset($cases[$caseID])) continue;
+        if(!$productID and $branchProduct)
+        {
+            $product = $this->product->getByID($cases[$caseID]->product);
+
+            $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id);
+            if($product->type != 'normal')
+            {
+                foreach($branches as $branchID => $branchName) $branches[$branchID] = '/' . $product->name . '/' . $branchName;
+                $branches = array('ditto' => $this->lang->story->ditto) + $branches;
+            }
+
+            $modules = $this->tree->getOptionMenu($cases[$caseID]->product, $viewType = 'case', 0, $cases[$caseID]->branch);
+            $modules = array('ditto' => $this->lang->story->ditto) + $modules;
+        }
+        ?>
+        <tr class='text-center'>
+          <td><?php echo $caseID . html::hidden("caseIDList[$caseID]", $caseID);?></td>
+          <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>   <?php echo html::select("pris[$caseID]",     $priList, $cases[$caseID]->pri, 'class=form-control');?></td>
+          <td class='<?php echo zget($visibleFields, 'status', 'hidden')?>'><?php echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control');?></td>
+          <?php if($branchProduct):?>
+          <td class='text-left<?php echo zget($visibleFields, 'branch', ' hidden')?>' style='overflow:visible'>
+            <?php $branchProductID = $productID ? $productID : $product->id;?>
+            <?php $disabled        = (isset($product) and $product->type == 'normal') ? "disabled='disabled'" : '';?>
+            <?php echo html::select("branches[$caseID]",  $branches,   $cases[$caseID]->branch, "class='form-control chosen' onchange='loadBranches($branchProductID, this.value, $caseID)', $disabled");?>
+          </td>
+          <?php endif;?>
+          <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("modules[$caseID]",  $modules,   $cases[$caseID]->module, "class='form-control chosen'");?></td>
+          <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden')?>' style='overflow:visible'><?php echo html::select("stories[$caseID]",  $stories,   $cases[$caseID]->story, "class='form-control chosen'");?></td>
+          <td style='overflow:visible' title='<?php echo $cases[$caseID]->title?>'>
+            <div class='input-group'>
+              <div class="input-control has-icon-right">
+                <?php echo html::input("title[$caseID]", $cases[$caseID]->title, "class='form-control' autocomplete='off'");?>
+                <div class="colorpicker">
+                  <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
+                  <ul class="dropdown-menu clearfix">
+                    <li class="heading"><?php echo $lang->testcase->colorTag;?><i class="icon icon-close"></i></li>
+                  </ul>
+                  <?php echo html::hidden("color[$caseID]", $cases[$caseID]->color, "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#title\\[$caseID\\]'");?>
+                </div>
+              </div>
+            </div>
+          </td>
+          <td><?php echo html::select("types[$caseID]", $typeList, $cases[$caseID]->type, 'class=form-control');?></td>
+          <td class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[$caseID]", $cases[$caseID]->precondition, "rows='1' class='form-control autosize'")?></td>
+          <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[$caseID]", $cases[$caseID]->keywords, "class='form-control' autocomplete='off'");?></td>
+          <td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stages[$caseID][]", $lang->testcase->stageList, $cases[$caseID]->stage, "class='form-control chosen' multiple data-placeholder='{$lang->testcase->stage}'");?></td>
+        </tr>
+        <?php endforeach;?>
+      </tbody>
+      <tfoot>
+        <tr><td colspan='<?php echo $branchProduct ? (count($visibleFields) + 3) : (count($visibleFields) + 2);?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td></tr>
+      </tfoot>
+    </table>
+  </form>
 <?php endif;?>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=testcase&section=custom&key=batchEditFields')?>
-<?php include '../../common/view/customfield.html.php';?>
+</div>
 <?php include '../../common/view/footer.html.php';?>