diff --git a/app/views/aspects/_aspect_stream.haml b/app/views/aspects/_aspect_stream.haml
index 2feef09bc..fbd506ae6 100644
--- a/app/views/aspects/_aspect_stream.haml
+++ b/app/views/aspects/_aspect_stream.haml
@@ -23,7 +23,11 @@
   = render 'aspects/no_contacts_message'
 
 #main_stream.stream{:data => {:guids => stream.aspect_ids.join(',')}}
-  - if stream.posts.length > 0
+  - if defined?(no_posts) && no_posts
+    #pagination
+      =link_to(t('more'), next_page_path(:ajax_stream => true), :class => 'paginate')
+
+  - elsif stream.posts.length > 0
     = render 'shared/stream', :posts => stream.posts
     #pagination
       =link_to(t('more'), next_page_path, :class => 'paginate')
diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index a5c08171a..4ba3eea39 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -26,12 +26,7 @@
 
 .span-13.append-1
   #aspect_stream_container.stream_container
-
-    = render 'shared/publisher', :selected_aspects => @stream.aspects, :aspect_ids => @stream.aspect_ids, :for_all_aspects => @stream.for_all_aspects?, :aspect => @stream.aspect
-    #main_stream.stream{:data => {:guids => @stream.aspect_ids.join(',')}}
-      #pagination
-        =link_to(t('more'), next_page_path(:ajax_stream => true), :class => 'paginate')
-    /= render 'aspects/aspect_stream', :stream => @stream
+    = render 'aspects/aspect_stream', :stream => @stream, :no_posts => true
 
 .span-5.rightBar.last
   = render 'aspects/selected_contacts', :stream => @stream
diff --git a/app/views/shared/_stream.haml b/app/views/shared/_stream.haml
index 9a2cd3ead..ac71ad100 100644
--- a/app/views/shared/_stream.haml
+++ b/app/views/shared/_stream.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-
 = render :partial => 'shared/stream_element',
          :collection => posts,
          :as => :post,
diff --git a/features/connects_users.feature b/features/connects_users.feature
index 841642432..bb0feacbf 100644
--- a/features/connects_users.feature
+++ b/features/connects_users.feature
@@ -96,7 +96,7 @@ Feature: following and being followed
     Given I sign in as "alice@alice.alice"
     And I am on "bob@bob.bob"'s page
 
-    Then I should see "Add to aspect"
+    Then I should see "Add contact"
     And I should not see "Mention"
     And I should not see "Message"
 
diff --git a/features/infinite_scroll.feature b/features/infinite_scroll.feature
index 8ed79b90a..d928b459d 100644
--- a/features/infinite_scroll.feature
+++ b/features/infinite_scroll.feature
@@ -41,7 +41,8 @@ Feature: infinite scroll
       Then I should see "No more"
 
     Scenario: on the main stream post created time
-      When I follow "posted"
+      When I wait for the ajax to finish
+      And I follow "posted"
       Then I should see 15 posts
       And I should see "alice - 15 - #seeded"