diff --git a/app/views/content_viewer/_comment.rhtml b/app/views/content_viewer/_comment.rhtml
index a981791..323d5a6 100644
--- a/app/views/content_viewer/_comment.rhtml
+++ b/app/views/content_viewer/_comment.rhtml
@@ -1,10 +1,5 @@
 <%= content_tag('a', '', :name => comment.anchor) %>
 <div class="article-comment<%= ' comment-from-owner' if ( comment.author && (@page.profile.name == comment.author.name) ) %> comment-logged-<%= comment.author ? 'in' : 'out' %>">
-  <% if logged_in? && (user == @page.profile || user == comment.author || user.has_permission?(:moderate_comments, @page.profile)) %>
-    <% button_bar(:style => 'float: right; margin-top: 0;') do %>
-      <%= icon_button(:delete, _('Remove'), { :profile => params[:profile], :remove_comment => comment.id }, :method => :post, :confirm => _('Are you sure you want to remove this comment?')) %>
-    <% end %>
-  <% end %>
   
   <% if comment.author %>
     <%= link_to content_tag( 'span', comment.author.name() ), comment.author.url,
@@ -19,12 +14,18 @@
     %>
   <% end %>
 
+  <% if logged_in? && (user == @page.profile || user == comment.author || user.has_permission?(:moderate_comments, @page.profile)) %>
+    <% button_bar(:style => 'float: right; margin-top: 0;') do %>
+      <%= icon_button(:delete, _('Remove'), { :profile => params[:profile], :remove_comment => comment.id }, :method => :post, :confirm => _('Are you sure you want to remove this comment?')) %>
+    <% end %>
+  <% end %>
+
   <h4><%= comment.title %></h4>
   <div class="comment-info">
     <%= _('By %{author} on %{date}') % {
         :author => comment.author ? link_to(comment.author.name, comment.author.url) : content_tag('u', comment.name),
         :date => show_time(comment.created_at) } %>
-    <%= '<br/>' + _('(unauthenticated user)') if ! comment.author %>
+    <%= _('(unauthenticated user)') if ! comment.author %>
   </div>
   <div class="comment-text">
     <p/>
diff --git a/public/stylesheets/article.css b/public/stylesheets/article.css
index 08bd502..e7d1f99 100644
--- a/public/stylesheets/article.css
+++ b/public/stylesheets/article.css
@@ -56,7 +56,7 @@
   position: relative;
   border: 1px solid #B8CFE7;
   margin-bottom: 10px;
-  padding: 10px;
+  padding: 4px;
 }
 
 .comment-from-owner {
@@ -67,6 +67,7 @@
 #article .article-comment h4 {
   font-size: 13px;
   margin: 0px;
+  display: inline;
 }
 
 .comment-picture {
@@ -76,7 +77,7 @@
   height: 50px;
   background-repeat: no-repeat;
   background-position: 50% 50%;
-  margin: 0px 10px 0px 10px;
+  margin: 0px 4px 4px 4px;
   float: right;
 }
 .comment-picture span {
@@ -86,13 +87,14 @@
 .comment-info {
   font-size: 10px;
   color: #999;
+  display: inline;
 }
 .comment-from-owner .comment-info {
   color: #729FCF;
 }
 
 .comment-text {
-  font-size: 12px;
+  font-size: 11px;
   clear: left;
 }
 
--
libgit2 0.21.2