diff --git a/module/task/css/common.css b/module/task/css/common.css
index 6970e5aa72..ba1774a931 100644
--- a/module/task/css/common.css
+++ b/module/task/css/common.css
@@ -7,7 +7,6 @@
 #modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;}
 #taskTeamEditor tr {padding: 8px 7px 8px 7px;}
 #taskTeamEditor td .chosen-single .chosen-search input,
-#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;}
 #taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;}
 #taskTeamEditor tr td:first-child {width: 40px; position: relative;}
 .team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;}
diff --git a/module/task/css/create.css b/module/task/css/create.css
index bc1d807d05..4d37edfb0c 100644
--- a/module/task/css/create.css
+++ b/module/task/css/create.css
@@ -29,6 +29,7 @@
 
 .keep-row-height {height: 32px;}
 #modalTeam .modal-dialog {min-height: 120px; width: 520px; color: #3c4353;}
-#taskTeamEditor .chosen-single {width: 200px;}
+#taskTeamEditor .hourBox {padding-bottom: 7px; width: 135px;}
 #taskTeamEditor .estimateBox {width: 120px;}
+#taskTeamEditor td.sort-handler {padding-bottom: 12px;}
 #modalTeam .modal-content {padding: 0;}
diff --git a/module/task/css/editteam.css b/module/task/css/editteam.css
new file mode 100644
index 0000000000..5d45d0da74
--- /dev/null
+++ b/module/task/css/editteam.css
@@ -0,0 +1 @@
+#mainContent {padding-left: 0;}
diff --git a/module/task/js/editteam.js b/module/task/js/editteam.js
index bc08f7bfbd..fe4836386e 100644
--- a/module/task/js/editteam.js
+++ b/module/task/js/editteam.js
@@ -16,3 +16,8 @@ $(document).ready(function()
         }
     });
 });
+
+$(function()
+{
+    parent.$(' #triggerModal .modal-dialog').css('width', '800px');
+});
diff --git a/module/task/view/editteam.html.php b/module/task/view/editteam.html.php
index c42ae0753b..635ad6da64 100755
--- a/module/task/view/editteam.html.php
+++ b/module/task/view/editteam.html.php
@@ -64,7 +64,6 @@
         </tfoot>
       </table>
     </form>
-    <hr class='small' />
     <?php endif;?>
   </div>
 </div>
diff --git a/module/task/view/taskteam.html.php b/module/task/view/taskteam.html.php
index ea123d1eb9..c75c982403 100644
--- a/module/task/view/taskteam.html.php
+++ b/module/task/view/taskteam.html.php
@@ -4,6 +4,17 @@
 #taskTeamEditor .estimateBox input {background-color: #fff; border-right-width: 0px;}
 #taskTeamEditor input, #taskTeamEditor span, #taskTeamEditor .chosen-container > a {border-color: #eee;}
 </style>
+<?php if($app->rawMethod != 'create'):?>
+<style>
+#modalTeam .modal-dialog {width: 855px;}
+#taskTeamEditor .hourBox {padding-bottom: 1px;}
+</style>
+<?php endif;?>
+<?php if($app->rawMethod == 'assignto'):?>
+<style>
+#taskTeamEditor td.sort-handler {width: 70px !important; padding-bottom: 12px;}
+</style>
+<?php endif;?>
 <?php $hiddenArrow = (empty($task->mode) or $task->mode == 'linear') ? '' : 'hidden';?>
 <?php $i = 1;?>
 <?php if(!empty($task->team)):?>
@@ -35,7 +46,7 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
     <?php echo html::hidden("teamSource[]", $member->account);?>
     <?php if($memberDisabled) echo html::hidden("team[]", $member->account);?>
   </td>
-  <td>
+  <td class='hourBox'>
     <div class='input-group'>
       <div class="input-control has-icon-right">
         <?php echo html::input("teamEstimate[]", (float)$member->estimate, "class='form-control text-center' placeholder='{$lang->task->estimate}'" . ($hourDisabled ? ' readonly' : ''))?>
@@ -51,7 +62,7 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
       </div>
     </div>
   </td>
-  <td class='w-130px sort-handler'>
+  <td class='w-100px 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'):?>
@@ -71,7 +82,7 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
     <?php echo html::select("team[]", $members, '', "class='form-control chosen' data-placeholder='{$lang->task->assignedTo}'")?>
     <?php echo html::hidden("teamSource[]", '');?>
   </td>
-  <td class='w-130px'>
+  <td class='hourBox'>
     <?php if(empty($task->team)):?>
     <div class='input-group estimateBox'>
       <?php echo html::input("teamEstimate[]", '', "class='form-control text-center' placeholder='{$lang->task->estimateAB}'") ?>