diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index b2a3fe6eb1..c7627d0a61 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -1,23 +1,27 @@
 #notice {margin: -20px -20px 20px; padding: 20px;}
 #zentaoLinks {margin-top: 20px;}
 #zentaoLinks .panel .panel-heading {padding: 6px 10px;}
-.admin {display: flex; background: unset;}
-.admin > .main {flex: 1 1 60%; padding-right: 20px;}
-.admin > .side {flex: 1 1 40%; padding-left: 10px;}
+.main-content.admin {padding: 0;}
+.admin {display: flex; background: unset; box-shadow: none;}
+.admin > .main {flex: 1 1 70%; padding-right: 16px;}
+.admin > .side {flex: 1 1 30%; padding-left: 10px;}
 .panel-title {padding: 10px 0px;}
 .flex {display: flex;}
 .panel {padding: 0 0 0 16px;}
+.settings.panel, .plug.panel {margin-bottom: 16px;}
 
-.settings-list {display: flex; flex-wrap: wrap; padding: 12px 4px 16px 4px;}
-.settings-list > .setting-box {flex: 0 0 20%; padding: 18px 0;}
+.settings-list {display: flex; flex-wrap: wrap; padding: 0 4px 16px 4px;}
+.settings-list > .setting-box {flex: 0 0 18%; padding: 8px; border: 1px solid #E3E4E9; margin-right: 10px; margin-top: 16px;}
+.settings-list > .setting-box > .setting-desc {padding-bottom: 16px;}
 
 .plugin-list {display: flex; flex-wrap: wrap; padding: 12px 4px 4px 4px;}
-.plugin-list > .plugin-item {flex: 1 1 26%; padding: 16px 4px; border: 1px solid #EDEEF2; border-radius: 4px; margin-right: 16px; margin-bottom: 16px; width: 0px;}
+.plugin-list > .plugin-item {flex: 1 1 26%; padding: 16px 10px; border: 1px solid #EDEEF2; border-radius: 4px; margin-right: 16px; margin-bottom: 16px; width: 0px;}
 .plugin-list > .plugin-item .ext-download {float: right; padding: 6px 0px;}
 .plugin-list > .plugin-item > .plug-title {height: 16px; overflow: hidden;}
 .plugin-list > .plugin-item .extension-desc {overflow: hidden; height: 16px;}
 
-.bottom.flex > .official {flex: 1 1 30%; margin-right: 20px;}
+.bottom.flex > .panel, .side.panel {margin-bottom: 0;}
+.bottom.flex > .official {flex: 1 1 30%; margin-right: 16px; padding: 0 16px 16px 16px;}
 .bottom.flex > .publicClass {flex: 1 1 60%;}
 
 .official-img {background-image: url('/static/images/wechat.jpg'); background-repeat: no-repeat; background-size: contain; flex: 1 1 50%; aspect-ratio: 1 / 1; background-position: center;}
diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php
index 7e1dd9a997..84ed30cc05 100755
--- a/module/admin/lang/zh-cn.php
+++ b/module/admin/lang/zh-cn.php
@@ -151,44 +151,44 @@ $lang->admin->safe->noticeGd       = '系统检测到您的服务器未安装GD
 
 $lang->admin->menuList = new stdclass();
 $lang->admin->menuList->setting['name']  = '系统设置';
-$lang->admin->menuList->setting['desc']  = '';
+$lang->admin->menuList->setting['desc']  = '备份、聊天、安全等系统各要素配置。';
 $lang->admin->menuList->setting['order'] = 1;
 
 $lang->admin->menuList->user['name']  = '人员管理';
-$lang->admin->menuList->user['desc']  = '';
+$lang->admin->menuList->user['desc']  = '维护部门、添加人员、分组配置权限。';
 $lang->admin->menuList->user['order'] = 2;
 
 $lang->admin->menuList->switch['name']  = '功能开关';
-$lang->admin->menuList->switch['desc']  = '';
+$lang->admin->menuList->switch['desc']  = '打开、关闭系统部分功能。';
 $lang->admin->menuList->switch['order'] = 3;
 
 $lang->admin->menuList->model['name']  = '模型配置';
-$lang->admin->menuList->model['desc']  = '';
+$lang->admin->menuList->model['desc']  = '不同项目管理模型和项目通用要素配置。';
 $lang->admin->menuList->model['order'] = 4;
 
 $lang->admin->menuList->feature['name']  = '功能配置';
-$lang->admin->menuList->feature['desc']  = '';
+$lang->admin->menuList->feature['desc']  = '按照功能菜单进行系统的要素配置。';
 $lang->admin->menuList->feature['order'] = 5;
 
 $lang->admin->menuList->template['name']  = '文档模板';
-$lang->admin->menuList->template['desc']  = '';
+$lang->admin->menuList->template['desc']  = '配置文档的模板类型和模板内容。';
 $lang->admin->menuList->template['order'] = 6;
 
 $lang->admin->menuList->message['name']  = '通知设置';
-$lang->admin->menuList->message['desc']  = '';
+$lang->admin->menuList->message['desc']  = '配置通知路径，自定义需要通知的动作。';
 $lang->admin->menuList->message['order'] = 7;
 
 $lang->admin->menuList->extension['name']  = '插件管理';
-$lang->admin->menuList->extension['desc']  = '';
+$lang->admin->menuList->extension['desc']  = '浏览、安装插件。';
 $lang->admin->menuList->extension['link']  = 'extension|browse';
 $lang->admin->menuList->extension['order'] = 8;
 
 $lang->admin->menuList->dev['name']  = '二次开发';
-$lang->admin->menuList->dev['desc']  = '';
+$lang->admin->menuList->dev['desc']  = '支持对系统进行二次开发。';
 $lang->admin->menuList->dev['order'] = 9;
 
 $lang->admin->menuList->convert['name']  = '数据导入';
-$lang->admin->menuList->convert['desc']  = '';
+$lang->admin->menuList->convert['desc']  = '第三方系统的数据导入。';
 $lang->admin->menuList->convert['link']  = 'convert|convertjira';
 $lang->admin->menuList->convert['order'] = 10;
 
diff --git a/module/admin/model.php b/module/admin/model.php
index b28a53ebd1..7976bd2ffc 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -419,6 +419,7 @@ class adminModel extends model
             $param      = $type == 'extension' ? '' : 'MTIxOA==';
             $extensions = $this->loadModel('extension')->getExtensionsByAPI($searchType, $param, 0, $limit);
             $extensions = isset($extensions->extensions) ? (array)$extensions->extensions : array();
+            foreach($extensions as $extension) $extension->viewLink = str_replace(array('info', 'client'), '', $extension->viewLink);
         }
         else
         {
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index 1688bddff6..9fbaccff93 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -17,16 +17,13 @@
     <div class="settings panel">
       <div class="panel-title"><?php echo $lang->admin->setting?></div>
       <div class="settings-list">
-        <div class="setting-box">1</div>
-        <div class="setting-box">2</div>
-        <div class="setting-box">3</div>
-        <div class="setting-box">4</div>
-        <div class="setting-box">5</div>
-        <div class="setting-box">6</div>
-        <div class="setting-box">7</div>
-        <div class="setting-box">8</div>
-        <div class="setting-box">9</div>
-        <div class="setting-box">10</div>
+        <?php foreach($lang->admin->menuList as $menu):?>
+        <div class="setting-box">
+          <h4><?php echo $menu['name'];?></h4>
+          <p class="text-muted setting-desc"><?php echo $menu['desc'];?></p>
+          <?php echo html::a('', "<i class='icon icon-help'></i> {$lang->help}", '_blank', 'class="text-muted setting-help"');?>
+        </div>
+        <?php endforeach;?>
       </div>
     </div>