diff --git a/app/assets/stylesheets/common/main_layout.css.scss b/app/assets/stylesheets/common/main_layout.css.scss
index c2bd126d3..6a2fc6354 100644
--- a/app/assets/stylesheets/common/main_layout.css.scss
+++ b/app/assets/stylesheets/common/main_layout.css.scss
@@ -65,6 +65,8 @@ div#page {
   
   section#content {
     overflow: visible;
+    margin-left: 15em;
+    padding-left: 1em;
   }
 }
 
diff --git a/app/assets/stylesheets/specific/favorites.css.scss b/app/assets/stylesheets/specific/favorites.css.scss
index 7b826a4c9..1e163f24d 100644
--- a/app/assets/stylesheets/specific/favorites.css.scss
+++ b/app/assets/stylesheets/specific/favorites.css.scss
@@ -9,8 +9,4 @@ div#c-favorites {
     margin-left: 0;
     margin-right: 6.5em;
   }
-  
-  #content {
-    margin-left: 15em;
-  }
 }
diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss
index 35672471d..aad2471e9 100644
--- a/app/assets/stylesheets/specific/posts.css.scss
+++ b/app/assets/stylesheets/specific/posts.css.scss
@@ -266,11 +266,6 @@ div#c-posts {
       }
     }
     
-    #content {
-      margin-left: 15em;
-      padding-left: 1em;
-    }
-    
     span.close-button {
       position: absolute;
       top: 5px;
diff --git a/app/assets/stylesheets/specific/wiki_pages.css.scss b/app/assets/stylesheets/specific/wiki_pages.css.scss
index 9cd771ee5..a79b3e007 100644
--- a/app/assets/stylesheets/specific/wiki_pages.css.scss
+++ b/app/assets/stylesheets/specific/wiki_pages.css.scss
@@ -3,11 +3,6 @@ div#c-wiki-pages {
     color: #AAA;
   }
   
-  div#form-content {
-    float: left;
-    width: 30em;
-  }
-  
   del {
     background: #FCC;
     text-decoration: none;
diff --git a/app/controllers/wiki_pages_controller.rb b/app/controllers/wiki_pages_controller.rb
index a98bf9962..cf692fdd6 100644
--- a/app/controllers/wiki_pages_controller.rb
+++ b/app/controllers/wiki_pages_controller.rb
@@ -1,7 +1,7 @@
 class WikiPagesController < ApplicationController
   respond_to :html, :xml, :json, :js
   before_filter :member_only, :except => [:index, :show, :show_or_new]
-  before_filter :moderator_only, :only => [:destroy]
+  before_filter :janitor_only, :only => [:destroy]
   before_filter :normalize_search_params, :only => [:index]
   rescue_from ActiveRecord::StatementInvalid, :with => :rescue_exception
 
@@ -30,7 +30,7 @@ class WikiPagesController < ApplicationController
     if params[:id] =~ /[a-zA-Z]/
       @wiki_page = WikiPage.find_by_title(params[:id])
     else
-      @wiki_page = WikiPage.find(params[:id])
+      @wiki_page = WikiPage.find_by_id(params[:id])
     end
     respond_with(@wiki_page)
   end
diff --git a/app/views/wiki_pages/_secondary_links.html.erb b/app/views/wiki_pages/_secondary_links.html.erb
index 90b3820eb..72b927381 100644
--- a/app/views/wiki_pages/_secondary_links.html.erb
+++ b/app/views/wiki_pages/_secondary_links.html.erb
@@ -4,16 +4,16 @@
     <li><%= link_to "Search", search_wiki_pages_path %></li>
     <li><%= link_to "New", new_wiki_page_path %></li>
     <li><%= link_to "Help", wiki_pages_path(:search => {:title => "help:wiki"}) %></li>
-    <% if @wiki_page && !@wiki_page.new_record? %>
+    <% if @wiki_page %>
       <li>|</li>
       <li><%= link_to "Posts (#{Post.fast_count(@wiki_page.title)})", posts_path(:tags => @wiki_page.title) %></li>
-      <li><%= link_to "History", wiki_page_versions_path(:search => {:wiki_page_id => @wiki_page.id}) %></li>
-      <% if CurrentUser.is_member? %>
-        <% unless @wiki_page.new_record? %>
+      <% unless @wiki_page.new_record? %> 
+        <li><%= link_to "History", wiki_page_versions_path(:search => {:wiki_page_id => @wiki_page.id}) %></li>
+        <% if CurrentUser.is_member? %>
           <li><%= link_to "Edit", edit_wiki_page_path(@wiki_page) %></li>
-          <% if CurrentUser.is_moderator? %>
-            <li><%= link_to "Delete", wiki_page_path(@wiki_page), :remote => true, :method => :delete, :confirm => "Do you want to delete this wiki page?" %></li>
-          <% end %>
+        <% end %>
+        <% if CurrentUser.is_janitor? %>
+          <li><%= link_to "Delete", wiki_page_path(@wiki_page), :remote => true, :method => :delete, :confirm => "Do you want to delete this wiki page?" %></li>
         <% end %>
       <% end %>
     <% end %>
diff --git a/app/views/wiki_pages/new.html.erb b/app/views/wiki_pages/new.html.erb
index e81e9242b..c82d2649d 100644
--- a/app/views/wiki_pages/new.html.erb
+++ b/app/views/wiki_pages/new.html.erb
@@ -5,6 +5,14 @@
     <section id="content">
       <h1>New Wiki Page</h1>
       <%= render "form" %>
+      
+      <div id="wiki-page-posts">
+        <h2>Posts</h2>
+        <%= @wiki_page.post_set.presenter.post_previews_html(self) %>
+      </div>
+      
+      <div class="clearfix"></div>
+      
     </section>
   </div>
 </div>
diff --git a/app/views/wiki_pages/show.html.erb b/app/views/wiki_pages/show.html.erb
index 432ed59b1..020b2af89 100644
--- a/app/views/wiki_pages/show.html.erb
+++ b/app/views/wiki_pages/show.html.erb
@@ -4,6 +4,7 @@
     
     <section id="content">
       <h1 id="wiki-page-title">
+        
         <%= @wiki_page.pretty_title %>
         
         <% if @wiki_page.is_locked? %>