diff --git a/module/common/model.php b/module/common/model.php
index 94dc8c07e2..b390a7f85d 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -359,6 +359,8 @@ class commonModel extends model
         $html .= "</div></a><ul class='dropdown-menu pull-right create-list'>";
 
         $showCreateList = $lastIsDivider = $needPrintDivider = false;
+        $productID      = isset($_SESSION['product']) ? $_SESSION['product'] : 0;
+        if(!$productID and $app->user->view->products) $productID = current(explode(',', $app->user->view->products));
 
         /* Check whether the creation permission is available, and print create buttons. */
         foreach($lang->createIcons as $objectType => $objectIcon)
@@ -371,12 +373,8 @@ class commonModel extends model
 
             if(common::hasPriv($objectType, $createMethod))
             {
-                $showCreateList = true;
-                $isOnlyBody     = strpos('program|project|product', $objectType) === false;
-                $iconWord       = $objectType == 'doc' ? 'W' : ''; // No ducument icon, print word instead of icon.
-
                 /* Determines whether to print a divider. */
-                if(!$lastIsDivider and $needPrintDivider)
+                if(!$lastIsDivider and $needPrintDivider and $showCreateList)
                 {
                     $html            .= '<li class="divider"></li>';
                     $lastIsDivider    = true;
@@ -387,8 +385,13 @@ class commonModel extends model
                     $lastIsDivider = false;
                 }
 
+                $showCreateList = true;
+                $isOnlyBody     = strpos('program|project|product', $objectType) === false;
+                $iconWord       = $objectType == 'doc' ? 'W' : ''; // No ducument icon, print word instead of icon.
+
                 $params = '';
-                if($objectType == 'effort') $params = 'date=today';
+                if($objectType == 'bug' or $objectType == 'testcase') $params = "productID=$productID";
+                if($objectType == 'doc') $params = "objectType=&objectID=0&libID=0";
 
                 $html .= '<li>' . html::a(helper::createLink($objectType, $createMethod, $params, '', $isOnlyBody), "<i class='icon icon-$objectIcon'>$iconWord</i> " . $lang->createObjects[$objectType], '', $isOnlyBody ? "class='iframe'" : '') . '</li>';
             }
diff --git a/module/doc/control.php b/module/doc/control.php
index 093eb6e810..7f8d360a7c 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -292,7 +292,7 @@ class doc extends control
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $docID));
             $objectID = zget($lib, $lib->type, '');
             $params   = "type={$lib->type}&objectID=$objectID&libID={$lib->id}&docID=" . $docResult['id'];
-            $link     = $this->createLink('doc', 'objectLibs', $params);
+            $link     = isonlybody() ? 'parent' : $this->createLink('doc', 'objectLibs', $params);
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link));
         }
 
@@ -320,15 +320,12 @@ class doc extends control
             if($this->config->systemMode == 'classic') unset($this->lang->doc->menu->execution['subMenu']);
         }
 
-        $lib  = $this->doc->getLibByID($libID);
-        $type = $lib->type;
-
-        $this->view->title      = $lib->name . $this->lang->colon . $this->lang->doc->create;
-        $this->view->position[] = html::a($this->createLink('doc', 'browse', "libID=$libID"), $lib->name);
-        $this->view->position[] = $this->lang->doc->create;
-
+        $lib      = $this->doc->getLibByID($libID);
+        $type     = !empty($lib) ? $lib->type : 'product';
         $unclosed = strpos($this->config->doc->custom->showLibs, 'unclosed') !== false ? 'unclosedProject' : '';
 
+        if(!isonlybody()) $this->view->title = $lib->name . $this->lang->colon . $this->lang->doc->create;
+
         $this->view->libID            = $libID;
         $this->view->libs             = $this->doc->getLibs($objectType, $extra = "withObject,$unclosed", $libID, $objectID);
         $this->view->libName          = $this->dao->findByID($libID)->from(TABLE_DOCLIB)->fetch('name');