diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index c10edae6..b498277d 100644
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -169,30 +169,38 @@ td .line_note_link {
     margin: 0;
   }
 
-  .file_upload {
-    position: absolute;
-    right:14px;
-    top:7px;
-  }
-
   .note_advanced_opts { 
     h6 { 
       line-height: 32px;
-      margin-right: 12px;
+      padding-right: 15px;
     }
   }
 
-  div.attachments {
+  .attachments {
     position:relative;
     width: 350px;
     height: 50px;
     overflow:hidden;
     margin:0 0 5px !important;
-  }
-  .file_name {
-    line-height:30px;
-    width:240px;
-    height:28px;
-    overflow:hidden;
+
+    .input_file { 
+      .file_upload {
+        position: absolute;
+        right:14px;
+        top:7px;
+      }
+
+      .file_name {
+        line-height:30px;
+        width:240px;
+        height:28px;
+        overflow:hidden;
+      }
+      .input-file { 
+        width: 260px;
+        height: 41px;
+        float: right;
+      }
+    }
   }
 }
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index 4e87353b..43d95564 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -13,6 +13,8 @@
     is enabled.
 
   .row.note_advanced_opts.hide
+    .span2
+      = f.submit 'Add Comment', :class => "btn primary submit_note", :id => "submit_note"
     .span4.notify_opts
       %h6.left Notify via email:
       = label_tag :notify do
@@ -23,11 +25,12 @@
         = label_tag :notify_author do
           = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
           %span Commit author
-    .span8.attachments
+    .span6.attachments
       %h6.left Attachment:
       %span.file_name File name...
-      %button.file_upload.btn.small Upload File
-      .input= f.file_field :attachment, :class => "input-file"
+      
+      .input.input_file
+        %a.file_upload.btn.small Upload File
+        = f.file_field :attachment, :class => "input-file"
       %span.hint Any file less than 10 MB
 
-  = f.submit 'Add Comment', :class => "btn primary submit_note", :id => "submit_note"