diff --git a/app/views/home/show.html.haml b/app/views/home/show.html.haml
index 5bf9790e9..39f6ff848 100644
--- a/app/views/home/show.html.haml
+++ b/app/views/home/show.html.haml
@@ -10,12 +10,50 @@
%p
= t('.share_what_you_want')
- #signup_field.section
- = render 'shared/mail_signup_form'
+ #why.span-22.prepend-1.last
+ .span-7
+ %h2
+ Choice
+ %p
+ Diaspora allows you to sort your connections into groups called Aspects.
+ Unique to Diaspora, Aspects ensure your photos, stories and jokes are shared
+ with only the people you want them to be.
+
+ .span-7
+ %h2
+ Ownership
+ %p
+ You own your pictures, and you shouldn’t have to give that up just in order
+ to share them. You maintain ownership of everything you share on Diaspora,
+ giving you full control over how it is distributed.
- #login_field.section
- = t('.already_account')
- = link_to t('.login_here'), new_user_session_path
+ .span-7
+ %h2
+ Simplicity
+ %p
+ Diaspora makes sharing clean and easy – this goes doubly so for privacy.
+ Innherently private, Diaspora doesn’t have pages of settings and options to
+ wade through to keep your profile secure and to your liking.
+
+
+ .span-22.prepend-1.last
+ #signup_field.section
+ = render 'shared/mail_signup_form'
+
+ #login_field.section
+ = t('.already_account')
+ = link_to t('.login_here'), new_user_session_path
+
+ #info_links.span-22.prepend-1.last
+ .span-10
+ %h3
+ Learn about how to host your own Diaspora server
+
+
+ .span-11
+ %h3
+ Learn more about Diaspora as an open source project.
+
.span-24.last{:style=>"text-align:center;"}
%ul#press_logos
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 53ffae2a3..a3dcd1f1c 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -1949,4 +1949,19 @@ h3,h4
:-webkit-border-radius 5px
:-moz-border-radius 5px
:border-radius 5px
+#why
+ :margin
+ :bottom 30px
+ p
+ :text-align justify
+ :padding 1em
+#info_links
+ :margin
+ :top 30px
+
+ h3
+ :border #eee 4px solid
+ :border-radius 5px
+ :background-color #ddd
+ :padding 5px