diff --git a/app/assets/stylesheets/screen.css.scss b/app/assets/stylesheets/screen.css.scss
index 530c8f7..2f320e3 100644
--- a/app/assets/stylesheets/screen.css.scss
+++ b/app/assets/stylesheets/screen.css.scss
@@ -36,6 +36,7 @@ and (min-width: 0px) //TODO
       color: #F00;
     }
   }
+
   .flash {
     text-align: center;
     padding: 10px;
@@ -271,7 +272,7 @@ and (min-width: 0px) //TODO
         margin-right: 0;
       }
       &.author {
-        border: 1px solid #633;
+        border: 3px solid #555;
       }
       .comment-content {
         word-wrap: break-word;
@@ -404,11 +405,23 @@ and (min-width: 0px) //TODO
     cursor: default;
     color: #fff;
     border: none;
+    font-size: 12px;
+    line-height: normal;
+    &[disabled], &[disabled]:hover {
+      box-shadow: 0 0 5px #ddd inset;
+      color: #ddd;
+    }
     &.blue {
-    background: #4096ee;
+      background: #4096ee;
+      &[disabled] {
+        background: #96C1EE;
+      }
     }
     &.red {
-    background: #ee4040;
+      background: #ee4040;
+      &[disabled] {
+        background: #EE8383;
+      }
     }
     &.right {
       float: right;
diff --git a/app/views/blogposts/show.html.erb b/app/views/blogposts/show.html.erb
index 6fd6fb6..f518bbe 100644
--- a/app/views/blogposts/show.html.erb
+++ b/app/views/blogposts/show.html.erb
@@ -11,6 +11,7 @@
     <%= Sanitize.clean(GitHub::Markdown.render_gfm(@post.content), Sanitize::Config::RELAXED).html_safe %>
   </div>
   <div id="comments">
+    <h3><%= "#{pluralize(@post.comments.length, 'comment')}." %></h3>
     <% @post.comments.each do |c| %>
       <%= render "comments/comment", :c => c %>
     <% end %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 68ca11e..e03bd64 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -1,3 +1,4 @@
+<% def can_edit?; (@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role); end %>
 <%= link_to (@user.is?(current_user) ? "Your profile" : @user.name), current_user %> → Edit
 <h1>Edit profile</h1>
 
@@ -11,7 +12,7 @@
       <tr>
         <td>Display name</td>
         <td>
-           <%= f.input :name, :label => false, disabled: !((@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role)) %>
+           <%= f.input :name, :label => false, disabled: !can_edit? %>
          </td>
        </tr>
          <td>In-game name</td>
@@ -35,7 +36,7 @@
            Skype username
          </td>
          <td>
-             <%= f.input :skype, label: false, placeholder: "Skype username", disabled: !((@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role)) %>
+             <%= f.input :skype, label: false, placeholder: "Skype username", disabled: !can_edit? %>
          </td>
        </tr>
        <tr>
@@ -43,29 +44,29 @@
            Show Skype to
          </td>
          <td>
-           <%= f.input :skype_public, label: false, as: :select, collection: [["Staff only", false], ["All users", true]], include_blank: false, input_html: { disabled: !((@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role)) } %>
+           <%= f.input :skype_public, label: false, as: :select, collection: [["Staff only", false], ["All users", true]], include_blank: false, input_html: { disabled: !can_edit? } %>
            </td>
        <tr>
          <td>YouTube username</td>
          <td>
-           <%= f.input :youtube, :label => false, placeholder: "YouTube username", disabled: !((@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role)) %>
+           <%= f.input :youtube, :label => false, placeholder: "YouTube username", disabled: !can_edit? %>
          </td>
        </tr>
        <tr>
          <td>Twitter username</td>
          <td>
-           <%= f.input :twitter, :label => false, placeholder: "Twitter username", disabled: !(confirmed? || (mod? && current_user.role >= @user.role)) %>
+           <%= f.input :twitter, :label => false, placeholder: "Twitter username", disabled: !(@user.is?(current_user) && confirmed? || (mod? && current_user.role >= @user.role)) %>
          </td>
        </tr>
        <tr>
          <td>About you</td>
          <td>
-           <%= f.input :about, :label => false, :input_html => {:class => "vertical"}, placeholder: "Tell us something about you...", disabled: !((@user.is?(current_user) && confirmed?) || (mod? && current_user.role >= @user.role)) %>
+           <%= f.input :about, :label => false, :input_html => {:class => "vertical"}, placeholder: "Tell us something about you...", disabled: !can_edit? %>
          </td>
        </tr>
      </tbody>
    </table>
-  <%= f.submit "Save profile", class: "btn blue", disabled: @user.unconfirmed? %>
+  <%= f.submit "Save profile", class: "btn blue", disabled: (@user.unconfirmed? && @user.is?(current_user)) %>
   <% if @user.unconfirmed? %>
     <% if @user.is?(current_user) %>
       <span class='red-alert'>Please confirm your email adress first!</span>