diff --git a/module/bug/css/batchcreate.css b/module/bug/css/batchcreate.css
index 28eee7d348..c642497ba7 100644
--- a/module/bug/css/batchcreate.css
+++ b/module/bug/css/batchcreate.css
@@ -1,3 +1,6 @@
-textarea {height:16px}
-.w-220px {width:220px}
-.chosen-container .chosen-drop {min-width: 300px; border-top: 1px solid #ddd!important}
+#batchCreateForm .input-group,
+#batchCreateForm .input-group .form-control {position: static;}
+#batchCreateForm .input-group .colorpicker {z-index: 2;}
+#batchCreateForm .input-group .colorpicker.open {z-index: 5;}
+
+#importLines {white-space: nowrap; background: repeat-y url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAfQCAMAAADvtW+dAAAARVBMVEVMaXEAqv0Aqv0Aqv0Avv8Aqv0Atf8Arv8Arv8Arf8Aq/0Aq/8Aqv0Aqv0ArP8AqvwArP8Aqv0AqvwAqv8Aqv0Aqv0Aqf3TOCGrAAAAFnRSTlMA2fjHBO8JFxAlmESoiDFdO+a6Um977Wj3pQAAERxJREFUeF7d3dmq41YUBmHNs63J1vs/amyRInTXOhd9EUjWvv1RaChjmQ+dqPhXT9cP4dDU1xIP/cTA4TySDH1fpD7dtnXRsO1ttW8e+vbddI+90XCWTVEM1xgXmds4SFc+4mGpmzjUHgd5tc8wwFmdXdc1Grbq+p7Vwcf7DJmjP/tw2Mq2OoYo0qsZ6slD821xLGGQ9ai2cKivcoybP5eyiE9fue663MOmYWjPZpjKzgFe135/qH3GdaZ42jP0PwzLHA+vKx7GtgqHpn614fA4inCY2zEchr1+v6tpc8Djc6p6DQPoP6XB2bvMwbv+c8Lg1+dEQ3kOwxAMw9UX4dmuun41wbAur6niu11jNcTDcD01bO/PcAb/gKE6i7Guw5tB+cOXTHfOJM96mvGH4VE2ccNqi2P8eG8ux3CYr+uqo6mut+dRR7nnonheLtV/Pwd9MBTlMnTT3njY9qqNvwCG8xwy9+7v02nor/sEcYfPmY6fb7Xh+emn/liN8bBM8QXPP7+gj4eDD6iuyH8zn8dwmPe2OoKp+/5uX45g+N7L33UUvFxf7RoWv65y8DC2U/88ykbDq2zin2qP4/69NmuYr7noHm3Q/XHtbXvGv+HOPnnzZxMNa9tedR91Wpv+WDys+2c9Ww/bNX6614VPvb+X6xUM3eNo7+Q+z2v+wROWOMBrjwGir84iPlvib/V76GjOeV/XXard23r49dPxHbp2LZqF5nT4Ni/vL/dew2O676uzhulxh19/Gk4N77vrvmk4y/vjOGhofvrnFnNV7r99qLvx3vtza7I2l8PRXA5HczkcPYCt/+1Acxwua3M5HM3lcDSXw9HDDsdgh2PA4TTgcBpwOA04nAccTgMOp+Y4XNLmOJyb43BqjsOpBw6nAYfTgMNpwOE84HAacDgNOJwGHE7NcbiczeVwNJfD0VwORw85HIMcjgGH04DDaZDDMcjhGMRtHtQch0vaXA5HczkczeVw9JDDMcjhGORwDHI4Bjkcgx2OwQ7HgMOpOQ6XtLkcjuZyOJrL4eghh2PA4TTI4RjkcAxyOAY5HIMcjsEOR3McLmtzORzN5XA0l8PRQw7HIIdjkMMxiNUYcDgNXKABh9Ngh6M5Dpe1uRyO5nI4msvh6CGHY5DDMcjhGORwDHI4BjkcgxyOwQ5HcxwueXObjByO5nI4esjhGORwDHI4BjkcgxyOQQ7HgMNpkMPRPKvD0WPuI4cbjmuv3oHDLUf/1Ws5XHMr9/GWw7HK4fixEDlcsVbP0OG2ag0dbmxfocP1+9R1XSOHG8rrexY53DDep8fhkjbH4dwch3NzHE7NBVusDGrOoOYMas6g5gxqzqDmDGqOwyVtjsO5OQ7n5jicmtvhWHE4N8fh3ByHc/O9d3Mczs1xODXH4dQch0vaHIdzcxzOzXE4NZfDseJwao7DqTkOp+Y4nJrjcGqOw6k5DqfmOFzW5jicmuNwbo7DqbkcjhWHU3McTs1xODXH4dQch1NzuE3NGdQch0vaHIdzcxzOzXE4NZfDseJwao7DqTkOp+Y4nJrjcGqOw6k5DqfmOFzW5jicmpPFzXE4NZfDseJwao7DqTkOp+Y4nJrjcGqOw6k5DqfmOFza5jicmuNwao7DqbkcjhWHU3McTs1hNTXH4dScC9Qch1NzHE7Ncbi0zXE4Ncfh1ByHU3M5HCsOp+Y4nJrjcGqOw6k5DqfmOJya43BqjsNlbh6aDA7n5jicmsvhWHE4Ncfh1ByHU3McTs1xODXH4dQch1PzzA7XP8Pn4bqjass5cLjpGJpH28jhiu+d4VU14fNwU/sIn4d7XddZhA7Xv67NDnef+iGH629JOx52uGUZmvXa5HDFuFffD7Uc7r6PjzwPl7Y5DufmOJyb43BqDmypOYOaM6g5g5ozqDmDmjOoOYOa43BJm+Nwbo7DuTkOp+Y4nJrjcGqOw6k5DqfmOJya43BqjsOpOQ6n5jhc0uY4nJvjcG6Ow6k5DqfmOJya43BqjsOpOQ6n5jicmuNwao7DqTkOl7U5DqfmOJyb43BqjsOpOQ6n5jicmuNwao7DqTkOp+Zwm5ozqDkOl7Q5DufmOJyb43BqjsOpOQ6n5jicmuNwao7DqTkOp+Y4nJrjcGqOw2VtjsOpOWzi5jicmuNwao7DqTkOp+Y4nJrjcGqOw6k5DqfmOJya43Bpm+Nwao7DqTkOp+Y4nJrjcGqOw6k5rKbmOJyac4Ga43BqjsOpOQ6XtjkOp+Y4nJrjcGqOw6k5DqfmOJya43BqjsOpOQ6n5jicmuNwao7DZW4emgwO5+Y4nJrjcGqOw6k5DqfmOJya43BqjsOpOQ7n5jicm29F4jPa4e6zTjic/i48/LvUpv4MkcO962mKHG5rx89ghxvKV/EZ7HBL+37X9SqHex6fs++THO4+01TgcBrkcGgMDpe1OQ6n5jicm+Nwag5sqTmDmjOoOYOaM6g5g9L+4dD3lE/bHIdTcxzOzXE4Ncfh1ByHU3McTs1xODXH4dQch1NaHE4DDqfmOFzW5jicmuNwbo7DqTkOp+Y4nJrjcGqOw6k5DqfmOJzS4nAacDg1x+GyNsfh1ByHc3McTs1xODXH4dQch1NzHE7NcTg1x+GUVtymQc1xuKTNcTg1x+HcHIdTcxxOzXE4Ncfh1ByHU3McTs1xOKXF4TTgcGqOw2VtjsOpOQ7n5jicmuNwao7DqTkOp+Y4nJrjcGqOwyktDqcBh1NzHC5tcxxOzXE4Ncfh1ByHU3McTs1xODXH4dQch1NzLlBaHE4DDqfmOFza5jicmuNwao7DqTkOp+Y4nJrjcGqOw6k5DqfmOJzS4nAacDg1x+EyNw9NBodzcxxOzXE4Ncfh1ByHU3McTs1xODXH4ZQWh/OAw7n5lvr/+tkFDnden3MGDvdYhmFoAoc77myBw+1lOfWBw/X1+12WnR3u7l6tdrj7HH4erps+kbr2FT0P13SParTDPcu2rdbQ4baz53m4xM1xODXH4dQch1NzYEvNGdScQc0Z1JxBzRnUnEHNGdQch0vbHIdTcxxOzXE4Ncfh1ByHU3McTs1xODXH4dQch1NzHE7NcTg1x+HSNsfh1ByHU3McTs1xODXH4dQch1NzHE7NcTg1x+HUHIdTcxxOzXG4tM1xODXH4dQch1NzHE7NcTg1x+HUHIdTcxxOzXE4NYfb1JxBzXG4tM1xODXH4dQch1NzHE7NcTg1x+HUHIdTcxxOzXE4Ncfh1ByHU3McLm1zHE7NcTg1x+HUHIdTcxxOzXE4Ncfh1ByHU3McTs1xODXH4dQch0vbHIdTcxxOzXE4Ncfh1ByHU3McTs1xODXH4dScC9Qch1NzHE7Ncbi0zXE4Ncfh1ByHU3McTs1xODXH4dQch1NzHE7NcTg1x+HUHIdTcxwuc/PYZHA4Ncfh1ByHU3McTs1xODXH4dQch1NzHE7NcTg3x+HcfEvN7fHzcM/qGT4P15VT/J6GqexChzuruSkCh+v262qjv0t9tWv/CWWHO76WV75wuN+ei6zfdrj3PhZn9HepXX3t1yNyuGZeRxwucXMcTs1xODXH4dQc2FJzBjVnUHMGNWdQcwY1Z1BzBjXH4dI2x+HUHIdTcxxOzXE4Ncfh1ByHU3McTs1xODXH4dQch1NzHE7Ncbi0zXE4Ncfh1ByHU3McTs1xODXH4dQch1NzHE7NcTg1x+HUHIdTcxwubXMcTs1xODXH4dQch1NzHE7NcTg1x+HUHIdTcxxOzeE2NWdQcxwubXMcTs1xODXH4dQch1NzHE7NcTg1x+HUHIdTcxxOzXE4Ncfh1ByHS9sch1NzHE7NcTg1x+HUHIdTcxxOzXE4Ncfh1ByHU3McTs1xODXH4dI2x+HUHIdTcxxOzXE4Ncfh1ByHU3McTs1xODXnAjXH4dQch1NzHC5tcxxOzXE4Ncfh1ByHU3McTs1xODXH4dQch1NzHE7NcTg1x+HUHIfL3Dw2GRxOzXE4Ncfh1ByHU3McTs1xODXH4dQch1NzHE7NcTg1z+twQ/89gx2uvr7nYYfrhmGY2x6HE4uG72mY2yFwuDtT/L7Uc+/C96U2d3A7XLHuXfiehqa8fc8Ot96oGzjcwH0Jh0vaHIdTcxxOzXE4NQe21JxBzRnUnEHNGdScQc0Z1JxBzXG4tM1xODXH4dQch1NzHE7NcTg1x+HUHIdTcxxOzXE4Ncfh1ByHU3McLm1zHE7NcTg1x+HUHIdTcxxOzXE4Ncfh1ByHU3McTs1xODXH4dQch0vbHIdTcxxOzXE4Ncfh1ByHU3McTs1xODXH4dQch1NzuE3NGdQch0vbHIdTcxxOzXE4Ncfh1ByHU3McTs1xODXH4dQch1NzHE7NcTg1x+HSNsfh1ByHU3McTs1xODXH4dQch1NzHE7NcTg1x+HUHIdTcxxOzXG4tM1xODXH4dzcDhc/ek5zHE7NcTg3x+HUHIdTcy5QcxxOzXE4Ncfh0jbH4dQch1NzHE7NcTg1x+HUHIdTcxxOzXE4Ncfh1ByHU3McTs1xuMzNY5PB4dQch1NzHE7NcTg1x+HUHIdTcxxOzXE4Ncfh1ByHU/PU70vdwvc09HW1l2v4vtShWCs73P2tOl6jHW5uH2t9BA7XHPdtww531Nvwrp5yuP56xu9p2G73WxY5XLdPXTFXqx1ubqv9muL3NKR+Ho7mOJya43BqjsOpObCl5gxqzqDmDGrOoOYMas6g5gxqjsOlbY7DqTkOp+Y4nJrjcGqOw6k5DqfmOJya43BqjsOpOQ6n5jicmuNwaZvjcGqOw6k5DqfmOJya43BqjsOpOQ6n5jicmuNwao7DqTkOp+Y4XNbm+Iyb43BqjsOpOQ6n5jicmuNwao7DqTkOp+Y4nJrDbWrOoOY4XNrmOJya43BqjsOpOQ6n5jicmuNwao7DqTkOp+Y4nJrjcGqOw6k5Dpe2OQ6n5jicmuNwao7DqTkOp+Y4nJrjcGqOw6k5DqfmOJya43BqjsOlbY7DqTkOp+Y4nJrjcGqOw6k5DqfmsJqa43BqzgVqjsOpOQ6n5jhc2uY4nJrjcGqOw6k5DqfmOJya43BqjsOpOQ6n5jicmuNwao7DqTkOl7l5bDI4nJrjcGqOw6k5DqfmOJya43BqjsOpOQ6n5jicmuNwap7Y4ZptHiKHG8v7NmeHq5ehe7eDHK779miq2Q63v7/e3dvhXtX0aOvA4Yr1KAE6HA7HKafwebji/W0avKdhvJva4Xiuww439omfh6M5DufmOJyb43BqDmypOYOaM6g5g5ozqDmDmjOoOYOa43BJm+Nwbo7DuTkOp+Y4nJrjcGqOw6k5DqfmOJya43BqjsOpOQ6n5jhc0uY4nJvjcG6Ow6k5DqfmOJya43BqjsOpOQ6n5jicmuNwao7DqTkOl7U5DqfmOJyb43BqjsOpOQ6n5jicmuNwao7DqTkOp+Zwm5ozqDkOl7Q5DufmOJyb43BqjsOpOQ6n5jicmuNwao7DqTkOp+Y4nJrjcGqOw2VtjsOpOQ7n5jicmuNwao7DqTkOp+Y4nJrjcGqOw6k5DqfmOJya43Bpm+Nwao7DqTkOp+Y4nJrjcGqOw6k5DqfmOJyac4Ga43BqjsOpOQ6XtjkOp+Y4nJrjcGqOw6k5DqfmOJya43BqjsOpOQ6n5jicmuNwao7DZW4emgwO5+Y4nJrjcGqOw6k5DqfmOJya43BqjsOpOQ6n5jicmmd0uKHv7ubPufvF4Z7VdX7nut3bDYe7o/bleQNnU5y/Odx3GO5v2+OFwzEUz7v/Y8LhGIq5vFscONw/w34PCw7H8Ol3G8qEwzEU3f10TLnicAxFMR1NsbYdDvfP0Jd72c6/Otz4N0n+Z97T8Bf2jqX0StH3zQAAAABJRU5ErkJggg=="); background-position: 0 6px; padding-left: 30px; line-height: 20px;}
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index 73bd313475..6942d5687d 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -11,184 +11,185 @@
  */
 ?>
 <?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['bug']);?></span>
-    <strong>
-      <small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small>
+<div id='mainContent' class='main-content'>
+  <div class='main-header'>
+    <h2>
       <?php echo $lang->bug->batchCreate;?>
       <?php if($this->session->currentProductType !== 'normal') echo '<span class="label label-info">' . $branches[$branch] . '</span>';?>
-    </strong>
-    <div class='actions'>
-      <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=bug&params=' . helper::safe64Encode("productID=$productID&projectID=$projectID&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-primary' data-width='70%'")?>
-      <?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>
+    </h2>
+    <div class="pull-right btn-toolbar">
+      <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=bug&params=' . helper::safe64Encode("productID=$productID&projectID=$projectID&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-info' data-width='70%'")?>
+      <?php echo html::commonButton($lang->pasteText, "data-toggle='importLinesModal'", 'btn btn-info')?>
+      <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=bug&section=custom&key=batchCreateFields')?>
+      <?php include '../../common/view/customfield.html.php';?>
     </div>
   </div>
-</div>
-<?php
-$visibleFields  = array();
-$requiredFields = array();
-foreach(explode(',', $showFields) as $field)
-{
-    if($field) $visibleFields[$field] = '';
-}
-foreach(explode(',', $this->config->bug->create->requiredFields) as $field)
-{
-    if($field)
-    {
-        $requiredFields[$field] = '';
-        if(strpos(",{$config->bug->list->customBatchCreateFields},", ",{$field},") !== false) $visibleFields[$field] = '';
-    }
-}
-?>
-<form class='form-condensed' class='form-condensed' method='post' target='hiddenwin'>
-  <table class='table table-fixed table-form with-border'>
-    <thead>
-      <tr>
-        <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-120px'> <?php echo $lang->bug->module;?> <span class='required'></span></th>
-        <th class='w-130px<?php echo zget($visibleFields, 'project', ' hidden')?>'>
-          <?php echo $lang->bug->project;?>
-          <?php if(isset($requiredFields['project'])) echo " <span class='required'></span>";?>
-        </th>
-        <th><?php echo $lang->bug->openedBuild;?> <span class='required'></span></th>
-        <th><?php echo $lang->bug->title;?> <span class='required'></span></th>
-        <th class='<?php echo zget($visibleFields, 'deadline', 'hidden')?>'>
-          <?php echo $lang->bug->deadline;?>
-          <?php if(isset($requiredFields['deadline'])) echo " <span class='required'></span>";?>
-        </th>
-        <th class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'>
-          <?php echo $lang->bug->steps;?>
-          <?php if(isset($requiredFields['steps'])) echo " <span class='required'></span>";?>
-        </th>
-        <th class='w-100px<?php echo zget($visibleFields, 'type', ' hidden')?>'>
-          <?php echo $lang->typeAB;?>
-          <?php if(isset($requiredFields['type'])) echo " <span class='required'></span>";?>
-        </th>
-        <th class='w-80px<?php echo zget($visibleFields, 'pri', ' hidden')?>'>
-          <?php echo $lang->bug->pri;?>
-          <?php if(isset($requiredFields['pri'])) echo " <span class='required'></span>";?>
-        </th>
-        <th class='w-80px<?php echo zget($visibleFields, 'severity', ' hidden')?>'>
-          <?php echo $lang->bug->severity;?>
-          <?php if(isset($requiredFields['severity'])) echo " <span class='required'></span>";?>
-        </th>
-        <th class='w-120px<?php echo zget($visibleFields, 'os', ' hidden')?>'>
-          <?php echo $lang->bug->os;?>
-          <?php if(isset($requiredFields['os'])) echo " <span class='required'></span>";?>
-        </th>
-        <th class='w-100px<?php echo zget($visibleFields, 'browser', ' hidden')?>'>
-          <?php echo $lang->bug->browser;?>
-          <?php if(isset($requiredFields['browser'])) echo " <span class='required'></span>";?>
-        </th>
-        <th class='<?php echo zget($visibleFields, 'keywords', ' hidden')?>'>
-          <?php echo $lang->bug->keywords;?>
-          <?php if(isset($requiredFields['keywords'])) echo " <span class='required'></span>";?>
-        </th>
-      </tr>
-    </thead>
-    <tbody>
-      <?php
-      /* Remove the unused types. */
-      unset($lang->bug->typeList['designchange']);
-      unset($lang->bug->typeList['newfeature']);
-      unset($lang->bug->typeList['trackthings']);
 
-      $moduleOptionMenu       += array('ditto' => $lang->bug->ditto);
-      $projects               += array('ditto' => $lang->bug->ditto);
-      $lang->bug->typeList    += array('ditto' => $lang->bug->ditto);
-      $lang->bug->priList     += array('ditto' => $lang->bug->ditto);
-      $lang->bug->osList      += array('ditto' => $lang->bug->ditto);
-      $lang->bug->browserList += array('ditto' => $lang->bug->ditto);
-      ?>
-      <?php $i = 0; ?>
-      <?php if(!empty($titles)):?>
-      <?php foreach($titles as $bugTitle => $fileName):?>
-      <?php
-      $moduleID  = $i == 0 ? $moduleID  : 'ditto';
-      $projectID = $i == 0 ? $projectID  : 'ditto';
-      $type      = $i == 0 ? '' : 'ditto';
-      $pri       = $i == 0 ? 0  : 'ditto';
-      $os        = $i == 0 ? '' : 'ditto';
-      $browser   = $i == 0 ? '' : 'ditto';
-      ?>
-      <tr class='text-left'>
-        <td><?php echo $i+1;?></td>
-        <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>' style='overflow:visible'><?php echo html::select("branches[$i]", $branches, $branch, "class='form-control chosen' onchange='setBranchRelated(this.value, $productID, $i)'");?></td>
-        <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
-        <td class='text-left<?php echo zget($visibleFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
-        <td class='text-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, 'trunk', "class='form-control chosen' multiple");?></td>
-        <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->bug->colorTag}' data-update-text='#title\\[{$i}\\]'");?>
-          <?php echo html::input("title[$i]", $bugTitle, "class='form-control' autocomplete='off'") . html::hidden("uploadImage[$i]", $fileName);?>
-          </div>
-        </td>
-        <td class='<?php echo zget($visibleFields, 'deadline', 'hidden')?>'><?php echo html::input("deadlines[$i]", '', "class='form-control form-date'");?></td>
-        <td class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'><?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
-        <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>' style='overflow:visible'>    <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control chosen'");?></td>
-        <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>' style='overflow:visible'>     <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control chosen'");?></td>
-        <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>' style='overflow:visible'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control chosen'");?></td>
-        <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>' style='overflow:visible'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
-        <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>' style='overflow:visible'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
-        <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
-      </tr>
-      <?php $i++;?>
-      <?php endforeach;?>
-      <?php endif;?>
-      <?php $nextStart = $i;?>
-      <?php for($i = $nextStart; $i < $config->bug->batchCreate; $i++):?>
-      <?php
-      $moduleID  = $i - $nextStart == 0 ? $moduleID  : 'ditto';
-      $projectID = $i - $nextStart == 0 ? $projectID  : 'ditto';
-      $type      = $i - $nextStart == 0 ? '' : 'ditto';
-      $pri       = $i - $nextStart == 0 ? 0  : 'ditto';
-      $os        = $i - $nextStart == 0 ? '' : 'ditto';
-      $browser   = $i - $nextStart == 0 ? '' : 'ditto';
-      ?>
-      <tr class='text-left'>
-        <td><?php echo $i+1;?></td>
-        <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>' style='overflow:visible'><?php echo html::select("branches[$i]", $branches, $branch, "class='form-control chosen' onchange='setBranchRelated(this.value, $productID, $i)'");?></td>
-        <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
-        <td class='text-left<?php echo zget($visibleFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
-        <td class='text-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='form-control chosen' multiple");?></td>
-        <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->bug->colorTag}' data-update-text='#title\\[{$i}\\]'");?>
-          <?php echo html::input("title[$i]", '', "class='form-control' autocomplete='off'");?>
-          </div>
-        </td>
-        <td class='<?php echo zget($visibleFields, 'deadline', 'hidden')?>'><?php echo html::input("deadlines[$i]", '', "class='form-control form-date'");?></td>
-        <td class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'><?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
-        <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>' style='overflow:visible'>    <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control chosen'");?></td>
-        <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>' style='overflow:visible'>     <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control chosen'");?></td>
-        <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>' style='overflow:visible'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control chosen'");?></td>
-        <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>' style='overflow:visible'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
-        <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>' style='overflow:visible'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
-        <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
-      </tr>
-      <?php endfor;?>
-    </tbody>
-    <tfoot>
-      <tr><td colspan='<?php echo count($visibleFields) + 3?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
-    </tfoot>
-  </table>
-</form>
+  <?php
+  $visibleFields  = array();
+  $requiredFields = array();
+  foreach(explode(',', $showFields) as $field)
+  {
+      if($field) $visibleFields[$field] = '';
+  }
+  foreach(explode(',', $this->config->bug->create->requiredFields) as $field)
+  {
+      if($field)
+      {
+          $requiredFields[$field] = '';
+          if(strpos(",{$config->bug->list->customBatchCreateFields},", ",{$field},") !== false) $visibleFields[$field] = '';
+      }
+  }
+  ?>
+  <form class='load-indicator main-form' method='post' target='hiddenwin' id='batchCreateForm'>
+    <table class='table table-form'>
+      <thead>
+        <tr>
+          <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-120px required'> <?php echo $lang->bug->module;?></th>
+          <th class='w-130px<?php echo zget($visibleFields, 'project', ' hidden') . zget($requiredFields, 'project', '', ' required');?>'><?php echo $lang->bug->project;?></th>
+          <th class='required'><?php echo $lang->bug->openedBuild;?></th>
+          <th class='required'><?php echo $lang->bug->title;?></th>
+          <th class='<?php echo zget($visibleFields, 'deadline', 'hidden') . zget($requiredFields, 'deadline', '', ' required');?>'><?php echo $lang->bug->deadline;?></th>
+          <th class='<?php echo zget($visibleFields, 'steps', 'hidden') . zget($requiredFields, 'steps', '', ' required');?>'><?php echo $lang->bug->steps;?></th>
+          <th class='w-100px<?php echo zget($visibleFields, 'type', ' hidden') . zget($requiredFields, 'type', '', ' required');?>'><?php echo $lang->typeAB;?></th>
+          <th class='w-80px<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->bug->pri;?></th>
+          <th class='w-90px<?php echo zget($visibleFields, 'severity', ' hidden') . zget($requiredFields, 'severity', '', ' required');?>'><?php echo $lang->bug->severity;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, 'os', ' hidden') . zget($requiredFields, 'os', '', ' required');?>'><?php echo $lang->bug->os;?></th>
+          <th class='w-100px<?php echo zget($visibleFields, 'browser', ' hidden') . zget($requiredFields, 'browser', '', ' required');?>'><?php echo $lang->bug->browser;?></th>
+          <th class='<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->bug->keywords;?></th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php
+        /* Remove the unused types. */
+        unset($lang->bug->typeList['designchange']);
+        unset($lang->bug->typeList['newfeature']);
+        unset($lang->bug->typeList['trackthings']);
+  
+        $moduleOptionMenu       += array('ditto' => $lang->bug->ditto);
+        $projects               += array('ditto' => $lang->bug->ditto);
+        $lang->bug->typeList    += array('ditto' => $lang->bug->ditto);
+        $lang->bug->priList     += array('ditto' => $lang->bug->ditto);
+        $lang->bug->osList      += array('ditto' => $lang->bug->ditto);
+        $lang->bug->browserList += array('ditto' => $lang->bug->ditto);
+        ?>
+        <?php $i = 0; ?>
+        <?php if(!empty($titles)):?>
+        <?php foreach($titles as $bugTitle => $fileName):?>
+        <?php
+        $moduleID  = $i == 0 ? $moduleID  : 'ditto';
+        $projectID = $i == 0 ? $projectID  : 'ditto';
+        $type      = $i == 0 ? '' : 'ditto';
+        $pri       = $i == 0 ? 0  : 'ditto';
+        $os        = $i == 0 ? '' : 'ditto';
+        $browser   = $i == 0 ? '' : 'ditto';
+        ?>
+        <tr>
+          <td class='text-center'><?php echo $i+1;?></td>
+          <td class='<?php echo zget($visibleFields, $product->type, ' hidden')?>' style='overflow:visible'><?php echo html::select("branches[$i]", $branches, $branch, "class='form-control chosen' onchange='setBranchRelated(this.value, $productID, $i)'");?></td>
+          <td class='<?php echo zget($visibleFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
+          <td class='<?php echo zget($visibleFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
+          <td style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, 'trunk', "class='form-control chosen' multiple");?></td>
+          <td style='overflow:visible'>
+            <div class='input-group'>
+              <div class="input-control has-icon-right">
+                <?php echo html::input("title[$i]", $bugTitle, "class='form-control' autocomplete='off'") . html::hidden("uploadImage[$i]", $fileName);?>
+                <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='#title\\[{$i}\\]'");?>
+                </div>
+              </div>
+            </div>
+          </td>
+          <td class='<?php echo zget($visibleFields, 'deadline', 'hidden')?>'><?php echo html::input("deadlines[$i]", '', "class='form-control form-date'");?></td>
+          <td class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'><?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
+          <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>' style='overflow:visible'>    <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control chosen'");?></td>
+          <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>' style='overflow:visible'>     <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control chosen'");?></td>
+          <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>' style='overflow:visible'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control chosen'");?></td>
+          <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>' style='overflow:visible'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
+          <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>' style='overflow:visible'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
+          <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
+        </tr>
+        <?php $i++;?>
+        <?php endforeach;?>
+        <?php endif;?>
+        <?php $nextStart = $i;?>
+        <?php for($i = $nextStart; $i < $config->bug->batchCreate; $i++):?>
+        <?php
+        $moduleID  = $i - $nextStart == 0 ? $moduleID  : 'ditto';
+        $projectID = $i - $nextStart == 0 ? $projectID  : 'ditto';
+        $type      = $i - $nextStart == 0 ? '' : 'ditto';
+        $pri       = $i - $nextStart == 0 ? 0  : 'ditto';
+        $os        = $i - $nextStart == 0 ? '' : 'ditto';
+        $browser   = $i - $nextStart == 0 ? '' : 'ditto';
+        ?>
+        <tr>
+          <td><?php echo $i+1;?></td>
+          <td class='<?php echo zget($visibleFields, $product->type, ' hidden')?>' style='overflow:visible'><?php echo html::select("branches[$i]", $branches, $branch, "class='form-control chosen' onchange='setBranchRelated(this.value, $productID, $i)'");?></td>
+          <td class='<?php echo zget($visibleFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
+          <td class='<?php echo zget($visibleFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProjectBuilds($productID, this.value, $i)'");?></td>
+          <td style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='form-control chosen' multiple");?></td>
+          <td style='overflow:visible'>
+            <div class='input-group'>
+              <div class="input-control has-icon-right">
+                <?php echo html::input("title[$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->bug->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='#title\\[$i\\]'");?>
+                </div>
+              </div>
+            </div>
+          </td>
+          <td class='<?php echo zget($visibleFields, 'deadline', 'hidden')?>'><?php echo html::input("deadlines[$i]", '', "class='form-control form-date'");?></td>
+          <td class='<?php echo zget($visibleFields, 'steps', 'hidden')?>'><?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?></td>
+          <td class='<?php echo zget($visibleFields, 'type', 'hidden')?>' style='overflow:visible'>    <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control chosen'");?></td>
+          <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>' style='overflow:visible'>     <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control chosen'");?></td>
+          <td class='<?php echo zget($visibleFields, 'severity', 'hidden')?>' style='overflow:visible'><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control chosen'");?></td>
+          <td class='<?php echo zget($visibleFields, 'os', 'hidden')?>' style='overflow:visible'>      <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
+          <td class='<?php echo zget($visibleFields, 'browser', 'hidden')?>' style='overflow:visible'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
+          <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'><?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
+        </tr>
+        <?php endfor;?>
+      </tbody>
+      <tfoot>
+        <tr>
+          <td colspan='<?php echo count($visibleFields) + 3?>' class='text-center'>
+            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
+          </td>
+        </tr>
+      </tfoot>
+    </table>
+  </form>
+</div>
 <table class='hide' id='trTemp'>
   <tbody>
-    <tr class='text-left'>
+    <tr>
       <td>%s</td>
-      <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>' style='overflow:visible'><?php echo html::select("branches[%s]", $branches, $branch, "class='form-control' onchange='setBranchRelated(this.value, $productID, \"%s\")'");?></td>
-      <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[%s]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
-      <td class='text-left<?php echo zget($visibleFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[%s]", $projects, $projectID, "class='form-control' onchange='loadProjectBuilds($productID, this.value, \"%s\")'");?></td>
-      <td class='text-left' style='overflow:visible' id='buildBox%s'><?php echo html::select("openedBuilds[%s][]", $builds, '', "class='form-control' multiple");?></td>
+      <td class='<?php echo zget($visibleFields, $product->type, ' hidden')?>' style='overflow:visible'><?php echo html::select("branches[%s]", $branches, $branch, "class='form-control' onchange='setBranchRelated(this.value, $productID, \"%s\")'");?></td>
+      <td class='<?php echo zget($visibleFields, 'module', ' hidden')?>'  style='overflow:visible'><?php echo html::select("modules[%s]", $moduleOptionMenu, $moduleID, "class='form-control'");?></td>
+      <td class='<?php echo zget($visibleFields, 'project', ' hidden')?>' style='overflow:visible'><?php echo html::select("projects[%s]", $projects, $projectID, "class='form-control' onchange='loadProjectBuilds($productID, this.value, \"%s\")'");?></td>
+      <td style='overflow:visible' id='buildBox%s'><?php echo html::select("openedBuilds[%s][]", $builds, '', "class='form-control' multiple");?></td>
       <td style='overflow:visible'>
         <div class='input-group'>
-        <?php echo html::hidden("color[%s]", '', "data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->bug->colorTag}' data-update-text='#title\\[%s\\]'");?>
-        <?php echo html::input("title[%s]", '', "class='form-control' autocomplete='off'");?>
+          <div class="input-control has-icon-right">
+            <?php echo html::input("title[%s]", '', "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[%s]", '', "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#title\\[%s\\]'");?>
+            </div>
+          </div>
         </div>
       </td>
       <td class='<?php echo zget($visibleFields, 'deadline', 'hidden')?>'><?php echo html::input("deadlines[%s]", '', "class='form-control form-date'");?></td>
@@ -203,7 +204,5 @@ foreach(explode(',', $this->config->bug->create->requiredFields) as $field)
   </tbody>
 </table>
 <?php js::set('branch', $branch)?>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=bug&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';?>