diff --git a/module/doc/control.php b/module/doc/control.php
index 34ad3e154e..1d84bc47cb 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -153,7 +153,7 @@ class doc extends control
         }
 
         $attachLibs = array();
-        if(!empty($lib) and (!empty($lib->product) or !empty($lib->project)))
+        if(!empty($lib) and (!empty($lib->product) or !empty($lib->project)) and $browseType != 'bymodule')
         {
             $count = $this->dao->select('count(*) as count')->from(TABLE_DOCLIB)->where('project')->eq($lib->project)->andWhere('product')->eq($lib->product)->fetch('count');
             if($count == 1)
diff --git a/module/doc/css/common.css b/module/doc/css/common.css
index fa5bbf1ec4..82ec05b862 100644
--- a/module/doc/css/common.css
+++ b/module/doc/css/common.css
@@ -70,7 +70,6 @@
 
 td.c-name a{color: #0c60e1}
 td.c-name a:visited{color: #082999}
-.main-col .panel-heading a:visited{color: #082999}
 
 .panel-title.font-normal .btn-group{margin-left: 20px;}
 
diff --git a/module/doc/js/browse.js b/module/doc/js/browse.js
index 9f2e4b34d5..1ba5d470ee 100644
--- a/module/doc/js/browse.js
+++ b/module/doc/js/browse.js
@@ -16,10 +16,10 @@ function browseBySearch()
 $(function()
 {
     if(browseType == 'bysearch') return;
-    $('ul.dropdown-menu').css('left', '67px');
+    $('#pageActions ul.dropdown-menu').css('left', '67px');
     if(browseType == 'byediteddate' || browseType == 'openedbyme' || browseType == 'collectedbyme') 
     {
-        $('ul.dropdown-menu').css('left', '0px');
+        $('#pageActions ul.dropdown-menu').css('left', '0px');
         $('#bysearchTab').remove();
     }
     $('#' + browseType + 'Tab').addClass('active');
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 7362adea90..432cfaead7 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -178,3 +178,5 @@ $lang->doclib->main['project'] = $lang->projectCommon . '主库';
 $lang->doclib->tabList['product'] = $lang->productCommon;
 $lang->doclib->tabList['project'] = $lang->projectCommon;
 $lang->doclib->tabList['custom']  = '自定义';
+
+$lang->doclib->nameList['custom'] = '自定义文档库名称';
diff --git a/module/doc/model.php b/module/doc/model.php
index 0941178d9d..9e94238914 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -53,9 +53,10 @@ class docModel extends model
                 $selectHtml .= "<div class='btn-group'>";
                 $selectHtml .= "<a data-toggle='dropdown' class='btn btn-limit' title=$mainLib>" . $mainLib . " <span class='caret'></span></a>";
                 $selectHtml .= "<ul class='dropdown-menu'>";
-                $selectHtml .= '<li>' . html::a(helper::createLink('doc', 'allLibs', "type=product"), "<i class='icon icon-cube'></i> {$this->lang->productCommon}") . '</li>';
-                $selectHtml .= '<li>' . html::a(helper::createLink('doc', 'allLibs', "type=project"), "<i class='icon icon-stack'></i> {$this->lang->projectCommon}") . '</li>';
-                $selectHtml .= '<li>' . html::a(helper::createLink('doc', 'allLibs', "type=custom"), "<i class='icon icon-folder-o'></i> {$this->lang->doc->customAB}") . '</li>';
+                foreach($this->lang->doc->libTypeList as $libType => $libName)
+                {
+                    $selectHtml .= '<li>' . html::a(helper::createLink('doc', 'allLibs', "type=$libType"), "<i class='icon {$this->lang->doc->libIconList[$libType]}'></i> {$this->lang->doc->libTypeList[$libType]}") . '</li>';
+                }
                 $selectHtml .='</ul></div></div>';
             }
 
diff --git a/module/doc/view/alllibsbylist.html.php b/module/doc/view/alllibsbylist.html.php
index 967a2fa46e..5dc49dc16b 100644
--- a/module/doc/view/alllibsbylist.html.php
+++ b/module/doc/view/alllibsbylist.html.php
@@ -17,10 +17,10 @@
             <?php $name = '';?>
             <?php if($type == 'product') $name = $lang->product->name;?>
             <?php if($type == 'project') $name = $lang->project->name;?>
-            <?php if($type == 'custom')  $name = $lang->doc->libName;?>
+            <?php if($type != 'product' and $type != 'project')  $name = $lang->doclib->nameList[$type];?>
             <th class="c-name"><?php echo $name;?></th>
             <th class="c-num"><?php echo $lang->doc->num;?></th>
-            <?php if($type != 'custom'):?>
+            <?php if($type == 'product' or $type == 'project'):?>
             <th class="c-user"><?php echo $lang->doc->addedBy;?></th>
             <th class="c-datetime"><?php echo $lang->doc->addedDate;?></th>
             <?php else:?>
@@ -30,17 +30,17 @@
         </thead>
         <tbody>
           <?php foreach($libs as $lib):?>
-          <?php $link = $type != 'custom' ? $this->createLink('doc', 'objectLibs', "type=$type&objectID=$lib->id") : $this->createLink('doc', 'browse', "libID=$lib->id");?>
+          <?php $link = ($type == 'product' or $type == 'project') ? $this->createLink('doc', 'objectLibs', "type=$type&objectID=$lib->id") : $this->createLink('doc', 'browse', "libID=$lib->id");?>
           <tr>
             <td class="c-name"><?php echo html::a($link, $lib->name);?></td>
             <td class="c-num">
-              <?php if($type == 'custom'):?>
+              <?php if($type != 'product' and $type != 'project'):?>
               <?php echo $itemCounts[$lib->id] . $lang->doc->item;?>
               <?php else:?>
               <?php echo count($subLibs[$lib->id]) . $lang->doc->item;?>
               <?php endif;?>
             </td>
-            <?php if($type != 'custom'):?>
+            <?php if($type == 'product' or $type == 'project'):?>
             <td class="c-user"><?php if($lib->createdBy) echo zget($users, $lib->createdBy);?></td>
             <td class="c-datetime"><?php if($lib->createdDate != '00-00-00 00:00:00') echo formatTime($lib->createdDate, 'm-d h:i');?></td>
             <?php else:?>
@@ -50,7 +50,7 @@
               <a data-url="<?php echo $this->createLink('doc', 'collect', "objectID=$lib->id&objectType=doclib");?>" title="<?php echo $collectTitle;?>" class='btn btn-link ajaxCollect'><i class='icon <?php echo $star;?>'></i></a>
               <?php common::printLink('doc', 'editLib', "libID=$lib->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link iframe'")?>
               <?php common::printLink('doc', 'deleteLib', "libID=$lib->id", "<i class='icon icon-close'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
-              <?php common::printLink('tree', 'browse', "rootID=$lib->id&type=doc", "<i class='icon icon-cog'></i>", '', "title='{$lang->tree->manage}' class='btn btn-link'")?>
+              <?php common::printLink('tree', 'browse', "rootID=$lib->id&type=doc", "<i class='icon icon-cog'></i>", '', "title='{$lang->tree->manageType}' class='btn btn-link'")?>
             </td>
             <?php endif;?>
           </tr>
diff --git a/module/doc/view/bookside.html.php b/module/doc/view/bookside.html.php
index e69de29bb2..4464ca81cf 100644
--- a/module/doc/view/bookside.html.php
+++ b/module/doc/view/bookside.html.php
@@ -0,0 +1 @@
+<?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 579f58cb43..99d8ba95d4 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -46,7 +46,7 @@ var browseType = '<?php echo $browseType;?>';
         </div>
         <nav class="panel-actions btn-toolbar">
           <div class="btn-group">
-            <?php echo html::a(helper::createLink('tree', 'browse', "libID=$libID&viewType=doc"), "<i class='icon icon-cog'></i>" . $lang->doc->manageType, '',"class='btn btn-printLink'");?>
+            <?php echo html::a(helper::createLink('tree', 'browse', "libID=$libID&viewType=doc"), "<i class='icon icon-cog'></i>" . $lang->doc->manageType, '',"class='btn btn-link'");?>
           </div>
         </nav>
       </div>
diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php
index dc36a5cd9b..34c767d697 100644
--- a/module/doc/view/browsebygrid.html.php
+++ b/module/doc/view/browsebygrid.html.php
@@ -7,8 +7,12 @@
         <div class="btn-group">
           <?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon'");?>
           <?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon text-primary'");?>
-          <?php echo html::a(helper::createLink('tree', 'browse', "libID=$libID&viewType=doc"), "<i class='icon icon-cog'></i>", '',"class='btn btn-icon'");?>
         </div>
+        <nav class="panel-actions btn-toolbar">
+          <div class="btn-group">
+            <?php echo html::a(helper::createLink('tree', 'browse', "libID=$libID&viewType=doc"), "<i class='icon icon-cog'></i>" . $lang->doc->manageType, '',"class='btn btn-link'");?>
+          </div>
+        </nav>
       </div>
     </div>
     <?php if(empty($docs) and empty($modules) and empty($libs) and empty($attachLibs)):?>
diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php
index 5fc74d44ef..66544928ec 100644
--- a/module/doc/view/side.html.php
+++ b/module/doc/view/side.html.php
@@ -110,30 +110,32 @@ if(!isset($type)) $type = 'product';
           </li>
           <?php endforeach;?>
           <?php else:?>
+
           <?php foreach($sideLibs[$tabValue] as $sideLibID => $sideLibName):?>
-          <?php
-          $activeClass = ($this->methodName == 'objectlibs' && $type == $tabValue && $object->id == $sideLibID) ? 'active' : '';
-          $activeClass = ($this->methodName == 'browse' && isset($currentLib->id) && $currentLib->id == $sideLibID) ? 'active' : $activeClass;
-          ?>
-          <li <?php echo "class='$activeClass'";?>>
-            <?php echo html::a($this->createLink('doc', 'browse', "libID=$sideLibID"), "<i class='icon icon-folder-o'></i> " . $sideLibName, '', "class='text-ellipsis' title='{$sideLibName}'");?>
             <?php if($tabValue == 'book'):?>
             <?php include './bookside.html.php';?>
             <?php else:?>
-            <?php if(isset($allModules[$sideLibID])):?>
-            <ul>
-              <?php foreach($allModules[$sideLibID] as $module):?>
-              <?php if($module->parent != 0) continue;?>
-              <li <?php if($this->methodName == 'browse' && $browseType == 'bymodule' && $moduleID == $module->id) echo "class='active'";?>>
-                <?php echo html::a($this->createLink('doc', 'browse', "libID=$sideLibID&browseType=byModule&param={$module->id}"), "<i class='icon icon-folder-outline'></i> " . $module->name, '', "class='text-ellipsis' title='{$module->name}'");?>
-                <?php $this->doc->printChildModule($module, $sideLibID, $this->methodName, $browseType, $moduleID);?>
-              </li>
-              <?php endforeach;?>
-            </ul>
+            <?php
+            $activeClass = ($this->methodName == 'objectlibs' && $type == $tabValue && $object->id == $sideLibID) ? 'active' : '';
+            $activeClass = ($this->methodName == 'browse' && isset($currentLib->id) && $currentLib->id == $sideLibID) ? 'active' : $activeClass;
+            ?>
+            <li <?php echo "class='$activeClass'";?>>
+              <?php echo html::a($this->createLink('doc', 'browse', "libID=$sideLibID"), "<i class='icon icon-folder-o'></i> " . $sideLibName, '', "class='text-ellipsis' title='{$sideLibName}'");?>
+              <?php if(isset($allModules[$sideLibID])):?>
+              <ul>
+                <?php foreach($allModules[$sideLibID] as $module):?>
+                <?php if($module->parent != 0) continue;?>
+                <li <?php if($this->methodName == 'browse' && $browseType == 'bymodule' && $moduleID == $module->id) echo "class='active'";?>>
+                  <?php echo html::a($this->createLink('doc', 'browse', "libID=$sideLibID&browseType=byModule&param={$module->id}"), "<i class='icon icon-folder-outline'></i> " . $module->name, '', "class='text-ellipsis' title='{$module->name}'");?>
+                  <?php $this->doc->printChildModule($module, $sideLibID, $this->methodName, $browseType, $moduleID);?>
+                </li>
+                <?php endforeach;?>
+              </ul>
+              <?php endif;?>
+            </li>
             <?php endif;?>
-            <?php endif;?>
-          </li>
           <?php endforeach;?>
+
           <?php endif;?>
         </ul>
       </div>
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index a8ff8c85ea..1990e93e77 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -72,13 +72,13 @@ $lang->todo->statusList['closed'] = 'Closed';
 //$lang->todo->statusList['postpone'] = 'Delayed';
 
 $lang->todo->priList[3] = 'Normal';
-$lang->todo->priList[1] = 'Highest';
-$lang->todo->priList[2] = 'High';
+$lang->todo->priList[1] = 'Critical';
+$lang->todo->priList[2] = 'Important';
 $lang->todo->priList[4] = 'Low';
 $lang->todo->priList[0] = '';
 
 $lang->todo->typeList['custom'] = 'Custom';
-$lang->todo->typeList['cycle']  = 'Recurrence';
+$lang->todo->typeList['cycle']  = 'Recur';
 $lang->todo->typeList['bug']    = 'Bug';
 $lang->todo->typeList['task']   = $lang->projectCommon . 'Task';
 $lang->todo->typeList['story']  = $lang->projectCommon . 'Story';