diff --git a/module/doc/control.php b/module/doc/control.php
index 8a6655c293..6329b9bdbd 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -537,56 +537,6 @@ class doc extends control
         }
     }
 
-    /**
-     * Ajax get drop menu.
-     * 
-     * @param  int    $productID 
-     * @param  string $module 
-     * @param  string $method 
-     * @param  string $extra 
-     * @access public
-     * @return void
-     */
-    public function ajaxGetDropMenu($libID, $module, $method, $extra)
-    {
-        $this->view->link   = $this->doc->getDocLink($module, $method, $extra);
-        $this->view->libID  = $libID;
-        $this->view->module = $module;
-        $this->view->method = $method;
-        $this->view->extra  = $extra;
-        $this->view->libs   = $this->doc->getLibs($extra);
-
-        $this->display();
-    }
-
-    /**
-     * The results page of search.
-     * 
-     * @param  string  $keywords 
-     * @param  string  $module 
-     * @param  string  $method 
-     * @param  mix     $extra 
-     * @access public
-     * @return void
-     */
-    public function ajaxGetMatchedItems($keywords, $module, $method, $extra)
-    {
-        $libs = $this->dao->select('*')->from(TABLE_DOCLIB)->where('deleted')->eq(0)
-            ->andWhere('name')->like("%$keywords%")
-            ->beginIF($extra == 'product' or $extra == 'project')->andWhere($extra)->ne(0)->fi()
-            ->orderBy('`id` desc')
-            ->fetchAll();
-        foreach($libs as $key => $lib)
-        {
-            if(!$this->doc->checkPriv($lib)) unset($libs[$key]);
-        }
-
-        $this->view->link     = $this->doc->getDocLink($module, $method, $extra);
-        $this->view->libs     = $libs;
-        $this->view->keywords = $keywords;
-        $this->display();
-    }
-
     /**
      * Ajax get modules by libID.
      * 
@@ -658,39 +608,40 @@ class doc extends control
      * Show all libs by type.
      * 
      * @param  string $type 
-     * @param  string $extra 
+     * @param  string $product 
      * @param  int    $recTotal 
      * @param  int    $recPerPage 
      * @param  int    $pageID 
      * @access public
      * @return void
      */
-    public function allLibs($type, $extra = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function allLibs($type, $product = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $libName = isset($this->lang->doc->systemLibs[$type]) ? $this->lang->doc->systemLibs[$type] : $this->lang->doc->custom;
-        $this->doc->setMenu(array($this->lang->doclib->select), 0);
+        if($product)
+        {
+            $this->view->product = $this->product->getById($product);
+            $libName = $this->view->product->name;
+        }
 
         $this->view->title      = $libName;
         $this->view->position[] = $libName;
 
+        $this->doc->setMenu(array($product ? $libName : $this->lang->doclib->select), 0);
+
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
-        $libs    = $this->doc->getAllLibsByType($type, $pager, $extra);
+        $libs    = $this->doc->getAllLibsByType($type, $pager, $product);
         $subLibs = array();
         if($type == 'product' or $type == 'project') $subLibs = $this->doc->getSubLibGroups($type, array_keys($libs));
-        if($extra)
-        {
-            parse_str($extra);
-            if(isset($product)) $this->view->product = $this->product->getById($product);
-        }
 
         $this->view->type    = $type;
         $this->view->libs    = $libs;
         $this->view->subLibs = $subLibs;
         $this->view->pager   = $pager;
-        $this->view->extra   = $extra;
+        $this->view->product = $product;
         $this->display();
     }
 
@@ -709,6 +660,9 @@ class doc extends control
         $this->app->session->set('storyList', $uri);
         $this->app->session->set('docList',   $uri);
 
+        $table  = $type == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
+        $object = $this->dao->select('id,name')->from($table)->where('id')->eq($objectID)->fetch();
+
         /* According the from, set menus. */
         if($this->from == 'product')
         {
@@ -726,16 +680,13 @@ class doc extends control
         }
         else
         {
-            $this->doc->setMenu(array($this->lang->doclib->files), 0);
+            $this->doc->setMenu(array($object->name), 0);
         }
 
         /* 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->view->title      = $object->name;
         $this->view->position[] = $object->name;
 
diff --git a/module/doc/css/common.css b/module/doc/css/common.css
index 9fb075a4b1..bc8e8e1ecc 100644
--- a/module/doc/css/common.css
+++ b/module/doc/css/common.css
@@ -1,9 +1,9 @@
 .libs-group-heading {color: #808080; border-bottom:1px solid #ddd; padding:8px;}
-.libs-group-heading a{overflow: hidden; white-space: nowrap;}
+.libs-group-heading a{overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
 .libs-group{padding:10px 10px 10px 10px;}
 .lib {float: left; display: block; width:80px; padding: 5px; margin:0px 3px; text-align: center; color: #333; overflow: hidden; text-overflow: ellipsis;}
 .lib .file-icon{margin-bottom:5px;}
-.lib .lib-name{overflow: hidden; white-space: nowrap;}
+.lib .lib-name{overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
 .lib:hover, .lib:focus, .lib:active {border-color: #2e6dad; background-color: #EBF2F9; color: #2e6dad}
 .w-lib-p100{width:100%;}
 .w-lib-p50{width:47%;}
@@ -27,13 +27,13 @@
 .lib-menu-list-heading:hover {border-color: #114f8e; cursor: pointer; color: #114f8e;}
 .lib-menu-list-heading > .icon {display: none}
 .lib-menu-list {max-height: 500px; overflow-y: auto; min-height: 100px;}
-.list-menu-item-heading {padding: 0 10px; font-weight: bold; color: #a1a1a1; float: left; width: 100%;}
+.list-menu-item-heading {padding: 0 10px; font-weight: bold; color: #141414; white-space: nowrap; text-overflow: ellipsis; overflow:hidden; float: left; max-width:50%}
 .list-menu-item-heading > .icon {display: inline-block; width: 18px;}
-.list-menu-item + .list-menu-item-heading {border-top: 1px dotted #ddd;}
-.list-menu-item {padding: 0 8px 0 10px; display: block; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 100%; float: left; width: 100%}
+.list-menu-item {padding: 0 8px 0 10px; display: block; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; float: left}
 .list-menu-item.current {background-color: #EBF2F9;}
 .list-menu-item.active,
 .list-menu-item:hover {background-color: #e5e5e5; color: #1a53ff}
+.list-menu-item-footer {clear:left; border-top: 1px dotted #ddd;}
 #searchLib {padding: 2px 8px; height: 28px; max-width: 190px;}
 
 #dropMenu[data-filter] #libMenuGroups {table-layout: auto;}
@@ -57,42 +57,42 @@
 @media (min-width: 880px)
 {
     #dropMenu {min-width: 850px;}
-    .lib-menu-lg .lib-list-bg .list-menu-item {width: 50%;}
-    #dropMenu.lib-menu-lg[data-filter] .list-menu-item {width: 25%;}
+    .lib-menu-lg .lib-list-bg .list-menu-item {max-width: 50%;}
+    #dropMenu.lib-menu-lg[data-filter] .list-menu-item {max-width: 25%;}
 }
 @media (min-width: 1000px)
 {
     #dropMenu {min-width: 960px;}
-    #dropMenu .lib-list-bg .list-menu-item {width: 50%;}
-    #dropMenu.lib-menu-lg[data-filter] .list-menu-item {width: 20%;}
+    #dropMenu .lib-list-bg .list-menu-item {max-width: 50%;}
+    #dropMenu.lib-menu-lg[data-filter] .list-menu-item {max-width: 20%;}
 }
 @media (min-width: 1120px)
 {
     #dropMenu {min-width: 1080px;}
-    #dropMenu .list-menu-item {width: 50%;}
-    #dropMenu .lib-list-bg .list-menu-item {width: 33.33333333%;}
-    #dropMenu.lib-menu-lg[data-filter] .list-menu-item {width: 16.666667%;}
+    #dropMenu .list-menu-item {max-width: 50%;}
+    #dropMenu .lib-list-bg .list-menu-item {max-width: 33.33333333%;}
+    #dropMenu.lib-menu-lg[data-filter] .list-menu-item {max-width: 16.666667%;}
 }
 @media (min-width: 1240px)
 {
     #dropMenu {min-width: 1200px;}
-    #dropMenu.lib-menu-lg[data-filter] .list-menu-item {width: 12.5%;}
+    #dropMenu.lib-menu-lg[data-filter] .list-menu-item {max-width: 12.5%;}
 }
 @media (min-width: 1360px)
 {
     #dropMenu {min-width: 1320px;}
-    #dropMenu .lib-list-bg .list-menu-item {width: 25%;}
-    #dropMenu.lib-menu-lg[data-filter] .list-menu-item {width: 10%;}
+    #dropMenu .lib-list-bg .list-menu-item {max-width: 25%;}
+    #dropMenu.lib-menu-lg[data-filter] .list-menu-item {max-width: 10%;}
 }
 @media (min-width: 1480px)
 {
     #dropMenu {min-width: 1340px;}
-    #dropMenu .list-menu-item {width: 33.3333333%;}
-    #dropMenu .lib-list-bg .list-menu-item {width: 20%;}
+    #dropMenu .list-menu-item {max-width: 33.3333333%;}
+    #dropMenu .lib-list-bg .list-menu-item {max-width: 20%;}
 }
 @media (min-width: 1600px)
 {
     #dropMenu {min-width: 1460px;}
-    #dropMenu .list-menu-item {width: 25%;}
-    #dropMenu.lib-menu-lg[data-filter] .list-menu-item {width: 8.333333%;}
+    #dropMenu .list-menu-item {max-width: 25%;}
+    #dropMenu.lib-menu-lg[data-filter] .list-menu-item {max-width: 8.333333%;}
 }
diff --git a/module/doc/css/index.css b/module/doc/css/index.css
index 3c30337744..89bc233945 100644
--- a/module/doc/css/index.css
+++ b/module/doc/css/index.css
@@ -4,7 +4,8 @@
 #libs .libs-group{border:1px solid #ddd; border-top:0px; margin-bottom:20px;}
 #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:center; height:120px; line-height:110px;}
+#libs .libs-custom-heading{text-align:center; height:120px; line-height:110px; position: relative;}
 #libs .libs-custom-heading:hover{background-color: #EBF2F9}
 #libs .libs-custom-heading a{display:block;height:100%;}
+#libs .libs-custom-heading .lable-custom{position: absolute;left:8px;}
 #libs hr {margin-top:0px;}
diff --git a/module/doc/js/common.js b/module/doc/js/common.js
index c01f81b762..caf24dafe3 100644
--- a/module/doc/js/common.js
+++ b/module/doc/js/common.js
@@ -21,22 +21,24 @@ function showLibMenu()
             var productCount = 0, projectCount = 0, customCount = 0;
             $.each(data.product, function(idx, product)
             {
-                $list.append('<div class="list-menu-item-heading" data-product="' + product.id + '"><i class="icon icon-cube"></i>' + product.name + '</div>');
+                $list.append('<div class="list-menu-item-heading" data-product="' + product.id + '">' + product.name + '</div>');
                 $.each(product.libs, function(libId, libName)
                 {
                     var url = libId === 'files' ? createLink('doc', 'showFiles', 'type=product&objectID=' + product.id) : createLink('doc', 'browse', 'libID=' + libId);
+                    var url = libId === 'project' ? createLink('doc', 'allLibs', 'type=project&extra=' + product.id) : url;
                     var itemId = 'lib-' + itemIdSeed++;
                     $list.append('<a data-order="' + (orderSeed++) + '" title="' + product.name + '/' + libName + '" id="' + itemId + '" href="' + url + '" class="list-menu-item" data-type="product" data-product="' + product.id + '" data-id="' + libId + '">' + libName + '</a>');
                     items[itemId] = {type: 'product', id: libId, name: libName, objectId: product.id, product: product.name, search: (libName + ' ' + product.name).toLowerCase()};
                     productCount++;
                 });
+                $list.append('<div class="list-menu-item-footer" data-product="' + product.id + '"></div>');
             });
             $list.toggleClass('lib-list-bg', productCount > 4);
 
             $list = $('#libMenuProjectGroup > .lib-menu-list');
             $.each(data.project, function(idx, project)
             {
-                $list.append('<div class="list-menu-item-heading" data-product="' + project.id + '"><i class="icon icon-folder-close-alt"></i>' + project.name + '</div>');
+                $list.append('<div class="list-menu-item-heading" data-project="' + project.id + '">' + project.name + '</div>');
                 $.each(project.libs, function(libId, libName)
                 {
                     var url = libId === 'files' ? createLink('doc', 'showFiles', 'type=project&objectID=' + project.id) : createLink('doc', 'browse', 'libID=' + libId);
@@ -45,6 +47,7 @@ function showLibMenu()
                     items[itemId] = {type: 'project', id: libId, name: libName, objectId: project.id, project: project.name, search: (libName + ' ' + project.name).toLowerCase()};
                     projectCount++;
                 });
+                $list.append('<div class="list-menu-item-footer" data-project="' + project.id + '"></div>');
             });
             $list.toggleClass('lib-list-bg', projectCount > 4);
 
@@ -75,6 +78,7 @@ function showLibMenu()
                 if(searchKey)
                 {
                     var $menuHeadings = $menu.find('.list-menu-item-heading').addClass('hidden');
+                    var $menuFooters  = $menu.find('.list-menu-item-footer').addClass('hidden');
                     searchKey = searchKey.toLowerCase();
                     $.each(items, function(itemId, item)
                     {
@@ -83,12 +87,13 @@ function showLibMenu()
                         if(isMatch && item.type !== 'custom' && item.objectId)
                         {
                             $menuHeadings.filter('[data-' + item.type + '="' + item.objectId + '"]').removeClass('hidden');
+                            $menuFooters.filter('[data-' + item.type + '="' + item.objectId + '"]').removeClass('hidden');
                         }
                     });
                 }
                 else
                 {
-                    $menu.find('.list-menu-item.hidden,.list-menu-item-heading.hidden').removeClass('hidden');
+                    $menu.find('.list-menu-item.hidden,.list-menu-item-heading.hidden,.list-menu-item-footer.hidden').removeClass('hidden');
                 }
                 $menu.find('.list-menu-item:not(.hidden)').first().addClass('active');
             }).on('keydown', function(e)
diff --git a/module/doc/model.php b/module/doc/model.php
index 8cb5d50f12..a798361657 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -24,8 +24,6 @@ class docModel extends model
      */
     public function setMenu($libs, $libID = 0, $moduleID = 0)
     {
-        $currentModule = 'doc';
-        $currentMethod = 'browse';
         if($libID)
         {
             $lib = $this->getLibById($libID);
@@ -34,6 +32,14 @@ class docModel extends model
                 echo(js::alert($this->lang->doc->accessDenied));
                 die(js::locate('back'));
             }
+
+            if($lib->product or $lib->project)
+            {
+                $table    = $lib->product ? TABLE_PRODUCT : TABLE_PROJECT;
+                $objectID = $lib->product ? $lib->product : $lib->project;
+                $object   = $this->dao->select('id,name')->from($table)->where('id')->eq($objectID)->fetch();
+                if($object) $libs[$libID] = $object->name . ' / ' . $lib->name;
+            }
         }
 
         $selectHtml = "<a id='currentItem' data-lib-id='$libID' href=\"javascript:showLibMenu()\">{$libs[$libID]} <span class='icon-caret-down'></span></a><div id='dropMenu'><i class='icon icon-spin icon-spinner'></i><div id='libMenu'><div id='libMenuHeading'><input id='searchLib' type='search' placeholder='{$this->lang->doc->searchDoc}' class='form-control'></div><div id='libMenuGroups' class='clearfix'><div class='lib-menu-group' id='libMenuProductGroup'><div class='lib-menu-list-heading' data-type='product'>{$this->lang->doc->libTypeList['product']}<i class='icon icon-remove'></i></div><div class='lib-menu-list clearfix'></div></div><div class='lib-menu-group' id='libMenuProjectGroup'><div class='lib-menu-list-heading' data-type='project'>{$this->lang->doc->libTypeList['project']}<i class='icon icon-remove'></i></div><div class='lib-menu-list clearfix'></div></div><div class='lib-menu-group' id='libMenuCustomGroup'><div class='lib-menu-list-heading' data-type='custom'>{$this->lang->doc->libTypeList['custom']}<i class='icon icon-remove'></i></div><div class='lib-menu-list clearfix'></div></div></div></div></div>";
@@ -83,7 +89,6 @@ class docModel extends model
                 ->andWhere('t1.deleted')->eq(0)
                 ->orderBy("t2.order desc, t1.id")
                 ->query();
-            $objects = $this->dao->select('id,name')->from($table)->where('deleted')->eq('0')->fetchPairs('id', 'name');
         }
         else
         {
@@ -93,12 +98,7 @@ class docModel extends model
         $libPairs = array();
         while($lib = $stmt->fetch())
         {
-            if($this->checkPriv($lib))
-            {
-                $libName = $lib->name;
-                if(($type == 'product' or $type == 'project') and isset($objects[$lib->$type])) $libName = $objects[$lib->$type] . ' / ' . $libName;
-                $libPairs[$lib->id] = $libName;
-            }
+            if($this->checkPriv($lib)) $libPairs[$lib->id] = $lib->name;
         }
         return $libPairs;
     }
@@ -629,14 +629,9 @@ class docModel extends model
      * @access public
      * @return array
      */
-    public function getAllLibsByType($type, $pager = null, $extra = '')
+    public function getAllLibsByType($type, $pager = null, $product = '')
     {
-        if($extra)
-        {
-            parse_str($extra);
-            if(isset($product) and $type == 'project') $projects = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('product')->eq($product)->fetchPairs('project', 'project');
-
-        }
+        if($product and $type == 'project') $projects = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('product')->eq($product)->fetchPairs('project', 'project');
 
         $key = ($type == 'product' or $type == 'project') ? $type : 'id';
         $stmt = $this->dao->select("DISTINCT $key")->from(TABLE_DOCLIB)->where('deleted')->eq(0);
@@ -1145,7 +1140,7 @@ class docModel extends model
         if(empty($libID)) return '';
 
         $parents = $moduleID ? $this->loadModel('tree')->getParents($moduleID) : array();
-        $crumb   = html::a(helper::createLink('doc', 'browse', "libID=$libID&browseType=all&param=0&orderBy=id_desc"), '/');
+        $crumb   = html::a(helper::createLink('doc', 'browse', "libID=$libID&browseType=all&param=0&orderBy=id_desc"), 'ROOT');
         foreach($parents as $module) $crumb .= $this->lang->arrow . html::a(helper::createLink('doc', 'browse', "libID=$libID&browseType=byModule&param=$module->id&orderBy=id_desc"), $module->name);
         return $crumb;
     }
diff --git a/module/doc/view/alllibs.html.php b/module/doc/view/alllibs.html.php
index 854bf7ce41..f89de48e48 100644
--- a/module/doc/view/alllibs.html.php
+++ b/module/doc/view/alllibs.html.php
@@ -36,7 +36,7 @@
         ?>
         <?php foreach($subLibs[$lib->id] as $subLibID => $subLibName):?>
         <?php
-        if($subLibID == 'project')   $libLink = inlink('allLibs', "type=project&extra=product=$lib->id");
+        if($subLibID == 'project')   $libLink = inlink('allLibs', "type=project&product=$lib->id");
         elseif($subLibID == 'files') $libLink = inlink('showFiles', "type=$type&objectID=$lib->id");
         else                         $libLink = inlink('browse', "libID=$subLibID");
         ?>
diff --git a/module/doc/view/browsebymenu.html.php b/module/doc/view/browsebymenu.html.php
index e75dce688b..40521d84cc 100644
--- a/module/doc/view/browsebymenu.html.php
+++ b/module/doc/view/browsebymenu.html.php
@@ -14,7 +14,7 @@
 #filesPanel .file > a {display: block}
 #filesPanel .file-icon {height: 60px; text-align: center; line-height: 60px; opacity: .7; margin-bottom:5px;}
 #filesPanel .file:hover .file-icon {opacity: 1}
-#filesPanel .file-name {text-align: center; overflow: hidden; white-space:nowrap;}
+#filesPanel .file-name {text-align: center; overflow: hidden; white-space:nowrap; text-overflow: ellipsis;}
 #filesPanel .file.create {height:88px; border:1px dashed #ddd; width:75px;}
 #filesPanel .file.create .addbtn{display:block;margin-top:22px;padding-top:10px;}
 #filesPanel .file.create .file-icon {height:100%; opacity: 0.5; color:#ddd;}
diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php
index b7e99ec4f0..91b28aae92 100644
--- a/module/doc/view/index.html.php
+++ b/module/doc/view/index.html.php
@@ -55,7 +55,7 @@
             ?>
             <?php foreach($subLibs['product'][$product->id] as $libID => $libName):?>
             <?php
-            if($libID == 'project')   $libLink = inlink('allLibs', "type=project&extra=product=$product->id");
+            if($libID == 'project')   $libLink = inlink('allLibs', "type=project&product=$product->id");
             elseif($libID == 'files') $libLink = inlink('showFiles', "type=product&objectID=$product->id");
             else                      $libLink = inlink('browse', "libID=$libID");
             ?>
@@ -127,7 +127,7 @@
     </div>
     <hr />
     <?php else:?>
-      <div class='clearfix'>
+      <div class='row clearfix'>
       <?php
       $objectNum   = 1;
       $objectCount = count($libs);
@@ -144,8 +144,8 @@
         <div class='col-md-3'>
           <div class='libs-group-heading libs-custom-heading'>
             <?php
-            $label = $objectNum == 1 ? "<span class='label label-info'>{$lang->doc->customAB}</span> " : '';
-            echo html::a(inlink('browse', "libID=$libID"), $label . $libName, '', "title='{$libName}'")
+            if($objectNum == 1) echo "<span class='label label-info lable-custom'>{$lang->doc->customAB}</span> ";
+            echo html::a(inlink('browse', "libID=$libID"), $libName, '', "title='{$libName}'")
             ?>
           </div>
         </div>