diff --git a/progit/templates/repo_info.html b/progit/templates/repo_info.html
index 5c8fe43..febb034 100644
--- a/progit/templates/repo_info.html
+++ b/progit/templates/repo_info.html
@@ -9,8 +9,25 @@
   <a href="{{ url_for('view_repo', repo=repo)}}">
     {{ repo.split('.git')[0] }}
   </a>
+  {% if branchname %} ({{ branchname }}) {% endif %}
 </h2>
 
+
+<section class="branch_list">
+  <h3>Branches</h3>
+  <ul>
+    {% for branch in branches %}
+    <li>
+      <a href="{{ url_for('view_repo_branch', repo=repo, branchname=branch) }}">
+        {{ branch }}
+      </a>
+      (<a href="{{ url_for('view_log', repo=repo, branchname=branch) }}"
+        >logs</a>)
+    </li>
+    {% endfor %}
+  </ul>
+</section>
+
 {% if total_page %}
 <table>
     <tr>
@@ -37,21 +54,12 @@
 </table>
 {% endif %}
 
-<section class="branch_list">
-  <h3>Branches</h3>
-  <ul>
-    {% for branch in branches %}
-    <li>
-      <a href="{{ url_for('view_repo_branch', repo=repo, branchname=branch) }}">
-        {{ branch }}
-      </a>
-    </li>
-    {% endfor %}
-  </ul>
-</section>
-
 <section class="commit_list">
+  {% if origin != 'view_log' %}
   <h3>Last 10 commits</h3>
+  {% else %}
+  <h3>Commits list</h3>
+  {% endif %}
   <ul>
     {% for commit in last_commits %}
     <li>
@@ -64,23 +72,25 @@
   </ul>
 </section>
 
-<section class="tree_list">
-  <h3>Current tree</h3>
-  <ul>
-    {% for entry in tree %}
-    <li>
-      {% if entry.filemode == 16384 %}
-      [ ]
-      {% endif %}
-      <a href="{{ url_for('view_file',
-                repo=repo, identifier=branchname, filename=entry.name) }}">
-        {{ entry.name }}
-      </a>
-      {{ entry.hex }}
-      {{ entry.id }}
-    </li>
-    {% endfor %}
-  </ul>
-</section>
+{% if tree %}
+  <section class="tree_list">
+    <h3>Current tree</h3>
+    <ul>
+      {% for entry in tree %}
+      <li>
+        {% if entry.filemode == 16384 %}
+        [ ]
+        {% endif %}
+        <a href="{{ url_for('view_file',
+                  repo=repo, identifier=branchname, filename=entry.name) }}">
+          {{ entry.name }}
+        </a>
+        {{ entry.hex }}
+        {{ entry.id }}
+      </li>
+      {% endfor %}
+    </ul>
+  </section>
+{% endif %}
 
 {% endblock %}