diff --git a/cms/static/client_templates/metadata_editor.html b/cms/static/client_templates/metadata_editor.html
index db355b38a7..34723edb8e 100644
--- a/cms/static/client_templates/metadata_editor.html
+++ b/cms/static/client_templates/metadata_editor.html
@@ -1,10 +1,6 @@
 <ul class="list-input settings-list">
     <% _.each(metadata_entries, function(entry) { %>
-    <li class="field comp-setting-entry metadata_entry">
+    <li class="field comp-setting-entry metadata_entry" id="settings-listing">
     </li>
     <% }) %>
-</ul>
-% if showHighLevelSource:
-    <a href="#hls-modal-${hlskey}" class="launch-latex-compiler" id="hls-trig-${hlskey}" >Edit High Level Source</a>
-    <%include file="source-edit.html" />
-% endif
\ No newline at end of file
+</ul>
\ No newline at end of file
diff --git a/cms/static/client_templates/metadata_number_entry.html b/cms/static/client_templates/metadata_number_entry.html
index f60e47160f..df534135c7 100644
--- a/cms/static/client_templates/metadata_number_entry.html
+++ b/cms/static/client_templates/metadata_number_entry.html
@@ -1,6 +1,6 @@
 <div class="wrapper-comp-setting">
 	<label class="label setting-label" for="<%= uniqueId %>"><%= model.get('display_name') %></label>
-	<input class="input setting-input" type="number" id="<%= uniqueId %>" value='<%= model.get("value") %>' onblur="this.checkNumberSettingValidity();"/>
+	<input class="input setting-input" type="number" id="<%= uniqueId %>" value='<%= model.get("value") %>' onkeyup="checkNumberSettingValidity(this);"/>
 	<button class="action setting-clear inactive" type="button" name="setting-clear" value="Clear" data-tooltip="Clear">
 		<i class="ss-icon ss-symbolicons-block undo">&#x21A9;</i><span class="sr">Clear Value</span>
 	</button>
diff --git a/cms/templates/widgets/metadata-edit.html b/cms/templates/widgets/metadata-edit.html
index 744c619864..d85ca222e9 100644
--- a/cms/templates/widgets/metadata-edit.html
+++ b/cms/templates/widgets/metadata-edit.html
@@ -12,13 +12,12 @@
     ## source-edit.html needs access to the 'source_code' value, so delete from a copy.
     <% del metadata_field_copy['source_code'] %>
 % endif
-<div class="wrapper-comp-settings metadata_edit" id="settings-tab" data-metadata='${json.dumps(metadata_field_copy)}'/>
 
 % if showHighLevelSource:
     <div class="launch-latex-compiler">
-      <label class="label setting-label">Latex Compiler Mode</label> 
-      <a href="#hls-modal-${hlskey}" id="hls-trig-${hlskey}" >Launch Latex Source Compiler</a></div>
+      <a href="#hls-modal-${hlskey}" id="hls-trig-${hlskey}">Launch Latex Source Compiler</a>
+    </div>
     <%include file="source-edit.html" />
 % endif
-</div>
 
+<div class="wrapper-comp-settings metadata_edit" id="settings-tab" data-metadata='${json.dumps(metadata_field_copy)}'/>
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/css/editor/edit.scss b/common/lib/xmodule/xmodule/css/editor/edit.scss
index e94d776035..d30f69bcd2 100644
--- a/common/lib/xmodule/xmodule/css/editor/edit.scss
+++ b/common/lib/xmodule/xmodule/css/editor/edit.scss
@@ -4,10 +4,6 @@
 
   .row {
     position: relative;
-
-    .CodeMirror {
-      padding: 15px;
-    }
   }
 
   .editor-bar {
diff --git a/common/lib/xmodule/xmodule/css/problem/edit.scss b/common/lib/xmodule/xmodule/css/problem/edit.scss
index be5455e901..b7c8bdaba5 100644
--- a/common/lib/xmodule/xmodule/css/problem/edit.scss
+++ b/common/lib/xmodule/xmodule/css/problem/edit.scss
@@ -99,6 +99,13 @@
   }
 }
 
+.problem-editor {
+// adding padding to simple editor only - adjacent selector is needed since there are no toggles for CodeMirror
+ .markdown-box+.CodeMirror {
+    padding: 10px;
+  }
+}
+
 .problem-editor-icon {
   display: inline-block;
   width: 26px;
diff --git a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js
index a9bc1b73d3..fbc7d4704b 100644
--- a/common/static/js/vendor/html5-input-polyfills/number-polyfill.js
+++ b/common/static/js/vendor/html5-input-polyfills/number-polyfill.js
@@ -3,7 +3,7 @@
 /*
 HTML5 Number polyfill | Jonathan Stipe | https://github.com/jonstipe/number-polyfill
 */
-  
+
 (function() {
 
   (function($) {