diff --git a/app/app/models/page.js b/app/app/models/page.js
index ad563ebe..f3c26d77 100644
--- a/app/app/models/page.js
+++ b/app/app/models/page.js
@@ -29,7 +29,8 @@ export default Model.extend({
 	meta: attr(),
 
 	tagName: Ember.computed('level', function () {
-		return "h" + (this.get('level') + 1);
+		return "h2";
+		// return "h" + (this.get('level') + 1);
 	}),
 
 	tocIndent: Ember.computed('level', function () {
diff --git a/app/app/styles/view/document/edit-tools.scss b/app/app/styles/view/document/edit-tools.scss
index 98cba9a6..a659f565 100644
--- a/app/app/styles/view/document/edit-tools.scss
+++ b/app/app/styles/view/document/edit-tools.scss
@@ -2,6 +2,17 @@
 	position: absolute;
 	top: 18px;
 	right: 78px;
+
+	> .toolbar {
+		margin: 0;
+		padding: 0;
+		line-height: 0;
+
+		> li {
+			list-style: none;
+			list-style-type: none;				
+		}
+	}
 }
 
 .content-counter-dialog {
diff --git a/app/app/styles/view/document/view.scss b/app/app/styles/view/document/view.scss
index e2601989..3b814730 100644
--- a/app/app/styles/view/document/view.scss
+++ b/app/app/styles/view/document/view.scss
@@ -23,8 +23,9 @@
 	}
 
 	.doc-title {
+		font-size: 2rem;
 		margin: 30px 0 10px;
-		font-weight: bold;
+		font-weight: normal;
 	}
 
 	.doc-excerpt {
@@ -38,8 +39,8 @@
 
 		.edit-doc-title {
 			> input {
-				font-weight: bold;
 				font-size: 2rem;
+				font-weight: normal;
 				margin: 0 0 10px;
 				color: $color-wysiwyg;
 			}
@@ -80,7 +81,6 @@
 	}
 
 	.is-a-tab {
-		// @extend .transition-all;
 		@include border-radius(2px);
 		@include ease-in();
 		padding: 25px 50px;
diff --git a/app/app/styles/view/document/wysiwyg.scss b/app/app/styles/view/document/wysiwyg.scss
index e90cad3e..3a285588 100644
--- a/app/app/styles/view/document/wysiwyg.scss
+++ b/app/app/styles/view/document/wysiwyg.scss
@@ -32,32 +32,32 @@
 	}
 
 	h1 {
-		font-size: 2rem;
-		font-weight: normal;
+		font-size: 1.7rem;
+		font-weight: bold;
+		margin: 16px 0;
 	}
 
 	h2 {
-		font-size: 1.7rem;
-		margin: 30px 0 20px;
+		font-size: 1.5rem;
+		font-weight: bold;
+		margin: 16px 0;
 	}
 
 	h3 {
-		font-size: 1.5rem;
-		margin: 30px 0 20px;
-	}
-
-	h4 {
 		font-size: 1.3rem;
-		margin: 30px 0 20px;
+		font-weight: bold;
+		margin: 16px 0;
 	}
 
+	h4,
 	h5,
 	h6,
 	h7,
 	h8,
 	h9 {
-		font-size: 1.3rem;
-		margin: 30px 0 20px;
+		font-size: 1.1rem;
+		font-weight: bold;
+		margin: 16px 0;
 	}
 
 	h2,
diff --git a/app/app/templates/components/document/document-page.hbs b/app/app/templates/components/document/document-page.hbs
index 3ee8f85e..62a53970 100644
--- a/app/app/templates/components/document/document-page.hbs
+++ b/app/app/templates/components/document/document-page.hbs
@@ -1,4 +1,4 @@
-<div id="page-{{ page.id }}" class="is-a-page" data-id="{{ page.id }}" data-type="{{ page.contentType }}">
+<div id="page-{{ page.id }}" class="is-a-page wysiwyg" data-id="{{ page.id }}" data-type="{{ page.contentType }}">
 	{{#unless editMode}}
 		{{document/page-heading tagName=page.tagName document=document folder=folder page=page isEditor=isEditor tabMode=tabMode
 			onEdit=(action 'onEdit')
diff --git a/app/app/templates/components/document/document-tab.hbs b/app/app/templates/components/document/document-tab.hbs
index f7e20273..d0280966 100644
--- a/app/app/templates/components/document/document-tab.hbs
+++ b/app/app/templates/components/document/document-tab.hbs
@@ -1,4 +1,4 @@
-<div id="page-{{ page.id }}" class="is-a-tab {{if expanded 'tab-max' 'tab-min'}}" data-id="{{ page.id }}" data-type="{{ page.contentType }}">
+<div id="page-{{ page.id }}" class="is-a-tab wysiwyg {{if expanded 'tab-max' 'tab-min'}}" data-id="{{ page.id }}" data-type="{{ page.contentType }}">
 	{{document/tab-heading tagName=page.tagName document=document folder=folder page=page isEditor=isEditor
 		onExpand=(action 'onExpand') onSavePageAsBlock=(action 'onSavePageAsBlock') onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onDeletePage')}}
 	{{#if expanded}}