diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 7167cf90db..c657b0876e 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -269,8 +269,7 @@ $lang->user->menu  = $lang->company->menu;
 $lang->admin = new stdclass();
 $lang->admin->menu = new stdclass();
 $lang->admin->menu->index     = array('link' => 'Index|admin|index');
-$lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension');
-$lang->admin->menu->editor    = array('link' => 'Scaffold|editor|index', 'subModule' => 'editor');
+$lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension,editor');
 $lang->admin->menu->mail      = array('link' => 'Email|mail|index', 'subModule' => 'mail');
 $lang->admin->menu->clearData = array('link' => 'Clear data|admin|cleardata');
 $lang->admin->menu->convert   = array('link' => 'Import|convert|index', 'subModule' => 'convert');
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index d0030eb613..fea1294e90 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -269,8 +269,7 @@ $lang->user->menu  = $lang->company->menu;
 $lang->admin = new stdclass();
 $lang->admin->menu = new stdclass();
 $lang->admin->menu->index     = array('link' => '首页|admin|index');
-$lang->admin->menu->extension = array('link' => '插件|extension|browse', 'subModule' => 'extension');
-$lang->admin->menu->editor    = array('link' => '扩展编辑器|editor|index', 'subModule' => 'editor');
+$lang->admin->menu->extension = array('link' => '扩展|extension|browse', 'subModule' => 'extension,editor');
 $lang->admin->menu->mail      = array('link' => '发信|mail|index', 'subModule' => 'mail');
 $lang->admin->menu->clearData = array('link' => '清除数据|admin|cleardata');
 $lang->admin->menu->convert   = array('link' => '导入|convert|index', 'subModule' => 'convert');
diff --git a/module/editor/control.php b/module/editor/control.php
index c3f4a88f0a..9849daba62 100644
--- a/module/editor/control.php
+++ b/module/editor/control.php
@@ -17,11 +17,13 @@ class editor extends control
      * @access public
      * @return void
      */
-    public function index()
+    public function index($type = 'editor')
     {
+        $this->app->loadLang('extension');
         $this->view->title      = $this->lang->editor->common;
         $this->view->position[] = $this->lang->editor->common;
         $this->view->moduleList = $this->editor->getModules();
+        $this->view->tab        = $type;
         $this->display();
     }
 
diff --git a/module/editor/js/index.js b/module/editor/js/index.js
index d3abaaee77..6b69a8d340 100644
--- a/module/editor/js/index.js
+++ b/module/editor/js/index.js
@@ -3,4 +3,5 @@ $(function()
    var showHeight = $(window).height() - $('#header').height() - $('#footer').height() - 20;
    $('#editWin').height(showHeight);
    $('#extendWin').height(showHeight);
+   if($('a.iframe').size()) $("a.iframe").colorbox({width:800, height:400, iframe:true, transition:'none', scrolling:true});
 });
diff --git a/module/editor/lang/en.php b/module/editor/lang/en.php
index 63526ba143..fcc91e720f 100644
--- a/module/editor/lang/en.php
+++ b/module/editor/lang/en.php
@@ -1,5 +1,6 @@
 <?php
-$lang->editor->common    = 'Extension editor';
+$lang->editor->common    = 'Editor';
+$lang->editor->api       = 'API';
 $lang->editor->index     = 'Index';
 $lang->editor->newMethod = 'New method';
 $lang->editor->extend    = 'Extend';
diff --git a/module/editor/lang/zh-cn.php b/module/editor/lang/zh-cn.php
index 0e52893a51..f4a55574e7 100644
--- a/module/editor/lang/zh-cn.php
+++ b/module/editor/lang/zh-cn.php
@@ -1,5 +1,6 @@
 <?php
-$lang->editor->common    = '扩展编辑器';
+$lang->editor->common    = '编辑器';
+$lang->editor->api       = 'API';
 $lang->editor->index     = '首页';
 $lang->editor->newMethod = '新增方法';
 $lang->editor->extend    = '扩展';
diff --git a/module/editor/view/index.html.php b/module/editor/view/index.html.php
index 8245096ac0..bdfdd08993 100644
--- a/module/editor/view/index.html.php
+++ b/module/editor/view/index.html.php
@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include '../../common/view/header.html.php';?>
+<?php include '../../extension/view/header.html.php';?>
 <table class='table-1 bd-none'>
   <tr valign='top'>
     <td width='160'>
diff --git a/module/extension/control.php b/module/extension/control.php
index ecc34abb7e..34ec8c1ade 100644
--- a/module/extension/control.php
+++ b/module/extension/control.php
@@ -11,6 +11,11 @@
  */
 class extension extends control
 {
+    public function __construct()
+    {
+        parent::__construct();
+        $this->app->loadLang('editor');
+    }
     /**
      * Browse extensions.
      *
diff --git a/module/extension/view/header.html.php b/module/extension/view/header.html.php
index ba93b6448a..1e3623e9ca 100644
--- a/module/extension/view/header.html.php
+++ b/module/extension/view/header.html.php
@@ -3,12 +3,17 @@
 <div id='featurebar'>
   <div class='f-left'>
   <?php 
-  echo '<span id="installed">'  . html::a(inlink('browse', "type=installed"),   $lang->extension->installed)   . '</span>';
-  echo '<span id="deactivated">'. html::a(inlink('browse', "type=deactivated"), $lang->extension->deactivated) . '</span>';
-  echo '<span id="available">'  . html::a(inlink('browse', "type=available"),   $lang->extension->available )  . '</span>';
-  echo '<span id="obtain">  '   . html::a(inlink('obtain'), $lang->extension->obtain) . '</span>';
+  echo '<span>'  . $lang->extension->common . '：</span>';
+  echo '<span id="installed">'  . html::a($this->createLink('extension', 'browse', "type=installed"),   $lang->extension->installed)   . '</span>';
+  echo '<span id="deactivated">'. html::a($this->createLink('extension', 'browse', "type=deactivated"), $lang->extension->deactivated) . '</span>';
+  echo '<span id="available">'  . html::a($this->createLink('extension', 'browse', "type=available"),   $lang->extension->available )  . '</span>';
+  echo '<span id="obtain">  '   . html::a($this->createLink('extension', 'obtain'), $lang->extension->obtain) . '</span>';
   common::printLink('extension', 'upload', '', $lang->extension->upload, '', "class='iframe'");
-  ?>
+
+  echo "<span class='pl-10px'>"  . $lang->editor->common . '&' . $lang->editor->api . '：</span>';
+  echo "<span id='editor'>" . html::a($this->createLink('editor', 'index', 'type=editor'), $lang->editor->common) . '</span>';
+  echo "<span id='api'>" . html::a($this->createLink('editor', 'index', 'type=api'), $lang->editor->api) . '</span>';
+?>
   </div>
   <script>$('#<?php echo $tab;?>').addClass('active')</script>
 </div>