diff --git a/config/zentaopms.php b/config/zentaopms.php
index 3ecf24e31e..646f396d0a 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -389,3 +389,5 @@ $config->programPriv->scrum     = array('story', 'projectstory', 'projectrelease
 $config->programPriv->waterfall = array_merge($config->programPriv->scrum, array('task', 'workestimation', 'durationestimation', 'budget', 'programplan', 'review', 'reviewissue', 'weekly', 'cm', 'milestone', 'design', 'issue', 'risk', 'opportunity', 'measrecord', 'auditplan', 'trainplan', 'gapanalysis', 'pssp', 'researchplan', 'researchreport'));
 
 $config->waterfallModules = array('workestimation', 'durationestimation', 'budget', 'programplan', 'review', 'reviewissue', 'weekly', 'cm', 'milestone', 'design', 'opportunity', 'auditplan', 'trainplan', 'gapanalysis', 'pssp', 'researchplan', 'researchreport');
+
+$config->showMainMenu = true;
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index cb9e3eb983..6d67bb95e8 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -7,10 +7,7 @@ include 'chosen.html.php';
 <?php if(empty($_GET['onlybody']) or $_GET['onlybody'] != 'yes'):?>
 <?php $this->app->loadConfig('sso');?>
 <?php if(!empty($config->sso->redirect)) js::set('ssoRedirect', $config->sso->redirect);?>
-<?php $isDocModule        = $app->getModuleName() == 'doc';?>
-<?php $isManagedDocMethod = strpos(',create,edit,', ",{$app->getMethodName()},") !== false;?>
-<?php $isNotTextTypeDoc   = (isset($docType) and strpos(',html,markdown,text,', ",$docType,") === false);?>
-<?php if(!$isDocModule or ($isDocModule and (!$isManagedDocMethod or ($isManagedDocMethod and $isNotTextTypeDoc)))):?>
+<?php if($config->showMainMenu):?>
 <header id='header'>
   <div id='mainHeader'>
     <div class='container'>
diff --git a/module/doc/control.php b/module/doc/control.php
index fbe0cd098e..1f767ce221 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -347,6 +347,8 @@ class doc extends control
             if($this->config->systemMode == 'new') unset($this->lang->doc->menu->project['subMenu']);
         }
 
+        $this->config->showMainMenu = strpos(',html,markdown,text,', ",$docType,") === false;
+
         /* Get libs and the default lib id. */
         $gobackLink = ($objectID == 0 and $libID == 0) ? $this->createLink('doc', 'tableContents', "type=$objectType") : '';
         $unclosed   = strpos($this->config->doc->custom->showLibs, 'unclosed') !== false ? 'unclosedProject' : '';
@@ -469,6 +471,8 @@ class doc extends control
             }
         }
 
+        $this->config->showMainMenu = strpos(',html,markdown,text,', ",{$doc->type},") === false;
+
         $objects                   = $this->doc->getOrderedObjects($objectType);
         $appendLib                 = (!empty($lib) and $lib->deleted == '1') ? $libID : 0;
         $libs                      = $this->doc->getLibsByObject($objectType, $objectID, '', $appendLib);
@@ -486,7 +490,6 @@ class doc extends control
         $this->view->lib              = $lib;
         $this->view->groups           = $this->loadModel('group')->getPairs();
         $this->view->users            = $this->user->getPairs('noletter|noclosed|nodeleted', $doc->users);
-        $this->view->docType          = $doc->type;
         $this->display();
     }
 
diff --git a/module/doc/view/createtexttype.html.php b/module/doc/view/createtexttype.html.php
index d23f98889a..9c97f6d3c5 100644
--- a/module/doc/view/createtexttype.html.php
+++ b/module/doc/view/createtexttype.html.php
@@ -155,9 +155,10 @@ $(function()
         setTimeout(function(){$('#dataform').scrollTop(0)}, 100);
     });
 
-    $('#sidebar').height($(document).height() - 120);
-    setTimeout(function(){$('.ke-edit-iframe, .ke-edit').height($(document).height() - 120);}, 100);
-    setTimeout(function(){$('.CodeMirror').height($(document).height() - 120);}, 100);
+    var contentHeight = $(document).height() - 120;
+    $('#sidebar').height(contentHeight);
+    setTimeout(function(){$('.ke-edit-iframe, .ke-edit').height(contentHeight);}, 100);
+    setTimeout(function(){$('.CodeMirror').height(contentHeight);}, 100);
 
     $('#editorContent .icon.icon-angle-right').css('top', '50%');
 })
diff --git a/module/doc/view/edittexttype.html.php b/module/doc/view/edittexttype.html.php
index d942e21f56..67bf6c18a6 100644
--- a/module/doc/view/edittexttype.html.php
+++ b/module/doc/view/edittexttype.html.php
@@ -34,18 +34,18 @@
 
 #contentBox {padding: 0; width: 100%;}
 .ke-container {overflow: visible;}
-.ke-container, .contentmarkdown {border: unset; background: #efefef;}
+.ke-container, .contenthtml {border: unset; background: #efefef;}
 .ke-container.focus {box-shadow: unset; border-color: unset;}
-.ke-toolbar {padding-left: 20px; width: 150%; height: 29px; border-bottom: unset;}
+.ke-toolbar {padding-left: 20px; width: 150%; height: 30px; border-bottom: unset;}
 .ke-edit {border-top: 1px solid rgb(220, 220, 220)}
 .ke-edit, .CodeMirror {margin-left: 20px; background: #fff;}
 .kindeditor-ph {padding-left: 20px !important;}
-.editor-toolbar {background: #fff; padding-left: 20px; border-right: unset; border-top: unset; height: 29px;}
+.editor-toolbar {background: #fff; padding-left: 20px; border-right: unset; border-top: unset; height: 30px;}
 .hide-sidebar .ke-edit {padding-right: 20px;}
 .hide-sidebar .CodeMirror {padding-right: 50px;}
 .CodeMirror.CodeMirror-wrap {border-left: 0; border-right: 0; border-bottom: 0;}
 
-#sidebar {top: 29px;}
+#sidebar {top: 30px;}
 #sidebar .sidebar-toggle {right: 0; left: 0px; background: #efefef; border-radius: 0px; width: 20px; border-top: 1px solid rgb(220, 220, 220);}
 #sidebar > .sidebar-toggle:hover {background: #efefef;}
 #sidebar {width: 500px;}
@@ -54,8 +54,7 @@
 .hide-sidebar #sidebar > .sidebar-toggle > .icon:before {content: "\e314";}
 .hide-sidebar #sidebar > .sidebar-toggle {left: -20px; z-index: 9;}
 #sidebar .cell {border-top: 1px solid rgb(220, 220, 220); border-radius: 0px;}
-#sidebar>.sidebar-toggle>.icon.icon-angle-right {left: 4px;}
-
+#sidebar > .sidebar-toggle > .icon.icon-angle-right {left: 4px;}
 .file-title {max-width: 130px !important;}
 
 .th-control {vertical-align: top !important;}
@@ -156,9 +155,10 @@ $(function()
         setTimeout(function(){$('#dataform').scrollTop(0)}, 100);
     });
 
-    $('#sidebar').height($(document).height() - 120);
-    setTimeout(function(){$('.ke-edit-iframe, .ke-edit').height($(document).height() - 120);}, 100);
-    setTimeout(function(){$('.CodeMirror').height($(document).height() - 120);}, 100);
+    var contentHeight = $(document).height() - 120;
+    $('#sidebar').height(contentHeight);
+    setTimeout(function(){$('.ke-edit-iframe, .ke-edit').height(contentHeight);}, 100);
+    setTimeout(function(){$('.CodeMirror').height(contentHeight);}, 100);
 
     $('#editorContent .icon.icon-angle-right').css('top', '50%');
 })