diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php
index 7dceb1f76f..58896b7d98 100644
--- a/module/story/view/batchedit.html.php
+++ b/module/story/view/batchedit.html.php
@@ -38,20 +38,20 @@ foreach(explode(',', $showFields) as $field)
       <tr>
         <th class='w-40px'> <?php echo $lang->idAB;?></th> 
         <?php if($branchProduct):?>
-        <th class='w-150px<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->story->branch;?></th>
+        <th class='w-120px<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->story->branch;?></th>
         <?php endif;?>
-        <th class='w-150px'><?php echo $lang->story->module;?></th>
+        <th class='w-120px'><?php echo $lang->story->module;?></th>
         <th class='w-150px<?php echo zget($visibleFields, 'plan', ' hidden')?>'><?php echo $lang->story->planAB;?></th>
         <th class='w-150px required'><?php echo $lang->story->title;?></th>
-        <th class='w-50px<?php echo zget($visibleFields, 'estimate', ' hidden')?>'> <?php echo $lang->story->estimateAB;?></th>
-        <th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden')?>'> <?php echo $lang->priAB;?></th>
-        <th class='w-100px<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>'> <?php echo $lang->story->assignedTo;?></th>
-        <th class='w-100px<?php echo zget($visibleFields, 'source', ' hidden')?>'> <?php echo $lang->story->source;?></th>
+        <th class='w-50px<?php   echo zget($visibleFields, 'estimate', ' hidden')?>'> <?php echo $lang->story->estimateAB;?></th>
+        <th class='w-70px<?php   echo zget($visibleFields, 'pri', ' hidden')?>'> <?php echo $lang->priAB;?></th>
+        <th class='w-100px<?php  echo zget($visibleFields, 'assignedTo', ' hidden')?>'> <?php echo $lang->story->assignedTo;?></th>
+        <th class='w-100px<?php  echo zget($visibleFields, 'source', ' hidden')?>'> <?php echo $lang->story->source;?></th>
         <th class='w-80px'><?php echo $lang->story->status;?></th>
-        <th class='w-100px<?php echo zget($visibleFields, 'stage', ' hidden')?>'> <?php echo $lang->story->stageAB;?></th>
-        <th class='w-130px<?php echo zget($visibleFields, 'closedBy', ' hidden')?>'><?php echo $lang->story->closedBy;?></th>
-        <th class='w-100px<?php echo zget($visibleFields, 'closedReason', ' hidden')?>'> <?php echo $lang->story->closedReason;?></th>
-        <th class='w-80px<?php echo zget($visibleFields, 'keywords', ' hidden')?>'><?php echo $lang->story->keywords;?></th>
+        <th class='w-100px<?php  echo zget($visibleFields, 'stage', ' hidden')?>'> <?php echo $lang->story->stageAB;?></th>
+        <th class='w-130px<?php  echo zget($visibleFields, 'closedBy', ' hidden')?>'><?php echo $lang->story->closedBy;?></th>
+        <th class='w-100px<?php  echo zget($visibleFields, 'closedReason', ' hidden')?>'> <?php echo $lang->story->closedReason;?></th>
+        <th class='w-80px<?php   echo zget($visibleFields, 'keywords', ' hidden')?>'><?php echo $lang->story->keywords;?></th>
       </tr>
     </thead>
     <tbody>
diff --git a/module/task/js/common.js b/module/task/js/common.js
index 9a6706bcc8..e552c3dc0a 100644
--- a/module/task/js/common.js
+++ b/module/task/js/common.js
@@ -15,7 +15,7 @@ function checkLeft()
     }
 }
 
-$('.btn-move-up, .btn-move-down').click(function()
+$(document).on('click', '.btn-move-up, .btn-move-down', function()
 {
     var $this = $(this);
     if($this.hasClass('btn-move-up'))
@@ -59,7 +59,11 @@ $('#modalTeam .btn').click(function()
     })
 });
 
-$('a.btn-move-add').on('click', function () {
-  var html = $("#modalTeam table.table tr").eq(-2).html();
-  $("#modalTeam table.table tr:last").before('<tr>' + html + '</tr>');
+$(document).on('click', 'a.btn-move-add', function()
+{
+    var html = $("#modalTeam table.table tbody tr:last").html();
+    $("#modalTeam table.table tbody tr:last").after('<tr>' + html + '</tr>');
+    $("#modalTeam table.table tbody tr:last").prev().find('.btn-move-down').removeClass('disabled').removeAttr('disabled');
+
+    adjustSortBtn();
 });
diff --git a/module/task/js/create.js b/module/task/js/create.js
index 71e6c125b5..e74f02710e 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -192,7 +192,7 @@ $(document).ready(function()
             $('#estimate').attr('readonly', false);
         }
     });
-    $('#modalTeam').on('show', function()
+    $("[href='#modalTeam']").click(function()
     {
         adjustSortBtn();
     });
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index aacb92d9e9..7f6530d390 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -181,27 +181,29 @@
           </div>
           <div class='modal-content with-padding'>
             <table class="table table-form">
-              <?php for($i = 0; $i < 5; $i++):?>
-              <tr>
-                <td><?php echo html::select("team[]", $members, '', "class='form-control chosen'");?></td>
-                <td>
-                  <div class='input-group'>
-                    <?php echo html::input("teamEstimate[]", '', "class='form-control text-center' placeholder='{$lang->task->estimateAB}'") ?>
-                    <span class='input-group-addon'><?php echo $lang->task->hour;?></span>
-                  </div>
-                </td>
-                <td class='w-90px'>
-                  <a class='btn btn-move-add btn-icon btn-sm'><i class='icon-plus'></i></a>
-                  <a class='btn btn-move-up btn-sm btn-icon'><i class='icon-arrow-up'></i></a>
-                  <a class='btn btn-move-down btn-sm btn-icon'><i class='icon-arrow-down'></i></a>
-                </td>
-              </tr>
-              <?php endfor;?>
-              <tr>
-                <td colspan='3' class='text-center'>
-                  <?php echo html::a('javascript:void(0)', $lang->confirm, '', "class='btn btn-primary' data-dismiss='modal'");?>
-                </td>
-              </tr>
+              <tbody>
+                <?php for($i = 0; $i < 5; $i++):?>
+                <tr>
+                  <td><?php echo html::select("team[]", $members, '', "class='form-control chosen'");?></td>
+                  <td>
+                    <div class='input-group'>
+                      <?php echo html::input("teamEstimate[]", '', "class='form-control text-center' placeholder='{$lang->task->estimateAB}'") ?>
+                      <span class='input-group-addon'><?php echo $lang->task->hour;?></span>
+                    </div>
+                  </td>
+                  <td class='w-90px'>
+                    <a class='btn btn-move-add btn-icon btn-sm'><i class='icon-plus'></i></a>
+                    <a class='btn btn-move-up btn-sm btn-icon'><i class='icon-arrow-up'></i></a>
+                    <a class='btn btn-move-down btn-sm btn-icon'><i class='icon-arrow-down'></i></a>
+                  </td>
+                </tr>
+                <?php endfor;?>
+              </tbody>
+              <tfoot>
+                <tr>
+                  <td colspan='3' class='text-center'><?php echo html::a('javascript:void(0)', $lang->confirm, '', "class='btn btn-primary' data-dismiss='modal'");?></td>
+                </tr>
+              </tfoot>
             </table>
           </div>
         </div>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 3cd057ab22..b60006735c 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -219,46 +219,50 @@
         </div>
         <div class="modal-content with-padding">
           <table class='table table-form'>
-            <?php foreach($task->team as $member):?>
-            <tr>
-              <td class='w-250px'><?php echo html::select("team[]", $members, $member->account, "class='form-control chosen'")?></td>
-              <td>
-                <div class='input-group'>
-                  <span class='input-group-addon'><?php echo $lang->task->estimate?></span>
-                  <?php echo html::input("teamEstimate[]", $member->estimate, "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
-                  <span class='input-group-addon fix-border'><?php echo $lang->task->consumed?></span>
-                  <?php echo html::input("teamConsumed[]", $member->consumed, "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
-                  <span class='input-group-addon fix-border'><?php echo $lang->task->left?></span>
-                  <?php echo html::input("teamLeft[]", $member->left, "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
-                </div>
-              </td>
-              <td class='w-90px'>
-                <a href='javascript:;' class='btn btn-icon btn-move-up btn-sm'><i class='icon-arrow-up'></i></a>
-                <a href='javascript:;' class='btn btn-icon btn-move-down btn-sm'><i class='icon-arrow-down'></i></a>
-              </td>
-            </tr>
-            <?php endforeach;?>
-            <?php for($i = 0; $i < 5; $i++):?>
-            <tr>
-              <td class='w-150px'><?php echo html::select("team[]", $members, '', "class='form-control chosen'")?></td>
-              <td>
-                <div class='input-group'>
-                  <span class='input-group-addon'><?php echo $lang->task->estimate?></span>
-                  <?php echo html::input("teamEstimate[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
-                  <span class='input-group-addon fix-border'><?php echo $lang->task->consumed?></span>
-                  <?php echo html::input("teamConsumed[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
-                  <span class='input-group-addon fix-border'><?php echo $lang->task->left?></span>
-                  <?php echo html::input("teamLeft[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
-                </div>
-              </td>
-              <td class='w-90px'>
-                <a class='btn btn-move-add btn-icon btn-sm'><i class='icon-plus'></i></a>
-                <a class='btn btn-icon btn-move-up btn-sm'><i class='icon-arrow-up'></i></a>
-                <a class='btn btn-icon btn-move-down btn-sm'><i class='icon-arrow-down'></i></a>
-              </td>
-            </tr>
-            <?php endfor;?>
-            <tr><td colspan='3' class='text-center'><?php echo html::a('javascript:void(0)', $lang->confirm, '', "class='btn btn-primary' data-dismiss='modal'");?></td></tr>
+            <tbody>
+              <?php foreach($task->team as $member):?>
+              <tr>
+                <td class='w-250px'><?php echo html::select("team[]", $members, $member->account, "class='form-control chosen'")?></td>
+                <td>
+                  <div class='input-group'>
+                    <span class='input-group-addon'><?php echo $lang->task->estimate?></span>
+                    <?php echo html::input("teamEstimate[]", $member->estimate, "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
+                    <span class='input-group-addon fix-border'><?php echo $lang->task->consumed?></span>
+                    <?php echo html::input("teamConsumed[]", $member->consumed, "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
+                    <span class='input-group-addon fix-border'><?php echo $lang->task->left?></span>
+                    <?php echo html::input("teamLeft[]", $member->left, "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
+                  </div>
+                </td>
+                <td class='w-90px'>
+                  <a href='javascript:;' class='btn btn-icon btn-move-up btn-sm'><i class='icon-arrow-up'></i></a>
+                  <a href='javascript:;' class='btn btn-icon btn-move-down btn-sm'><i class='icon-arrow-down'></i></a>
+                </td>
+              </tr>
+              <?php endforeach;?>
+              <?php for($i = 0; $i < 5; $i++):?>
+              <tr>
+                <td class='w-150px'><?php echo html::select("team[]", $members, '', "class='form-control chosen'")?></td>
+                <td>
+                  <div class='input-group'>
+                    <span class='input-group-addon'><?php echo $lang->task->estimate?></span>
+                    <?php echo html::input("teamEstimate[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
+                    <span class='input-group-addon fix-border'><?php echo $lang->task->consumed?></span>
+                    <?php echo html::input("teamConsumed[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
+                    <span class='input-group-addon fix-border'><?php echo $lang->task->left?></span>
+                    <?php echo html::input("teamLeft[]", '', "class='form-control text-center' placeholder='{$lang->task->hour}'")?>
+                  </div>
+                </td>
+                <td class='w-90px'>
+                  <a class='btn btn-move-add btn-icon btn-sm'><i class='icon-plus'></i></a>
+                  <a class='btn btn-icon btn-move-up btn-sm'><i class='icon-arrow-up'></i></a>
+                  <a class='btn btn-icon btn-move-down btn-sm'><i class='icon-arrow-down'></i></a>
+                </td>
+              </tr>
+              <?php endfor;?>
+            </tbody>
+            <tfoot>
+              <tr><td colspan='3' class='text-center'><?php echo html::a('javascript:void(0)', $lang->confirm, '', "class='btn btn-primary' data-dismiss='modal'");?></td></tr>
+            </tfoot>
           </table>
         </div>
       </div>