diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index ccf2948f26..16271276d9 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -76,7 +76,7 @@ $lang->admin->menuList->switch['subMenu']['setmodule'] = array('link' => "{$lang
 $lang->admin->menuList->switch['menuOrder']['5'] = 'setmodule';
 
 $lang->admin->menuList->model['subMenu']['common']    = array('link' => "{$lang->globalSetting}|custom|required|module=project", 'subModule' => 'custom');
-$lang->admin->menuList->model['subMenu']['scrum']     = array('link' => "{$lang->scrumModel}|auditcl|scrumbrowse|");
+$lang->admin->menuList->model['subMenu']['scrum']     = array('link' => "{$lang->scrumModel}|auditcl|scrumbrowse|", 'subModule' => 'auditcl');
 $lang->admin->menuList->model['subMenu']['waterfall'] = array('link' => "{$lang->waterfallModel}|stage|settype|", 'subModule' => 'stage');
 
 $lang->admin->menuList->model['menuOrder']['5']  = 'common';
diff --git a/module/admin/model.php b/module/admin/model.php
index 6770508b60..3b39276daa 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -273,20 +273,21 @@ class adminModel extends model
             {
                 $moduleName = $this->app->rawModule;
                 $methodName = $this->app->rawMethod;
-                $paramName  = $this->app->rawParams ? reset($this->app->rawParams) : '';
+                $firstParam = $this->app->rawParams ? reset($this->app->rawParams) : '';
+
                 foreach($this->lang->admin->menuList->$menuKey['subMenu'] as $subMenuKey => $subMenu)
                 {
                     $subModule = '';
                     if($moduleName == 'custom' and strpos(',required,set,', $methodName) !== false)
                     {
-                        if(isset($this->config->admin->navsGroup[$subMenuKey]) and strpos($this->config->admin->navsGroup[$subMenuKey], ",$paramName,") !== false) $subModule = 'custom';
-                        if($paramName == $subMenuKey) $subModule = 'custom';
+                        if(isset($this->config->admin->navsGroup[$subMenuKey]) and strpos($this->config->admin->navsGroup[$subMenuKey], ",$firstParam,") !== false) $subModule = 'custom';
+                        if($firstParam == $subMenuKey) $subModule = 'custom';
                     }
 
                     if(!empty($subModule)) $subMenu['subModule'] = $subModule;
                     if(isset($this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey]))
                     {
-                        if(!empty($subModule)) $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey][$paramName]['subModule'] = $subModule;
+                        if(!empty($subModule)) $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey][$firstParam]['subModule'] = $subModule;
                         $subMenu['subMenu'] = $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey];
                     }
 
diff --git a/module/custom/css/common.css b/module/custom/css/common.css
index fd7c269813..8a1a8a3f5c 100644
--- a/module/custom/css/common.css
+++ b/module/custom/css/common.css
@@ -1,3 +1,5 @@
 .alert-block {border-top: 1px solid #ddd;}
 .btn-toolbar.pull-left .divider {margin-left: 0px; border-color: rgba(0,0,0,.2);}
 .main-content .main-header {padding: 10px 20px;}
+#subNavbar .nav>li>a { padding: 4px 12px;}
+#subHeader.admin-tab-menu {margin-bottom: -25px;}
diff --git a/module/entry/view/create.html.php b/module/entry/view/create.html.php
index f571010eea..673bcd45b3 100644
--- a/module/entry/view/create.html.php
+++ b/module/entry/view/create.html.php
@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/form.html.php';?>
 <div id='mainContent' class='main-content'>
-  <div class='center-block mw-800px center-block-sm'>
+  <div class='mw-800px center-block-sm'>
     <div class="main-header">
       <h2>
         <?php echo $lang->entry->common;?>
diff --git a/module/mail/view/detect.html.php b/module/mail/view/detect.html.php
index 4ad689faa8..8413df0492 100755
--- a/module/mail/view/detect.html.php
+++ b/module/mail/view/detect.html.php
@@ -12,13 +12,7 @@
 ?>
 <?php include $this->app->getModuleRoot() . 'message/view/header.html.php';?>
 <div id='mainContent' class='main-content'>
-  <div class='center-block mw-700px'>
-    <div class='main-header'>
-      <h2>
-        <?php echo $lang->mail->common;?>
-        <small class='text-muted'> <?php echo $lang->arrow . $lang->mail->detect;?></small>
-      </h2>
-    </div>
+  <div class='mw-700px'>
     <form class='pdt-20' method='post' target='hiddenwin'>
       <table class='table table-form'>
         <tr><th style='width:140px'><?php echo $lang->mail->inputFromEmail; ?></th><td class='w-p50'><?php echo html::input('fromAddress', $fromAddress, "class='form-control'");?></td><td><?php echo html::submitButton($lang->mail->nextStep, '', 'btn btn-primary');?></td></tr>
diff --git a/module/mail/view/edit.html.php b/module/mail/view/edit.html.php
index 263a7a3826..2d07ec249b 100755
--- a/module/mail/view/edit.html.php
+++ b/module/mail/view/edit.html.php
@@ -12,13 +12,7 @@
 ?>
 <?php include $this->app->getModuleRoot() . 'message/view/header.html.php';?>
 <div id='mainContent' class='main-content'>
-  <div class='center-block mw-800px'>
-    <div class='main-header'>
-      <h2>
-        <?php echo $lang->mail->common;?>
-        <small class='text-muted'> <?php echo $lang->arrow . $lang->mail->edit;?></small>
-      </h2>
-    </div>
+  <div class=' mw-800px'>
     <form method='post' action='<?php echo inlink('save');?>' id='dataform'>
       <table class='table table-form'>
         <tr>
diff --git a/xuanxuan/extension/xuan/admin/ext/lang/de/xuanxuan.php b/xuanxuan/extension/xuan/admin/ext/lang/de/xuanxuan.php
index 1a35918f24..b7062e1f1c 100644
--- a/xuanxuan/extension/xuan/admin/ext/lang/de/xuanxuan.php
+++ b/xuanxuan/extension/xuan/admin/ext/lang/de/xuanxuan.php
@@ -25,7 +25,7 @@ $lang->admin->sizeType['G'] = 1024 * 1024 * 1024;
 global $config;
 if($config->vision != 'lite')
 {
-    $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting');
+    $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting,conference');
     $lang->admin->menuList->system['menuOrder']['20'] = 'xuanxuan';
 
     $lang->admin->menuList->system['tabMenu']['xuanxuan']['index']   = array('link' => 'Home|admin|xuanxuan|');
diff --git a/xuanxuan/extension/xuan/admin/ext/lang/en/xuanxuan.php b/xuanxuan/extension/xuan/admin/ext/lang/en/xuanxuan.php
index 1a35918f24..b7062e1f1c 100644
--- a/xuanxuan/extension/xuan/admin/ext/lang/en/xuanxuan.php
+++ b/xuanxuan/extension/xuan/admin/ext/lang/en/xuanxuan.php
@@ -25,7 +25,7 @@ $lang->admin->sizeType['G'] = 1024 * 1024 * 1024;
 global $config;
 if($config->vision != 'lite')
 {
-    $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting');
+    $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting,conference');
     $lang->admin->menuList->system['menuOrder']['20'] = 'xuanxuan';
 
     $lang->admin->menuList->system['tabMenu']['xuanxuan']['index']   = array('link' => 'Home|admin|xuanxuan|');
diff --git a/xuanxuan/extension/xuan/admin/ext/lang/fr/xuanxuan.php b/xuanxuan/extension/xuan/admin/ext/lang/fr/xuanxuan.php
index 1a35918f24..b7062e1f1c 100644
--- a/xuanxuan/extension/xuan/admin/ext/lang/fr/xuanxuan.php
+++ b/xuanxuan/extension/xuan/admin/ext/lang/fr/xuanxuan.php
@@ -25,7 +25,7 @@ $lang->admin->sizeType['G'] = 1024 * 1024 * 1024;
 global $config;
 if($config->vision != 'lite')
 {
-    $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting');
+    $lang->admin->menuList->system['subMenu']['xuanxuan'] = array('link' => 'Desktop|admin|xuanxuan|', 'subModule' => 'client,setting,conference');
     $lang->admin->menuList->system['menuOrder']['20'] = 'xuanxuan';
 
     $lang->admin->menuList->system['tabMenu']['xuanxuan']['index']   = array('link' => 'Home|admin|xuanxuan|');