diff --git a/module/build/control.php b/module/build/control.php
index d768e9aa81..1da5979ced 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -27,7 +27,10 @@ class build extends control
 
         if($this->app->openApp == 'project')
         {
+            $model = $this->dao->select('model')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch('model');
+            $this->lang->project->menu = $this->lang->menu->$model;
             commonModel::setAppObjectID('project', $projectID);
+
             $executions  = $this->execution->getPairs($projectID);
             $executionID = key($executions);
         }
diff --git a/module/common/model.php b/module/common/model.php
index 04917e4964..accb24ebf4 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -696,6 +696,7 @@ class commonModel extends model
                 /* Avoid highlighting the same navigation method at the same time. */
                 if($currentModule == 'feedback' and $currentMethod == 'admin') $active = '';
                 if($currentModule == 'product' and $currentMethod == 'browse') $active = '';
+                if($currentModule == 'product' and $currentMethod == 'create') $active = '';
                 if($currentModule == 'story') $active = '';
 
                 $misc = $openApp != $lang->navGroup->$module ? "data-app='$openApp'" : '';
diff --git a/module/product/control.php b/module/product/control.php
index 76e8191a49..c998dffb50 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -321,15 +321,7 @@ class product extends control
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate));
         }
 
-        if($programID)
-        {
-            $this->lang->program->switcherMenu = $this->loadModel('program')->getSwitcher($programID, true);
-            commonModel::setAppObjectID('program', $programID);
-        }
-        else
-        {
-            $this->lang->product->switcherMenu = $this->product->getSwitcher();
-        }
+        if($programID) commonModel::setAppObjectID('program', $programID);
 
         $this->loadModel('user');
         $poUsers = $this->user->getPairs('nodeleted|pofirst|noclosed',  '', $this->config->maxCount);
diff --git a/module/product/model.php b/module/product/model.php
index febb71a391..0e8be554c1 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1555,6 +1555,10 @@ class productModel extends model
             {
                 $link = helper::createLink($module, $method, "productID=%s&type=$extra");
             }
+            elseif($module == 'product' && $method == 'create')
+            {
+                $link = helper::createLink($module, 'browse', "productID=%s&type=$extra");
+            }
             elseif($module == 'qa' && $method == 'index')
             {
                 $link = helper::createLink('bug', 'browse', "productID=%s" . ($branch ? "&branch=%s" : ''));
diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index 4d5391c44d..45311efea1 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -28,19 +28,19 @@ foreach($products as $product)
     {
         $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
         $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id);
-        $myProductsHtml .= html::a($linkHtml, $productName, '', "class='text-important' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openApp'");
+        $myProductsHtml .= html::a($linkHtml, $productName, '', "class='text-important' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'");
     }
     else if($product->status == 'normal' and !($product->PO == $this->app->user->account))
     {
         $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
         $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id);
-        $normalProductsHtml .= html::a($linkHtml, $productName, '', "title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openApp'");
+        $normalProductsHtml .= html::a($linkHtml, $productName, '', "title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'");
     }
     else if($product->status == 'closed')
     {
         $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id;
         $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $objectID);
-        $closedProductsHtml .= html::a($linkHtml, $productName, '', "title='{$productName}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-group='$openApp'");
+        $closedProductsHtml .= html::a($linkHtml, $productName, '', "title='{$productName}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'");
     }
 }
 ?>
@@ -62,7 +62,7 @@ foreach($products as $product)
     </div>
     <div class="col-footer">
       <?php //echo html::a(helper::createLink('product', 'all'), '<i class="icon icon-cards-view muted"></i> ' . $lang->product->all, '', 'class="not-list-item"'); ?>
-      <?php echo html::a(helper::createLink('product', 'create'), '<i class="icon icon-plus"></i> ' . $lang->product->create, '', 'class="not-list-item"'); ?>
+      <?php echo html::a(helper::createLink('product', 'create'), '<i class="icon icon-plus"></i> ' . $lang->product->create, '', 'class="not-list-item" data-app="product"'); ?>
       <a class='pull-right toggle-right-col not-list-item'><?php echo $lang->product->closed?><i class='icon icon-angle-right'></i></a>
     </div>
   </div>
diff --git a/module/program/view/ajaxgetdropmenu.html.php b/module/program/view/ajaxgetdropmenu.html.php
index 0d1d968201..b8eefa99bb 100644
--- a/module/program/view/ajaxgetdropmenu.html.php
+++ b/module/program/view/ajaxgetdropmenu.html.php
@@ -23,7 +23,7 @@ $programsPinYin = common::convert2Pinyin($programNames);
 .tree li.has-list.open:before {border-left: none;}
 #programTree li {padding: 0 0 0 8px;}
 #programTree li.has-list {padding-left: 20px;}
-#programTree li > a {display: block; padding: 5px 0; border-radius: 2px; padding-left: 6px; height: 30px;}
+#programTree li > a {display: block; padding: 6px 0; border-radius: 2px; padding-left: 6px; height: 30px;}
 #programTree li > a > span {display: inline-block;}
 #programTree li > a > span + span {margin-left: 8px;}
 #programTree li.selected > a {background-color: #E8F3FC;}