diff --git a/webnotes/templates/base.html b/webnotes/templates/base.html
index 6f616d2cf5..e07f08e71b 100644
--- a/webnotes/templates/base.html
+++ b/webnotes/templates/base.html
@@ -49,7 +49,7 @@
 	
 		<header class="page-header">
 			<div class="container" data-html-block="header">
-			{%- if header is defined -%}{{ header }}{%- endif -%}
+			{%- if header is defined -%}<h2>{{ header }}</h2>{%- endif -%}
 			</div>
 			<div class="container">
 				<div class="row">
diff --git a/webnotes/templates/generators/website_group.html b/webnotes/templates/generators/website_group.html
index 2787c80720..3158b3b581 100644
--- a/webnotes/templates/generators/website_group.html
+++ b/webnotes/templates/generators/website_group.html
@@ -1,4 +1,4 @@
-{% block header %}<h2>{{ group.group_title }}</h2>{% endblock %}
+{% block header %}{{ group.group_title }}{% endblock %}
 
 {% block content %}
 {%- if group.group_description -%}
diff --git a/webnotes/templates/pages/about.html b/webnotes/templates/pages/about.html
index e5e89197c1..2da2f9b97e 100644
--- a/webnotes/templates/pages/about.html
+++ b/webnotes/templates/pages/about.html
@@ -1,7 +1,5 @@
 {% block title %} About Us {% endblock %}
 
-{% block header %}<h2>About Us</h2>{% endblock %}
-
 {% block content %}
 <div class="about-content">
 	{{ obj.doc.company_introduction or """<p>Some Introduction about your company that you would 
diff --git a/webnotes/templates/pages/contact.html b/webnotes/templates/pages/contact.html
index f145caa6ef..970621b790 100644
--- a/webnotes/templates/pages/contact.html
+++ b/webnotes/templates/pages/contact.html
@@ -1,7 +1,5 @@
 {% block title %}{{ heading or "Contact Us"}}{% endblock %}
 
-{% block header %}<h2>{{ heading or "Contact Us"}}</h2>{% endblock %}
-
 {% block content %}
 <div class="contact-content">
 	<div class="row">
diff --git a/webnotes/templates/pages/message.html b/webnotes/templates/pages/message.html
index 536078b221..90b6fb794b 100644
--- a/webnotes/templates/pages/message.html
+++ b/webnotes/templates/pages/message.html
@@ -1,6 +1,6 @@
 {% block title %}{{ title }}{% endblock %}
 
-{% block header %}<h2 class="text-{{ 'success' if success else 'danger'}}">{{ title }}</h2>{% endblock %}
+{% block header %}<span class="text-{{ 'success' if success else 'danger'}}">{{ title }}</span>{% endblock %}
 
 {% block content %}
 <div class="message-content">
diff --git a/webnotes/website/js/website.js b/webnotes/website/js/website.js
index 7cf0d0b9c1..590757488b 100644
--- a/webnotes/website/js/website.js
+++ b/webnotes/website/js/website.js
@@ -426,6 +426,10 @@ $(document).on("page_change", function() {
 	$(".page-footer").toggleClass("hidden", !!!$(".page-footer").text().trim());
 	$("[data-html-block='breadcrumbs'] .breadcrumb").toggleClass("hidden",
 		$("[data-html-block='breadcrumbs']").text().trim()==$("[data-html-block='header']").text().trim());
+		
+	if(!$(".page-sidebar").hasClass("hidden-xs")) {
+		$(".toggle-sidebar").trigger("click");
+	}
 
 	// add prive pages to sidebar
 	if(website.private_pages && $(".page-sidebar").length) {
diff --git a/webnotes/webutils.py b/webnotes/webutils.py
index 996d6f8e2d..cff31fc842 100644
--- a/webnotes/webutils.py
+++ b/webnotes/webutils.py
@@ -466,7 +466,7 @@ def render_blocks(context):
 		out["title"] = context.get("title")
 	
 	if "header" not in out:
-		out["header"] = """<h2>{}</h2>""".format(out.get("title") or context.title)
+		out["header"] = out["title"]
 		
 	if "breadcrumbs" not in out:
 		out["breadcrumbs"] = scrub_relative_urls(