diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 38e65661..67b0a0a0 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -438,9 +438,49 @@ ul.autocomplete .informal {
   top: -1em;
   left: 5%; }
 
-.wiki_show h1, .wiki_version h1, .wiki_new h1, .wiki_edit h1, .wiki_all h1 {
-  padding-left: 0;
-  padding-top: 10px; }
+#wiki_content {
+  border-style: none;
+  color: black;
+  line-height: 1.5em; }
+
+.wiki_show, .wiki_version, .wiki_new, .wiki_edit, .wiki_all {
+  margin-top: 30px;
+  padding: 10px;
+  border: 1px solid #78b74e;
+  background-color: #F5FFFA; }
+  .wiki_show h1, .wiki_version h1, .wiki_new h1, .wiki_edit h1, .wiki_all h1 {
+    padding-left: 0;
+    padding-top: 10px;
+    border-bottom-style: solid; }
+
+#wiki_content {
+  min-height: 400px; }
+  #wiki_content span.editsection {
+    display: none; }
+  #wiki_content h2, #wiki_content h3, #wiki_content h4, #wiki_content h5, #wiki_content h6 {
+    background: transparent none repeat scroll 0 0;
+    border-bottom: 1px solid #AAAAAA;
+    padding-bottom: 0,17em;
+    padding-top: 0,5em;
+    font-weight: normal;
+    font-size: 150%;
+    color: black; }
+  #wiki_content h3, #wiki_content h4, #wiki_content h5, #wiki_content h6 {
+    border-bottom: medium none;
+    font-weight: bold; }
+  #wiki_content h3 {
+    font-size: 132%; }
+  #wiki_content h4 {
+    font-size: 116%; }
+  #wiki_content ul {
+    line-height: 1.5em;
+    margin: 0.3em 0 0 1.5em;
+    padding: 0; }
+  #wiki_content ol {
+    line-height: 1.5em;
+    margin: 0.3em 0 0 3.2em;
+    padding: 0;
+    list-style-image: none; }
 
 a.new_wiki_link {
   color: grey; }
@@ -455,7 +495,6 @@ a.new_wiki_link {
 #breadcrump {
   font-size: 0.5em;
   margin-bottom: 5px;
-  margin-top: 30px;
   height: 1em;
   color: #ED0606; }
   #breadcrump a {
@@ -473,11 +512,6 @@ a.new_wiki_link {
   #sidebar #subpages {
     margin-top: 2em; }
 
-#wiki_content h1, #wiki_content h2, #wiki_content h3, #wiki_content h4, #wiki_content h5 {
-  color: black; }
-#wiki_content span.editsection {
-  display: none; }
-
 #wiki-syntax-help {
   float: right; }
   #wiki-syntax-help table {
diff --git a/public/stylesheets/print.css b/public/stylesheets/print.css
index 3f3be6d4..4e279455 100644
--- a/public/stylesheets/print.css
+++ b/public/stylesheets/print.css
@@ -438,9 +438,49 @@ ul.autocomplete .informal {
   top: -1em;
   left: 5%; }
 
-.wiki_show h1, .wiki_version h1, .wiki_new h1, .wiki_edit h1, .wiki_all h1 {
-  padding-left: 0;
-  padding-top: 10px; }
+#wiki_content {
+  border-style: none;
+  color: black;
+  line-height: 1.5em; }
+
+.wiki_show, .wiki_version, .wiki_new, .wiki_edit, .wiki_all {
+  margin-top: 30px;
+  padding: 10px;
+  border: 1px solid #78b74e;
+  background-color: #F5FFFA; }
+  .wiki_show h1, .wiki_version h1, .wiki_new h1, .wiki_edit h1, .wiki_all h1 {
+    padding-left: 0;
+    padding-top: 10px;
+    border-bottom-style: solid; }
+
+#wiki_content {
+  min-height: 400px; }
+  #wiki_content span.editsection {
+    display: none; }
+  #wiki_content h2, #wiki_content h3, #wiki_content h4, #wiki_content h5, #wiki_content h6 {
+    background: transparent none repeat scroll 0 0;
+    border-bottom: 1px solid #AAAAAA;
+    padding-bottom: 0,17em;
+    padding-top: 0,5em;
+    font-weight: normal;
+    font-size: 150%;
+    color: black; }
+  #wiki_content h3, #wiki_content h4, #wiki_content h5, #wiki_content h6 {
+    border-bottom: medium none;
+    font-weight: bold; }
+  #wiki_content h3 {
+    font-size: 132%; }
+  #wiki_content h4 {
+    font-size: 116%; }
+  #wiki_content ul {
+    line-height: 1.5em;
+    margin: 0.3em 0 0 1.5em;
+    padding: 0; }
+  #wiki_content ol {
+    line-height: 1.5em;
+    margin: 0.3em 0 0 3.2em;
+    padding: 0;
+    list-style-image: none; }
 
 a.new_wiki_link {
   color: grey; }
@@ -455,7 +495,6 @@ a.new_wiki_link {
 #breadcrump {
   font-size: 0.5em;
   margin-bottom: 5px;
-  margin-top: 30px;
   height: 1em;
   color: #ED0606; }
   #breadcrump a {
@@ -473,11 +512,6 @@ a.new_wiki_link {
   #sidebar #subpages {
     margin-top: 2em; }
 
-#wiki_content h1, #wiki_content h2, #wiki_content h3, #wiki_content h4, #wiki_content h5 {
-  color: black; }
-#wiki_content span.editsection {
-  display: none; }
-
 #wiki-syntax-help {
   float: right; }
   #wiki-syntax-help table {
diff --git a/public/stylesheets/sass/main.sass b/public/stylesheets/sass/main.sass
index 787aaa9a..fdeca380 100644
--- a/public/stylesheets/sass/main.sass
+++ b/public/stylesheets/sass/main.sass
@@ -486,10 +486,52 @@ ul.autocomplete
   left: 5%
 
 // *** wiki
+#wiki_content
+  border-style: none
+  color: black
+  line-height: 1.5em
+
 .wiki_show, .wiki_version, .wiki_new, .wiki_edit, .wiki_all
+  margin-top: 30px
+  padding: 10px
+  border: 1px solid #78b74e
+  background-color: #F5FFFA
   h1
     padding-left: 0
     padding-top: 10px
+    border-bottom:
+      :style solid
+
+#wiki_content
+  min-height: 400px
+  span.editsection
+    display: none
+  h2, h3, h4, h5, h6
+    background: transparent none repeat scroll 0 0
+    border-bottom: 1px solid #AAAAAA
+    padding-bottom: 0,17em
+    padding-top: 0,5em
+    font-weight: normal
+    font-size: 150%
+    color: black
+  h3, h4, h5, h6
+    border-bottom: medium none
+    font-weight: bold
+  h3
+    font-size: 132%
+  h4
+    font-size: 116%
+  ul
+    line-height: 1.5em
+    margin: 0.3em 0 0 1.5em
+    padding: 0
+  ol
+    line-height: 1.5em
+    margin: 0.3em 0 0 3.2em
+    padding: 0
+    list-style-image: none
+  li margin-bottom: 0.1em
+
 a.new_wiki_link
   color: grey
 #preview
@@ -500,7 +542,6 @@ a.new_wiki_link
 #breadcrump
   font-size: 0.5em
   margin-bottom: 5px
-  margin-top: 30px
   height: 1em
   color: #ED0606
   a
@@ -517,13 +558,6 @@ a.new_wiki_link
   #subpages
     margin-top: 2em
 
-
-#wiki_content
-  h1, h2, h3, h4, h5
-    color: black
-  span.editsection
-    display: none
-
 #wiki-syntax-help
   float: right
   table