diff --git a/pinaxcon/templates/_account_bar.html b/pinaxcon/templates/_account_bar.html
index 1174cd91b5bf62af9b698caa9e294971ebb52a7a..6db356170c524ba7ed3d1eeddf07a34a70c373c4 100644
--- a/pinaxcon/templates/_account_bar.html
+++ b/pinaxcon/templates/_account_bar.html
@@ -21,6 +21,6 @@
     {% endif %}
 </ul>
 
-<form id="accountLogOutForm" style="display: none;" action="{% url 'account_logout' %}" method="POST">
+<form id="accountLogOutForm" action="{% url 'account_logout' %}" method="POST">
     {% csrf_token %}
 </form>
diff --git a/pinaxcon/templates/_default_sidebar.html b/pinaxcon/templates/_default_sidebar.html
index a1936f1c4c80d518b39128f70c564358c3844c97..1432aa621d69741672fb3db5430e9e707bbde4c1 100644
--- a/pinaxcon/templates/_default_sidebar.html
+++ b/pinaxcon/templates/_default_sidebar.html
@@ -9,10 +9,10 @@
 <div class="sponsor-list">
     {% for level in levels %}
         {% if level.sponsors %}
-            <h3 style="margin-top: 3em;">{{ level.name }}</h3>
+            <h3>{{ level.name }}</h3>
 
             {% for sponsor in level.sponsors %}
-                <div style="margin: 10px 0;">
+                <div>
                     {% if sponsor.website_logo %}
                         <a href="{{ sponsor.external_url }}">
                             <img src="{% thumbnail sponsor.website_logo '100x60' %}" alt="{{ sponsor.name }}" />
@@ -25,3 +25,5 @@
         {% endif %}
     {% endfor %}
 </div>
+
+
diff --git a/pinaxcon/templates/pages/about.html b/pinaxcon/templates/pages/about.html
deleted file mode 100644
index 48fe0c86bac21022723154b515cac6f30e38b2f8..0000000000000000000000000000000000000000
--- a/pinaxcon/templates/pages/about.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "page_with_title_and_lede.html" %}
-
-{% block title %}About {{ SITE_NAME }}{% endblock %}
-{% block heading %}About {{ SITE_NAME }}{% endblock %}
-{% block lede %}{{ SITE_NAME }} is the premier demo conference site for Symposion and Registrasion{% endblock %}
-
-{% block content %}
-  <p>I am the body content</p>
-{% endblock %}
diff --git a/pinaxcon/templates/pages/sponsors/info.html b/pinaxcon/templates/pages/sponsors/info.html
deleted file mode 100644
index a213eb1c5e1bfd3af30790447c703a018d18a3b6..0000000000000000000000000000000000000000
--- a/pinaxcon/templates/pages/sponsors/info.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "page_with_title_and_lede.html" %}
-
-{% block title %}Sponsorship Prospectus{% endblock %}
-{% block heading %}Sponsorship Prospectus{% endblock %}
-{% block lede %}{{ SITE_NAME }} wants sponsors.{% endblock %}
-
-{% block content %}
-  <p>I am the body content</p>
-{% endblock %}
diff --git a/pinaxcon/templates/pages/venue.html b/pinaxcon/templates/pages/venue.html
deleted file mode 100644
index ee3ea28ca958718d95623e78987c234b702d680f..0000000000000000000000000000000000000000
--- a/pinaxcon/templates/pages/venue.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "page_with_title_and_lede.html" %}
-
-{% block title %}Venue{% endblock %}
-{% block heading %}Venue{% endblock %}
-{% block lede %}{{ SITE_NAME }} is being held on a Django Hosting facility, somewhere.{% endblock %}
-
-{% block content %}
-  <p>I am the body content</p>
-{% endblock %}
diff --git a/pinaxcon/templates/pinax/boxes/_box.html b/pinaxcon/templates/pinax/boxes/_box.html
deleted file mode 100644
index 8901f69c2530d485bce083bb52122e62dd531c80..0000000000000000000000000000000000000000
--- a/pinaxcon/templates/pinax/boxes/_box.html
+++ /dev/null
@@ -1 +0,0 @@
-{% include "pinax/boxes/_box_body.html" %}
diff --git a/pinaxcon/templates/pinax/boxes/_box_body.html b/pinaxcon/templates/pinax/boxes/_box_body.html
deleted file mode 100644
index 3dba5ad918c8132e649441fca03734f2f69db01d..0000000000000000000000000000000000000000
--- a/pinaxcon/templates/pinax/boxes/_box_body.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% load i18n %}
-
-{% if form %}
-    <div id="edit_{{ label }}" class="modal fade">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <form id="edit_form_{{ label }}" accept-charset="UTF-8" class="modal-form" method="POST" action="{{ form_action }}?next={{ request.path }}">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                        <h4 class="modal-title">{% trans "Editing content:" %} {{ label }}</h4>
-                    </div>
-                    <div class="modal-body form-group">
-                        {% csrf_token %}
-                        {{ form.content }}
-                    </div>
-                    <div class="modal-footer">
-                        <button type="submit" class="btn btn-primary">Save changes</button>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-{% endif %}
-
-<div id="content_{{ label }}" class="content-box {% if form %}editable{% endif %}">
-    {% if form %}
-        <a href="#edit_{{ label }}" data-toggle="modal" class="btn btn-default btn-sm edit-toggle">
-            <i class="fa fa-pencil"></i>
-            Edit this content
-        </a>
-    {% endif %}
-    {{ box.content_html|safe }}
-</div>
diff --git a/pinaxcon/templates/pinax/pages/file_create.html b/pinaxcon/templates/pinax/pages/file_create.html
deleted file mode 100644
index 7b117d8634b0d0eb5318ac58ac30643ef02dc7a5..0000000000000000000000000000000000000000
--- a/pinaxcon/templates/pinax/pages/file_create.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "site_base.html" %}
-
-{% load bootstrap %}
-
-{% block head_title %}Upload File{% endblock %}
-
-{% block body_outer %}
-    <h1>Upload File</h1>
-    <form method="POST" action="{% url "file_create" %}" enctype="multipart/form-data">
-        {% csrf_token %}
-        {{ form|bootstrap }}
-        <div class="form-actions">
-            <button class="btn btn-primary" type="submit">Upload</button>
-        </div>
-    </form>
-{% endblock %}
diff --git a/pinaxcon/templates/pinax/pages/file_list.html b/pinaxcon/templates/pinax/pages/file_list.html
deleted file mode 100644
index be27817d6ea692f40777051215b6ea79a923e4c0..0000000000000000000000000000000000000000
--- a/pinaxcon/templates/pinax/pages/file_list.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "site_base.html" %}
-
-{% block head_title %}Uploaded Files{% endblock %}
-
-{% block body_outer %}
-    <h1>Files</h1>
-    {% for file in files %}
-        <div style="margin-top: 1em;">
-            <form class="pull-right" action="{% url "file_delete" file.pk %}" method="post">
-                {% csrf_token %}
-                <button type="submit" class="btn btn-error"><i class="fa fa-trash"></i> delete</button>
-            </form>
-            <h3><a href="{{ file.download_url }}">{{ file.file }}</a></h3>
-            <span style="font-style:italic; color: #999;">Uploaded {{ file.created|date:"N j, Y" }}</span>
-        </div>
-    {% empty %}
-        <p>No uploaded files.</p>
-    {% endfor %}
-    <div style="margin-top: 2em">
-        <a class="btn btn-success" href="{% url "file_create" %}">
-            <i class="fa fa-plus"></i>
-            Add File
-        </a>
-    </div>
-{% endblock %}
diff --git a/pinaxcon/templates/pinax/pages/page_detail.html b/pinaxcon/templates/pinax/pages/page_detail.html
deleted file mode 100644
index 8f48b149d4734d1484634d11bcf64f968df9108e..0000000000000000000000000000000000000000
--- a/pinaxcon/templates/pinax/pages/page_detail.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends "site_base.html" %}
-
-{% load sitetree %}
-{% load i18n %}
-
-{% block body_class %}cms-page{% endblock %}
-
-{% block head_title %}{{ page.title }}{% endblock %}
-
-{% block breadcrumbs %}{% sitetree_breadcrumbs from "main" %}{% endblock %}
-
-{% block body %}
-    {% if editable %}
-        <div class="pull-right">
-            <a href="{% url 'pages_page_edit' page.path %}" class="btn btn-sm btn-default">
-                <i class="fa fa-pencil"></i>
-                Edit this page
-            </a>
-        </div>
-    {% endif %}
-    <h2>{{ page.title }}</h2>
-
-    <div class="page-content">
-        {{ page.body_html|safe }}
-    </div>
-
-{% endblock %}
diff --git a/pinaxcon/templates/pinax/pages/page_edit.html b/pinaxcon/templates/pinax/pages/page_edit.html
deleted file mode 100644
index ced154ed519dbe6b4214ef4dd3e1d2f7482694ef..0000000000000000000000000000000000000000
--- a/pinaxcon/templates/pinax/pages/page_edit.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends "site_base.html" %}
-
-{% load sitetree %}
-{% load i18n %}
-{% load bootstrap %}
-
-{% block body_class %}cms-page{% endblock %}
-
-{% block head_title %}Create Page{% endblock %}
-
-{% block page_title %}{% trans "Edit page at:" %} {{ path }}{% endblock %}
-{% block breadcrumbs %}{% sitetree_breadcrumbs from "main" %}{% endblock %}
-
-{% block body %}
-    <form method="POST" action="">
-        {% csrf_token %}
-        {{ form|bootstrap }}
-        <div class="form-actions">
-            <input class="btn btn-primary" type="submit" value="Save" />
-        </div>
-    </form>
-{% endblock %}
diff --git a/pinaxcon/templates/static_pages/about/north-bay-python.html b/pinaxcon/templates/static_pages/about/north_bay_python.html
similarity index 100%
rename from pinaxcon/templates/static_pages/about/north-bay-python.html
rename to pinaxcon/templates/static_pages/about/north_bay_python.html
diff --git a/pinaxcon/templates/static_pages/code-of-conduct/code-of-conduct.html b/pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.html
similarity index 83%
rename from pinaxcon/templates/static_pages/code-of-conduct/code-of-conduct.html
rename to pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.html
index 216d712b8361eda03699734b938a42fc3dab76f3..b75861623739ab3b488e5299b012d89df1e32d37 100644
--- a/pinaxcon/templates/static_pages/code-of-conduct/code-of-conduct.html
+++ b/pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.html
@@ -12,7 +12,7 @@
 {% block content %}
   {% markdown %}
 
-{% include "static_pages/code-of-conduct/code-of-conduct.md" %}
+{% include "static_pages/code_of_conduct/code_of_conduct.md" %}
 
   {% endmarkdown %}
 {% endblock %}
diff --git a/pinaxcon/templates/static_pages/code-of-conduct/code-of-conduct.md b/pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.md
similarity index 100%
rename from pinaxcon/templates/static_pages/code-of-conduct/code-of-conduct.md
rename to pinaxcon/templates/static_pages/code_of_conduct/code_of_conduct.md
diff --git a/pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-attendee.html b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.html
similarity index 85%
rename from pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-attendee.html
rename to pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.html
index 8a9bf80e45428c37d8d31f1ec20907f5d6abdcbc..3384b7b22506be52d23944cd3b97f6c91fb5bd08 100644
--- a/pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-attendee.html
+++ b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.html
@@ -12,7 +12,7 @@
 {% block content %}
   {% markdown %}
 
-{% include "static_pages/code-of-conduct/harassment-procedure-attendee.md" %}
+{% include "static_pages/code_of_conduct/harassment_procedure_attendee.md" %}
 
   {% endmarkdown %}
 {% endblock %}
diff --git a/pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-attendee.md b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.md
similarity index 100%
rename from pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-attendee.md
rename to pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_attendee.md
diff --git a/pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-staff.html b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.html
similarity index 85%
rename from pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-staff.html
rename to pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.html
index 5a1510799b930ad4925bf1b765e84e209c04adce..caadaabfa5e0456a3ebbd3d1187d36f4350aae12 100644
--- a/pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-staff.html
+++ b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.html
@@ -12,7 +12,7 @@
 {% block content %}
   {% markdown %}
 
-{% include "static_pages/code-of-conduct/harassment-procedure-staff.md" %}
+{% include "static_pages/code_of_conduct/harassment_procedure_staff.md" %}
 
   {% endmarkdown %}
 {% endblock %}
diff --git a/pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-staff.md b/pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.md
similarity index 100%
rename from pinaxcon/templates/static_pages/code-of-conduct/harassment-procedure-staff.md
rename to pinaxcon/templates/static_pages/code_of_conduct/harassment_procedure_staff.md
diff --git a/pinaxcon/templates/static_pages/news.html b/pinaxcon/templates/static_pages/news.html
index bc0a04f3dd11a21ded4b0b6c304745a97e79105c..7eac9e4278c22b3133d9b68940c959b901621b4a 100644
--- a/pinaxcon/templates/static_pages/news.html
+++ b/pinaxcon/templates/static_pages/news.html
@@ -10,4 +10,7 @@
 
 {% block content %}
 
+  * conservancy press release
+  * CFP opening
+
 {% endblock %}
diff --git a/pinaxcon/templates/static_pages/program/call-for-proposals.html b/pinaxcon/templates/static_pages/program/call_for_proposals.html
similarity index 84%
rename from pinaxcon/templates/static_pages/program/call-for-proposals.html
rename to pinaxcon/templates/static_pages/program/call_for_proposals.html
index 0314240c3b0f9d70f9a24879c5171db22b1f78f2..4cb62e3d9a4ea5ab4110f3a96951bdd435afe488 100644
--- a/pinaxcon/templates/static_pages/program/call-for-proposals.html
+++ b/pinaxcon/templates/static_pages/program/call_for_proposals.html
@@ -12,7 +12,7 @@
 {% block content %}
   {% markdown %}
 
-{% include "static_pages/program/call-for-proposals.md" %}
+{% include "static_pages/program/call_for_proposals.md" %}
 
   {% endmarkdown %}
 {% endblock %}
diff --git a/pinaxcon/templates/static_pages/program/call-for-proposals.md b/pinaxcon/templates/static_pages/program/call_for_proposals.md
similarity index 100%
rename from pinaxcon/templates/static_pages/program/call-for-proposals.md
rename to pinaxcon/templates/static_pages/program/call_for_proposals.md
diff --git a/pinaxcon/templates/static_pages/program/selection-process.html b/pinaxcon/templates/static_pages/program/selection_process.html
similarity index 84%
rename from pinaxcon/templates/static_pages/program/selection-process.html
rename to pinaxcon/templates/static_pages/program/selection_process.html
index 7bec516f3239a17233207a87a3774407036ea7ee..4e3236fec332f7fc9030a2496ee8c24a27bdcaed 100644
--- a/pinaxcon/templates/static_pages/program/selection-process.html
+++ b/pinaxcon/templates/static_pages/program/selection_process.html
@@ -12,7 +12,7 @@
 {% block content %}
   {% markdown %}
 
-{% include "static_pages/program/selection-process.md" %}
+{% include "static_pages/program/selection_process.md" %}
 
   {% endmarkdown %}
 {% endblock %}
diff --git a/pinaxcon/templates/static_pages/program/selection-process.md b/pinaxcon/templates/static_pages/program/selection_process.md
similarity index 100%
rename from pinaxcon/templates/static_pages/program/selection-process.md
rename to pinaxcon/templates/static_pages/program/selection_process.md
diff --git a/pinaxcon/templates/static_pages/sponsors/become-a-sponsor.html b/pinaxcon/templates/static_pages/sponsors/become-a-sponsor.html
deleted file mode 100644
index 48361d5cf0c0eca7f09ce63aae5e96bd9ed56c37..0000000000000000000000000000000000000000
--- a/pinaxcon/templates/static_pages/sponsors/become-a-sponsor.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "page_with_title_and_lede.html" %}
-
-{% load i18n %}
-
-{% block head_title %}Become a Sponsors{% endblock %}
-
-{% block heading %}Become a Sponsors{% endblock %}
-
-{% block body_class %}sponsors{% endblock %}
-
-{% block content %}
-
-{% endblock %}
diff --git a/pinaxcon/templates/static_pages/sponsors/become_a_sponsor.html b/pinaxcon/templates/static_pages/sponsors/become_a_sponsor.html
new file mode 100644
index 0000000000000000000000000000000000000000..cd43be2e7335ae7b4b7d0d10af30fbb988edd2a2
--- /dev/null
+++ b/pinaxcon/templates/static_pages/sponsors/become_a_sponsor.html
@@ -0,0 +1,43 @@
+{% extends "page_with_title_and_lede.html" %}
+
+{% load i18n %}
+
+{% block head_title %}Become a Sponsor{% endblock %}
+
+{% block heading %}Become a Sponsor{% endblock %}
+
+{% block body_class %}sponsors{% endblock %}
+
+{% block content %}
+
+<p>Our sponsors help put this conference on. Our base costs, including our venue, printing, web hosting, and more, are all funded through sponsorship.</p>
+
+<p>In return, we offer complimentary corporate level tickets, a chance to talk about your company on our main stage, floor space in the lobby to display your free-standing banners, and as much praise as we can deliver in front of 400 grateful Pythonistas.</p>
+
+<p>Below is an overview of sponsorship levels. Please see our <a href="/sponsors/prospectus">prospectus</a> or contact <a href="mailto:sponsor@northbaypython.org">sponsor@northbaypython.org</a> for additional details.</p>
+
+<h2>Package Sponsorship</h2>
+
+<p>Package sponsorships are the widest-reaching and best value sponsorships we offer at North Bay Python. When our attendees arrive at the venue, they'll see your signage as they walk through the door. As they're sitting in the theatre, they'll see your logo on the backdrop behind the speakers, and on-screen on between talks. You'll also get the chance to present a short talk about your organization between two of our invited presentations.</p>
+
+<h2>À la Carte Sponsorship</h2>
+
+<p>If you're looking for something a bit more exclusive, North Bay Python's À la Carte sponsorships allow you to promote your organization as part of an important offering during the conference, including lanyards, catering, or video branding. We'll also recognize you as a Silver package sponsor, with the opportunity for discounted upgrades to higher package tiers.</p>
+
+<h2>In-Kind Partnerships</h2>
+
+<p>Sponsorship can also be in the form of in-kind donations of goods and services essential to organizing the conference, or in assisting speakers to attend the conference. If you can make a substantial in-kind donation, we will recognize you as a package-level sponsor of equivalent value.</p>
+
+<h2>Community Partnerships</h2>
+
+<p>Community groups, such as Python Meetups and PyLadies groups, are the lifeblood of the Python community, and we need your help to put on the best conference we can. If you can help us with one of the following, we'll recognize you as a community partner, which comes with all of the benefits of a Silver sponsorship.</p>
+
+<ul>
+  <li>You help us find 10 submissions to our Call for Proposals</li>
+  <li>Three members of your group attend at a Supporter level or higher</li>
+  <li>You put us in contact with a sponsor who signs on at Silver level or above</li>
+  <li>One of your members volunteers with the conference</li>
+  <li>Anything else that we agree will make our conference even better</li>
+</ul>
+
+{% endblock %}
diff --git a/pinaxcon/templates/static_pages/terms-and-conditions.html b/pinaxcon/templates/static_pages/terms_and_conditions.html
similarity index 100%
rename from pinaxcon/templates/static_pages/terms-and-conditions.html
rename to pinaxcon/templates/static_pages/terms_and_conditions.html
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index 9fff7c729cb0ff440a5536b0fddce979b7c5167b..49b3b2bd1cb8d3ea5eb44abcfd2693f82b420e56 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -13,7 +13,7 @@ urlpatterns = [
 
     # about
     # TODO add /about
-    url(r"^about/north-bay-python$", TemplateView.as_view(template_name="static_pages/about/north-bay-python.html"), name="about/north-bay-python"),
+    url(r"^about/north-bay-python$", TemplateView.as_view(template_name="static_pages/about/north_bay_python.html"), name="about/north-bay-python"),
     # TODO add /about/the-mystic
     # TODO add /about/petaluma
     url(r"^about/team$", TemplateView.as_view(template_name="static_pages/about/team.html"), name="about/team"),
@@ -23,8 +23,8 @@ urlpatterns = [
     # TODO add /program
     # TODO add /program/sessions
     # TODO add /program/events
-    url(r"^program/call-for-proposals$", TemplateView.as_view(template_name="static_pages/program/call-for-proposals.html"), name="program/call-for-proposals"),
-    url(r"^program/selection-process$", TemplateView.as_view(template_name="static_pages/program/selection-process.html"), name="program/selection-process"),
+    url(r"^program/call-for-proposals$", TemplateView.as_view(template_name="static_pages/program/call_for_proposals.html"), name="program/call-for-proposals"),
+    url(r"^program/selection-process$", TemplateView.as_view(template_name="static_pages/program/selection_process.html"), name="program/selection-process"),
 
     # attend
     # TODO add /attend
@@ -34,14 +34,14 @@ urlpatterns = [
     # TODO add /attend/how-to-pitch-your-manager
     # TODO add /attend/how-to-get-here
     # TODO add /attend/where-to-stay
-    url(r"^code-of-conduct$", TemplateView.as_view(template_name="static_pages/code-of-conduct/code-of-conduct.html"), name="code-of-conduct"),
-    url(r"^code-of-conduct/harassment-incidents$", TemplateView.as_view(template_name="static_pages/code-of-conduct/harassment-procedure-attendee.html"), name="code-of-conduct/harassment-incidents"),
-    url(r"^code-of-conduct/harassment-staff-procedures$", TemplateView.as_view(template_name="static_pages/code-of-conduct/harassment-procedure-staff.html"), name="code-of-conduct/harassment-staff-procedures"),
-    url(r"^terms-and-conditions$", TemplateView.as_view(template_name="static_pages/terms-and-conditions.html"), name="terms-and-conditions"),
+    url(r"^code-of-conduct$", TemplateView.as_view(template_name="static_pages/code_of_conduct/code_of_conduct.html"), name="code-of-conduct"),
+    url(r"^code-of-conduct/harassment-incidents$", TemplateView.as_view(template_name="static_pages/code_of_conduct/harassment_procedure_attendee.html"), name="code-of-conduct/harassment-incidents"),
+    url(r"^code-of-conduct/harassment-staff-procedures$", TemplateView.as_view(template_name="static_pages/code_of_conduct/harassment_procedure_staff.html"), name="code-of-conduct/harassment-staff-procedures"),
+    url(r"^terms-and-conditions$", TemplateView.as_view(template_name="static_pages/terms_and_conditions.html"), name="terms-and-conditions"),
 
     # sponsor
     # TODO add /sponsors
-    url(r"^sponsors/become-a-sponsor$", TemplateView.as_view(template_name="static_pages/sponsors/become-a-sponsor.html"), name="sponsors/become-a-sponsor"),
+    url(r"^sponsors/become-a-sponsor$", TemplateView.as_view(template_name="static_pages/sponsors/become_a_sponsor.html"), name="sponsors/become-a-sponsor"),
 
     # news
     url(r"^news$", TemplateView.as_view(template_name="static_pages/news.html"), name="news"),
diff --git a/static/scss/custom.scss b/static/scss/custom.scss
index fc5ae9dbca17415445fd53e440c2a3168bdf5443..5a92266f186167d2295abdcfc14d0203b85383d0 100644
--- a/static/scss/custom.scss
+++ b/static/scss/custom.scss
@@ -52,3 +52,19 @@ body.reviews.voting-status {
         box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
     }
 }
+
+#accountLogOutForm {
+    display: none;
+}
+
+.sponsor-list h3 {
+    margin-top: 3em;
+}
+
+.sponsor-list > div {
+    margin: 10px 0;
+}
+
+
+
+