diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index d39dda9c9b..ec54221e33 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -47,10 +47,8 @@
             </div>
             <div class="panel-body">
               <ul class="timeline timeline-tag-left">
-                <?php $i = 1;?>
                 <?php foreach($actions as $action):?>
-                <?php $i++;?>
-                <li <?php if($i % 3 == 0) echo "class='active'";?>>
+                <li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
                   <div>
                     <span class="timeline-tag"><?php echo $action->date;?></span>
                     <span class="timeline-text"><?php echo zget($users, $action->actor) . ' ' . $action->actionLabel . $action->objectLabel . ' ' . html::a($action->objectLink, $action->objectName);?></span>
diff --git a/module/project/css/common.css b/module/project/css/common.css
index 5a3dbfc7ee..a086dd2ac1 100644
--- a/module/project/css/common.css
+++ b/module/project/css/common.css
@@ -9,3 +9,5 @@
 .table-children.table-child-top{border-top:2px solid #ccc;}
 .table-children.table-child-bottom{border-bottom:2px solid #ccc;}
 .table-striped>tbody>tr.table-children:nth-child(odd)>td, .table-striped>tbody>tr.table-children:nth-child(odd)>th{background-color:#fff;}
+
+.chosen-container-single .chosen-single > span{max-width:200px;}
diff --git a/module/project/css/create.css b/module/project/css/create.css
index 30ede19d20..a7dcb82c26 100644
--- a/module/project/css/create.css
+++ b/module/project/css/create.css
@@ -15,4 +15,3 @@
 .checkbox input[type=checkbox], .checkbox-inline input[type=checkbox], .radio input[type=radio], .radio-inline input[type=radio] {margin-top: 1px;}
 
 .type-tips {display: none;}
-.chosen-container-single .chosen-single > span{max-width:200px;}
diff --git a/module/project/js/common.js b/module/project/js/common.js
index 222cb22d50..39a7476669 100644
--- a/module/project/js/common.js
+++ b/module/project/js/common.js
@@ -248,4 +248,5 @@ $(function()
     });
 
     adjustProductBoxMargin();
+    adjustPlanBoxMargin();
 });
diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php
index fb10dc0bcc..20b8a17436 100644
--- a/module/project/view/activate.html.php
+++ b/module/project/view/activate.html.php
@@ -14,46 +14,50 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
-<div class='container'>
-  <div id='titlebar'>
-    <div class='heading'>
-      <span class='prefix'><?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->id;?></strong></span>
-      <strong><?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?></strong>
-      <small class='text-success'> <?php echo $lang->project->activate;?> <?php echo html::icon($lang->icons['activate']);?></small>
-    </div>
+<div id='mainContent' class='main-content'>
+  <div class='main-header'>
+    <h2>
+      <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
+      <?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
+      <small><?php echo $lang->arrow . $lang->project->activate;?></small>
+    </h2>
   </div>
-  <form class='form-condensed' method='post' target='hiddenwin'>
+  <form class='load-indicator main-form' method='post' target='hiddenwin'>
     <table class='table table-form'>
       <tr>
-        <th class='w-80px text-right'><?php echo $lang->project->beginAndEnd;?></th>
-        <td class='w-250px'>
-          <div id='sourceTimeBox'>
-            <span style='display:inline-block; padding:5px 10px; width:85px'><?php echo $project->begin?></span>
-            <span style='padding:5px 10px'> ~ </span>
-            <span style='display:inline-block; padding:5px 10px; width:85px'><?php echo $project->end;?></span>
-          </div>
+        <th><?php echo $lang->project->beginAndEnd;?></th>
+        <td class='muted' colspan='2'>
+          <div id='sourceTimeBox'><?php echo $project->begin . ' ~ ' . $project->end;?></div>
           <div id='readjustTimeBox' class='hide'>
-            <span style='display:inline-block; width:85px'><?php echo html::input('begin', $newBegin, "class='form-control form-date'")?></span>
-            <span style='padding:5px 10px;'> ~ </span>
-            <span style='display:inline-block; width:85px'><?php echo html::input('end', $newEnd, "class='form-control form-date'");?></span>
+            <div class='input-group'>
+              <?php echo html::input('begin', $newBegin, "class='form-control form-date'")?>
+              <span class='input-group-addon'> ~ </span>
+              <?php echo html::input('end', $newEnd, "class='form-control form-date'");?>
+            </div>
           </div>
         </td>
-        </td>
-        <td>
-          <label class="checkbox-inline"><input name="readjustTime" value="1" id="readjustTime" type="checkbox"> <strong><?php echo $lang->project->readjustTime?></strong></label>
-          <span id='readjustTaskBox' class='hide'><label class="checkbox-inline"><input name="readjustTask" value="1" id="readjustTask" type="checkbox"> <strong><?php echo $lang->project->readjustTask?></strong></label></span>
+        <td colspan='3'>
+          <div class='clearfix row'>
+            <div class='col-md-6 pull-left'>
+              <div class="checkbox-primary"><input name="readjustTime" value="1" id="readjustTime" type="checkbox"><label for="readjustTime" class="no-margin"><?php echo $lang->project->readjustTime;?></label></div>
+            </div>
+            <div class='col-md-6 pull-left'>
+              <div id='readjustTaskBox' class='checkbox-primary hide'><input name="readjustTask" value="1" id="readjustTask" type="checkbox"> <label for='readjustTask' class='no-margin'><?php echo $lang->project->readjustTask?></label></div>
+            </div>
+          </div>
         </td>
       </tr>
       <tr>
-        <th class='text-right'><?php echo $lang->comment;?></th>
-        <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
+        <th><?php echo $lang->comment;?></th>
+        <td colspan='5'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
       </tr>
       <tr>
         <th></th>
-        <td><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
+        <td colspan='5'><?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>
 <script>
diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php
index ad9351e6a3..cca35dc7d6 100644
--- a/module/project/view/close.html.php
+++ b/module/project/view/close.html.php
@@ -12,26 +12,29 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container mw-800px'>
-  <div id='titlebar'>
-    <div class='heading'>
-      <span class='prefix'><?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->id;?></strong></span>
-      <strong><?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?></strong>
-      <small class='text-danger'> <?php echo $lang->project->close;?> <?php echo html::icon($lang->icons['close']);?></small>
-    </div>
+<div id='mainContent' class='main-content'>
+  <div class='main-header'>
+    <h2>
+      <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
+      <?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
+      <small> <?php echo $lang->arrow . $lang->project->close;?></small>
+    </h2>
   </div>
-  <form class='form-condensed' method='post' target='hiddenwin'>
+  <form class='load-indicator main-form' method='post' target='hiddenwin'>
     <table class='table table-form'>
-      <tr>
-        <th class='text-left'><?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() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
-      </tr>
+      <tbody>
+        <tr>
+          <th><?php echo $lang->comment;?></th>
+          <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
+        </tr>
+        <tr>
+          <th></th>
+          <td><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
+        </tr>
+      </tbody>
     </table>
   </form>
+   <hr class='small' />
   <div class='main'><?php include '../../common/view/action.html.php';?></div>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index c3a50aba12..20adc39ff8 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -18,8 +18,8 @@
   <div class='center-block'>
     <div class='main-header'>
       <h2>
-        <span class='prefix'><?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->id;?></strong></span>
-        <strong><?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?></strong>
+        <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
+        <?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
         <small><?php echo $lang->arrow . ' ' . $lang->project->edit;?></small>
       </h2>
     </div>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 9c9cc74182..9221042afc 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -47,10 +47,8 @@
             </div>
             <div class="panel-body">
               <ul class="timeline timeline-tag-left">
-                <?php $i = 1;?>
                 <?php foreach($actions as $action):?>
-                <?php $i++;?>
-                <li <?php if($i % 3 == 0) echo "class='active'";?>>
+                <li <?php if($action->actor == $this->app->user->account) echo "class='active'";?>>
                   <div>
                     <span class="timeline-tag"><?php echo $action->date;?></span>
                     <span class="timeline-text"><?php echo zget($users, $action->actor) . ' ' . $action->actionLabel . $action->objectLabel . ' ' . html::a($action->objectLink, $action->objectName);?></span>
@@ -74,10 +72,7 @@
             <div class="detail">
               <h2 class="detail-title"><span class="label-id"><?php echo $project->id;?></span> <span class="label label-light label-outline"><?php echo $project->code;?></span> <?php echo $project->name;?></h2>
               <div class="detail-content article-content">
-                <p>
-                  <span class="text-limit" data-limit-size="40"><?php echo $project->desc;?></span>
-                  <a class="text-primary text-limit-toggle small" data-text-expand="<?php echo $lang->expand;?>"  data-text-collapse="<?php echo $lang->collapse;?>"></a>
-                </p>
+                <p><span class="text-limit" data-limit-size="40"><?php echo $project->desc;?></span><a class="text-primary text-limit-toggle small" data-text-expand="<?php echo $lang->expand;?>"  data-text-collapse="<?php echo $lang->collapse;?>"></a></p>
                 <p>
                   <?php if($project->deleted):?>
                   <span class='label label-danger label-outline'><?php echo $lang->project->deleted;?></span>
diff --git a/module/story/css/common.css b/module/story/css/common.css
index bbf40b4424..cbf7b115fe 100644
--- a/module/story/css/common.css
+++ b/module/story/css/common.css
@@ -1,3 +1,7 @@
 .linkbox{height:180px; overflow-y:auto}
 .tab-pane .table-borderless {border: 1px solid #ddd!important}
 .tab-pane .table-data.table-borderless {border: none!important}
+
+.input-group .control-product + .chosen-container-single .chosen-single {border-radius: 2px 0 0 2px; border-right-width: 0; padding-right: 1px;}
+.input-group .control-product + .chosen-container-active .chosen-single {border-right-width: 1px; padding-right: 0;}
+.input-group .control-branch + .chosen-container-single .chosen-single {border-radius: 0 2px 2px 0;}
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index f68b8e0410..a3e51eb480 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -31,9 +31,10 @@
             <?php if($product->type != 'normal'):?>
             <div class='input-group'>
             <?php endif;?>
-            <?php echo html::select('product', $products, $productID, "onchange='loadProduct(this.value);' class='form-control chosen'");?>
+            <?php echo html::select('product', $products, $productID, "onchange='loadProduct(this.value);' class='form-control chosen control-product'");?>
             <?php if($product->type != 'normal'):?>
-            <?php echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control chosen'");?>
+            <span class='input-group-addon fix-border fix-padding'></span>
+            <?php echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control chosen control-branch'");?>
             </div>
             <?php endif;?>
           </td>
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 18d8287cd2..00c1df3372 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -68,8 +68,9 @@
                 <th class='w-80px'><?php echo $lang->story->product;?></th>
                 <td>
                   <div class='input-group'>
-                    <?php echo html::select('product', $products, $story->product, "onchange='loadProduct(this.value);' class='form-control chosen'");?>
-                    <?php if($product->type != 'normal') echo html::select('branch', $branches, $story->branch, "onchange='loadBranch();' class='form-control' style='width:65px'");?>
+                    <?php echo html::select('product', $products, $story->product, "onchange='loadProduct(this.value);' class='form-control chosen control-product'");?>
+                    <span class='input-group-addon fix-border fix-padding'></span>
+                    <?php if($product->type != 'normal') echo html::select('branch', $branches, $story->branch, "onchange='loadBranch();' class='form-control chosen control-branch'");?>
                   </div>
                 </td>
               </tr>
diff --git a/module/testcase/js/create.js b/module/testcase/js/create.js
index 0b693088a1..6d7acd8042 100644
--- a/module/testcase/js/create.js
+++ b/module/testcase/js/create.js
@@ -17,6 +17,7 @@ function setPreview()
 
 $(function()
 {
+    $('#product_chosen .chosen-single').css('max-width', $('#product_chosen').closest('td').width());
     var $searchStories = $('#searchStories');
     var lastSearchFn = false;
     var $searchInput = $('#storySearchInput');
@@ -33,10 +34,7 @@ $(function()
     };
     $(document).on('change', '#story', function()
     {
-       if($(this).val() === 'showmore')
-       {
-            showSearchModal();
-       }
+       if($(this).val() === 'showmore') showSearchModal();
     });
 
     $(document).on('click', '#story_chosen .chosen-results > li.no-results', showSearchModal);
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 501541a9c9..bbd0e21f97 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -15,196 +15,186 @@
 <?php js::set('lblDelete', $lang->testcase->deleteStep);?>
 <?php js::set('lblBefore', $lang->testcase->insertBefore);?>
 <?php js::set('lblAfter', $lang->testcase->insertAfter);?>
-<div class='container mw-1400px'>
-  <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['create']);?></small> <?php echo $lang->testcase->create;?></strong>
+<div id='mainContent' class='main-content'>
+  <div class='center-block'>
+    <div class='main-header'>
+      <h2><?php echo $lang->testcase->create;?></h2>
+      <div class="pull-right btn-toolbar">
+        <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=testcase&section=custom&key=createFields');?>
+        <?php include '../../common/view/customfield.html.php';?>
+      </div>
     </div>
-    <div class='actions'>
-      <button type='button' class='btn btn-default' data-toggle='customModal'><i class='icon icon-cog'></i></button>
-    </div>
-  </div>
-  <form class='form-condensed' method='post' enctype='multipart/form-data' id='dataform' data-type='ajax'>
+  <form class='load-indicator main-form form-ajax' method='post' enctype='multipart/form-data' id='dataform' data-type='ajax'>
     <table class='table table-form'>
-      <tr>
-        <th class='w-80px'><?php echo $lang->testcase->product;?></th>
-        <td class='w-p45-f'>
-          <div class='input-group'>
-            <?php echo html::select('product', $products, $productID, "onchange='loadAll(this.value);' class='form-control chosen'");?>
-            <?php if($this->session->currentProductType != 'normal') echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control' style='width:120px'");?>
-          </div>
-        </td>
-        <td style='padding-left:15px;'>
-          <div class='input-group' id='moduleIdBox'>
-          <span class="input-group-addon w-80px"><?php echo $lang->testcase->module?></span>
-          <?php
-          echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated();' class='form-control chosen'");
-          if(count($moduleOptionMenu) == 1)
-          {
-              echo "<span class='input-group-btn'>";
-              echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=case&currentModuleID=0&branch=$branch"), "<i class='icon icon-cog'></i>", '_blank', "data-toggle='tooltip' class='btn' title='{$lang->tree->manage}'");
-              echo html::a("javascript:loadProductModules($productID)", "<i class='icon icon-refresh'></i>", '', "data-toggle='tooltip' class='btn' title='{$lang->refresh}'");
-              echo '</span>';
-          }
-          ?>
-          </div>
-        </td><td></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->testcase->type;?></th>
-        <td><?php echo html::select('type', $lang->testcase->typeList, $type, "class='form-control chosen'");?></td>
-        <?php if(strpos(",$showFields,", 'stage') !== false):?>
-        <td style='padding-left:15px'>
-          <div class='input-group'>
-            <span class='input-group-addon w-80px'><?php echo $lang->testcase->stage?></span>
-            <?php echo html::select('stage[]', $lang->testcase->stageList, $stage, "class='form-control chosen' multiple='multiple'");?>
-          </div>
-        </td>
+      <tbody>
+        <tr>
+          <th class='w-80px'><?php echo $lang->testcase->product;?></th>
+          <td class='w-p45-f'>
+            <div class='input-group'>
+              <?php echo html::select('product', $products, $productID, "onchange='loadAll(this.value);' class='form-control chosen'");?>
+              <?php if($this->session->currentProductType != 'normal') echo html::select('branch', $branches, $branch, "onchange='loadBranch();' class='form-control' style='width:120px'");?>
+            </div>
+          </td>
+          <td style='padding-left:15px;'>
+            <div class='input-group' id='moduleIdBox'>
+            <span class="input-group-addon w-80px"><?php echo $lang->testcase->module?></span>
+            <?php
+            echo html::select('module', $moduleOptionMenu, $currentModuleID, "onchange='loadModuleRelated();' class='form-control chosen'");
+            if(count($moduleOptionMenu) == 1)
+            {
+                echo "<span class='input-group-btn'>";
+                echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=case&currentModuleID=0&branch=$branch"), "<i class='icon icon-cog'></i>", '_blank', "data-toggle='tooltip' class='btn' title='{$lang->tree->manage}'");
+                echo html::a("javascript:loadProductModules($productID)", "<i class='icon icon-refresh'></i>", '', "data-toggle='tooltip' class='btn' title='{$lang->refresh}'");
+                echo '</span>';
+            }
+            ?>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->testcase->type;?></th>
+          <td><?php echo html::select('type', $lang->testcase->typeList, $type, "class='form-control chosen'");?></td>
+          <?php if(strpos(",$showFields,", 'stage') !== false):?>
+          <td style='padding-left:15px'>
+            <div class='input-group'>
+              <span class='input-group-addon w-80px'><?php echo $lang->testcase->stage?></span>
+              <?php echo html::select('stage[]', $lang->testcase->stageList, $stage, "class='form-control chosen' multiple='multiple'");?>
+            </div>
+          </td>
+          <?php endif;?>
+        </tr>
+        <?php if(strpos(",$showFields,", ',story,') !== false and $this->config->global->flow != 'onlyTest'):?>
+        <tr>
+          <th><?php echo $lang->testcase->lblStory;?></th>
+          <td colspan='2'>
+            <div class='input-group' id='storyIdBox'>
+              <?php echo html::select('story', $stories, $storyID, 'class="form-control chosen" onchange="setPreview();" data-no_results_text="' . $lang->searchMore . '"');?>
+              <span class='input-group-btn' style='width: 0.01%'>
+              <?php if($storyID == 0): ?>
+                <a href='' id='preview' class='btn iframe hidden'><?php echo $lang->preview;?></a>
+              <?php else:?>
+                <?php echo html::a($this->createLink('story', 'view', "storyID=$storyID", '', true), $lang->preview, '', "class='btn iframe' id='preview'");?>
+              <?php endif;?>
+              </span>
+            </div>
+          </td>
+        </tr>
         <?php endif;?>
-      </tr>
-      <?php if(strpos(",$showFields,", ',story,') !== false and $this->config->global->flow != 'onlyTest'):?>
-      <tr>
-        <th><?php echo $lang->testcase->lblStory;?></th>
-        <td colspan='2'>
-          <div class='input-group' id='storyIdBox'>
-            <?php echo html::select('story', $stories, $storyID, 'class="form-control chosen" onchange="setPreview();" data-no_results_text="' . $lang->searchMore . '"');?>
-            <span class='input-group-btn' style='width: 0.01%'>
-            <?php if($storyID == 0): ?>
-              <a href='' id='preview' class='btn iframe hidden'><?php echo $lang->preview;?></a>
-            <?php else:?>
-              <?php echo html::a($this->createLink('story', 'view', "storyID=$storyID", '', true), $lang->preview, '', "class='btn iframe' id='preview'");?>
-            <?php endif;?>
-            </span>
-          </div>
-        </td>
-      </tr>
-      <?php endif;?>
-      <tr>
-        <th><?php echo $lang->testcase->title;?></th>
-        <td colspan='2'>
-           <div class='row-table'>
-            <div class='col-table w-p100'>
-              <div class='input-group w-p100'>
-                <input type='hidden' id='color' name='color' data-provide='colorpicker' data-wrapper='input-group-btn' data-pull-menu-right='false' data-btn-tip='<?php echo $lang->testcase->colorTag ?>' data-update-text='#title' value='<?php echo $color;?>'>
-                <?php echo html::input('title', $caseTitle, "class='form-control' autocomplete='off'");?>
-                <?php if(!$this->testcase->forceNotReview()):?>
-                <span class='input-group-addon'><?php echo html::checkbox('forceNotReview', $lang->testcase->forceNotReview, '', "id='forceNotReview'");?></span>
-                <?php endif;?>
+        <tr>
+          <th><?php echo $lang->testcase->title;?></th>
+          <td colspan='2'>
+            <div class="input-control has-icon-right">
+              <?php echo html::input('title', $caseTitle, "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>
+                <input type="hidden" class="colorpicker" id="color" name="color" value="" data-icon="color" data-wrapper="input-control-icon-right" data-update-color="#title"  data-provide="colorpicker">
               </div>
             </div>
-            <?php if(strpos(",$showFields,", ',pri,') !== false):?>
-            <div class='col-table'>
-              <div class='input-group'>
-                <span class='input-group-addon fix-border br-0'><?php echo $lang->testcase->pri;?></span>
-                <?php
-                $hasCustomPri = false;
-                foreach($lang->testcase->priList as $priKey => $priValue)
-                {
-                    if($priKey != $priValue or strlen($priKey) != strlen($priValue))
-                    {
-                        $hasCustomPri = true;
-                        break;
-                    }
-                }
-                ?>
-                <?php if($hasCustomPri):?>
-                <?php echo html::select('pri', (array)$lang->testcase->priList, $pri, "class='form-control minw-80px chosen'");?> 
-                <?php else: ?>
-                <div class='input-group-btn dropdown-pris'>
-                  <button type='button' class='btn dropdown-toggle br-0' data-toggle='dropdown'>
-                    <span class='pri-text'></span> &nbsp;<span class='caret'></span>
-                  </button>
-                  <ul class='dropdown-menu pull-right'></ul>
-                  <?php echo html::select('pri', (array)$lang->testcase->priList, $pri, "class='hide'");?>
-                </div>
-                <?php endif; ?>
-              </div>
-            </div>
-            <?php endif;?>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->testcase->precondition;?></th>
-        <td colspan='2'><?php echo html::textarea('precondition', $precondition, " rows='2' class='form-control'");?></td>
-      </tr>  
-      <tr>
-        <th><?php echo $lang->testcase->steps;?></th>
-        <td colspan='2'>
-          <table class='table table-form mg-0 table-bordered' style='border: 1px solid #ddd'>
-            <thead>
-              <tr>
-                <th class='w-40px text-right'><?php echo $lang->testcase->stepID;?></th>
-                <th width="45%"><?php echo $lang->testcase->stepDesc;?></th>
-                <th><?php echo $lang->testcase->stepExpect;?></th>
-                <th class='step-actions'><?php echo $lang->actions;?></th>
-              </tr>
-            </thead>
-            <tbody id='steps' class='sortable' data-group-name='<?php echo $lang->testcase->groupName ?>'>
-              <tr class='template step' id='stepTemplate'>
-                <td class='step-id'></td>
-                <td>
-                  <div class='input-group'>
-                    <span class='input-group-addon step-item-id'></span>
-                    <textarea rows='1' class='form-control autosize step-steps' name='steps[]'></textarea>
-                    <span class="input-group-addon step-type-toggle">
-                      <input type='hidden' name='stepType[]' value='item' class='step-type'>
-                      <label class="checkbox-inline"><input tabindex='-1' type="checkbox" class='step-group-toggle'> <?php echo $lang->testcase->group ?></label>
-                    </span>
-                  </div>
-                </td>
-                <td><textarea rows='1' class='form-control autosize step-expects' name='expects[]'></textarea></td>
-                <td class='step-actions'>
-                  <div class='btn-group'>
-                    <button type='button' class='btn btn-step-add' tabindex='-1'><i class='icon icon-plus'></i></button>
-                    <button type='button' class='btn btn-step-move' tabindex='-1'><i class='icon icon-move'></i></button>
-                    <button type='button' class='btn btn-step-delete' tabindex='-1'><i class='icon icon-remove'></i></button>
-                  </div>
-                </td>
-              </tr>
-              <?php foreach($steps as $stepID => $step):?>
-              <tr class='step'>
-                <td class='step-id'></td>
-                <td>
-                  <div class='input-group'>
-                    <span class='input-group-addon step-item-id'></span>
-                    <?php echo html::textarea('steps[]', $step->desc, "rows='1' class='form-control autosize step-steps'") ?>
-                    <span class='input-group-addon step-type-toggle'>
-                      <?php if(!isset($step->type)) $step->type = 'step';?>
-                      <input type='hidden' name='stepType[]' value='<?php echo $step->type;?>' class='step-type'>
-                      <label class="checkbox-inline"><input tabindex='-1' type="checkbox" class='step-group-toggle'<?php if($step->type === 'group') echo ' checked' ?>> <?php echo $lang->testcase->group ?></label>
-                    </span>
-                  </div>
-                </td>
-                <td><?php echo html::textarea('expects[]', $step->expect, "rows='1' class='form-control autosize step-expects'") ?></td>
-                <td class='step-actions'>
-                  <div class='btn-group'>
-                    <button type='button' class='btn btn-step-add' tabindex='-1'><i class='icon icon-plus'></i></button>
-                    <button type='button' class='btn btn-step-move' tabindex='-1'><i class='icon icon-move'></i></button>
-                    <button type='button' class='btn btn-step-delete' tabindex='-1'><i class='icon icon-remove'></i></button>
-                  </div>
-                </td>
-              </tr>
-              <?php endforeach; ?>
-            </tbody>
-          </table>
-        </td> 
-      </tr>
-      <?php if(strpos(",$showFields,", ',keywords,') !== false):?>
-      <tr>
-        <th><?php echo $lang->testcase->keywords;?></th>
-        <td colspan='2'><?php echo html::input('keywords', $keywords, "class='form-control' autocomplete='off'");?></td>
-      </tr>  
-      <?php endif;?>
-       <tr>
-        <th><?php echo $lang->testcase->files;?></th>
-        <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
-      </tr>  
-      <tr>
-        <th></th>
-        <td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?> </td>
-      </tr>
+          </td>
+        </tr>
+        <?php if(!$this->testcase->forceNotReview()):?>
+        <tr>
+          <th></th>
+          <td><?php echo html::checkbox('forceNotReview', $lang->testcase->forceNotReview, '', "id='forceNotReview0'");?></td>
+        </tr>
+        <?php endif;?>
+        <?php if(strpos(",$showFields,", ',pri,') !== false):?>
+        <tr>
+          <th><?php echo $lang->testcase->pri;?></th>
+          <td><?php echo html::select('pri', (array)$lang->testcase->priList, $pri, "class='form-control minw-80px chosen'");?></td>
+        </tr>
+        <?php endif;?>
+        <tr>
+          <th><?php echo $lang->testcase->precondition;?></th>
+          <td colspan='2'><?php echo html::textarea('precondition', $precondition, " rows='2' class='form-control'");?></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->testcase->steps;?></th>
+          <td colspan='2'>
+            <table class='table table-form mg-0 table-bordered' style='border: 1px solid #ddd'>
+              <thead>
+                <tr>
+                  <th class='w-40px text-right'><?php echo $lang->testcase->stepID;?></th>
+                  <th width="45%"><?php echo $lang->testcase->stepDesc;?></th>
+                  <th><?php echo $lang->testcase->stepExpect;?></th>
+                  <th class='step-actions'><?php echo $lang->actions;?></th>
+                </tr>
+              </thead>
+              <tbody id='steps' class='sortable' data-group-name='<?php echo $lang->testcase->groupName ?>'>
+                <tr class='template step' id='stepTemplate'>
+                  <td class='step-id'></td>
+                  <td>
+                    <div class='input-group'>
+                      <span class='input-group-addon step-item-id'></span>
+                      <textarea rows='1' class='form-control autosize step-steps' name='steps[]'></textarea>
+                      <span class="input-group-addon step-type-toggle">
+                        <input type='hidden' name='stepType[]' value='item' class='step-type'>
+                        <label class="checkbox-inline"><input tabindex='-1' type="checkbox" class='step-group-toggle'> <?php echo $lang->testcase->group ?></label>
+                      </span>
+                    </div>
+                  </td>
+                  <td><textarea rows='1' class='form-control autosize step-expects' name='expects[]'></textarea></td>
+                  <td class='step-actions'>
+                    <div class='btn-group'>
+                      <button type='button' class='btn btn-step-add' tabindex='-1'><i class='icon icon-plus'></i></button>
+                      <button type='button' class='btn btn-step-move' tabindex='-1'><i class='icon icon-move'></i></button>
+                      <button type='button' class='btn btn-step-delete' tabindex='-1'><i class='icon icon-trash'></i></button>
+                    </div>
+                  </td>
+                </tr>
+                <?php foreach($steps as $stepID => $step):?>
+                <tr class='step'>
+                  <td class='step-id'></td>
+                  <td>
+                    <div class='input-group'>
+                      <span class='input-group-addon step-item-id'></span>
+                      <?php echo html::textarea('steps[]', $step->desc, "rows='1' class='form-control autosize step-steps'") ?>
+                      <span class='input-group-addon step-type-toggle'>
+                        <?php if(!isset($step->type)) $step->type = 'step';?>
+                        <input type='hidden' name='stepType[]' value='<?php echo $step->type;?>' class='step-type'>
+                        <label class="checkbox-inline"><input tabindex='-1' type="checkbox" class='step-group-toggle'<?php if($step->type === 'group') echo ' checked' ?>> <?php echo $lang->testcase->group ?></label>
+                      </span>
+                    </div>
+                  </td>
+                  <td><?php echo html::textarea('expects[]', $step->expect, "rows='1' class='form-control autosize step-expects'") ?></td>
+                  <td class='step-actions'>
+                    <div class='btn-group'>
+                      <button type='button' class='btn btn-step-add' tabindex='-1'><i class='icon icon-plus'></i></button>
+                      <button type='button' class='btn btn-step-move' tabindex='-1'><i class='icon icon-move'></i></button>
+                      <button type='button' class='btn btn-step-delete' tabindex='-1'><i class='icon icon-trash'></i></button>
+                    </div>
+                  </td>
+                </tr>
+                <?php endforeach; ?>
+              </tbody>
+            </table>
+          </td> 
+        </tr>
+        <?php if(strpos(",$showFields,", ',keywords,') !== false):?>
+        <tr>
+          <th><?php echo $lang->testcase->keywords;?></th>
+          <td colspan='2'><?php echo html::input('keywords', $keywords, "class='form-control' autocomplete='off'");?></td>
+        </tr>  
+        <?php endif;?>
+         <tr>
+          <th><?php echo $lang->testcase->files;?></th>
+          <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
+        </tr>  
+      </tbody>
+      <tfoot>
+        <tr>
+          <td colspan='3' class='text-center'>
+            <?php
+            echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');
+            echo ' &nbsp; ';
+            echo html::backButton($lang->goback, '', 'btn btn-wide');
+            ?>
+          </td>
+        </tr>
+      </tfoot>
     </table>
   </form>
 </div>
@@ -224,7 +214,6 @@
     </div>
   </div>
 </div>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=testcase&section=custom&key=createFields');?>
-<?php include '../../common/view/customfield.html.php';?>
+</div>
 <?php js::set('caseModule', $lang->testcase->module)?>
 <?php include '../../common/view/footer.html.php';?>