diff --git a/app/views/home/_keep_in_touch.html.haml b/app/views/home/_keep_in_touch.html.haml
new file mode 100644
index 000000000..34365352b
--- /dev/null
+++ b/app/views/home/_keep_in_touch.html.haml
@@ -0,0 +1,17 @@
+%h2 Keep in touch
+
+%p
+  =image_tag("twitter_32.png", :alt => '')
+  Follow
+  =link_to '@growstufforg', 'http://twitter.com/growstufforg'
+  on Twitter.
+
+%p
+  =image_tag("blog_32.png", :alt => '')
+  Subscribe to the
+  =link_to 'Growstuff Blog', 'http://blog.growstuff.org/'
+
+%p
+  =image_tag("email_32.png", :alt => '')
+  Subscribe to our
+  =link_to 'email newsletter', 'http://blog.growstuff.org/newsletter'
diff --git a/app/views/home/_open.html.haml b/app/views/home/_open.html.haml
new file mode 100644
index 000000000..2d294b062
--- /dev/null
+++ b/app/views/home/_open.html.haml
@@ -0,0 +1,50 @@
+%h2 Open Source
+
+%p
+  #{Growstuff::Application.config.site_name} is open source software,
+  which means that we're sharing this website's code for free with our
+  community and the world.  We believe that open source,
+  sustainability, and social good go hand in hand.  You can read more
+  about
+  =link_to "why Growstuff is open source", "http://blog.growstuff.org/2013/02/20/why-growstuff-is-open-source/"
+  or check out our code on
+  =succeed '.' do
+    = link_to 'Github', 'http://github.com/Growstuff/growstuff'
+
+%h2 Open Data and APIs
+
+%p
+  We're building a database
+  of crops, planting advice, seed sources, and other information
+  that anyone can use for free, under a
+  = succeed '.' do
+    = link_to 'Creative Commons license', 'http://creativecommons.org/licenses/by-sa/3.0/'
+  You can use this data for research, to build apps, or for any
+  purpose at all.  Read more about our
+
+  = link_to 'open data', 'http://wiki.growstuff.org/index.php/Open_data'
+  and
+  = succeed '.' do
+    = link_to 'API documentation', 'http://wiki.growstuff.org/index.php/API'
+
+%h2 Get Involved
+
+%p
+  We believe in collaboration, and we work closely with our members
+  and the wider food-growing community to make sure we're building
+  what you want. Our team includes volunteers from all walks of life
+  and all skills levels, and we'd love to have you, too. To get
+  involved,
+  = link_to 'join our discussion mailing list', 'http://lists.growstuff.org/mailman/listinfo/discuss'
+  or find more information on the
+  = succeed "." do
+    = link_to 'Growstuff Wiki', 'http://wiki.growstuff.org/'
+
+%h2 Support Growstuff
+
+%p
+  Growstuff is supported by our community. We are
+  =link_to 'ad-free', 'http://wiki.growstuff.org/index.php/Why_no_ads%3F'
+  and have no outside investment.  You can support us by
+  =succeed "." do
+    =link_to 'buying a paid account', shop_path
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 16f93ff8a..770f05d4a 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -1,36 +1,11 @@
-.row
+.row-fluid
   = render :partial => 'blurb'
-.row
-  .span8
+.row-fluid
+  .span8.main
     = render :partial => 'crops'
     = render :partial => 'seeds'
     = render :partial => 'people'
 
-  .span4
-    %h2 Keep in touch
-
-    %p
-      =image_tag("twitter_32.png", :alt => '')
-      Follow
-      =link_to '@growstufforg', 'http://twitter.com/growstufforg'
-      on Twitter.
-
-    %p
-      =image_tag("blog_32.png", :alt => '')
-      Subscribe to the
-      =link_to 'Growstuff Blog', 'http://blog.growstuff.org/'
-
-    %p
-      =image_tag("email_32.png", :alt => '')
-      Subscribe to our
-      =link_to 'email newsletter', 'http://blog.growstuff.org/newsletter'
-
-    %p
-
-    %h2 Open Source
-
-    %h2 Open Data and APIs
-
-    %h2 Get Involved
-
-    %h2 Support Growstuff
+  .span4.sidebar
+    = render :partial => 'keep_in_touch'
+    = render :partial => 'open'