diff --git a/rhodecode/templates/files/file_content.mako b/rhodecode/templates/files/file_content.mako
new file mode 100644
--- /dev/null
+++ b/rhodecode/templates/files/file_content.mako
@@ -0,0 +1,9 @@
+<%namespace name="sourceblock" file="/codeblocks/source.mako"/>
+
+<%def name="render_lines(lines)">
+<table class="cb codehilite">
+    %for line_num, tokens in enumerate(lines, 1):
+        ${sourceblock.render_line(line_num, tokens)}
+    %endfor
+</table>
+</%def>
diff --git a/rhodecode/templates/files/files_add.mako b/rhodecode/templates/files/files_add.mako
--- a/rhodecode/templates/files/files_add.mako
+++ b/rhodecode/templates/files/files_add.mako
@@ -23,7 +23,11 @@
 
     <div class="edit-file-title">
         <span class="title-heading">${_('Add new file')} @ <code>${h.show_id(c.commit)}</code></span>
-        <span class="tag branchtag"><i class="icon-branch"></i> ${c.commit.branch}</span>
+        % if c.commit.branch:
+        <span class="tag branchtag">
+            <i class="icon-branch"></i> ${c.commit.branch}
+        </span>
+        % endif
     </div>
 
     ${h.secure_form(h.route_path('repo_files_create_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path), id='eform', request=request)}
diff --git a/rhodecode/templates/files/files_delete.mako b/rhodecode/templates/files/files_delete.mako
--- a/rhodecode/templates/files/files_delete.mako
+++ b/rhodecode/templates/files/files_delete.mako
@@ -23,7 +23,11 @@
 
     <div class="edit-file-title">
         <span class="title-heading">${_('Delete file')} @ <code>${h.show_id(c.commit)}</code></span>
-        <span class="tag branchtag"><i class="icon-branch"></i> ${c.commit.branch}</span>
+        % if c.commit.branch:
+        <span class="tag branchtag">
+            <i class="icon-branch"></i> ${c.commit.branch}
+        </span>
+        % endif
     </div>
 
     ${h.secure_form(h.route_path('repo_files_delete_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path), id='eform', request=request)}
diff --git a/rhodecode/templates/files/files_edit.mako b/rhodecode/templates/files/files_edit.mako
--- a/rhodecode/templates/files/files_edit.mako
+++ b/rhodecode/templates/files/files_edit.mako
@@ -23,7 +23,11 @@
 
     <div class="edit-file-title">
         <span class="title-heading">${_('Edit file')} @ <code>${h.show_id(c.commit)}</code></span>
-        <span class="tag branchtag"><i class="icon-branch"></i> ${c.commit.branch}</span>
+        % if c.commit.branch:
+        <span class="tag branchtag">
+            <i class="icon-branch"></i> ${c.commit.branch}
+        </span>
+        % endif
     </div>
 
     ${h.secure_form(h.route_path('repo_files_update_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path), id='eform', request=request)}
diff --git a/rhodecode/templates/files/files_upload.mako b/rhodecode/templates/files/files_upload.mako
--- a/rhodecode/templates/files/files_upload.mako
+++ b/rhodecode/templates/files/files_upload.mako
@@ -50,7 +50,11 @@
 
     <div class="edit-file-title">
         <span class="title-heading">${_('Upload new file')} @ <code>${h.show_id(c.commit)}</code></span>
-        <span class="tag branchtag"><i class="icon-branch"></i> ${c.commit.branch}</span>
+        % if c.commit.branch:
+        <span class="tag branchtag">
+            <i class="icon-branch"></i> ${c.commit.branch}
+        </span>
+        % endif
     </div>
 
     <% form_url = h.route_path('repo_files_upload_file', repo_name=c.repo_name, commit_id=c.commit.raw_id, f_path=c.f_path) %>