diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 1c2181e738..2ef8dc081e 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -217,11 +217,10 @@ $lang->scrum->menu->settings['subMenu']->group       = array('link' => "{$lang->
 $lang->waterfall->menu = new stdclass();
 $lang->waterfall->menu->index       = array('link' => "$lang->dashboard|project|index|project=%s");
 $lang->waterfall->menu->programplan = array('link' => "{$lang->productplan->shortCommon}|programplan|browse|project=%s", 'subModule' => 'programplan');
-$lang->waterfall->menu->doc         = array('link' => "{$lang->doc->common}|doc|index|project=%s");
+$lang->waterfall->menu->doc         = array('link' => "{$lang->doc->common}|doc|objectLibs|type=project&objectID=%s");
 $lang->waterfall->menu->story       = array('link' => "$lang->SRCommon|projectstory|story|project=%s", 'subModule' => 'projectstory');
-$lang->waterfall->menu->design      = array('link' => "$lang->design|design|browse|product=0&project=%s");
+$lang->waterfall->menu->design      = array('link' => "$lang->design|design|browse|product=%s");
 $lang->waterfall->menu->repo        = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&objectID=%s", 'subModule' => 'repo');
-$lang->waterfall->menu->track       = array('link' => "$lang->track|projectstory|track", 'alias' => 'track');
 $lang->waterfall->menu->qa         = array('link' => "{$lang->qa->common}|project|qa|projectID=%s", 'subModule' => 'testcase,testtask,bug', 'alias' => 'bug,testtask,testcase');
 $lang->waterfall->menu->release     = array('link' => "{$lang->release->common}|projectrelease|browse", 'subModule' => 'projectrelease');
 $lang->waterfall->menu->build       = array('link' => "{$lang->build->common}|project|build|project=%s");
@@ -247,11 +246,17 @@ $lang->waterfall->menuOrder[65] = 'other';
 $lang->waterfall->menuOrder[68] = 'dynamic';
 $lang->waterfall->menuOrder[70] = 'projectsetting';
 
+$lang->waterfall->menu->qa['subMenu'] = new stdclass();
+$lang->waterfall->menu->qa['subMenu']->index    = array('link' => "$lang->dashboard|project|qa|projectID=%s");
+$lang->waterfall->menu->qa['subMenu']->bug      = array('link' => "{$lang->bug->common}|project|bug|projectID=%s", 'subModule' => 'bug');
+$lang->waterfall->menu->qa['subMenu']->testcase = array('link' => "{$lang->testcase->shortCommon}|project|testcase|projectID=%s", 'subModule' => 'testsuite,testcase,caselib');
+$lang->waterfall->menu->qa['subMenu']->testtask = array('link' => "{$lang->testtask->common}|project|testtask|projectID=%s", 'subModule' => 'testtask', 'class' => 'dropdown dropdown-hover');
+
 $lang->waterfall->menu->other['dropMenu'] = new stdclass();
-$lang->waterfall->menu->other['dropMenu']->estimation  = array('link' => "$lang->estimation|workestimation|index|program=%s", 'subModule' => 'workestimation,durationestimation,budget');
-$lang->waterfall->menu->other['dropMenu']->issue       = array('link' => "$lang->issue|issue|browse|", 'subModule' => 'issue');
-$lang->waterfall->menu->other['dropMenu']->risk        = array('link' => "$lang->risk|risk|browse|", 'subModule' => 'risk');
-$lang->waterfall->menu->other['dropMenu']->stakeholder = array('link' => "{$lang->stakeholder->common}|stakeholder|browse|", 'subModule' => 'stakeholder');
+$lang->waterfall->menu->other['dropMenu']->estimation  = array('link' => "$lang->estimation|workestimation|index|projectID=%s", 'subModule' => 'workestimation,durationestimation,budget');
+$lang->waterfall->menu->other['dropMenu']->issue       = array('link' => "$lang->issue|issue|browse|projectID=%s", 'subModule' => 'issue');
+$lang->waterfall->menu->other['dropMenu']->risk        = array('link' => "$lang->risk|risk|browse|projectID=%s", 'subModule' => 'risk');
+$lang->waterfall->menu->other['dropMenu']->stakeholder = array('link' => "{$lang->stakeholder->common}|stakeholder|browse|projectID=%s", 'subModule' => 'stakeholder');
 
 $lang->waterfall->menu->settings = $lang->scrum->menu->settings;
 
diff --git a/module/project/model.php b/module/project/model.php
index 13d4cf924f..424efc8225 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -628,7 +628,7 @@ class projectModel extends model
         }
 
         krsort($projectMenu);
-        $projectMenu = implode('', $projectMenu);
+        $projectMenu = array_pop($projectMenu);
         $lastMenu    = "<ul class='tree' data-ride='tree' id='projectTree' data-name='tree-project'>{$projectMenu}</ul>\n";
 
         return $lastMenu;
@@ -1600,9 +1600,12 @@ class projectModel extends model
         $this->lang->project->menu      = $this->lang->{$project->model}->menu;
         $this->lang->project->menuOrder = $this->lang->{$project->model}->menuOrder;
 
+        $moduleName = $this->app->getModuleName();
+        $methodName = $this->app->getMethodName();
         foreach($this->lang->project->menu as $key => $menu)
         {
             if(!isset($this->lang->project->menu->{$key}['dropMenu'])) continue;
+            $projectSubMenu = $this->lang->project->menu->{$key}['dropMenu'];
             $dropMenu = common::createDropMenu($this->lang->project->menu->{$key}['dropMenu'], $objectID);
             if(!empty($dropMenu))
             {