diff --git a/rhodecode/templates/files/file_authors_box.mako b/rhodecode/templates/files/file_authors_box.mako
--- a/rhodecode/templates/files/file_authors_box.mako
+++ b/rhodecode/templates/files/file_authors_box.mako
@@ -1,30 +1,40 @@
 <%namespace name="base" file="/base/base.mako"/>
 
 % if c.authors:
-<ul class="sidebar-right-content">
+
+<table class="sidebar-right-content">
     % for email, user, commits in sorted(c.authors, key=lambda e: c.file_last_commit.author_email!=e[0]):
-    <li class="file_author">
-        <div class="tooltip" title="${h.tooltip(h.author_string(email))}">
-          <span class="user commit-author">${h.link_to_user(user)}</span>
+    <tr class="file_author tooltip" title="${h.tooltip(h.author_string(email))}">
 
+        <td>
+            <span class="user commit-author">${h.link_to_user(user)}</span>
             % if c.file_author:
                 <span class="commit-date">- ${h.age_component(c.file_last_commit.date)}</span>
             % elif c.file_last_commit.author_email==email:
                 <span> (${_('last author')})</span>
             % endif
+        </td>
 
+        <td>
             % if not c.file_author:
-                <span>
+                <code>
                   % if commits == 1:
                     ${commits} ${_('Commit')}
                   % else:
                     ${commits} ${_('Commits')}
                   % endif
-                </span>
+                </code>
             % endif
-        </div>
-    </li>
+        </td>
+    </tr>
+    <tr>
+        <td colspan="2">
+            % if c.file_author:
+            <a href="#ShowAuthors" id="show_authors" class="action_link">${_('Show Authors')}</a>
+            % endif
+        </td>
+    </tr>
     % endfor
-</ul>
+</table>
 % endif
-<a href="#" id="show_authors" class="action_link">${_('Show All')}</a>
+