diff --git a/templates/header_with_user.html b/templates/header_with_user.html
index c01d179..85a2f7d 100644
--- a/templates/header_with_user.html
+++ b/templates/header_with_user.html
@@ -13,9 +13,9 @@
     </div>
 </div>
 
-{% else %} <!-- this is for the `when` statement -->
+{% when None %} <!-- this is for the `when` statement -->
 <div class="header_logged_out">
-    Heya, why don't you <a href="/login">log in</a> or <a href="/signup">sign up</a>?
+    <a href="/login">log in</a> or <a href="/signup">sign up</a>?
 </div>
 {% endmatch %}
 
diff --git a/templates/search_watches_page.html b/templates/search_watches_page.html
index 68767f2..10e3c70 100644
--- a/templates/search_watches_page.html
+++ b/templates/search_watches_page.html
@@ -6,17 +6,23 @@
 {% block content %}
 
 <h1>Whatcha Watchin?</h1>
-
-<div class="quicksearch-query">{{self.search}}</div>
-
 <div class="watchlist">
-    <ul>
-        {% for watch in watches %}
-        <li><span class="watchtitle">{{watch.title}}</span> -- {% call m::get_or_default(watch.year(), "when??") -%}:
-            {{watch.kind}} </li>
-        {% endfor %}
-    </ul>
+    <table>
+        <thead>
+            <tr>
+                <th>Title</th>
+                <th>Type</th>
+                <th>Year</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for watch in watches %}
+            {% include "watch-search-result.html" %}
+            {% endfor %}
+        </tbody>
+    </table>
 </div>
+
 <h2>Simple Search</h2>
 <div class="simplesearch">
     <form action="/search" enctype="application/x-www-form-urlencoded" method="get">
@@ -24,6 +30,7 @@
         <input type="text" name="search" id="search"></br>
         <input type="submit" value="Let's go!">
 </div>
+
 <h2>Fussy Search</h2>
 <div class="fullsearch">
     <label for="title">Title</label>
diff --git a/templates/watch-search-result.html b/templates/watch-search-result.html
new file mode 100644
index 0000000..4b10842
--- /dev/null
+++ b/templates/watch-search-result.html
@@ -0,0 +1,5 @@
+<tr id="watchlist-item-{{watch.id}}">
+    <td><span class="watchtitle">{{watch.title}}</span></td>
+    <td>{{watch.kind}}</td>
+    <td> {% call m::get_or_default(watch.year(), "when??") -%}</td>
+</tr>