diff --git a/tekuti/page-helpers.scm b/tekuti/page-helpers.scm
index ab0a5e7..20e36a9 100644
--- a/tekuti/page-helpers.scm
+++ b/tekuti/page-helpers.scm
@@ -192,10 +192,6 @@
             ,(show-post post #f))
           '())))
 
-(define (sidebar-ul body)
-  `(div (@ (id "menu"))
-        (ul ,@body)))
-
 (define (admin-post-url post)
   (relurl `("admin" "posts" ,(post-key post))))
 
@@ -320,20 +316,21 @@
    " "))
 
 (define (main-sidebar request index)
-  (sidebar-ul
-   `((li (h2 (a (@ (href ,(relurl '("feed" "atom"))))
-                "subscribe "
-                (img (@ (src ,(relurl '("wp-content" "feed-icon-14x14.png")))
-                        (alt "[feed]")))
-                )))
-     (li (h2 "search")
-         (form (@ (method "POST")
-                  (action ,(relurl '("search"))))
+  `((h2 (a (@ (href ,(relurl '("feed" "atom"))))
+           "subscribe"))
+    (h2 "search")
+    (form (@ (method "POST")
+             (action ,(relurl '("search")))
+             (class "form-search"))
+          (div (@ (class "input-append"))
                (input (@ (name "string") (type "text") (size "15")
-                         (value "")))))
-     (li (h2 "tags " ,(rellink '("tags") ">>"))
-         (ul (li (@ (style "line-height: 150%"))
-                 ,@(tag-cloud (top-tags index 30))))))))
+                         (value "")
+                         (class "input-small search-query")))
+               (button (@ (type "submit")
+                          (class "btn"))
+                       (i (@ (class "icon-search")) ""))))
+    (h2 "tags " ,(rellink '("tags") ">>"))
+    ,@(tag-cloud (top-tags index 30))))
 
 (define (post-sidebar post index)
   (sidebar-ul