diff --git a/stylesheet/stylesheet.css b/stylesheet/stylesheet.css
index 5892e78..ff2acd6 100644
--- a/stylesheet/stylesheet.css
+++ b/stylesheet/stylesheet.css
@@ -1,16 +1,21 @@
 a {
-  color: #439639;
+  color: #2c6825; /* #439639 */
   text-decoration: none;
 }
 
 a:visited {
-  color: #d9541e;
+  color: #bf420f; /* #d9541e */
 }
 
 a:hover {
   text-decoration: underline
 }
 
+.tags > a {
+  margin-right: 8px;
+  text-decoration: underline;
+}
+
 body {
   background-color:#f5f5f5;
 }
diff --git a/template/browse.atom b/template/browse.atom
index 2abd33c..ba81d4d 100644
--- a/template/browse.atom
+++ b/template/browse.atom
@@ -6,7 +6,7 @@
     <link href="{{request.url}}"
           rel="self"
           type="text/html" />
-    <link href="{{request.url.__str__().replace('mode=feed&', '', 1)}}"
+    <link href="{{request.url.__str__().replace('mode=feed&', '', 1).replace('?mode=feed', '', 1)}}"
           rel="alternate"
           type="text/html" />
     <link href="xmpp:{{pubsub_jid}}?pubsub;action=subscribe;node={{node_id}}"
diff --git a/template/browse.xhtml b/template/browse.xhtml
index 16a7289..14b4338 100644
--- a/template/browse.xhtml
+++ b/template/browse.xhtml
@@ -151,15 +151,17 @@
                                     {% endif %}
                                     <p class="p-summary summary">{{entry['summary']}}</p>
                                     <div class="details">
-                                        {% if entry['tags'] | length > 0 %}
-                                            to
-                                            {% for tag in entry['tags'] %}
-                                                <a class="p-category"
-                                                   href="{% if jid %}/jid/{{jid}}{% elif path in ('query', 'url') %}/{% endif %}?tags={{tag}}">
-                                                    {{tag}}
-                                                </a>
-                                            {% endfor %}
-                                        {% endif %}
+                                        <span class="tags">
+                                            {% if entry['tags'] | length > 0 %}
+                                                to
+                                                {% for tag in entry['tags'] %}
+                                                    <a class="p-category"
+                                                       href="{% if jid %}/jid/{{jid}}{% elif path in ('query', 'url') %}/{% endif %}?tags={{tag}}">
+                                                        {{tag}}
+                                                    </a>
+                                                {% endfor %}
+                                            {% endif %}
+                                        </span>
                                         by
                                         {% if jid %}
                                             <a class="p-author" href="/jid/{{jid}}">{{jid}}</a>