diff --git a/app/views/tokens/show.html.haml b/app/views/tokens/show.html.haml
index c3070fae6..7add09dca 100644
--- a/app/views/tokens/show.html.haml
+++ b/app/views/tokens/show.html.haml
@@ -13,55 +13,33 @@
   
 %hr
 
-.span-24{:style => "text-align:center;"}
-  = image_tag '/images/cubbies_screenshot.png', :width => 600, :height => 452
+.cubbies_infographic.span-24{:style => "text-align:left;position:relative;"}
+  = image_tag '/images/cubbies_screenshot2.png', :height => 452, :class => "cubbies_screenshot"
+  = image_tag '/images/cubbies_collage.png', :class => "cubbies_collage"
 
-.span-18.prepend-3.append-3.last{:style => "text-align:center;"}
+.span-24.last{:style => "text-align:right;"}
   %p.subtle
     != t('.screenshot_explanation', :link1 => link_to(t('.typical_userpage'), "http://cubbi.es/daniel"), :link2 => link_to(t('.daniels_account'), "https://joindiaspora.com/people/29"))
+  %br
 %hr
 
-/%p.subtle
-/  Cubbi.es allows you to collect images from all across the internet and keep them in one place (your cubby) in a simple and intuative way.  Hooking up your Diaspora account with Cubbi.es means the images you collect will automatically be shared on Diaspora.*
-
 %br
 .span-24.last
   %h2
     = t('.making_the_connection')
   %br
-  %br
 
-.span-20.append-2.prepend-2.last
-  .span-8
-    = image_tag '/images/cubbies_settings.png', :width => 238, :height => 248, :class => "cubbies-settings-image"
+.span-24.last
+  .span-10
+    = image_tag '/images/connect_services.png', :class => "cubbies-settings-image"
     %div.subtle
       != t('.via', :link => link_to('http://cubbi.es/users/edit', 'http://cubbi.es/users/edit'))
 
+
   .span-12.last
     %h3
-      = t('.connecting_is_simple')
+      != t('.connecting_is_simple', :diaspora_id => current_user.diaspora_handle, :href_link => 'http://cubbi.es/users/edit')
 
     %p.subtle
-      = t('.were_working_hard')
-
-    %br
-
-    .span-11.cubbies-credentials
-      .span-4
-        %h5
-          = t('.your_diaspora_handle')
-      .span-6
-        %h2
-          = current_user.diaspora_handle
-      .span-4
-        %h5
-          = t('.your_diaspora_token')
-
-      .span-6
-        - if current_user.authentication_token
-          %h2
-            = current_user.authentication_token
-        - else
-          = form_tag(token_path) do
-            = submit_tag t('.generate_a_token')
+      = t('.log_in_with_diaspora_is_comming')
 
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index dc7dd9b5d..57586a2df 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -704,11 +704,8 @@ en:
       typical_userpage: "A typical cubbi.es userpage"
       daniels_account: "Daniel's Diaspora account"
       making_the_connection: "Making the Connection"
-      connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
-      your_diaspora_handle: "Your Diaspora ID:"
-      your_diaspora_token: "Your Diaspora Token:"
-      generate_a_token: "Generate a token"
+      connecting_is_simple: "Connecting your Diaspora account is simple!  Just enter your Diaspora ID (<b>%{diaspora_id}</b>) from your cubbies <a href='%{href_link}'>settings page</a> and hit connect."
+      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       via: "(via %{link})"
 
   authorizations:
diff --git a/public/images/connect_services.png b/public/images/connect_services.png
new file mode 100644
index 000000000..4f0cb84a8
Binary files /dev/null and b/public/images/connect_services.png differ
diff --git a/public/images/cubbies_collage.png b/public/images/cubbies_collage.png
new file mode 100644
index 000000000..67d36caeb
Binary files /dev/null and b/public/images/cubbies_collage.png differ
diff --git a/public/images/cubbies_screenshot2.png b/public/images/cubbies_screenshot2.png
new file mode 100644
index 000000000..d8347fc6c
Binary files /dev/null and b/public/images/cubbies_screenshot2.png differ
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index aec2a7f69..0182bf439 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -2710,11 +2710,6 @@ h1.tag
       :bottom 12px
     :vertical-align top
 
-.cubbies-credentials
-  :background
-    :color #eee
-  :padding 15px
-
 .cubbies-settings-image
   @include box-shadow(3px, 3px, 15px, #333)
   :margin
@@ -3047,3 +3042,19 @@ ul.left_nav
     :left 0px
   :padding
     :bottom 10px
+
+.cubbies_collage
+  :position absolute
+  :right 50px
+  :top -50px
+  :z-index -1
+
+.cubbies_screenshot
+  :position absolute
+  :right -20px
+  :z-index 1
+
+.cubbies_infographic
+  :height 450px
+  :margin
+    :top 30px