diff --git a/module/task/css/create.css b/module/task/css/create.css
index c723963b03..02a3660e8f 100644
--- a/module/task/css/create.css
+++ b/module/task/css/create.css
@@ -6,6 +6,9 @@
 
 .chosen-container {max-width: 980px}
 
-.minw-80px {min-width: 120px;}
-.minw-60px {min-width: 50px;}
+#priRowCol, #estRowCol {width: 110px;}
+.col-table .input-group {width: 100%}
 
+#taskPlanCol, #mailCol {width: 50%}
+#planAndMailCell.has-mail-col #taskPlanCol {padding-right: 5px;}
+#planAndMailCell.has-mail-col #taskPlanCol + #mailCol {padding-left: 5px;}
diff --git a/module/task/js/create.js b/module/task/js/create.js
index d5e0308eda..a92ebf7610 100644
--- a/module/task/js/create.js
+++ b/module/task/js/create.js
@@ -152,14 +152,20 @@ $(document).ready(function()
 
     $('[data-toggle=tooltip]').tooltip();
 
-    /* Code for kanban following codes. */
-    // ajust style for file box
-    var ajustFilebox = function()
+    // adjust form controls layout
+    var ajustFormControls = function()
     {
-        applyCssStyle('.fileBox > tbody > tr > td:first-child {transition: none; width: ' + ($('#dataPlanGroup').width() - 2) + 'px}', 'filebox')
+        // adjust style for file box
+        applyCssStyle('.fileBox > tbody > tr > td:first-child {transition: none; width: ' + ($('#dataPlanGroup').width() - 1) + 'px}', 'filebox');
+
+        // adjust #priRowCol and #estRowCol size
+        var $priRowCol = $('#priRowCol'),
+            $estRowCol = $('#estRowCol');
+        $priRowCol.css('width', 55 + $priRowCol.find('.input-group-addon').outerWidth());
+        $estRowCol.css('width', 55 + $estRowCol.find('.input-group-addon').outerWidth());
     };
-    ajustFilebox();
-    $(window).resize(ajustFilebox);
+    ajustFormControls();
+    $(window).resize(ajustFormControls);
 
     /* First unbind ajaxForm for form.*/
     $("form[data-type='ajax']").unbind('submit');
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index f6c9c6d3e1..6b90a40690 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -72,11 +72,9 @@
             $hiddenPri = strpos(",$showFields,", ',pri,') === false;
             $hiddenEst = strpos(",$showFields,", ',estimate,') === false;
             ?>
-            <?php if(!$hiddenPri or !$hiddenEst):?>
-            <?php $widthClass = ($hiddenPri or $hiddenEst) ? 'w-120px' : 'w-250px';?>
-            <div class='col-table <?php echo $widthClass?>'>
-              <div class="input-group">
-                <?php if(!$hiddenPri):?>
+            <?php if(!$hiddenPri):?>
+            <div class='col-table' id='priRowCol'>
+              <div class='input-group'>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->task->pri;?></span>
                 <?php
                 $hasCustomPri = false;
@@ -90,7 +88,7 @@
                 }
                 ?>
                 <?php if($hasCustomPri):?>
-                <?php echo html::select('pri', $lang->task->priList, '', "class='form-control minw-80px'");?> 
+                <?php echo html::select('pri', $lang->task->priList, '', "class='form-control'");?> 
                 <?php else: ?>
                 <div class='input-group-btn dropdown-pris'>
                   <button type='button' class='btn dropdown-toggle br-0' data-toggle='dropdown'>
@@ -100,14 +98,18 @@
                   <?php echo html::select('pri', $lang->task->priList, '', "class='hide'");?>
                 </div>
                 <?php endif; ?>
-                <?php endif?>
-                <?php if(!$hiddenEst):?>
-                <span class='input-group-addon fix-border br-0'><?php echo $lang->task->estimateAB;?></span>
-                <?php echo html::input('estimate', '', "class='form-control minw-60px' placeholder='{$lang->task->hour}'");?>
-                <?php endif;?>
               </div>
             </div>
-            <?php endif;?>
+            <?php endif; ?>
+
+            <?php if(!$hiddenEst):?>
+            <div class='col-table' id='estRowCol'>
+              <div class='input-group'>
+                <span class='input-group-addon fix-border br-0'><?php echo $lang->task->estimateAB;?></span>
+                <?php echo html::input('estimate', '', "class='form-control' placeholder='{$lang->task->hour}'");?>
+              </div>
+            </div>
+            <?php endif; ?>
           </div>
         </td>
       </tr>
@@ -123,33 +125,36 @@
       <?php if(!$hiddenEstStarted or !$hiddenDeadline or !$hiddenMailto):?>
       <tr>
         <th><?php echo ($hiddenEstStarted and $hiddenDeadline) ? $lang->task->mailto : $lang->task->datePlan;?></th>
-        <?php if(!$hiddenEstStarted or !$hiddenDeadline):?>
-        <td colspan='2'>
-          <div class='input-group' id='dataPlanGroup'>
-            <?php if(!$hiddenEstStarted):?>
-            <?php echo html::input('estStarted', $task->estStarted, "class='form-control form-date' placeholder='{$lang->task->estStarted}'");?>
-            <?php endif;?>
-            <?php if(!$hiddenEstStarted and !$hiddenDeadline):?>
-            <span class='input-group-addon fix-border'>~</span>
-            <?php endif;?>
-            <?php if(!$hiddenDeadline):?>
-            <?php echo html::input('deadline', $task->deadline, "class='form-control form-date' placeholder='{$lang->task->deadline}'");?>
-            <?php endif;?>
-          </div>
+        <td id='planAndMailCell' colspan='5' class='<?php if(!$hiddenMailto) echo 'has-mail-col' ?>'>
+            <div class='row-table'>
+              <?php if(!$hiddenEstStarted or !$hiddenDeadline):?>
+              <div class='col-table' id='taskPlanCol'>
+                <div class='input-group' id='dataPlanGroup'>
+                  <?php if(!$hiddenEstStarted):?>
+                  <?php echo html::input('estStarted', $task->estStarted, "class='form-control form-date' placeholder='{$lang->task->estStarted}'");?>
+                  <?php endif;?>
+                  <?php if(!$hiddenEstStarted and !$hiddenDeadline):?>
+                  <span class='input-group-addon fix-border'>~</span>
+                  <?php endif;?>
+                  <?php if(!$hiddenDeadline):?>
+                  <?php echo html::input('deadline', $task->deadline, "class='form-control form-date' placeholder='{$lang->task->deadline}'");?>
+                  <?php endif;?>
+                </div>
+              </div>
+              <?php endif;?>
+              <?php if(!$hiddenMailto):?>
+              <div class='col-table' id='mailCol'>
+                <div id='mailtoGroup' class='input-group'>
+                  <?php if(!$hiddenEstStarted or !$hiddenDeadline):?>
+                  <span class='input-group-addon'><?php echo $lang->task->mailto;?></span>
+                  <?php endif;?>
+                  <?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ', '', $task->mailto), "multiple class='form-control'");?>
+                  <?php echo $this->fetch('my', 'buildContactLists');?>
+                </div>
+              </div>
+              <?php endif;?>
+            </div>
         </td>
-        <?php endif;?>
-        <?php if(!$hiddenMailto):?>
-        <?php $colspan = ($hiddenEstStarted and $hiddenDeadline) ? '5' : '4';?>
-        <td colspan='<?php echo $colspan?>'>
-          <div id='mailtoGroup' class='input-group'>
-            <?php if(!$hiddenEstStarted or !$hiddenDeadline):?>
-            <span class='input-group-addon'><?php echo $lang->task->mailto;?></span>
-            <?php endif;?>
-            <?php echo html::select('mailto[]', $project->acl == 'private' ? $members : $users, str_replace(' ', '', $task->mailto), "multiple class='form-control'");?>
-            <?php echo $this->fetch('my', 'buildContactLists');?>
-          </div>
-        </td>
-        <?php endif;?>
       </tr>
       <?php endif;?>
       <tr>