diff --git a/templates/browser/log.html b/templates/browser/log.html
index 441fbd3..3f2ce32 100644
--- a/templates/browser/log.html
+++ b/templates/browser/log.html
@@ -8,12 +8,6 @@
 
 {% block content %}
 <h2>Commit Log</h2>
-Branches:
-<ul>
-{% for branch, commit in repo.branches.items %}
-<li><a href="{% url codereview.browser.views.log repository=repository.name %}?c={{branch}}">{{ branch }}</a> ({{commit.id}})</li>
-{% endfor %}
-</ul>
 <table class="vcs-log">
     <tr>
         <th>Commit Date</th>
diff --git a/templates/browser/navigation.html b/templates/browser/navigation.html
index ee5a535..a1b689d 100644
--- a/templates/browser/navigation.html
+++ b/templates/browser/navigation.html
@@ -1,5 +1,18 @@
 {% load vcs %}
 <h2><a href="{% url codereview.browser.views.log repository=repository.name %}?c={{ ref }}">{{ repository.name }}</a></h2>
+<h3>Branches</h3>
+<ul>
+    {% for branch, commit in repo.branches.items %}
+    <li>
+        {% if ref == branch or ref == commit.id %}
+            <strong>{{ branch }}</strong>
+        {% else %}
+            <a href="{% url codereview.browser.views.log repository=repository.name %}?c={{branch}}">{{ branch }}</a>
+        {% endif %}
+    </li>
+    {% endfor %}
+</ul>
+<h3>Browse</h3>
 {% if path|dirname %}
     <strong>{{ path|dirname }}/</strong><br />
     <a href="{% url codereview.browser.views.log repository=repository.name path=path|dirname %}?c={{ ref }}">Up one</a>