diff --git a/module/block/control.php b/module/block/control.php
index c8e9bc0d06..1fbda6efcf 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -240,9 +240,9 @@ class block extends control
             }
 
             $block->actionLink = '';
-            if($block->block == 'overview' && common::hasPriv('product', 'create'))
+            if($block->block == 'overview')
             {
-                if($module == 'product' && common::hasPriv('product', 'create')) $block->actionLink = html::a($this->createLink('product', 'create'), "<i class='icon icon-plus'> </i>" . $this->lang->product->create, '', "class='btn'");
+                if($module == 'product' && common::hasPriv('product', 'create')) $block->actionLink = html::a($this->createLink('product', 'create'), "<i class='icon icon-sm icon-plus'> </i>" . $this->lang->product->create, '', "class='btn btn-sm'");
                 if($module == 'project' && common::hasPriv('project', 'create')) $block->actionLink = html::a($this->createLink('project', 'create'), "<i class='icon icon-sm icon-plus'> </i>" . $this->lang->project->create, '', "class='btn btn-sm'");
             }
 
diff --git a/module/block/css/dashboard.css b/module/block/css/dashboard.css
index e69de29bb2..0326b2b2ad 100644
--- a/module/block/css/dashboard.css
+++ b/module/block/css/dashboard.css
@@ -0,0 +1,3 @@
+.nav > li > a.btn {color: #3c4353; margin-top: 4px;}
+.nav > li > a.btn-sm {padding: 2px 8px; font-size: 12px; line-height: 1.5; border-radius: 4px;}
+.block-statistic .nav-stacked {overflow: auto; max-height: 220px;}
diff --git a/module/block/view/projectoverviewblock.html.php b/module/block/view/projectoverviewblock.html.php
index e3d9d88751..6e5f30d148 100644
--- a/module/block/view/projectoverviewblock.html.php
+++ b/module/block/view/projectoverviewblock.html.php
@@ -10,6 +10,9 @@
  * @link        http://www.zentao.net
  */
 ?>
+<style>
+.block-overview .tile-amount {font-size: 48px; margin-bottom: 10px;}
+</style>
 <div class="panel-body table-row">
   <div class="col-6 text-middle text-center">
     <div class="tile">
@@ -30,9 +33,3 @@
     </ul>
   </div>
 </div>
-
-<style>
-.block-overview .tile-amount {font-size: 48px; margin-bottom: 10px;}
-.nav > li > a.btn{color: #3c4353;}
-.nav > li > a.btn-sm{padding: 2px 8px; font-size: 12px; line-height: 1.5; border-radius: 4px;}
-</style>
diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php
index 264cb9ae17..28a7b46cf9 100644
--- a/module/block/view/projectstatisticblock.html.php
+++ b/module/block/view/projectstatisticblock.html.php
@@ -1,3 +1,32 @@
+<style>
+.types-line {display: table; padding: 0; margin: 0 auto;}
+.types-line > li {display: table-cell;}
+.types-line > li > div {position: relative; padding: 18px 5px 5px; text-align: center;}
+.types-line > li > div:before {content: ''; display: block; background: #eee;  width: 100%; height: 2px; position: absolute; left: 50%; top: 4px;}
+.types-line > li:last-child > div:before {display: none;}
+.types-line > li > div:after {content: ''; display: block; background: #FFFFFF; box-shadow: 0 2px 4px 0 rgba(170,170,170,0.50), 0 0 5px 0 rgba(0,0,0,0.1); width: 10px; height: 10px; position: absolute; border-radius: 50%; top: 0; left: 50%; margin-left: -2px;}
+.types-line > li > div > small {display: block; color: #A6AAB8;}
+.types-line > li > div > span {display: block; color: #CBD0DB; font-size: 16px;}
+.product-info {position: relative; padding: 10px 10px 10px 200px;}
+.product-info + .product-info {margin-top: 10px;}
+.product-info .progress {position: absolute; left: 10px; top: 33px; width: 180px;}
+.product-info .progress-info {position: absolute; left: 8px; top: 8px; width: 180px; font-size: 12px;}
+.product-info .type-info {color: #A6AAB8; text-align: center;}
+.product-info .type-label {font-size: 12px;}
+.product-info .type-value {font-size: 14px;}
+.product-info .type-value > strong {font-size: 20px; color: #3C4353;}
+.product-info .actions {position: absolute; left: 10px; top: 14px;}
+.block-statistic .tile {margin-bottom: 30px;}
+.block-statistic .tile-title {font-size: 18px; color: #A6AAB8;}
+.block-statistic .tile-amount {font-size: 48px; margin-bottom: 10px;}
+.block-statistic .col-nav {border-left: 1px solid #EBF2FB; width: 260px; padding-left: 0;}
+.block-statistic .nav-secondary > li > a {font-size: 16px; color: #838A9D; position: relative; box-shadow: none; padding-left: 20px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; transition: all .2s;}
+.block-statistic .nav-secondary > li.active > a {font-size: 20px; color: #3C4353; background: transparent; box-shadow: none;}
+.block-statistic .nav-secondary > li.active > a:hover,
+.block-statistic .nav-secondary > li.active > a:focus,
+.block-statistic .nav-secondary > li > a:hover {box-shadow: none;}
+.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; left: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;}
+</style>
 <div class="panel-body">
   <div class="table-row">
     <div class="col tab-content">
@@ -88,34 +117,3 @@
     </div>
   </div>
 </div>
-
-<style>
-.types-line {display: table; padding: 0; margin: 0 auto;}
-.types-line > li {display: table-cell;}
-.types-line > li > div {position: relative; padding: 18px 5px 5px; text-align: center;}
-.types-line > li > div:before {content: ''; display: block; background: #eee;  width: 100%; height: 2px; position: absolute; left: 50%; top: 4px;}
-.types-line > li:last-child > div:before {display: none;}
-.types-line > li > div:after {content: ''; display: block; background: #FFFFFF; box-shadow: 0 2px 4px 0 rgba(170,170,170,0.50), 0 0 5px 0 rgba(0,0,0,0.1); width: 10px; height: 10px; position: absolute; border-radius: 50%; top: 0; left: 50%; margin-left: -2px;}
-.types-line > li > div > small {display: block; color: #A6AAB8;}
-.types-line > li > div > span {display: block; color: #CBD0DB; font-size: 16px;}
-.product-info {position: relative; padding: 10px 10px 10px 200px;}
-.product-info + .product-info {margin-top: 10px;}
-.product-info .progress {position: absolute; left: 10px; top: 33px; width: 180px;}
-.product-info .progress-info {position: absolute; left: 8px; top: 8px; width: 180px; font-size: 12px;}
-.product-info .type-info {color: #A6AAB8; text-align: center;}
-.product-info .type-label {font-size: 12px;}
-.product-info .type-value {font-size: 14px;}
-.product-info .type-value > strong {font-size: 20px; color: #3C4353;}
-.product-info .actions {position: absolute; left: 10px; top: 14px;}
-.block-statistic .tile {margin-bottom: 30px;}
-.block-statistic .tile-title {font-size: 18px; color: #A6AAB8;}
-.block-statistic .tile-amount {font-size: 48px; margin-bottom: 10px;}
-.block-statistic .col-nav {border-left: 1px solid #EBF2FB; width: 260px; padding-left: 0;}
-.block-statistic .nav-secondary > li > a {font-size: 16px; color: #838A9D; position: relative; box-shadow: none; padding-left: 20px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; transition: all .2s;}
-.block-statistic .nav-secondary > li.active > a {font-size: 20px; color: #3C4353; background: transparent; box-shadow: none;}
-.block-statistic .nav-secondary > li.active > a:hover,
-.block-statistic .nav-secondary > li.active > a:focus,
-.block-statistic .nav-secondary > li > a:hover {box-shadow: none;}
-.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; left: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;}
-.block-statistic .nav-stacked {overflow: auto; max-height: 220px;}
-</style>
diff --git a/module/bug/config.php b/module/bug/config.php
index 6ac9bc0717..88acd370e5 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -179,7 +179,7 @@ $config->bug->datatable->fieldList['severity']['required'] = 'no';
 
 $config->bug->datatable->fieldList['pri']['title']    = 'P';
 $config->bug->datatable->fieldList['pri']['fixed']    = 'left';
-$config->bug->datatable->fieldList['pri']['width']    = '40';
+$config->bug->datatable->fieldList['pri']['width']    = '50';
 $config->bug->datatable->fieldList['pri']['required'] = 'no';
 
 $config->bug->datatable->fieldList['title']['title']    = 'title';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 9e84e05f4a..24b408fb17 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -189,12 +189,12 @@ $lang->project->aboveAllProject = "以上所有{$lang->projectCommon}";
 $lang->project->selectProject   = "请选择{$lang->projectCommon}";
 $lang->project->beginAndEnd     = '起止时间';
 $lang->project->lblStats        = '工时统计';
-$lang->project->stats           = '可用工时<strong>%s</strong>工时，总共预计<strong>%s</strong>工时，已经消耗<strong>%s</strong>工时，预计剩余<strong>%s</strong>工时';
-$lang->project->taskSummary     = "本页共 <strong>%s</strong> 个任务，未开始 <strong>%s</strong>，进行中 <strong>%s</strong>，总预计<strong>%s</strong>工时，已消耗<strong>%s</strong>工时，剩余<strong>%s</strong>工时。";
-$lang->project->checkedSummary  = "选中 <strong>%total%</strong> 个任务，未开始 <strong>%wait%</strong>，进行中 <strong>%doing%</strong>，总预计<strong>%estimate%</strong>工时，已消耗<strong>%consumed%</strong>工时，剩余<strong>%left%</strong>工时。";
+$lang->project->stats           = '可用工时 <strong>%s</strong> 工时，总共预计 <strong>%s</strong> 工时，已经消耗 <strong>%s</strong> 工时，预计剩余 <strong>%s</strong> 工时';
+$lang->project->taskSummary     = "本页共 <strong>%s</strong> 个任务，未开始 <strong>%s</strong>，进行中 <strong>%s</strong>，总预计 <strong>%s</strong> 工时，已消耗 <strong>%s</strong> 工时，剩余 <strong>%s</strong> 工时。";
+$lang->project->checkedSummary  = "选中 <strong>%total%</strong> 个任务，未开始 <strong>%wait%</strong>，进行中 <strong>%doing%</strong>，总预计 <strong>%estimate%</strong> 工时，已消耗 <strong>%consumed%</strong> 工时，剩余 <strong>%left%</strong> 工时。";
 $lang->project->memberHours     = "%s共有 <strong>%s</strong> 个可用工时，";
-$lang->project->groupSummary    = "本组共 <strong>%s</strong> 个任务，未开始 <strong>%s</strong>，进行中 <strong>%s</strong>，总预计<strong>%s</strong>工时，已消耗<strong>%s</strong>工时，剩余<strong>%s</strong>工时。";
-$lang->project->groupSummaryAB  = "总任务<strong>%s</strong> ，未开始<strong>%s</strong>，进行中<strong>%s</strong>。<br />总预计<strong>%s</strong>，已消耗<strong>%s</strong>，剩余<strong>%s</strong>。";
+$lang->project->groupSummary    = "本组共 <strong>%s</strong> 个任务，未开始 <strong>%s</strong>，进行中 <strong>%s</strong>，总预计 <strong>%s</strong> 工时，已消耗 <strong>%s</strong> 工时，剩余 <strong>%s</strong> 工时。";
+$lang->project->groupSummaryAB  = "总任务 <strong>%s</strong>，未开始 <strong>%s</strong>，进行中 <strong>%s</strong>。<br />总预计 <strong>%s</strong>，已消耗 <strong>%s</strong>，剩余 <strong>%s</strong>。";
 $lang->project->noTimeSummary   = "本组共 <strong>%s</strong> 个任务，未开始 <strong>%s</strong>，进行中 <strong>%s</strong>";
 $lang->project->wbs             = "分解任务";
 $lang->project->batchWBS        = "批量分解";
diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php
index a6de7c7673..db1d970f28 100644
--- a/module/project/lang/zh-tw.php
+++ b/module/project/lang/zh-tw.php
@@ -189,12 +189,12 @@ $lang->project->aboveAllProject = "以上所有{$lang->projectCommon}";
 $lang->project->selectProject   = "請選擇{$lang->projectCommon}";
 $lang->project->beginAndEnd     = '起止時間';
 $lang->project->lblStats        = '工時統計';
-$lang->project->stats           = '可用工時<strong>%s</strong>工時，總共預計<strong>%s</strong>工時，已經消耗<strong>%s</strong>工時，預計剩餘<strong>%s</strong>工時';
-$lang->project->taskSummary     = "本頁共 <strong>%s</strong> 個任務，未開始 <strong>%s</strong>，進行中 <strong>%s</strong>，總預計<strong>%s</strong>工時，已消耗<strong>%s</strong>工時，剩餘<strong>%s</strong>工時。";
-$lang->project->checkedSummary  = "選中 <strong>%total%</strong> 個任務，未開始 <strong>%wait%</strong>，進行中 <strong>%doing%</strong>，總預計<strong>%estimate%</strong>工時，已消耗<strong>%consumed%</strong>工時，剩餘<strong>%left%</strong>工時。";
+$lang->project->stats           = '可用工時 <strong>%s</strong> 工時，總共預計 <strong>%s</strong> 工時，已經消耗 <strong>%s</strong> 工時，預計剩餘 <strong>%s</strong> 工時';
+$lang->project->taskSummary     = "本頁共 <strong>%s</strong> 個任務，未開始 <strong>%s</strong>，進行中 <strong>%s</strong>，總預計 <strong>%s</strong> 工時，已消耗 <strong>%s</strong> 工時，剩餘 <strong>%s</strong> 工時。";
+$lang->project->checkedSummary  = "選中 <strong>%total%</strong> 個任務，未開始 <strong>%wait%</strong>，進行中 <strong>%doing%</strong>，總預計 <strong>%estimate%</strong> 工時，已消耗 <strong>%consumed%</strong> 工時，剩餘 <strong>%left%</strong> 工時。";
 $lang->project->memberHours     = "%s共有 <strong>%s</strong> 個可用工時，";
-$lang->project->groupSummary    = "本組共 <strong>%s</strong> 個任務，未開始 <strong>%s</strong>，進行中 <strong>%s</strong>，總預計<strong>%s</strong>工時，已消耗<strong>%s</strong>工時，剩餘<strong>%s</strong>工時。";
-$lang->project->groupSummaryAB  = "總任務<strong>%s</strong> ，未開始<strong>%s</strong>，進行中<strong>%s</strong>。<br />總預計<strong>%s</strong>，已消耗<strong>%s</strong>，剩餘<strong>%s</strong>。";
+$lang->project->groupSummary    = "本組共 <strong>%s</strong> 個任務，未開始 <strong>%s</strong>，進行中 <strong>%s</strong>，總預計 <strong>%s</strong> 工時，已消耗 <strong>%s</strong> 工時，剩餘 <strong>%s</strong> 工時。";
+$lang->project->groupSummaryAB  = "總任務 <strong>%s</strong>，未開始 <strong>%s</strong>，進行中 <strong>%s</strong>。<br />總預計 <strong>%s</strong>，已消耗 <strong>%s</strong>，剩餘 <strong>%s</strong>。";
 $lang->project->noTimeSummary   = "本組共 <strong>%s</strong> 個任務，未開始 <strong>%s</strong>，進行中 <strong>%s</strong>";
 $lang->project->wbs             = "分解任務";
 $lang->project->batchWBS        = "批量分解";
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 20a4cfb094..f69dfc6b0e 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -148,8 +148,6 @@ js::set('browseType', $browseType);
     <div class="cell">
       <?php echo $moduleTree;?>
       <div class="text-center">
-        <?php common::printLink('project', 'edit',    "projectID=$projectID", $lang->edit, '', "class='btn btn-info btn-wide'");?>
-        <?php common::printLink('project', 'delete',  "projectID=$projectID&confirm=no", $lang->delete, 'hiddenwin', "class='btn btn-info btn-wide'");?>
         <?php common::printLink('tree', 'browsetask', "rootID=$projectID&productID=0", $lang->tree->manage, '', "class='btn btn-info btn-wide'");?>
         <hr class="space-sm" />
       </div>
diff --git a/module/story/config.php b/module/story/config.php
index f7d11e4e86..2e7b43e173 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -56,7 +56,7 @@ $config->story->datatable->fieldList['id']['required'] = 'yes';
 
 $config->story->datatable->fieldList['pri']['title']    = 'priAB';
 $config->story->datatable->fieldList['pri']['fixed']    = 'left';
-$config->story->datatable->fieldList['pri']['width']    = '40';
+$config->story->datatable->fieldList['pri']['width']    = '50';
 $config->story->datatable->fieldList['pri']['required'] = 'no';
 
 $config->story->datatable->fieldList['title']['title']    = 'title';
diff --git a/module/task/config.php b/module/task/config.php
index 89f09267bc..ad72f28bfb 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -64,7 +64,7 @@ $config->task->datatable->fieldList['id']['required'] = 'yes';
 
 $config->task->datatable->fieldList['pri']['title']    = 'priAB';
 $config->task->datatable->fieldList['pri']['fixed']    = 'left';
-$config->task->datatable->fieldList['pri']['width']    = '40';
+$config->task->datatable->fieldList['pri']['width']    = '50';
 $config->task->datatable->fieldList['pri']['required'] = 'no';
 
 $config->task->datatable->fieldList['name']['title']    = 'name';
@@ -79,7 +79,7 @@ $config->task->datatable->fieldList['type']['required'] = 'no';
 
 $config->task->datatable->fieldList['status']['title']    = 'statusAB';
 $config->task->datatable->fieldList['status']['fixed']    = 'no';
-$config->task->datatable->fieldList['status']['width']    = '70';
+$config->task->datatable->fieldList['status']['width']    = '80';
 $config->task->datatable->fieldList['status']['required'] = 'no';
 
 $config->task->datatable->fieldList['estimate']['title']    = 'estimateAB';
diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css
index d09664df48..09feb38df2 100644
--- a/module/task/css/batchcreate.css
+++ b/module/task/css/batchcreate.css
@@ -4,11 +4,15 @@
 .outer .chosen-container-single + .input-group-btn > .btn {border-left: 0}
 .outer .input-group > span {display: block; padding-right: 29px; max-width: 100%;}
 .outer .input-group-btn > a {display: block; position: absolute; right: 0; width: 29px; top: 0}
-.chosen-container[id^="story"] {width: 200px;}
-.chosen-container[id^="story"] .chosen-drop {min-width: 450px;!important}
-.chosen-container[id^="module"] .chosen-drop {min-width: 400px;!important}
+.chosen-container[id^="story"] {width: 200px; max-width: 150px;}
+.chosen-container[id^="story"] .chosen-drop {min-width: 450px !important;}
+.chosen-container[id^="module"] .chosen-drop {min-width: 400px !important;}
+[id^=name] {min-width: 165px;}
 
-#zeroTaskStory{background-color: #fafafa; color: #808080; padding: 5px 8px; text-align: center; margin-left: 10px; border: 1px solid #ddd; }
+#zeroTaskStory{background-color: #fafafa; color: #808080; padding: 5px 8px; text-align: center; margin-left: 10px; border: 1px solid #ddd;}
 #zeroTaskStory .icon{display:none;}
-#zeroTaskStory.zeroTask {background-color: #114f8e; color: #fff; border-color: #114f8e; }
+#zeroTaskStory.zeroTask {background-color: #006af1; color: #fff; border-color: #006af1;}
 #zeroTaskStory.zeroTask .icon{display:inline;}
+
+#batchCreateForm .input-group .colorpicker {z-index: 2;}
+#batchCreateForm .input-group .colorpicker.open {z-index: 5;}
diff --git a/module/task/model.php b/module/task/model.php
index 460ac6f0c4..efdb50cebe 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2094,7 +2094,7 @@ class taskModel extends model
             if($id == 'deadline' and isset($task->delay)) $class .= ' delayed';
             if($id == 'assignedTo')
             {
-                $class .= ' c-actions';
+                $class .= ' c-actions text-left';
                 if($task->assignedTo == $account) $class .= ' red';
             }
 
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index 6e0eceec37..356d5e4590 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -12,102 +12,124 @@
 ?>
 <?php include '../../common/view/header.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']);?></span>
-    <strong><small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small> <?php echo $lang->task->batchCreate;?></strong>
-      <?php if($project->type != 'ops'):?><span><small><a href='javascript:toggleZeroTaskStory();' id='zeroTaskStory'><?php echo $lang->story->zeroTask;?><i class='icon icon-remove'></i></a></small></span><?php endif;?>
-    <div class='actions'>
-      <?php echo html::commonButton($lang->pasteText, "data-toggle='myModal'", 'btn btn-primary')?>
-      <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->task->batchCreate;?>
+      <?php if($project->type != 'ops'):?>
+      <span><small><a href='javascript:toggleZeroTaskStory();' id='zeroTaskStory'><?php echo $lang->story->zeroTask;?><i class='icon icon-sm icon-close'></i></a></small></span>
+      <?php endif;?>
+    </h2>
+    <div class="pull-right btn-toolbar">
+      <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=task&section=custom&key=batchCreateFields')?>
+      <?php include '../../common/view/dropdowncustomfield.html.php';?>
     </div>
   </div>
+  <?php
+  $visibleFields = array();
+  foreach(explode(',', $showFields) as $field)
+  {
+      if($field)$visibleFields[$field] = '';
+  }
+  $colspan     = count($visibleFields) + 3;
+  $hiddenStory = ((isonlybody() and $storyID) || $this->config->global->flow == 'onlyTask') ? ' hidden' : '';
+  if($hiddenStory and isset($visibleFields['story'])) $colspan -= 1;
+  ?>
+  <form method='post' class='load-indicator main-form' enctype='multipart/form-data' target='hiddenwin' id="batchCreateForm">
+    <table class="table table-form" id="tableBody">
+      <thead>
+        <tr>
+          <th class='w-30px'><?php echo $lang->idAB;?></th>
+          <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->task->module?></th>
+          <?php if($project->type != 'ops'):?>
+          <th class='w-200px<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?>'><?php echo $lang->task->story;?></th>
+          <?php endif;?>
+          <th class='required has-btn'>
+            <?php echo $lang->task->name;?></span>
+            <button type='button' data-toggle="importLinesModal" class="btn btn-info"><?php echo $lang->pasteText;?></button>
+          </th>
+          <th class='w-80px required'><?php echo $lang->typeAB;?></span></th>
+          <th class='w-150px<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>'><?php echo $lang->task->assignedTo;?></th>
+          <th class='w-50px<?php echo zget($visibleFields, 'estimate', ' hidden')?>'><?php echo $lang->task->estimateAB;?></th>
+          <th class='w-100px<?php echo zget($visibleFields, 'estStarted', ' hidden')?>'><?php echo $lang->task->estStarted;?></th>
+          <th class='w-100px<?php echo zget($visibleFields, 'deadline', ' hidden')?>'><?php echo $lang->task->deadline;?></th>
+          <th class='<?php echo zget($visibleFields, 'desc', ' hidden')?>'><?php echo $lang->task->desc;?></th>
+          <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden')?>'><?php echo $lang->task->pri;?></th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php
+        $stories['ditto'] = $lang->task->ditto;
+        $lang->task->typeList['ditto'] = $lang->task->ditto;
+        $members['ditto'] = $lang->task->ditto;
+        $modules['ditto'] = $lang->task->ditto;
+        if($project->type == 'ops') $colspan = $colspan - 1;
+        ?>
+        <?php for($i = 0; $i < $config->task->batchCreate; $i++):?>
+        <?php
+        if($i == 0)
+        {
+            $currentStory = $storyID;
+            $type         = '';
+            $member       = '';
+            $module       = $story ? $story->module : '';
+        }
+        else
+        {
+            $currentStory = $type = $member = $module = 'ditto';
+        }
+        ?>
+        <?php $pri = 3;?>
+        <tr>
+          <td class='text-center'><?php echo $i + 1;?></td>
+          <td <?php echo zget($visibleFields, 'module', "class='hidden'")?> style='overflow:visible'>
+            <?php echo html::select("module[$i]", $modules, $module, "class='form-control chosen' onchange='setStories(this.value, $project->id, $i)'")?>
+            <?php echo html::hidden("parent[$i]", $parent);?>
+          </td>
+          <?php if($project->type != 'ops'):?>
+          <td <?php echo zget($visibleFields, 'story', "class='hidden'"); echo $hiddenStory;?> style='overflow: visible'>
+            <div class='input-group'>
+              <?php echo html::select("story[$i]", $stories, $currentStory, "class='form-control chosen' onchange='setStoryRelated($i)'");?>
+              <span class='input-group-btn'>
+                <a href='javascript:copyStoryTitle(<?php echo $i;?>)' class='btn' title='<?php echo $lang->task->copyStoryTitle; ?>'><i class='icon-angle-right'></i></a>
+                <?php echo html::hidden("storyEstimate$i") . html::hidden("storyDesc$i") . html::hidden("storyPri$i");?>
+              </span>
+            </div>
+          </td>
+          <?php endif;?>
+          <td style='overflow:visible'>
+            <div class='input-group'>
+              <div class="input-control has-icon-right">
+                <?php echo html::input("name[$i]", '', "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->story->colorTag;?><i class="icon icon-close"></i></li>
+                  </ul>
+                  <?php echo html::hidden("color[$i]", '', "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#name\\[$i\\]'");?>
+                </div>
+              </div>
+            </div>
+          </td>
+          <td><?php echo html::select("type[$i]", $lang->task->typeList, $type, 'class=form-control');?></td>
+          <td <?php echo zget($visibleFields, 'assignedTo', "class='hidden'")?> style='overflow:visible'><?php echo html::select("assignedTo[$i]", $members, $member, "class='form-control chosen'");?></td>
+          <td <?php echo zget($visibleFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimate[$i]", '', "class='form-control text-center' autocomplete='off'");?></td>
+          <td <?php echo zget($visibleFields, 'estStarted', "class='hidden'")?>><?php echo html::input("estStarted[$i]", '', "class='form-control text-center form-date'");?></td>
+          <td <?php echo zget($visibleFields, 'deadline', "class='hidden'")?>><?php echo html::input("deadline[$i]", '', "class='form-control text-center form-date'");?></td>
+          <td <?php echo zget($visibleFields, 'desc', "class='hidden'")?>><?php echo html::textarea("desc[$i]", '', "rows='1' class='form-control autosize'");?></td>
+          <td <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pri[$i]", (array)$lang->task->priList, $pri, 'class=form-control');?></td>
+        </tr>
+        <?php endfor;?>
+        <tr>
+          <td colspan='<?php echo $colspan?>' class='text-center'>
+            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </form>
 </div>
-<?php
-$visibleFields = array();
-foreach(explode(',', $showFields) as $field)
-{
-    if($field)$visibleFields[$field] = '';
-}
-$colspan     = count($visibleFields) + 3;
-$hiddenStory = ((isonlybody() and $storyID) || $this->config->global->flow == 'onlyTask') ? ' hidden' : '';
-if($hiddenStory and isset($visibleFields['story'])) $colspan -= 1;
-?>
-<form class='form-condensed' method='post' target='hiddenwin'>
-  <table class='table table-form table-fixed with-border' id="tableBody">
-    <thead>
-      <tr class='text-center'>
-        <th class='w-30px'><?php echo $lang->idAB;?></th> 
-        <th class='w-150px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->task->module?></th>
-        <?php if($project->type != 'ops'):?><th class='w-200px<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?>'><?php echo $lang->task->story;?></th><?php endif;?>
-        <th><?php echo $lang->task->name;?> <span class='required'></span></th>
-        <th class='w-80px'><?php echo $lang->typeAB;?> <span class='required'></span></th>
-        <th class='w-150px<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>'><?php echo $lang->task->assignedTo;?></th>
-        <th class='w-50px<?php echo zget($visibleFields, 'estimate', ' hidden')?>'><?php echo $lang->task->estimateAB;?></th>
-        <th class='w-100px<?php echo zget($visibleFields, 'estStarted', ' hidden')?>'><?php echo $lang->task->estStarted;?></th>
-        <th class='w-100px<?php echo zget($visibleFields, 'deadline', ' hidden')?>'><?php echo $lang->task->deadline;?></th>
-        <th class='w-p20<?php echo zget($visibleFields, 'desc', ' hidden')?>'><?php echo $lang->task->desc;?></th>
-        <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden')?>'><?php echo $lang->task->pri;?></th>
-      </tr>
-    </thead>
-
-    <?php
-    $stories['ditto'] = $lang->task->ditto; 
-    $lang->task->typeList['ditto'] = $lang->task->ditto; 
-    $members['ditto'] = $lang->task->ditto;
-    $modules['ditto'] = $lang->task->ditto;
-    if($project->type == 'ops') $colspan = $colspan - 1;
-    ?>
-    <?php for($i = 0; $i < $config->task->batchCreate; $i++):?>
-    <?php 
-    if($i == 0)
-    {
-        $currentStory = $storyID;
-        $type         = '';
-        $member       = '';
-        $module       = $story ? $story->module : '';
-    }
-    else
-    {
-        $currentStory = $type = $member = $module = 'ditto';
-    }
-    ?>
-    <?php $pri = 3;?>
-    <tr>
-      <td class='text-center'><?php echo $i + 1;?></td>
-      <td <?php echo zget($visibleFields, 'module', "class='hidden'")?> style='overflow:visible'>
-        <?php echo html::select("module[$i]", $modules, $module, "class='form-control chosen' onchange='setStories(this.value, $project->id, $i)'")?>
-        <?php echo html::hidden("parent[$i]", $parent);?>
-      </td>
-      <?php if($project->type != 'ops'):?>
-      <td <?php echo zget($visibleFields, 'story', "class='hidden'"); echo $hiddenStory;?> style='overflow: visible'>
-        <div class='input-group'>
-          <?php echo html::select("story[$i]", $stories, $currentStory, "class='form-control chosen' onchange='setStoryRelated($i)'");?>
-          <span class='input-group-btn'>
-            <a href='javascript:copyStoryTitle(<?php echo $i;?>)' class='btn' title='<?php echo $lang->task->copyStoryTitle; ?>'><i class='icon-angle-right'></i></a>
-            <?php echo html::hidden("storyEstimate$i") . html::hidden("storyDesc$i") . html::hidden("storyPri$i");?>
-          </span>
-        </div>
-      </td>
-      <?php endif;?>
-      <td style='overflow:visible'>
-        <div class='input-group'>
-        <?php echo html::hidden("color[$i]", '', "data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->task->colorTag}' data-update-text='#name\\[{$i}\\]'");?>
-        <?php echo html::input("name[$i]", '', "class='form-control' autocomplete='off'");?>
-        </div>
-      </td>
-      <td><?php echo html::select("type[$i]", $lang->task->typeList, $type, 'class=form-control');?></td>
-      <td <?php echo zget($visibleFields, 'assignedTo', "class='hidden'")?> style='overflow:visible'><?php echo html::select("assignedTo[$i]", $members, $member, "class='form-control chosen'");?></td>
-      <td <?php echo zget($visibleFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimate[$i]", '', "class='form-control text-center' autocomplete='off'");?></td>
-      <td <?php echo zget($visibleFields, 'estStarted', "class='hidden'")?>><?php echo html::input("estStarted[$i]", '', "class='form-control text-center form-date'");?></td>
-      <td <?php echo zget($visibleFields, 'deadline', "class='hidden'")?>><?php echo html::input("deadline[$i]", '', "class='form-control text-center form-date'");?></td>
-      <td <?php echo zget($visibleFields, 'desc', "class='hidden'")?>><?php echo html::textarea("desc[$i]", '', "rows='1' class='form-control autosize'");?></td>
-      <td <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pri[$i]", (array)$lang->task->priList, $pri, 'class=form-control');?></td>
-    </tr>
-    <?php endfor;?>
-    <tr><td colspan='<?php echo $colspan?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
-  </table>
-</form>
 <table class='hide' id='trTemp'>
   <tbody>
     <tr>
@@ -145,7 +167,5 @@ if($hiddenStory and isset($visibleFields['story'])) $colspan -= 1;
 <?php js::set('mainField', 'name');?>
 <?php js::set('ditto', $lang->task->ditto);?>
 <?php js::set('storyID', $storyID);?>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=task&section=custom&key=batchCreateFields')?>
-<?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/pastetext.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testcase/config.php b/module/testcase/config.php
index e65a2a5e24..dc0eae0691 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -83,7 +83,7 @@ $config->testcase->datatable->fieldList['id']['required'] = 'yes';
 
 $config->testcase->datatable->fieldList['pri']['title']    = 'priAB';
 $config->testcase->datatable->fieldList['pri']['fixed']    = 'left';
-$config->testcase->datatable->fieldList['pri']['width']    = '40';
+$config->testcase->datatable->fieldList['pri']['width']    = '50';
 $config->testcase->datatable->fieldList['pri']['required'] = 'no';
 
 $config->testcase->datatable->fieldList['title']['title']    = 'title';