diff --git a/pinaxcon/templates/static_pages/homepage.html b/pinaxcon/templates/static_pages/homepage.html
index 537abd6fbb481de7be88fd11d00959efaee7b72c..0cd3171284acbae087bdea2860c6487404f200e7 100644
--- a/pinaxcon/templates/static_pages/homepage.html
+++ b/pinaxcon/templates/static_pages/homepage.html
@@ -28,7 +28,6 @@
 
           <h4>
             December 2 &amp; 3, 2017<br/>
-            Talk submissions close September 29
           </h4>
         </div>
         <div class="col-md-4 col-md-offset-2 email-signup-panel">
@@ -64,7 +63,6 @@
 
     <div class="container homepage-block-footer">
       <div>
-        <a class="btn btn-primary btn-lg" href="/dashboard">Submit a Proposal</a>
         <a class="btn btn-default btn-lg " href="https://twitter.com/northbaypython">Twitter</a>
         <a class="btn btn-default btn-lg" href="https://facebook.com/northbaypython">Facebook</a>
       </div>
@@ -81,17 +79,19 @@
       <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>
+        <li>Charming <a href="/attend/hotels">small-town hotels</a>, as close as one block away</li>
       </ul>
 
-      <p>&hellip; and it's only an hour away from San Francisco (on a good day).</p>
+      <p>&hellip; and it's <a href="/attend/travel">only an hour away from San Francisco</a> (on a good day).</p>
     </div>
 
     <div class="homepage-block-footer full-width">
       <div class="container">
         <div class="row">
-          <div class="btn-group col-md-4">
-            <a class="btn btn-lg btn-primary btn-shadow" href="/about/north-bay-python">Learn More</a>
+          <div class="col-md-4">
+            <a class="btn btn-lg btn-primary btn-shadow" href="/about/petaluma">Learn More</a>
+            <a class="btn btn-lg btn-info" href="/attend/hotels">Hotels</a>
+            <a class="btn btn-lg btn-info" href="/attend/travel">Travel</a>
           </div>
 
           <div class="col-md-8 text-right photo-attribution">