diff -r 416560b82116 -r cdb6403c2498 templates/channel.tmpl
--- a/templates/channel.tmpl	Mon Feb 09 07:32:11 2009 +0200
+++ b/templates/channel.tmpl	Mon Feb 09 11:05:53 2009 +0200
@@ -17,6 +17,7 @@
         </form>
     </li>
 
+<!--
     <li>
         <a href="${urls.channel_view.build(req, channel=channel, count=count or None)}">View last:</a>
     </li><li class="join-left">
@@ -30,13 +31,13 @@
             lines: <input type="submit" value="Go &raquo;" />
         </form>
     </li>
-
+-->
     <li><a href="${urls.channel_calendar.build(req, channel=channel)}">Browse by Date</a></li>
 
     <li>
+        <a href="${h.build_url(urls.channel_search, channel=channel)}">Search:</a>
+    </li><li class="join-left">
         <form action="${urls.channel_search.build(req, channel=channel)}" method="GET">
-            <label for="q">Search:</label>
-
             <input name="q"></input>
             <input type="submit" value="Go &raquo;" />
         </form>