diff --git a/app.rb b/app.rb
index f995ee96..e87da76e 100644
--- a/app.rb
+++ b/app.rb
@@ -67,13 +67,13 @@ get '/profile_mockup' do
   erb :'profile_mockup', locals: {site: current_site}
 end
 
-get '/profile/:sitename' do |sitename|
+get '/site/:sitename' do |sitename|
   @title = "#{sitename}.neocities.org"
   site = Site[username: sitename]
-  erb :'profile', locals: {site: site, is_current_site: site == current_site}
+  erb :'site', locals: {site: site, is_current_site: site == current_site}
 end
 
-post '/profile/:sitename/comment' do |sitename|
+post '/site/:sitename/comment' do |sitename|
   require_login
 
   site = Site[username: sitename]
@@ -85,7 +85,7 @@ post '/profile/:sitename/comment' do |sitename|
     )
   end
 
-  redirect "/profile/#{sitename}"
+  redirect "/site/#{sitename}"
 end
 
 get '/tags_mockup' do
@@ -886,6 +886,7 @@ def signed_in?
 end
 
 def current_site
+  return nil if session[:id].nil?
   @site ||= Site[id: session[:id]]
 end
 
diff --git a/migrations/022_fix_changes.rb b/migrations/022_fix_changes.rb
index c31f8b5a..25f494c7 100644
--- a/migrations/022_fix_changes.rb
+++ b/migrations/022_fix_changes.rb
@@ -4,6 +4,6 @@ Sequel.migration do
   }
 
   down {
-    DB.drop_column :site_changes, :changes
+    DB.rename_table :site_changes, :changes
   }
 end
\ No newline at end of file
diff --git a/models/site.rb b/models/site.rb
index f9d1ce6c..e868293c 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -54,7 +54,7 @@ class Site < Sequel::Model
   HTML_REGEX           = /htm|html/
   MAX_COMMENT_SIZE     = 420 # Used to be the limit for Facebook.. no comment (PUN NOT INTENDED).
 
-  SCREENSHOT_RESOLUTIONS = ['235x141', '105x63', '270x162', '37x37', '146x88', '302x182', '90x63', '82x62']
+  SCREENSHOT_RESOLUTIONS = ['235x141', '105x63', '270x162', '37x37', '146x88', '302x182', '90x63', '82x62', '348x205']
   THUMBNAIL_RESOLUTIONS  = ['105x63']
 
   many_to_one :server
diff --git a/views/_follows.erb b/views/_follows.erb
index 29fe8cf9..8a6a229b 100644
--- a/views/_follows.erb
+++ b/views/_follows.erb
@@ -5,7 +5,7 @@
       <p>You are not following any sites yet. Add some by <a href="/browse">browsing sites</a> or looking at your tags.
     <% else %>
       <% site.followings.each do |following| %>
-        <a href="#"><img src="<%= site.screenshot_path 'index.html', '37x37' %>" class="avatar"></a>
+        <a href="/site/<%= site.username %>"><img src="<%= site.screenshot_path 'index.html', '37x37' %>" class="avatar"></a>
       <% end %>
     <% end %>
   </div>
diff --git a/views/_news.erb b/views/_news.erb
index 549220d6..1565d00f 100644
--- a/views/_news.erb
+++ b/views/_news.erb
@@ -1,10 +1,9 @@
 <% events.each do |event| %>
   <% if event.profile_comment_id %>
-    <%== erb :'_news_profile_comment', layout: false, locals: {event: event} %>
+    <%== erb :'_news_profile_comment', layout: false, locals: {profile_comment: event.profile_comment} %>
   <% end %>
 <% end %>
 
-
 <!--
     <div class="news-item follow">
       <div class="title">
diff --git a/views/_news_profile_comment.erb b/views/_news_profile_comment.erb
index e389b541..70473d2f 100644
--- a/views/_news_profile_comment.erb
+++ b/views/_news_profile_comment.erb
@@ -1,8 +1,8 @@
 <div class="news-item comment for-me">
   <div class="title">
-    <div class="icon" style="background-image:url(https://neocities.org/site_screenshots/codeventurer.jpg);"></div>
-    <a href="" class="user">Foo</a> 
-    <span class="date"><%= event.profile_comment.created_at.ago %></span>
-    <div class="comment"><%= event.profile_comment.message %></div>
+    <div class="icon" style="background-image:url(<%= profile_comment.actioning_site.screenshot_url('index.html', '82x62') %>);"></div>
+    <a href="" class="user"><%= profile_comment.actioning_site.username %></a> 
+    <span class="date"><%= profile_comment.created_at.ago %></span>
+    <div class="comment"><%= profile_comment.message %></div>
   </div>
 </div>
\ No newline at end of file
diff --git a/views/_tags.erb b/views/_tags.erb
index 909809f8..2644bd15 100644
--- a/views/_tags.erb
+++ b/views/_tags.erb
@@ -1,10 +1,10 @@
-<% if is_current_site %>
+<% if (!is_current_site && site.tags_dataset.count > 0) || is_current_site %>
   <h3>Tags</h3>
   <% if site.tags_dataset.count == 0 %>
     <p>You don't have any tags yet. <a href="#">Add some!</a>
   <% else %>
     <% site.tags.each do |tag| %>
-    <a class="tag" href="//neocities.org/tags/<%= tag.name %>"><%= tag.name %></a>
+    <a class="tag" href="/tags/<%= tag.name %>"><%= tag.name %></a>
     <% end %>
   <% end %>
 <% end %>
\ No newline at end of file
diff --git a/views/home.erb b/views/home.erb
index 49794c8e..fb2729f7 100644
--- a/views/home.erb
+++ b/views/home.erb
@@ -107,10 +107,10 @@
           </div>
         </div>
 
-        <a href=""><img src="http://neocities.org/site_screenshots/codeventurer.jpg" style="width:340px" class="large-portrait"></a>
+        <a href=""><img src="<%= site.screenshot_url('index.html', '348x205') %>" style="width:340px" class="large-portrait"></a>
 
         <div style="margin-top: 20px; margin-bottom: 20px" class="txt-Center">
-          <a href="/profile/<%= site.username %>" class="btn-Action">View Site Profile</a>
+          <a href="/site/<%= site.username %>" class="btn-Action">View Site Profile</a>
         </div>
 
         <%== erb :'_follows', layout: false, locals: {site: site, is_current_site: site == current_site} %>
diff --git a/views/profile.erb b/views/site.erb
similarity index 80%
rename from views/profile.erb
rename to views/site.erb
index c9ec6442..fdb92cd2 100644
--- a/views/profile.erb
+++ b/views/site.erb
@@ -3,12 +3,12 @@
     <div class="col col-50 signup-Area large">
       <div class="signup-Form">
   	  <fieldset class="content">
-        <img class="screenshot" src="http://neocities.org/site_screenshots/codeventurer.jpg" style="width: 358px;height: 215px;">
+        <img class="screenshot" src="<%= site.screenshot_url('index.html', '348x205') %>" style="width: 358px;height: 215px;">
 	    </fieldset>
       </div>
     </div>
     <div class="col col-50">
-      <h2 class="eps title-with-badge"><span>Derp's Website</span> <% if site.supporter? && !site.ended_supporter? %><a href="/plan" class="supporter-badge" title="Neocities Supporter"></a> <% end %></h2>
+      <h2 class="eps title-with-badge"><span><%= site.title %></span> <% if site.supporter? && !site.ended_supporter? %><a href="/plan" class="supporter-badge" title="Neocities Supporter"></a> <% end %></h2>
       <p class="site-url"><a href="http://<%= site.username %>.neocities.org" target="_blank">http://<%= site.username %>.neocities.org</a></p>
       <div class="stats">
         <div class="stat"><strong><%= site.hits_english %></strong> <span>hits</span></div>
@@ -29,13 +29,15 @@
 <div class="container">
 <div class="content misc-page columns right-col"><div class="col-left">
   <div class="col col-66">
-    <div class="post-comment">
-      <form method="POST" action="/profile/<%= site.username %>/comment">
-        <input name="csrf_token" type="hidden" value="<%= csrf_token %>">
-        <input name="message" type="text" placeholder="Post a message..." maxlength="<%= Site::MAX_COMMENT_SIZE %>">
-        <button class="btn-Action">Post</button>
-      </form>
-    </div>
+    <% if current_site %>
+      <div class="post-comment">
+        <form method="POST" action="/profile/<%= site.username %>/comment">
+          <input name="csrf_token" type="hidden" value="<%= csrf_token %>">
+          <input name="message" type="text" placeholder="Post a message..." maxlength="<%= Site::MAX_COMMENT_SIZE %>">
+          <button class="btn-Action">Post</button>
+        </form>
+      </div>
+    <% end %>
 
     <% if site.latest_events.empty? %>
       <div>