diff --git a/app/app/components/document/document-view.js b/app/app/components/document/document-view.js
index 464086b0..0344d6c2 100644
--- a/app/app/components/document/document-view.js
+++ b/app/app/components/document/document-view.js
@@ -30,11 +30,11 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 	toEdit: '',
 
 	didReceiveAttrs() {
-		if (this.get('isDestroyed') || this.get('isDestroying')) {
-			return;
-		}
-
 		this.get('sectionService').getSpaceBlocks(this.get('folder.id')).then((blocks) => {
+			if (this.get('isDestroyed') || this.get('isDestroying')) {
+				return;
+			}
+
 			this.set('blocks', blocks);
 			this.set('hasBlocks', blocks.get('length') > 0);
 
@@ -141,8 +141,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 		promise.then((id) => {
 			if (model.page.pageType === 'section') {
 				this.set('toEdit', id);
-			} else {
-				this.get('onEditSection')(id);
 			}
 		});
 	},
diff --git a/app/app/components/section/gemini/type-editor.js b/app/app/components/section/gemini/type-editor.js
index e2175aa7..762236ea 100644
--- a/app/app/components/section/gemini/type-editor.js
+++ b/app/app/components/section/gemini/type-editor.js
@@ -110,11 +110,16 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
 
 		this.get('sectionService').fetch(page, "items", this.get('config'))
 			.then(function (response) {
-				// console.log(response);
+				if (self.get('isDestroyed') || self.get('isDestroying')) {
+					return;
+				}
 				self.set('items', response);
 				self.set('config.itemCount', response.length);
 				self.set('waiting', false);
 			}, function (reason) { //jshint ignore: line
+				if (self.get('isDestroyed') || self.get('isDestroying')) {
+					return;
+				}
 				self.set('items', []);
 				self.set('waiting', false);
 			});
diff --git a/app/app/pods/document/index/controller.js b/app/app/pods/document/index/controller.js
index 606888b2..2a832d60 100644
--- a/app/app/pods/document/index/controller.js
+++ b/app/app/pods/document/index/controller.js
@@ -53,7 +53,6 @@ export default Ember.Controller.extend(NotifierMixin, {
 
 			this.get('documentService').copyPage(documentId, pageId, targetDocumentId).then(() => {
 				this.showNotification("Moved");
-
 				this.send('onPageDeleted', { id: pageId, children: false });
 			});
 		},
@@ -70,8 +69,8 @@ export default Ember.Controller.extend(NotifierMixin, {
 				self.audit.record("edited-page");
 				self.get('documentService').getPages(documentId).then((pages) => {
 					self.set('model.pages', pages);
+					self.get('target.router').refresh();
 				});
-
 			});
 		},
 
@@ -138,21 +137,22 @@ export default Ember.Controller.extend(NotifierMixin, {
 
 					this.get('documentService').getPages(this.get('model.document.id')).then((pages) => {
 						this.set('model.pages', pages);
-						resolve(newPage.id);
+
+						if (newPage.pageType === 'section') {
+							resolve(newPage.id);
+						} else {
+							this.transitionToRoute('document.section',
+								this.get('model.folder.id'),
+								this.get('model.folder.slug'),
+								this.get('model.document.id'),
+								this.get('model.document.slug'),
+								newPage.id);
+						}
 					});
 				});
 			});
 		},
 
-		onEditSection(pageId) {
-			this.transitionToRoute('document.section',
-				this.get('model.folder.id'),
-				this.get('model.folder.slug'),
-				this.get('model.document.id'),
-				this.get('model.document.slug'),
-				pageId);
-		},
-
 		// to test
 		onPageSequenceChange(changes) {
 			this.get('documentService').changePageSequence(this.get('model.document.id'), changes).then(() => {
diff --git a/app/app/pods/document/index/route.js b/app/app/pods/document/index/route.js
index eb757ae3..93757b0d 100644
--- a/app/app/pods/document/index/route.js
+++ b/app/app/pods/document/index/route.js
@@ -19,7 +19,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	userService: Ember.inject.service('user'),
 	queryParams: {
 		pageId: {
-			refreshModel: false
+			refreshModel: true
 		}
 	},
 
@@ -38,7 +38,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 			document: this.modelFor('document').document,
 			pageId: this.get('pageId'),
 			isEditor: this.get('folderService').get('canEditCurrentFolder'),
-			pages: this.modelFor('document').pages,
+			pages: this.get('documentService').getPages(this.modelFor('document').document.get('id')),
 			links: this.modelFor('document').links,
 			sections: this.modelFor('document').sections
 		});
diff --git a/app/app/pods/document/index/template.hbs b/app/app/pods/document/index/template.hbs
index 2384fd79..f2d17ae4 100644
--- a/app/app/pods/document/index/template.hbs
+++ b/app/app/pods/document/index/template.hbs
@@ -67,7 +67,7 @@
 							folder=model.folder folders=model.folders sections=model.sections isEditor=model.isEditor pageId=pageId
 							onSavePage=(action 'onSavePage') onInsertSection=(action 'onInsertSection') 
 							onSavePageAsBlock=(action 'onSavePageAsBlock') onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') 
-							onDeletePage=(action 'onPageDeleted') onEditSection=(action 'onEditSection')}}
+							onDeletePage=(action 'onPageDeleted')}}
 					</div>
 				</div>
 			</div>
diff --git a/app/app/pods/document/section/controller.js b/app/app/pods/document/section/controller.js
index ba85228b..974032bc 100644
--- a/app/app/pods/document/section/controller.js
+++ b/app/app/pods/document/section/controller.js
@@ -14,8 +14,6 @@ import NotifierMixin from '../../../mixins/notifier';
 
 export default Ember.Controller.extend(NotifierMixin, {
 	documentService: Ember.inject.service('document'),
-	queryParams: ['mode'],
-	mode: null,
 
 	actions: {
 		onCancel() {
diff --git a/app/app/pods/document/section/route.js b/app/app/pods/document/section/route.js
index 68d3f7f2..04165c37 100644
--- a/app/app/pods/document/section/route.js
+++ b/app/app/pods/document/section/route.js
@@ -17,15 +17,6 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	folderService: Ember.inject.service('folder'),
 	userService: Ember.inject.service('user'),
 	pageId: '',
-	queryParams: {
-		mode: {
-			refreshModel: false
-		}
-	},
-
-	beforeModel(transition) {
-		this.set('mode', !_.isUndefined(transition.queryParams.mode) ? transition.queryParams.mode : '');
-	},
 
 	model(params) {
 		return Ember.RSVP.hash({