diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee
index ad875294a1..068750c3d9 100644
--- a/cms/static/coffee/src/views/module_edit.coffee
+++ b/cms/static/coffee/src/views/module_edit.coffee
@@ -74,4 +74,5 @@ class CMS.Views.ModuleEdit extends Backbone.View
     event.preventDefault()
     @$el.addClass('editing')
     @$component_editor().slideDown(150)
+    # $modalCover.show()
     @loadEdit()
diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index f5376cd0e5..eefe1c61ce 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -9,7 +9,7 @@ body {
     background: #eaecf3;
     font-size: 16px;
     line-height: 1.6;
-    color: #3c3c3c;
+    color: $baseFontColor;
 }
 
 body,
@@ -93,7 +93,7 @@ input[type="password"] {
     @include box-shadow(0 1px 2px rgba(0, 0, 0, .1) inset);
     font-family: 'Open Sans', sans-serif;
     font-size: 11px;
-    color: #3c3c3c;
+    color: $baseFontColor;
     outline: 0;
 
     &::-webkit-input-placeholder,
@@ -110,7 +110,7 @@ input.search {
     border-radius: 20px;
     background: url(../img/search-icon.png) no-repeat 8px 7px #edf1f5;
     font-family: 'Open Sans', sans-serif;
-    color: #3c3c3c;
+    color: $baseFontColor;
     outline: 0;
 
     &::-webkit-input-placeholder {
@@ -129,6 +129,12 @@ code {
     font-family: Monaco, monospace;
 }
 
+.CodeMirror {
+    font-size: 13px;
+    border: 1px solid $darkGrey;
+    background: #fff;
+}
+
 .text-editor {
     width: 100%;
     min-height: 80px;
diff --git a/cms/static/sass/_cms_mixins.scss b/cms/static/sass/_cms_mixins.scss
index 2c794ee266..50b62b7d57 100644
--- a/cms/static/sass/_cms_mixins.scss
+++ b/cms/static/sass/_cms_mixins.scss
@@ -130,18 +130,17 @@
 @mixin edit-box {
 	padding: 15px 20px;
 	border-radius: 3px;
-	border: 1px solid #5597dd;
-	@include linear-gradient(top, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0));
-	background-color: #5597dd;
+	background-color: $lightBluishGrey;
+	color: #3c3c3c;
 	@include box-shadow(0 1px 0 rgba(255, 255, 255, .2) inset);
 
 	label {
-		color: #fff;
+		color: $baseFontColor;
 	}
 
 	input,
 	textarea {
-		border: 1px solid #3c3c3c;
+		border: 1px solid $darkGrey;
 	}
 
 	textarea {
@@ -161,14 +160,12 @@
 	}
 
 	.save-button {
-		@include orange-button;
-		border-color: #3c3c3c;
+		@include blue-button;
 		margin-top: 0;
 	}
 
 	.cancel-button {
 		@include white-button;
-		border-color: #30649C;
 		margin-top: 0;
 	}
 }
diff --git a/cms/static/sass/_header.scss b/cms/static/sass/_header.scss
index ab1dcea03a..8402fa54be 100644
--- a/cms/static/sass/_header.scss
+++ b/cms/static/sass/_header.scss
@@ -49,8 +49,8 @@ body.no-header {
 	.class-nav-bar {
 		clear: both;
 		@include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
-		background-color: rgb(197, 207, 223);
-		@include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 -1px 0 rgba(0, 0, 0, 0.2) inset, 0 1px 1px rgba(0, 0, 0, 0.1));
+		background-color: $lightBluishGrey;
+		@include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 -1px 0 rgba(0, 0, 0, 0.2) inset);
 	}
 
 	.class-nav {
@@ -80,7 +80,6 @@ body.no-header {
 		color: rgb(163, 171, 184);
 		@include linear-gradient(top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .1));
 		background-color: rgb(47, 53, 63);
-		@include box-shadow(0 -1px 3px rgba(0, 0, 0, 0.6) inset);
 
 		a {
 			display: inline-block;
diff --git a/cms/static/sass/_static-pages.scss b/cms/static/sass/_static-pages.scss
index f862484250..9a2d1303ec 100644
--- a/cms/static/sass/_static-pages.scss
+++ b/cms/static/sass/_static-pages.scss
@@ -10,6 +10,11 @@
     padding: 0;
   }
 
+  .component-editor {
+    border: none;
+    border-radius: 0;
+  }
+
   .components > li {
     margin: 0;
     border-radius: 0;
diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index a7a33f6024..978d53e1b3 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -156,7 +156,6 @@
     }
 
     &.editing {
-      border-color: #6696d7;
 
       .drag-handle,
       .component-actions {
@@ -203,10 +202,6 @@
     @include edit-box;
     display: none;
     padding: 20px;
-    border-radius: 2px 2px 0 0;
-    @include linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, .1));
-    background-color: $blue;
-    color: #fff;
     @include box-shadow(none);
 
     .metadata_edit {
@@ -223,12 +218,6 @@
       }
     }
 
-    .CodeMirror {
-      border: 1px solid #3c3c3c;
-      background: #fff;
-      color: #3c3c3c;
-    }
-
     h3 {
       margin-bottom: 10px;
       font-size: 18px;
diff --git a/cms/static/sass/_variables.scss b/cms/static/sass/_variables.scss
index 98134fc83e..985d87ca70 100644
--- a/cms/static/sass/_variables.scss
+++ b/cms/static/sass/_variables.scss
@@ -13,6 +13,7 @@ $body-line-height: golden-ratio(.875em, 1);
 $pink: rgb(182,37,104);
 $error-red: rgb(253, 87, 87);
 
+$baseFontColor: #3c3c3c;
 $blue: #5597dd;
 $orange: #edbd3c;
 $lightGrey: #edf1f5;
@@ -20,8 +21,8 @@ $mediumGrey: #ced2db;
 $darkGrey: #8891a1;
 $extraDarkGrey: #3d4043;
 $paleYellow: #fffcf1;
-
 $green: rgb(37, 184, 90);
 $brightGreen: rgb(22, 202, 87);
 $disabledGreen: rgb(124, 206, 153);
-$darkGreen: rgb(52, 133, 76);
\ No newline at end of file
+$darkGreen: rgb(52, 133, 76);
+$lightBluishGrey: rgb(197, 207, 223);
\ No newline at end of file
diff --git a/cms/templates/widgets/metadata-edit.html b/cms/templates/widgets/metadata-edit.html
index 069db424da..590baec3c9 100644
--- a/cms/templates/widgets/metadata-edit.html
+++ b/cms/templates/widgets/metadata-edit.html
@@ -4,7 +4,6 @@
   hlskey = hashlib.md5(module.location.url()).hexdigest()
 %>
 <section class="metadata_edit">
-  <h3>Metadata</h3>
   <ul>
     % for keyname in editable_metadata_fields:
     <li>