diff --git a/app/app/components/document/sidebar-zone.js b/app/app/components/document/sidebar-zone.js
index 02b8b7f9..b8eaf8d3 100644
--- a/app/app/components/document/sidebar-zone.js
+++ b/app/app/components/document/sidebar-zone.js
@@ -16,6 +16,7 @@ import NotifierMixin from '../../mixins/notifier';
 export default Ember.Component.extend(TooltipMixin, NotifierMixin, {
     documentService: Ember.inject.service('document'),
 	sectionService: Ember.inject.service('section'),
+	sessionService: Ember.inject.service('session'),
 	appMeta: Ember.inject.service(),
 	userService: Ember.inject.service('user'),
 	localStorage: Ember.inject.service(),
@@ -138,6 +139,14 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, {
 			this.showNotification('Template saved');
 			this.attrs.onSaveTemplate(name, excerpt);
 
+			return true;
+		},
+		
+		onLayoutChange(layout) {
+			let doc = this.get('document');
+			doc.set('layout', layout);
+			this.get('documentService').save(doc);
+			
 			return true;
 		}
     }
diff --git a/app/app/models/document.js b/app/app/models/document.js
index b32b2545..91a6335d 100644
--- a/app/app/models/document.js
+++ b/app/app/models/document.js
@@ -25,6 +25,7 @@ export default Model.extend({
 	userId: attr('string'),
 	tags: attr('string'),
 	template: attr('boolean'),
+	layout: attr('string'),
 
 	// client-side property
 	selected: attr('boolean', { defaultValue: false }),
diff --git a/app/app/styles/view/document/view.scss b/app/app/styles/view/document/view.scss
index f8e18d4a..06f5dc03 100644
--- a/app/app/styles/view/document/view.scss
+++ b/app/app/styles/view/document/view.scss
@@ -51,7 +51,7 @@
 		@include content-container();
 		@include ease-in();
 		@extend .transition-all;
-		overflow-x: scroll;
+		overflow-x: auto;
 
 		&:hover {
 			.page-title {
@@ -329,6 +329,28 @@
 	}
 }
 
+.document-view-unified {
+	margin: 0 0 50px 0;
+	@include content-container();
+	@include ease-in();
+	@extend .transition-all;
+
+	.is-a-page, .is-a-tab {
+		padding: 0 !important;
+		box-shadow: none !important;
+		background-color: transparent !important;
+		@include border-radius(0px);
+	}
+
+	.tab-min, .tab-max {
+		padding: 0 !important;
+	}
+
+	.start-section {
+		height: 50px !important;
+	}
+}
+
 .dropdown-page-toolbar {
 	width: 300px;
 }
diff --git a/app/app/templates/components/document/document-view.hbs b/app/app/templates/components/document/document-view.hbs
index 6ac64126..fea2ca70 100644
--- a/app/app/templates/components/document/document-view.hbs
+++ b/app/app/templates/components/document/document-view.hbs
@@ -1,4 +1,4 @@
-<div class="document-view">
+<div class="document-view {{if (is-equal document.layout 'doc') 'document-view-unified'}}">
 
 	{{#if hasPages}}
 		{{#each pages key="id" as |page index|}}
diff --git a/app/app/templates/components/document/sidebar-zone.hbs b/app/app/templates/components/document/sidebar-zone.hbs
index 825efb15..316c1a79 100644
--- a/app/app/templates/components/document/sidebar-zone.hbs
+++ b/app/app/templates/components/document/sidebar-zone.hbs
@@ -43,6 +43,13 @@
 {{#dropdown-menu target="sidebar-zone-more-button" position="bottom left" open="click" onOpenCallback=(action 'onMenuOpen') onCloseCallback=(action 'onMenuOpen')}}
     <ul class="menu">
         {{#if session.authenticated}}
+            {{#if (is-equal document.layout 'section')}}
+                <li class="item" {{action 'onLayoutChange' 'doc'}}>Flat view</li>
+                <li class="divider"></li>
+            {{else}}
+                <li class="item" {{action 'onLayoutChange' 'section'}}>Section view</li>
+                <li class="divider"></li>
+            {{/if}}
             {{#if pinState.isPinned}}
                 <li class="item" {{action 'onUnpin'}}>Unpin</li>
             {{else}}
diff --git a/core/api/entity/objects.go b/core/api/entity/objects.go
index 27661e80..91ba53dc 100644
--- a/core/api/entity/objects.go
+++ b/core/api/entity/objects.go
@@ -166,6 +166,7 @@ type Document struct {
 	Slug     string `json:"-"`
 	Tags     string `json:"tags"`
 	Template bool   `json:"template"`
+	Layout   string `json:"layout"`
 }
 
 // SetDefaults ensures on blanks and cleans.
diff --git a/core/api/request/document.go b/core/api/request/document.go
index ae88605d..72a10ae1 100644
--- a/core/api/request/document.go
+++ b/core/api/request/document.go
@@ -49,7 +49,7 @@ func (p *Persister) AddDocument(document entity.Document) (err error) {
 
 // GetDocument fetches the document record with the given id fromt the document table and audits that it has been got.
 func (p *Persister) GetDocument(id string) (document entity.Document, err error) {
-	stmt, err := Db.Preparex("SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, created, revised FROM document WHERE orgid=? and refid=?")
+	stmt, err := Db.Preparex("SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, layout, created, revised FROM document WHERE orgid=? and refid=?")
 	defer utility.Close(stmt)
 
 	if err != nil {
@@ -108,7 +108,7 @@ func (p *Persister) GetDocumentMeta(id string) (meta entity.DocumentMeta, err er
 
 // GetDocuments returns a slice containg all of the the documents for the client's organisation, with the most recient first.
 func (p *Persister) GetDocuments() (documents []entity.Document, err error) {
-	err = Db.Select(&documents, "SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, created, revised FROM document WHERE orgid=? AND template=0 ORDER BY revised DESC", p.Context.OrgID)
+	err = Db.Select(&documents, "SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, layout, created, revised FROM document WHERE orgid=? AND template=0 ORDER BY revised DESC", p.Context.OrgID)
 
 	if err != nil {
 		log.Error(fmt.Sprintf("Unable to execute select documents for org %s", p.Context.OrgID), err)
@@ -120,7 +120,7 @@ func (p *Persister) GetDocuments() (documents []entity.Document, err error) {
 
 // GetDocumentsByFolder returns a slice containing the documents for a given folder, most recient first.
 func (p *Persister) GetDocumentsByFolder(folderID string) (documents []entity.Document, err error) {
-	err = Db.Select(&documents, "SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, created, revised FROM document WHERE orgid=? AND template=0 AND labelid=? ORDER BY revised DESC", p.Context.OrgID, folderID)
+	err = Db.Select(&documents, "SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, layout, created, revised FROM document WHERE orgid=? AND template=0 AND labelid=? ORDER BY revised DESC", p.Context.OrgID, folderID)
 
 	if err != nil {
 		log.Error(fmt.Sprintf("Unable to execute select documents for org %s", p.Context.OrgID), err)
@@ -136,7 +136,7 @@ func (p *Persister) GetDocumentsByTag(tag string) (documents []entity.Document,
 	tagQuery := "tags LIKE '%#" + tag + "#%'"
 
 	err = Db.Select(&documents,
-		`SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, created, revised FROM document WHERE orgid=? AND template=0 AND `+tagQuery+` AND labelid IN
+		`SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, layout, created, revised FROM document WHERE orgid=? AND template=0 AND `+tagQuery+` AND labelid IN
 		(SELECT refid from label WHERE orgid=? AND type=2 AND userid=?
     	UNION ALL SELECT refid FROM label a where orgid=? AND type=1 AND refid IN (SELECT labelid from labelrole WHERE orgid=? AND userid='' AND (canedit=1 OR canview=1))
 		UNION ALL SELECT refid FROM label a where orgid=? AND type=3 AND refid IN (SELECT labelid from labelrole WHERE orgid=? AND userid=? AND (canedit=1 OR canview=1)))
@@ -161,7 +161,7 @@ func (p *Persister) GetDocumentsByTag(tag string) (documents []entity.Document,
 // GetDocumentTemplates returns a slice containing the documents available as templates to the client's organisation, in title order.
 func (p *Persister) GetDocumentTemplates() (documents []entity.Document, err error) {
 	err = Db.Select(&documents,
-		`SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, created, revised FROM document WHERE orgid=? AND template=1 AND labelid IN
+		`SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, layout, created, revised FROM document WHERE orgid=? AND template=1 AND labelid IN
 		(SELECT refid from label WHERE orgid=? AND type=2 AND userid=?
     	UNION ALL SELECT refid FROM label a where orgid=? AND type=1 AND refid IN (SELECT labelid from labelrole WHERE orgid=? AND userid='' AND (canedit=1 OR canview=1))
 		UNION ALL SELECT refid FROM label a where orgid=? AND type=3 AND refid IN (SELECT labelid from labelrole WHERE orgid=? AND userid=? AND (canedit=1 OR canview=1)))
@@ -203,7 +203,7 @@ AND d.template=0`, orgID)
 // GetDocumentList returns a slice containing the documents available as templates to the client's organisation, in title order.
 func (p *Persister) GetDocumentList() (documents []entity.Document, err error) {
 	err = Db.Select(&documents,
-		`SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, created, revised FROM document WHERE orgid=? AND template=0 AND labelid IN
+		`SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, layout, created, revised FROM document WHERE orgid=? AND template=0 AND labelid IN
 		(SELECT refid from label WHERE orgid=? AND type=2 AND userid=?
     	UNION ALL SELECT refid FROM label a where orgid=? AND type=1 AND refid IN (SELECT labelid from labelrole WHERE orgid=? AND userid='' AND (canedit=1 OR canview=1))
 		UNION ALL SELECT refid FROM label a where orgid=? AND type=3 AND refid IN (SELECT labelid from labelrole WHERE orgid=? AND userid=? AND (canedit=1 OR canview=1)))
@@ -301,7 +301,7 @@ func (p *Persister) SearchDocument(keywords string) (results []entity.DocumentSe
 func (p *Persister) UpdateDocument(document entity.Document) (err error) {
 	document.Revised = time.Now().UTC()
 
-	stmt, err := p.Context.Transaction.PrepareNamed("UPDATE document SET labelid=:labelid, userid=:userid, job=:job, location=:location, title=:title, excerpt=:excerpt, slug=:slug, tags=:tags, template=:template, revised=:revised WHERE orgid=:orgid AND refid=:refid")
+	stmt, err := p.Context.Transaction.PrepareNamed("UPDATE document SET labelid=:labelid, userid=:userid, job=:job, location=:location, title=:title, excerpt=:excerpt, slug=:slug, tags=:tags, template=:template, layout=:layout, revised=:revised WHERE orgid=:orgid AND refid=:refid")
 	defer utility.Close(stmt)
 
 	if err != nil {
diff --git a/core/database/scripts/autobuild/db_00012.sql b/core/database/scripts/autobuild/db_00012.sql
new file mode 100644
index 00000000..4fd39c9d
--- /dev/null
+++ b/core/database/scripts/autobuild/db_00012.sql
@@ -0,0 +1,3 @@
+/* community edition */
+ALTER TABLE document ALTER COLUMN `layout` SET DEFAULT 'section';
+UPDATE document SET layout='section';