diff --git a/app/models/person.rb b/app/models/person.rb
index 43fd165..6fd3c7b 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -6,11 +6,11 @@ class Person < Profile
   has_many :friends, :class_name => 'Person', :through => :friendships
 
   def suggested_friend_groups
-    (friend_groups + [ _('friends'), _('work'), _('school'), _('family') ]).uniq
+    (friend_groups + [ _('friends'), _('work'), _('school'), _('family') ]).map {|i| i if !i.empty?}.compact.uniq
   end
 
   def friend_groups
-    friendships.map {|item| item.group}.uniq
+    friendships.map { |item| item.group }.uniq
   end
 
   def add_friend(friend, group = nil)
diff --git a/app/views/tasks/_add_friend.rhtml b/app/views/tasks/_add_friend.rhtml
index 5523146..08be9c2 100644
--- a/app/views/tasks/_add_friend.rhtml
+++ b/app/views/tasks/_add_friend.rhtml
@@ -2,7 +2,8 @@
 
 <%= link_to( profile_image(task.requestor, :minor, :border => 0), task.requestor.public_profile_url ) %>
 
-<%= _('%s wants to connect to you as a friend.') % link_to( task.requestor.name, task.requestor.public_profile_url ) %>
+<%= _('%s wants to connect to you as a friend.') %
+    content_tag('b', link_to( task.requestor.name, task.requestor.public_profile_url ) ) %>
 
 <% form_for('task', task, :url => { :action => 'close', :id => task.id } ) do |f| %>
 
@@ -11,14 +12,14 @@
     <%= radio_button_tag(:decision, 'finish', true,
         :id => "decision-finish-#{task.id}",
         :onclick => "Element.show('group-for-friend-#{task.id}')") %>
-    <label for="<%= "decision-finish-#{task.id}" %>"><%= _('Accept') %></label>
+    <label for="<%= "decision-finish-#{task.id}" %>"><b><%= _('Accept') %></b></label>
 
     &nbsp; &nbsp;
 
     <%= radio_button_tag(:decision, 'cancel', false,
         :id => "decision-cancel-#{task.id}",
         :onclick => "Element.hide('group-for-friend-#{task.id}')") %>
-    <label for="<%= "decision-cancel-#{task.id}" %>"><%= _('Ignore') %></label>
+    <label for="<%= "decision-cancel-#{task.id}" %>"><b><%= _('Ignore') %></b></label>
 
     <%
       content_tag('div', :id => "group-for-friend-#{task.id}",
--
libgit2 0.21.2