diff --git a/views/_news.erb b/views/_news.erb
index 63d8cdaf..2641c68d 100644
--- a/views/_news.erb
+++ b/views/_news.erb
@@ -37,7 +37,7 @@
       <% end %>
 
       <span class="date">
-        <a href="?event_id=<%= event.id %>"><%= event.created_at.ago %></a>
+        <a href="/site/<%= event_site.username %>?event_id=<%= event.id %>"><%= event.created_at.ago %></a>
       </span>
     </div>
   <% elsif event.site_change_id %>
@@ -51,7 +51,7 @@
           <a href="/site/<%= event_site.username %>" class="user" title="<%= event_site.title %>"><%= event_site.title.shorten(45) %></a> has been updated.
         <% end %>
         <span class="date">
-          <a href="?event_id=<%= event.id %>"><%= event.created_at.ago %></a>
+          <a href="/site/<%= event_site.username %>?event_id=<%= event.id %>"><%= event.created_at.ago %></a>
         </span>
       </div>
       <% site_change_filenames = event.site_change.site_change_filenames %>
@@ -90,11 +90,12 @@
       <div class="comments">
         <% event.comments.each do |comment| %>
           <% comment_actioning_site = comment.actioning_site_dataset.select(:id, :title, :domain, :username, :stripe_customer_id).first %>
+          <% comment_event_site = comment.event.site_dataset.select(:id, :title, :domain, :username, :stripe_customer_id).first %>
           <div class="comment" id="comment_<%= comment.id %>">
             <a href="/site/<%= comment_actioning_site.username %>"><img class="avatar" src="<%= comment_actioning_site.screenshot_url('index.html', '50x50') %>"></a>
             <a href="/site/<%= comment_actioning_site.username %>" class="user" title="<%= comment_actioning_site.title %>"><i class="fa fa-user"><% if comment_actioning_site.supporter? %><i class="fa fa-heart"></i><% end %></i><%= comment_actioning_site.username %></a>
             <span class="date">
-              <a href="?event_id=<%= event.id %>"><%= comment.created_at.ago %></a>
+              <a href="/site/<%= comment_event_site.username %>?event_id=<%= event.id %>"><%= comment.created_at.ago %></a>
             </span>
             <p><%= comment.message %></p>
           </div>
diff --git a/views/_news_profile_comment.erb b/views/_news_profile_comment.erb
index 5840d82f..f2ccde95 100644
--- a/views/_news_profile_comment.erb
+++ b/views/_news_profile_comment.erb
@@ -11,14 +11,14 @@
   <% end %>
 
   <i class="fa fa-chevron-right comment-symbol" title="commented on"></i>
-  
+
     <% if current_site && current_site.id == profile_comment.site_id %>
       <a href="/site/<%= current_site.username %>" class="you">You</a>
     <% else %>
       <a href="/site/<%= profile_comment.site.username %>" class="user"><i class="fa fa-user"><% if profile_comment.site.supporter? %><i class="fa fa-heart"></i><% end %></i><%= profile_comment.site.username %></a>
     <% end %>
   <span class="date">
-    <a href="?event_id=<%= profile_comment.event.id %>"><%= profile_comment.created_at.ago %></a>
+    <a href="/site/<%= site.username %>?event_id=<%= profile_comment.event.id %>"><%= profile_comment.created_at.ago %></a>
   </span>
   <div class="comment"><%= profile_comment.message %></div>
-</div>
\ No newline at end of file
+</div>