diff --git a/app/views/users/getting_started/_step_2.html.haml b/app/views/users/getting_started/_step_2.html.haml
index c7f4004f7..900aa12f9 100644
--- a/app/views/users/getting_started/_step_2.html.haml
+++ b/app/views/users/getting_started/_step_2.html.haml
@@ -9,7 +9,7 @@
 %br
 %br
 %h3{:style => 'text-align: center;'}
-  = t('.find_your_friends_on_facebook')
+  = t('.find_your_friends_on_diaspora')
   %br
   %br
   %br
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 5cf13a074..693ea1835 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -239,7 +239,7 @@ en:
               finish: "Finish"
               people_already_on_diaspora: "People already on Diaspora"
           step_2:
-              find_your_friends_on_facebook: "would you like to find your friends on facebook?"
+              find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
               skip: "Skip"
       update:
           password_changed: "Password Changed"
diff --git a/features/accepts_invitation.feature b/features/accepts_invitation.feature
index 37e9f8e7e..57df80751 100644
--- a/features/accepts_invitation.feature
+++ b/features/accepts_invitation.feature
@@ -15,7 +15,7 @@ Feature: invitation acceptance
       And I fill in "profile_gender" with "guess!"
       And I press "Save and continue"
       Then I should see "Profile updated"
-			And I should see "would you like to find your friends on facebook?"
+			And I should see "Would you like to find your Facebook friends on Diaspora?"
       And I should not see "Here are the people who are waiting for you:"
 
     Scenario: accept invitation from user
@@ -34,7 +34,7 @@ Feature: invitation acceptance
       And I press "Save and continue"
       Then I should see "Profile updated"
       
-			And I should see "would you like to find your friends on facebook?"
+			And I should see "Would you like to find your Facebook friends on Diaspora?"
 
 		When I follow "Skip"
 		  Then I should see "People already on Diaspora"
diff --git a/features/connects_users.feature b/features/connects_users.feature
index 0d591c8d6..22b9a9849 100644
--- a/features/connects_users.feature
+++ b/features/connects_users.feature
@@ -37,7 +37,6 @@ Feature: sending and receiving requests
     And I fill in "Name" with "Super People" in the modal window
     And I press "aspect_submit" in the modal window
     And I wait for the ajax to finish
-    And I press the first ".add.button" within "#facebox #aspects_list ul > li:last-child"
 
    When I go to the home page
    Then I go to the aspects manage page
diff --git a/features/signs_up.feature b/features/signs_up.feature
index b70911dff..c7d11b349 100644
--- a/features/signs_up.feature
+++ b/features/signs_up.feature
@@ -9,32 +9,20 @@ Feature: new user registration
     And I fill in "Password confirmation" with "secret"
     And I press "Sign up"
     Then I should be on the getting started page
-    And I should see "Welcome to Diaspora!"
+    And I should see "getting_started_logo"
 
   Scenario: new user goes through the setup wizard
-    Then I should see "Your services"
-    When I follow "Save and continue"
-    And I wait for "step 2" to load
-
-    When I fill in "profile_first_name" with "O"
+   When I fill in "profile_first_name" with "O"
     And I fill in "profile_last_name" with "Hai"
     And I fill in "profile_gender" with "guess!"
     And I press "Save and continue"
-    And I wait for "step 3" to load
+    And I wait for "step 2" to load
     Then I should see "Profile updated"
-    And I should see "Your aspects"
-    
-    When I fill in "step-3-aspect-name" with "cheez friends"
-    And I press "Add"
-    Then I should see "cheez friends"
+    And I should see "Would you like to find your Facebook friends on Diaspora?"
+    And I follow "Skip"
 
-    When I follow "Save and continue"
-    And I wait for "step 4" to load
-    Then I should see "You're all set up, O!"
-    But I should not see "skip getting started"
-
-    When I follow "Continue on to your Home page, an overview of all of your aspects."
     Then I should be on the aspects page
+    And I should not see "skip getting started"
     And I should see "Bring the people that matter in your life to Diaspora!"
 
   Scenario: new user skips the setup wizard and returns to the setup wizard
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index f40e2c909..14b9f71ec 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -2424,6 +2424,7 @@ ul.show_comments
       :right 1em
   .done
     :padding 1em
+      :bottom 2em
     .right
       :right 1em