diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html
index b69dca5d1ecc71ce05fab8e06331182a4411fc38..58e31716f9275acba2d1d1572764aeff5fad1bc8 100644
--- a/pinaxcon/templates/static_pages/homepage.html
+++ b/pinaxcon/templates/static_pages/homepage.html
@@ -19,20 +19,54 @@
         <h3>A Python conference north of the Golden Gate</h3>
       </div>
 
-      <h3>
-        The Mystic Theatre</br>
-        Petaluma, California
-      </h3>
-
-      <h4>
-        <strong>2017 conference:</strong> December 2 &amp; 3 <br>
-        Talk submissions close September 29
-      </h4>
+      <div class="row">
+        <div class="col-md-6">
+          <h3>
+            The Mystic Theatre</br>
+            Petaluma, California
+          </h3>
+
+          <h4>
+            <strong>2017 conference:</strong> December 2 &amp; 3 <br/>
+            Talk submissions close September 29
+          </h4>
+        </div>
+        <div class="col-md-4 col-md-offset-2">
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h2 class="panel-title">Sign up for our low-volume announcements newsletter</h4>
+            </div>
+            <div class="panel-body">
+              <form
+                class="form-inline"
+                action="https://tinyletter.com/northbaypython" method="post" target="popupwindow" onsubmit="window.open('https://tinyletter.com/northbaypython', 'popupwindow', 'scrollbars=yes,width=800,height=600');return true">
+                <div class="form-group">
+                  <span>
+                    <label style="display: none;" for="tlemail">Email address:</label>
+                  </span>
+                  <span>
+                    <input class="form-control" type="email" name="email" id="tlemail" placeholder="E-mail address"/>
+                  </span>
+                </div>
+                <span>
+                  <input class="btn btn-primary" type="submit" value="Subscribe" />
+                </span>
+
+                <input type="hidden" value="1" name="embed"/>
+              </form>
+            </div>
+          </div>
+        </div>
+
+      </div>
+
     </div>
 
     <div class="container homepage-block-footer">
-      <div class="btn-group">
-        <a class="btn btn-lg btn-primary btn-shadow" href="/dashboard" title="Submit a Proposal to North Bay Python">Submit a Proposal</a>
+      <div>
+        <a class="btn btn-primary btn-lg" href="/dashboard" title="Submit a Proposal to North Bay Python">Submit a Proposal</a>
+        <a class="btn btn-default btn-lg " href="https://twitter.com/northbaypython" title="North Bay Python on Twitter">Twitter</a>
+        <a class="btn btn-default btn-lg" href="https://facebook.com/northbaypython" title="North Bay Python on Facebook">Facebook</a>
       </div>
     </div>
   </div>
@@ -42,11 +76,15 @@
     <div class="container homepage-block-content">
       <h1>Downtown Petaluma</h1>
 
-      <p>North Bay Python's home is Petaluma, a shockingly quaint dairy town, nestled on a river at the edge of California's Wine Country.</p>
+      <p>North Bay Python's home is Petaluma, a delightfully quaint dairy town, nestled on a river at the edge of California's Wine Country. Here's what you can look forward to:</p>
 
-      <p>We're hosting the conference at the Mystic Theatre, a 1912-era music hall in the middle of Historic Downtown Petaluma. There are countless places to eat, craft food and drink producers within walking distance, and plenty of places to stay nearby.</p>
+      <ul>
+        <li>An historic venue with countless restaurants and coffee shops in walking distance</li>
+        <li>World-famous craft food and drink producers on your doorstep</li>
+        <li>Charming small-town hotels, as close as one block away</li>
+      </ul>
 
-      <p>And it's only an hour away from San Francisco.</p>
+      <p>&hellip; and it's only an hour away from San Francisco (on a good day).</p>
     </div>
 
     <div class="homepage-block-footer full-width">
@@ -104,13 +142,14 @@
     <div class="container homepage-block-content">
       <h1>Inclusion and Diversity</h1>
 
-      <p>North Bay Python is proud to be founded on a commitment to inclusion and diversity.</p>
-
-      <p>We value your safety, so we have a strong Code of Conduct and enforcement policy built on the Python Software Foundation's PyCon US policy.</p>
-
-      <p>We have set diversity targets for our conference program, including short-term and long-term goals for gender balance. We make financial assistance available to speakers.</p>
+      <p>North Bay Python is proud to be founded on a commitment to inclusion and diversity. Here's what we commit to:</p>
 
-      <p>We will always have low-cost tickets available, and we will enthusiastically waive ticket costs on request if you need it.</p>
+      <ul>
+        <li>A strong Code of Conduct and enforcement policy built on the Python Software Foundation's PyCon US policy.</li>
+        <li>Diversity targets for speakers and attendees.</li>
+        <li>Financial assistance for speakers who need it.</li>
+        <li>Low-cost tickets, with fees enthusiastically waived on request.</li>
+      </ul>
     </div>
 
     <div class="homepage-block-footer full-width">