diff --git a/resources/content_server/browse/browse.css b/resources/content_server/browse/browse.css
index 9a2125c0c0..1243795e55 100644
--- a/resources/content_server/browse/browse.css
+++ b/resources/content_server/browse/browse.css
@@ -263,9 +263,16 @@ h2.library_name {
 
 }
 
-.category div.category-item span.href { display: none }
+.category div.category-item a { text-decoration: none; color: inherit; }
 
-#groups span.load_href { display: none }
+#groups a.load_href { 
+    text-decoration: none;
+    color: inherit;
+    font-size: medium;
+    font-weight: normal;
+    padding: 0;
+    padding-left: 0.5em;
+}
 
 #groups h3 {
     font-weight: bold;
diff --git a/resources/content_server/browse/browse.js b/resources/content_server/browse/browse.js
index db4e602449..e0585a9afd 100644
--- a/resources/content_server/browse/browse.js
+++ b/resources/content_server/browse/browse.js
@@ -133,7 +133,7 @@ function render_error(msg) {
 // Category feed {{{
 
 function category_clicked() {
-   var href = $(this).find("span.href").html();
+   var href = $(this).find("a").attr('href');
    window.location = href;
 }
 
@@ -151,7 +151,7 @@ function category() {
 
         change: function(event, ui) {
             if (ui.newContent) {
-                var href = ui.newContent.children("span.load_href").html();
+                var href = ui.newContent.prev().children("a.load_href").attr('href');
                 ui.newContent.children(".loading").show();
                 if (href) {
                     $.ajax({
diff --git a/resources/content_server/monocle.js b/resources/content_server/read/monocle.js
similarity index 100%
rename from resources/content_server/monocle.js
rename to resources/content_server/read/monocle.js
diff --git a/setup/server.py b/setup/server.py
index d9c444fa55..443ffb7da9 100644
--- a/setup/server.py
+++ b/setup/server.py
@@ -18,7 +18,7 @@ class Server(Command):
     def rebuild_monocole(self):
         subprocess.check_call(['sprocketize', '-C', self.MONOCLE_PATH,
             '-I', 'src', 'src/monocle.js'],
-            stdout=open('resources/content_server/monocle.js', 'wb'))
+            stdout=open('resources/content_server/read/monocle.js', 'wb'))
 
     def launch_server(self, log):
         self.rebuild_monocole()
diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 935d472cb1..7131ead77f 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -123,9 +123,10 @@ def get_category_items(category, items, restriction, datatype, prefix): # {{{
 
     def item(i):
         templ = (u'<div title="{4}" class="category-item">'
-                '<div class="category-name">{0}</div><div>{1}</div>'
-                '<div>{2}'
-                '<span class="href">{5}{3}</span></div></div>')
+                '<div class="category-name">'
+                '<a href="{5}{3}" title="{4}">{0}</a></div>'
+                '<div>{1}</div>'
+                '<div>{2}</div></div>')
         rating, rstring = render_rating(i.avg_rating, prefix)
         name = xml(i.name)
         if datatype == 'rating':
@@ -142,7 +143,7 @@ def get_category_items(category, items, restriction, datatype, prefix): # {{{
             q = category
         href = '/browse/matches/%s/%s'%(quote(q), quote(id_))
         return templ.format(xml(name), rating,
-                xml(desc), xml(href), rstring, prefix)
+                xml(desc), xml(href, True), rstring, prefix)
 
     items = list(map(item, items))
     return '\n'.join(['<div class="category-container">'] + items + ['</div>'])
@@ -394,14 +395,15 @@ class BrowseServer(object):
             for x in sorted(starts):
                 category_groups[x] = len([y for y in items if
                     getter(y).upper().startswith(x)])
-            items = [(u'<h3 title="{0}">{0} <span>[{2}]</span></h3><div>'
+            items = [(u'<h3 title="{0}"><a class="load_href" title="{0}"'
+                      u' href="{4}{3}"><strong>{0}</strong> [{2}]</a></h3><div>'
                       u'<div class="loaded" style="display:none"></div>'
                       u'<div class="loading"><img alt="{1}" src="{4}/static/loading.gif" /><em>{1}</em></div>'
-                      u'<span class="load_href">{4}{3}</span></div>').format(
+                      u'</div>').format(
                         xml(s, True),
                         xml(_('Loading, please wait'))+'&hellip;',
                         unicode(c),
-                        xml(u'/browse/category_group/%s/%s'%(category, s)),
+                        xml(u'/browse/category_group/%s/%s'%(category, s), True),
                         self.opts.url_prefix)
                     for s, c in category_groups.items()]
             items = '\n\n'.join(items)