diff --git a/module/doc/control.php b/module/doc/control.php
index 77f2d56096..0ff5dfc3aa 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -128,6 +128,7 @@ class doc extends control
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
         /* Append id for secend sort. */
+        if($browseType == 'bymenu' and strtolower($orderBy) != 'editeddate_desc' and strtolower($orderBy) != 'addeddate_desc') $orderBy = 'title_asc';
         $sort = $this->loadModel('common')->appendOrder($orderBy);
  
         /* Get docs by browse type. */
@@ -145,7 +146,7 @@ class doc extends control
 
         if($this->cookie->browseType == 'bymenu')
         {
-            $this->view->modules = $this->doc->getDocMenu($libID, $moduleID);
+            $this->view->modules = $this->doc->getDocMenu($libID, $moduleID, $orderBy == 'title_asc' ? 'name_asc' : 'id_desc');
             $this->view->parents = $this->loadModel('tree')->getParents($moduleID);
         }
         elseif($this->cookie->browseType == 'bytree')
@@ -704,23 +705,47 @@ class doc extends control
      * @access public
      * @return void
      */
-    public function showFiles($type, $objectID)
+    public function showFiles($type, $objectID, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $uri = $this->app->getURI(true);
         $this->app->session->set('taskList',  $uri);
         $this->app->session->set('storyList', $uri);
         $this->app->session->set('docList',   $uri);
 
+        /* According the from, set menus. */
+        if($this->from == 'product')
+        {
+            $this->lang->doc->menu      = $this->lang->product->menu;
+            $this->lang->doc->menuOrder = $this->lang->product->menuOrder;
+            $this->product->setMenu($this->product->getPairs(), $objectID);
+            $this->lang->set('menugroup.doc', 'product');
+        }
+        elseif($this->from == 'project')
+        {
+            $this->lang->doc->menu      = $this->lang->project->menu;
+            $this->lang->doc->menuOrder = $this->lang->project->menuOrder;
+            $this->project->setMenu($this->project->getPairs('nocode'), $objectID);
+            $this->lang->set('menugroup.doc', 'project');
+        }
+        else
+        {
+            $this->doc->setMenu(array($this->lang->doclib->files), 0, $type);
+        }
+
+        /* Load pager. */
+        $this->app->loadClass('pager', $static = true);
+        $pager = new pager($recTotal, $recPerPage, $pageID);
+
         $table  = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
         $object = $this->dao->select('id,name')->from($table)->where('id')->eq($objectID)->fetch();
-        $this->doc->setMenu(array($this->lang->doclib->files), 0, $type);
 
         $this->view->title      = $object->name;
         $this->view->position[] = $object->name;
 
         $this->view->type   = $type;
         $this->view->object = $object;
-        $this->view->files  = $this->doc->getLibFiles($type, $objectID);
+        $this->view->files  = $this->doc->getLibFiles($type, $objectID, $pager);
+        $this->view->pager  = $pager;
         $this->display();
     }
 
diff --git a/module/doc/css/index.css b/module/doc/css/index.css
index 674e43389d..3c30337744 100644
--- a/module/doc/css/index.css
+++ b/module/doc/css/index.css
@@ -2,9 +2,9 @@
 .lib-more a.more{font-weight:bold; display:block;}
 #libs .libs-group-heading{border:1px solid #ddd;}
 #libs .libs-group{border:1px solid #ddd; border-top:0px; margin-bottom:20px;}
-#libs .libs-group.lib-more{border:0px; text-align:center; height:128px; line-height:110px;}
+#libs .libs-group.lib-more{border:0px; text-align:center; height:120px; line-height:110px;}
 #libs .libs-group.lib-more:hover{background-color: #EBF2F9}
-#libs .libs-custom-heading{text-align:left; height:128px;}
+#libs .libs-custom-heading{text-align:center; height:120px; line-height:110px;}
 #libs .libs-custom-heading:hover{background-color: #EBF2F9}
 #libs .libs-custom-heading a{display:block;height:100%;}
 #libs hr {margin-top:0px;}
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 9e05b61d54..6b88812422 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -115,3 +115,6 @@ $lang->doclib->user    = 'User';
 $lang->doclib->files   = 'Files';
 $lang->doclib->all     = 'All Libraries';
 $lang->doclib->select  = 'Select Library';
+
+$lang->doclib->main['product'] = $lang->productCommon . ' Library';
+$lang->doclib->main['project'] = $lang->projectCommon . ' Library';
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index fdfbd2ccb7..13e9dd7626 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -115,3 +115,6 @@ $lang->doclib->user    = '用户';
 $lang->doclib->files   = '附件库';
 $lang->doclib->all     = '所有文档库';
 $lang->doclib->select  = '选择文档库';
+
+$lang->doclib->main['product'] = $lang->productCommon . '库';
+$lang->doclib->main['project'] = $lang->projectCommon . '库';
diff --git a/module/doc/model.php b/module/doc/model.php
index 5f3e9975ac..7434738de9 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -531,13 +531,14 @@ class docModel extends model
      * @param  int    $libID 
      * @param  int    $parent 
      * @access public
-     * @return void
+     * @return array
      */
-    public function getDocMenu($libID, $parent)
+    public function getDocMenu($libID, $parent, $orderBy = 'name_asc')
     {
         return $this->dao->select('*')->from(TABLE_MODULE)->where('root')->eq($libID)
             ->andWhere('type')->eq('doc')
             ->andWhere('parent')->eq($parent)
+            ->orderBy($orderBy)
             ->fetchAll('id');
     }
 
diff --git a/module/doc/view/alllibs.html.php b/module/doc/view/alllibs.html.php
index 07c5ec4a14..854bf7ce41 100644
--- a/module/doc/view/alllibs.html.php
+++ b/module/doc/view/alllibs.html.php
@@ -63,8 +63,7 @@
   </div>
   <?php endif; ?>
 </div>
-<div class='clearfix pager-wrapper'><?php $pager->show('left');?></div>
-<?php js::set('type', $type);?>
+<div class='clearfix pager-wrapper'><?php $pager->show();?></div>
 <script>
 $(function()
 {
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index a68be44854..36fb2264be 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -47,7 +47,7 @@ var browseType = '<?php echo $browseType;?>';
       <ul class="dropdown-menu" role="menu">
         <li><?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-list'></i> {$lang->doc->browseTypeList['list']}");?></li>
         <li><?php echo html::a('javascript:setBrowseType("bymenu")', "<i class='icon icon-th'></i> {$lang->doc->browseTypeList['menu']}");?></li>
-        <li><?php echo html::a('javascript:setBrowseType("bytree")', "<i class='icon icon-tags'></i> {$lang->doc->browseTypeList['tree']}");?></li>
+        <li><?php echo html::a('javascript:setBrowseType("bytree")', "<i class='icon icon-branch'></i> {$lang->doc->browseTypeList['tree']}");?></li>
       </ul>
     </div>
     <?php common::printIcon('doc', 'create', "libID=$libID&moduleID=$moduleID");?>
diff --git a/module/doc/view/browsebymenu.html.php b/module/doc/view/browsebymenu.html.php
index 732ea40422..2513f6afbf 100644
--- a/module/doc/view/browsebymenu.html.php
+++ b/module/doc/view/browsebymenu.html.php
@@ -53,7 +53,7 @@
       <ul class="dropdown-menu" role="menu">
         <li><?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-list'></i> {$lang->doc->browseTypeList['list']}");?></li>
         <li><?php echo html::a('javascript:setBrowseType("bymenu")', "<i class='icon icon-th'></i> {$lang->doc->browseTypeList['menu']}");?></li>
-        <li><?php echo html::a('javascript:setBrowseType("bytree")', "<i class='icon icon-tags'></i> {$lang->doc->browseTypeList['tree']}");?></li>
+        <li><?php echo html::a('javascript:setBrowseType("bytree")', "<i class='icon icon-branch'></i> {$lang->doc->browseTypeList['tree']}");?></li>
       </ul>
     </div>
     <?php common::printIcon('doc', 'create', "libID=$libID&moduleID=$moduleID");?>
diff --git a/module/doc/view/browsebytree.html.php b/module/doc/view/browsebytree.html.php
index a5a1d64520..f20faa5d30 100644
--- a/module/doc/view/browsebytree.html.php
+++ b/module/doc/view/browsebytree.html.php
@@ -45,11 +45,11 @@
       </ul>
     </div>
     <div class="btn-group">
-      <button type="button" class="btn dropdown-toggle" data-toggle="dropdown"><i class='icon icon-tags'></i> <?php echo $lang->doc->browseTypeList['tree']?> <span class="caret"></span></button>
+      <button type="button" class="btn dropdown-toggle" data-toggle="dropdown"><i class='icon icon-branch'></i> <?php echo $lang->doc->browseTypeList['tree']?> <span class="caret"></span></button>
       <ul class="dropdown-menu" role="menu">
         <li><?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-list'></i> {$lang->doc->browseTypeList['list']}");?></li>
         <li><?php echo html::a('javascript:setBrowseType("bymenu")', "<i class='icon icon-th'></i> {$lang->doc->browseTypeList['menu']}");?></li>
-        <li><?php echo html::a('javascript:setBrowseType("bytree")', "<i class='icon icon-tags'></i> {$lang->doc->browseTypeList['tree']}");?></li>
+        <li><?php echo html::a('javascript:setBrowseType("bytree")', "<i class='icon icon-branch'></i> {$lang->doc->browseTypeList['tree']}");?></li>
       </ul>
     </div>
     <?php common::printIcon('doc', 'create', "libID=$libID&moduleID=$moduleID");?>
diff --git a/module/doc/view/diff.html.php b/module/doc/view/diff.html.php
index 6ec6156c96..e10fce50c2 100644
--- a/module/doc/view/diff.html.php
+++ b/module/doc/view/diff.html.php
@@ -90,5 +90,4 @@
     <?php endforeach;?>
   </table>
 </div>
-<?php js::set('type', 'doc')?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php
index a69c3bbea7..b8dda0be59 100644
--- a/module/doc/view/edit.html.php
+++ b/module/doc/view/edit.html.php
@@ -13,7 +13,6 @@
 <?php include '../../common/view/header.html.php';?>
 <?php if($doc->contentType == 'html')     include '../../common/view/ueditor.html.php';?>
 <?php if($doc->contentType == 'markdown') include '../../common/view/markdown.html.php';?>
-<?php js::set('type', 'doc')?>
 <div class='container mw-1400px'>
   <div id='titlebar'>
     <div class='heading'>
diff --git a/module/doc/view/footer.html.php b/module/doc/view/footer.html.php
index 5644fbe0c7..e00e874203 100644
--- a/module/doc/view/footer.html.php
+++ b/module/doc/view/footer.html.php
@@ -5,7 +5,7 @@
 <script>
 $(function()
 {
-    $('#featurebar .heading').prepend("<i class='icon icon-tags'></i> " + <?php echo json_encode($crumbs)?> + <?php echo json_encode($lang->arrow)?>);
+    $('#featurebar .heading').prepend(<?php echo json_encode($crumbs)?> + <?php echo json_encode($lang->arrow)?>);
 })
 </script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php
index e0b55b6115..b7e99ec4f0 100644
--- a/module/doc/view/index.html.php
+++ b/module/doc/view/index.html.php
@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div id='featurebar'><strong><?php echo $lang->doclib->all?></strong></div>
 <div id='libs'>
   <?php
   $libs = array();
@@ -30,7 +29,7 @@
         <?php if($objectCount > 8 and $objectNum == 8):?>
         <div class='col-md-3'>
           <div class='libs-group clearfix lib-more'>
-            <?php echo html::a(inlink('allLibs', "type=$libsName"), "{$lang->more}<i class='icon icon-double-angle-right'></i>", '', "title='$lang->more' class='more'")?>
+            <?php echo html::a(inlink('allLibs', "type=$libsName"), "{$lang->more}{$lang->doc->libTypeList['product']}<i class='icon icon-double-angle-right'></i>", '', "title='$lang->more' class='more'")?>
           </div>
         </div>
         <?php break;?>
@@ -84,7 +83,7 @@
         <?php if($objectCount > 8 and $objectNum == 8):?>
         <div class='col-md-3'>
           <div class='libs-group clearfix lib-more'>
-            <?php echo html::a(inlink('allLibs', "type=$libsName"), $lang->more . "<i class='icon icon-double-angle-right'></i>", '', "title='$lang->more' class='more'")?>
+            <?php echo html::a(inlink('allLibs', "type=$libsName"), "{$lang->more}{$lang->doc->libTypeList['project']}<i class='icon icon-double-angle-right'></i>", '', "title='$lang->more' class='more'")?>
           </div>
         </div>
         <?php break;?>
@@ -137,7 +136,7 @@
         <?php if($objectCount > 8 and $objectNum == 8):?>
         <div class='col-md-3'>
           <div class='libs-group clearfix lib-more'>
-            <?php echo html::a(inlink('allLibs', "type=$libsName"), $lang->more . "<i class='icon icon-double-angle-right'></i>", '', "title='$lang->more' class='more'")?>
+            <?php echo html::a(inlink('allLibs', "type=$libsName"), "{$lang->more}{$lang->doc->libTypeList['custom']}<i class='icon icon-double-angle-right'></i>", '', "title='$lang->more' class='more'")?>
           </div>
         </div>
         <?php break;?>
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index a9586204ba..e8957796db 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -32,5 +32,4 @@
     <?php endforeach; ?>
   </div>
 </div>
-<?php js::set('type', 'doc')?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php
index f12fde2095..ae3e6b5563 100644
--- a/module/doc/view/showfiles.html.php
+++ b/module/doc/view/showfiles.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div id='featurebar'>
-  <strong><?php echo html::a(inlink('objectLibs', "type=$type&objectID={$object->id}&from={$this->from}"), $object->name) . $lang->arrow . $lang->doclib->files?></strong>
+  <strong><?php echo $lang->doclib->files?></strong>
   <div class='actions'><?php echo html::backButton();?></div>
 </div>
 <div class='lib-files cards'>
@@ -46,12 +46,12 @@
       </a>
       <div class='card-heading'>
         <a href='<?php echo $this->createLink($file->objectType, 'view', "objectID=$file->objectID"); ?>'><?php echo $lang->doc->fileObject . ' ' . strtoupper($file->objectType) . ' #' . $file->objectID ?></a>
-        <i class='icon icon-chevron-right pull-right'></i>
         <a href='<?php echo $this->createLink('file', 'delete', "fileID=$file->id"); ?>' target='hiddenwin' title='<?php echo $lang->delete?>' class='delete pull-right'><i class='icon icon-remove'></i></a>
       </div>
     </div>
   </div>
   <?php endforeach;?>
 </div>
+<div class='clearfix pager-wrapper'><?php $pager->show();?></div>
 <?php js::set('type', 'doc');?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php
index 163b510ec6..6a56185354 100644
--- a/module/doc/view/view.html.php
+++ b/module/doc/view/view.html.php
@@ -165,6 +165,5 @@
     </div>
   </div>
 </div>
-<?php js::set('type', 'doc')?>
 <?php include '../../common/view/syntaxhighlighter.html.php';?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/product/model.php b/module/product/model.php
index c6aebf417e..a00de27ab1 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -257,9 +257,10 @@ class productModel extends model
         $this->dao->update(TABLE_PRODUCT)->set('`order`')->eq($productID * 5)->where('id')->eq($productID)->exec();
 
         /* Create doc lib. */
+        $this->app->loadLang('doc');
         $lib = new stdclass();
         $lib->product = $productID;
-        $lib->name    = $product->name;
+        $lib->name    = $this->lang->doclib->main['product'];
         $lib->main    = '1';
         $lib->acl     = $product->acl == 'open' ? 'open' : 'custom';
         $lib->users   = $this->app->user->account;
diff --git a/module/project/model.php b/module/project/model.php
index 01355ae0d6..c160476651 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -271,7 +271,7 @@ class projectModel extends model
             /* Create doc lib. */
             $lib = new stdclass();
             $lib->project = $projectID;
-            $lib->name    = $project->name;
+            $lib->name    = $this->lang->doclib->main['project'];
             $lib->main    = '1';
             $lib->acl     = $project->acl == 'open' ? 'open' : 'custom';
 
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index e85420645c..b1c024d8b0 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -94,7 +94,8 @@
               <td></td>
               <td colspan='2'>
                 <?php 
-                echo html::submitButton() . html::backButton();
+                echo html::submitButton();
+                echo $this->session->{$viewType .'List'} ? html::linkButton($this->lang->goback, $this->session->{$viewType .'List'}) : html::backButton();
                 echo html::hidden('parentModuleID', $currentModuleID);
                 echo html::hidden('maxOrder', $maxOrder);
                 ?>      
diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php
index 45e4863b8b..b49a1abf6b 100644
--- a/module/tree/view/browsetask.html.php
+++ b/module/tree/view/browsetask.html.php
@@ -80,7 +80,8 @@
               <td></td>
               <td colspan='2'>
                 <?php 
-                echo html::submitButton() . html::backButton();
+                echo html::submitButton();
+                echo $this->session->taskList ? html::linkButton($this->lang->goback, $this->session->taskList) : html::backButton();
                 echo html::hidden('parentModuleID', $currentModuleID);
                 echo html::hidden('maxOrder', $maxOrder);
                 ?>      
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index a822d74c44..1b1419a5e7 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -1163,6 +1163,7 @@ class upgradeModel extends model
      */
     public function adjustDocModule()
     {
+        $this->app->loadLang('doc');
         $productDocModules = $this->dao->select('*')->from(TABLE_MODULE)->where('type')->eq('productdoc')->orderBy('grade,id')->fetchAll('id');
         $allProductIdList  = $this->dao->select('id,name,acl,whitelist,createdBy')->from(TABLE_PRODUCT)->where('deleted')->eq('0')->fetchAll('id');
         foreach($allProductIdList as $productID => $product)
@@ -1171,7 +1172,7 @@ class upgradeModel extends model
 
             $lib = new stdclass();
             $lib->product = $productID;
-            $lib->name    = $product->name;
+            $lib->name    = $this->lang->doclib->main['product'];
             $lib->main    = 1;
             $lib->acl     = $product->acl == 'open' ? 'open' : 'custom';
             $lib->users   = $product->createdBy;
@@ -1213,7 +1214,7 @@ class upgradeModel extends model
 
             $lib = new stdclass();
             $lib->project = $projectID;
-            $lib->name    = $project->name;
+            $lib->name    = $this->lang->doclib->main['project'];
             $lib->main    = 1;
             $lib->acl     = $project->acl == 'open' ? 'open' : 'custom';