diff --git a/module/my/js/requirement.js b/module/my/js/requirement.js
index 65996d23e9..7ce09255ea 100644
--- a/module/my/js/requirement.js
+++ b/module/my/js/requirement.js
@@ -7,6 +7,7 @@ $(function()
         if($td.find('.label').length > 0) labelWidth = $td.find('.label').width();
         $td.find('a').eq(0).css('max-width', $td.width() - labelWidth - 60);
     });
+    toggleFold('#myStoryForm', [], 0, 'requirement');
 
     $(document).on('click', '.story-toggle', function(e)
     {
diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php
index 4072cb4d9f..449c7ef409 100644
--- a/module/my/view/requirement.html.php
+++ b/module/my/view/requirement.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+
 <?php js::set('mode', $mode);?>
 <?php js::set('total', $pager->recTotal);?>
 <?php js::set('rawMethod', $app->rawMethod);?>
@@ -79,7 +80,7 @@
         $canBeChanged = common::canBeChanged('story', $story);
         $spanClass    = $canBatchAction ? 'c-span' : '';
         ?>
-        <tr>
+        <tr data-id='<?php echo $story->id;?>' >
           <td class="c-id">
             <?php if($canBatchAction):?>
             <div class="checkbox-primary">
@@ -91,7 +92,7 @@
           </td>
           <td class='c-name nobr <?php if(!empty($story->children)) echo "has-child" ?>'>
             <?php echo common::hasPriv('requirement', 'view') ? html::a($storyLink, $story->title, null, "style='color: $story->color' data-group='product' title='$story->title'") : "<span title='$story->title'>$story->title</span>";?>
-            <?php if(!empty($story->children)) echo '<a class="story-toggle" data-id="' . $story->id . '"><i class="icon icon-angle-double-right"></i></a>';?>
+            <?php if(!empty($story->children)) echo '<a class="story-toggle" data-id="' . $story->id . '"><i class="icon icon-angle-right"></i></a>';?>
           </td>
           <td class='c-pri'><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
           <td class='c-status'><span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span></td>
diff --git a/module/product/css/browse.css b/module/product/css/browse.css
index 687cadd585..dd98a82845 100644
--- a/module/product/css/browse.css
+++ b/module/product/css/browse.css
@@ -41,3 +41,4 @@ a.removeModule:hover {color: red;}
 #productStoryForm tbody tr td .label {max-width: 100px; text-overflow: unset;}
 .c-span {margin-left: 19px;}
 .btn-toolbar #query span.text{overflow: hidden; width: 52px; vertical-align: middle; margin-right: 1px;}
+#productStoryForm table thead th.c-title {min-width: 50px;}
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 545084f854..26d7033472 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -17,6 +17,7 @@
 #subHeader #dropMenu .col-left {padding-bottom: 0px;}
 #currentBranch + #dropMenu .col-left {padding-bottom: 30px;}
 .c-deadline {text-align: center;}
+#mainContent .main-col {padding-bottom: 20px;}
 </style>
 <div id="mainMenu" class="clearfix main-row fade in">
   <div id="sidebarHeader">
diff --git a/module/task/css/common.css b/module/task/css/common.css
index 842d9c8db3..676f71a76d 100644
--- a/module/task/css/common.css
+++ b/module/task/css/common.css
@@ -1,8 +1,7 @@
 .body-modal > .main {padding: 20px;}
 .body-modal > .main .table-form {border: 1px solid #ddd;}
 
-#modalTeam .modal-dialog {padding-bottom: 20px;}
-#modalTeam .modal-content {padding: 0 0 5px; height: 340px;}
+#modalTeam .modal-content {padding: 0 0 5px; min-height: 120px;}
 #modalTeam .modal-body {padding: 12px 13px 20px; max-height: 296px !important; overflow-y: scroll !important;}
 #modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0; }
 #modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;}
diff --git a/module/task/css/create.css b/module/task/css/create.css
index 6aa2ede9c0..0c8b0eb081 100644
--- a/module/task/css/create.css
+++ b/module/task/css/create.css
@@ -28,6 +28,6 @@
 .c-modulel {width: 110px;}
 
 .keep-row-height {height: 32px;}
-#modalTeam .modal-dialog {height: 340px; width: 520px; color: #3c4353;}
+#modalTeam .modal-dialog {min-height: 120px; width: 520px; color: #3c4353;}
 #taskTeamEditor .chosen-single {width: 200px;}
 #taskTeamEditor .estimateBox {width: 120px;}
diff --git a/www/js/my.full.js b/www/js/my.full.js
index defe102c4f..43cbcf35f6 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -834,7 +834,7 @@ function toggleFold(form, unfoldIdList, objectID, objectType)
     $parentTd = $form.find('td.has-child');
     if($parentTd.length == 0) return false;
 
-    var toggleClass = objectType == 'product' ? 'story-toggle' : 'task-toggle';
+    var toggleClass = ['product', 'requirement'].includes(objectType) ? 'story-toggle' : 'task-toggle';
     var nameClass   = ['product', 'productplan'].indexOf(objectType) !== -1 ? 'c-title' : 'c-name';
     $form.find('th.' + nameClass).addClass('clearfix').append("<span id='toggleFold' class='collapsed'><i  class='icon icon-angle-double-right'></i></span>");