diff --git a/edit.html b/edit.html
index 9347569a..bb0dc2f9 100644
--- a/edit.html
+++ b/edit.html
@@ -50,6 +50,9 @@
 				height: 10em;
 				width: 40em;
 			}
+      .CodeMirror {
+        border: solid #CCC 1px;
+      }
 			.applies-to ul {
 				display: inline-block;
 				margin: 0;
diff --git a/edit.js b/edit.js
index 656656b0..e12340ee 100644
--- a/edit.js
+++ b/edit.js
@@ -15,7 +15,11 @@ sectionTemplate.innerHTML = '<label>' + t('sectionCode') + '</label><textarea cl
 var editors = [] // array of all CodeMirror instances
 // replace given textarea with the CodeMirror editor
 function setupCodeMirror(textarea) {
-  var cm = CodeMirror.fromTextArea(textarea, { mode: 'css' });
+  var cm = CodeMirror.fromTextArea(textarea, {
+    mode: 'css',
+    lineNumbers: true,
+    lineWrapping: true
+  });
   editors.push(cm);
 }
 
@@ -187,6 +191,11 @@ function validate() {
 }
 
 function save() {
+  // save the contents of the CodeMirror editors back into the textareas
+  for(var i=0; i < editors.length; i++) {
+    editors[i].save();
+  }
+
 	var error = validate();
 	if (error) {
 		alert(error);