diff --git a/scratch/css/gollum.css b/scratch/css/gollum.css
index c163e95e..0e40f2a7 100644
--- a/scratch/css/gollum.css
+++ b/scratch/css/gollum.css
@@ -17,6 +17,15 @@ body, html {
   width: 80%;
 }
 
+a:link {
+  color: #4183c4;
+  text-decoration: none;
+}
+
+a:hover, a:visited {
+  text-decoration: underline;
+}
+
 
 /* @section head */
 #head {
@@ -31,7 +40,7 @@ body, html {
     float: left;
     line-height: normal;
     margin: 0;
-    padding: 0;
+    padding: 0.08em 0 0 0;
   }
 
   #head ul.actions {
@@ -39,7 +48,7 @@ body, html {
     float: right;
     list-style-type: none;
     overflow: hidden;
-    padding: 0.6em 0 0;
+    padding: 0;
   }
   
   #head ul.actions li {
@@ -48,6 +57,39 @@ body, html {
     margin-left: 0.6em;
   }
   
+  /* @control minibutton */
+  .minibutton a {
+    background-color: #f7f7f7;
+    border: 1px solid #d4d4d4;
+    color: #333;
+    display: block;
+    font-weight: bold;
+    margin: 0;
+    padding: 0.4em 1em;
+    
+    text-shadow: 0 1px 0 #fff;
+    
+    filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec');
+    background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec));
+    background: -moz-linear-gradient(top, #f4f4f4, #ececec);
+    
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+  }
+  
+  .minibutton a:hover {
+    background: #3072b3;
+    border-color: #518cc6 #518cc6 #2a65a0;
+    color: #fff;
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3);
+    text-decoration: none;
+    
+    filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#599bdc', endColorstr='#3072b3');
+    background: -webkit-gradient(linear, left top, left bottom, from(#599bdc), to(#3072b3));
+    background: -moz-linear-gradient(top, #599bdc, #3072b3);
+  }
+  
   
 /* @section content */
 #wiki-content {
@@ -63,6 +105,86 @@ body, html {
   /* @section body */
   #wiki-body {
     float: left;
-    margin-right: 5%;
+    margin-right: 3%;
     width: 70%;
   }
+  
+  /* @section rightbar */
+  #wiki-rightbar {
+    float: right;
+    width: 27%;
+  }
+  
+  #wiki-rightbar #nav {
+    background-color: #f7f7f7;
+    border: 1px solid #ddd;
+    margin-top: 1.5em;
+    padding: 1em;
+    
+    border-radius: 0.5em;
+    -moz-border-radius: 0.5em;
+    -webkit-border-radius: 0.5em;
+  }
+  
+    #wiki-rightbar #nav {
+      font-size: 1.2em;
+      line-height: 1.5em;
+    }
+    
+    #wiki-rightbar #nav p.parent {
+      border-bottom: 1px solid #bbb;
+      font-weight: bold;
+      margin: 0 0 0.5em 0;
+      padding: 0 0 0.5em 0;
+      text-shadow: 0 1px 0 #fff;
+    }
+    
+    /* Back arrow */
+    #wiki-rightbar #nav p.parent:before {
+      color: #666;
+      content: "← ";
+    }
+    
+    #wiki-rightbar #nav h3 {
+      font-size: 1.2em;
+      color: #333;
+      margin: 1.2em 0 0;
+      padding: 0;
+      text-shadow: 0 1px 0 #fff;
+    }
+    
+    #wiki-rightbar #nav ul {
+      margin: 0.5em 0 1em;
+      padding: 0;
+    }
+    
+    #wiki-rightbar #nav ul li {
+      list-style-position: inside;
+      list-style-type: none;
+      margin: 0;
+      padding: 0 0 0 1em;
+      line-height: 1.75em;
+    }
+    
+    #wiki-rightbar #nav ul li a {
+      font-weight: bold;
+      text-shadow: 0 1px 0 #fff;
+    }
+    
+  /* @section footer */
+  #wiki-footer {
+    clear: both;
+  }
+  
+  
+  /* @section page-footer */
+  #footer {
+    border-top: 1px solid #ccc;
+    font-size: 1.2em;
+    line-height: 1.6em;
+    margin: 1em 0 7em;
+  }
+  
+  #footer p#last-edit {
+    color: #999;
+  }
diff --git a/scratch/css/template.css b/scratch/css/template.css
index db1a333e..5d6a6f95 100644
--- a/scratch/css/template.css
+++ b/scratch/css/template.css
@@ -24,7 +24,15 @@
     content: " ❈";
     font-size: 0.8em;
   }
-  
+
+#template a:link {
+  color: #4183c4;
+  text-decoration: none;
+}
+
+#template a:hover, #template a:visited {
+  text-decoration: underline;
+}
   
 #template ul, #template ol {
   margin: 1.0em 0;
diff --git a/scratch/page.html b/scratch/page.html
index 8eb96cc5..dfe92551 100644
--- a/scratch/page.html
+++ b/scratch/page.html
@@ -88,6 +88,7 @@
     </div>
   </div>
   <div id="wiki-rightbar">
+    <div id="nav">
     <p class="parent">
       <a href="javascript:void(0);">Back to <span>Page Name</span></a></li>
     </p>
@@ -97,6 +98,7 @@
       <li><a href="javascript:void(0);">Something 2</a></li>
       <li><a href="javascript:void(0);">Something 3</a></li>
     </ul>
+    </div>
   </div>
   </div>
   <div id="wiki-footer">