diff --git a/app/app/pods/document/block/template.hbs b/app/app/pods/document/block/template.hbs
index 952cb08f..2ab87b96 100644
--- a/app/app/pods/document/block/template.hbs
+++ b/app/app/pods/document/block/template.hbs
@@ -1,16 +1,14 @@
 <div class="zone-section-editor">
-	<div class="container">
-		<div class="row">
-			<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
-				<div id="zone-document-content" class="zone-document-content">
-					<div class="back-to-space">
-						{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
-							<i class="material-icons">arrow_back</i>&nbsp;{{model.document.name}}
-						{{/link-to}}
-					</div>
-					{{document/document-heading document=model.document isEditor=false}}
-                    {{document/block-editor document=model.document folder=model.folder block=model.block onCancel=(action 'onCancel') onAction=(action 'onAction')}}
+	<div class="page-container">
+		<div id="page-content-wrapper">
+			<div id="zone-document-content" class="zone-document-content">
+				<div class="back-to-space">
+					{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
+						<i class="material-icons">arrow_back</i>&nbsp;{{model.document.name}}
+					{{/link-to}}
 				</div>
+				{{document/document-heading document=model.document isEditor=false}}
+				{{document/block-editor document=model.document folder=model.folder block=model.block onCancel=(action 'onCancel') onAction=(action 'onAction')}}
 			</div>
 		</div>
 	</div>
diff --git a/app/app/pods/document/history/route.js b/app/app/pods/document/history/route.js
index a1ffe5fe..37dbfe92 100644
--- a/app/app/pods/document/history/route.js
+++ b/app/app/pods/document/history/route.js
@@ -14,5 +14,10 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 			diff: "",
 			revisions: this.get('documentService').getDocumentRevisions(this.modelFor('document').document.get('id'))
 		});
+	},
+
+	setupController(controller, model) {
+		controller.set('model', model);
+		controller.set('hasRevisions', model.revisions.length > 0);
 	}
 });
diff --git a/app/app/pods/document/history/template.hbs b/app/app/pods/document/history/template.hbs
index 69e3b421..6fbaf81a 100644
--- a/app/app/pods/document/history/template.hbs
+++ b/app/app/pods/document/history/template.hbs
@@ -1,17 +1,19 @@
 <div class="zone-document-history">
-	<div class="container">
-		<div class="row">
-			<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
-				<div id="zone-document-content" class="zone-document-content">
-					<div class="back-to-space">
-						{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
-							<i class="material-icons">arrow_back</i>&nbsp;{{model.document.name}}
-						{{/link-to}}
-					</div>
-					{{document/document-heading document=model.document isEditor=false}}
+	<div class="page-container">
+		<div id="page-content-wrapper">
+			<div id="zone-document-content" class="zone-document-content">
+				<div class="back-to-space">
+					{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
+						<i class="material-icons">arrow_back</i>&nbsp;{{model.document.name}}
+					{{/link-to}}
+				</div>
+				{{document/document-heading document=model.document isEditor=false}}
+				{{#if hasRevisions}}
 					{{document/document-history document=model.document folder=model.folder pages=model.pages
 					revisions=model.revisions diff=model.diff onFetchDiff=(action 'onFetchDiff') onRollback=(action 'onRollback')}}
-				</div>
+				{{else}}
+					No revisions made
+				{{/if}}
 			</div>
 		</div>
 	</div>
diff --git a/app/app/pods/document/section/template.hbs b/app/app/pods/document/section/template.hbs
index 5076ce87..f42e207f 100644
--- a/app/app/pods/document/section/template.hbs
+++ b/app/app/pods/document/section/template.hbs
@@ -1,16 +1,14 @@
 <div class="zone-section-editor">
-	<div class="container">
-		<div class="row">
-			<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
-				<div id="zone-document-content" class="zone-document-content">
-					<div class="back-to-space">
-						{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
-							<i class="material-icons">arrow_back</i>&nbsp;{{model.document.name}}
-						{{/link-to}}
-					</div>
-					{{document/document-heading document=model.document isEditor=false}}
-					{{document/document-editor document=model.document folder=model.folder page=model.page meta=model.meta onCancel=(action 'onCancel') onAction=(action 'onAction')}}
+	<div class="page-container">
+		<div id="page-content-wrapper">
+			<div id="zone-document-content" class="zone-document-content">
+				<div class="back-to-space">
+					{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
+						<i class="material-icons">arrow_back</i>&nbsp;{{model.document.name}}
+					{{/link-to}}
 				</div>
+				{{document/document-heading document=model.document isEditor=false}}
+				{{document/document-editor document=model.document folder=model.folder page=model.page meta=model.meta onCancel=(action 'onCancel') onAction=(action 'onAction')}}
 			</div>
 		</div>
 	</div>
diff --git a/app/app/styles/view/layout-left-sidebar.scss b/app/app/styles/view/layout-left-sidebar.scss
index 159b58c6..2fd72328 100644
--- a/app/app/styles/view/layout-left-sidebar.scss
+++ b/app/app/styles/view/layout-left-sidebar.scss
@@ -15,6 +15,7 @@ $sidebar-width: 400px;
     position: fixed;
     overflow-x: hidden;
     left: $sidebar-width;
+    top: 0;
     width: 0;
     height: 100%;
     margin-left: -$sidebar-width;
@@ -31,11 +32,20 @@ $sidebar-width: 400px;
     width: $sidebar-width;
 }
 
+.page-container {
+    margin-right: auto;
+    margin-left: auto;
+    padding-left: 30px;
+    padding-right: 30px;
+    max-width: 1200px;
+}
+
 #page-content-wrapper {
     width: 100%;
     position: absolute;
-    margin-top: 30px;
 	padding: 30px;
+    margin: 0 auto;
+    margin-top: 30px;
 
     .page-content-title {
 		font-size: 2rem;
diff --git a/app/app/templates/components/document/sidebar-zone.hbs b/app/app/templates/components/document/sidebar-zone.hbs
index 51586f9f..825efb15 100644
--- a/app/app/templates/components/document/sidebar-zone.hbs
+++ b/app/app/templates/components/document/sidebar-zone.hbs
@@ -47,7 +47,7 @@
                 <li class="item" {{action 'onUnpin'}}>Unpin</li>
             {{else}}
                 <li class="item" id="pin-document-button">Pin</li>
-            {{/if}}        
+            {{/if}}
             <li class="item" id="pin-document-button">
                 {{#link-to 'document.history'}}History{{/link-to}}
             </li>
diff --git a/app/app/templates/components/layout/zone-content.hbs b/app/app/templates/components/layout/zone-content.hbs
index ca007cf1..1b0b8607 100644
--- a/app/app/templates/components/layout/zone-content.hbs
+++ b/app/app/templates/components/layout/zone-content.hbs
@@ -1,9 +1,5 @@
-<div class="container">
-	<div class="row">
-		<div class="col-lg-12">
-			<div id="page-content-wrapper">
-				{{yield}}
-			</div>
-		</div>
+<div class="page-container">
+	<div id="page-content-wrapper">
+		{{yield}}
 	</div>
 </div>