diff --git a/app/assets/stylesheets/common/main_layout.css.scss b/app/assets/stylesheets/common/main_layout.css.scss
index 2f6de2dc5..70dc5acee 100644
--- a/app/assets/stylesheets/common/main_layout.css.scss
+++ b/app/assets/stylesheets/common/main_layout.css.scss
@@ -25,7 +25,7 @@ div#page {
   }
   
   aside#sidebar {
-    width: 20%;
+    width: 15%;
     float: left;
     
     h1 {
@@ -46,7 +46,7 @@ div#page {
   }
 
   section#content {
-    width: 75%;
+    width: 80%;
     float: left;
     padding-left: 2em;
     overflow: visible;
diff --git a/app/controllers/pools_controller.rb b/app/controllers/pools_controller.rb
index b0944a77b..cb43bd1f0 100644
--- a/app/controllers/pools_controller.rb
+++ b/app/controllers/pools_controller.rb
@@ -16,7 +16,7 @@ class PoolsController < ApplicationController
   
   def index
     @search = Pool.active.search(params[:search])
-    @pools = @search.paginate(params[:page])
+    @pools = @search.paginate(params[:page]).order("name")
     respond_with(@pools)
   end
   
diff --git a/app/presenters/user_presenter.rb b/app/presenters/user_presenter.rb
index 41d42e776..d6ea6c938 100644
--- a/app/presenters/user_presenter.rb
+++ b/app/presenters/user_presenter.rb
@@ -44,7 +44,7 @@ class UserPresenter
       string = "base:10 + approved:(#{approved_count} / 10) - deleted:(#{deleted_count}) / 4 - pending:#{pending_count}"
     end
     
-    if limit > 20
+    if limit >= 20
       limit = 20
       string += " = capped:20"
     elsif limit < 0
diff --git a/app/views/forum_topics/index.html.erb b/app/views/forum_topics/index.html.erb
index ffb4461fe..d26bed1ab 100644
--- a/app/views/forum_topics/index.html.erb
+++ b/app/views/forum_topics/index.html.erb
@@ -26,7 +26,7 @@
               <%= link_to topic.title, forum_topic_path(topic) %>
 
               <% if topic.response_count > 30 %>
-                <%= link_to "last", forum_topic_path(topic, :page => (topic.response_count / 30.0).ceil), :class => "last-page" %>
+                <%= link_to "last", forum_topic_path(topic, :page => (topic.response_count / Danbooru.config.posts_per_page.to_f).ceil), :class => "last-page" %>
               <% end %>
 
               <% if topic.is_locked? %>
diff --git a/app/views/posts/partials/show/_information.html.erb b/app/views/posts/partials/show/_information.html.erb
index 29c87bc83..5724108d8 100644
--- a/app/views/posts/partials/show/_information.html.erb
+++ b/app/views/posts/partials/show/_information.html.erb
@@ -13,6 +13,7 @@
   <li>Source: <%= post_source_tag(post) %></li>
   <li>Rating: <%= post.pretty_rating %></li>
   <li>Score: <span id="score-for-post-<%= post.id %>"><%= post.score %></span> <% if CurrentUser.is_privileged? %>(vote <%= link_to "up", post_votes_path(:post_id => post.id, :score => "up"), :remote => true, :method => :post %>/<%= link_to "down", post_votes_path(:post_id => post.id, :score => "down"), :remote => true, :method => :post %>)<% end %></li>
+  <li>ID: <%= post.id %></li>
   <li>
     Status:
     <% if post.is_pending? %>
diff --git a/script/donmai/downbooru b/script/donmai/downbooru
index 82e9ab997..93485c156 100755
--- a/script/donmai/downbooru
+++ b/script/donmai/downbooru
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-mv public/maintenance2.html public/maintenance.html
+mv public/maintenance.html.bak public/maintenance.html
diff --git a/script/donmai/upbooru b/script/donmai/upbooru
index 069a47ba0..7ab61c383 100755
--- a/script/donmai/upbooru
+++ b/script/donmai/upbooru
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-mv public/maintenance.html public/maintenance2.html
+mv public/maintenance.html public/maintenance.html.bak