diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index 15b028fb24..029b2dfe62 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -143,10 +143,10 @@
             {
                 $vars = "story={$child->id}";
                 common::printIcon('story', 'change',     $vars, $child, 'list', 'alter', '', 'iframe', true);
-                common::printIcon('story', 'review',     $vars, $child, 'list', 'search');
+                common::printIcon('story', 'review',     $vars, $child, 'list', 'search', '', 'iframe', true);
                 common::printIcon('story', 'close',      $vars, $child, 'list', '', '', 'iframe', true);
                 common::printIcon('story', 'edit',       $vars, $child, 'list', '', '', 'iframe', true, "data-width='95%'");
-                common::printIcon('story', 'createCase', "productID=$child->product&branch=$child->branch&module=0&from=&param=0&$vars", $child, 'list', 'sitemap');
+                common::printIcon('story', 'createCase', "productID=$child->product&branch=$child->branch&module=0&from=&param=0&$vars", $child, 'list', 'sitemap', '', 'iframe', true, "data-width='95%'");
             }
             ?>
           </td>
diff --git a/module/product/model.php b/module/product/model.php
index 78ce9e5b2b..5b4b11f951 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1934,6 +1934,10 @@ class productModel extends model
             {
                 $link = helper::createLink('testsuite', 'browse', "productID=%s");
             }
+            elseif(($module == 'testcase' and $method == 'groupCase') or ($module == 'story' and $method == 'zeroCase') and $this->app->tab == 'project')
+            {
+                $link = helper::createLink($module, $method, "productID=%s" . ($branch ? "&branch=%s" : '')) . "#app=project";
+            }
             else
             {
                 $link = helper::createLink($module, $method, "productID=%s" . ($branch ? "&branch=%s" : ''));
diff --git a/module/story/control.php b/module/story/control.php
index 49c659ae06..12fc0692e8 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -647,7 +647,7 @@ class story extends control
         $reviewedReviewer = array();
         foreach($reviewedBy as $reviewer) $reviewedReviewer[] = zget($users, $reviewer);
 
-        if($this->app->tab = 'project' or $this->app->tab = 'execution')
+        if($this->app->tab == 'project' or $this->app->tab == 'execution')
         {
             $objectID = $this->app->tab == 'project' ? $this->session->project : $this->session->execution;
             $productBranches = $product->type != 'normal' ? $this->loadModel('execution')->getBranchByProduct($story->product, $objectID) : array();
@@ -748,7 +748,7 @@ class story extends control
                 $branches      = $this->branch->getPairs($productID);
                 $product       = $this->product->getByID($productID);
                 $branchProduct = $product->type == 'normal' ? false : true;
-                $modules       = $this->tree->getOptionMenu($productID, 'story', 0, array_keys($branches));
+                $modules       = array($productID => $this->tree->getOptionMenu($productID, 'story', 0, array_keys($branches)));
                 $plans         = array($productID => $this->productplan->getBranchPlanPairs($productID));
                 $products      = array($productID => $product);
                 $branches      = array($productID => $branches);
@@ -840,7 +840,7 @@ class story extends control
         $this->view->branchProduct     = $branchProduct;
         $this->view->storyIdList       = $storyIdList;
         $this->view->branch            = $branch;
-        $this->view->plans             = $plans;
+        $this->view->plans             = array('' => '') + $plans;
         $this->view->storyType         = $storyType;
         $this->view->stories           = $stories;
         $this->view->executionID       = $executionID;
@@ -1700,7 +1700,7 @@ class story extends control
             $this->lang->project->menu->qa['subMenu']->testcase['subModule'] = 'story';
             $products  = $this->product->getProducts($this->session->project, 'all', '', false);
             $productID = $this->product->saveState($productID, $products);
-            $this->lang->modulePageNav = $this->product->select($products, $productID, 'story', 'zeroCase');
+            $this->lang->modulePageNav = $this->product->select($products, $productID, 'story', 'zeroCase', '', $branchID);
         }
         else
         {
diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php
index 2b88a87354..7a3eab3f8c 100644
--- a/module/story/view/batchedit.html.php
+++ b/module/story/view/batchedit.html.php
@@ -95,7 +95,7 @@ foreach(explode(',', $showFields) as $field)
             }
             ?>
             <?php if($this->session->currentProductType == 'normal') $productPlans = array('' => '', 'ditto' => $this->lang->story->ditto) + $productPlans;?>
-            <?php echo html::select("plans[$storyID]", isset($plans[$story->product][$story->branch]) ? $plans[$story->product][$story->branch] : '', $story->plan, "class='form-control chosen'");?>
+            <?php echo html::select("plans[$storyID]", isset($plans[$story->product][$story->branch]) ? array('' => '') + $plans[$story->product][$story->branch] : '', $story->plan, "class='form-control chosen'");?>
           </td>
           <td title='<?php echo $story->title?>'>
             <div class="input-group">
diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 2fd00bc077..390877abcd 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -189,7 +189,7 @@ class testsuite extends control
         $this->view->cases        = $this->testsuite->getLinkedCases($suiteID, $sort, $pager);
         $this->view->orderBy      = $orderBy;
         $this->view->pager        = $pager;
-        $this->view->modules      = $this->loadModel('tree')->getOptionMenu($suite->product, 'case');
+        $this->view->modules      = $this->loadModel('tree')->getOptionMenu($suite->product, 'case', 0, 'all');
         $this->view->branches     = $this->loadModel('branch')->getPairs($suite->product, 'noempty');
         $this->view->canBeChanged = common::canBeChanged('testsuite', $suite);