-<!-- <li><a href="/2017/streaming">Livestream</a></li> -->
+<!-- <li><a href="https://my.fsf.org/lp-call-for-sessions">Propose a session</a></li> -->
+<!--<li><a href="https://my.fsf.org/lp-scholarship-application">Apply for a scholarship</a></li>-->
-
-<li class="btn-register visible-xs"><a href="https://my.fsf.org/civicrm/event/register?reset=1&id=47">Register Now</a></li>
-<li><a href="https://my.fsf.org/lp-call-for-sessions">Propose a session</a></li>
-<li class="program-link"><a href="/2016/program">Video sessions from last LibrePlanet</a></li>
-<li class="getting-around-link"><a href="/2017/getting-around">Travel info</a></li>
-<li class="ahp-link"><a href="/2017/safe-space-policy/">Safe Space Policy</a></li>
+<li class="program-link"><a href="/2017/program">Sessions (with videos!)</a></li>
+<li class="speakers-link"><a href="/2017/program/speakers.html">Speakers</a></li>
+<li class="social-events-link"><a href="/2017/social.html">Social Events</a></li>
+<li class="exhibit-hall-link"><a href="/2017/exhibit-hall">Exhibit Hall</a></li>
+<li><a href="/2017/live">Video Recordings <span class="glyphicon glyphicon-globe"></span></a></li>