diff --git a/src/Orchard.Web/Modules/Orchard.Templates/Scripts/codemirror/lib/codemirror.css b/src/Orchard.Web/Modules/Orchard.Templates/Scripts/codemirror/lib/codemirror.css
index 23eaf74d4..8c6245e02 100644
--- a/src/Orchard.Web/Modules/Orchard.Templates/Scripts/codemirror/lib/codemirror.css
+++ b/src/Orchard.Web/Modules/Orchard.Templates/Scripts/codemirror/lib/codemirror.css
@@ -2,7 +2,8 @@
 
 .CodeMirror {
   /* Set height, width, borders, and global font properties here */
-  font-family: monospace;
+  line-height: 1.40em;
+  font-family: Monaco, Menlo, "Andale Mono","lucida console","Courier New",monospace !important;
   height: 300px;
 }
 .CodeMirror-scroll {
diff --git a/src/Orchard.Web/Modules/Orchard.Templates/Views/EditorTemplates/Parts.Shape.cshtml b/src/Orchard.Web/Modules/Orchard.Templates/Views/EditorTemplates/Parts.Shape.cshtml
index 70d59aeb1..bae9936ad 100644
--- a/src/Orchard.Web/Modules/Orchard.Templates/Views/EditorTemplates/Parts.Shape.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Templates/Views/EditorTemplates/Parts.Shape.cshtml
@@ -1,7 +1,6 @@
 @model Orchard.Templates.ViewModels.ShapePartViewModel
 @{
     Style.Include("~/modules/orchard.templates/scripts/codemirror/lib/codemirror.css");
-    Style.Include("~/modules/orchard.templates/scripts/codemirror/theme/codemirror.css");
     Style.Include("template-editor.css");
     Script.Require("jQuery");
     Script.Include("codemirror/lib/codemirror.js");
@@ -18,14 +17,16 @@
         @Html.TextBoxFor(m => m.Name, new { @class = "text medium" })
         <span class="hint">@T("The name of this template, which can be used to reference from code (as when using shape type names) and tokens.")</span>
     </div>
+</fieldset>
+<fieldset>
     <div>
-        @Html.LabelFor(m => m.Template, T("Template Body"))
         @Html.TextAreaFor(m => m.Template, new { @class = "text large code-editor" })
-        <span class="hint">@T("The template.")</span>
     </div>
+</fieldset>
+<fieldset>
     <div>
         @Html.LabelFor(m => m.Language, T("Language"))
         @Html.EditorFor(m => m.Language, new { Model.AvailableLanguages })
-        <span class="hint">@T("The template language to use.")</span>
+        <span class="hint">@T("The templating language to use.")</span>
     </div>
 </fieldset>
\ No newline at end of file