diff --git a/.vscode/settings.json b/.vscode/settings.json
index 36cdc89d..8fe7823e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
   "eslint.enable": true,
-"puglint.enable": true,
-"standard.enable": false
+  "puglint.enable": true,
+  "standard.enable": false,
+  "editor.formatOnSave": true
 }
diff --git a/client/js/app.js b/client/js/app.js
index 46f5afc4..ab93d206 100644
--- a/client/js/app.js
+++ b/client/js/app.js
@@ -19,7 +19,8 @@ $(() => {
     offset: -50
   })
 
-  $('.stickyscroll').sticky({ topSpacing: 15, bottomSpacing: 75 })
+  $('#header').sticky({ topSpacing: 0 })
+  $('.sidebar-pagecontents').sticky({ topSpacing: 15, bottomSpacing: 75 })
 
   // ====================================
   // Notifications
diff --git a/client/scss/components/_editor.scss b/client/scss/components/_editor.scss
index a215bc04..c44e78e5 100644
--- a/client/scss/components/_editor.scss
+++ b/client/scss/components/_editor.scss
@@ -1,8 +1,9 @@
 
 .editor-toolbar {
 	z-index: 2;
-	background-color: mc('indigo', '900');
+	background: linear-gradient(to bottom, mc('blue-grey', '900'), mc('blue-grey', '700'));
 	border: none;
+  border-top: 1px solid mc('blue-grey', '400');
 	border-top-left-radius: 0;
 	border-top-right-radius: 0;
 	opacity: 1;
@@ -10,6 +11,7 @@
 	top: 50px;
 	left: 0;
 	width: 100%;
+  box-shadow: 0 0 5px rgba(0,0,0,.75);
 
 	&:hover {
 		opacity: 1;
@@ -299,27 +301,33 @@
 .CodeMirror {
 	border-left: none;
 	border-right: none;
-	padding-top: 52px;
-	font-family: $core-font-monospace;
+	margin-top: 49px;
+	font-family: $core-font-standard;
+  border: 10px solid mc('blue-grey', '100');
 }
 
-.CodeMirror .CodeMirror-code .cm-url {
-	color: #00ACC1;
-}
-.CodeMirror .CodeMirror-code .cm-header-1 {
-	color: #635c8c;
-	font-size: 2em;
-	font-weight: 400;
-}
-.CodeMirror .CodeMirror-code .cm-header-2 {
-	color: #222324;
-	font-size: 1.75em;
-	font-weight: 300;
-}
-.CodeMirror .CodeMirror-code .cm-header-3 {
-	color: #222324;
-	font-size: 1.5em;
-	font-weight: 300;
+.CodeMirror .CodeMirror-code {
+  .cm-url {
+    color: #00ACC1;
+  }
+  .cm-header-1 {
+    color: #635c8c;
+    font-size: 2em;
+    font-weight: 400;
+  }
+  .cm-header-2 {
+    color: #222324;
+    font-size: 1.75em;
+    font-weight: 300;
+  }
+  .cm-header-3 {
+    color: #222324;
+    font-size: 1.5em;
+    font-weight: 300;
+  }
+  .cm-formatting-code-block, .cm-comment {
+    font-family: $core-font-monospace;
+  }
 }
 
 .editor-toolbar .fa {
diff --git a/server/views/common/header.pug b/server/views/common/header.pug
index 135328e0..79451f64 100644
--- a/server/views/common/header.pug
+++ b/server/views/common/header.pug
@@ -1,6 +1,6 @@
 
 #header-container
-  nav.nav.stickyscroll#header
+  nav.nav#header
     .nav-left
       block rootNavLeft
         a.nav-item(href='/')
diff --git a/server/views/pages/view.pug b/server/views/pages/view.pug
index b2782650..fb4a8e21 100644
--- a/server/views/pages/view.pug
+++ b/server/views/pages/view.pug
@@ -64,7 +64,7 @@ block content
                   a(href='/login')
                     i.icon-unlock
                     span= t('nav.login')
-          aside.stickyscroll
+          aside.sidebar-pagecontents
             .sidebar-label
               span= t('sidebar.pagecontents')
             ul.sidebar-menu