diff --git a/app/assets/javascripts/common.js b/app/assets/javascripts/common.js
index 8ad8851f3..4504c2754 100644
--- a/app/assets/javascripts/common.js
+++ b/app/assets/javascripts/common.js
@@ -11,6 +11,7 @@ $(function() {
       e.stopPropagation();
     });
 
+    $("#more-links").show();
     $("#more-links").position({
       of: $("#site-map-link"),
       my: "left top",
diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss
index 10e885d9b..c54ef22ab 100644
--- a/app/assets/stylesheets/specific/posts.css.scss
+++ b/app/assets/stylesheets/specific/posts.css.scss
@@ -7,8 +7,8 @@ div.post-previews {
 article.post-preview {
   height: 150px;
   width: 150px;
-  margin-right: 30px;
-  margin-bottom: 30px;
+  margin-right: 20px;
+  margin-bottom: 20px;
   float: left;
   text-align: center;
   vertical-align: middle;
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d80c9b97f..bd873c258 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -50,6 +50,8 @@ class UsersController < ApplicationController
     else
       UserMailer.upgrade(@user, params[:email]).deliver
     end
+    
+    redirect_to user_path(@user), :notice => "Email was sent"
   end
 
 private
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 78a4cb7c2..bc9f8e9d7 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -57,10 +57,6 @@ class Comment < ActiveRecord::Base
     return vote
   end
   
-  def creator_name
-    creator.name.tr("_", " ")
-  end
-  
   def editable_by?(user)
     creator_id == user.id || user.is_moderator?
   end
diff --git a/app/views/layouts/_more_links.html.erb b/app/views/layouts/_more_links.html.erb
index d693a6fc2..f2e7589ea 100644
--- a/app/views/layouts/_more_links.html.erb
+++ b/app/views/layouts/_more_links.html.erb
@@ -1,4 +1,4 @@
-<div id="more-links">
+<div id="more-links" style="display: none;">
   <ul>
     <%= nav_link_to("Artists", artists_path(:order => "date")) %>
     <%= nav_link_to("Tags", tags_path(:order => "date")) %>
diff --git a/app/views/posts/partials/index/_edit.html.erb b/app/views/posts/partials/index/_edit.html.erb
index b4ee8c051..2dac3f9c0 100644
--- a/app/views/posts/partials/index/_edit.html.erb
+++ b/app/views/posts/partials/index/_edit.html.erb
@@ -1,4 +1,4 @@
-<div id="quick-edit-div">
+<div id="quick-edit-div" style="display: none;">
   <h1>Edit</h1>
 
   <%= form_tag("/posts", :class => "simple_form", :method => :put, :id => "quick-edit-form") do %>
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index 634b59027..bcdea7d83 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -52,11 +52,11 @@
         <%= render "comments/partials/index/list", :comments => @post.comments, :post => @post, :show_header => false %>
       </section>
 
-      <section id="notes">
+      <section id="notes" style="display: none;">
         <%= render :partial => "notes/note", :collection => @post.notes.active %>
       </section>
 
-      <section id="edit">
+      <section id="edit" style="display: none;">
         <%= render "posts/partials/show/edit", :post => @post %>
       </section>
     </section>    
diff --git a/lib/tasks/images.rake b/lib/tasks/images.rake
index af2f174e3..861bd33d7 100644
--- a/lib/tasks/images.rake
+++ b/lib/tasks/images.rake
@@ -1,6 +1,16 @@
 require 'danbooru_image_resizer/danbooru_image_resizer'
 
 namespace :images do
+  desc "Generate thumbnail-sized images of posts"
+  task :generate_preview => :environment do
+    Post.where("image_width > ?", Danbooru.config.small_image_width).find_each do |post|
+      if post.is_image?
+        puts "resizing preview #{post.id}"
+        Danbooru.resize(post.file_path, post.preview_file_path, Danbooru.config.small_image_width, Danbooru.config.small_image_width, 80)
+      end
+    end
+  end
+  
   desc "Generate medium-sized images of posts"
   task :generate_medium => :environment do
     Post.where("image_width > ?", Danbooru.config.medium_image_width).find_each do |post|
diff --git a/script/upgrade_schema.sql b/script/upgrade_schema.sql
index d9bd464c5..7f3751172 100644
--- a/script/upgrade_schema.sql
+++ b/script/upgrade_schema.sql
@@ -61,6 +61,7 @@ alter table comments rename column user_id to creator_id;
 alter index index_comments_on_user_id rename to index_comments_on_creator_id;
 drop trigger trg_comment_search_update on comments;
 CREATE TRIGGER trigger_comments_on_update BEFORE INSERT OR UPDATE ON comments FOR EACH ROW EXECUTE PROCEDURE tsvector_update_trigger('body_index', 'pg_catalog.english', 'body');
+update comments set creator_id = 1 where creator_id is null;
 
 CREATE TABLE delayed_jobs (
     id integer NOT NULL,
@@ -3047,6 +3048,7 @@ alter index posts_mpixels rename to index_posts_on_mpixels;
 create index index_posts_on_uploader_ip_addr on posts (uploader_ip_addr);
 drop function trg_posts_tags__delete();
 drop function trg_posts_tags__insert();
+update posts set uploader_id = 1 where uploader_id is null;
 
 alter table post_appeals rename column user_id to creator_id;
 alter index index_post_appeals_on_user_id rename to index_post_appeals_on_creator_id;
@@ -3167,7 +3169,7 @@ update users set blacklisted_tags = (select string_agg(_.tags, E'\n') from user_
 update users set post_update_count = (select count(*) from post_versions where updater_id = users.id);
 update users set note_update_count = (select count(*) from note_versions where updater_id = users.id);
 update users set favorite_count = (select count(*) from favorites where user_id = users.id);
--- drop table user_blacklisted_tags;
+drop table user_blacklisted_tags;
 
 CREATE TABLE user_password_reset_nonces (
     id integer NOT NULL,