diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html
--- a/rhodecode/templates/changeset/changeset.html
+++ b/rhodecode/templates/changeset/changeset.html
@@ -11,11 +11,11 @@
     »
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     »
-    ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
+    ${_('Changeset')} - <span class='hash'>r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}</span>
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('changelog')}     
+    ${self.menu('changelog')}
 </%def>
 
 <%def name="main()">
@@ -27,19 +27,24 @@
     <div class="table">
 		<div class="diffblock">
 			<div class="code-header">
-				<div>
-				${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
-				 &raquo; <span>${h.link_to(_('raw diff'),
-				h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show'))}</span>
-				 &raquo; <span>${h.link_to(_('download diff'),
-				h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download'))}</span>
-				</div>
+                <div class="hash">
+                 r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
+                </div>
+                <div class="date">
+                  ${c.changeset.date}
+                </div>
+                <div class="diff-actions">
+                  <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show')}" title="${_('raw diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
+                  <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" title="${_('download diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white_get.png')}"/></a>
+                  ${c.ignorews_url()}
+                  ${c.context_url()}
+                </div>
+                <div class="comments-number" style="float:right;padding-right:5px">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div>
 			</div>
 		</div>
 	    <div id="changeset_content">
 			<div class="container">
 	             <div class="left">
-	                 <div class="date">${_('commit')} ${c.changeset.revision}: ${h.short_id(c.changeset.raw_id)}@${c.changeset.date}</div>
 	                 <div class="author">
 	                     <div class="gravatar">
 	                         <img alt="gravatar" src="${h.gravatar_url(h.email(c.changeset.author),20)}"/>
@@ -47,93 +52,141 @@
 	                     <span>${h.person(c.changeset.author)}</span><br/>
 	                     <span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/>
 	                 </div>
-	                 <div class="message">${h.link_to(h.wrap_paragraphs(c.changeset.message),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</div>
+	                 <div class="message">${h.urlify_commit(h.wrap_paragraphs(c.changeset.message),c.repo_name)}</div>
 	             </div>
 	             <div class="right">
 		             <div class="changes">
-                        % if len(c.changeset.affected_files) <= c.affected_files_cut_off:	             
+                        % if len(c.changeset.affected_files) <= c.affected_files_cut_off:
 		                 <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span>
 		                 <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span>
 		                 <span class="added" title="${_('added')}">${len(c.changeset.added)}</span>
 	                    % else:
                          <span class="removed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
                          <span class="changed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
-                         <span class="added"   title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>	                    
-	                    % endif		                 
-		             </div>                  
-		                 %if len(c.changeset.parents)>1:
-		                 <div class="merge">
-		                     ${_('merge')}<img alt="merge" src="${h.url("/images/icons/arrow_join.png")}"/>
-		                 </div>
-		                 %endif
-		                 
+                         <span class="added"   title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
+	                    % endif
+		             </div>
+
 		            %if c.changeset.parents:
 		             %for p_cs in reversed(c.changeset.parents):
-		                 <div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(h.short_id(p_cs.raw_id),
-		                     h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}
+		                 <div class="parent">${_('Parent')}
+                     <span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id),
+		                     h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span>
 		                 </div>
 		             %endfor
-                    %else: 
-                        <div class="parent">${_('No parents')}</div>   
-                    %endif		             
+                    %else:
+                        <div class="parent">${_('No parents')}</div>
+                    %endif
 		         <span class="logtags">
+                 %if len(c.changeset.parents)>1:
+                 <span class="merge">${_('merge')}</span>
+                 %endif
 		             <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}">
 		             ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
 		             %for tag in c.changeset.tags:
 		                 <span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
 		                 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
 		             %endfor
-		         </span>                                                                 
-	                </div>              
+		         </span>
+	                </div>
 	        </div>
-	        <span style="font-size:1.1em;font-weight: bold">
-	        ${_('%s files affected with %s additions and %s deletions.') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}
+	        <span>
+	        ${_('%s files affected with %s additions and %s deletions:') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}
 	        </span>
 	        <div class="cs_files">
 	                %for change,filenode,diff,cs1,cs2,stat in c.changes:
 	                    <div class="cs_${change}">
-		                    <div class="node">${h.link_to(h.safe_unicode(filenode.path),
-		                                        h.url.current(anchor=h.repo_name_slug('C%s' % h.safe_unicode(filenode.path))))}</div>
+                            <div class="node">
+                            %if change != 'removed':
+                                ${h.link_to(h.safe_unicode(filenode.path),c.anchor_url(filenode.changeset.raw_id,filenode.path)+"_target")}
+                            %else:
+                                ${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID('',filenode.path)))}
+                            %endif
+                            </div>
 		                    <div class="changes">${h.fancy_file_stats(stat)}</div>
 	                    </div>
 	                %endfor
 	                % if c.cut_off:
 	                  ${_('Changeset was too big and was cut off...')}
 	                % endif
-	        </div>         
+	        </div>
 	    </div>
-	    
+
     </div>
-    	
-	%for change,filenode,diff,cs1,cs2,stat in c.changes:
-		%if change !='removed':
-		<div style="clear:both;height:10px"></div>
-		<div class="diffblock">
-			<div id="${h.repo_name_slug('C%s' % h.safe_unicode(filenode.path))}" class="code-header">
-				<div class="changeset_header">
-					<span class="changeset_file">
-						${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,
-						revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))}
-					</span>
-					%if 1:
-					&raquo; <span>${h.link_to(_('diff'),
-					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff'))}</span>
-					&raquo; <span>${h.link_to(_('raw diff'),
-					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw'))}</span>
-					&raquo; <span>${h.link_to(_('download diff'),
-					h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download'))}</span>
-					%endif
-				</div>
-			</div>
-			<div class="code-body">        
-					%if diff:
-						${diff|n}
-					%else:
-						${_('No changes in this file')}
-					%endif
-			</div>
-		</div>
-		%endif
-	%endfor 
-    </div>	
+
+    ## diff block
+    <%namespace name="diff_block" file="/changeset/diff_block.html"/>
+    ${diff_block.diff_block(c.changes)}
+
+    ## template for inline comment form
+    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
+    ${comment.comment_inline_form(c.changeset)}
+
+    ${comment.comments(c.changeset)}
+
+    <script type="text/javascript">
+      var deleteComment = function(comment_id){
+
+          var url = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}".replace('__COMMENT_ID__',comment_id);
+          var postData = '_method=delete';
+          var success = function(o){
+              var n = YUD.get('comment-'+comment_id);
+              n.parentNode.removeChild(n);
+          }
+          ajaxPOST(url,postData,success);
+      }
+
+      YUE.onDOMReady(function(){
+
+          YUE.on(YUQ('.show-inline-comments'),'change',function(e){
+              var show = 'none';
+              var target = e.currentTarget;
+              if(target.checked){
+                  var show = ''
+              }
+              var boxid = YUD.getAttribute(target,'id_for');
+              var comments = YUQ('#{0} .inline-comments'.format(boxid));
+              for(c in comments){
+                 YUD.setStyle(comments[c],'display',show);
+              }
+              var btns = YUQ('#{0} .inline-comments-button'.format(boxid));
+              for(c in btns){
+                  YUD.setStyle(btns[c],'display',show);
+               }
+          })
+
+          YUE.on(YUQ('.line'),'click',function(e){
+              var tr = e.currentTarget;
+              injectInlineForm(tr);
+          });
+
+          // inject comments into they proper positions
+          var file_comments = YUQ('.inline-comment-placeholder');
+
+          for (f in file_comments){
+              var box = file_comments[f];
+              var inlines = box.children;
+              for(var i=0; i<inlines.length; i++){
+                  try{
+
+                    var inline = inlines[i];
+                    var lineno = YUD.getAttribute(inlines[i],'line');
+                    var lineid = "{0}_{1}".format(YUD.getAttribute(inline,'target_id'),lineno);
+                    var target_line = YUD.get(lineid);
+
+                    var add = createInlineAddButton(target_line.parentNode,'${_("add another comment")}');
+                    YUD.insertAfter(add,target_line.parentNode);
+
+                    var comment = new YAHOO.util.Element(tableTr('inline-comments',inline.innerHTML))
+                    YUD.insertAfter(comment,target_line.parentNode);
+                  }catch(e){
+                	  console.log(e);
+                  }
+              }
+          }
+      })
+
+    </script>
+
+    </div>
 </%def>