diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index eaf8e6af..06fcc0c3 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1011,23 +1011,37 @@ p.time {
 }
 
 .issue_box, 
+.commit_box,
 .merge_request_box{ 
   @extend .padded;
   @extend .borders;
   @extend .prepend-top-20;
   @extend .append-bottom-20;
+  border-width:2px;
 
   img { max-width: 100%; }
 
   pre {
-    background: white !important;
-    
     code {
       background: none !important;
     }
   }
 }
 
+.commit_box { 
+  .commit_message { 
+    margin: -20px;
+    padding: 20px;
+    margin-top:10px;
+    border-radius:0;
+    border:none;
+    font-size:12px;
+    background-color:#f5f5f5;
+    border:none;
+    border-top:1px solid #eee;
+  }
+}
+
 .highlight_word { 
   background:#EEDC94;
 }
diff --git a/app/controllers/commits_controller.rb b/app/controllers/commits_controller.rb
index 0d36957c..486e1988 100644
--- a/app/controllers/commits_controller.rb
+++ b/app/controllers/commits_controller.rb
@@ -32,6 +32,8 @@ class CommitsController < ApplicationController
     @note = @project.build_commit_note(@commit)
     @comments_allowed = true
     @line_notes = project.commit_line_notes(@commit)
+
+    @notes_count = @line_notes.count + project.commit_notes(@commit).count
   end
 
   def compare
diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml
index 9e633072..4d7be2a9 100644
--- a/app/views/commits/show.html.haml
+++ b/app/views/commits/show.html.haml
@@ -1,23 +1,25 @@
-.commit
-  = link_to tree_project_ref_path(@project, @commit.id), :class => "btn right small" do 
-    Browse Code »
-  = image_tag gravatar_icon(@commit.author_email), :class => "avatar"
-  %code= @commit.id.to_s
-  %h5
-    = @commit.author_name
-    %small= @commit.created_at.stamp("Aug 21, 2011 9:23pm")
-    - if @commit.author_name != @commit.committer_name or @commit.author_email != @commit.committer_email or @commit.authored_date != @commit.committed_date 
-      &ndash;
-      %cite committed by
-      = @commit.committer_name
-      %small= @commit.committed_date.stamp("Aug 21, 2011 9:23pm")
+.commit_box
+  .commit
+    .right
+      - unless @notes_count.zero?
+        %span.btn.small.disabled.padded= pluralize @notes_count, 'note'
 
-%br
-%pre.commit_message.prettyprint
-  = commit_msg_with_link_to_issues(@project, @commit.safe_message)
-.clear
-%br
+      = link_to tree_project_ref_path(@project, @commit.id), :class => "btn small" do 
+        Browse Code »
+    = image_tag gravatar_icon(@commit.author_email), :class => "avatar"
+    %code= @commit.id.to_s
+    %h5
+      = @commit.author_name
+      %small= @commit.created_at.stamp("Aug 21, 2011 9:23pm")
+      - if @commit.author_name != @commit.committer_name or @commit.author_email != @commit.committer_email or @commit.authored_date != @commit.committed_date 
+        &ndash;
+        %cite committed by
+        = @commit.committer_name
+        %small= @commit.committed_date.stamp("Aug 21, 2011 9:23pm")
 
+  %pre.commit_message
+    = commit_msg_with_link_to_issues(@project, @commit.safe_message)
+%br
 %p.cgray
   Showing #{pluralize(@commit.diffs.count, "changed file")}
 = render "commits/diffs", :diffs => @commit.diffs