diff --git a/rhodecode/templates/files/files_source.html b/rhodecode/templates/files/files_source.html
--- a/rhodecode/templates/files/files_source.html
+++ b/rhodecode/templates/files/files_source.html
@@ -1,52 +1,50 @@
 <dl>
-	<dt>${_('Revision')}</dt>
-	<dd>
-		${h.link_to("r%s:%s" % (c.files_list.last_changeset.revision,h.short_id(c.files_list.last_changeset.raw_id)),
-						h.url('changeset_home',repo_name=c.repo_name,revision=c.files_list.last_changeset.raw_id))} 
-	</dd>
-	<dt>${_('Size')}</dt>
-	<dd>${h.format_byte_size(c.files_list.size,binary=True)}</dd>
-	<dt>${_('Mimetype')}</dt>
-	<dd>${c.files_list.mimetype}</dd>
-	<dt>${_('Options')}</dt>
-	<dd>${h.link_to(_('show annotation'),
-			h.url('files_annotate_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}
-		 / ${h.link_to(_('show as raw'),
-			h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}			
-		 / ${h.link_to(_('download as raw'),
-			h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}
-        % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):			
-         % if not c.files_list.is_binary:
-         / ${h.link_to(_('edit'),
-            h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}
-         % endif
-        % endif			
-	</dd>
-	<dt>${_('History')}</dt>
+	<dt style="padding-top:10px;font-size:16px">${_('History')}</dt>
 	<dd>
 		<div>
 		${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
-		${h.hidden('diff2',c.files_list.last_changeset.raw_id)}
-		${h.select('diff1',c.files_list.last_changeset.raw_id,c.file_history)}
+		${h.hidden('diff2',c.file.last_changeset.raw_id)}
+		${h.select('diff1',c.file.last_changeset.raw_id,c.file_history)}
 		${h.submit('diff','diff to revision',class_="ui-button-small")}
 		${h.submit('show_rev','show at revision',class_="ui-button-small")}
 		${h.end_form()}
 		</div>
 	</dd>
-</dl>	
+</dl>
 
 	
 <div id="body" class="codeblock">
 	<div class="code-header">
-		<div class="revision">${c.files_list.name}@r${c.files_list.last_changeset.revision}:${h.short_id(c.files_list.last_changeset.raw_id)}</div>
-		<div class="commit">"${c.files_list.last_changeset.message}"</div>
+        <div class="stats">
+            <div class="left"><img src="${h.url('/images/icons/file.png')}"/></div>
+            <div class="left item">${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}</div>      
+            <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div>
+            <div class="left item last">${c.file.mimetype}</div>
+            <div class="buttons">
+              ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-button-small")}
+              ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-button-small")}           
+              ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-button-small")}
+              % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):            
+               % if not c.file.is_binary:
+                ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-button-small")}
+               % endif
+              % endif            
+            </div>
+        </div>
+        <div class="author">
+            <div class="gravatar">
+                <img alt="gravatar" src="${h.gravatar_url(h.email(c.changeset.author),16)}"/>
+            </div>
+            <div title="${h.email_or_none(c.changeset.author)}" class="user">${h.person(c.changeset.author)}</div>
+        </div>
+		<div class="commit">${c.file.last_changeset.message}</div>
 	</div>
 	<div class="code-body">
-	   %if c.files_list.is_binary:
-	       ${_('Binary file (%s)') % c.files_list.mimetype}
+	   %if c.file.is_binary:
+	       ${_('Binary file (%s)') % c.file.mimetype}
 	   %else:
-		% if c.files_list.size < c.cut_off_limit:
-			${h.pygmentize(c.files_list,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
+		% if c.file.size < c.cut_off_limit:
+			${h.pygmentize(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
 		%else:
 			${_('File is too big to display')} ${h.link_to(_('show as raw'),
 			h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}