diff --git a/README.md b/README.md
index eca32df..b7b030a 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,7 @@ Run the tests locally (against development environment):
 ## TODOs
 
 1. CSS
+1. Check status for items not found, should be 404 but getting 5xx
 1. "All new posts flagged" mode (require approval for new posts)
 1. Tests for mod-only user?
 1. Check input validation
diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep
index 3bac0e2..5895483 100644
--- a/templates/layouts/default.html.ep
+++ b/templates/layouts/default.html.ep
@@ -14,12 +14,11 @@
     <%= link_to About => 'about_page'                      %>
     <%= link_to Rules => 'rules_page'                      %>
     <%= link_to RSS   => threads_feed => {format => 'rss'} %>
-    <span class="login">
-      <% if (is_mod) { =%>
-      <%= link_to Logout => 'mod_logout' %>
-      <% } else { =%>
-      <%= link_to Login => 'mod_login' %>
-      <% } =%>
+    <% if (is_mod) { =%>
+    <%= link_to Logout => mod_logout => (class => 'login') %>
+    <% } else { =%>
+    <%= link_to Login => mod_login => (class => 'login') %>
+    <% } =%>
     </span>
   </nav>
   <% if (is_mod) { =%>
diff --git a/templates/thread/by_page.html.ep b/templates/thread/by_page.html.ep
index ccf9468..8df5aaa 100644
--- a/templates/thread/by_page.html.ep
+++ b/templates/thread/by_page.html.ep
@@ -8,10 +8,8 @@
       <%= link_to single_thread => {thread_id => $thread->{'id'}}, begin %>
         <%= $thread->{'title'} %>
       <% end %>
-      <span class="id">
-        <%= link_to "#$thread->{'id'}",
-            single_thread => {thread_id => $thread->{'id'}} %>
-      </span>
+      <%= link_to "#$thread->{'id'}",
+          single_thread => {thread_id => $thread->{'id'}}, (class => 'id') %>
     </h3>
     <h4 class="date"><%= $thread->{'date'} %></h4>
     <h5 class="author"><%= $thread->{'author'} %></h5>
@@ -22,14 +20,13 @@
       <%= link_to Remark => post_remark => {thread_id => $thread->{'id'}} %>
       <%= link_to url_for(single_thread => {thread_id => $thread->{'id'}})
           ->fragment('remarks'), begin %>
-        (<%= $thread->{'remark_tally'} %> remarks)
+        <%= $thread->{'remark_tally'} %> Remarks
       <% end %>
       <%= link_to bump_thread => {thread_id => $thread->{'id'}}, begin %>
-        Bump (<%= $thread->{'bump_tally'} %> bumps)
+        Bump (<%= $thread->{'bump_tally'} %>)
       <% end %>
-      <span class="flag">
-        <%= link_to Flag => flag_thread => {thread_id => $thread->{'id'}} %>
-      </span>
+      <%= link_to Flag => flag_thread => {thread_id => $thread->{'id'}},
+          (class => 'flag') %>
     </nav>
   </article>
   <% } =%>