diff --git a/app.rb b/app.rb
index 3925d848..ca62f89f 100644
--- a/app.rb
+++ b/app.rb
@@ -222,7 +222,17 @@ end
 post '/tags/add' do
   require_login
   current_site.new_tags_string = params[:tags]
-  current_site.save validate: false
+  current_site.save
+  redirect request.referer
+end
+
+post '/tags/remove' do
+  require_login
+
+  DB.transaction {
+    params[:tags].each {|tag| current_site.remove_tag Tag[name: tag]}
+  }
+
   redirect request.referer
 end
 
diff --git a/migrations/033_add_site_id_to_site_change_files.rb b/migrations/033_add_site_id_to_site_change_files.rb
new file mode 100644
index 00000000..e06722af
--- /dev/null
+++ b/migrations/033_add_site_id_to_site_change_files.rb
@@ -0,0 +1,9 @@
+Sequel.migration do
+  up {
+    DB.add_column :site_change_files, :site_id, :integer
+  }
+
+  down {
+    DB.drop_column :site_change_files, :site_id
+  }
+end
diff --git a/models/site.rb b/models/site.rb
index 410af5f9..63bfbe54 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -267,6 +267,8 @@ class Site < Sequel::Model
     screenshots_delete(filename) if ext.match HTML_REGEX
     thumbnails_delete(filename) if ext.match IMAGE_REGEX
 
+    SiteChangeFile.filter(site_id: self.id, filename: filename).delete
+
     true
   end
 
diff --git a/models/site_change.rb b/models/site_change.rb
index 0423f2bf..f4835fdc 100644
--- a/models/site_change.rb
+++ b/models/site_change.rb
@@ -20,7 +20,7 @@ class SiteChange < Sequel::Model
     site_change_file = site_change.site_change_files_dataset.filter(filename: filename).first
 
     if !site_change_file
-      site_change.add_site_change_file filename: filename
+      site_change.add_site_change_file site_id: site.id, filename: filename
     end
   end
 end
diff --git a/public/css/bootstrap.min.css b/public/css/bootstrap.min.css
index a8ba3895..1d2c6f14 100644
--- a/public/css/bootstrap.min.css
+++ b/public/css/bootstrap.min.css
@@ -1,4 +1,4 @@
-@import url("http://fonts.googleapis.com/css?family=Lato:400,700,900,400italic");/*!
+@import url("//fonts.googleapis.com/css?family=Lato:400,700,900,400italic");/*!
  * Bootstrap v2.3.2
  *
  * Copyright 2012 Twitter, Inc
diff --git a/views/_news.erb b/views/_news.erb
index 8302a53e..f3a283b2 100644
--- a/views/_news.erb
+++ b/views/_news.erb
@@ -22,30 +22,33 @@
       <div class="title">
         <div class="icon"></div>
         <% event_site_username = event.site_dataset.select(:username).first.username %>
-        <a href="http://<%= event_site_username %>.neocities.org" class="user"><%= event_site_username %>.neocities.org</a> has been updated <span class="date"><%= event.created_at.ago %></span>
+        <a href="http://<%= event_site_username %>.neocities.org" class="user"><%= event_site_username %>.neocities.org</a> has been updated. <span class="date"><%= event.created_at.ago %></span>
       </div>
-      <div class="content">
-        <div class="files">
-          <% event.site_change.site_change_filenames.each do |f| %>
-            <div class="file">
-              <div class="html-thumbnail <%= site_change_file_display_class f %>">
-                <a href="http://<%= site.username %>.neocities.org/<%= f %>">
-                  <% if site_change_file_display_class(f) == 'html' %>
-                    <img src="<%= site.screenshot_url(f, '90x63') %>">
-                  <% elsif site_change_file_display_class(f) == 'image' %>
-                    <img src="<%= site.thumbnail_url(f, '90x63') %>">
-                  <% elsif site_change_file_display_class(f) == 'misc' %>
-                    <span class="misc-icon">
-                      <%= File.extname(f).sub('.', '') %>
-                    </span>
-                  <% end %>
-                  <span class="title"><%= f %></span>
-                </a>
+      <% site_change_filenames = event.site_change.site_change_filenames %>
+      <% unless site_change_filenames.empty? %>
+        <div class="content">
+          <div class="files">
+            <% event.site_change.site_change_filenames.each do |f| %>
+              <div class="file">
+                <div class="html-thumbnail <%= site_change_file_display_class f %>">
+                  <a href="http://<%= site.username %>.neocities.org/<%= f %>">
+                    <% if site_change_file_display_class(f) == 'html' %>
+                      <img src="<%= site.screenshot_url(f, '90x63') %>">
+                    <% elsif site_change_file_display_class(f) == 'image' %>
+                      <img src="<%= site.thumbnail_url(f, '90x63') %>">
+                    <% elsif site_change_file_display_class(f) == 'misc' %>
+                      <span class="misc-icon">
+                        <%= File.extname(f).sub('.', '') %>
+                      </span>
+                    <% end %>
+                    <span class="title"><%= f %></span>
+                  </a>
+                </div>
               </div>
-            </div>
-          <% end %>
+            <% end %>
+          </div>
         </div>
-      </div>
+      <% end %>
   <% end %>
 
   <%== erb :'_news_actions', layout: false, locals: {event: event} %>
diff --git a/views/_tags.erb b/views/_tags.erb
index ecd6fec0..0037b530 100644
--- a/views/_tags.erb
+++ b/views/_tags.erb
@@ -9,7 +9,9 @@
 
     <% if is_current_site %>
       <div class="clear">
-        <a href="#addTag" data-toggle="modal">Add Tags</a>
+        <a href="#addTag" data-toggle="modal">Add</a>
+        &nbsp;&nbsp;&nbsp;
+        <a href="#removeTag" data-toggle="modal">Remove</a>
       </div>
     <% end %>
   <% end %>
@@ -24,7 +26,7 @@
     </div>
     <div class="modal-body">
       <p>
-        Tags must only be a single word, and can only contain letters and numbers. Separate multiple tags with commas (example: pokemon, gardening, bicycles).
+        Tags must only be a single word, and can only contain letters and numbers, and you can only have up to five tags. Separate multiple tags with commas (example: pokemon, gardening, bicycles).
       </p>
       <p>Tags:</p>
       <input type="text" name="tags">
@@ -34,4 +36,27 @@
       <button type="submit" class="btn btn-Action">Add Tag(s)</button>
     </div>
   </form>
+</div>
+
+<div class="modal hide fade" id="removeTag" tabindex="-1" role="dialog" aria-labelledby="removeTagLabel" aria-hidden="true">
+  <form method="POST" action="/tags/remove">
+    <input type="hidden" value="<%= csrf_token %>" name="csrf_token">
+    <div class="modal-header">
+      <button class="close" type="button" data-dismiss="modal" aria-hidden="true">x</button>
+      <h3 id="removeTagLabel">Remove Tags</h3>
+    </div>
+    <div class="modal-body">
+      <p>
+        Select the tags you would like to remove:
+      </p>
+      <% site.tags.each do |tag| %>
+        <input name="tags[]" type="checkbox" value="<%= tag.name %>"> <%= tag.name %>
+        <br>
+      <% end %>
+    </div>
+    <div class="modal-footer">
+      <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
+      <button type="submit" class="btn btn-Action">Remove Tag(s)</button>
+    </div>
+  </form>
 </div>
\ No newline at end of file
diff --git a/views/site.erb b/views/site.erb
index 1fd52e87..5afa75ca 100644
--- a/views/site.erb
+++ b/views/site.erb
@@ -97,17 +97,6 @@
 
     <%== erb :'_follows', layout: false, locals: {site: site, is_current_site: site == current_site} %>
 
-    <!--
-    <h3>Archives</h3>
-    <div class="archives">
-    <a href=""><img src="http://neocities.org/site_screenshots/codeventurer.jpg"></a>
-    <a href=""><img src="http://neocities.org/site_screenshots/codeventurer.jpg"></a>
-    <a href=""><img src="http://neocities.org/site_screenshots/codeventurer.jpg"></a>
-    <a href=""><img src="http://neocities.org/site_screenshots/codeventurer.jpg"></a>
-    <a href="" class="more">See all versions</a>
-    </div>
-    -->
-
     <%== erb :'_tags', layout: false, locals: {site: site, is_current_site: site == current_site} %>
 
     <div class="report">