diff --git a/module/project/model.php b/module/project/model.php
index b65d3d13af..06b9aa0f71 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -515,11 +515,7 @@ class projectModel extends model
             }
             elseif($module == 'story')
             {
-                if($method == 'create')
-                {
-                    $link = helper::createLink($module, $method);
-                }
-                elseif($method == 'change')
+                if($method == 'change' or $method == 'create')
                 {
                     $link = helper::createLink('projectstory', 'story', "projectID=%s");
                 }
@@ -528,26 +524,19 @@ class projectModel extends model
                     $link = helper::createLink('project', 'testcase', "projectID=%s");
                 }
             }
-            elseif($module == 'testcase' and $method == 'create')
+            elseif($module == 'testcase')
             {
-                if($method == 'create')
-                {
-                    $link = helper::createLink($module, $method);
-                }
-                elseif($method == 'edit')
-                {
-                    $link = helper::createLink('project', 'testcase', "projectID=%s");
-                }
+                $link = helper::createLink('project', 'testcase', "projectID=%s");
             }
             elseif($module == 'testtask')
             {
-                if($method == 'create')
+                if($method == 'browseunits')
                 {
-                    $link = helper::createLink($module, $method, "product=0&executionID=0&build=0&projectID=%s");
+                    $link = helper::createLink('project', 'testcase', "projectID=%s");
                 }
                 else
                 {
-                    $link = helper::createLink($module, 'browseunits');
+                    $link = helper::createLink('project', 'testtask', "projectID=%s");
                 }
             }
             elseif($module == 'testreport')
@@ -2476,6 +2465,8 @@ class projectModel extends model
 
         $this->lang->switcherMenu = $this->getSwitcher($objectID, $this->app->rawModule, $this->app->rawMethod);
 
+        $this->saveState($objectID, $this->project->getPairsByProgram());
+
         common::setMenuVars('project', $objectID);
     }
 
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 1b3f609a20..13b8418a7e 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -165,7 +165,7 @@ class testtask extends control
                 $this->lang->waterfall->menu->qa['subMenu']->testtask['subModule'] = '';
             }
 
-            $this->loadModel('project')->setMenu($this->session->project);
+            $this->loadModel('project')->setMenu($projectID);
             $this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits', "projectID=$projectID", '', 0, '', false);
         }
         else