diff --git a/gui/app/components/folder/settings-category.js b/gui/app/components/folder/settings-category.js
index f60f5c4c..5d198c60 100644
--- a/gui/app/components/folder/settings-category.js
+++ b/gui/app/components/folder/settings-category.js
@@ -45,7 +45,6 @@ export default Component.extend(ModalMixin, Notifer, {
 		// get categories
 		this.get('categorySvc').getAll(this.get('space.id')).then((c) => {
 			this.set('category', c);
-
 			// get summary of documents and users for each category in space
 			this.get('categorySvc').getSummary(this.get('space.id')).then((s) => {
 				c.forEach((cat) => {
diff --git a/gui/app/styles/core/view/document/section.scss b/gui/app/styles/core/view/document/section.scss
index 52d3a073..0e8ae759 100644
--- a/gui/app/styles/core/view/document/section.scss
+++ b/gui/app/styles/core/view/document/section.scss
@@ -47,12 +47,20 @@
 			width: 5px;
 			display: inline-block;
 		}
+
+		> i.add-section {
+			color: map-get($yellow-shades, 500);
+
+			&:hover {
+				color: map-get($yellow-shades, 700);
+			}
+		}
 	}
 }
 
 .start-section {
 	@extend .no-select;
-	text-align: right;
+	text-align: center;
 	margin: 0.5rem 0;
 	display: block;
 
diff --git a/gui/app/templates/components/document/document-page.hbs b/gui/app/templates/components/document/document-page.hbs
index 5c2e03b1..84e5bd63 100644
--- a/gui/app/templates/components/document/document-page.hbs
+++ b/gui/app/templates/components/document/document-page.hbs
@@ -28,7 +28,8 @@
 			onDeletePage=(action "onDeletePage")
 			onSavePageAsBlock=(action "onSavePageAsBlock")
 			onPageLevelChange=(action onPageLevelChange)
-			onPageSequenceChange=(action onPageSequenceChange)}}
+			onPageSequenceChange=(action onPageSequenceChange)
+			onShowSectionWizard=(action onShowSectionWizard)}}
 
 		<div class="wysiwyg">
 			{{section/base-renderer page=page}}
diff --git a/gui/app/templates/components/document/page-heading.hbs b/gui/app/templates/components/document/page-heading.hbs
index d8473b17..825d66d0 100644
--- a/gui/app/templates/components/document/page-heading.hbs
+++ b/gui/app/templates/components/document/page-heading.hbs
@@ -12,6 +12,10 @@
 			<div class="section-heading no-print" id="page-toolbar-{{ page.id }}">
 				<div class="section-toolbar">
 					{{#if canEdit}}
+						<i class="add-section dicon {{constants.Icon.Plus}}" {{action "onShowSectionWizard" page}}>
+							{{#attach-tooltip showDelay=1000}}Insert section above{{/attach-tooltip}}
+						</i>
+						<div class="gap"/>
 						<i class="dicon {{constants.Icon.Edit}}" {{action "onEdit"}} />
 					{{/if}}
 					{{#if hasMenuPermissions}}
diff --git a/gui/app/templates/components/document/view-content.hbs b/gui/app/templates/components/document/view-content.hbs
index 7f151e2b..8884cf57 100644
--- a/gui/app/templates/components/document/view-content.hbs
+++ b/gui/app/templates/components/document/view-content.hbs
@@ -1,14 +1,6 @@
 {{#if hasPages}}
 	{{#each pages key="id" as |item|}}
-		{{#if canEdit}}
-			<div class="start-section">
-				<i class="dicon {{constants.Icon.Plus}}" {{action "onShowSectionWizard" item.page}}>
-					{{#attach-tooltip showDelay=1000}}Insert section here{{/attach-tooltip}}
-				</i>
-			</div>
-		{{else}}
-			{{ui/ui-spacer size=100}}
-		{{/if}}
+		{{ui/ui-spacer size=100}}
 		{{document/document-page
 			roles=roles
 			pages=pages
@@ -27,17 +19,9 @@
 			onDeletePage=(action "onDeletePage")
 			onSavePageAsBlock=(action "onSavePageAsBlock")
 			onPageLevelChange=(action onPageLevelChange)
-			onPageSequenceChange=(action onPageSequenceChange)}}
+			onPageSequenceChange=(action onPageSequenceChange)
+			onShowSectionWizard=(action "onShowSectionWizard")}}
 	{{/each}}
-
-	{{#if canEdit}}
-		<div class="start-section">
-			<i class="dicon {{constants.Icon.Plus}}" {{action "onShowSectionWizard"}}>
-				{{#attach-tooltip showDelay=1000}}Insert section here{{/attach-tooltip}}
-			</i>
-		</div>
-	{{/if}}
-
 	{{#if showLikes}}
 		<div class="vote-box no-print">
 			{{#if voteThanks}}
@@ -53,14 +37,14 @@
 			{{/if}}
 		</div>
 	{{/if}}
-{{else}}
-	{{#if canEdit}}
-		<div class="start-section">
-			<i class="dicon {{constants.Icon.Plus}}" {{action "onShowSectionWizard"}}>
-				{{#attach-tooltip showDelay=1000}}Insert section here{{/attach-tooltip}}
-			</i>
-		</div>
-	{{/if}}
+{{/if}}
+
+{{#if canEdit}}
+	<div class="start-section">
+		<i class="dicon {{constants.Icon.Plus}}" {{action "onShowSectionWizard"}}>
+			{{#attach-tooltip showDelay=1000}}Insert section here{{/attach-tooltip}}
+		</i>
+	</div>
 {{/if}}
 
 {{#if canEdit}}
diff --git a/gui/app/templates/components/folder/document-categories.hbs b/gui/app/templates/components/folder/document-categories.hbs
index 499b2ef5..752baee4 100644
--- a/gui/app/templates/components/folder/document-categories.hbs
+++ b/gui/app/templates/components/folder/document-categories.hbs
@@ -1,8 +1,10 @@
 {{#if categories}}
 	{{#each categories as |cat|}}
-		<div class="category">
-			<i class="dicon {{constants.Icon.Category}}" />
-			<div class="name">{{cat}}</div>
-		</div>
+		{{#if cat}}
+			<div class="category">
+				<i class="dicon {{constants.Icon.Category}}" />
+				<div class="name">{{cat}}</div>
+			</div>
+		{{/if}}
 	{{/each}}
 {{/if}}
\ No newline at end of file