diff --git a/module/common/lang/common.php b/module/common/lang/common.php
index bd4b899fa5..40549ef33e 100644
--- a/module/common/lang/common.php
+++ b/module/common/lang/common.php
@@ -115,6 +115,17 @@ $lang->featureconfig      = new stdclass();
 $lang->doctemplate        = new stdclass();
 $lang->notifysetting      = new stdclass();
 $lang->bidesign           = new stdclass();
+$lang->programstakeholder = new stdclass();
+$lang->projectsettings    = new stdclass();
+$lang->dataaccess         = new stdclass();
+$lang->executiongantt     = new stdclass();
+$lang->executionkanban    = new stdclass();
+$lang->executionburn      = new stdclass();
+$lang->executioncfd       = new stdclass();
+$lang->executionstory     = new stdclass();
+$lang->executionqa        = new stdclass();
+$lang->executionsettings  = new stdclass();
+$lang->generalcomment     = new stdclass();
 
 $lang->projectbuild   = new stdclass();
 $lang->projectrelease = new stdclass();
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 98b404e58c..e8975028fe 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -591,12 +591,12 @@ $lang->system->menuOrder[15] = 'dynamic';
 $lang->system->menuOrder[20] = 'view';
 
 /* Nav group.*/
-$lang->navGroup          = new stdclass();
-$lang->navGroup->my      = 'my';
-$lang->navGroup->effort  = 'my';
-$lang->navGroup->score   = 'my';
-$lang->navGroup->todo    = 'my';
-$lang->navGroup->contact = 'my';
+$lang->navGroup = new stdclass();
+$lang->navGroup->my               = 'my';
+$lang->navGroup->score            = 'my';
+$lang->navGroup->todo             = 'my';
+$lang->navGroup->contact          = 'my';
+$lang->navGroup->personalsettings = 'my';
 
 $lang->navGroup->program            = 'program';
 $lang->navGroup->personnel          = 'program';
@@ -609,11 +609,12 @@ $lang->navGroup->branch      = 'product';
 $lang->navGroup->story       = 'product';
 $lang->navGroup->requirement = 'product';
 
-$lang->navGroup->project     = 'project';
-$lang->navGroup->deploy      = 'project';
-$lang->navGroup->programplan = 'project';
-$lang->navGroup->design      = 'project';
-$lang->navGroup->stakeholder = 'project';
+$lang->navGroup->project         = 'project';
+$lang->navGroup->deploy          = 'project';
+$lang->navGroup->programplan     = 'project';
+$lang->navGroup->design          = 'project';
+$lang->navGroup->stakeholder     = 'project';
+$lang->navGroup->projectsettings = 'project';
 
 $lang->navGroup->projectbuild   = 'project';
 $lang->navGroup->projectstory   = 'project';
@@ -632,11 +633,18 @@ $lang->navGroup->researchplan   = 'project';
 $lang->navGroup->workestimation = 'project';
 $lang->navGroup->gapanalysis    = 'project';
 
-$lang->navGroup->execution     = 'execution';
-$lang->navGroup->task          = 'execution';
-$lang->navGroup->build         = 'execution';
-$lang->navGroup->team          = 'execution';
-$lang->navGroup->executionview = 'execution';
+$lang->navGroup->execution         = 'execution';
+$lang->navGroup->task              = 'execution';
+$lang->navGroup->build             = 'execution';
+$lang->navGroup->team              = 'execution';
+$lang->navGroup->executionview     = 'execution';
+$lang->navGroup->executiongantt    = 'execution';
+$lang->navGroup->executionkanban   = 'execution';
+$lang->navGroup->executionburn     = 'execution';
+$lang->navGroup->executioncfd      = 'execution';
+$lang->navGroup->executionstory    = 'execution';
+$lang->navGroup->executionqa       = 'execution';
+$lang->navGroup->executionsettings = 'execution';
 
 $lang->navGroup->managespace  = 'kanban';
 $lang->navGroup->kanbanspace  = 'kanban';
@@ -690,6 +698,7 @@ $lang->navGroup->systemschedule = 'system';
 $lang->navGroup->systemeffort   = 'system';
 $lang->navGroup->systemdynamic  = 'system';
 $lang->navGroup->systemcompany  = 'system';
+$lang->navGroup->dataaccess     = 'system';
 
 $lang->navGroup->attend   = 'attend';
 $lang->navGroup->leave    = 'attend';
@@ -725,9 +734,7 @@ $lang->navGroup->featureconfig = 'admin';
 $lang->navGroup->doctemplate   = 'admin';
 $lang->navGroup->notifysetting = 'admin';
 
-$lang->navGroup->search  = 'search';
 $lang->navGroup->index   = 'index';
-$lang->navGroup->tree    = 'tree';
 $lang->navGroup->misc    = 'misc';
 $lang->navGroup->upgrade = 'upgrade';
 
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 4add04912d..39787a4a06 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -230,6 +230,17 @@ $lang->featureconfig->common      = '功能配置';
 $lang->doctemplate->common        = '文档模板';
 $lang->notifysetting->common      = '通知设置';
 $lang->bidesign->common           = 'BI设计';
+$lang->programstakeholder->common = '个人设置';
+$lang->projectsettings->common    = '设置';
+$lang->dataaccess->common         = '数据权限';
+$lang->executiongantt->common     = '甘特图';
+$lang->executionkanban->common    = '看板';
+$lang->executionburn->common      = '燃尽图';
+$lang->executioncfd->common       = '累积流图';
+$lang->executionstory->common     = '研发需求';
+$lang->executionqa->common        = '测试';
+$lang->executionsettings->common  = '设置';
+$lang->generalcomment->common     = '备注';
 
 $lang->personnel->common     = '人员';
 $lang->personnel->invest     = '投入人员';
diff --git a/module/group/control.php b/module/group/control.php
index 8dd95f512b..000b4b2d4c 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -402,7 +402,6 @@ class group extends control
 
         if($browseType == 'bycard')
         {
-            $moduleList   = array_keys($moduleLang);
             $privs        = $this->group->getPrivsListByView($view);
             $privPackages = $this->group->getPrivPackagePairs();
             $privLang     = $this->group->getPrivLangPairs();
diff --git a/module/group/lang/de.php b/module/group/lang/de.php
index 0a7655eb2b..975cf8b048 100644
--- a/module/group/lang/de.php
+++ b/module/group/lang/de.php
@@ -99,7 +99,7 @@ $lang->group->option     = 'Option';
 $lang->group->inside     = 'Gruppenbenutzer';
 $lang->group->outside    = 'Andere Benutzer';
 $lang->group->limited    = 'Limited Users';
-$lang->group->other      = 'Andere';
+$lang->group->general    = 'General';
 $lang->group->all        = 'Alle';
 $lang->group->config     = 'Config';
 $lang->group->unassigned = 'Unassigned';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index 534e08b835..c9d331f3e6 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -99,7 +99,7 @@ $lang->group->option     = 'Option';
 $lang->group->inside     = 'Group Users';
 $lang->group->outside    = 'Other Users';
 $lang->group->limited    = 'Limited Users';
-$lang->group->other      = 'Others';
+$lang->group->general    = 'General';
 $lang->group->all        = 'All Privileges';
 $lang->group->config     = 'Config';
 $lang->group->unassigned = 'Unassigned';
diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php
index 6e9119eaef..f762ce25e5 100644
--- a/module/group/lang/fr.php
+++ b/module/group/lang/fr.php
@@ -99,7 +99,7 @@ $lang->group->option     = 'Option';
 $lang->group->inside     = "Groupe d'utilisateurs";
 $lang->group->outside    = 'Autres utilisateurs';
 $lang->group->limited    = 'Limited Users';
-$lang->group->other      = 'Autres';
+$lang->group->general    = 'General';
 $lang->group->all        = 'Tous les Privilèges';
 $lang->group->config     = 'Config';
 $lang->group->unassigned = 'Unassigned';
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 737ce3ed60..c6758fc7a0 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -149,10 +149,10 @@ $lang->resource->todo->batchClose   = 'batchClose';
 
 /* Personnel . */
 $lang->resource->personnel = new stdclass();
-$lang->resource->personnel->accessible      = 'accessible';
-$lang->resource->personnel->invest          = 'invest';
-$lang->resource->personnel->whitelist       = 'whitelist';
-$lang->resource->personnel->addWhitelist    = 'addWhitelist';
+$lang->resource->personnel->accessible   = 'accessible';
+$lang->resource->personnel->invest       = 'invest';
+$lang->resource->personnel->whitelist    = 'whitelist';
+$lang->resource->personnel->addWhitelist = 'addWhitelist';
 
 $lang->personnel->methodOrder[5]  = 'accessible';
 $lang->personnel->methodOrder[10] = 'invest';
@@ -161,43 +161,43 @@ $lang->personnel->methodOrder[20] = 'addWhitelist';
 
 /* Project. */
 $lang->resource->project = new stdclass();
-$lang->resource->project->index               = 'index';
-$lang->resource->project->browse              = 'browse';
-$lang->resource->project->kanban              = 'kanban';
-$lang->resource->project->create              = 'create';
-$lang->resource->project->edit                = 'edit';
-$lang->resource->project->batchEdit           = 'batchEdit';
-$lang->resource->project->group               = 'group';
-$lang->resource->project->createGroup         = 'createGroup';
-$lang->resource->project->managePriv          = 'managePriv';
-$lang->resource->project->manageMembers       = 'manageMembers';
-$lang->resource->project->manageGroupMember   = 'manageGroupMember';
-$lang->resource->project->copyGroup           = 'copyGroup';
-$lang->resource->project->editGroup           = 'editGroup';
-$lang->resource->project->start               = 'start';
-$lang->resource->project->suspend             = 'suspend';
-$lang->resource->project->close               = 'close';
-$lang->resource->project->activate            = 'activate';
-$lang->resource->project->delete              = 'delete';
-$lang->resource->project->view                = 'view';
-$lang->resource->project->whitelist           = 'whitelist';
-$lang->resource->project->addWhitelist        = 'addWhitelist';
-$lang->resource->project->unbindWhitelist     = 'unbindWhitelist';
-$lang->resource->project->manageProducts      = 'manageProducts';
-$lang->resource->project->dynamic             = 'dynamic';
-$lang->resource->project->build               = 'build';
-$lang->resource->project->qa                  = 'qa';
-$lang->resource->project->bug                 = 'bug';
-$lang->resource->project->testcase            = 'testcase';
-$lang->resource->project->testtask            = 'testtask';
-$lang->resource->project->testreport          = 'testreport';
-$lang->resource->project->execution           = 'execution';
-$lang->resource->project->export              = 'export';
-$lang->resource->project->updateOrder         = 'updateOrder';
-$lang->resource->project->team                = 'teamAction';
-$lang->resource->project->unlinkMember        = 'unlinkMember';
-$lang->resource->project->programTitle        = 'moduleOpen';
-$lang->resource->project->manageRepo          = 'manageRepo';
+$lang->resource->project->index             = 'index';
+$lang->resource->project->browse            = 'browse';
+$lang->resource->project->kanban            = 'kanban';
+$lang->resource->project->create            = 'create';
+$lang->resource->project->edit              = 'edit';
+$lang->resource->project->batchEdit         = 'batchEdit';
+$lang->resource->project->group             = 'group';
+$lang->resource->project->createGroup       = 'createGroup';
+$lang->resource->project->managePriv        = 'managePriv';
+$lang->resource->project->manageMembers     = 'manageMembers';
+$lang->resource->project->manageGroupMember = 'manageGroupMember';
+$lang->resource->project->copyGroup         = 'copyGroup';
+$lang->resource->project->editGroup         = 'editGroup';
+$lang->resource->project->start             = 'start';
+$lang->resource->project->suspend           = 'suspend';
+$lang->resource->project->close             = 'close';
+$lang->resource->project->activate          = 'activate';
+$lang->resource->project->delete            = 'delete';
+$lang->resource->project->view              = 'view';
+$lang->resource->project->whitelist         = 'whitelist';
+$lang->resource->project->addWhitelist      = 'addWhitelist';
+$lang->resource->project->unbindWhitelist   = 'unbindWhitelist';
+$lang->resource->project->manageProducts    = 'manageProducts';
+$lang->resource->project->dynamic           = 'dynamic';
+$lang->resource->project->build             = 'build';
+$lang->resource->project->qa                = 'qa';
+$lang->resource->project->bug               = 'bug';
+$lang->resource->project->testcase          = 'testcase';
+$lang->resource->project->testtask          = 'testtask';
+$lang->resource->project->testreport        = 'testreport';
+$lang->resource->project->execution         = 'execution';
+$lang->resource->project->export            = 'export';
+$lang->resource->project->updateOrder       = 'updateOrder';
+$lang->resource->project->team              = 'teamAction';
+$lang->resource->project->unlinkMember      = 'unlinkMember';
+$lang->resource->project->programTitle      = 'moduleOpen';
+$lang->resource->project->manageRepo        = 'manageRepo';
 
 $lang->project->methodOrder[0]   = 'index';
 $lang->project->methodOrder[5]   = 'browse';
@@ -2076,6 +2076,16 @@ $lang->resource->featureconfig      = new stdclass();
 $lang->resource->doctemplate        = new stdclass();
 $lang->resource->notifysetting      = new stdclass();
 $lang->resource->bidesign           = new stdclass();
+$lang->resource->personalsettings   = new stdclass();
+$lang->resource->dataaccess         = new stdclass();
+$lang->resource->executiongantt     = new stdclass();
+$lang->resource->executionkanban    = new stdclass();
+$lang->resource->executionburn      = new stdclass();
+$lang->resource->executioncfd       = new stdclass();
+$lang->resource->executionstory     = new stdclass();
+$lang->resource->executionqa        = new stdclass();
+$lang->resource->executionsettings  = new stdclass();
+$lang->resource->generalcomment     = new stdclass();
 
 global $config;
 $inUpgrade = (defined('IN_UPGRADE') and IN_UPGRADE);
diff --git a/module/group/lang/vi.php b/module/group/lang/vi.php
index aabf14794b..2e705c02e2 100644
--- a/module/group/lang/vi.php
+++ b/module/group/lang/vi.php
@@ -53,8 +53,8 @@ $lang->group->priv    = 'Nhóm quyền';
 $lang->group->option  = 'Tùy chọn';
 $lang->group->inside  = 'Nhóm người dùng';
 $lang->group->outside = 'Other người dùng';
-$lang->group->limited  = 'Limited Users';
-$lang->group->other   = 'Khác';
+$lang->group->limited = 'Limited Users';
+$lang->group->general = 'General';
 $lang->group->all     = 'Tất cả Privileges';
 
 $lang->group->copyOptions['copyPriv'] = 'Copy Privileges';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index 8f7e590946..f3e38dfdb7 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -99,7 +99,7 @@ $lang->group->option     = '选项';
 $lang->group->inside     = '组内用户';
 $lang->group->outside    = '组外用户';
 $lang->group->limited    = '受限用户组';
-$lang->group->other      = '其他模块';
+$lang->group->general    = '通用';
 $lang->group->all        = '所有权限';
 $lang->group->config     = '配置';
 $lang->group->unassigned = '未分配';
diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php
index af522ffc39..3d9fb9a4ae 100644
--- a/module/group/lang/zh-tw.php
+++ b/module/group/lang/zh-tw.php
@@ -53,7 +53,7 @@ $lang->group->option   = '選項';
 $lang->group->inside   = '組內用戶';
 $lang->group->outside  = '組外用戶';
 $lang->group->limited  = '受限用戶組';
-$lang->group->other    = '其他模組';
+$lang->group->general  = '通用';
 $lang->group->all      = '所有權限';
 
 $lang->group->copyOptions['copyPriv'] = '複製權限';
diff --git a/module/group/model.php b/module/group/model.php
index 6273fd3ada..68511050ae 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -714,8 +714,8 @@ class groupModel extends model
     public function checkMenuModule($menu, $moduleName)
     {
         if(empty($menu)) return true;
-        if($menu == 'other' and (isset($this->lang->navGroup->$moduleName) or isset($this->lang->mainNav->$moduleName))) return false;
-        if($menu != 'other' and !($moduleName == $menu or (isset($this->lang->navGroup->$moduleName) and $this->lang->navGroup->$moduleName == $menu))) return false;
+        if($menu == 'general' and (isset($this->lang->navGroup->$moduleName) or isset($this->lang->mainNav->$moduleName))) return false;
+        if($menu != 'general' and !($moduleName == $menu or (isset($this->lang->navGroup->$moduleName) and $this->lang->navGroup->$moduleName == $menu))) return false;
         if($menu == 'project' and strpos('caselib|testsuite|report', $moduleName) !== false) return false;
         return true;
     }
@@ -1152,7 +1152,7 @@ class groupModel extends model
             ->leftJoin(TABLE_PRIVLANG)->alias('t2')->on('t1.id=t2.priv')
             ->leftJoin(TABLE_PRIVPACKAGE)->alias('t3')->on('t1.package=t3.id')
             ->where('1=1')
-            ->beginIF(!empty($view))->andWhere('t1.module')->in($modules)->fi()
+            ->beginIF(!empty($view) and $view != 'general')->andWhere('t1.module')->in($modules)->fi()
             ->andWhere('t2.lang')->eq($this->app->getClientLang())
             ->orderBy("moduleOrder asc, t3.order asc, `order` asc")
             ->page($pager)
diff --git a/module/group/view/editmanagepriv.html.php b/module/group/view/editmanagepriv.html.php
index 0b31ada423..0dd2e9314d 100644
--- a/module/group/view/editmanagepriv.html.php
+++ b/module/group/view/editmanagepriv.html.php
@@ -33,8 +33,8 @@
     if($i >= $config->group->maxToolBarCount) echo '</ul></div>';
     ?>
 
-    <?php $active = $view == 'other' ? 'btn-active-text' : '';?>
-    <?php echo html::a(inlink('editManagePriv', sprintf($params, 'other')), "<span class='text'>{$lang->group->other}</span>", '', "class='btn btn-link $active'");?>
+    <?php $active = $view == 'general' ? 'btn-active-text' : '';?>
+    <?php echo html::a(inlink('editManagePriv', sprintf($params, 'general')), "<span class='text'>{$lang->group->general}</span>", '', "class='btn btn-link $active'");?>
     <?php if($browseType != 'bycard'):?>
     <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->searchAB;?></a>
     <?php endif;?>
diff --git a/module/group/view/editmanageprivbycard.html.php b/module/group/view/editmanageprivbycard.html.php
index db6d30f5bb..d87d482c80 100644
--- a/module/group/view/editmanageprivbycard.html.php
+++ b/module/group/view/editmanageprivbycard.html.php
@@ -22,6 +22,7 @@
     </thead>
     <tbody>
       <?php foreach($privList as $module => $packages):?>
+      <?php if(!$this->group->checkMenuModule($view, $module)) continue;?>
       <?php $i = 1;?>
       <?php foreach($packages as $packageID => $privs):?>
       <tr class="permission-row">
diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php
index 60f178bf87..5fc840032f 100644
--- a/module/group/view/privbygroup.html.php
+++ b/module/group/view/privbygroup.html.php
@@ -68,8 +68,8 @@
     if($i >= $config->group->maxToolBarCount) echo '</ul></div>';
     ?>
 
-    <?php $active = $menu == 'other' ? 'btn-active-text' : '';?>
-    <?php echo html::a(inlink('managePriv', sprintf($params, 'other')), "<span class='text'>{$lang->group->other}</span>", '', "class='btn btn-link $active'");?>
+    <?php $active = $menu == 'general' ? 'btn-active-text' : '';?>
+    <?php echo html::a(inlink('managePriv', sprintf($params, 'general')), "<span class='text'>{$lang->group->general}</span>", '', "class='btn btn-link $active'");?>
 
     <div class='input-control space w-150px'>
       <?php echo html::select('version', $this->lang->group->versions, $version, "onchange=showPriv(this.value) class='form-control chosen'");?>