diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4c2a7802a..c2be55c13 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -45,7 +45,7 @@ module ApplicationHelper
     if !link
       str << link_to(aspect.name, "#", 'data-guid' => aspect.id, :class => 'hard_aspect_link').html_safe
     else 
-      str << link_for_aspect(aspect, 'data-guid' => aspect.id, :class => 'hard_aspect_link').html_safe
+      str << link_for_aspect(aspect).html_safe
     end
     str << "</span>"
   end
diff --git a/app/helpers/aspects_helper.rb b/app/helpers/aspects_helper.rb
index 2e36bb090..147704c3f 100644
--- a/app/helpers/aspects_helper.rb
+++ b/app/helpers/aspects_helper.rb
@@ -7,6 +7,9 @@ module AspectsHelper
     opts[:params] ||= {}
     params ||= {}
     opts[:params] = opts[:params].merge("a_ids[]" => aspect.id, :created_at => params[:created_at])
+    opts[:class] ||= ""
+    opts[:class] << " hard_aspect_link"
+    opts['data-guid'] = aspect.id
 
     link_to aspect.name, aspects_path( opts[:params] ), opts
   end
diff --git a/app/views/aspects/_aspect.haml b/app/views/aspects/_aspect.haml
index 673c5ed3d..2f7053f8e 100644
--- a/app/views/aspects/_aspect.haml
+++ b/app/views/aspects/_aspect.haml
@@ -3,7 +3,8 @@
     %b
       = link_to t('contacts', :count => contacts.size), edit_aspect_path(aspect), :rel => 'facebox'
   %b
-    = link_to aspect.name, edit_aspect_path(aspect), :rel => 'facebox', :class => 'name'
+    /= link_to aspect.name, aspect_path(aspect), :rel => 'facebox', :class => 'name'
+    = link_for_aspect(aspect, :class => 'hard_aspect_link')
   %br
 
   - if contacts.length > 0
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 7c205f338..136f20e18 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -46,7 +46,7 @@
     -unless @landing_page
       %ul#aspect_nav
         %li{:class => ('selected' if @aspect == :all)}
-          = link_to t('_home'), aspects_path, :class => 'home_selector'
+          = link_to t('all_aspects'), aspects_path, :class => 'home_selector'
 
         - for aspect in @all_aspects
           %li{:data=>{:guid=>aspect.id}, :class => ("selected" if @object_aspect_ids.include?(aspect.id))}
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 73b35100f..f03d377ef 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -30,6 +30,7 @@ en:
   next: "next"
   previous: "previous"
   _comments: "Comments"
+  all_aspects: "All aspects"
 
 
   #for reference translation, the real activerecord english transations are actually