diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
new file mode 100644
index 00000000000..5e8a28863bb
--- /dev/null
+++ b/docs/_includes/footer.html
@@ -0,0 +1,41 @@
+<footer class="nav-footer">
+  <section class="sitemap">
+    <a href="/react/" class="nav-home">
+    </a>
+    <div>
+      <h5><a href="/react/docs/">Docs</a></h5>
+      <a href="/react/docs/installation.html">Quick Start</a>
+      <a href="/react/docs/thinking-in-react.html">Thinking in React</a>
+      <a href="/react/tutorial/tutorial.html">Tutorial</a>
+      <a href="/react/docs/jsx-in-depth.html">Advanced Guides</a>
+    </div>
+    <div>
+      <h5><a href="/react/community/support.html">Community</a></h5>
+      <a href="http://stackoverflow.com/questions/tagged/reactjs" target="_blank">Stack Overflow</a>
+      <a href="https://discuss.reactjs.org/" target="_blank">Discussion Forum</a>
+      <a href="https://discord.gg/0ZcbPKXt5bZjGY5n" target="_blank">Reactiflux Chat</a>
+      <a href="https://www.facebook.com/react" target="_blank">Facebook</a>
+      <a href="https://twitter.com/reactjs" target="_blank">Twitter</a>
+    </div>
+    <div>
+      <h5><a href="/react/community/support.html">Resources</a></h5>
+      <a href="/react/community/conferences.html">Conferences</a>
+      <a href="/react/community/videos.html">Videos</a>
+      <a href="https://github.com/facebook/react/wiki/Examples" target="_blank">Examples</a>
+      <a href="https://github.com/facebook/react/wiki/Complementary-Tools" target="_blank">Complementary Tools</a>
+    </div>
+    <div>
+      <h5>More</h5>
+      <a href="/react/blog/">Blog</a>
+      <a href="https://github.com/facebook/react" target="_blank">GitHub</a>
+      <a href="http://facebook.github.io/react-native/" target="_blank">React Native</a>
+      <a href="/react/acknowledgements.html">Acknowledgements</a>
+    </div>
+  </section>
+  <a href="https://code.facebook.com/projects/" target="_blank" class="fbOpenSource">
+    <img src="/react/img/oss_logo.png" alt="Facebook Open Source" width="170" height="45"/>
+  </a>
+  <section class="copyright">
+    Copyright © {{ site.time | date: '%Y' }} Facebook Inc.
+  </section>
+</footer>
diff --git a/docs/_includes/hero.html b/docs/_includes/hero.html
new file mode 100644
index 00000000000..3bb551acf18
--- /dev/null
+++ b/docs/_includes/hero.html
@@ -0,0 +1,13 @@
+<div class="hero">
+  <div class="wrap">
+    <div class="text"><strong>React</strong></div>
+    <div class="minitext">
+      A JavaScript library for building user interfaces
+    </div>
+
+    <div class="buttons-unit">
+      <a href="/react/docs/installation.html" class="button">Get Started</a>
+      <a href="/react/tutorial/tutorial.html" class="button">Take the Tutorial</a>
+    </div>
+  </div>
+</div>
diff --git a/docs/_includes/navigation.html b/docs/_includes/navigation.html
new file mode 100644
index 00000000000..ddda178d971
--- /dev/null
+++ b/docs/_includes/navigation.html
@@ -0,0 +1,23 @@
+<div class="nav-main">
+  <div class="wrap">
+    <a class="nav-home" href="/react/index.html">
+      <img class="nav-logo" src="/react/img/logo.svg" width="36" height="36">
+      React
+    </a>
+    <div class="nav-lists">
+      <ul class="nav-site nav-site-internal">
+        <li><a href="/react/docs/installation.html"{% if page.sectionid == 'docs' or page.sectionid == 'tips' or page.sectionid == 'contributing' %} class="active"{% endif %}>Docs</a></li>
+        <li><a href="/react/tutorial/tutorial.html"{% if page.sectionid == 'tutorial' %} class="active"{% endif %}>Tutorial</a></li>
+        <li><a href="/react/community/support.html"{% if page.sectionid == 'community' %} class="active"{% endif %}>Community</a></li>
+        <li><a href="/react/blog/"{% if page.sectionid == 'blog' %} class="active"{% endif %}>Blog</a></li>
+        <li class="nav-site-search">
+          <input id="algolia-doc-search" type="text" placeholder="Search docs..." />
+        </li>
+      </ul>
+      <ul class="nav-site nav-site-external">
+        <li><a href="https://github.com/facebook/react">GitHub</a></li>
+        <li><a href="https://facebook.github.io/react-native/">React Native</a></li>
+      </ul>
+    </div>
+  </div>
+</div>
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 8bc98537b0f..2516518d610 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -53,91 +53,14 @@
 
   <div class="container">
 
-    <div class="nav-main">
-      <div class="wrap">
-        <a class="nav-home" href="/react/index.html">
-          <img class="nav-logo" src="/react/img/logo.svg" width="36" height="36">
-          React
-        </a>
-        <div class="nav-lists">
-          <ul class="nav-site nav-site-internal">
-            <li><a href="/react/docs/installation.html"{% if page.sectionid == 'docs' or page.sectionid == 'tips' or page.sectionid == 'contributing' %} class="active"{% endif %}>Docs</a></li>
-            <li><a href="/react/tutorial/tutorial.html"{% if page.sectionid == 'tutorial' %} class="active"{% endif %}>Tutorial</a></li>
-            <li><a href="/react/community/support.html"{% if page.sectionid == 'community' %} class="active"{% endif %}>Community</a></li>
-            <li><a href="/react/blog/"{% if page.sectionid == 'blog' %} class="active"{% endif %}>Blog</a></li>
-            <li class="nav-site-search">
-              <input id="algolia-doc-search" type="text" placeholder="Search docs..." />
-            </li>
-          </ul>
-          <ul class="nav-site nav-site-external">
-            <li><a href="https://github.com/facebook/react">GitHub</a></li>
-            <li><a href="https://facebook.github.io/react-native/">React Native</a></li>
-          </ul>
-        </div>
-      </div>
-    </div>
-
-    {% if page.id == 'home' %}
-    <div class="hero">
-      <div class="wrap">
-        <div class="text"><strong>React</strong></div>
-        <div class="minitext">
-          A JavaScript library for building user interfaces
-        </div>
-
-        <div class="buttons-unit">
-          <!-- TODO: pick one call to action? -->
-          <a href="/react/docs/installation.html" class="button">Get Started</a>
-          <a href="/react/docs/tutorial.html" class="button">Take the Tutorial</a>
-        </div>
-      </div>
-    </div>
-    {% endif %}
+    {% include navigation.html %}
 
     {{ content }}
-    <footer class="nav-footer">
-      <section class="sitemap">
-        <a href="/react/" class="nav-home">
-        </a>
-        <div>
-          <h5><a href="/react/docs/">Docs</a></h5>
-          <a href="/react/docs/installation.html">Getting Started</a>
-          <a href="/react/docs/tutorial.html">Tutorial</a>
-          <a href="/react/docs/thinking-in-react.html">Thinking in React</a>
-          <a href="https://github.com/facebook/react/wiki/Examples" target="_blank">Examples</a>
-        </div>
-        <div>
-          <h5><a href="/react/community/support.html">Community</a></h5>
-          <a href="http://stackoverflow.com/questions/tagged/reactjs" target="_blank">Stack Overflow</a>
-          <a href="https://discuss.reactjs.org/" target="_blank">Discussion Forum</a>
-          <a href="https://www.facebook.com/react" target="_blank">Facebook</a>
-          <a href="https://twitter.com/reactjs" target="_blank">Twitter</a>
-          <a href="irc://chat.freenode.net/reactjs" target="_blank">Chat</a>
-        </div>
-        <div>
-          <h5><a href="/react/community/support.html">Resources</a></h5>
-          <a href="/react/community/conferences.html">Conferences</a>
-          <a href="/react/community/videos.html">Videos</a>
-          <a href="https://github.com/facebook/react/wiki/Complementary-Tools" target="_blank">Complementary Tools</a>
-        </div>
-        <div>
-          <h5>More</h5>
-          <a href="/react/blog/">Blog</a>
-          <a href="https://github.com/facebook/react" target="_blank">GitHub</a>
-          <a href="http://facebook.github.io/react-native/" target="_blank">React Native</a>
-          <a href="/react/acknowledgements.html">Acknowledgements</a>
-        </div>
-      </section>
-      <a href="https://code.facebook.com/projects/" target="_blank" class="fbOpenSource">
-        <img src="/react/img/oss_logo.png" alt="Facebook Open Source" width="170" height="45"/>
-      </a>
-      <section class="copyright">
-        Copyright © {{ site.time | date: '%Y' }} Facebook Inc.
-      </section>
 
+    {% include footer.html %}
   </div>
-  <div id="fb-root"></div>
 
+  <div id="fb-root"></div>
   <script>
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/docs/_layouts/hero.html b/docs/_layouts/hero.html
new file mode 100644
index 00000000000..0eaf4951d51
--- /dev/null
+++ b/docs/_layouts/hero.html
@@ -0,0 +1,11 @@
+---
+layout: default
+---
+
+{% if page.id == 'home' %}
+  {% include hero.html %}
+{% endif %}
+
+<section class="content wrap">
+  {{ content }}
+</section>
diff --git a/docs/community/support.md b/docs/community/support.md
index b3f16ef772a..2e7f9882eb8 100644
--- a/docs/community/support.md
+++ b/docs/community/support.md
@@ -19,12 +19,12 @@ For longer-form conversations about React, we've set up a [discussion forum at *
 
 In the forum there's also a category for job posts and a category for discussion of our weekly meeting notes.
 
-## IRC
+## Reactiflux Chat
 
-Many developers and users idle on Freenode.net's IRC network in **[#reactjs on freenode](irc://chat.freenode.net/reactjs)**.
+If you need an answer right away, check out the [Reactiflux Discord](https://discord.gg/0ZcbPKXt5bZjGY5n) community. There are usually a number of React experts there who can help out or point you to somewhere you might want to look.
 
-## Twitter
+## Facebook and Twitter
 
-For the latest news about React, [follow **@reactjs** on Twitter](https://twitter.com/reactjs). In addition, you can use the #reactjs hashtag to see what others are saying or add to the conversation.
+For the latest news about React, [like us on Facebook](https://facebook/react) and [follow **@reactjs** on Twitter](https://twitter.com/reactjs). In addition, you can use the [#reactjs](https://twitter.com/hashtag/reactjs) hashtag to see what others are saying or add to the conversation.
 
 <div><a class="twitter-timeline" data-dnt="true" data-chrome="nofooter noheader transparent" href="https://twitter.com/search?q=%23reactjs" data-widget-id="342522405270470656"></a></div>
diff --git a/docs/index.md b/docs/index.md
index dbfc0ad4621..94aba962388 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: hero
 title: A JavaScript library for building user interfaces
 id: home
 ---