diff --git a/app/views/users/invoice.html.haml b/app/views/users/invoice.html.haml
index b406af929..092f20936 100644
--- a/app/views/users/invoice.html.haml
+++ b/app/views/users/invoice.html.haml
@@ -23,5 +23,10 @@
       %th{ :colspan => 4, :style => 'text-align:right;' } Grand Total
       %td.numeric= number_to_currency @user.get_invoice_total
 
-- if can? :manage, @user
-  %p= link_to "Return to #{@user.full_name_possessive} Account", user_path(@user)
+.row-of-buttons
+  - if can? :manage, @user
+    - user_fnp = @user.full_name_possessive
+    = button_to "Return to #{user_fnp} Account", user_path(@user), :method => :get
+  - if current_user.is_admin?
+    - pcsfu_path = print_cost_summary_for_user_path(@user)
+    = button_to 'Print Cost Summary', pcsfu_path, :method => :get
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 5e4773f20..9bd7d234a 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -11,23 +11,19 @@
         %td
           .hardwrap{:style => "max-width:250px;"}= @user.email
         %td.smalltext= link_to 'Edit', edit_email_for_user_path(@user)
-      %tr
-        %th Created
-        %td= @user.created_at.to_formatted_s(:long)
+
   %p
     = link_to 'Change Password', edit_password_for_user_path(@user)
     %br
     - if current_user.is_admin?
       = link_to 'User Administration', edit_user_path(@user)
-      %br
-      = link_to 'Print Cost Summary', print_cost_summary_for_user_path(@user)
 
 .right-column
   %h2 Balance
   = render :partial => 'shared/balance', :locals => {:user => @user, :show_detail_links => true}
   %p= button_to "Make a Payment", pay_user_path(@user), :method => "get", :class => 'button-emphasis'
 
-%br/
+%br
 
 %h2 My Attendees