diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index d5dbd1b402..d35318470a 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -556,7 +556,9 @@ function notice()
         else
         {
             executionID = $('#execution').val();
-            link = createLink('build', 'create','executionID=' + executionID + '&productID=' + $('#product').val());
+            productID   = $('#product').val();
+            projectID   = $('#project').val();
+            link = createLink('build', 'create','executionID=' + executionID + '&productID=' + productID + '&projectID=' + projectID);
             link += config.requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes';
             html += '<a href="' + link + '" data-toggle="modal" data-type="iframe" style="padding-right:5px">' + createBuild + '</a> ';
             html += '<a href="javascript:loadExecutionBuilds(' + executionID + ')">' + refresh + '</a>';
diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php
index 3e41ae4c8f..08ca7ba16c 100644
--- a/module/my/view/requirement.html.php
+++ b/module/my/view/requirement.html.php
@@ -60,7 +60,7 @@
           <th class='c-hours'>     <?php common::printOrderLink('estimate',     $orderBy, $vars, $lang->story->estimateAB);?></th>
           <th class='c-status'>    <?php common::printOrderLink('status',       $orderBy, $vars, $lang->statusAB);?></th>
           <th class='c-stage'>     <?php common::printOrderLink('stage',        $orderBy, $vars, $lang->story->stageAB);?></th>
-          <th class='c-actions-5'> <?php echo $lang->actions;?></th>
+          <th class='c-actions-4'> <?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
@@ -98,7 +98,6 @@
                 common::printIcon('story', 'review',     $vars, $story, 'list', 'search', '', 'iframe', true);
                 common::printIcon('story', 'close',      $vars, $story, 'list', '', '', 'iframe', true);
                 common::printIcon('story', 'edit',       $vars, $story, 'list', '', '', 'iframe', true, "data-width='95%'");
-                common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$vars", $story, 'list', 'sitemap');
             }
             ?>
           </td>
diff --git a/module/product/model.php b/module/product/model.php
index 43fe6c4e1f..d5d1d6aecf 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -74,7 +74,7 @@ class productModel extends model
      */
     public function select($products, $productID, $currentModule, $currentMethod, $extra = '', $branch = 0, $module = 0, $moduleType = '', $withBranch = true)
     {
-        $isBrowseBug = (strpos(',project,execution,', ",{$this->app->openApp},") !== false and strpos(',bug,testcase,testtask,', ",{$this->app->rawMethod},") !== false and isset($products[0])) ? true : false;
+        $isBrowseBug = (strpos(',project,execution,', ",{$this->app->openApp},") !== false and strpos(',bug,testcase,testtask,ajaxselectstory,', ",{$this->app->rawMethod},") !== false and isset($products[0])) ? true : false;
 
         $this->app->loadLang('product');
         if(!$isBrowseBug and !$productID)
@@ -1575,6 +1575,10 @@ class productModel extends model
             {
                 $link = helper::createLink($module, 'report', "productID=%s" . ($branch ? "&branch=%s" : '&branch=0') . "&extra=$extra");
             }
+            elseif($module == 'testtask')
+            {
+                $link = helper::createLink($module, 'browse', "productID=%s" . ($branch ? "&branch=%s" : '&branch=0') . "&extra=$extra");
+            }
             elseif($module == 'bug' && $method == 'view')
             {
                 $link = helper::createLink('bug', 'browse', "productID=%s" . ($branch ? "&branch=%s" : '&branch=0') . "&extra=$extra");
diff --git a/module/story/model.php b/module/story/model.php
index 413fc6c928..e057aafc49 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3337,6 +3337,10 @@ class storyModel extends model
                     }
                 }
             }
+            else if($id == 'actions')
+            {
+                $class .= ' text-center';
+            }
 
             echo "<td class='" . $class . "' title='$title' style='$style'>";
             if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFlowCell('story', $story, $id);
@@ -3484,7 +3488,7 @@ class storyModel extends model
                     common::printIcon('story', 'review',     $vars . "&from=$story->from", $story, 'list', 'search', '', '', false, "data-group=$story->from");
                     common::printIcon('story', 'close',      $vars, $story, 'list', '', '', 'iframe', true);
                     common::printIcon('story', 'edit',       $vars . "&from=$story->from", $story, 'list', '', '', '', false, "data-group=$story->from");
-                    common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$vars", $story, 'list', 'sitemap', '', '', false, "data-app='qa'");
+                    if($story->type != 'requirement') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$vars", $story, 'list', 'sitemap', '', '', false, "data-app='qa'");
                     common::printIcon('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&storyID=$story->id", $story, 'list', 'split', '', '', '', '', $this->lang->story->subdivide);
                     if($this->app->rawModule == 'projectstory') common::printIcon('projectstory', 'unlinkStory', "projectID={$this->session->project}&storyID=$story->id", '', 'list', 'unlink', 'hiddenwin');
                 }
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 103b6bf853..c9678db455 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -54,7 +54,7 @@ js::set('suiteID',        $suiteID);
     <div class="table-empty-tip">
       <p>
         <span class="text-muted"><?php echo $lang->testcase->noCase;?></span>
-        <?php if(common::canModify('product', $product) and common::hasPriv('testcase', 'create') and $browseType != 'bysuite'):?>
+        <?php if((empty($productID) or common::canModify('product', $product)) and common::hasPriv('testcase', 'create') and $browseType != 'bysuite'):?>
         <?php $initModule = isset($moduleID) ? (int)$moduleID : 0;?>
         <?php echo html::a($this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule"), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info' data-app='{$this->app->openApp}'");?>
         <?php endif;?>
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index dd5e3a95ed..129f5c3d94 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -61,7 +61,7 @@
 
         echo "<div id='bysuiteTab' class='btn-group'>";
         echo html::a('javascript:;', "<span class='text'>{$currentLable}</span>" . " <span class='caret'></span>", '', "class='btn btn-link' data-toggle='dropdown'");
-        if(common::canModify('product', $product))
+        if(empty($productID) or common::canModify('product', $product))
         {
             echo "<ul class='dropdown-menu' style='max-height:240px; overflow-y:auto'>";
 
@@ -130,7 +130,7 @@
       </ul>
     </div>
     <?php endif;?>
-    <?php if(common::canModify('product', $product)):?>
+    <?php if(empty($productID) or common::canModify('product', $product)):?>
     <?php if(!empty($productID)): ?>
     <div class='btn-group'>
       <button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown' id='importAction'><i class='icon icon-import muted'></i> <?php echo $lang->import ?><span class='caret'></span></button>
@@ -180,7 +180,7 @@
       </ul>
       <?php endif;?>
     </div>
-    <?php if($this->app->rawMethod == 'browseunits' and common::canModify('product', $product)):?>
+    <?php if($this->app->rawMethod == 'browseunits' and (empty($productID) or common::canModify('product', $product))):?>
       <?php common::printLink('testtask', 'importUnitResult', "product=$productID", "<i class='icon icon-import'></i> " . $lang->testtask->importUnitResult, '', "class='btn btn-primary' data-app='{$this->app->openApp}'");?>
     <?php endif;?>
     <?php else:?>