diff --git a/lib/gollum/frontend/public/gollum/css/editor.css b/lib/gollum/frontend/public/gollum/css/editor.css
index 9687a3a8..9003bc01 100755
--- a/lib/gollum/frontend/public/gollum/css/editor.css
+++ b/lib/gollum/frontend/public/gollum/css/editor.css
@@ -226,22 +226,21 @@ a#function-help:hover span { background-position: -405px -28px; }
 }
 
 #gollum-editor #gollum-editor-function-bar
-  #gollum-editor-format-selector label:after {
+#gollum-editor-format-selector label:after {
   content: ':';
 }
 
 
 /* @section form-fields */
 
-#gollum-editor textarea#gollum-editor-sidebar,
-#gollum-editor textarea#gollum-editor-body {
+#gollum-editor textarea {
   background: #fff;
   border: 1px solid #ddd;
   font-size: 1em;
   font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
   line-height: 1.4em;
   margin: 1em 0 0.4em;
-  padding: 0.5em; /* I don't really like mixing pct & em here… */
+  padding: 0.5em;
   width: 98%;
   height: 20em;
 }
@@ -295,7 +294,7 @@ a#function-help:hover span { background-position: -405px -28px; }
   border-bottom: 1px solid #ddd;
   display: block;
   overflow: hidden;
-  padding: 1em 0 0.5em;
+  padding: 0.5em 0 0;
 }
 
 #gollum-editor #gollum-editor-body + .collapsed,
@@ -382,10 +381,10 @@ a#function-help:hover span { background-position: -405px -28px; }
   border: 1px solid #ddd;
   clear: both;
   display: block;
-  font-size: 1.3em;
+  font-size: 1em;
   font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
   height: 7em;
-  line-height: 1.8em;
+  line-height: 1.4em;
   margin: 0.7em 0;
   padding: 0.5em;
   width: 98%;
diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css
index 4fb9a8a9..e8847dcb 100755
--- a/lib/gollum/frontend/public/gollum/css/gollum.css
+++ b/lib/gollum/frontend/public/gollum/css/gollum.css
@@ -10,17 +10,6 @@
   A basic stylesheet for Gollum
 */
 
-/*
-  Fixes AsciiDoc listing block rendering.
-  Must be !important to override
-  .markdown-body code, .markdown-body tt {
-  in template.css.
-  https://github.com/github/gollum/issues/278
-*/
-pre > tt {
-  white-space: pre !important;
-}
-
 /* @section core */
 body, html {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -49,7 +38,8 @@ a:hover, a:visited {
 /* @section head */
 #head {
   border-bottom: 1px solid #ddd;
-  margin: 4.5em 0 0.5em;
+  margin: 4em 0 1.5em;
+  padding-bottom: 0.3em;
   overflow: hidden;
 }
 
diff --git a/lib/gollum/frontend/public/gollum/css/template.css b/lib/gollum/frontend/public/gollum/css/template.css
index b2075ec4..119c2395 100644
--- a/lib/gollum/frontend/public/gollum/css/template.css
+++ b/lib/gollum/frontend/public/gollum/css/template.css
@@ -31,13 +31,13 @@ a.absent {
   line-height: 1.6;
 }
 .markdown-body>*:first-child {
-  margin-top: 0!important
+  margin-top: 0!important;
 }
 .markdown-body>*:last-child {
-  margin-bottom: 0!important
+  margin-bottom: 0!important;
 }
 .markdown-body a.absent {
-  color: #c00
+  color: #c00;
 }
 .markdown-body a.anchor {
   display: block;
@@ -83,25 +83,31 @@ a.absent {
 .markdown-body h5 code,
 .markdown-body h6 tt,
 .markdown-body h6 code {
-  font-size: inherit
+  font-size: inherit;
 }
 .markdown-body h1 {
   font-size: 28px;
   color: #000;
+  margin-top: 50px;
+  margin-bottom: 20px;
 }
 .markdown-body h2 {
   font-size: 24px;
   border-bottom: 1px solid #ccc;
   color: #000;
+  margin-top: 40px;
+  margin-bottom: 20px;
 }
 .markdown-body h3 {
-  font-size: 18px
+  font-size: 18px;
+  margin-top: 30px;
+  margin-bottom: 15px;
 }
 .markdown-body h4 {
-  font-size: 16px
+  font-size: 16px;
 }
 .markdown-body h5 {
-  font-size: 14px
+  font-size: 14px;
 }
 .markdown-body h6 {
   color: #777;
@@ -115,7 +121,7 @@ a.absent {
 .markdown-body li,
 .markdown-body table,
 .markdown-body pre {
-  margin: 15px 0
+  margin: 15px 0;
 }
 .markdown-body hr {
   background: transparent url('/images/dirty-shade.png') repeat-x 0 0;
@@ -124,15 +130,18 @@ a.absent {
   height: 4px;
   padding: 0;
 }
-.markdown-body>h2:first-child,
 .markdown-body>h1:first-child,
-.markdown-body>h1:first-child+h2,
+.markdown-body>h2:first-child,
 .markdown-body>h3:first-child,
 .markdown-body>h4:first-child,
 .markdown-body>h5:first-child,
 .markdown-body>h6:first-child {
-  margin-top: 0;
-  padding-top: 0;
+}
+.markdown-body h1+h2{
+  margin-top: 30px;
+}
+.markdown-body h2+h3{
+  margin-top: 10px;
 }
 .markdown-body a:first-child h1,
 .markdown-body a:first-child h2,
@@ -149,25 +158,25 @@ a.absent {
 .markdown-body h4+p,
 .markdown-body h5+p,
 .markdown-body h6+p {
-  margin-top: 0
+  margin-top: 0;
 }
 .markdown-body li p.first {
-  display: inline-block
+  display: inline-block;
 }
 .markdown-body ul,
 .markdown-body ol {
-  padding-left: 30px
+  padding-left: 30px;
 }
 .markdown-body ul li>:first-child,
 .markdown-body ol li>:first-child {
-  margin-top: 0
+  margin-top: 0;
 }
 .markdown-body ul li>:last-child,
 .markdown-body ol li>:last-child {
-  margin-bottom: 0
+  margin-bottom: 0;
 }
 .markdown-body dl {
-  padding: 0
+  padding: 0;
 }
 .markdown-body dl dt {
   font-size: 14px;
@@ -177,23 +186,23 @@ a.absent {
   margin: 15px 0 5px;
 }
 .markdown-body dl dt:first-child {
-  padding: 0
+  padding: 0;
 }
 .markdown-body dl dt>:first-child {
-  margin-top: 0
+  margin-top: 0;
 }
 .markdown-body dl dt>:last-child {
-  margin-bottom: 0
+  margin-bottom: 0;
 }
 .markdown-body dl dd {
   margin: 0 0 15px;
   padding: 0 15px;
 }
 .markdown-body dl dd>:first-child {
-  margin-top: 0
+  margin-top: 0;
 }
 .markdown-body dl dd>:last-child {
-  margin-bottom: 0
+  margin-bottom: 0;
 }
 .markdown-body blockquote {
   border-left: 4px solid #DDD;
@@ -201,13 +210,13 @@ a.absent {
   color: #777;
 }
 .markdown-body blockquote>:first-child {
-  margin-top: 0
+  margin-top: 0;
 }
 .markdown-body blockquote>:last-child {
-  margin-bottom: 0
+  margin-bottom: 0;
 }
 .markdown-body table {
-  padding: 0
+  padding: 0;
 }
 .markdown-body table tr {
   border-top: 1px solid #ccc;
@@ -216,10 +225,10 @@ a.absent {
   padding: 0;
 }
 .markdown-body table tr:nth-child(2n) {
-  background-color: #f8f8f8
+  background-color: #f8f8f8;
 }
 .markdown-body table tr th {
-  font-weight: bold
+  font-weight: bold;
 }
 .markdown-body table tr th,
 .markdown-body table tr td {
@@ -230,14 +239,14 @@ a.absent {
 }
 .markdown-body table tr th>:first-child,
 .markdown-body table tr td>:first-child {
-  margin-top: 0
+  margin-top: 0;
 }
 .markdown-body table tr th>:last-child,
 .markdown-body table tr td>:last-child {
-  margin-bottom: 0
+  margin-bottom: 0;
 }
 .markdown-body img {
-  max-width: 100%
+  max-width: 100%;
 }
 .markdown-body span.frame {
   display: block;
@@ -299,7 +308,7 @@ a.absent {
   float: left;
 }
 .markdown-body span.float-left span {
-  margin: 13px 0 0
+  margin: 13px 0 0;
 }
 .markdown-body span.float-right {
   display: block;
@@ -322,6 +331,7 @@ a.absent {
   background-color: #f8f8f8;
   border-radius: 3px;
 }
+.markdown-body pre>tt,
 .markdown-body pre>code {
   margin: 0;
   padding: 0;
@@ -329,7 +339,6 @@ a.absent {
   border: none;
   background: transparent;
 }
-.markdown-body .highlight pre,
 .markdown-body pre {
   background-color: #f8f8f8;
   border: 1px solid #ccc;
@@ -339,14 +348,18 @@ a.absent {
   padding: 6px 10px;
   border-radius: 3px;
 }
+.markdown-body pre pre,
 .markdown-body pre code,
 .markdown-body pre tt {
   background-color: transparent;
   border: none;
 }
-
+.markdown-body pre pre {
+  margin: 0;
+  padding: 0;
+}
 .highlight {
-  background: #fff
+  background: #fff;
 }
 .highlight .c {
   color: #998;
@@ -357,10 +370,10 @@ a.absent {
   background-color: #e3d2d2;
 }
 .highlight .k {
-  font-weight: bold
+  font-weight: bold;
 }
 .highlight .o {
-  font-weight: bold
+  font-weight: bold;
 }
 .highlight .cm {
   color: #998;
@@ -388,13 +401,13 @@ a.absent {
   background-color: #faa;
 }
 .highlight .ge {
-  font-style: italic
+  font-style: italic;
 }
 .highlight .gr {
-  color: #a00
+  color: #a00;
 }
 .highlight .gh {
-  color: #999
+  color: #999;
 }
 .highlight .gi {
   color: #000;
@@ -405,61 +418,61 @@ a.absent {
   background-color: #afa;
 }
 .highlight .go {
-  color: #888
+  color: #888;
 }
 .highlight .gp {
-  color: #555
+  color: #555;
 }
 .highlight .gs {
-  font-weight: bold
+  font-weight: bold;
 }
 .highlight .gu {
   color: #800080;
   font-weight: bold;
 }
 .highlight .gt {
-  color: #a00
+  color: #a00;
 }
 .highlight .kc {
-  font-weight: bold
+  font-weight: bold;
 }
 .highlight .kd {
-  font-weight: bold
+  font-weight: bold;
 }
 .highlight .kn {
-  font-weight: bold
+  font-weight: bold;
 }
 .highlight .kp {
-  font-weight: bold
+  font-weight: bold;
 }
 .highlight .kr {
-  font-weight: bold
+  font-weight: bold;
 }
 .highlight .kt {
   color: #458;
   font-weight: bold;
 }
 .highlight .m {
-  color: #099
+  color: #099;
 }
 .highlight .s {
-  color: #d14
+  color: #d14;
 }
 .highlight .na {
-  color: #008080
+  color: #008080;
 }
 .highlight .nb {
-  color: #0086B3
+  color: #0086B3;
 }
 .highlight .nc {
   color: #458;
   font-weight: bold;
 }
 .highlight .no {
-  color: #008080
+  color: #008080;
 }
 .highlight .ni {
-  color: #800080
+  color: #800080;
 }
 .highlight .ne {
   color: #900;
@@ -470,103 +483,103 @@ a.absent {
   font-weight: bold;
 }
 .highlight .nn {
-  color: #555
+  color: #555;
 }
 .highlight .nt {
-  color: #000080
+  color: #000080;
 }
 .highlight .nv {
-  color: #008080
+  color: #008080;
 }
 .highlight .ow {
-  font-weight: bold
+  font-weight: bold;
 }
 .highlight .w {
-  color: #bbb
+  color: #bbb;
 }
 .highlight .mf {
-  color: #099
+  color: #099;
 }
 .highlight .mh {
-  color: #099
+  color: #099;
 }
 .highlight .mi {
-  color: #099
+  color: #099;
 }
 .highlight .mo {
-  color: #099
+  color: #099;
 }
 .highlight .sb {
-  color: #d14
+  color: #d14;
 }
 .highlight .sc {
-  color: #d14
+  color: #d14;
 }
 .highlight .sd {
-  color: #d14
+  color: #d14;
 }
 .highlight .s2 {
-  color: #d14
+  color: #d14;
 }
 .highlight .se {
-  color: #d14
+  color: #d14;
 }
 .highlight .sh {
-  color: #d14
+  color: #d14;
 }
 .highlight .si {
-  color: #d14
+  color: #d14;
 }
 .highlight .sx {
-  color: #d14
+  color: #d14;
 }
 .highlight .sr {
-  color: #009926
+  color: #009926;
 }
 .highlight .s1 {
-  color: #d14
+  color: #d14;
 }
 .highlight .ss {
-  color: #990073
+  color: #990073;
 }
 .highlight .bp {
-  color: #999
+  color: #999;
 }
 .highlight .vc {
-  color: #008080
+  color: #008080;
 }
 .highlight .vg {
-  color: #008080
+  color: #008080;
 }
 .highlight .vi {
-  color: #008080
+  color: #008080;
 }
 .highlight .il {
-  color: #099
+  color: #099;
 }
 .highlight .gc {
   color: #999;
   background-color: #EAF2F5;
 }
 .type-csharp .highlight .k {
-  color: #00F
+  color: #00F;
 }
 .type-csharp .highlight .kt {
-  color: #00F
+  color: #00F;
 }
 .type-csharp .highlight .nf {
   color: #000;
   font-weight: normal;
 }
 .type-csharp .highlight .nc {
-  color: #2B91AF
+  color: #2B91AF;
 }
 .type-csharp .highlight .nn {
-  color: #000
+  color: #000;
 }
 .type-csharp .highlight .s {
-  color: #A31515
+  color: #A31515;
 }
 .type-csharp .highlight .sc {
-  color: #A31515
+  color: #A31515;
 }
diff --git a/lib/gollum/frontend/templates/editor.mustache b/lib/gollum/frontend/templates/editor.mustache
index 168b9fbc..1ae57779 100644
--- a/lib/gollum/frontend/templates/editor.mustache
+++ b/lib/gollum/frontend/templates/editor.mustache
@@ -86,6 +86,14 @@
     <textarea id="gollum-editor-body"
      data-markup-lang="{{format}}" name="content">{{content}}</textarea>
      
+    {{#header}}
+    <div id="gollum-editor-edit-header" class="collapsed">
+      <a href="#" class="button"><span>Expand/Collapse</span></a>
+      <h4>Header</h4>
+      <textarea id="gollum-editor-header" name="header">{{header}}</textarea>
+    </div>
+    {{/header}}
+    
     {{#footer}}
     <div id="gollum-editor-edit-footer" class="collapsed">
       <a href="#" class="button"><span>Expand/Collapse</span></a>
@@ -113,4 +121,4 @@
     <a href="/preview" id="gollum-editor-preview" class="minibutton" title="Preview this Page">Preview</a>
   </fieldset>
 </form>
-</div>
\ No newline at end of file
+</div>