diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 670dc6cee2..34c540b15f 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -29,6 +29,8 @@ $lang->help             = '帮助';
 $lang->aboutZenTao      = '关于禅道';
 $lang->profile          = '个人档案';
 $lang->changePassword   = '修改密码';
+$lang->unfoldMenu       = '展开导航';
+$lang->collapseMenu     = '收起导航';
 $lang->runInfo          = "<div class='row'><div class='u-1 a-center' id='debugbar'>时间: %s 毫秒, 内存: %s KB, 查询: %s.  </div></div>";
 $lang->agreement        = "已阅读并同意<a href='http://zpl.pub/page/zplv12.html' target='_blank'>《Z PUBLIC LICENSE授权协议1.2》</a>。<span class='text-danger'>未经许可，不得去除、隐藏或遮掩禅道软件的任何标志及链接。</span>";
 $lang->designedByAIUX   = "<a href='https://api.zentao.net/goto.php?item=aiux' class='link-aiux' target='_blank'>Designed by <strong>艾体验</strong></a>";
@@ -130,7 +132,7 @@ $lang->common->common = '公有模块';
 /* 主导航菜单。*/
 $lang->mainNav = new stdclass();
 $lang->mainNav->my      = '<i class="icon icon-menu-my"></i> 地盘|my|index|';
-$lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> 项目集|program|pgmproduct|';
+$lang->mainNav->program = '<i class="icon icon-folder-open-o"></i> 项目集|program|pgmbrowse|';
 $lang->mainNav->product = '<i class="icon icon-product"></i> 产品|product|browse|';
 $lang->mainNav->project = '<i class="icon icon-project"></i> 项目|program|index|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> 代码|repo|browse|';
diff --git a/module/common/model.php b/module/common/model.php
index 35aabaf6cb..6b00d1a6cc 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -290,6 +290,14 @@ class commonModel extends model
                 echo '</a></li><li class="divider"></li>';
                 echo '<li>' . html::a(helper::createLink('my', 'profile', '', '', true), "<i class='icon icon-account'></i> " . $lang->profile, '', "class='iframe' data-width='600'") . '</li>';
                 echo '<li>' . html::a(helper::createLink('my', 'changepassword', '', '', true), "<i class='icon-cog-outline'></i> " . $lang->changePassword, '', "class='iframe' data-width='600'") . '</li>';
+                if(isset($_COOKIE['hideMenu']) and $_COOKIE['hideMenu'])
+                {
+                    echo '<li>' . "<a type='button' id='menuToggle'><i class='icon icon-sm icon-menu-collapse'></i> $lang->unfoldMenu</a>" . '</li>';
+                }
+                else
+                {
+                    echo '<li>' . "<a type='button' id='menuToggle'><i class='icon icon-sm icon-menu-collapse'></i> $lang->collapseMenu</a>" . '</li>';
+                }
 
                 echo "<li class='divider'></li>";
             }
diff --git a/module/index/css/index.css b/module/index/css/index.css
index 8631675abd..ab74c99daf 100644
--- a/module/index/css/index.css
+++ b/module/index/css/index.css
@@ -7,7 +7,7 @@
 [lang="en"] #pagesBar {left: 134px}
 #bars {position: absolute; left: 0; top: 0; bottom: 0; padding: 0 5px}
 #bars > li {padding: 8px 5px;}
-#bars > li > a {height: 24px; color: #fff; background: #88b6ff; padding: 2px 8px; line-height: 20px; border-radius: 2px;}
+#bars > li > a {height: 24px; color: #fff; background: #3c4353; padding: 2px 8px; line-height: 20px; border-radius: 2px;}
 #bars > li > a:hover, #bars > li > a:active, #bars > li > a:focus {background: #3c495c}
 #bars > li.active > a, #bars > li.active > a:active, #bars > li.active > a:focus {background: #0c64eb}
 #bars > li.active:after {content: ' '; display: block; position: absolute; background: #a0cafa; height: 3px; left: 5px; right: 5px; bottom: 0; border-radius: 2px;}
@@ -18,7 +18,7 @@
 #userNav>li{text-align: center}
 #userNav>li>a{padding: 6px 6px;color: #fff; opacity: .9;margin-left: 0px}
 #userNav>li>a:hover{background: #0c64eb;}
-#userNav>li>.dropdown-menu{left: 100%; top: -290px; width: 140px;text-align: left; background: #3c495c;}
+#userNav>li>.dropdown-menu{left: 100%; top: -310px; width: 140px;text-align: left; background: #3c495c;}
 #userNav>li>.dropdown-menu a{color: #fff}
 #userNav>li>.dropdown-menu .dropdown-menu{left: 100%; text-align: left; background: #3c495c}
 #userNav>li .lang .dropdown-menu, #userNav>li .theme .dropdown-menu{top: -60px}
diff --git a/module/project/model.php b/module/project/model.php
index b6ade223b4..00266a0896 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -187,17 +187,12 @@ class projectModel extends model
 
         if(isset($currentProject->type) and $currentProject->type == 'program') return;
 
-        if(isset($currentProject->program)) $program = $this->getByID($currentProject->program);
+        if(isset($currentProject->project)) $project = $this->loadModel('program')->getPRJByID($currentProject->project);
 
-        if(isset($program->product) and $program->product == 'multiple')
+        if(isset($project) and $project->model == 'waterfall')
         {
             $productID = $this->loadModel('product')->getProductIDByProject($currentProject->id);
             $productName = $this->dao->findByID($productID)->from(TABLE_PRODUCT)->fetch('name');
-            if($currentProject->parent)
-            {
-                $parentInfo = $this->getById($currentProject->parent);
-                $currentProject->name = $parentInfo->name . '/' . $currentProject->name;
-            }
             $currentProject->name = $productName . '/' . $currentProject->name;
         }
 
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index ea81453203..2b1181d216 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -62,3 +62,11 @@ a.showMoreImage:hover {opacity: 1;}
 #menuFooter{height: 50px}
 
 #header #toolbar a{color: #fff; font-size: 14px; line-height: 15px;}
+
+#navbar .nav>li.divider {margin: 15px 8px 15px 8px;}
+#navbar .nav>li>a { padding: 10px 10px;}
+
+#menuToggle { width: 100%; height: 24px; line-height: 24px; color: #fff; text-align: left; background: 0 0; border: none; opacity: .8; }
+#menuToggle:hover{background-color: #0c64eb}
+.menu-hide #menuToggle { height: 24px; line-height: 24px; text-align: left;}
+.menu-hide #menuToggle:hover {background-color: #0c64eb}