diff --git a/module/task/css/create.css b/module/task/css/create.css
index c668eb1d93..88c04530a3 100644
--- a/module/task/css/create.css
+++ b/module/task/css/create.css
@@ -28,3 +28,9 @@
 .c-modulel {width: 110px;}
 
 .keep-row-height {height: 32px;}
+#modalTeam .modal-dialog {height: 360px; width: 620px;}
+#modalTeam .modal-header {height: 44px; padding: 10px 0;}
+#modalTeam .modal-header .modal-title {font-size: 13px; color: #3c4353;}
+#modalTeam .modal-body {padding-top: 12px;}
+#taskTeamEditor tr {padding: 8px 7px 8px 7px;}
+#taskTeamEditor td {height: 36px;}
diff --git a/module/task/lang/de.php b/module/task/lang/de.php
index 493e02d009..857cf99725 100644
--- a/module/task/lang/de.php
+++ b/module/task/lang/de.php
@@ -147,6 +147,7 @@ $lang->task->my                = 'My ';
 $lang->task->hasConsumed       = 'Verbraucht';
 $lang->task->multiple          = 'Mehere Aufgaben';
 $lang->task->multipleAB        = ' Mehrere';
+$lang->task->teamSetting       = 'Team Setting';
 $lang->task->team              = 'Team';
 $lang->task->transfer          = 'Transfer';
 $lang->task->transferTo        = 'Transfer nach';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index 571fcd261e..c06bbd7c38 100755
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -147,6 +147,7 @@ $lang->task->my                = 'My ';
 $lang->task->hasConsumed       = 'Already Cost';
 $lang->task->multiple          = 'Multiple Users';
 $lang->task->multipleAB        = 'M';
+$lang->task->teamSetting       = 'Team Setting';
 $lang->task->team              = 'Team';
 $lang->task->transfer          = 'Transfer';
 $lang->task->transferTo        = 'Transfer To';
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index baa3e29cd1..0b05ddd6a5 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -147,6 +147,7 @@ $lang->task->my                = 'My ';
 $lang->task->hasConsumed       = 'Consommé';
 $lang->task->multiple          = 'Utilisateurs Multiples';
 $lang->task->multipleAB        = 'M';
+$lang->task->teamSetting       = 'Team Setting';
 $lang->task->team              = 'Equipe';
 $lang->task->transfer          = 'Transferer';
 $lang->task->transferTo        = 'Transferer à';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index fd840a99fa..40dc0a3230 100755
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -147,6 +147,7 @@ $lang->task->my                = '我的';
 $lang->task->hasConsumed       = '之前消耗';
 $lang->task->multiple          = '多人任务';
 $lang->task->multipleAB        = '多人';
+$lang->task->teamSetting       = '团队设置';
 $lang->task->team              = '团队';
 $lang->task->transfer          = '转交';
 $lang->task->transferTo        = '转交给';
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 18e26c505f..56303056fb 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -289,7 +289,7 @@ foreach(explode(',', $config->task->create->requiredFields) as $field)
               <button type='button' class='close' data-dismiss='modal'>
                 <i class="icon icon-close"></i>
               </button>
-              <h4 class='modal-title'><?php echo $lang->task->team;?></h4>
+              <h4 class='modal-title'><?php echo $lang->task->teamSetting;?></h4>
             </div>
             <div class='modal-body'>
               <table class="table table-form" id='taskTeamEditor'>
diff --git a/module/task/view/taskteam.html.php b/module/task/view/taskteam.html.php
index b089ff7803..231a8af5f2 100644
--- a/module/task/view/taskteam.html.php
+++ b/module/task/view/taskteam.html.php
@@ -1,3 +1,10 @@
+<style>
+#taskTeamEditor button > i {color: #5e626d;}
+#taskTeamEditor .estimateBox span {background-color: #fff;}
+#taskTeamEditor .estimateBox input {background-color: #fff; border-right-width: 0px;}
+#taskTeamEditor input, #taskTeamEditor span, #taskTeamEditor .chosen-container > a {border-color: #eee;}
+</style>
+<?php $i = 1;?>
 <?php if(!empty($task->team)):?>
 <?php foreach($task->team as $member):?>
 <?php
@@ -18,6 +25,9 @@ $hourDisabled = $memberDisabled;
 if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = false;
 ?>
 <tr class='member-<?php echo $memberStatus;?>' data-estimate='<?php echo (float)$member->estimate?>' data-consumed='<?php echo (float)$member->consumed?>' data-left='<?php echo (float)$member->left?>'>
+  <td>
+    <span><?php echo $i;?></span>
+  </td>
   <td class='w-250px'>
     <?php echo html::select("team[]", $members, $member->account, "class='form-control chosen'" . ($memberDisabled ? ' disabled' : ''))?>
     <?php echo html::hidden("teamSource[]", $member->account);?>
@@ -35,24 +45,28 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
   </td>
   <td class='w-130px sort-handler'>
     <button type="button" <?php echo $memberDisabled ? 'disabled' : '';?> class="btn btn-link btn-sm btn-icon btn-add"><i class="icon icon-plus"></i></button>
+    <button type="button" <?php echo $memberDisabled ? 'disabled' : '';?> class="btn btn-link btn-sm btn-icon btn-delete"><i class="icon icon-trash"></i></button>
     <?php if(isset($task->mode) and $task->mode == 'linear'):?>
     <button type="button" <?php echo $sortDisabled   ? 'disabled' : '';?> class='btn btn-link btn-sm btn-icon btn-move'><i class='icon-move'></i></button>
     <?php endif;?>
-    <button type="button" <?php echo $memberDisabled ? 'disabled' : '';?> class="btn btn-link btn-sm btn-icon btn-delete"><i class="icon icon-close"></i></button>
   </td>
 </tr>
+<?php $i ++;?>
 <?php endforeach;?>
 <?php endif;?>
 <tr class='template teamTemplate member-wait'>
+  <td>
+    <span><?php echo $i;?></span>
+  </td>
   <td class='w-250px'>
     <?php echo html::select("team[]", $members, '', "class='form-control chosen'")?>
     <?php echo html::hidden("teamSource[]", '');?>
   </td>
   <td>
     <?php if(empty($task->team)):?>
-    <div class='input-group'>
+    <div class='input-group estimateBox'>
       <?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>
+      <span class='input-group-addon'><?php echo 'h';?></span>
     </div>
     <?php else:?>
     <div class='input-group'>
@@ -67,10 +81,10 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
   </td>
   <td class='w-130px sort-handler'>
     <button type="button" class="btn btn-link btn-sm btn-icon btn-add"><i class="icon icon-plus"></i></button>
+    <button type="button" class="btn btn-link btn-sm btn-icon btn-delete"><i class="icon icon-trash"></i></button>
     <?php if(empty($task->mode) or $task->mode == 'linear'):?>
     <button type='button' class='btn btn-link btn-sm btn-icon btn-move'><i class='icon-move'></i></button>
     <?php endif;?>
-    <button type="button" class="btn btn-link btn-sm btn-icon btn-delete"><i class="icon icon-close"></i></button>
   </td>
 </tr>
 <?php $newRowCount = (!empty($task->team) and count($task->team) < 6) ? 6 - count($task->team) : 1;?>
@@ -89,6 +103,7 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
 </tr>
 <?php endif;?>
 <?php endif;?>
+<?php js::set('id', $i);?>
 <script>
 $(document).ready(function()
 {
@@ -99,8 +114,8 @@ $(document).ready(function()
     /* Init task team manage dialog */
     var $taskTeamEditor = $('tr.teamTemplate').closest('table').batchActionForm(
     {
-        idStart: 0,
-        idEnd: newRowCount - 1,
+        idStart: id,
+        idEnd: id + newRowCount - 1,
         chosen: true,
         datetimepicker: false,
         colorPicker: false,