diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index e7785fa..f77ec73 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -1,3 +1,7 @@
+<p>
+  <b>User:</b>
+  <%= @card.user.name unless @card.user.blank? %>
+</p>
 
 <p>
   <b>Card Note:</b>
@@ -20,5 +24,5 @@
 </p>
 
 <%= link_to 'Upload to Door', upload_path(@card) if can? :upload, @card %>
-<%= link_to 'Edit', edit_card_path(@card) %> |
+<% if can? :update, @card then %><%= link_to 'Edit', edit_card_path(@card) %> |<% end %>
 <%= link_to 'Back', cards_path %>
diff --git a/app/views/user_certifications/index.html.erb b/app/views/user_certifications/index.html.erb
index 16876ca..b84bcd5 100644
--- a/app/views/user_certifications/index.html.erb
+++ b/app/views/user_certifications/index.html.erb
@@ -1,5 +1,7 @@
 <h1>Listing User Certifications</h1>
 
+<%= link_to 'New User Certification', new_user_certification_path %>
+
 <dl>
   <% @grouped_user_certs.sort.each do |user, user_certifications| %>
     <dt><%= user %></dt>
@@ -13,6 +15,3 @@
 <% end %>
 </dl>
 
-<br />
-
-<%= link_to 'New User Certification', new_user_certification_path %>