diff --git a/app/views/registrations/new.html.haml b/app/views/registrations/new.html.haml
index 567e5318d..b36826aec 100644
--- a/app/views/registrations/new.html.haml
+++ b/app/views/registrations/new.html.haml
@@ -1,39 +1,48 @@
 = javascript_include_tag "validation"
+-# = javascript_include_tag 'vendor/jquery.ghostInput'
 
-:javascript
-  $(function() {
-    $("#user_username").focus();
-  });
-
+= javascript_tag "Diaspora.Page = 'InvitationsEdit';"
 .span-7.append-1.prepend-3
   %br
   %br
   %br
   %br
-  %h2
-    = t('.join_the_movement')
+  %h1
+    = t('users.getting_started.welcome')
   %h3.accept_invitation_text
-    = t('.sign_up_today')
+    = t('.sign_up_message')
+  - flash.each do |name, msg|
+    %p{:class => "login_#{name}"}= msg
+
+  = image_tag 'diaspora_collage.png', :style => "margin-left:-50px;"
 
 .span-10
   %br
   %br
   %br
   %br
-  = form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => {:class => 'sign_up_form'}) do |f|
-    %p
-      = f.label :username , t('username')
-      = f.text_field :username, :title => t('.enter_username')
-    %p  
-      = f.label :email , t('email')
-      = f.text_field :email, :title => t('.enter_email')
-    
-    %p
-      = f.label :password , t('password')
-      = f.password_field :password, :title => t('.enter_password') 
-    %p
-      = f.label :password_confirmation , t('password_confirmation')
-      = f.password_field :password_confirmation, :title => t('.enter_password_again') 
+  = form_for(resource, :as => resource_name, :html => {:class => 'new_user_form'}, :url => registration_path(resource_name), :validate => true) do |f|
+    %fieldset
+      .clearfix
+        %b
+          = t('username')
+        = f.text_field :username, :title => t('registrations.new.enter_username')
+        %span.host_uri
+          = "@#{AppConfig[:pod_uri].host}"
+      .clearfix
+        %b
+          = t('email')
+        = f.email_field :email, :title => t('registrations.new.enter_email')
+      .clearfix
+        %b
+          = t('password')
+        = f.password_field :password, :title => t('registrations.new.enter_password') 
+      .clearfix
+        %b
+          = t('password_confirmation')
+        = f.password_field :password_confirmation, :title => t('registrations.new.enter_password_again') 
+
+      .submit_field
+        = f.submit t('registrations.new.create_my_account'), :class => 'in_aspects'
 
-    = f.submit t('.create_my_account')
 
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 53fae21dd..04c65c798 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -633,7 +633,7 @@ en:
       create_my_account: "Create my account!"
 
       join_the_movement: "Join the movement!"
-      sign_up_today: "Sign up today"
+      sign_up_message: "Social Networking with a <3"
 
       enter_email: "Enter an email"
       enter_username: "Pick a username (only letters, numbers, and underscores)"
diff --git a/public/javascripts/pages/invitations-edit.js b/public/javascripts/pages/invitations-edit.js
index 61be4201f..79649ac7b 100644
--- a/public/javascripts/pages/invitations-edit.js
+++ b/public/javascripts/pages/invitations-edit.js
@@ -3,5 +3,6 @@ Diaspora.Pages.InvitationsEdit = function() {
 
   this.subscribe("page/ready", function(evt, body) {
     $('#user_username').tipsy({trigger: 'select', gravity: 'w'});
+
   });
 };
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 5eb5c5761..0e9390a41 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -3478,7 +3478,7 @@ ul#getting_started
   :right 10px
   :left auto
 
-.accept_invitation_form fieldset
+.new_user_form fieldset, .accept_invitation_form fieldset
   @include border-radius(3px)
 
   :background
@@ -3488,3 +3488,8 @@ ul#getting_started
   .submit_field
     :margin
       :top 15px
+  span.host_uri
+    :float right
+    :margin-top -28px
+    :color #999
+    :padding-right 9px