diff --git a/gui/app/components/document/page-heading.js b/gui/app/components/document/page-heading.js
index 15f5f800..b2ab04c3 100644
--- a/gui/app/components/document/page-heading.js
+++ b/gui/app/components/document/page-heading.js
@@ -101,6 +101,10 @@ export default Component.extend(ModalMixin, {
 	},
 
 	actions: {
+		onShowSectionWizard(beforePage) {
+			this.get('onShowSectionWizard')(beforePage);
+		},
+
 		onEdit() {
 			let page = this.get('page');
 
diff --git a/gui/app/pods/document/index/template.hbs b/gui/app/pods/document/index/template.hbs
index fe1cdf78..ca15dadb 100644
--- a/gui/app/pods/document/index/template.hbs
+++ b/gui/app/pods/document/index/template.hbs
@@ -59,28 +59,19 @@
 {{/layout/master-sidebar}}
 
 {{#layout/master-content}}
-	<div class="grid-container-6-4">
-		<div class="grid-cell-1">
-			{{#link-to "folder.index" folder.id folder.slug class="no-print"}}
-				{{ui/ui-button light=true color=constants.Color.Yellow uppercase=false
-					icon=constants.Icon.ArrowLeft label=folder.name}}
-			{{/link-to}}
-		</div>
-
-		<div class="grid-cell-2 grid-cell-right">
-			{{document/document-toolbar
-				tab=tab
-				roles=roles
-				space=folder
-				spaces=folders
-				document=document
-				versions=versions
-				permissions=permissions
-				refresh=(action "refresh")
-				onSaveTemplate=(action "onSaveTemplate")
-				onSaveDocument=(action "onSaveDocument")
-				onDocumentDelete=(action "onDocumentDelete")}}
-		</div>
+	<div class="text-right">
+		{{document/document-toolbar
+			tab=tab
+			roles=roles
+			space=folder
+			spaces=folders
+			document=document
+			versions=versions
+			permissions=permissions
+			refresh=(action "refresh")
+			onSaveTemplate=(action "onSaveTemplate")
+			onSaveDocument=(action "onSaveDocument")
+			onDocumentDelete=(action "onDocumentDelete")}}
 	</div>
 
 	{{document/document-meta
diff --git a/gui/app/styles/core/layout/spacing.scss b/gui/app/styles/core/layout/spacing.scss
index 269d501e..b09903c6 100644
--- a/gui/app/styles/core/layout/spacing.scss
+++ b/gui/app/styles/core/layout/spacing.scss
@@ -67,5 +67,8 @@ $i: 100;
 	.width-#{$i} {
 		width: #{$i}#{"%"} !important;
 	}
+	.max-width-#{$i} {
+		max-width: #{$i}#{"%"} !important;
+	}
 	$i: $i - 1;
 }
diff --git a/gui/app/styles/core/view/document/all.scss b/gui/app/styles/core/view/document/all.scss
index a8def036..18b5ecdb 100644
--- a/gui/app/styles/core/view/document/all.scss
+++ b/gui/app/styles/core/view/document/all.scss
@@ -3,7 +3,6 @@
 @import "meta.scss";
 @import "section.scss";
 @import "section-editor.scss";
-@import "sidebar.scss";
 @import "sidebar-toc.scss";
 @import "sidebar-attachment.scss";
 @import "view-activity.scss";
diff --git a/gui/app/styles/core/view/document/meta.scss b/gui/app/styles/core/view/document/meta.scss
index 78064bea..19d2b1ce 100644
--- a/gui/app/styles/core/view/document/meta.scss
+++ b/gui/app/styles/core/view/document/meta.scss
@@ -78,7 +78,7 @@
 		font-size: 1.1rem;
 		font-weight: 500;
 		background-color: map-get($red-shades, 700);
-		color: map-get($red-shades, 300);
+		color: map-get($red-shades, 100);
 		text-transform: uppercase;
 	}
 
diff --git a/gui/app/styles/core/view/document/sidebar.scss b/gui/app/styles/core/view/document/sidebar.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/gui/app/templates/components/document/sidebar-meta.hbs b/gui/app/templates/components/document/sidebar-meta.hbs
index c9bea0dd..f1589b95 100644
--- a/gui/app/templates/components/document/sidebar-meta.hbs
+++ b/gui/app/templates/components/document/sidebar-meta.hbs
@@ -1,4 +1,10 @@
 <div class="document-meta">
+	{{#link-to "folder.index" space.id space.slug class="no-print"}}
+		{{ui/ui-button light=true color=constants.Color.Yellow uppercase=false
+			icon=constants.Icon.ArrowLeft label=space.name stretch=true truncate=true}}
+	{{/link-to}}
+	{{ui/ui-spacer size=200}}
+
 	{{#if (eq appMeta.edition constants.Product.EnterpriseEdition)}}
 		<div class="title">VERSION</div>
 		{{#if (gt versions.length 0)}}