diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css
--- a/rhodecode/public/css/style.css
+++ b/rhodecode/public/css/style.css
@@ -3697,7 +3697,7 @@ div.rst-block  pre {
 
 .comments .comment .meta {
     background: #f8f8f8;
-    padding: 6px;
+    padding: 4px;
     border-bottom: 1px solid #ddd;
 }
 
@@ -3710,13 +3710,14 @@ div.rst-block  pre {
 }
 
 .comments .comment .meta .date {
-    float: right;
 }
 
 .comments .comment .text {
-    padding: 8px 6px 6px 14px;
     background-color: #FAFAFA;
 }
+.comment .text div.rst-block p {
+	margin: 0.5em 0px !important;
+}
 
 .comments .comments-number{
 	padding:0px 0px 10px 0px;
@@ -3784,8 +3785,7 @@ form.comment-form {
 }
 
 .comment .buttons {
-    position: absolute;
-    right:40px;
+	float: right;
 }
 
 
@@ -3872,7 +3872,7 @@ form.comment-inline-form {
 }
 .inline-comments .comment .meta {
     background: #f8f8f8;
-    padding: 6px;
+    padding: 4px;
     border-bottom: 1px solid #ddd;
 }
 
@@ -3885,11 +3885,9 @@ form.comment-inline-form {
 }
 
 .inline-comments .comment .meta .date {
-    float: right;
 }
 
 .inline-comments .comment .text {
-    padding: 8px 6px 6px 14px;
     background-color: #FAFAFA;
 }
 
diff --git a/rhodecode/templates/changeset/changeset_file_comment.html b/rhodecode/templates/changeset/changeset_file_comment.html
--- a/rhodecode/templates/changeset/changeset_file_comment.html
+++ b/rhodecode/templates/changeset/changeset_file_comment.html
@@ -11,22 +11,16 @@
   			<img src="${h.gravatar_url(co.author.email, 20)}" />
   			${co.author.username}
   		</span>
-  		<a href="${h.url.current(anchor='comment-%s' % co.comment_id)}"> ${_('commented on')} </a>
-  		${h.short_id(co.revision)}
-  		%if co.f_path:
-  			${_(' in file ')}
-  			${co.f_path}:L ${co.line_no}
-  		%endif
   		<span class="date">
   			${h.age(co.modified_at)}
   		</span>
+      %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
+        <span class="buttons">
+          <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
+        </span>
+      %endif
   	</div>
   	<div class="text">
-  		%if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
-  			<div class="buttons">
-  				<span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
-  			</div>
-  		%endif
   		${h.rst_w_mentions(co.text)|n}
   	</div>
     </div>