diff --git a/src/main/twirl/wiki/page.scala.html b/src/main/twirl/wiki/page.scala.html
index f90dead12..e72dcf713 100644
--- a/src/main/twirl/wiki/page.scala.html
+++ b/src/main/twirl/wiki/page.scala.html
@@ -12,6 +12,9 @@
     <ul class="nav nav-tabs fill-width pull-left">
       <li>
         <h1 class="wiki-title">@pageName</h1>
+        <div class="small">
+          <span class="muted"><strong>@page.committer</strong> edited this page at @datetime(page.time)</span>
+        </div>
       </li>
       <li class="pull-right">
         <div class="btn-group">
@@ -50,13 +53,10 @@
         </div>
       }
     </div>
-    <div style="margin-right: 200px;">
+    <div style="margin-right: 220px;">
       <div class="markdown-body">
         @markdown(page.content, repository, true, false)
       </div>
-      <div class="small">
-        <span class="muted">Last edited by @page.committer at @datetime(page.time)</span>
-      </div>
     </div>
   }
 }
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 99888f47b..b7526e649 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -10,6 +10,37 @@ li p {
   margin: 0px;
 }
 
+h1 {
+  font-size: 30px;
+  line-height: 32px;
+}
+
+h2 {
+  font-size: 28px;
+  line-height: 30px;
+}
+
+h3 {
+  font-size: 26px;
+  line-height: 28px;
+}
+
+h4 {
+  font-size: 24px;
+}
+
+h5 {
+  font-size: 22px;
+}
+
+h6 {
+  font-size: 18px;
+}
+
+h7 {
+  font-size: 14px;
+}
+
 /* ======================================================================== */
 /* Global Header */
 /* ======================================================================== */
@@ -554,7 +585,7 @@ pre.blob {
 }
 
 #readme .box-content {
-  padding: 30px;
+  padding: 20px;
 }
 
 li.highlight {
@@ -977,6 +1008,26 @@ a.markdown-anchor-link {
   display: none;
 }
 
-h1 a.markdown-anchor-link, h2 a.markdown-anchor-link, h3 a.markdown-anchor-link {
-  top: 10px;
+h1 a.markdown-anchor-link {
+  top: 8px;
+}
+
+h2 a.markdown-anchor-link {
+  top: 6px;
+}
+
+h3 a.markdown-anchor-link {
+  top: 6px;
+}
+
+h4 a.markdown-anchor-link {
+  top: 2px;
+}
+
+h5 a.markdown-anchor-link {
+  top: 2px;
+}
+
+h6 a.markdown-anchor-link {
+  top: 2px;
 }