diff --git a/module/bug/css/batchcreate.css b/module/bug/css/batchcreate.css
index dcfd01218a..9449741f33 100644
--- a/module/bug/css/batchcreate.css
+++ b/module/bug/css/batchcreate.css
@@ -6,3 +6,5 @@
 .c-build, .c-browser, .c-keywords {width: 100px;}
 .c-steps {width: 150px;}
 .c-pri, .c-severity {width: 80px;}
+[lang^=de] .c-build {width: 110px}
+[lang^=fr] .c-build {width: 110px}
diff --git a/module/bug/js/batchcreate.js b/module/bug/js/batchcreate.js
index 091963078f..b87c21141d 100644
--- a/module/bug/js/batchcreate.js
+++ b/module/bug/js/batchcreate.js
@@ -22,7 +22,7 @@ $(function()
         var link = createLink('custom', 'ajaxSaveCustomFields', 'module=bug&section=custom&key=batchCreateFields');
         $.post(link, {'fields' : fields}, function()
         {
-            checkedShowFields(fields);
+            showCheckedFields(fields);
             $('#formSetting').parent().removeClass('open');
 
             if($('#batchCreateForm table thead tr th.c-title').width() < 150) $titleCol.width(150);
@@ -47,14 +47,16 @@ $(function()
 })
 
 /**
- * Checked show fields.
+ * Show checked fields.
  *
  * @param  string fields
  * @access public
  * @return void
  */
-function checkedShowFields(fields)
+function showCheckedFields(fields)
 {
+    showFields = fields;
+
     var fieldList = ',' + fields + ',';
     $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function()
     {
diff --git a/module/common/view/customfield.html.php b/module/common/view/customfield.html.php
index ef369decb0..2ccfe0b5d9 100644
--- a/module/common/view/customfield.html.php
+++ b/module/common/view/customfield.html.php
@@ -37,6 +37,16 @@
   var $formSetting = $('#formSetting');
   $formSetting.on('click', '.close-dropdown', function()
   {
+      if(showFields != undefined)
+      {
+          var fieldList = ',' + showFields + ',';
+          $('#formSettingForm > .checkboxes > .checkbox-primary > input:visible').each(function()
+          {
+              var field = ',' + $(this).val() + ',';
+              $(this).prop('checked', fieldList.indexOf(field) >= 0);
+          });
+      }
+
       $formSetting.parent().removeClass('open');
   }).on('click', function(e){e.stopPropagation()});
   </script>
diff --git a/module/common/view/pastetext.html.php b/module/common/view/pastetext.html.php
index fe4a62bb10..f2d4f56275 100644
--- a/module/common/view/pastetext.html.php
+++ b/module/common/view/pastetext.html.php
@@ -25,7 +25,15 @@ $(function()
     {
         if(!rowTpl) rowTpl = $('#trTemp tbody').html();
         if(!$formTbody) $formTbody = $form.find('table > tbody');
+
         var lastIndex = parseInt($formTbody.find('tr:last > td:first').text());
+        var moduleArr = ['task', 'story', 'bug', 'testcase'];
+        if($.inArray(config.currentModule, moduleArr) >= 0 && config.currentMethod == 'batchcreate')
+        {
+            lastIndex = itemIndex;
+            itemIndex ++;
+        }
+
         var $newRow = $(rowTpl.replace(/%s/g, lastIndex + 1));
         $newRow.find('.chosen').chosen();
         $newRow.find('.iframe').modalTrigger({iframe:true});
diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css
index 388bdf119c..df0b38611f 100644
--- a/module/task/css/batchcreate.css
+++ b/module/task/css/batchcreate.css
@@ -31,3 +31,4 @@ select[id^="story"] + .picker-single {width: 130px; max-width: 130px;}
 .c-assigned {width: 130px;}
 .c-date {width: 120px;}
 .c-pri {width: 80px;}
+.c-actions {width: 60px;}
diff --git a/module/task/js/batchcreate.js b/module/task/js/batchcreate.js
index 55454dd725..6c33c8fdf1 100755
--- a/module/task/js/batchcreate.js
+++ b/module/task/js/batchcreate.js
@@ -23,12 +23,23 @@ $(function()
         var link = createLink('custom', 'ajaxSaveCustomFields', 'module=task&section=custom&key=batchCreateFields');
         $.post(link, {'fields' : fields}, function()
         {
-            checkedShowFields(fields);
+            showCheckedFields(fields);
             $('#formSetting').parent().removeClass('open');
 
             var fieldCount = $('#batchCreateForm .table thead>tr>th:visible').length;
             $('.form-actions').attr('colspan', fieldCount);
 
+            if(fieldCount > 9)
+            {
+                $('#batchCreateForm > .table-responsive').removeClass('scroll-none');
+                $('#batchCreateForm > .table-responsive').css('overflow', 'auto');
+            }
+            else
+            {
+                $('#batchCreateForm > .table-responsive').addClass('scroll-none');
+                $('#batchCreateForm > .table-responsive').css('overflow', 'visible');
+            }
+
             if($('th.c-name').width() < 165) $('th.c-name').width(165);
         });
 
@@ -344,3 +355,30 @@ $(function()
         }
     });
 });
+
+/**
+ * Add item.
+ *
+ * @param  object $obj
+ * @access public
+ * @return void
+ */
+function addItem(obj)
+{
+    var item = $('#addItem').html().replace(/%i%/g, itemIndex + 1);
+    $('<tr class="addedItem">' + item  + '</tr>').insertAfter($(obj).closest('tr'));
+
+    itemIndex ++;
+}
+
+/**
+ * Delete item.
+ *
+ * @param  object $obj
+ * @access public
+ * @return void
+ */
+function deleteItem(obj)
+{
+    $(obj).closest('tr').remove();
+}
diff --git a/module/task/js/common.js b/module/task/js/common.js
index 8c8f907a4f..0d683835b2 100644
--- a/module/task/js/common.js
+++ b/module/task/js/common.js
@@ -21,14 +21,16 @@ function setStoryModule()
 }
 
 /**
- * Checked show fields.
+ * Show checked fields.
  *
  * @param  string fields
  * @access public
  * @return void
  */
-function checkedShowFields(fields)
+function showCheckedFields(fields)
 {
+    showFields = fields;
+
     var fieldList = ',' + fields + ',';
     $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function()
     {
diff --git a/module/task/js/create.js b/module/task/js/create.js
index dd1edd9bfd..c6b28b6a97 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -17,7 +17,7 @@ $(function()
         var link = createLink('custom', 'ajaxSaveCustomFields', 'module=task&section=custom&key=createFields');
         $.post(link, {'fields' : fields}, function()
         {
-            checkedShowFields(fields);
+            showCheckedFields(fields);
             $('#formSetting').parent().removeClass('open');
         });
 
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index 9cef587605..a22c4c32f6 100755
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -90,6 +90,7 @@ $colspan = count($visibleFields) + 3;
                 echo "<th class='w-100px $required'>{$extendField->name}</th>";
             }
             ?>
+            <th class='c-actions'><?php echo $lang->actions;?></th>
           </tr>
         </thead>
         <tbody>
@@ -115,7 +116,7 @@ $colspan = count($visibleFields) + 3;
           ?>
           <?php $pri = 3;?>
           <tr>
-            <td class='text-left'><?php echo $i;?></td>
+            <td class='text-left c-id'><?php echo $i;?></td>
             <td class="<?php echo zget($visibleFields, 'module', 'hidden')?> moduleBox" style='overflow:visible'>
               <?php echo html::select("module[$i]", $modules, $moduleID, "class='form-control chosen'")?>
               <?php echo html::hidden("parent[$i]", $parent);?>
@@ -173,7 +174,14 @@ $colspan = count($visibleFields) + 3;
             $this->loadModel('flow');
             foreach($extendFields as $extendField) echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->flow->getFieldControl($extendField, '', $extendField->field . "[$i]") . "</td>";
             ?>
+            <td class='c-actions text-left'>
+              <a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
+              <?php if($i != 1):?>
+              <a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-close'></i></a>
+              <?php endif;?>
+            </td>
           </tr>
+          <?php js::set('itemIndex', $i)?>
           <?php endfor;?>
         </tbody>
         <tfoot>
@@ -191,7 +199,7 @@ $colspan = count($visibleFields) + 3;
 <table class='template' id='trTemp'>
   <tbody>
     <tr>
-      <td class='text-center'>%s</td>
+      <td class='text-left c-id'>%s</td>
       <td class="<?php echo zget($visibleFields, 'module', 'hidden')?> moduleBox" style='overflow:visible'>
         <?php echo html::select("module[%s]", $modules, $moduleID, "class='form-control chosen' onchange='setStories(this.value, $execution->id, \"%s\")'")?>
         <?php echo html::hidden("parent[%s]", $parent);?>
@@ -242,9 +250,82 @@ $colspan = count($visibleFields) + 3;
       $this->loadModel('flow');
       foreach($extendFields as $extendField) echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->flow->getFieldControl($extendField, '', $extendField->field . "[%s]") . "</td>";
       ?>
+      <td class='c-actions text-center'>
+        <a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
+        <a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-close'></i></a>
+      </td>
     </tr>
   </tbody>
 </table>
+<div>
+  <?php $i = '%i%';?>
+  <table class='hidden'>
+    <tr id='addItem' class='hidden'>
+      <td class='text-left c-id'><?php echo $i;?></td>
+      <td class="<?php echo zget($visibleFields, 'module', 'hidden')?> moduleBox" style='overflow:visible'>
+        <?php echo html::select("module[$i]", $modules, $moduleID, "class='form-control chosen'")?>
+        <?php echo html::hidden("parent[$i]", $parent);?>
+      </td>
+      <?php if($execution->type != 'ops'):?>
+      <td class="<?php echo zget($visibleFields, 'story', 'hidden');?> storyBox" 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 id='preview<?php echo $i;?>' href='#' class='btn iframe btn-link btn-icon btn-copy' style='pointer-events:none' data-width='80%' disabled='disabled' title='<?php echo $lang->preview; ?>'><i class='icon-eye'></i></a>
+            <a href='javascript:copyStoryTitle(<?php echo $i;?>)' class='btn btn-link btn-icon btn-copy' title='<?php echo $lang->task->copyStoryTitle; ?>'><i class='icon-arrow-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-control has-icon-right">
+          <?php echo html::input("name[$i]", '', "class='form-control title-import'");?>
+          <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 pull-right">
+              <li class="heading"><?php echo $lang->task->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>
+      </td>
+      <?php if($execution->type == 'kanban'):?>
+      <td><?php echo html::select("regions[$i]", $regionPairs, $regionID, "class='form-control chosen' onchange='setLane(this.value, $i)'");?></td>
+      <td><?php echo html::select("lanes[$i]", $lanePairs, $laneID, "class='form-control chosen'");?></td>
+      <?php endif;?>
+      <td><?php echo html::select("type[$i]", $lang->task->typeList, $type, 'class=form-control');?></td>
+      <td class="<?php echo zget($visibleFields, 'assignedTo', 'hidden')?> assignedToBox" style='overflow:visible'><?php echo html::select("assignedTo[$i]", $members, $member, "class='form-control chosen'");?></td>
+      <td class="<?php echo zget($visibleFields, 'estimate', 'hidden')?> estimateBox"><?php echo html::input("estimate[$i]", '', "class='form-control text-center'");?></td>
+      <td class="<?php echo zget($visibleFields, 'estStarted', 'hidden')?> estStartedBox">
+        <div class='input-group'>
+          <?php
+          echo html::input("estStarted[$i]", '', "class='form-control text-center form-date' onkeyup='toggleCheck(this)'");
+          echo "<span class='input-group-addon estStartedBox'><input type='checkbox' name='estStartedDitto[$i]' id='estStartedDitto$i' checked/> {$lang->task->ditto}</span>";
+          ?>
+        </div>
+      </td>
+      <td class="<?php echo zget($visibleFields, 'deadline', 'hidden')?> deadlineBox">
+        <div class='input-group'>
+          <?php
+          echo html::input("deadline[$i]", '', "class='form-control text-center form-date' onkeyup='toggleCheck(this)'");
+          echo "<span class='input-group-addon deadlineBox'><input type='checkbox' name='deadlineDitto[$i]' id='deadlineDitto$i' checked/> {$lang->task->ditto}</span>";
+          ?>
+        </div>
+      </td>
+      <td class="<?php echo zget($visibleFields, 'desc', 'hidden')?> descBox"><?php echo html::textarea("desc[$i]", '', "rows='1' class='form-control autosize'");?></td>
+      <td class="<?php echo zget($visibleFields, 'pri', 'hidden')?> priBox"><?php echo html::select("pri[$i]", (array)$lang->task->priList, $pri, 'class=form-control');?></td>
+      <?php
+      $this->loadModel('flow');
+      foreach($extendFields as $extendField) echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->flow->getFieldControl($extendField, '', $extendField->field . "[$i]") . "</td>";
+      ?>
+      <td class='c-actions text-left'>
+        <a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
+        <a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-close'></i></a>
+      </td>
+    </tr>
+  </table>
+</div>
 <?php js::set('executionType', $execution->type);?>
 <?php js::set('storyTasks', $storyTasks);?>
 <?php js::set('mainField', 'name');?>