diff --git a/app/app/components/document/document-page.js b/app/app/components/document/document-page.js
index 7ab40e3a..eaf2614f 100644
--- a/app/app/components/document/document-page.js
+++ b/app/app/components/document/document-page.js
@@ -37,6 +37,13 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 	},
 
 	actions: {
+		onSavePage(page, meta) {
+			this.set('page', page);
+			this.set('meta', meta);
+			this.set('editMode', false);
+			this.get('onSavePage')(page, meta);
+		},
+
 		onSavePageAsBlock(block) {
 			this.attrs.onSavePageAsBlock(block);
 		},
@@ -75,11 +82,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 
 		onCancelEdit() {
 			this.set('editMode', false);
-		},
-
-		onSavePage(page, meta) {
-			this.get('onSavePage')(page, meta);
-			this.set('editMode', false);
 		}
 	}
 });
diff --git a/app/app/components/section/code/type-renderer.js b/app/app/components/section/code/type-renderer.js
index c44053b7..3440a054 100644
--- a/app/app/components/section/code/type-renderer.js
+++ b/app/app/components/section/code/type-renderer.js
@@ -17,6 +17,9 @@ export default Ember.Component.extend({
 
     didReceiveAttrs() {
         this._super(...arguments);
+        if (this.get('isDestroyed') || this.get('isDestroying')) {
+            return;
+        }
 
         CodeMirror.modeURL = "/codemirror/mode/%N/%N.js";
 
@@ -44,6 +47,9 @@ export default Ember.Component.extend({
 
     didInsertElement() {
         this._super(...arguments);
+        if (this.get('isDestroyed') || this.get('isDestroying')) {
+            return;
+        }
 
         let page = this.get('page');
         let elem = `page-${page.id}-code`;
diff --git a/app/app/templates/components/document/document-page.hbs b/app/app/templates/components/document/document-page.hbs
index 62a53970..9395fb09 100644
--- a/app/app/templates/components/document/document-page.hbs
+++ b/app/app/templates/components/document/document-page.hbs
@@ -1,8 +1,8 @@
 <div id="page-{{ page.id }}" class="is-a-page wysiwyg" data-id="{{ page.id }}" data-type="{{ page.contentType }}">
 	{{#unless editMode}}
 		{{document/page-heading tagName=page.tagName document=document folder=folder page=page isEditor=isEditor tabMode=tabMode
-			onEdit=(action 'onEdit')
-			onSavePageAsBlock=(action 'onSavePageAsBlock') onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onDeletePage')}}
+			onEdit=(action 'onEdit') onSavePageAsBlock=(action 'onSavePageAsBlock')
+			onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onDeletePage')}}
 		{{section/base-renderer page=page}}
 	{{else}}
 		{{document/document-editor document=document folder=folder page=page meta=meta onCancel=(action 'onCancelEdit') onAction=(action 'onSavePage')}}
diff --git a/app/bower.json b/app/bower.json
index d7f0024f..955ef78c 100644
--- a/app/bower.json
+++ b/app/bower.json
@@ -1,7 +1,5 @@
 {
   "name": "documize",
   "dependencies": {
-    "ember": "~2.10.0",
-    "ember-cli-shims": "0.1.3"
   }
 }
diff --git a/app/package.json b/app/package.json
index 937279f5..b43cfe92 100644
--- a/app/package.json
+++ b/app/package.json
@@ -13,7 +13,6 @@
     "start": "ember server",
     "test": "ember test"
   },
-  "repository": "",
   "engines": {
     "node": ">= 0.10.0"
   },
@@ -22,26 +21,28 @@
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
     "ember-ajax": "^2.4.1",
-    "ember-cli": "2.10.0",
+    "ember-cli": "2.11.1",
     "ember-cli-app-version": "^2.0.0",
     "ember-cli-babel": "^5.1.7",
     "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-htmlbars": "^1.0.10",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.3",
+    "ember-cli-htmlbars": "^1.1.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-jshint": "^2.0.1",
     "ember-cli-mirage": "^0.2.0",
     "ember-cli-qunit": "^3.0.1",
     "ember-cli-release": "^0.2.9",
     "ember-cli-sass": "5.3.1",
+    "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.10.0",
+    "ember-data": "^2.11.0",
     "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.5.1",
+    "ember-load-initializers": "^0.6.0",
     "ember-resolver": "^2.0.3",
     "ember-simple-auth": "git+https://github.com/documize/ember-simple-auth.git#21e638f9e33267d8944835002ee96884d34d568a",
+    "ember-source": "~2.11.0",
     "loader.js": "^4.0.10"
   },
   "ember-addon": {