diff --git a/module/block/control.php b/module/block/control.php
index bd6344b39e..c9326f5618 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -216,7 +216,7 @@ class block extends control
         if($module == 'program')
         {
             $program     = $this->loadModel('project')->getByID($this->session->PRJ);
-            $commonField = $program->template . 'common';
+            $commonField = $program->model . 'common';
         }
         $inited = empty($this->config->$module->$commonField->blockInited) ? '' : $this->config->$module->$commonField->blockInited;
 
@@ -415,25 +415,25 @@ class block extends control
 
         if($mode == 'getblocklist')
         {
-            $template  = '';
+            $model     = '';
             $block     = $this->block->getByID($id);
             $dashboard = $this->get->dashboard;
 
             /* Create a program block. */
             if($dashboard == 'program')
             {
-                $program  = $this->loadModel('project')->getByID($this->session->PRJ);
-                $template = $program->template;
+                $program = $this->loadModel('project')->getByID($this->session->PRJ);
+                $model   = $program->model;
             }
 
             /* Edit a program block. */
             if($id and $block->module == 'program')
             {
-                $template  = $block->type;
+                $model     = $block->type;
                 $dashboard = 'program';
             }
 
-            $blocks = $this->block->getAvailableBlocks($module, $dashboard, $template);
+            $blocks = $this->block->getAvailableBlocks($module, $dashboard, $model);
             if(!$this->selfCall)
             {
                 echo $blocks;
@@ -446,7 +446,7 @@ class block extends control
             echo '<div class="form-group">';
             echo '<label for="moduleBlock" class="col-sm-3">' . $this->lang->block->lblBlock . '</label>';
             echo '<div class="col-sm-7">';
-            if($template) echo html::hidden('type', $template);
+            if($model) echo html::hidden('type', $model);
             echo html::select('moduleBlock', $blockPairs, ($block and $block->source != '') ? $block->block : '', "class='form-control chosen'");
             echo '</div></div>';
         }
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index d972a39631..f85e7a1431 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -571,45 +571,45 @@ $lang->navGroup->effort = 'my';
 $lang->navGroup->product     = 'product';
 $lang->navGroup->project     = 'project';
 
-$lang->navGroup->story       = 'program';
-$lang->navGroup->branch      = 'program';
-$lang->navGroup->productplan = 'program';
-$lang->navGroup->release     = 'program';
-$lang->navGroup->tree        = 'program';
-$lang->navGroup->task        = 'program';
-$lang->navGroup->qa          = 'program';
-$lang->navGroup->bug         = 'program';
-$lang->navGroup->doc         = 'program';
-$lang->navGroup->testcase    = 'program';
-$lang->navGroup->testtask    = 'program';
-$lang->navGroup->testreport  = 'program';
-$lang->navGroup->testsuite   = 'program';
-$lang->navGroup->caselib     = 'program';
-$lang->navGroup->feedback    = 'program';
-$lang->navGroup->deploy      = 'program';
-$lang->navGroup->stakeholder = 'program';
+$lang->navGroup->story       = 'project';
+$lang->navGroup->branch      = 'project';
+$lang->navGroup->productplan = 'project';
+$lang->navGroup->release     = 'project';
+$lang->navGroup->tree        = 'project';
+$lang->navGroup->task        = 'project';
+$lang->navGroup->qa          = 'project';
+$lang->navGroup->bug         = 'project';
+$lang->navGroup->doc         = 'project';
+$lang->navGroup->testcase    = 'project';
+$lang->navGroup->testtask    = 'project';
+$lang->navGroup->testreport  = 'project';
+$lang->navGroup->testsuite   = 'project';
+$lang->navGroup->caselib     = 'project';
+$lang->navGroup->feedback    = 'project';
+$lang->navGroup->deploy      = 'project';
+$lang->navGroup->stakeholder = 'project';
 
-$lang->navGroup->programplan    = 'program';
-$lang->navGroup->workestimation = 'program';
-$lang->navGroup->budget         = 'program';
-$lang->navGroup->review         = 'program';
-$lang->navGroup->reviewissue    = 'program';
-$lang->navGroup->weekly         = 'program';
-$lang->navGroup->milestone      = 'program';
-$lang->navGroup->pssp           = 'program';
-$lang->navGroup->design         = 'program';
-$lang->navGroup->repo           = 'program';
-$lang->navGroup->issue          = 'program';
-$lang->navGroup->risk           = 'program';
-$lang->navGroup->auditplan      = 'program';
-$lang->navGroup->cm             = 'program';
-$lang->navGroup->nc             = 'program';
-$lang->navGroup->job            = 'program';
-$lang->navGroup->jenkins        = 'program';
-$lang->navGroup->compile        = 'program';
-$lang->navGroup->build          = 'program';
+$lang->navGroup->programplan    = 'project';
+$lang->navGroup->workestimation = 'project';
+$lang->navGroup->budget         = 'project';
+$lang->navGroup->review         = 'project';
+$lang->navGroup->reviewissue    = 'project';
+$lang->navGroup->weekly         = 'project';
+$lang->navGroup->milestone      = 'project';
+$lang->navGroup->pssp           = 'project';
+$lang->navGroup->design         = 'project';
+$lang->navGroup->repo           = 'project';
+$lang->navGroup->issue          = 'project';
+$lang->navGroup->risk           = 'project';
+$lang->navGroup->auditplan      = 'project';
+$lang->navGroup->cm             = 'project';
+$lang->navGroup->nc             = 'project';
+$lang->navGroup->job            = 'project';
+$lang->navGroup->jenkins        = 'project';
+$lang->navGroup->compile        = 'project';
+$lang->navGroup->build          = 'project';
 
-$lang->navGroup->durationestimation = 'program';
+$lang->navGroup->durationestimation = 'project';
 
 $lang->navGroup->stage         = 'system';
 $lang->navGroup->measurement   = 'system';
diff --git a/module/common/model.php b/module/common/model.php
index 44ec0dd2c0..4ad2e2dffc 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -649,12 +649,12 @@ class commonModel extends model
                             $subActive .= 'dropdown-submenu';
                             $subLink = 'javascript:;';
                             $subProgram .= "<ul class='dropdown-menu'>";
-                            $subProgram .= '<li>' . html::a(helper::createLink('program', 'edit', "programID={$app->session->program}"), "<i class=icon-edit></i> " . "<span class='text'>{$lang->program->edit}</span>", '', "class='btn btn-link'") . '</li>';
-                            $subProgram .= '<li>' . self::buildIconButton('program', 'group', "projectID={$app->session->program}", $program, 'button', 'group', '', '', '', '', $lang->program->group) . '</li>';
-                            $subProgram .= '<li>' . self::buildIconButton('program', 'manageMembers', "projectID={$app->session->program}", $program, 'button', 'persons', '', '', '', '', $lang->program->manageMembers) . '</li>';
-                            $subProgram .= '<li>' . self::buildIconButton('program', 'start', "projectID={$app->session->program}", $program, 'button', 'play', '', 'iframe', true, '', $lang->program->start) . '</li>';
-                            $subProgram .= '<li>' . self::buildIconButton('program', 'activate', "projectID={$app->session->program}", $program, 'button', 'magic', '', 'iframe', true, '', $lang->program->activate) . '</li>';
-                            $subProgram .= '<li>' . self::buildIconButton('program', 'suspend', "projectID={$app->session->program}", $program, 'button', 'pause', '', 'iframe', true, '', $lang->program->suspend) . '</li>';
+                            $subProgram .= '<li>' . html::a(helper::createLink('program', 'prjedit', "programID={$app->session->program}"), "<i class=icon-edit></i> " . "<span class='text'>{$lang->program->PRJEdit}</span>", '', "class='btn btn-link'") . '</li>';
+                            $subProgram .= '<li>' . self::buildIconButton('program', 'prjgroup', "projectID={$app->session->program}", $program, 'button', 'group', '', '', '', '', $lang->program->PRJGroup) . '</li>';
+                            $subProgram .= '<li>' . self::buildIconButton('program', 'prjmanageMembers', "projectID={$app->session->program}", $program, 'button', 'persons', '', '', '', '', $lang->program->PRJManageMembers) . '</li>';
+                            $subProgram .= '<li>' . self::buildIconButton('program', 'prjstart', "projectID={$app->session->program}", $program, 'button', 'play', '', 'iframe', true, '', $lang->program->PRJStart) . '</li>';
+                            $subProgram .= '<li>' . self::buildIconButton('program', 'prjactivate', "projectID={$app->session->program}", $program, 'button', 'magic', '', 'iframe', true, '', $lang->program->PRJActivate) . '</li>';
+                            $subProgram .= '<li>' . self::buildIconButton('program', 'prjsuspend', "projectID={$app->session->program}", $program, 'button', 'pause', '', 'iframe', true, '', $lang->program->PRJSuspend) . '</li>';
                             $subProgram .= '</ul>';
                         }
 
@@ -1737,8 +1737,8 @@ EOD;
         /* Reset priv by program privway. */
         $this->app->user->rights = $this->loadModel('user')->authorize($this->app->user->account);
         $rights = $this->app->user->rights['rights'];
-        if($program->privway == 'extend') $this->app->user->rights['rights'] = array_merge_recursive($programRightGroup, $rights);
-        if($program->privway == 'reset')  
+        if($program->auth == 'extend') $this->app->user->rights['rights'] = array_merge_recursive($programRightGroup, $rights);
+        if($program->auth == 'reset')  
         {
             /* If priv way is reset, unset common program priv, and cover by program priv. */
             foreach($rights as $moduleKey => $methods) 
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index 32bf883a37..3f0b38d381 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -27,7 +27,7 @@ include 'chosen.html.php';
     <div class='container'>
       <div id='heading'>
         <?php if($isProgram) echo $this->lang->program->switcherMenu;?>
-        <?php if($isProject) echo $this->loadModel('program')->getPRJSwitcher($this->program->getPairs(), $this->session->PRJ, $app->rawModule, $app->rawMethod);?>
+        <?php if($isProject) echo $this->loadModel('program')->getPRJSwitcher($this->session->PRJ, $app->rawModule, $app->rawMethod);?>
         <?php if($isSystem)  echo $this->loadModel('custom')->getModeSwitcher();?>
       </div>
       <nav id='navbar'><?php commonModel::printMainmenu($app->rawModule, $app->rawMethod);?></nav>
diff --git a/module/program/model.php b/module/program/model.php
index 87d7f1bedf..4dd42c2b2a 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -766,7 +766,7 @@ class programModel extends model
      * @access private
      * @return void
      */
-    public function getPRJSwitcher($programs, $programID, $currentModule, $currentMethod, $extra = '')
+    public function getPRJSwitcher($programID, $currentModule, $currentMethod)
     {
         $this->loadModel('project');
         $currentProgramName = '';
@@ -778,11 +778,10 @@ class programModel extends model
         }
         if($currentModule == 'program' && $currentMethod == 'browse') $currentProgramName = $this->lang->program->all;
 
-        $dropMenuLink = helper::createLink('program', 'ajaxGetDropMenu', "objectID=$programID&module=$currentModule&method=$currentMethod&extra=$extra");
+        $dropMenuLink = helper::createLink('program', 'ajaxGetDropMenu', "objectID=$programID&module=$currentModule&method=$currentMethod");
         $output  = "<div class='btn-group' id='swapper'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$currentProgramName}'>{$currentProgramName} <i class='icon icon-swap'></i></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
         $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
         $output .= "</div></div>";
-        //if($isMobile) $output  = "<a id='currentItem' href=\"javascript:showSearchMenu('project', '$projectID', '$currentModule', '$currentMethod', '$extra')\">{$currentProjectName} <span class='icon-caret-down'></span></a><div id='currentItemDropMenu' class='hidden affix enter-from-bottom layer'></div>";
 
         return $output;
     }
diff --git a/module/program/view/index.html.php b/module/program/view/index.html.php
index 3c4a8b38e1..4136db8f6e 100644
--- a/module/program/view/index.html.php
+++ b/module/program/view/index.html.php
@@ -10,5 +10,5 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php echo $this->fetch('block', 'dashboard', "module=program&type={$program->template}");?>
+<?php echo $this->fetch('block', 'dashboard', "module=program&type={$program->model}");?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 05af5a22a3..647e974671 100644
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -70,8 +70,8 @@ class programplanModel extends model
         $projects = $this->getProjectsByProduct($productID);
 
         $plans = $this->dao->select('*')->from(TABLE_PROJECT)
-            ->where('program')->eq($programID)
-            ->andWhere('template')->eq('')
+            ->where('type')->eq('stage')
+            ->andWhere('parent')->eq($programID)
             ->beginIF($type != 'all')->andWhere('parent')->eq($planID)->fi()
             ->andWhere('deleted')->eq(0)
             ->beginIF($productID)->andWhere('id')->in($projects)->fi()