diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 8314e2f999..8cffd566c2 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -397,7 +397,7 @@ $lang->devops->menu            = new stdclass();
 $lang->devops->menu->code      = array('link' => "{$lang->repo->common}|repo|browse|repoID=%s", 'alias' => 'diff,view,revision,log,blame,showsynccommit');
 $lang->devops->menu->mr        = array('link' => "{$lang->devops->mr}|mr|browse|repoID=%s");
 $lang->devops->menu->compile   = array('link' => "{$lang->devops->compile}|job|browse", 'subModule' => 'compile,job');
-$lang->devops->menu->set       = array('link' => "{$lang->devops->set}|repo|maintain", 'subModule' => 'repo,gitlab', 'alias' => '');
+$lang->devops->menu->set       = array('link' => "{$lang->devops->set}|repo|maintain");
 
 $lang->devops->menuOrder[5]  = 'code';
 $lang->devops->menuOrder[10] = 'mr';
@@ -405,8 +405,8 @@ $lang->devops->menuOrder[15] = 'compile';
 $lang->devops->menuOrder[25] = 'set';
 
 $lang->devops->menu->set['subMenu'] = new stdclass();
-$lang->devops->menu->set['subMenu']->repo      = array('link' => "{$lang->devops->repo}|repo|maintain");
-$lang->devops->menu->set['subMenu']->gitlab    = array('link' => 'GitLab|gitlab|browse');
+$lang->devops->menu->set['subMenu']->repo      = array('link' => "{$lang->devops->repo}|repo|maintain", 'subModule' => 'repo');
+$lang->devops->menu->set['subMenu']->gitlab    = array('link' => 'GitLab|gitlab|browse', 'subModule' => 'gitlab');
 $lang->devops->menu->set['subMenu']->jenkins   = array('link' => 'Jenkins|jenkins|browse');
 $lang->devops->menu->set['subMenu']->sonarqube = array('link' => 'SonarQube|sonarqube|browse');
 $lang->devops->menu->set['subMenu']->setrules  = array('link' => "{$lang->devops->rules}|repo|setrules");
diff --git a/module/gitlab/config.php b/module/gitlab/config.php
index 7fd742944a..ac86fa3db8 100644
--- a/module/gitlab/config.php
+++ b/module/gitlab/config.php
@@ -124,3 +124,7 @@ $config->gitlab->accessLevel['owner']      = 50;
 
 /* Minimum compatible version. */
 $config->gitlab->minCompatibleVersion = '9.0';
+
+$config->gitlab->menus['project'] = 'browseProject';
+$config->gitlab->menus['group']   = 'browseGroup';
+$config->gitlab->menus['user']    = 'browseUser';
diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index 942567f049..955314b974 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -325,8 +325,9 @@ class gitlab extends control
             if(!$openID) return print(js::alert($this->lang->gitlab->mustBindUser) . js::locate($this->createLink('gitlab', 'browse')));
         }
 
-        $groups      = $this->gitlab->apiGetGroups($gitlabID, $orderBy);
-        $adminGroups = $this->gitlab->apiGetGroups($gitlabID, $orderBy, 'owner');
+        $keyword     = fixer::input('post')->setDefault('keyword', '')->get('keyword');
+        $groups      = $this->gitlab->apiGetGroups($gitlabID, $orderBy, '', $keyword);
+        $adminGroups = $this->gitlab->apiGetGroups($gitlabID, $orderBy, 'owner', $keyword);
 
         $adminGroupIDList = array();
         foreach($adminGroups as $group) $adminGroupIDList[] = $group->id;
@@ -337,6 +338,7 @@ class gitlab extends control
         $this->view->gitlabGroupList  = $groups;
         $this->view->adminGroupIDList = $adminGroupIDList;
         $this->view->orderBy          = $orderBy;
+        $this->view->keyword          = $keyword;
         $this->display();
     }
 
@@ -558,11 +560,22 @@ class gitlab extends control
             if(!$user->is_admin) $isAdmin = false;
         }
 
+        $keyword = fixer::input('post')->setDefault('keyword', '')->get('keyword');
+        $users   = $this->gitlab->apiGetUsers($gitlabID, false, $orderBy);
+        if($keyword)
+        {
+            foreach($users as $key => $user)
+            {
+                if(strpos($user->realname, $keyword) === false) unset($users[$key]);
+            }
+        }
+
         $this->view->title          = $this->lang->gitlab->common . $this->lang->colon . $this->lang->gitlab->browseUser;
         $this->view->gitlabID       = $gitlabID;
-        $this->view->gitlabUserList = $this->gitlab->apiGetUsers($gitlabID, false, $orderBy);
+        $this->view->gitlabUserList = $users;
         $this->view->orderBy        = $orderBy;
         $this->view->isAdmin        = $isAdmin;
+        $this->view->keyword        = $keyword;
         $this->display();
     }
 
diff --git a/module/gitlab/js/browseproject.js b/module/gitlab/js/browseproject.js
deleted file mode 100644
index af5f37901a..0000000000
--- a/module/gitlab/js/browseproject.js
+++ /dev/null
@@ -1,17 +0,0 @@
-$(document).ready(function()
-{
-    $('#projectSearch').click(function()
-    {
-        triggerSearch();
-    });
-    $('#keyword').keypress(function(event)
-    {
-        if(event.which == 13) triggerSearch();
-    })
-
-});
-
-function triggerSearch()
-{
-    $("#gitlabprojectForm").submit();
-}
diff --git a/module/gitlab/js/common.js b/module/gitlab/js/common.js
index d4c0d829bb..b339bcab90 100644
--- a/module/gitlab/js/common.js
+++ b/module/gitlab/js/common.js
@@ -17,4 +17,22 @@ function setAvatar()
         $(".avatar img").attr("src", window.URL.createObjectURL(files[0]));
         $(".avatar").removeClass('hidden');
     });
-}
\ No newline at end of file
+}
+
+$(document).ready(function()
+{
+    $('#gitlabSearch').click(function()
+    {
+        triggerSearch();
+    });
+    $('#keyword').keypress(function(event)
+    {
+        if(event.which == 13) triggerSearch();
+    })
+
+});
+
+function triggerSearch()
+{
+    $("#gitlabForm").submit();
+}
diff --git a/module/gitlab/lang/de.php b/module/gitlab/lang/de.php
index 9df7073538..169875c665 100644
--- a/module/gitlab/lang/de.php
+++ b/module/gitlab/lang/de.php
@@ -24,14 +24,14 @@ $lang->gitlab->lastUpdate        = 'Last Update';
 $lang->gitlab->confirmAddWebhook = 'Are you sure about creating Webhook？';
 $lang->gitlab->addWebhookSuccess = 'Webhook created successfully';
 $lang->gitlab->failCreateWebhook = 'Failed to create Webhook, please view the log';
-$lang->gitlab->placeholderSearch = 'Project name';
+$lang->gitlab->placeholderSearch = 'Enter name';
 
 $lang->gitlab->browseAction         = 'GitLab List';
 $lang->gitlab->deleteAction         = 'Delete GitLab';
 $lang->gitlab->gitlabProject        = "GitLab Project";
-$lang->gitlab->browseProject        = "GitLab Project List";
-$lang->gitlab->browseUser           = "User List";
-$lang->gitlab->browseGroup          = "Group List";
+$lang->gitlab->browseProject        = "Project";
+$lang->gitlab->browseUser           = "User";
+$lang->gitlab->browseGroup          = "Group";
 $lang->gitlab->browseBranch         = "GitLab Branch List";
 $lang->gitlab->browseTag            = "GitLab Tag List";
 $lang->gitlab->browseTagPriv        = "GitLab Tag protected List";
@@ -62,12 +62,13 @@ $lang->gitlab->editTagPriv          = 'Edit tag protected';
 $lang->gitlab->deleteTagPriv        = 'Delete tag protected';
 
 $lang->gitlab->id             = 'ID';
-$lang->gitlab->name           = "GitLab Server";
+$lang->gitlab->name           = "Server Name";
 $lang->gitlab->url            = 'Server URL';
 $lang->gitlab->token          = 'Token';
 $lang->gitlab->defaultProject = 'Default Project';
 $lang->gitlab->private        = 'MD5 Verify';
 
+$lang->gitlab->server        = "Server List";
 $lang->gitlab->lblCreate     = 'Create GitLab Server';
 $lang->gitlab->desc          = 'Description';
 $lang->gitlab->tokenFirst    = 'When the Token is not empty, the Token will be used first';
diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php
index 9df7073538..169875c665 100644
--- a/module/gitlab/lang/en.php
+++ b/module/gitlab/lang/en.php
@@ -24,14 +24,14 @@ $lang->gitlab->lastUpdate        = 'Last Update';
 $lang->gitlab->confirmAddWebhook = 'Are you sure about creating Webhook？';
 $lang->gitlab->addWebhookSuccess = 'Webhook created successfully';
 $lang->gitlab->failCreateWebhook = 'Failed to create Webhook, please view the log';
-$lang->gitlab->placeholderSearch = 'Project name';
+$lang->gitlab->placeholderSearch = 'Enter name';
 
 $lang->gitlab->browseAction         = 'GitLab List';
 $lang->gitlab->deleteAction         = 'Delete GitLab';
 $lang->gitlab->gitlabProject        = "GitLab Project";
-$lang->gitlab->browseProject        = "GitLab Project List";
-$lang->gitlab->browseUser           = "User List";
-$lang->gitlab->browseGroup          = "Group List";
+$lang->gitlab->browseProject        = "Project";
+$lang->gitlab->browseUser           = "User";
+$lang->gitlab->browseGroup          = "Group";
 $lang->gitlab->browseBranch         = "GitLab Branch List";
 $lang->gitlab->browseTag            = "GitLab Tag List";
 $lang->gitlab->browseTagPriv        = "GitLab Tag protected List";
@@ -62,12 +62,13 @@ $lang->gitlab->editTagPriv          = 'Edit tag protected';
 $lang->gitlab->deleteTagPriv        = 'Delete tag protected';
 
 $lang->gitlab->id             = 'ID';
-$lang->gitlab->name           = "GitLab Server";
+$lang->gitlab->name           = "Server Name";
 $lang->gitlab->url            = 'Server URL';
 $lang->gitlab->token          = 'Token';
 $lang->gitlab->defaultProject = 'Default Project';
 $lang->gitlab->private        = 'MD5 Verify';
 
+$lang->gitlab->server        = "Server List";
 $lang->gitlab->lblCreate     = 'Create GitLab Server';
 $lang->gitlab->desc          = 'Description';
 $lang->gitlab->tokenFirst    = 'When the Token is not empty, the Token will be used first';
diff --git a/module/gitlab/lang/fr.php b/module/gitlab/lang/fr.php
index 9df7073538..169875c665 100644
--- a/module/gitlab/lang/fr.php
+++ b/module/gitlab/lang/fr.php
@@ -24,14 +24,14 @@ $lang->gitlab->lastUpdate        = 'Last Update';
 $lang->gitlab->confirmAddWebhook = 'Are you sure about creating Webhook？';
 $lang->gitlab->addWebhookSuccess = 'Webhook created successfully';
 $lang->gitlab->failCreateWebhook = 'Failed to create Webhook, please view the log';
-$lang->gitlab->placeholderSearch = 'Project name';
+$lang->gitlab->placeholderSearch = 'Enter name';
 
 $lang->gitlab->browseAction         = 'GitLab List';
 $lang->gitlab->deleteAction         = 'Delete GitLab';
 $lang->gitlab->gitlabProject        = "GitLab Project";
-$lang->gitlab->browseProject        = "GitLab Project List";
-$lang->gitlab->browseUser           = "User List";
-$lang->gitlab->browseGroup          = "Group List";
+$lang->gitlab->browseProject        = "Project";
+$lang->gitlab->browseUser           = "User";
+$lang->gitlab->browseGroup          = "Group";
 $lang->gitlab->browseBranch         = "GitLab Branch List";
 $lang->gitlab->browseTag            = "GitLab Tag List";
 $lang->gitlab->browseTagPriv        = "GitLab Tag protected List";
@@ -62,12 +62,13 @@ $lang->gitlab->editTagPriv          = 'Edit tag protected';
 $lang->gitlab->deleteTagPriv        = 'Delete tag protected';
 
 $lang->gitlab->id             = 'ID';
-$lang->gitlab->name           = "GitLab Server";
+$lang->gitlab->name           = "Server Name";
 $lang->gitlab->url            = 'Server URL';
 $lang->gitlab->token          = 'Token';
 $lang->gitlab->defaultProject = 'Default Project';
 $lang->gitlab->private        = 'MD5 Verify';
 
+$lang->gitlab->server        = "Server List";
 $lang->gitlab->lblCreate     = 'Create GitLab Server';
 $lang->gitlab->desc          = 'Description';
 $lang->gitlab->tokenFirst    = 'When the Token is not empty, the Token will be used first';
diff --git a/module/gitlab/lang/vi.php b/module/gitlab/lang/vi.php
new file mode 100644
index 0000000000..169875c665
--- /dev/null
+++ b/module/gitlab/lang/vi.php
@@ -0,0 +1,239 @@
+<?php
+$lang->gitlab = new stdclass;
+$lang->gitlab->common            = 'GitLab';
+$lang->gitlab->browse            = 'GitLab Browse';
+$lang->gitlab->search            = 'Search';
+$lang->gitlab->create            = 'Create GitLab';
+$lang->gitlab->edit              = 'Edit GitLab';
+$lang->gitlab->view              = 'View GitLab';
+$lang->gitlab->bindUser          = 'Bind User';
+$lang->gitlab->webhook           = 'Webhook';
+$lang->gitlab->bindProduct       = 'Import Product';
+$lang->gitlab->importIssue       = 'Import Issue';
+$lang->gitlab->delete            = 'Delete GitLab';
+$lang->gitlab->confirmDelete     = 'Do you want to delete this GitLab server?';
+$lang->gitlab->gitlabAccount     = 'GitLab Account';
+$lang->gitlab->zentaoAccount     = 'Zentao Account';
+$lang->gitlab->bindingStatus     = 'Binding Status';
+$lang->gitlab->notBind           = 'Not bind';
+$lang->gitlab->binded            = 'Binded';
+$lang->gitlab->bindedError       = 'The bound user has been deleted or modified. Please bind again.';
+$lang->gitlab->bindDynamic       = '%s and Zentao user %s';
+$lang->gitlab->serverFail        = 'Connect to GitLab server failed, please check the GitLab server.';
+$lang->gitlab->lastUpdate        = 'Last Update';
+$lang->gitlab->confirmAddWebhook = 'Are you sure about creating Webhook？';
+$lang->gitlab->addWebhookSuccess = 'Webhook created successfully';
+$lang->gitlab->failCreateWebhook = 'Failed to create Webhook, please view the log';
+$lang->gitlab->placeholderSearch = 'Enter name';
+
+$lang->gitlab->browseAction         = 'GitLab List';
+$lang->gitlab->deleteAction         = 'Delete GitLab';
+$lang->gitlab->gitlabProject        = "GitLab Project";
+$lang->gitlab->browseProject        = "Project";
+$lang->gitlab->browseUser           = "User";
+$lang->gitlab->browseGroup          = "Group";
+$lang->gitlab->browseBranch         = "GitLab Branch List";
+$lang->gitlab->browseTag            = "GitLab Tag List";
+$lang->gitlab->browseTagPriv        = "GitLab Tag protected List";
+$lang->gitlab->gitlabIssue          = "GitLab Issue";
+$lang->gitlab->zentaoProduct        = 'Zentao Product';
+$lang->gitlab->objectType           = 'Type'; // task, bug, story
+$lang->gitlab->manageProjectMembers = 'Manage project member';
+$lang->gitlab->createProject        = 'Create GitLab project';
+$lang->gitlab->editProject          = 'Eidt GitLab project';
+$lang->gitlab->deleteProject        = 'Delete GitLab project';
+$lang->gitlab->createGroup          = 'Create group';
+$lang->gitlab->editGroup            = 'Edit group';
+$lang->gitlab->deleteGroup          = 'Delete group';
+$lang->gitlab->createUser           = 'Create user';
+$lang->gitlab->editUser             = 'Edit user';
+$lang->gitlab->deleteUser           = 'Delete user';
+$lang->gitlab->createBranch         = 'Add branch';
+$lang->gitlab->manageGroupMembers   = 'Manage group member';
+$lang->gitlab->createWebhook        = 'Create Webhook';
+$lang->gitlab->browseBranchPriv     = 'Protect branch';
+$lang->gitlab->createBranchPriv     = 'Cerate branch protected';
+$lang->gitlab->editBranchPriv       = 'Edit branch protected';
+$lang->gitlab->deleteBranchPriv     = 'Delete branch protected';
+$lang->gitlab->createTag            = 'Create Tag';
+$lang->gitlab->deleteTag            = 'Delete tag';
+$lang->gitlab->createTagPriv        = 'Create tag protected';
+$lang->gitlab->editTagPriv          = 'Edit tag protected';
+$lang->gitlab->deleteTagPriv        = 'Delete tag protected';
+
+$lang->gitlab->id             = 'ID';
+$lang->gitlab->name           = "Server Name";
+$lang->gitlab->url            = 'Server URL';
+$lang->gitlab->token          = 'Token';
+$lang->gitlab->defaultProject = 'Default Project';
+$lang->gitlab->private        = 'MD5 Verify';
+
+$lang->gitlab->server        = "Server List";
+$lang->gitlab->lblCreate     = 'Create GitLab Server';
+$lang->gitlab->desc          = 'Description';
+$lang->gitlab->tokenFirst    = 'When the Token is not empty, the Token will be used first';
+$lang->gitlab->tips          = 'When using a password, please disable the "Prevent cross-site request forgery" option in the GitLab global security settings.';
+$lang->gitlab->emptyError    = " cannot be empty";
+$lang->gitlab->createSuccess = "Create success";
+$lang->gitlab->mustBindUser  = 'You have not registered the GitLab account, please contact the administrator to register.';
+$lang->gitlab->noAccess      = 'Permission denied';
+$lang->gitlab->notCompatible = 'The current GitLab version is not compatible with ZenTao, please upgrade the GitLab version and try again';
+$lang->gitlab->deleted       = 'Deleted';
+
+$lang->gitlab->placeholder = new stdclass;
+$lang->gitlab->placeholder->name        = '';
+$lang->gitlab->placeholder->url         = "Please fill in the access address of the GitLab Server homepage, as: https://gitlab.zentao.net.";
+$lang->gitlab->placeholder->token       = "Please fill in the access token of an account with root privileges.";
+$lang->gitlab->placeholder->projectPath = "It should contain only letters, digits, underscore, hyphen and period.  It should not start with hypen, or end with .git or .atom.";
+
+$lang->gitlab->noImportableIssues = "There are currently no issues available for import.";
+$lang->gitlab->tokenError         = "The current token is not root rights.";
+$lang->gitlab->tokenLimit         = "The current token has no admin privilege. Please regenerate one with root user in GitLab.";
+$lang->gitlab->hostError          = "So the current GitLab server address is invalid or the current GitLab version is not compatible with ZenTao, please confirm that the current server can be accessed or contact the administrator to upgrade the GitLab version to %s or above and try again.";
+$lang->gitlab->bindUserError      = "Can not bind users repeatedly %s";
+$lang->gitlab->importIssueError   = "The execution to which this issue belongs is not selected.";
+$lang->gitlab->importIssueWarn    = "There is a problem of import failure, you can try to import again.";
+
+$lang->gitlab->accessLevels[10] = 'Guest';
+$lang->gitlab->accessLevels[20] = 'Reporter';
+$lang->gitlab->accessLevels[30] = 'Developer';
+$lang->gitlab->accessLevels[40] = 'Maintainer';
+$lang->gitlab->accessLevels[50] = 'Owner';
+
+$lang->gitlab->apiError[0] = 'internal is not allowed in a private group.';
+$lang->gitlab->apiError[1] = 'public is not allowed in a private group.';
+$lang->gitlab->apiError[2] = 'is too short (minimum is 8 characters)';
+$lang->gitlab->apiError[3] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
+$lang->gitlab->apiError[4] = 'Branch already exists';
+$lang->gitlab->apiError[5] = 'Failed to save group {:path=>["has already been taken"]}';
+$lang->gitlab->apiError[6] = '403 Forbidden';
+
+$lang->gitlab->errorLang[0] = 'You cannot set Internal as its Visibility Level, if it is private in GitLab.';
+$lang->gitlab->errorLang[1] = 'You cannot set Public as its Visibility Level, if it is private in GitLab.';
+$lang->gitlab->errorLang[2] = 'Password is too short (minimum is 8 characters)';
+$lang->gitlab->errorLang[3] = 'It should contain only letters, digits, underscore, hyphen and period.  It should not start with hypen, or end with .git or .atom.';
+$lang->gitlab->errorLang[4] = 'Branch already exists.';
+$lang->gitlab->errorLang[5] = 'Failed to save group, path has already been taken.';
+$lang->gitlab->errorLang[6] = $lang->gitlab->noAccess;
+
+$lang->gitlab->project = new stdclass;
+$lang->gitlab->project->id                         = "Project ID";
+$lang->gitlab->project->name                       = "Project name";
+$lang->gitlab->project->create                     = "Create GitLab project";
+$lang->gitlab->project->edit                       = "Edit GitLab project";
+$lang->gitlab->project->url                        = "Project URL";
+$lang->gitlab->project->path                       = "Project slug";
+$lang->gitlab->project->description                = "Project description";
+$lang->gitlab->project->visibility                 = "Visibility Level";
+$lang->gitlab->project->visibilityList['private']  = "Private(Project access must be granted explicitly to each user. If this project is part of a group, access will be granted to members of the group)";
+$lang->gitlab->project->visibilityList['internal'] = "Internal(The project can be accessed by any logged in user except external users)";
+$lang->gitlab->project->visibilityList['public']   = "Public(The project can be accessed without any authentication)";
+$lang->gitlab->project->star                       = "Stars";
+$lang->gitlab->project->fork                       = "Forks";
+$lang->gitlab->project->mergeRequests              = "Merge Requests";
+$lang->gitlab->project->issues                     = "Issues";
+$lang->gitlab->project->tagList                    = "Topics";
+$lang->gitlab->project->tagListTips                = "Separate topics with commas.";
+$lang->gitlab->project->emptyNameError             = "Project name cannot be empty.";
+$lang->gitlab->project->emptyPathError             = "Project slug cannot be empty.";
+$lang->gitlab->project->confirmDelete              = 'Do you want to delete this GitLab project?';
+$lang->gitlab->project->notbindedError             = 'GitLab user has not been bound, unable to modify permissions!';
+$lang->gitlab->project->publicTip                  = 'The visible status of the current project will be modified to public, and the project can be accessed without any authentication in GitLab. ';
+
+$lang->gitlab->user = new stdclass;
+$lang->gitlab->user->id             = "User ID";
+$lang->gitlab->user->name           = "Name";
+$lang->gitlab->user->username       = "Username";
+$lang->gitlab->user->email          = "Email";
+$lang->gitlab->user->password       = "Password";
+$lang->gitlab->user->passwordRepeat = "Repeat Password";
+$lang->gitlab->user->projectsLimit  = "Projects limit";
+$lang->gitlab->user->canCreateGroup = "Can create group";
+$lang->gitlab->user->external       = "External";
+$lang->gitlab->user->externalTip    = "External users cannot see internal or private projects unless access is explicitly granted. Also, external users cannot create projects, groups, or personal snippets.";
+$lang->gitlab->user->bind           = "Zentao user";
+$lang->gitlab->user->avatar         = "Avatar";
+$lang->gitlab->user->skype          = "Skype";
+$lang->gitlab->user->linkedin       = "Linkedin";
+$lang->gitlab->user->twitter        = "Twitter";
+$lang->gitlab->user->websiteUrl     = "Website url";
+$lang->gitlab->user->note           = "Note";
+$lang->gitlab->user->createOn       = "Created on";
+$lang->gitlab->user->lastActivity   = "Last activity";
+$lang->gitlab->user->create         = "Create GitLab user";
+$lang->gitlab->user->edit           = "Edit GitLab user";
+$lang->gitlab->user->emptyError     = "cannot be empty";
+$lang->gitlab->user->passwordError  = "The second password is inconsistent!";
+$lang->gitlab->user->bindError      = "The user has been bound!";
+$lang->gitlab->user->confirmDelete  = 'Do you want to delete this GitLab user?';
+
+$lang->gitlab->group = new stdclass;
+$lang->gitlab->group->id                                      = "Group ID";
+$lang->gitlab->group->name                                    = "Group name";
+$lang->gitlab->group->path                                    = "Group URL";
+$lang->gitlab->group->pathTip                                 = "Changing group URL can have unintended side effects.";
+$lang->gitlab->group->description                             = "Group description";
+$lang->gitlab->group->avatar                                  = "Group avatar";
+$lang->gitlab->group->avatarTip                               = 'Max file size is 200 KB.';
+$lang->gitlab->group->visibility                              = "Visibility level";
+$lang->gitlab->group->visibilityList['private']               = "Private(The group and its projects can only be viewed by members)";
+$lang->gitlab->group->visibilityList['internal']              = "Internal(The group and any internal projects can be viewed by any logged in user except external users)";
+$lang->gitlab->group->visibilityList['public']                = "Public(The group and any public projects can be viewed without any authentication.)";
+$lang->gitlab->group->permission                              = 'Permission';
+$lang->gitlab->group->requestAccessEnabledTip                 = "Allow users to request access (if visibility is public or internal)";
+$lang->gitlab->group->lfsEnabled                              = 'Large File Storage';
+$lang->gitlab->group->lfsEnabledTip                           = "Allow projects within this group to use Git LFS(This setting can be overridden in each project)";
+$lang->gitlab->group->projectCreationLevel                    = "Allowed to create projects";
+$lang->gitlab->group->projectCreationLevelList['noone']       = "No one";
+$lang->gitlab->group->projectCreationLevelList['maintainer']  = "Maintainers";
+$lang->gitlab->group->projectCreationLevelList['developer']   = "Developers + Maintainers";
+$lang->gitlab->group->subgroupCreationLevel                   = "Allowed to create projects";
+$lang->gitlab->group->subgroupCreationLevelList['owner']      = "Owners";
+$lang->gitlab->group->subgroupCreationLevelList['maintainer'] = "Maintainers";
+$lang->gitlab->group->create                                  = "Create Group";
+$lang->gitlab->group->edit                                    = "Edit Group";
+$lang->gitlab->group->createOn                                = "Created on";
+$lang->gitlab->group->members                                 = "Group Members";
+$lang->gitlab->group->confirmDelete                           = 'Do you want to delete this GitLab group?';
+$lang->gitlab->group->emptyError                              = "cannot be empty";
+$lang->gitlab->group->manageMembers                           = 'Manage Group Members';
+$lang->gitlab->group->memberName                              = 'Account';
+$lang->gitlab->group->memberAccessLevel                       = 'Access Level';
+$lang->gitlab->group->memberExpiresAt                         = 'Expiration time';
+$lang->gitlab->group->repeatError                             = "Group members cannot be added repeatedly";
+$lang->gitlab->group->publicTip                               = 'The visible status of the current group will be modified to public, and the group can be accessed without any authentication in GitLab. ';
+
+$lang->gitlab->branch = new stdclass();
+$lang->gitlab->branch->name                        = 'Branch name';
+$lang->gitlab->branch->from                        = 'Create from';
+$lang->gitlab->branch->create                      = 'Create';
+$lang->gitlab->branch->lastCommitter               = 'Last Committer';
+$lang->gitlab->branch->lastCommittedDate           = 'Last Committed Date';
+$lang->gitlab->branch->accessLevel                 = "Branch protection list";
+$lang->gitlab->branch->mergeAllowed                = "Merge Allowed";
+$lang->gitlab->branch->pushAllowed                 = "Push Allowed";
+$lang->gitlab->branch->placeholderSearch           = "Branch name";
+$lang->gitlab->branch->placeholderSelect           = "Branch name";
+$lang->gitlab->branch->confirmDelete               = 'Branch will be writable for developers. Are you sure?';
+$lang->gitlab->branch->branchCreationLevelList[40] = "Maintainers";
+$lang->gitlab->branch->branchCreationLevelList[30] = "Developers + Maintainers";
+$lang->gitlab->branch->branchCreationLevelList[0]  = "No one";
+$lang->gitlab->branch->emptyPrivNameError          = "Branch cannot be empty.";
+$lang->gitlab->branch->issetPrivNameError          = "The protection branch already exists";
+
+$lang->gitlab->tag = new stdclass();
+$lang->gitlab->tag->name               = 'Tag name';
+$lang->gitlab->tag->ref                = 'Create from';
+$lang->gitlab->tag->lastCommitter      = 'Last Committer';
+$lang->gitlab->tag->lastCommittedDate  = 'Last Committed Date';
+$lang->gitlab->tag->placeholderSearch  = "Enter branch tag";
+$lang->gitlab->tag->message            = 'Message';
+$lang->gitlab->tag->emptyNameError     = "Name cannot be empty.";
+$lang->gitlab->tag->emptyRefError      = "Create from cannot be empty.";
+$lang->gitlab->tag->issetNameError     = "The tag already exists";
+$lang->gitlab->tag->confirmDelete      = 'Do you want to delete this GitLab tag?';
+$lang->gitlab->tag->protected          = 'Protected';
+$lang->gitlab->tag->accessLevel        = 'Allow creation';
+$lang->gitlab->tag->protectConfirmDel  = 'Do you want to delete this GitLab tag protected?';
+$lang->gitlab->tag->emptyPrivNameError = 'Tag cannot be empty.';
+$lang->gitlab->tag->issetPrivNameError = 'The protection tag already exists.';
diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php
index d3235a8c3a..d9ac66d15f 100644
--- a/module/gitlab/lang/zh-cn.php
+++ b/module/gitlab/lang/zh-cn.php
@@ -24,14 +24,14 @@ $lang->gitlab->lastUpdate        = '最后更新';
 $lang->gitlab->confirmAddWebhook = '您确定创建Webhook吗？';
 $lang->gitlab->addWebhookSuccess = 'Webhook创建成功';
 $lang->gitlab->failCreateWebhook = 'Webhook创建失败，请查看日志';
-$lang->gitlab->placeholderSearch = '请输入项目名称';
+$lang->gitlab->placeholderSearch = '请输入名称';
 
 $lang->gitlab->browseAction         = 'GitLab列表';
 $lang->gitlab->deleteAction         = '删除GitLab';
 $lang->gitlab->gitlabProject        = "{$lang->gitlab->common}项目";
-$lang->gitlab->browseProject        = "{$lang->gitlab->common}项目列表";
-$lang->gitlab->browseUser           = "用户列表";
-$lang->gitlab->browseGroup          = "群组列表";
+$lang->gitlab->browseProject        = "项目";
+$lang->gitlab->browseUser           = "用户";
+$lang->gitlab->browseGroup          = "群组";
 $lang->gitlab->browseBranch         = "GitLab分支列表";
 $lang->gitlab->browseTag            = "GitLab标签列表";
 $lang->gitlab->browseTagPriv        = "GitLab标签保护列表";
@@ -62,12 +62,13 @@ $lang->gitlab->editTagPriv          = '编辑标签保护';
 $lang->gitlab->deleteTagPriv        = '删除标签保护';
 
 $lang->gitlab->id             = 'ID';
-$lang->gitlab->name           = "{$lang->gitlab->common}服务器";
+$lang->gitlab->name           = "服务器名称";
 $lang->gitlab->url            = '服务器地址';
 $lang->gitlab->token          = 'Token';
 $lang->gitlab->defaultProject = '默认项目';
 $lang->gitlab->private        = 'MD5验证';
 
+$lang->gitlab->server        = "服务器列表";
 $lang->gitlab->lblCreate     = '添加GitLab服务器';
 $lang->gitlab->desc          = '描述';
 $lang->gitlab->tokenFirst    = 'Token不为空时，优先使用Token。';
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 65f147a955..a034ea6336 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -601,10 +601,11 @@ class gitlabModel extends model
      * @param  int     $gitlabID
      * @param  string  $orderBy
      * @param  string  $minRole
+     * @param  string  $keyword
      * @access public
      * @return object
      */
-    public function apiGetGroups($gitlabID, $orderBy = 'id_desc', $minRole = '')
+    public function apiGetGroups($gitlabID, $orderBy = 'id_desc', $minRole = '', $keyword = '')
     {
         $apiRoot = $this->getApiRoot($gitlabID);
         $url     = sprintf($apiRoot, "/groups");
@@ -617,6 +618,8 @@ class gitlabModel extends model
             $url .= '&min_access_level=' . $this->config->gitlab->accessLevel[$minRole];
         }
 
+        if($keyword) $url .= '&search=' . urlencode($keyword);
+
         $order = 'id';
         $sort  = 'desc';
         if(strpos($orderBy, '_') !== false) list($order, $sort) = explode('_', $orderBy);
@@ -2854,4 +2857,43 @@ class gitlabModel extends model
         $apiRoot .= '&sudo=' . $users[0]->id;
         return $this->apiGet($apiRoot, '/user');
     }
+
+    /**
+     * Get gitlab menu.
+     *
+     * @param  int    $gitlabID
+     * @param  string $type
+     * @access public
+     * @return void
+     */
+    public function getGitlabMenu($gitlabID = 0, $type = 'project')
+    {
+        $html    = '<div class="btn-toolbar pull-left">';
+
+        /* Gitlab server list. */
+        $gitlabs = $this->getPairs();
+        $html   .= "<div class='btn-group'>";
+        $tips    = $gitlabID >0 ? zget($gitlabs, $gitlabID, $this->lang->gitlab->server) : $this->lang->gitlab->server;
+        $html   .=  html::a('javascript:;', $tips . " <span class='caret'></span>", '', "data-toggle='dropdown' class='btn btn-link'");
+        $html   .= "<ul class='dropdown-menu'>";
+        foreach($gitlabs as $id => $gitlab)
+        {
+            $html .= '<li' . ($gitlabID == $id ? " class='active'" : '') . '>';
+            $html .= html::a(helper::createLink('gitlab', zget($this->config->gitlab->menus, $type, 'project'), "gitlabID=$id"), $gitlab);
+        }
+        $html .= '</ul></div>';
+
+        /* Other route. */
+        foreach($this->config->gitlab->menus as $key => $method)
+        {
+            $lang   = 'browse' . ucwords($key);
+            $title  = $this->lang->gitlab->$lang;
+            $label  = "<span class='text'>$title</span>";
+            $active = $key == $type ? 'btn-active-text' : '';
+            $html  .= html::a(inlink($method, "gitlabID=$gitlabID"), $label, '', "id='{$key}' class='btn btn-link $active' title='$title'");
+        }
+
+        $html .= '</div>';
+        return $html;
+    }
 }
diff --git a/module/gitlab/view/browse.html.php b/module/gitlab/view/browse.html.php
index 81b197a04c..56b57a028c 100644
--- a/module/gitlab/view/browse.html.php
+++ b/module/gitlab/view/browse.html.php
@@ -12,6 +12,9 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
+  <div class="btn-toolbar pull-left">
+    <?php echo html::a($this->createLink('gitlab', 'browse'), "<span class='text'>{$lang->gitlab->server}</span>", '', "class='btn btn-link btn-active-text'");?>
+  </div>
   <div class="btn-toolbar pull-right">
     <?php if(common::hasPriv('gitlab', 'create')) common::printLink('gitlab', 'create', "", "<i class='icon icon-plus'></i> " . $lang->gitlab->create, '', "class='btn btn-primary'");?>
   </div>
@@ -35,7 +38,7 @@
           <th class='c-id text-center'><?php common::printOrderLink('id', $orderBy, $vars, $lang->gitlab->id);?></th>
           <th class='c-name text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->gitlab->name);?></th>
           <th class='text-left'><?php common::printOrderLink('url', $orderBy, $vars, $lang->gitlab->url);?></th>
-          <th class='c-actions-6'><?php echo $lang->actions;?></th>
+          <th class='c-actions-3'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
@@ -43,8 +46,8 @@
         <tr class='text' title='<?php if(!$gitlab->isAdminToken) echo $lang->gitlab->tokenLimit;?>'>
           <td class='text-center'><?php echo $id;?></td>
           <td class='text-c-name' title='<?php echo $gitlab->name;?>'>
-            <?php if(common::hasPriv('gitlab', 'view')):?>
-            <a class="iframe" href="<?php echo $this->createLink('gitlab', 'view', "id=$id", '', true); ?>"><?php echo $gitlab->name;?></a>
+            <?php if(common::hasPriv('gitlab', 'browseProject')):?>
+            <a href="<?php echo $this->createLink('gitlab', 'browseProject', "gitlabID=$id"); ?>"><?php echo $gitlab->name;?></a>
             <?php else:?>
             <?php echo $gitlab->name;?>
             <?php endif;?>
@@ -54,10 +57,7 @@
             <?php
             $disabled = !empty($gitlab->isAdminToken) ? '' : 'disabled';
             $notBind  = $gitlab->isBindUser ? '' : 'disabled';
-            common::printLink('gitlab', 'browseProject', "gitlabID=$id", "<i class='icon icon-list-box'></i> ", '',"title='{$lang->gitlab->browseProject}' class='btn {$notBind}'");
-            common::printLink('gitlab', 'browseGroup', "gitlabID=$id", "<i class='icon icon-groups'></i> ", '', "title='{$lang->gitlab->browseGroup}'  class='btn {$notBind}'");
             common::printLink('gitlab', 'edit', "gitlabID=$id", "<i class='icon icon-edit'></i> ", '',"title='{$lang->gitlab->edit}' class='btn btn-primary'");
-            common::printLink('gitlab', 'browseUser', "gitlabID=$id", "<i class='icon icon-person'></i> ", '', "title='{$lang->gitlab->browseUser}'  class='btn {$disabled} {$notBind}' ,'disabled'");
             common::printLink('gitlab', 'bindUser', "id=$id", "<i class='icon icon-link'></i> ", '', "title='{$lang->gitlab->bindUser}'  class='btn {$disabled} {$notBind}' ,'disabled'");
             if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'delete', "gitlabID=$id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->gitlab->delete}' class='btn'");
             ?>
diff --git a/module/gitlab/view/browsegroup.html.php b/module/gitlab/view/browsegroup.html.php
index c16fb9ad8b..1e7266d949 100644
--- a/module/gitlab/view/browsegroup.html.php
+++ b/module/gitlab/view/browsegroup.html.php
@@ -12,8 +12,12 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
-  <div class='pull-left'>
-    <?php echo html::linkButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, $this->createLink('gitlab', 'browse'), 'self', '','btn btn-secondary');?>
+  <?php echo $this->gitlab->getGitlabMenu($gitlabID, 'group');?>
+  <div class="btn-toolbar pull-left">
+    <form id='gitlabForm' method='post'>
+    <?php echo html::input('keyword', $keyword, "class='form-control' placeholder='{$lang->gitlab->placeholderSearch}' style='display: inline-block;width:auto;margin:0 10px'");?>
+    <a id="gitlabSearch" class="btn btn-primary"><?php echo $lang->gitlab->search?></a>
+    </form>
   </div>
   <div class="btn-toolbar pull-right">
     <?php if(common::hasPriv('gitlab', 'create')) common::printLink('gitlab', 'createGroup', "gitlabID=$gitlabID", "<i class='icon icon-plus'></i> " . $lang->gitlab->group->create, '', "class='btn btn-primary'");?>
diff --git a/module/gitlab/view/browseproject.html.php b/module/gitlab/view/browseproject.html.php
index 0acb2fa888..75ec02375d 100644
--- a/module/gitlab/view/browseproject.html.php
+++ b/module/gitlab/view/browseproject.html.php
@@ -14,19 +14,12 @@
 <?php js::set('vars', "keyword=%s&orderBy=id_desc&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID=1")?>
 <?php js::set('gitlabID', $gitlabID)?>
 <div id="mainMenu" class="clearfix">
-  <div class='pull-left'>
-    <?php echo html::a($this->createLink('gitlab', 'browse'), "<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "class='btn btn-secondary'");?>
-  </div>
-  <div id="sidebarHeader">
-    <div class="title"><?php echo $this->lang->gitlab->common . ':' . $gitlab->name; ?></div>
-  </div>
+  <?php echo $this->gitlab->getGitlabMenu($gitlabID, 'project');?>
   <div class="btn-toolbar pull-left">
-    <div>
-      <form id='gitlabprojectForm' method='post'>
-      <?php echo html::input('keyword', $keyword, "class='form-control' placeholder='{$lang->gitlab->placeholderSearch}' style='display: inline-block;width:auto;margin:0 10px'");?>
-      <a id="projectSearch" class="btn btn-primary"><?php echo $lang->gitlab->search?></a>
-      </form>
-    </div>
+    <form id='gitlabForm' method='post'>
+    <?php echo html::input('keyword', $keyword, "class='form-control' placeholder='{$lang->gitlab->placeholderSearch}' style='display: inline-block;width:auto;margin:0 10px'");?>
+    <a id="gitlabSearch" class="btn btn-primary"><?php echo $lang->gitlab->search?></a>
+    </form>
   </div>
   <div class="btn-toolbar pull-right">
     <?php if(common::hasPriv('gitlab', 'createProject')) common::printLink('gitlab', 'createProject', "gitlabID=$gitlabID", "<i class='icon icon-plus'></i> " . $lang->gitlab->project->create, '', "class='btn btn-primary'");?>
@@ -52,7 +45,7 @@
           <th class='c-name text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->gitlab->project->name);?></th>
           <th class='text-left'></th>
           <th class='text-left'><?php echo $lang->gitlab->lastUpdate;?></th>
-          <th class='c-actions-6'><?php echo $lang->actions;?></th>
+          <th class='c-actions-4'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <tbody>
@@ -70,9 +63,7 @@
             $maintainerClass  = $gitlabProject->isMaintainer ? '' : 'disabled';
             $ownerClass       = $gitlabProject->adminer ? '' : 'disabled';
             $emptyBranchClass = $gitlabProject->default_branch ? '' : 'disabled';
-            common::printLink('gitlab', 'browseBranch', "gitlabID=$gitlabID&projectID=$gitlabProject->id", "<i class='icon icon-treemap'></i> ", '', "title='{$lang->gitlab->browseBranch}' class='btn {$emptyBranchClass}'");
             common::printLink('gitlab', 'browseBranchPriv', "gitlabID=$gitlabID&projectID=$gitlabProject->id", "<i class='icon icon-branch-lock'></i> ", '', "title='{$lang->gitlab->branch->accessLevel}' class='btn {$maintainerClass} {$emptyBranchClass}'");
-            common::printLink('gitlab', 'browseTag', "gitlabID=$gitlabID&projectID=$gitlabProject->id", "<i class='icon icon-tag'></i> ", '', "title='{$lang->gitlab->browseTag}' class='btn {$emptyBranchClass}'");
             common::printLink('gitlab', 'browseTagPriv', "gitlabID=$gitlabID&projectID=$gitlabProject->id", "<i class='icon icon-tag-lock'></i> ", '', "title='{$lang->gitlab->browseTagPriv}' class='btn {$maintainerClass} {$emptyBranchClass}'");
             common::printLink('gitlab', 'editProject', "gitlabID=$gitlabID&projectID=$gitlabProject->id", "<i class='icon icon-edit'></i> ", '', "title='{$lang->gitlab->project->edit}' class='btn {$ownerClass}'");
             if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'deleteProject', "gitlabID=$gitlabID&projectID=$gitlabProject->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->gitlab->deleteProject}' class='btn {$ownerClass}'");
diff --git a/module/gitlab/view/browseuser.html.php b/module/gitlab/view/browseuser.html.php
index e839d2f8b7..61163a30ac 100644
--- a/module/gitlab/view/browseuser.html.php
+++ b/module/gitlab/view/browseuser.html.php
@@ -12,8 +12,12 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
-  <div class='pull-left'>
-    <?php echo html::linkButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, $this->createLink('gitlab', 'browse'), 'self', '','btn btn-secondary');?>
+  <?php echo $this->gitlab->getGitlabMenu($gitlabID, 'user');?>
+  <div class="btn-toolbar pull-left">
+    <form id='gitlabForm' method='post'>
+    <?php echo html::input('keyword', $keyword, "class='form-control' placeholder='{$lang->gitlab->placeholderSearch}' style='display: inline-block;width:auto;margin:0 10px'");?>
+    <a id="gitlabSearch" class="btn btn-primary"><?php echo $lang->gitlab->search?></a>
+    </form>
   </div>
   <div class="btn-toolbar pull-right">
     <?php common::printLink('gitlab', 'createUser', "gitlabID=$gitlabID", "<i class='icon icon-plus'></i> " . $lang->gitlab->user->create, '', "class='btn btn-primary'");?>
diff --git a/module/repo/control.php b/module/repo/control.php
index e940ee3a82..cced3f27de 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -79,7 +79,6 @@ class repo extends control
     public function maintain($objectID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->lang->switcherMenu = '';
-        if(common::hasPriv('repo', 'create')) $this->lang->TRActions = html::a(helper::createLink('repo', 'create'), "<i class='icon icon-plus'></i> " . $this->lang->repo->create, '', "class='btn btn-primary'");
 
         $repoID = $this->repo->saveState(0, $objectID);
         if($this->viewType !== 'json') $this->commonAction($repoID, $objectID);