diff --git a/app/views/tokens/show.html.haml b/app/views/tokens/show.html.haml
index aba67155f..318c1bf5c 100644
--- a/app/views/tokens/show.html.haml
+++ b/app/views/tokens/show.html.haml
@@ -1,16 +1,39 @@
 %h3
   This is a temporary hack while we develop a more general application framework.
-%div
+%br
+%br
+%br
+%br
+
+.span-11.append-1
+  %h3
+    Your Diaspora Token:
   - if current_user.authentication_token
-    %h4= current_user.authentication_token
+    %h1
+      = current_user.authentication_token
   - else
     %h4 No authentication token set.
-%div
+
   = form_tag(token_path) do
     =submit_tag "Generate new authentication token"
+
+.span-11.last
+  %h3
+    Your Diaspora Handle:
+  %h1
+    = current_user.diaspora_handle
+
+.clearfix
+
+%br
+%br
+%br
+%br
 %br
 %div
   %h4
     Click settings on
     = link_to "Cubbi.es", 'http://cubbi.es'
     to share your internet folder with the internet!
+  %h5
+    Make sure to fill out both these fields to properly connect your account!!