diff --git a/module/port/model.php b/module/port/model.php
index a791a5b9f5..207c062800 100644
--- a/module/port/model.php
+++ b/module/port/model.php
@@ -1385,8 +1385,11 @@ class portModel extends model
 
                 elseif($control == 'hidden')   $html .= html::hidden("$name", $selected);
 
-                elseif($control == 'textarea') $html .= '<td>' . html::textarea("$name", $selected, "class='form-control' cols='50' rows='1'") . '</td>';
-
+                elseif($control == 'textarea')
+                {
+                    if($model == 'bug' and $field == 'steps') $selected = str_replace("\n\n\n\n\n\n", '', $selected);
+                    $html .= '<td>' . html::textarea("$name", $selected, "class='form-control' cols='50' rows='1'") . '</td>';
+                }
                 elseif($field == 'stepDesc' or $field == 'stepExpect')
                 {
                     $stepDesc = $this->process4Testcase($field, $tmpList, $row);
diff --git a/module/product/js/browse.js b/module/product/js/browse.js
index e4e9e68bb2..0a979fd7bb 100644
--- a/module/product/js/browse.js
+++ b/module/product/js/browse.js
@@ -11,7 +11,7 @@ $(function()
         var $title = $('#storyList thead th.c-title');
         var headerWidth = $('#storyList thead th.c-title a').innerWidth();
         var buttonWidth = $('#storyList thead th.c-title button').innerWidth();
-        if($title.width() < headerWidth + buttonWidth + 2) $title.width(headerWidth + buttonWidth + 30);
+        if($title.width() < headerWidth + buttonWidth + 16) $title.width(headerWidth + buttonWidth + 30);
     });
 
     $('#storyList td.has-child .story-toggle').each(function()
diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php
index 00f5400a4f..5e28abe0af 100644
--- a/module/project/view/testtask.html.php
+++ b/module/project/view/testtask.html.php
@@ -60,7 +60,7 @@
           <th class='c-date'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->testtask->begin);?></th>
           <th class='c-date'><?php common::printOrderLink('end', $orderBy, $vars, $lang->testtask->end);?></th>
           <th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
-          <th class='<?php echo $project->model == 'scrum' ? 'c-actions-5' : 'c-actions-4';?> text-center'><?php echo $lang->actions;?></th>
+          <th class='c-actions-5 text-center'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
@@ -102,7 +102,7 @@
             {
                 common::printIcon('testtask', 'cases',    "taskID=$task->id", $task, 'list', 'sitemap');
                 common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link');
-                if(common::hasPriv('execution', 'testreport') and $project->model == 'scrum')
+                if(common::hasPriv('execution', 'testreport'))
                 {
                     echo html::a($this->createLink('execution', 'testreport', "executionID=$task->execution&objectType=execution&extra=$task->id"), '<i class="icon-testreport-browse icon-summary"></i>', '', 'class="btn " title="' . $lang->testreport->browse . '" data-app="project"');
                 }
diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index b4fd31b40c..8209fbf211 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -118,6 +118,7 @@ $lang->story->pri              = 'Priorität';
 $lang->story->estimate         = 'Schätzung(h)';
 $lang->story->estimateAB       = 'Schätzung(h)';
 $lang->story->hour             = 'Stunde';
+$lang->story->consumed         = 'Zeitaufwendig';
 $lang->story->status           = 'Status';
 $lang->story->statusAB         = 'Status';
 $lang->story->subStatus        = 'Sub Status';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index eaf61f59dd..dbb5d44d16 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -118,6 +118,7 @@ $lang->story->pri              = 'Priority';
 $lang->story->estimate         = "Estimates";
 $lang->story->estimateAB       = 'Est.';
 $lang->story->hour             = $lang->hourCommon;
+$lang->story->consumed         = 'Consumed';
 $lang->story->status           = 'Status';
 $lang->story->statusAB         = 'Status';
 $lang->story->subStatus        = 'Sub Status';
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index d0bff1b1f6..cf5f0c0ac0 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -118,6 +118,7 @@ $lang->story->pri              = 'Priorité';
 $lang->story->estimate         = 'Estimation';
 $lang->story->estimateAB       = 'Esti.(h)';
 $lang->story->hour             = 'Heures';
+$lang->story->consumed         = 'Long';
 $lang->story->status           = 'Statut';
 $lang->story->statusAB         = 'Statut';
 $lang->story->subStatus        = 'Sous-statut';
diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php
index e92b3a8b0c..c0e7f138b4 100644
--- a/module/story/lang/vi.php
+++ b/module/story/lang/vi.php
@@ -116,6 +116,7 @@ $lang->story->pri            = 'Ưu tiên';
 $lang->story->estimate       = "{$lang->hourCommon} dự tính";
 $lang->story->estimateAB     = 'DT.' . $lang->hourCommon == 'giờ' ? '(giờ)' : '(SP)';
 $lang->story->hour           = $lang->hourCommon;
+$lang->story->consumed       = 'Mất thời gian';
 $lang->story->status         = 'Tình trạng';
 $lang->story->subStatus      = 'Tình trạng con';
 $lang->story->stage          = 'Giai đoạn';
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 8f268263e5..0ec66c579d 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -118,6 +118,7 @@ $lang->story->pri              = '优先级';
 $lang->story->estimate         = "预计{$lang->hourCommon}";
 $lang->story->estimateAB       = '预计';
 $lang->story->hour             = $lang->hourCommon;
+$lang->story->consumed         = '耗时';
 $lang->story->status           = '当前状态';
 $lang->story->statusAB         = '状态';
 $lang->story->subStatus        = '子状态';
diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php
index c282e5c83c..75bc90d3e6 100644
--- a/module/story/lang/zh-tw.php
+++ b/module/story/lang/zh-tw.php
@@ -107,6 +107,7 @@ $lang->story->pri            = '優先順序';
 $lang->story->estimate       = "預計{$lang->hourCommon}";
 $lang->story->estimateAB     = '預計';
 $lang->story->hour           = $lang->hourCommon;
+$lang->story->consumed       = '耗時';
 $lang->story->status         = '當前狀態';
 $lang->story->subStatus      = '子狀態';
 $lang->story->stage          = '所處階段';
diff --git a/module/task/css/common.css b/module/task/css/common.css
index 9205805f5d..6970e5aa72 100644
--- a/module/task/css/common.css
+++ b/module/task/css/common.css
@@ -19,8 +19,10 @@
 #modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;}
 #modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;}
 #modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;}
+#modalTeam #team_chosen span {line-height: 24px;}
+#modalTeam #team_chosen a.chosen-default > span {color: #c4c4c4;}
 
-#modalTeam .input-control input[type="text"]::input-placeholder{text-align: right;}
-#modalTeam .input-control input[type="text"]::-webkit-input-placeholder{text-align: right;}
-#modalTeam .input-control input[type="text"]::-moz-placeholder{text-align: right;}
-#modalTeam .input-control input[type="text"]::-ms-input-placeholder{text-align: right;}
+#modalTeam .input-control input[type="text"]::input-placeholder{text-align: center;}
+#modalTeam .input-control input[type="text"]::-webkit-input-placeholder{text-align: center;}
+#modalTeam .input-control input[type="text"]::-moz-placeholder{text-align: center;}
+#modalTeam .input-control input[type="text"]::-ms-input-placeholder{text-align: center;}
diff --git a/module/task/view/taskteam.html.php b/module/task/view/taskteam.html.php
index 28ca7dee5f..ea123d1eb9 100644
--- a/module/task/view/taskteam.html.php
+++ b/module/task/view/taskteam.html.php
@@ -31,7 +31,7 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
     <i class="icon icon-angle-down <?php echo $hiddenArrow;?>"></i>
   </td>
   <td class='w-250px'>
-    <?php echo html::select("team[]", $members, $member->account, "class='form-control chosen'" . ($memberDisabled ? ' disabled' : ''))?>
+    <?php echo html::select("team[]", $members, $member->account, "class='form-control chosen' data-placeholder='{$lang->task->assignedTo}'" . ($memberDisabled ? ' disabled' : ''))?>
     <?php echo html::hidden("teamSource[]", $member->account);?>
     <?php if($memberDisabled) echo html::hidden("team[]", $member->account);?>
   </td>
@@ -68,7 +68,7 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
     <i class="icon icon-angle-down <?php echo $hiddenArrow;?>"></i>
   </td>
   <td class='w-240px'>
-    <?php echo html::select("team[]", $members, '', "class='form-control chosen'")?>
+    <?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'>