diff --git a/module/block/control.php b/module/block/control.php
index 6e77f100d0..bfb4294944 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -230,7 +230,7 @@ class block extends control
         $commonField = 'common';
         if($module == 'project' and $projectID)
         {
-            $project     = $this->loadModel('project')->getByID($this->session->project);
+            $project     = $this->loadModel('project')->getByID($projectID);
             $commonField = $project->model . 'common';
         }
 
diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 44689051f1..a39d9615cd 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -105,48 +105,16 @@ $lang->block->spent           = 'Has Been Spent';
 $lang->block->budget          = 'Budget';
 $lang->block->left            = 'Residuals';
 
-$lang->block->default['waterfall']['project']['1']['title']  = 'Project Weekly';
-$lang->block->default['waterfall']['project']['1']['block']  = 'waterfallreport';
-$lang->block->default['waterfall']['project']['1']['source'] = 'project';
-$lang->block->default['waterfall']['project']['1']['grid']   = 8;
-
-$lang->block->default['waterfall']['project']['2']['title']  = 'Estimate';
-$lang->block->default['waterfall']['project']['2']['block']  = 'waterfallestimate';
-$lang->block->default['waterfall']['project']['2']['source'] = 'project';
-$lang->block->default['waterfall']['project']['2']['grid']   = 4;
-
 $lang->block->default['waterfall']['project']['3']['title']  = 'Plan Gantt Chart';
 $lang->block->default['waterfall']['project']['3']['block']  = 'waterfallgantt';
 $lang->block->default['waterfall']['project']['3']['source'] = 'project';
 $lang->block->default['waterfall']['project']['3']['grid']   = 8;
 
-$lang->block->default['waterfall']['project']['4']['title']  = 'Progress Chart';
-$lang->block->default['waterfall']['project']['4']['block']  = 'waterfallprogress';
-$lang->block->default['waterfall']['project']['4']['grid']   = 4;
-
-$lang->block->default['waterfall']['project']['5']['title']  = 'Project Issue';
-$lang->block->default['waterfall']['project']['5']['block']  = 'waterfallissue';
-$lang->block->default['waterfall']['project']['5']['source'] = 'project';
-$lang->block->default['waterfall']['project']['5']['grid']   = 8;
-
-$lang->block->default['waterfall']['project']['5']['params']['type']    = 'all';
-$lang->block->default['waterfall']['project']['5']['params']['count']   = '15';
-$lang->block->default['waterfall']['project']['5']['params']['orderBy'] = 'id_desc';
-
 $lang->block->default['waterfall']['project']['6']['title']  = 'Dynamic';
 $lang->block->default['waterfall']['project']['6']['block']  = 'projectdynamic';
 $lang->block->default['waterfall']['project']['6']['grid']   = 4;
 $lang->block->default['waterfall']['project']['6']['source'] = 'project';
 
-$lang->block->default['waterfall']['project']['7']['title']  = 'Project Risk';
-$lang->block->default['waterfall']['project']['7']['block']  = 'waterfallrisk';
-$lang->block->default['waterfall']['project']['7']['source'] = 'project';
-$lang->block->default['waterfall']['project']['7']['grid']   = 8;
-
-$lang->block->default['waterfall']['project']['7']['params']['type']    = 'all';
-$lang->block->default['waterfall']['project']['7']['params']['count']   = '15';
-$lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc';
-
 $lang->block->default['scrum']['project']['1']['title'] =  'Project Overview';
 $lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview';
 $lang->block->default['scrum']['project']['1']['grid']  = 8;
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index dbd8e2ed9f..95450b18f9 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -105,48 +105,16 @@ $lang->block->spent           = '已花费';
 $lang->block->budget          = '预算';
 $lang->block->left            = '剩余';
 
-$lang->block->default['waterfall']['project']['1']['title']  = '项目周报';
-$lang->block->default['waterfall']['project']['1']['block']  = 'waterfallreport';
-$lang->block->default['waterfall']['project']['1']['source'] = 'project';
-$lang->block->default['waterfall']['project']['1']['grid']   = 8;
-
-$lang->block->default['waterfall']['project']['2']['title']  = '估算';
-$lang->block->default['waterfall']['project']['2']['block']  = 'waterfallestimate';
-$lang->block->default['waterfall']['project']['2']['source'] = 'project';
-$lang->block->default['waterfall']['project']['2']['grid']   = 4;
-
 $lang->block->default['waterfall']['project']['3']['title']  = "项目计划";
 $lang->block->default['waterfall']['project']['3']['block']  = 'waterfallgantt';
 $lang->block->default['waterfall']['project']['3']['source'] = 'project';
 $lang->block->default['waterfall']['project']['3']['grid']   = 8;
 
-$lang->block->default['waterfall']['project']['4']['title']  = '到目前为止项目进展趋势图';
-$lang->block->default['waterfall']['project']['4']['block']  = 'waterfallprogress';
-$lang->block->default['waterfall']['project']['4']['grid']   = 4;
-
-$lang->block->default['waterfall']['project']['5']['title']  = '项目问题';
-$lang->block->default['waterfall']['project']['5']['block']  = 'waterfallissue';
-$lang->block->default['waterfall']['project']['5']['source'] = 'project';
-$lang->block->default['waterfall']['project']['5']['grid']   = 8;
-
-$lang->block->default['waterfall']['project']['5']['params']['type']    = 'all';
-$lang->block->default['waterfall']['project']['5']['params']['count']   = '15';
-$lang->block->default['waterfall']['project']['5']['params']['orderBy'] = 'id_desc';
-
 $lang->block->default['waterfall']['project']['6']['title']  = '最新动态';
 $lang->block->default['waterfall']['project']['6']['block']  = 'projectdynamic';
 $lang->block->default['waterfall']['project']['6']['grid']   = 4;
 $lang->block->default['waterfall']['project']['6']['source'] = 'project';
 
-$lang->block->default['waterfall']['project']['7']['title']  = '项目风险';
-$lang->block->default['waterfall']['project']['7']['block']  = 'waterfallrisk';
-$lang->block->default['waterfall']['project']['7']['source'] = 'project';
-$lang->block->default['waterfall']['project']['7']['grid']   = 8;
-
-$lang->block->default['waterfall']['project']['7']['params']['type']    = 'all';
-$lang->block->default['waterfall']['project']['7']['params']['count']   = '15';
-$lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc';
-
 $lang->block->default['scrum']['project']['1']['title'] =  '项目概况';
 $lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview';
 $lang->block->default['scrum']['project']['1']['grid']  = 8;
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index cd4eb4912b..025951b915 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -240,24 +240,28 @@ $lang->scrum->menu->settings['subMenu']->group       = array('link' => "{$lang->
 
 /* Waterfall menu. */
 $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&productID=0&type=lists", 'subModule' => 'programplan');
 $lang->waterfall->menu->execution   = array('link' => "{$lang->stage->common}|project|execution|status=all&projectID=%s");
 $lang->waterfall->menu->story       = array('link' => "$lang->SRCommon|projectstory|story|project=%s", 'subModule' => 'projectstory,tree', 'exclude' => 'projectstory-track');
 $lang->waterfall->menu->design      = array('link' => "{$lang->design->common}|design|browse|project=%s");
+$lang->waterfall->menu->qa          = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug', 'alias' => 'bug,testtask,testcase');
 $lang->waterfall->menu->devops      = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo');
 $lang->waterfall->menu->build       = array('link' => "{$lang->build->common}|project|build|project=%s");
 $lang->waterfall->menu->release     = array('link' => "{$lang->release->common}|projectrelease|browse|project=%s", 'subModule' => 'projectrelease');
 $lang->waterfall->menu->dynamic     = array('link' => "$lang->dynamic|project|dynamic|project=%s");
 
 $lang->waterfall->menu->settings = $lang->scrum->menu->settings;
-$lang->waterfall->dividerMenu = ',build,dynamic,';
+$lang->waterfall->dividerMenu    = ',programplan,build,dynamic,';
 
 /* Waterfall menu order. */
+$lang->waterfall->menuOrder[5]  = 'index';
 $lang->waterfall->menuOrder[15] = 'programplan';
 $lang->waterfall->menuOrder[20] = 'execution';
 $lang->waterfall->menuOrder[25] = 'story';
 $lang->waterfall->menuOrder[30] = 'design';
 $lang->waterfall->menuOrder[35] = 'devops';
+$lang->waterfall->menuOrder[55] = 'qa';
 $lang->waterfall->menuOrder[60] = 'doc';
 $lang->waterfall->menuOrder[65] = 'build';
 $lang->waterfall->menuOrder[70] = 'release';
@@ -274,11 +278,11 @@ $lang->waterfall->menu->qa['subMenu']->testcase = array('link' => "{$lang->testc
 $lang->waterfall->menu->qa['subMenu']->testtask = array('link' => "{$lang->testtask->common}|project|testtask|projectID=%s", 'subModule' => 'testtask', 'class' => 'dropdown dropdown-hover');
 
 $lang->waterfall->menu->design['subMenu'] = new stdclass();
-$lang->waterfall->menu->design['subMenu']->all      = array("link' => '$lang->all|design|browse|projectID=%s&productID=0&browseType=all");
-$lang->waterfall->menu->design['subMenu']->hlds     = array("link' => '{$lang->design->HLDS}|design|browse|projectID=%s&productID=0&browseType=HLDS");
-$lang->waterfall->menu->design['subMenu']->dds      = array("link' => '{$lang->design->DDS}|design|browse|projectID=%s&productID=0&browseType=DDS");
-$lang->waterfall->menu->design['subMenu']->dbds     = array("link' => '{$lang->design->DBDS}|design|browse|projectID=%s&productID=0&browseType=DBDS");
-$lang->waterfall->menu->design['subMenu']->ads      = array("link' => {$lang->design->ADS}|design|browse|projectID=%s&productID=0&browseType=ADS");
+$lang->waterfall->menu->design['subMenu']->all      = array('link' => "$lang->all|design|browse|projectID=%s&productID=0&browseType=all");
+$lang->waterfall->menu->design['subMenu']->hlds     = array('link' => "{$lang->design->HLDS}|design|browse|projectID=%s&productID=0&browseType=HLDS");
+$lang->waterfall->menu->design['subMenu']->dds      = array('link' => "{$lang->design->DDS}|design|browse|projectID=%s&productID=0&browseType=DDS");
+$lang->waterfall->menu->design['subMenu']->dbds     = array('link' => "{$lang->design->DBDS}|design|browse|projectID=%s&productID=0&browseType=DBDS");
+$lang->waterfall->menu->design['subMenu']->ads      = array('link' => "{$lang->design->ADS}|design|browse|projectID=%s&productID=0&browseType=ADS");
 $lang->waterfall->menu->design['subMenu']->bysearch = array('link' => '<a href="javascript:;" class="querybox-toggle"><i class="icon-search icon"></i> ' . $lang->searchAB . '</a>');
 
 /* Execution menu. */
diff --git a/module/programplan/model.php b/module/programplan/model.php
index b0f8d556da..181571d72d 100644
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -480,8 +480,11 @@ class programplanModel extends model
         foreach($datas as $data)
         {
             /* Set planDuration and realDuration. */
-            $data->planDuration = $this->getDuration($data->begin, $data->end);
-            $data->realDuration = $this->getDuration($data->realBegan, $data->realEnd);
+            if(isset($this->config->maxVersion))
+            {
+                $data->planDuration = $this->getDuration($data->begin, $data->end);
+                $data->realDuration = $this->getDuration($data->realBegan, $data->realEnd);
+            }
 
             $projectChanged = false;
             $data->days     = helper::diffDate($data->end, $data->begin) + 1;
@@ -671,8 +674,11 @@ class programplanModel extends model
         }
 
         /* Set planDuration and realDuration. */
-        $plan->planDuration = $this->getDuration($plan->begin, $plan->end);
-        $plan->realDuration = $this->getDuration($plan->realBegan, $plan->realEnd);
+        if(isset($this->config->maxVersion))
+        {
+            $plan->planDuration = $this->getDuration($plan->begin, $plan->end);
+            $plan->realDuration = $this->getDuration($plan->realBegan, $plan->realEnd);
+        }
 
         if($planChanged)  $plan->version = $oldPlan->version + 1;
         if(empty($plan->parent)) $plan->parent = $projectID;
diff --git a/module/project/model.php b/module/project/model.php
index 2e204e57e4..ccf06ddc38 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1429,15 +1429,7 @@ class projectModel extends model
         $canBatchEdit = common::hasPriv('project', 'batchEdit');
         $account      = $this->app->user->account;
         $id           = $col->id;
-
-        if($project->model == 'waterfall')
-        {
-            $projectLink = helper::createLink('programplan', 'browse', "projectID=$project->id&productID=0&type=lists", '', '', $project->id); 
-        }
-        else
-        {
-            $projectLink  = $this->config->systemMode == 'new' ? helper::createLink('project', 'index', "projectID=$project->id", '', '', $project->id) : helper::createLink('execution', 'task', "projectID=$project->id");
-        }
+        $projectLink  = $this->config->systemMode == 'new' ? helper::createLink('project', 'index', "projectID=$project->id", '', '', $project->id) : helper::createLink('execution', 'task', "projectID=$project->id");
 
         if($col->show)
         {
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index 7605f19000..4aa753f687 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -74,10 +74,7 @@ foreach($projects as $programID => $programProjects)
     {
         $selected    = $project->id == $projectID ? 'selected' : '';
         $link        = helper::createLink('project', 'index', "projectID=%s", '', '', $project->id);
-        $projectName = $project->name;
-
-        /* If this version is maxVersion, add the execution icon before execution name. */
-        if(isset($this->config->maxVersion)) $projectName = $project->model == 'scrum' ? '<i class="icon icon-sprint"></i> ' . $project->name : '<i class="icon icon-waterfall"></i> ' . $project->name;
+        $projectName = $project->model == 'scrum' ? '<i class="icon icon-sprint"></i> ' . $project->name : '<i class="icon icon-waterfall"></i> ' . $project->name;
 
         if($project->status != 'done' and $project->status != 'closed' and $project->PM == $this->app->user->account)
         {