diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php
index a543d98780..6cfeb4e519 100644
--- a/module/admin/view/safe.html.php
+++ b/module/admin/view/safe.html.php
@@ -48,7 +48,10 @@
         </tr>
         <tr>
           <th></th>
-          <td colspan='2'><?php echo html::submitButton();?></td>
+          <td colspan='2'>
+            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
+          </td>
         </tr>
       </table>
     </form>
diff --git a/module/admin/view/sso.html.php b/module/admin/view/sso.html.php
index da941688b4..c1d63908e6 100644
--- a/module/admin/view/sso.html.php
+++ b/module/admin/view/sso.html.php
@@ -41,9 +41,10 @@
           <td><?php echo html::input('key', $key, "class='form-control' autocomplete='off'");?></td>
         </tr>
         <tr>
-           <td colspan='2' class='text-center'>
-             <?php echo html::submitButton(); ?>
-           </td>
+          <td colspan='2' class='text-center'>
+            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::backButton('', '', 'btn btn-wide');?>
+          </td>
          </tr>
       </table>
     </form>
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index f31f2a75aa..4731e73e0b 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -304,10 +304,7 @@ $lang->caselib->menu->caselib   = array('link' => '用例库|testsuite|library',
 /* 文档视图菜单设置。*/
 $lang->doc = new stdclass();
 $lang->doc->menu = new stdclass();
-
-//$lang->doc->menu->list   = array('link' => '%s', 'fixed' => true);
-//$lang->doc->menu->crumb  = array('link' => '%s', 'fixed' => true);
-//$lang->doc->menu->create = array('link' => '<i class="icon-plus"></i>&nbsp;添加文档库|doc|createLib', 'float' => 'right');
+//$lang->doc->menu->createLib = array('link' => '<i class="icon icon-folder-plus"></i>&nbsp;添加文件夹|doc|createLib', 'float' => 'right');
 
 /* 统计视图菜单设置。*/
 $lang->report = new stdclass();
diff --git a/module/doc/control.php b/module/doc/control.php
index 1b0874c19a..e0a3148b46 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -37,6 +37,8 @@ class doc extends control
      */
     public function index()
     {
+        $this->doc->setMenu();
+
         $products   = $this->doc->getLimitLibs('product');
         $projects   = $this->doc->getLimitLibs('project');
         $customLibs = $this->doc->getLimitLibs('custom');
@@ -90,20 +92,22 @@ class doc extends control
         $queryID    = ($browseType == 'bysearch') ? (int)$param : 0;
         $moduleID   = ($browseType == 'bymodule' or $browseType == 'bymenu') ? (int)$param : 0;
 
-        $type = 'custom';
+        $type = '';
+        $productID = 0;
+        $projectID = 0;
         if($libID)
         {
-            $lib = $this->doc->getLibByID($libID);
-            if($lib->product or $lib->project) $type = $lib->product ? 'product' : 'project';
+            $type = 'custom';
+            $lib  = $this->doc->getLibByID($libID);
+            if($lib->product or $lib->project)
+            {
+                $type = $lib->product ? 'product' : 'project';
+                $productID = $lib->product; 
+                $projectID = $lib->project; 
+            }
         }
-        if(empty($libID)) $type = 'product';
 
         $this->libs = $this->doc->getLibs($type);
-        if(empty($libID))
-        {
-            $libID = key($this->libs);
-            $lib = $this->dao->select('*')->from(TABLE_DOCLIB)->where('id')->eq($libID)->orderBy('id')->fetch();
-        }
 
         /* According the from, set menus. */
         if($from == 'product')
@@ -122,20 +126,21 @@ class doc extends control
         }
         else
         {
-            $this->doc->setMenu($libID, $moduleID);
+            $menuType = (!$type && in_array($browseType, array_keys($this->lang->doc->fastMenuList))) ? $browseType : $type;
+            $this->doc->setMenu($menuType, $libID, $moduleID, $productID, $projectID);
         }
         $this->session->set('docList',   $this->app->getURI(true));
 
         /* Set header and position. */
-        $this->view->title      = $this->lang->doc->common . $this->lang->colon . $this->libs[$libID];
-        $this->view->position[] = $this->libs[$libID];
+        $this->view->title      = $this->lang->doc->common . ($libID ? $this->lang->colon . $this->libs[$libID] : '');
+        $this->view->position[] = $libID ? $this->libs[$libID] : '';
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
         /* Append id for secend sort. */
-        if($browseType == 'bymenu' and strpos('editeddate_desc,addeddate_desc,visiteddate_desc', strtolower($orderBy)) === false) $orderBy = 'title_asc';
+        if($browseType == 'bymenu' and strpos('editeddate_desc,addeddate_desc', strtolower($orderBy)) === false) $orderBy = 'title_asc';
         $sort = $this->loadModel('common')->appendOrder($orderBy);
 
         /* Get docs by browse type. */
@@ -166,7 +171,7 @@ class doc extends control
         }
 
         $this->view->libID         = $libID;
-        $this->view->libName       = $this->libs[$libID];
+        $this->view->libName       = $libID ? $this->libs[$libID] : '';
         $this->view->moduleID      = $moduleID;
         $this->view->docs          = $docs;
         $this->view->pager         = $pager;
@@ -308,8 +313,8 @@ class doc extends control
             die(js::locate($link, 'parent'));
         }
 
-        $lib        = $this->doc->getLibByID($libID);
-        $type       = $lib->product ? 'product' : ($lib->project ? 'project' : 'custom');
+        $lib  = $this->doc->getLibByID($libID);
+        $type = $lib->product ? 'product' : ($lib->project ? 'project' : 'custom');
 
         /* According the from, set menus. */
         if($this->from == 'product')
@@ -328,7 +333,7 @@ class doc extends control
         }
         else
         {
-            $this->doc->setMenu($libID, $moduleID);
+            $this->doc->setMenu($type, $libID, $moduleID, $lib->product, $lib->project);
         }
 
         $this->view->title      = $lib->name . $this->lang->colon . $this->lang->doc->create;
@@ -382,7 +387,7 @@ class doc extends control
 
         $lib        = $this->doc->getLibByID($libID);
         $type       = $lib->product ? 'product' : ($lib->project ? 'project' : 'custom');
-        $this->doc->setMenu($libID, $doc->module);
+        $this->doc->setMenu($type, $libID, $doc->module, $lib->product, $lib->project);
 
         $this->view->title      = $lib->name . $this->lang->colon . $this->lang->doc->edit;
         $this->view->position[] = html::a($this->createLink('doc', 'browse', "libID=$libID"), $lib->name);
@@ -421,7 +426,7 @@ class doc extends control
         $type = $lib->product ? 'product' : ($lib->project ? 'project' : 'custom');
 
         /* Set menu. */
-        $this->doc->setMenu($doc->lib, $doc->module);
+        $this->doc->setMenu($type, $doc->lib, $doc->module, $lib->product, $lib->project);
 
         /* Update visitedDate and views for current doc.*/
         $this->doc->updateVisitData($docID);
@@ -527,6 +532,7 @@ class doc extends control
         if(empty($customMenus))
         {
             if($type == 'remove') die(js::reload('parent'));
+            $customMenus = array();
             $i = 0;
             foreach($this->lang->doc->menu as $name => $item)
             {
@@ -539,6 +545,7 @@ class doc extends control
             }
         }
 
+        $customMenus = (array)$customMenus;
         foreach($customMenus as $i => $customMenu)
         {
             if(isset($customMenu->name) and $customMenu->name == "custom{$libID}") unset($customMenus[$i]);
@@ -587,7 +594,7 @@ class doc extends control
         $this->view->title      = $libName;
         $this->view->position[] = $libName;
 
-        $this->doc->setMenu($libID = 0, $moduleID = 0, $crumb);
+        $this->doc->setMenu($type, $libID = 0, $moduleID = 0, $productID = 0, $projectID = 0, $crumb);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -648,19 +655,23 @@ class doc extends control
             $crumb .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID"), $object->name);
             $crumb .= $this->lang->doc->separator . ' ' . $this->lang->doclib->files;
 
+            $productID = 0;
+            $projectID = 0;
             if($type == 'product')
             {
+                $productID = $objectID;
                 $lib = $this->product->getById($objectID);
                 if(!$this->product->checkPriv($lib)) $this->accessDenied();
             }
 
             if($type == 'project')
             {
+                $projectID = $objectID;
                 $lib = $this->project->getById($objectID);
                 if(!$this->project->checkPriv($lib)) $this->accessDenied();
             }
 
-            $this->doc->setMenu($libID = 0, $moduleID = 0, $crumb);
+            $this->doc->setMenu($type, $libID = 0, $moduleID = 0, $productID, $projectID, $crumb);
         }
 
         /* Load pager. */
@@ -734,7 +745,9 @@ class doc extends control
             $crumb  = html::a(inlink('allLibs', "type=$type"), $type == 'product' ? $this->lang->productCommon : $this->lang->projectCommon) . $this->lang->doc->separator;
             if($this->productID and $type == 'project') $crumb = $this->doc->getProductCrumb($this->productID, $objectID);
             $crumb .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID"), $object->name);
-            $this->doc->setMenu($libID = 0, $moduleID = 0, $crumb);
+            $productID = $type == 'product' ? $objectID : 0;
+            $projectID = $type == 'project' ? $objectID : 0;
+            $this->doc->setMenu($type, $libID = 0, $moduleID = 0, $productID, $projectID, $crumb);
         }
 
         $this->view->title      = $object->name;
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index 08cd519fd3..f5cc00cb29 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -58,7 +58,7 @@ $lang->doc->myDoc          = '我的文档';
 $lang->doc->myCollection   = '我的收藏';
 
 /* 方法列表。*/
-$lang->doc->index          = '首页';
+$lang->doc->index          = '文档主页';
 $lang->doc->create         = '创建文档';
 $lang->doc->edit           = '编辑文档';
 $lang->doc->delete         = '删除文档';
@@ -119,12 +119,12 @@ $lang->doc->browseTypeList['menu'] = '目录';
 $lang->doc->browseTypeList['tree'] = '树状图';
 $lang->doc->browseTypeList['card'] = '卡片';
 
-$lang->doc->fastMenuList['editeddate']    = '最近更新';
+$lang->doc->fastMenuList['byediteddate']  = '最近更新';
 $lang->doc->fastMenuList['visiteddate']   = '最近访问';
 $lang->doc->fastMenuList['openedbyme']    = '我的文档';
 $lang->doc->fastMenuList['collectedbyme'] = '我的收藏';
 
-$lang->doc->fastMenuIconList['editeddate']    = 'icon-folder-upload';
+$lang->doc->fastMenuIconList['byediteddate']  = 'icon-folder-upload';
 $lang->doc->fastMenuIconList['visiteddate']   = 'icon-folder-move';
 $lang->doc->fastMenuIconList['openedbyme']    = 'icon-folder-account';
 $lang->doc->fastMenuIconList['collectedbyme'] = 'icon-folder-star';
diff --git a/module/doc/model.php b/module/doc/model.php
index 8029ca21bd..ad5329e3bc 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -22,60 +22,162 @@ class docModel extends model
      * @access public
      * @return void
      */
-    public function setMenu($libID = 0, $moduleID = 0, $crumb = '')
+    public function setMenu($type = '', $libID = 0, $moduleID = 0, $productID = 0, $projectID = 0, $crumb = '')
     {
-        $customMenuKey = $this->config->global->flow . '_doc';
-        if(isset($this->config->customMenu->{$customMenuKey}))
+        $selectHtml  = "<div class='btn-group angle-btn'>";
+        $selectHtml .= html::a(helper::createLink('doc', 'index'), $this->lang->doc->index, '', "class='btn'");
+        $selectHtml .= '</div>';
+
+        if($type)
         {
-            $customMenu = json_decode($this->config->customMenu->{$customMenuKey}, true);
-            $menuLibIdList = array();
-            foreach($customMenu as $i => $menu)
+            $mainLib = in_array($type, array_keys($this->lang->doc->fastMenuList)) ? $this->lang->doc->fastMenuList[$type] : '';
+
+            if($libID)
             {
-                if(strpos($menu['name'], 'custom') === 0)
+                $lib = $this->getLibById($libID);
+                if($this->checkPriv($lib))
                 {
-                    $menuLibID = (int)substr($menu['name'], 6);
-                    if($menuLibID) $menuLibIdList[$i] = $menuLibID;
+                    $type = $lib->product ? 'product' : 'custom';
+                    $type = $lib->project ? 'project' : $type;
                 }
             }
 
-            $productIdList = array();
-            $projectIdList = array();
-            if($menuLibIdList)
+            $mainLib = $type == 'custom' ? $this->lang->doc->customAB : $mainLib;
+            $mainLib = $type == 'product' ? $this->lang->productCommon : $mainLib;
+            $mainLib = $type == 'project' ? $this->lang->projectCommon : $mainLib;
+
+            $selectHtml .= "<div class='btn-group angle-btn'>";
+            $selectHtml .= "<div class='btn-group'>";
+            $selectHtml .= "<a data-toggle='dropdown' class='btn'>" . $mainLib . " <span class='caret'></span></a>";
+            $selectHtml .= "<ul class='dropdown-menu'>";
+            foreach($this->lang->doc->fastMenuList as $key => $fastMenu)
             {
-                $libs = $this->dao->select('id,name,product,project')->from(TABLE_DOCLIB)->where('id')->in($menuLibIdList)->fetchAll('id');
-                foreach($libs as $lib)
+                if($key == 'editedDate' or $key == 'visitedDate')
                 {
-                    if($lib->product) $productIdList[] = $lib->product;
-                    if($lib->project) $projectIdList[] = $lib->project;
+                    $link = helper::createLink('doc', 'browse', "libID=0&browseTyp=bymenu&module=0&orderBy={$key}_desc");
                 }
+                else
+                {
+                    $link = helper::createLink('doc', 'browse', "libID=0&browseTyp={$key}");
+                }
+                $selectHtml .= '<li>' . html::a($link, "<i class='icon {$this->lang->doc->fastMenuIconList[$key]}'></i> {$fastMenu}") . '</li>';
             }
-            $products = $productIdList ? $this->dao->select('id,name')->from(TABLE_PRODUCT)->where('id')->in($productIdList)->fetchPairs('id', 'name') : array();
-            $projects = $projectIdList ? $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->in($projectIdList)->fetchPairs('id', 'name') : array();
-            foreach($menuLibIdList as $i => $menuLibID)
+            $selectHtml .= "<li class='divider'></li>";
+            $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>';
+            $selectHtml .='</ul></div></div>';
+
+            if(strpos('product,project,custom', $type) !== false)
             {
-                $lib = $libs[$menuLibID];
-                $libName = '';
-                if($lib->product) $libName = isset($products[$lib->product]) ? '[' . $products[$lib->product] . ']' : '';
-                if($lib->project) $libName = isset($projects[$lib->project]) ? '[' . $projects[$lib->project] . ']' : '';
-                $libName .= $lib->name;
-                $customMenu[$i]['link'] = "{$libName}|doc|browse|libID={$menuLibID}";
+                $allLibGroups = $this->getAllLibGroups();
+                $currentGroups = $allLibGroups[$type];
+
+                if($type == 'custom')  $currentLib = $libID ? $libID : key($currentGroups);
+                if($type == 'product') $currentLib = $productID ? $productID : key($currentGroups);
+                if($type == 'project') $currentLib = $projectID ? $projectID : key($currentGroups);
+
+                $selectHtml .= "<div class='btn-group angle-btn'>";
+                $selectHtml .= "<div class='btn-group'>";
+                $selectHtml .= '<a data-toggle="dropdown" class="btn">' . (is_array($currentGroups[$currentLib]) ? $currentGroups[$currentLib]['name'] : $currentGroups[$currentLib]) . ' <span class="caret"></span></a>';
+                $selectHtml .='<ul class="dropdown-menu">';
+                if($type == 'custom')
+                {
+                    foreach($currentGroups as $groupID => $groupName)
+                    {
+                        if($type == 'custom')
+                        {
+                            $link = helper::createLink('doc', 'browse', "libID=$groupID");
+                            $icon = 'icon-folder-o';
+                        }
+                        elseif($type == 'product')
+                        {
+                            $link = helper::createLink('doc', 'objectLibs', "type=product&objectID=$groupID");
+                            $icon = 'icon-cube';
+                        }
+                        else
+                        {
+                            $link = helper::createLink('doc', 'objectLibs', "type=project&objectID=$groupID");
+                            $icon = 'icon-stack';
+                        }
+
+                        $active = $currentLib == $groupID ? "class='active'" : '';
+                        $selectHtml .= "<li $active>" . html::a(helper::createLink('doc', 'browse', "libID=$groupID"), "<i class='icon icon-folder-o'></i> {$groupName}") . '</li>';
+                    }
+                }
+                else
+                {
+                    foreach($currentGroups as $groupID => $libGroups)
+                    {
+                        $link = helper::createLink('doc', 'objectLibs', "type=$type&objectID=$groupID");
+                        $icon = $type == 'product' ? 'icon-cube' : 'icon-stack';
+
+                        $active = $currentLib == $groupID ? "class='active'" : '';
+                        $selectHtml .= "<li $active>" . html::a($link, "<i class='icon {$icon}'></i> {$libGroups['name']}") . '</li>';
+                    }
+                }
+                $selectHtml .= '</ul></div></div>';
             }
-            $this->config->customMenu->{$customMenuKey} = json_encode($customMenu);
+
+            $actions = '';
+            $customMenuKey = $this->config->global->flow . '_doc';
+            if(isset($this->config->customMenu->{$customMenuKey}))
+            {
+                $customMenu = json_decode($this->config->customMenu->{$customMenuKey}, true);
+                $menuLibIdList = array();
+                foreach($customMenu as $i => $menu)
+                {
+                    if(strpos($menu['name'], 'custom') === 0)
+                    {
+                        $menuLibID = (int)substr($menu['name'], 6);
+                        if($menuLibID) $menuLibIdList[$i] = $menuLibID;
+                    }
+                }
+
+                $productIdList = array();
+                $projectIdList = array();
+                if($menuLibIdList)
+                {
+                    $libs = $this->dao->select('id,name,product,project')->from(TABLE_DOCLIB)->where('id')->in($menuLibIdList)->fetchAll('id');
+                    foreach($libs as $lib)
+                    {
+                        if($lib->product) $productIdList[] = $lib->product;
+                        if($lib->project) $projectIdList[] = $lib->project;
+                    }
+                }
+                $products = $productIdList ? $this->dao->select('id,name')->from(TABLE_PRODUCT)->where('id')->in($productIdList)->fetchPairs('id', 'name') : array();
+                $projects = $projectIdList ? $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->in($projectIdList)->fetchPairs('id', 'name') : array();
+                foreach($menuLibIdList as $i => $menuLibID)
+                {
+                    $lib = $libs[$menuLibID];
+                    $libName = '';
+                    if($lib->product) $libName = isset($products[$lib->product]) ? '[' . $products[$lib->product] . ']' : '';
+                    if($lib->project) $libName = isset($projects[$lib->project]) ? '[' . $projects[$lib->project] . ']' : '';
+                    $libName .= $lib->name;
+                    $customMenu[$i]['link'] = "{$libName}|doc|browse|libID={$menuLibID}";
+                }
+
+                foreach($customMenu as $menu)
+                {
+                    if(isset($menu['link']))
+                    {
+                        list($menuLabel, $module, $method, $vars) = explode('|', $menu['link']);
+                        $actions .= html::a(helper::createLink($module, $method, $vars), $menuLabel, '', "class='btn btn-gray'");
+                    }
+                        
+                }
+
+            }
+
+            $actions .= html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-folder-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary' data-toggle='modal'");
+            if($libID) $actions .= html::a(helper::createLink('doc', 'create', "libID=$libID"), "<i class='icon icon-plus'></i> " . $this->lang->doc->create, '', "class='btn btn-primary' data-toggle='modal'");
+
+            $this->lang->modulePageActions = $actions;
+
         }
 
-        $this->app->loadLang('project');
-        $selectHtml  = "<a id='currentItem' data-lib-id='$libID' href=\"javascript:showLibMenu()\">{$this->lang->doclib->all} <span class='icon-caret-down'></span></a>";
-        $selectHtml .= "<div id='dropMenu'>";
-        $selectHtml .= "<i class='icon icon-spin icon-spinner'></i>";
-        $selectHtml .= "<div id='libMenu'>";
-        $selectHtml .= "<div id='libMenuHeading'><input id='searchLib' type='search' placeholder='{$this->lang->doc->searchDoc}' class='form-control'></div>";
-        $selectHtml .= "<div id='libMenuGroups' class='clearfix'>";
-        if($this->config->global->flow != 'onlyTask' and isset($this->lang->doc->libTypeList['product']))  $selectHtml .= "<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>";
-        if($this->config->global->flow != 'onlyStory' and $this->config->global->flow != 'onlyTest' and isset($this->lang->doc->libTypeList['project'])) $selectHtml .= "<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-project-done'>{$this->lang->project->statusList['done']}<i class='icon icon-remove'></i></div><div class='lib-menu-list clearfix'></div></div>";
-        $selectHtml .= "<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>";
-        $selectHtml .= "</div></div></div>";
-        common::setMenuVars($this->lang->doc->menu, 'list', $selectHtml);
-        common::setMenuVars($this->lang->doc->menu, 'crumb', $crumb ? $crumb : $this->getCrumbs($libID, $moduleID));
+        //$selectHtml .= $crumb ? $crumb : $this->getCrumbs($libID, $moduleID);
+        $this->lang->modulePageNav     = $selectHtml;
     }
 
     /**
@@ -209,7 +311,7 @@ class docModel extends model
             $docs = $this->dao->select('*')->from(TABLE_DOC)
                 ->where('deleted')->eq(0)
                 ->andWhere('id')->in($docIdList)
-                ->orderBy($sort)
+                ->orderBy('editedDate_desc')
                 ->page($pager)
                 ->fetchAll('id');
 
@@ -246,6 +348,16 @@ class docModel extends model
                 }
             }
         }
+        elseif($browseType == 'visiteddate')
+        {
+            $docIdList = $this->getPrivDocs($libID, $moduleID);
+            $docs = $this->dao->select('*')->from(TABLE_DOC)
+                ->where('deleted')->eq(0)
+                ->andWhere('id')->in($docIdList)
+                ->orderBy('visitedDate_desc')
+                ->page($pager)
+                ->fetchAll('id');
+        }
         elseif($browseType == "collectedbyme")
         {
             $docs = $this->dao->select('*')->from(TABLE_DOC)
@@ -596,7 +708,7 @@ class docModel extends model
         $this->config->doc->search['queryID']   = $queryID;
         $this->config->doc->search['params']['product']['values'] = array(''=>'') + $this->loadModel('product')->getPairs('nocode') + array('all'=>$this->lang->doc->allProduct);
         $this->config->doc->search['params']['project']['values'] = array(''=>'') + $this->loadModel('project')->getPairs('nocode') + array('all'=>$this->lang->doc->allProject);
-        $this->config->doc->search['params']['lib']['values']     = array(''=>'', $libID => $libs[$libID], 'all' => $this->lang->doclib->all);
+        $this->config->doc->search['params']['lib']['values']     = array(''=>'', $libID => ($libID ? $libs[$libID] : 0), 'all' => $this->lang->doclib->all);
 
         /* Get the modules. */
         $moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($libID, 'doc', $startModuleID = 0);
@@ -853,7 +965,7 @@ class docModel extends model
             }
         }
 
-        return array('product' => array_values($productOrderLibs), 'project' => array_values($projectOrderLibs), 'custom' => $customLibs);
+        return array('product' => $productOrderLibs, 'project' => $projectOrderLibs, 'custom' => $customLibs);
     }
 
     /**
diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php
index b4424a03e0..10d25a843e 100644
--- a/module/doc/view/index.html.php
+++ b/module/doc/view/index.html.php
@@ -30,17 +30,7 @@
           <a class="text-muted tree-toggle"><?php echo $lang->doc->fast;?></a>
           <ul>
             <?php foreach($lang->doc->fastMenuList as $type => $menu):?>
-            <?php
-            if($type == 'editedDate' or $type == 'visitedDate')
-            {
-                $link = $this->createLink('doc', 'browse', "libID=0&browseTyp=bymenu&module=0&orderBy={$type}_desc");
-            }
-            else
-            {
-                $link = $this->createLink('doc', 'browse', "libID=0&browseTyp={$type}");
-            }
-            ?>
-            <li><?php echo html::a($link, "<i class='icon {$lang->doc->fastMenuIconList[$type]}'></i> {$menu}");?>
+            <li><?php echo html::a($this->createLink('doc', 'browse', "libID=0&browseType={$type}"), "<i class='icon {$lang->doc->fastMenuIconList[$type]}'></i> {$menu}");?>
             <?php endforeach;?>
           </ul>
         </li>
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index fa8271f01d..314e1494ac 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -185,7 +185,7 @@
               if(common::hasPriv('project', 'unlinkStory', $project))
               {
                   $unlinkURL = $this->createLink('project', 'unlinkStory', "projectID=$project->id&storyID=$story->id&confirm=yes");
-                  echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '<i class="icon-unlink"></i>', '', "class='btn btn-link' title='{$lang->project->unlinkStory}'");
+                  echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '<i class="icon-unlink"></i>', '', "class='btn' title='{$lang->project->unlinkStory}'");
               }
               ?>
             </td>
diff --git a/module/story/css/batchcreate.css b/module/story/css/batchcreate.css
index 700590f736..ea3dd93df4 100644
--- a/module/story/css/batchcreate.css
+++ b/module/story/css/batchcreate.css
@@ -1,4 +1,3 @@
-
 #batchCreateForm .col-id {width: 50px; text-align: center; color: #838A9D}
 #batchCreateForm .col-module,
 #batchCreateForm .col-plan {width: 180px;}
diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css
index 09feb38df2..201fc71e2c 100644
--- a/module/task/css/batchcreate.css
+++ b/module/task/css/batchcreate.css
@@ -14,5 +14,9 @@
 #zeroTaskStory.zeroTask {background-color: #006af1; color: #fff; border-color: #006af1;}
 #zeroTaskStory.zeroTask .icon{display:inline;}
 
+#batchCreateForm .input-group,
+#batchCreateForm .input-group .form-control {position: static;}
 #batchCreateForm .input-group .colorpicker {z-index: 2;}
 #batchCreateForm .input-group .colorpicker.open {z-index: 5;}
+
+#importLines {white-space: nowrap; background: repeat-y url("data:image/png;base64,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"); background-position: 0 6px; padding-left: 30px; line-height: 20px;}
diff --git a/module/testcase/css/batchcreate.css b/module/testcase/css/batchcreate.css
index 32d56f3f82..ffcd370b4d 100644
--- a/module/testcase/css/batchcreate.css
+++ b/module/testcase/css/batchcreate.css
@@ -4,3 +4,10 @@
 .half-right{text-align:left}
 .chosen-container[id^="module"] .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
 .chosen-container[id^="story"] .chosen-drop {min-width: 450px; border-top: 1px solid #ddd!important}
+
+#batchCreateForm .input-group,
+#batchCreateForm .input-group .form-control {position: static;}
+#batchCreateForm .input-group .colorpicker {z-index: 2;}
+#batchCreateForm .input-group .colorpicker.open {z-index: 5;}
+
+#importLines {white-space: nowrap; background: repeat-y url("data:image/png;base64,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"); background-position: 0 6px; padding-left: 30px; line-height: 20px;}
diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php
index 774f0dc58b..a6576b5098 100644
--- a/module/testcase/view/batchcreate.html.php
+++ b/module/testcase/view/batchcreate.html.php
@@ -14,84 +14,97 @@
 <?php js::set('testcaseBatchCreateNum', $config->testcase->batchCreate);?>
 <?php js::set('productID', $productID);?>
 <?php js::set('branch', $branch);?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['testcase']);?></span>
-    <strong>
-      <small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small>
+<div id="mainContent" class="main-content">
+  <div class="main-header">
+    <h2>
       <?php echo $lang->testcase->batchCreate;?>
       <?php if($this->session->currentProductType !== 'normal') echo '<span class="label label-info">' . $branches[$branch] . '</span>';?>
-    </strong>
-    <?php if($story):?>
-    <small class='text-muted'><?php echo html::icon($lang->icons['story']) . ' ' . $story->title ?></small>
-    <?php endif;?>
-    <div class='actions'>
-      <?php echo html::commonButton($lang->pasteText, "data-toggle='myModal'", 'btn btn-primary')?>
-      <button type="button" class="btn btn-default" data-toggle="customModal"><i class='icon icon-cog'></i></button>
+      <?php if($story):?>
+      <small class='text'><?php echo $lang->arrow . $story->title ?></small>
+      <?php endif;?>
+    </h2>
+    <div class="pull-right btn-toolbar">
+      <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=testcase&section=custom&key=batchCreateFields')?>
+      <?php include '../../common/view/customfield.html.php';?>
     </div>
   </div>
+  <?php
+  $visibleFields = array();
+  foreach(explode(',', $showFields) as $field)
+  {
+      if($field) $visibleFields[$field] = '';
+  }
+  $colspan     = count($visibleFields) + 3;
+  $hiddenStory = (isonlybody() and $story) ? ' hidden' : '';
+  if($hiddenStory and isset($visibleFields['story'])) $colspan -= 1;
+  ?>
+  <form method='post' class='load-indicator main-form' enctype='multipart/form-data' target='hiddenwin' id="batchCreateForm">
+    <table class="table table-form" id="tableBody">
+      <thead>
+        <tr class='text-center'>
+          <th class='w-50px'><?php echo $lang->idAB;?></th>
+          <th class='w-120px<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo $lang->product->branch;?></th>
+          <th class='w-180px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
+          <th class='w-180px<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?>'> <?php echo $lang->testcase->story;?></th>
+          <th class='text-left required has-btn'>
+            <?php echo $lang->testcase->title;?></span>
+            <button type='button' data-toggle="importLinesModal" class="btn btn-info"><?php echo $lang->pasteText;?></button>
+          </th>
+          <th class='w-120px text-left required'><?php echo $lang->testcase->type;?></th>
+          <th class='w-80px<?php echo  zget($visibleFields, 'pri', ' hidden')?>'>         <?php echo $lang->testcase->pri;?></th>
+          <th class='w-150px<?php echo zget($visibleFields, 'precondition', ' hidden')?>'><?php echo $lang->testcase->precondition;?></th>
+          <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden')?>'>    <?php echo $lang->testcase->keywords;?></th>
+          <th class='w-140px<?php echo zget($visibleFields, 'stage', ' hidden')?>'>       <?php echo $lang->testcase->stage;?></th>
+          <th class='w-70px<?php echo zget($visibleFields, 'review', ' hidden')?>'>      <?php echo $lang->testcase->review;?></th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php unset($lang->testcase->typeList['']);?>
+        <?php for($i = 0; $i < $config->testcase->batchCreate; $i++):?>
+        <?php
+        if($i != 0) $currentModuleID = 'ditto';
+        if($i != 0) $lang->testcase->typeList['ditto'] = $lang->testcase->ditto;
+        if($i != 0) $lang->testcase->priList['ditto']  = $lang->testcase->ditto;
+        $type = $i == 0 ? 'feature' : 'ditto';
+        $pri  = $i == 0 ? 3 : 'ditto';
+        ?>
+        <tr class='text-center'>
+          <td><?php echo $i+1;?></td>
+          <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo html::select("branch[$i]", $branches, $branch, "class='form-control' onchange='setModules(this.value, $productID, $i)'");?></td>
+          <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $currentModuleID, "class='form-control chosen'");?></td>
+          <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?>' style='overflow:visible'> <?php echo html::select("story[$i]", $storyList, $story ? $story->id : '', 'class="form-control chosen"');?></td>
+          <td style='overflow:visible'>
+            <div class='input-group'>
+              <div class="input-control has-icon-right">
+                <?php echo html::input("title[$i]", '', "class='form-control' autocomplete='off'");?>
+                <div class="colorpicker">
+                  <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
+                  <ul class="dropdown-menu clearfix">
+                    <li class="heading"><?php echo $lang->testcase->colorTag;?><i class="icon icon-close"></i></li>
+                  </ul>
+                  <?php echo html::hidden("color[$i]", '', "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right'  data-update-color='#title\\[$i\\]'");?>
+                </div>
+              </div>
+            </div>
+          </td>
+          <td><?php echo html::select("type[$i]", $lang->testcase->typeList, $type, "class=form-control");?></td>
+          <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>         <?php echo html::select("pri[$i]", $lang->testcase->priList, $pri, "class=form-control");?></td>
+          <td class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[$i]", '', "rows='1' class='form-control autosize'")?></td>
+          <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
+          <td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stage[$i][]", $lang->testcase->stageList, '', "class='form-control chosen' multiple");?></td>
+          <td class='<?php echo zget($visibleFields, 'review', 'hidden')?>'><?php echo html::select("needReview[$i]", $lang->testcase->reviewList, $needReview, "class='form-control'");?></td>
+        </tr>
+        <?php endfor;?>
+        <tr>
+          <td colspan='<?php echo $colspan?>' class='text-center'>
+            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
+            <?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </form>
 </div>
-<?php
-$visibleFields = array();
-foreach(explode(',', $showFields) as $field)
-{
-    if($field) $visibleFields[$field] = '';
-}
-$colspan     = count($visibleFields) + 3;
-$hiddenStory = (isonlybody() and $story) ? ' hidden' : '';
-if($hiddenStory and isset($visibleFields['story'])) $colspan -= 1;
-?>
-<form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
-  <table align='center' class='table table-form table-fixed'>
-    <thead>
-      <tr>
-        <th class='w-50px'><?php echo $lang->idAB;?></th> 
-        <th class='w-120px<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo $lang->product->branch;?></th>
-        <th class='w-180px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
-        <th class='w-180px<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?>'> <?php echo $lang->testcase->story;?></th>
-        <th><?php echo $lang->testcase->title;?> <span class='required'></span></th>
-        <th class='w-100px'><?php echo $lang->testcase->type;?> <span class='required'></span></th>
-        <th class='w-80px<?php echo  zget($visibleFields, 'pri', ' hidden')?>'>         <?php echo $lang->testcase->pri;?></th>
-        <th class='w-150px<?php echo zget($visibleFields, 'precondition', ' hidden')?>'><?php echo $lang->testcase->precondition;?></th>
-        <th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden')?>'>    <?php echo $lang->testcase->keywords;?></th>
-        <th class='w-200px<?php echo zget($visibleFields, 'stage', ' hidden')?>'>       <?php echo $lang->testcase->stage;?></th>
-        <th class='w-70px<?php echo zget($visibleFields, 'review', ' hidden')?>'>      <?php echo $lang->testcase->review;?></th>
-      </tr>
-    </thead>
-
-    <?php unset($lang->testcase->typeList['']);?>
-    <?php for($i = 0; $i < $config->testcase->batchCreate; $i++):?>
-    <?php
-    if($i != 0) $currentModuleID = 'ditto';
-    if($i != 0) $lang->testcase->typeList['ditto'] = $lang->testcase->ditto;
-    if($i != 0) $lang->testcase->priList['ditto']  = $lang->testcase->ditto;
-    $type = $i == 0 ? 'feature' : 'ditto';
-    $pri  = $i == 0 ? 3 : 'ditto';
-    ?>
-    <tr class='text-center'>
-      <td><?php echo $i+1;?></td>
-      <td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo html::select("branch[$i]", $branches, $branch, "class='form-control' onchange='setModules(this.value, $productID, $i)'");?></td>
-      <td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $currentModuleID, "class='form-control chosen'");?></td>
-      <td class='text-left<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?>' style='overflow:visible'> <?php echo html::select("story[$i]", $storyList, $story ? $story->id : '', 'class="form-control chosen"');?></td>
-      <td style='overflow:visible'>
-        <div class='input-group'>
-        <?php echo html::hidden("color[$i]", '', "data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->testcase->colorTag}' data-update-text='#title\\[{$i}\\]'");?>
-        <?php echo html::input("title[$i]", '', "class='form-control' autocomplete='off'");?>
-        </div>
-      </td>
-      <td><?php echo html::select("type[$i]", $lang->testcase->typeList, $type, "class=form-control");?></td>
-      <td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'>         <?php echo html::select("pri[$i]", $lang->testcase->priList, $pri, "class=form-control");?></td>
-      <td class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[$i]", '', "rows='1' class='form-control autosize'")?></td>
-      <td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'>    <?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
-      <td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stage[$i][]", $lang->testcase->stageList, '', "class='form-control chosen' multiple");?></td>
-      <td class='<?php echo zget($visibleFields, 'review', 'hidden')?>'><?php echo html::select("needReview[$i]", $lang->testcase->reviewList, $needReview, "class='form-control'");?></td>
-    </tr>
-    <?php endfor;?>
-    <tfoot>
-      <tr><td colspan='<?php echo $colspan?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
-    </tfoot>
-  </table>
-</form>
 <table class='hide' id='trTemp'>
   <tbody>
     <tr class='text-center'>
@@ -113,7 +126,5 @@ if($hiddenStory and isset($visibleFields['story'])) $colspan -= 1;
     </tr>
   </tbody>
 </table>
-<?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=testcase&section=custom&key=batchCreateFields')?>
-<?php include '../../common/view/customfield.html.php';?>
 <?php include '../../common/view/pastetext.html.php';?>
 <?php include '../../common/view/footer.html.php';?>