diff --git a/cms/static/sass/views/_static-pages.scss b/cms/static/sass/views/_static-pages.scss
index 759b03cfc7..09d3957bb0 100644
--- a/cms/static/sass/views/_static-pages.scss
+++ b/cms/static/sass/views/_static-pages.scss
@@ -31,38 +31,23 @@ body.course.static-pages {
       @include edit-box;
       @include box-shadow(none);
       display: none;
-      padding: 20px;
+      padding: 0;
       border-radius: 2px 2px 0 0;
 
-      .metadata_edit {
-        margin-bottom: 20px;
-        font-size: 13px;
-
-        li {
-          margin-bottom: 10px;
-        }
-
-        label {
-          display: inline-block;
-          margin-right: 10px;  
-        }
+      //Overrides general edit-box mixin 
+      .row {
+        margin-bottom: 0px;
       }
 
-      h3 {
-        margin-bottom: 10px;
-        font-size: 18px;
-        font-weight: 700;
-      }
+      // This duplicates the styling from Unit page editing
+      .module-actions {
+        @include box-shadow(inset 0 1px 1px $shadow);
+        padding: 0px 0 10px 10px;
+        background-color: $gray-l6;
 
-      h5 {
-        margin-bottom: 8px;
-        color: #fff;
-        font-weight: 700;
-      }
-
-      .save-button {
-        margin-top: 10px;
+        .save-button {
         margin: 15px 8px 0 0;
+        }
       }
     }
   }
diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss
index 9956762c98..eff7aa0c0f 100644
--- a/cms/static/sass/views/_unit.scss
+++ b/cms/static/sass/views/_unit.scss
@@ -457,7 +457,7 @@ body.course.unit {
         margin-bottom: 0px;
       }
 
-      // Module Actions
+      // Module Actions, also used for Static Pages 
       .module-actions {
         @include box-shadow(inset 0 1px 1px $shadow);
         padding: 0px 0 10px 10px;
diff --git a/common/lib/xmodule/xmodule/css/editor/edit.scss b/common/lib/xmodule/xmodule/css/editor/edit.scss
index d30f69bcd2..dec070264a 100644
--- a/common/lib/xmodule/xmodule/css/editor/edit.scss
+++ b/common/lib/xmodule/xmodule/css/editor/edit.scss
@@ -4,6 +4,11 @@
 
   .row {
     position: relative;
+
+    //testing
+    .CodeMirror {
+      padding: 15px;
+    }
   }
 
   .editor-bar {
diff --git a/common/static/js/vendor/CodeMirror/codemirror.css b/common/static/js/vendor/CodeMirror/codemirror.css
index 08beee406d..2d79f4aa79 100644
--- a/common/static/js/vendor/CodeMirror/codemirror.css
+++ b/common/static/js/vendor/CodeMirror/codemirror.css
@@ -1,7 +1,6 @@
 .CodeMirror {
   line-height: 1em;
   font-family: monospace;
-  padding: 15px;
 }
 
 .CodeMirror-scroll {