diff --git a/rhodecode/templates/files/files_add.html b/rhodecode/templates/files/files_add.html
--- a/rhodecode/templates/files/files_add.html
+++ b/rhodecode/templates/files/files_add.html
@@ -16,13 +16,11 @@
     »
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     »
-    ${_('add file')} @ R${c.cs.revision}:${h.short_id(c.cs.raw_id)}
+    ${_('add file')} @ ${h.show_id(c.cs)}
 </%def>
 
-<%def name="page_nav()">
-    ${self.menu('files')}
-</%def>
 <%def name="main()">
+${self.context_bar('files')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
diff --git a/rhodecode/templates/files/files_edit.html b/rhodecode/templates/files/files_edit.html
--- a/rhodecode/templates/files/files_edit.html
+++ b/rhodecode/templates/files/files_edit.html
@@ -16,13 +16,11 @@
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
-    ${_('edit file')} @ R${c.cs.revision}:${h.short_id(c.cs.raw_id)}
+    ${_('edit file')} @ ${h.show_id(c.cs)}
 </%def>
 
-<%def name="page_nav()">
-    ${self.menu('files')}
-</%def>
 <%def name="main()">
+${self.context_bar('files')}
 <div class="box">
     <!-- box / title -->
     <div class="title">