diff --git a/lib/gollum/frontend/public/css/editor.css b/lib/gollum/frontend/public/css/editor.css
index df072eef..a6833e9d 100644
--- a/lib/gollum/frontend/public/css/editor.css
+++ b/lib/gollum/frontend/public/css/editor.css
@@ -3,6 +3,17 @@
   Wiki editor formatting
 */
 
+.jaws {
+  /* JAWS should see it, but you can't */
+  display: block;
+  height: 1px;
+  left: -5000px;
+  overflow: hidden;
+  position: absolute;
+  top: -5000px;
+  width: 1px;
+}
+
 #gollum-editor {
   border: 1px solid #e4e4e4;
   background: #f9f9f9;
@@ -22,9 +33,8 @@
   width: 100%;
 }
 
-/* @control title */
-#gollum-editor-title-field {
-  display: none;
+#gollum-editor-title-field input {
+  font-weight: bold;
 }
 
 #gollum-editor-title-field.active {
@@ -34,31 +44,25 @@
   padding: 0 0 0.5em 0;
 }
 
-#gollum-editor-title-field label {
-  /* JAWS should see it, but you can't */
+#gollum-editor .singleline {
   display: block;
-  height: 1px;
-  left: -5000px;
+  margin: 0 0 0.7em 0;
   overflow: hidden;
-  position: absolute;
-  top: -5000px;
-  width: 1px;
 }
 
-#gollum-editor-title-field input {
+#gollum-editor .singleline input {
   background: #fff;
   border: 1px solid #ddd;
   color: #000;
   font-size: 1.3em;
   font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-weight: bold;
   line-height: 1.8em;
   margin: 0;
   padding: 0.5em;
-  width: 40%;
+  width: 98%;
 }
 
-#gollum-editor-title-field input.ph {
+#gollum-editor .singleline input.ph {
   color: #999;
 }
 
diff --git a/lib/gollum/frontend/templates/editor.mustache b/lib/gollum/frontend/templates/editor.mustache
index d4fa5321..aac9180a 100644
--- a/lib/gollum/frontend/templates/editor.mustache
+++ b/lib/gollum/frontend/templates/editor.mustache
@@ -1,7 +1,7 @@
 <div id="gollum-editor">
 <form name="gollum-editor" action="/create/{{escaped_name}}" method="post">
-  <div id="gollum-editor-title-field">
-    <label for="page">Page Title</label>
+  <div id="gollum-editor-title-field" class="singleline">
+    <label for="page" class="jaws">Page Title</label>
     <input type="text" name="page" id="gollum-editor-page-title" value="{{page_name}}">
   </div>
   <div id="gollum-editor-function-bar">
@@ -37,7 +37,13 @@
   <fieldset id="gollum-editor-fields">
     <textarea id="gollum-editor-body"
      data-markup-lang="markdown" name="content">{{content}}</textarea>
-    <span class="br"><br></span>
+    
+    <div id="gollum-editor-edit-summary" class="singleline">
+      <label for="message" class="jaws">Edit message:</label>
+      <input type="text" name="message" id="gollum-editor-message-field" value="Write a small message here explaining this change. (Optional)">
+    </div>
+    
+    <span class="jaws"><br></span>
     <input type="submit" id="gollum-editor-submit" value="Save" title="Save current changes">
   </fieldset>
 </form>