diff --git a/app/assets/javascripts/blacklists.js b/app/assets/javascripts/blacklists.js
index b587eaaf3..49a5b3c81 100644
--- a/app/assets/javascripts/blacklists.js
+++ b/app/assets/javascripts/blacklists.js
@@ -78,12 +78,12 @@
   }
   
   Danbooru.Blacklist.posts = function() {
-    return $("article.post-preview");
+    return $(".post-preview");
   }
   
   Danbooru.Blacklist.post_match = function(post, blacklist) {
     var $post = $(post);
-    var tags = $post.data("tags").match(/\S+/g) || [];
+    var tags = String($post.data("tags")).match(/\S+/g) || [];
     tags.push("rating:" + $post.data("rating"));
     tags.push("uploader:" + $post.data("uploader"));
     
diff --git a/app/assets/javascripts/tag_script.js b/app/assets/javascripts/tag_script.js
index c782d5349..9df9b588d 100644
--- a/app/assets/javascripts/tag_script.js
+++ b/app/assets/javascripts/tag_script.js
@@ -48,7 +48,7 @@
     var old_tags = $post.data("tags");
     
     $.each(commands, function(i, x) {
-      var array = $post.data("tags").match(/\S+/g);
+      var array = String($post.data("tags")).match(/\S+/g);
       $post.data("tags", Danbooru.TagScript.process(array, x).join(" "));
     });
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4bb0f680f..711ac170d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -31,8 +31,10 @@ module ApplicationHelper
   end
   
   def compact_time(time)
-    if time > Time.now.beginning_of_day
-      time_tag(time.strftime("%H:%M"), time)
+    if time > Time.now.end_of_day
+      time_tag(time.strftime("%b %e, %Y"), time)
+    elsif time > Time.now.beginning_of_day 
+      time_tag(time.strftime("%l:%M %P"), time)
     elsif time > Time.now.beginning_of_year
       time_tag(time.strftime("%b %e"), time)
     else
diff --git a/app/models/ban.rb b/app/models/ban.rb
index 41ac79d55..93a5417d5 100644
--- a/app/models/ban.rb
+++ b/app/models/ban.rb
@@ -2,8 +2,9 @@ class Ban < ActiveRecord::Base
   after_create :update_feedback
   belongs_to :user
   belongs_to :banner, :class_name => "User"
-  attr_accessible :reason, :duration, :user_id
+  attr_accessible :reason, :duration, :user_id, :user_name
   validate :user_is_inferior
+  validates_presence_of :user_id, :reason, :duration
   
   def self.is_banned?(user)
     exists?(["user_id = ? AND expires_at > ?", user.id, Time.now])
diff --git a/app/views/bans/index.html.erb b/app/views/bans/index.html.erb
index bd08db46d..e73d72bc5 100644
--- a/app/views/bans/index.html.erb
+++ b/app/views/bans/index.html.erb
@@ -2,7 +2,7 @@
   <div class="index">
     <h1>Bans</h1>
     
-    <table class="striped">
+    <table class="striped" width="100%">
       <thead>
         <tr>
           <th>User</th>
diff --git a/app/views/bans/show.html.erb b/app/views/bans/show.html.erb
index 8502cb891..1e898bc61 100644
--- a/app/views/bans/show.html.erb
+++ b/app/views/bans/show.html.erb
@@ -3,7 +3,7 @@
     <h1>Show Ban</h1>
     <ul>
       <li><strong>User</strong>: <%= @ban.user.name %></li>
-      <li><strong>Expires</strong>: <%= @ban.expires_at %></li>
+      <li><strong>Expires</strong>: <%= compact_time @ban.expires_at %></li>
       <li><strong>Reason</strong>: <%= @ban.reason %></li>
     </ul>
   </div>
diff --git a/app/views/layouts/_main_links.html.erb b/app/views/layouts/_main_links.html.erb
index eb30537b0..903cf8849 100644
--- a/app/views/layouts/_main_links.html.erb
+++ b/app/views/layouts/_main_links.html.erb
@@ -9,5 +9,5 @@
   <%= nav_link_to("Notes", notes_path(:group_by => "post")) %>
   <%= nav_link_to("Wiki", wiki_pages_path(:title => "help:home")) %>
   <%= nav_link_to("Forum", forum_topics_path, :class => (CurrentUser.user.has_forum_been_updated? ? "forum-updated" : nil)) %>
-  <%= nav_link_to("&raquo;".html_safe, site_map_path, :id => "site-map-link") %>
+  <%= nav_link_to("More &raquo;".html_safe, site_map_path, :id => "site-map-link") %>
 </menu>
\ No newline at end of file
diff --git a/app/views/layouts/_more_links.html.erb b/app/views/layouts/_more_links.html.erb
index 9063bd7d1..d693a6fc2 100644
--- a/app/views/layouts/_more_links.html.erb
+++ b/app/views/layouts/_more_links.html.erb
@@ -10,5 +10,6 @@
     <% if CurrentUser.is_janitor? %>
       <%= nav_link_to("Dashboard", moderator_dashboard_path) %>
     <% end %>
+    <%= nav_link_to("More &raquo;".html_safe, site_map_path) %>
   </ul>
 </div>
\ No newline at end of file