diff --git a/module/testcase/css/batchedit.css b/module/testcase/css/batchedit.css
index 4c4be58690..39b515da69 100644
--- a/module/testcase/css/batchedit.css
+++ b/module/testcase/css/batchedit.css
@@ -2,3 +2,8 @@
 .chosen  {z-index:99}
 .chosen-container[id^="module"] .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
 .chosen-container[id^="stories"] .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
+
+#batchEditForm .input-group,
+#batchEditForm .input-group .form-control {position: static;}
+#batchEditForm .input-group .colorpicker {z-index: 2;}
+#batchEditForm .input-group .colorpicker.open {z-index: 5;}
diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php
index 1576be1839..84854d4132 100644
--- a/module/testcase/view/batchcreate.html.php
+++ b/module/testcase/view/batchcreate.html.php
@@ -54,15 +54,15 @@
         <tr class='text-center'>
           <th class='w-50px'><?php echo $lang->idAB;?></th>
           <th class='w-120px<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo $lang->product->branch;?></th>
-          <th class='w-180px<?php echo zget($visibleFields, 'module', ' hidden') . zget($requiredFields, 'module', ' required');?>'><?php echo $lang->testcase->module;?></th>
-          <th class='w-180px<?php echo zget($visibleFields, 'story',  ' hidden') . zget($requiredFields, 'story',  ' required'); echo $hiddenStory;?>'> <?php echo $lang->testcase->story;?></th>
+          <th class='w-180px<?php echo zget($visibleFields, 'module', ' hidden') . zget($requiredFields, 'module', '', ' required');?>'><?php echo $lang->testcase->module;?></th>
+          <th class='w-180px<?php echo zget($visibleFields, 'story',  ' hidden') . zget($requiredFields, 'story',  '', ' required'); echo $hiddenStory;?>'> <?php echo $lang->testcase->story;?></th>
           <th class='text-left required has-btn'><?php echo $lang->testcase->title;?></span></th>
           <th class='w-120px text-left required'><?php echo $lang->testcase->type;?></th>
-          <th class='w-80px<?php  echo zget($visibleFields, 'pri',          ' hidden') . zget($requiredFields, 'pri',          ' required')?>'><?php echo $lang->testcase->pri;?></th>
-          <th class='w-150px<?php echo zget($visibleFields, 'precondition', ' hidden') . zget($requiredFields, 'precondition', ' required')?>'><?php echo $lang->testcase->precondition;?></th>
-          <th class='w-100px<?php echo zget($visibleFields, 'keywords',     ' hidden') . zget($requiredFields, 'keywords',     ' required')?>'><?php echo $lang->testcase->keywords;?></th>
-          <th class='w-140px<?php echo zget($visibleFields, 'stage',        ' hidden') . zget($requiredFields, 'stage',        ' required')?>'><?php echo $lang->testcase->stage;?></th>
-          <th class='w-70px<?php  echo zget($visibleFields, 'review',       ' hidden') . zget($requiredFields, 'review',       ' required')?>'><?php echo $lang->testcase->review;?></th>
+          <th class='w-80px<?php  echo zget($visibleFields, 'pri',          ' hidden') . zget($requiredFields, 'pri',          '', ' required')?>'><?php echo $lang->testcase->pri;?></th>
+          <th class='w-150px<?php echo zget($visibleFields, 'precondition', ' hidden') . zget($requiredFields, 'precondition', '', ' required')?>'><?php echo $lang->testcase->precondition;?></th>
+          <th class='w-100px<?php echo zget($visibleFields, 'keywords',     ' hidden') . zget($requiredFields, 'keywords',     '', ' required')?>'><?php echo $lang->testcase->keywords;?></th>
+          <th class='w-140px<?php echo zget($visibleFields, 'stage',        ' hidden') . zget($requiredFields, 'stage',        '', ' required')?>'><?php echo $lang->testcase->stage;?></th>
+          <th class='w-70px<?php  echo zget($visibleFields, 'review',       ' hidden') . zget($requiredFields, 'review',       '', ' required')?>'><?php echo $lang->testcase->review;?></th>
         </tr>
       </thead>
       <tbody>
diff --git a/module/testcase/view/batchedit.html.php b/module/testcase/view/batchedit.html.php
index 95ac73f3a8..a665d8151c 100644
--- a/module/testcase/view/batchedit.html.php
+++ b/module/testcase/view/batchedit.html.php
@@ -39,41 +39,23 @@
       }
   }
   ?>
-  <form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit');?>">
+  <form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit');?>" id='batchEditForm'>
     <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>
+          <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->priAB;?></th>
+          <th class='w-100px<?php echo zget($visibleFields, 'status', ' hidden') . zget($requiredFields, 'status', '', ' required');?>'><?php echo $lang->statusAB;?></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>
+          <th class='w-150px<?php echo zget($visibleFields, 'story', ' hidden') . zget($requiredFields, 'story', '', ' required');?>'><?php echo $lang->testcase->story;?></th>
+          <th class='required'><?php echo $lang->testcase->title;?></th>
+          <th class='w-120px required'><?php echo $lang->testcase->type;?></th>
+          <th class='<?php echo zget($visibleFields, 'precondition', 'hidden') . zget($requiredFields, 'precondition', '', ' required');?>'><?php echo $lang->testcase->precondition;?></th>
+          <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->testcase->keywords;?></th>
+          <th class='w-300px<?php echo zget($visibleFields, 'stage', ' hidden') . zget($requiredFields, 'stage', '', ' required');?>'><?php echo $lang->testcase->stage;?></th>
         </tr>
       </thead>
       <tbody>