diff --git a/README.md b/README.md
index 6208ee3c..e8e828c7 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ The mission is to bring software dev inspired features (refactoring, testing, li
 
 ## Latest version
 
-v0.35.0
+v0.36.0
 
 ## OS Support
 
diff --git a/app/app/styles/view/document/toolbar.scss b/app/app/styles/view/document/toolbar.scss
index 61791aec..9937141c 100644
--- a/app/app/styles/view/document/toolbar.scss
+++ b/app/app/styles/view/document/toolbar.scss
@@ -9,7 +9,7 @@
 	@extend .no-select;
 
 	> .tabs {
-		width: 80%;
+		width: 70%;
 		height: 50px;
 		margin-top: 15px;
 		display: inline-block;
@@ -64,7 +64,7 @@
 	}
 
 	> .options {
-		width: 20%;
+		width: 30%;
 		height: 50px;
 		margin-top: 15px;
 		display: inline-block;
diff --git a/app/bower.json b/app/bower.json
index a11a3a6a..d7f0024f 100644
--- a/app/bower.json
+++ b/app/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "documize",
   "dependencies": {
-    "ember": "~2.9.1",
+    "ember": "~2.10.0",
     "ember-cli-shims": "0.1.3"
   }
 }
diff --git a/app/package.json b/app/package.json
index 16006fad..fad37418 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,50 +1,52 @@
 {
-	"name": "documize",
-	"version": "0.35.0",
-	"description": "The Document IDE",
-	"private": true,
-	"directories": {
-		"doc": "doc",
-		"test": "tests"
-	},
-	"scripts": {
-		"build": "ember build",
-		"start": "ember server",
-		"test": "ember test"
-	},
-	"repository": "",
-	"engines": {
-		"node": ">= 0.10.0"
-	},
-	"author": "",
-	"license": "AGPL",
-	"devDependencies": {
-		"broccoli-asset-rev": "^2.4.5",
-		"ember-ajax": "^2.4.1",
-		"ember-cli": "2.9.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-inject-live-reload": "^1.4.1",
-		"ember-cli-jshint": "^1.0.4",
-		"ember-cli-qunit": "^3.0.1",
-		"ember-cli-release": "^0.2.9",
-		"ember-cli-sri": "^2.1.0",
-		"ember-cli-test-loader": "^1.1.0",
-		"ember-cli-uglify": "^1.2.0",
-		"ember-data": "^2.9.0",
-		"ember-export-application-global": "^1.0.5",
-		"ember-load-initializers": "^0.5.1",
-		"ember-resolver": "^2.0.3",
-		"ember-cli-mirage": "^0.2.0",
-		"ember-cli-sass": "5.3.1",
-		"ember-data": "^2.9.0",
-		"ember-simple-auth": "git+https://github.com/documize/ember-simple-auth.git#21e638f9e33267d8944835002ee96884d34d568a",
-		"loader.js": "^4.0.10"
-	},
-	"ember-addon": {
-		"paths": ["lib/intercom"]
-	}
+  "name": "documize",
+  "version": "0.36.0",
+  "description": "The Document IDE",
+  "private": true,
+  "repository": "",
+  "directories": {
+    "doc": "doc",
+    "test": "tests"
+  },
+  "scripts": {
+    "build": "ember build",
+    "start": "ember server",
+    "test": "ember test"
+  },
+  "repository": "",
+  "engines": {
+    "node": ">= 0.10.0"
+  },
+  "author": "",
+  "license": "AGPL",
+  "devDependencies": {
+    "broccoli-asset-rev": "^2.4.5",
+    "ember-ajax": "^2.4.1",
+    "ember-cli": "2.10.0",
+    "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-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-sri": "^2.1.0",
+    "ember-cli-test-loader": "^1.1.0",
+    "ember-cli-uglify": "^1.2.0",
+    "ember-data": "^2.10.0",
+    "ember-export-application-global": "^1.0.5",
+    "ember-load-initializers": "^0.5.1",
+    "ember-resolver": "^2.0.3",
+    "ember-simple-auth": "git+https://github.com/documize/ember-simple-auth.git#21e638f9e33267d8944835002ee96884d34d568a",
+    "loader.js": "^4.0.10"
+  },
+  "ember-addon": {
+    "paths": [
+      "lib/intercom"
+    ]
+  }
 }
diff --git a/app/tests/index.html b/app/tests/index.html
index cb51b93b..c2a22715 100644
--- a/app/tests/index.html
+++ b/app/tests/index.html
@@ -1,50 +1,33 @@
 <!DOCTYPE html>
 <html>
-
-<head>
+  <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Documize Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta property="dbname" content="{{.DBname}}" />
-    <meta property="dbhash" content="{{.DBhash}}" />
-    <meta name="author" content="Documize" />
-    <style>
-    #ember-testing {
-        zoom: 100% !important;
-    }
-    #ember-testing-container {
-        /* Set position static to short-circuit Hubspot Tether's positioning */
-        /* https://github.com/HubSpot/tether/pull/98/ */
-        position: static !important;
-    }
-    </style>
 
     {{content-for "head"}}
     {{content-for "test-head"}}
 
-    <link rel="stylesheet" href="assets/vendor.css">
-    <link rel="stylesheet" href="assets/documize.css">
-    <link rel="stylesheet" href="assets/test-support.css" />
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/documize.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
 
     {{content-for "head-footer"}}
     {{content-for "test-head-footer"}}
-</head>
-
-<body>
+  </head>
+  <body>
     {{content-for "body"}}
     {{content-for "test-body"}}
 
-    <script src="testem.js" integrity=""></script>
-    <script src="assets/vendor.js"></script>
-    <script src="assets/test-support.js"></script>
-    <script src="assets/documize.js"></script>
-    <script src="assets/tests.js"></script>
-    <script src="assets/test-loader.js"></script>
+    <script src="/testem.js" integrity=""></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/test-support.js"></script>
+    <script src="{{rootURL}}assets/documize.js"></script>
+    <script src="{{rootURL}}assets/tests.js"></script>
 
     {{content-for "body-footer"}}
     {{content-for "test-body-footer"}}
-</body>
-
+  </body>
 </html>
diff --git a/core/product.go b/core/product.go
index b724bc41..c9077cc3 100644
--- a/core/product.go
+++ b/core/product.go
@@ -26,7 +26,7 @@ type ProdInfo struct {
 // Product returns product edition details
 func Product() (p ProdInfo) {
 	p.Major = "0"
-	p.Minor = "35"
+	p.Minor = "36"
 	p.Patch = "0"
 	p.Version = fmt.Sprintf("%s.%s.%s", p.Major, p.Minor, p.Patch)
 	p.Edition = "Community"