diff --git a/app/app/components/document/document-sidebar-toc.js b/app/app/components/document/document-sidebar-toc.js
index 4535e8cb..8f56d58f 100644
--- a/app/app/components/document/document-sidebar-toc.js
+++ b/app/app/components/document/document-sidebar-toc.js
@@ -160,6 +160,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 		onEntryClick(id) {
 			this.setState(id);
 			this.attrs.gotoPage(id);
-		},
-	},
+		}
+	}
 });
diff --git a/app/app/pods/document/route.js b/app/app/pods/document/route.js
index c8edae3b..69550ff1 100644
--- a/app/app/pods/document/route.js
+++ b/app/app/pods/document/route.js
@@ -46,7 +46,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 
 		return new Ember.RSVP.Promise(function (resolve) {
 			self.get('documentService').getPages(documentId).then(function (pages) {
-				self.set('pages', pages);
+				self.set('allPages', pages);
 
 				self.get('sectionService').getAll().then(function (sections) {
 					self.set('sections', sections.filterBy('pageType', 'section'));
@@ -62,8 +62,8 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 		controller.set('folders', this.get('folders').rejectBy('id', 0));
 		controller.set('currentPage', this.pageId);
 		controller.set('isEditor', this.get('folderService').get('canEditCurrentFolder'));
-		controller.set('pages', this.get('pages').filterBy('pageType', 'section'));
-		controller.set('tabs', this.get('pages').filterBy('pageType', 'tab'));
+		controller.set('pages', this.get('allPages').filterBy('pageType', 'section'));
+		controller.set('tabs', this.get('allPages').filterBy('pageType', 'tab'));
 		controller.set('sections', this.get('sections'));
 
 		// setup document owner
diff --git a/app/app/pods/document/template.hbs b/app/app/pods/document/template.hbs
index 85324d38..1d9c44ca 100644
--- a/app/app/pods/document/template.hbs
+++ b/app/app/pods/document/template.hbs
@@ -7,5 +7,7 @@
 
 {{#layout/zone-content}}
 	{{document/document-toolbar document=model pages=pages tabs=tabs folder=folder isEditor=isEditor
-		onSaveTemplate=(action 'onSaveTemplate') onDocumentDelete=(action 'onDocumentDelete')}} {{outlet}}
+		onSaveTemplate=(action 'onSaveTemplate') onDocumentDelete=(action 'onDocumentDelete')}}
+
+		{{outlet}}
 {{/layout/zone-content}}
diff --git a/app/app/utils/toc.js b/app/app/utils/toc.js
index acf7e21e..48da0815 100644
--- a/app/app/utils/toc.js
+++ b/app/app/utils/toc.js
@@ -203,7 +203,7 @@ function moveDown(state, pages, current) {
 		}
 	} else {
 		// startingSequence = downTarget.sequence * 2;
-		startingSequence = cutOff[cutOff.length - 1].sequence * 2;
+		startingSequence = cutOff[cutOff.length - 1].get('sequence') * 2;
 		upperSequence = startingSequence * 2;
 	}