diff --git a/pinaxcon/templates/_form_btns.html b/pinaxcon/templates/_form_btns.html
index a38a9ce7ec652c85342a6c07e1472a6acc38342a..00a0ca25c8344719de7dfe9a111da1bf978e13d7 100644
--- a/pinaxcon/templates/_form_btns.html
+++ b/pinaxcon/templates/_form_btns.html
@@ -1,2 +1,2 @@
 <input class="btn btn-primary" type="submit" value="Save" />
-          <a class="btn btn-default" href="{% url "dashboard" %}">Cancel</a>
\ No newline at end of file
+<a class="btn btn-default" href="{% url "dashboard" %}">Cancel</a>
\ No newline at end of file
diff --git a/pinaxcon/templates/symposion/proposals/_proposal_fields.html b/pinaxcon/templates/symposion/proposals/_proposal_fields.html
index 46449e50b396e6b5634cc90db79d92f0028e04fc..78ba6ac5852d4e368bbddac846b9c24ecdaecebd 100644
--- a/pinaxcon/templates/symposion/proposals/_proposal_fields.html
+++ b/pinaxcon/templates/symposion/proposals/_proposal_fields.html
@@ -1,236 +1,249 @@
 {% load i18n %}
 {% load lca2018_tags %}
 
-    <div>
-      <label class="col-sm-2 col-lg-2">Withdrawn</label>
-      <div class="col-sm-10 col-lg-10">
-          {% if proposal.cancelled %}
-            <p class="label-danger">WITHDRAWN</p>
-          {% else %}
-            <p class="label-success">Not withdrawn</p>
-          {% endif %}
-      </div>
-    </div>
-
-    <div>
-      <label class="col-sm-2 col-lg-2">Submitted by</label>
-      <div class="col-sm-10 col-lg-10">
-        <p>{{ proposal.speaker }} &lt;{{ proposal.speaker.email }}&gt;</p>
-      </div>
-    </div>
-
-    <div>
-      <label class="col-sm-2 col-lg-2">Proposal Type</label>
-      <div class="col-sm-10 col-lg-10">
-        <p>{{ proposal.kind.name|capfirst }}</p>
-      </div>
-    </div>
-
-    <div>
-      <label class="col-sm-2 col-lg-2">Target Audience</label>
-      <div class="col-sm-10 col-lg-10">
-        <p>{{ proposal.get_target_audience_display }}&nbsp;</p>
-      </div>
-    </div>
-
-    {% if proposal.talk_format %}
-    <div>
-      <label class="col-sm-2 col-lg-2">Talk Format</label>
-      <div class="col-sm-10 col-lg-10">
-          <p>{{ proposal.get_talk_format_display }}</p>
-      </div>
-    </div>
+<div class="row my-4">
+  <h2 class="col-12">
+    Details
+  </h2>
+</div>
+
+<div class="row">
+  <label class="list-label col-md-2">Withdrawn</label>
+  <div class="col-md-10">
+    {% if proposal.cancelled %}
+    <p class="label-danger">WITHDRAWN</p>
+    {% else %}
+    <p class="label-success">Not withdrawn</p>
     {% endif %}
-
-    {% if proposal.can_exhibit %}
-    <div>
-      <label class="col-sm-2 col-lg-2">Can exhibit?</label>
-      <div class="col-sm-10 col-lg-10">
-          <p>{{ proposal.get_can_exhibit_display }}</p>
-      </div>
-      <div>
-      <label class="col-sm-2 col-lg-2">Exhibition Requirements</label>
-      <div class="col-sm-10 col-lg-10">
-          {% if proposal.exhibition_requirements %}
-            <div class="special_requirements monospace-text">{{ proposal.exhibition_requirements|safe }}</div>
-          {% else %}
-            <div class="special_requirements monospace-text"><b>No Special Talk Requirements Requested</b></div>
-          {% endif %}
+  </div>
+</div>
+
+<div class="row">
+  <label class="list-label col-md-2">Submitted by</label>
+  <div class="col-md-10">
+    <p>{{ proposal.speaker }} &lt;{{ proposal.speaker.email }}&gt;</p>
+  </div>
+</div>
+
+<div class="row">
+  <label class="list-label col-md-2">Proposal Type</label>
+  <div class="col-md-10">
+    <p>{{ proposal.kind.name|capfirst }}</p>
+  </div>
+</div>
+
+<div class="row">
+  <label class="list-label col-md-2">Target Audience</label>
+  <div class="col-md-10">
+    <p>{{ proposal.get_target_audience_display }}&nbsp;</p>
+  </div>
+</div>
+
+{% if proposal.talk_format %}
+<div class="row">
+  <label class="list-label col-md-2">Talk Format</label>
+  <div class="col-md-10">
+    <p>{{ proposal.get_talk_format_display }}</p>
+  </div>
+</div>
+{% endif %}
+
+{% if proposal.can_exhibit %}
+<div class="row">
+  <label class="list-label col-md-2">Can exhibit?</label>
+  <div class="col-md-10">
+    <p>{{ proposal.get_can_exhibit_display }}</p>
+  </div>
+  <div>
+    <label class="list-label col-md-2">Exhibition Requirements</label>
+    <div class="col-md-10">
+      {% if proposal.exhibition_requirements %}
+      <div class="special_requirements monospace-text">{{ proposal.exhibition_requirements|safe }}</div>
+      {% else %}
+      <div class="special_requirements monospace-text"><b>No Special Talk Requirements Requested</b></div>
+      {% endif %}
       
-      </div>
-      &nbsp;
-    </div>
-
     </div>
+    &nbsp;
+  </div>
+</div>
+{% endif %}
+
+{% if proposal.additional_speakers.all %}
+<div class="row">
+  <label class="list-label col-md-2">Additional Speakers</label>
+  <div class="col-md-10">
+    <table class="table">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>Email</th>
+          <th>Status</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for speaker in proposal.additional_speakers.all %}
+        <tr>
+          {% if speaker.user %}
+          <td>{{ speaker.name }}</td>
+          <td>{{ speaker.email }}</td>
+          <td>Joined</td>
+          {% else %}
+          <td>Unknown</td>
+          <td>{{ speaker.email }}</td>
+          <td>Invitation Sent</td>
+          {% endif %}
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+</div>
+{% endif %}
+
+<div class="row">
+  <label class="list-label col-md-2">Abstract</label>
+  <div class="col-md-10">
+    <div class="abstract monospace-text well">{{ proposal.abstract_html|safe }}&nbsp;</div>
+    <p></p>
+  </div>
+</div>
+
+<div class="row">
+  <label class="list-label col-md-2">Private Abstract</label>
+  <div class="col-md-10">
+    <div class="private_abstract monospace-text well">{{ proposal.private_abstract_html|safe }}&nbsp;</div>
+    <p></p>
+  </div>
+</div>
+
+<div class="row">
+  <label class="list-label col-md-2">Project</label>
+  <div class="col-md-10">
+    {% if proposal.project %}
+    <p>{{ proposal.project|safe }}&nbsp;</p>
+    {% else %}
+    <p><b>None Provided</b></p>
     {% endif %}
-
-    {% if proposal.additional_speakers.all %}
-      <div>
-        <label class="col-sm-2 col-lg-2">Additional Speakers</label>
-        <div class="col-sm-10 col-lg-10">
-          <table class="table">
-            <thead>
-              <tr>
-                <th>Name</th>
-                <th>Email</th>
-                <th>Status</th>
-              </tr>
-            </thead>
-            <tbody>
-              {% for speaker in proposal.additional_speakers.all %}
-                <tr>
-                  {% if speaker.user %}
-                    <td>{{ speaker.name }}</td>
-                    <td>{{ speaker.email }}</td>
-                    <td>Joined</td>
-                  {% else %}
-                    <td>Unknown</td>
-                    <td>{{ speaker.email }}</td>
-                    <td>Invitation Sent</td>
-                  {% endif %}
-               </tr>
-              {% endfor %}
-            </tbody>
-          </table>
-        </div>
-      </div>
-      <p></p>
+  </div>
+</div>
+
+<div class="row">
+  <label class="list-label col-md-2">Project URL</label>
+  <div class="col-md-10">
+    {% if proposal.project_url %}
+    <p><a href="{{ proposal.project_url|safe }}">{{ proposal.project_url|safe }}</a>&nbsp;</p>
+    {% else %}
+    <p><b>None Provided</b></p>
     {% endif %}
-
-    <div>
-      <label class="col-sm-2 col-lg-2">Abstract</label>
-      <div class="col-sm-10 col-lg-10">
-        <div class="abstract monospace-text well">{{ proposal.abstract_html|safe }}&nbsp;</div>
-        <p></p>
-      </div>
-    </div>
-
-    <div>
-      <label class="col-sm-2 col-lg-2">Private Abstract</label>
-      <div class="col-sm-10 col-lg-10">
-        <div class="private_abstract monospace-text well">{{ proposal.private_abstract_html|safe }}&nbsp;</div>
-        <p></p>
-      </div>
-    </div>
-
-    <div>
-      <label class="col-sm-2 col-lg-2">Project</label>
-      <div class="col-sm-10 col-lg-10">
-        {% if proposal.project %}
-          <p>{{ proposal.project|safe }}&nbsp;</p>
-        {% else %}
-          <p><b>None Provided</b></p>
-        {% endif %}
-      </div>
+  </div>
+</div>
+
+<div class="row">
+  <label class="list-label col-md-2">Video URL</label>
+  <div class="col-md-10">
+    {% if proposal.video_url %}
+    <p><a href="{{ proposal.video_url|safe }}">{{ proposal.video_url|safe }}</a>&nbsp;</p>
+    {% else %}
+    <p><b>None Provided</b></p>
+    {% endif %}
+  </div>
+</div>
+
+<div class="row">
+  <label class="list-label col-md-2">Special Requirements</label>
+  <div class="col-md-10">
+    {% if proposal.technical_requirements_html %}
+    <div class="special_requirements monospace-text">{{ proposal.technical_requirements_html|safe }}</div>
+    {% else %}
+    <div class="special_requirements monospace-text"><b>No Special Talk Requirements Requested</b></div>
+    {% endif %}
+  </div>
+</div>
+
+<div class="row">
+  <label class="list-label col-md-2">Recording Release</label>
+  <div class="col-md-10">
+    <p>{{ proposal.recording_release }}&nbsp;</p>
+  </div>
+</div>
+
+<div class="row">
+  <label class="list-label col-md-2">Materials Release</label>
+  <div class="col-md-10">
+    <p>{{ proposal.materials_release }}&nbsp;</p>
+  </div>
+</div>
+
+<div class="row my-4">
+  <h2 class="col-12">
+    Speakers
+  </h2>
+</div>
+
+{% for speaker in proposal.speakers %}
+{% if speaker.name %}
+<div class="card card-default my-3">
+  <div class="card-header">
+    <h3 class="card-title">{{ speaker.name }}</h3>
+  </div>
+  <div class="card-body">
+    <div class="row">
+      <label class="list-label col-md-2">Biography</label>
+      <div class="col-md-10 well monospace-text">{{ speaker.biography_html|safe }}&nbsp;</div>
     </div>
-
-    <div>
-      <label class="col-sm-2 col-lg-2">Project URL</label>
-      <div class="col-sm-10 col-lg-10">
-        {% if proposal.project_url %}
-          <p><a href="{{ proposal.project_url|safe }}">{{ proposal.project_url|safe }}</a>&nbsp;</p>
-        {% else %}
-          <p><b>None Provided</b></p>
-        {% endif %}
-      </div>
+    <div class="row">
+      <label class="list-label col-md-2">Experience</label>
+      <div class="col-md-10 well monospace-text">{{ speaker.experience_html|safe }}&nbsp;</div>
     </div>
-
-    <div>
-      <label class="col-sm-2 col-lg-2">Video URL</label>
-      <div class="col-sm-10 col-lg-10">
-        {% if proposal.video_url %}
-          <p><a href="{{ proposal.video_url|safe }}">{{ proposal.video_url|safe }}</a>&nbsp;</p>
-        {% else %}
-          <p><b>None Provided</b></p>
-        {% endif %}
-      </div>
+    {% if speaker.accessibility_html %}
+    <div class="row">
+      <label class="list-label col-md-2">Accessibility Requirements</label>
+      <div class="col-md-10 well monospace-text">{{ speaker.accessibility_html|safe }}&nbsp;</div>
     </div>
-
-    <div>
-      <label class="col-sm-2 col-lg-2">Special Requirements</label>
-      <div class="col-sm-10 col-lg-10">
-        {% if proposal.technical_requirements_html %}
-          <div class="special_requirements monospace-text">{{ proposal.technical_requirements_html|safe }}</div>
-        {% else %}
-          <div class="special_requirements monospace-text"><b>No Special Talk Requirements Requested</b></div>
-        {% endif %}
-      </div>
-      &nbsp;
-    </div>
-    <br/>
-
-    {% for speaker in proposal.speakers %}
-      {% if speaker.name %}
-        <div class="panel panel-default">
-          <div class="panel-heading">
-            <h3 class="panel-title">Speaker: {{ speaker.name }}</h3>
-          </div>
-          <div class="panel-body">
-            <div>
-              <label class="col-sm-2 col-lg-2">Biography</label>
-              <div class="col-sm-10 col-lg-10 well monospace-text">{{ speaker.biography_html|safe }}&nbsp;</div>
-            </div>
-            <div>
-              <label class="col-sm-2 col-lg-2">Experience</label>
-              <div class="col-sm-10 col-lg-10 well monospace-text">{{ speaker.experience_html|safe }}&nbsp;</div>
-            </div>
-            {% if speaker.accessibility_html %}
-              <div>
-                <label class="col-sm-2 col-lg-2">Accessibility Requirements</label>
-                <div class="col-sm-10 col-lg-10 well monospace-text">{{ speaker.accessibility_html|safe }}&nbsp;</div>
-              </div>
-            {% endif %}
-          </div>
-        </div>
-      {% endif %}
-    {% endfor %}
-
-    {% can_manage proposal as can_manage_proposal %}
-    {% if can_manage_proposal or request.user.speaker_profile in proposal.speakers %}
-      <div>
-        <label class="col-sm-2 col-lg-2">Travel Assistance Required</label>
-        <div class="col-sm-10 col-lg-10">
-          <table class="table">
-            <thead>
-              <tr>
-                <th>Name</th>
-                <th>Travel</th>
-                <th>Accomodation</th>
-              </tr>
-            </thead>
-            <tbody>
-              {% for speaker in proposal.speakers %}
-                <tr>
-                  {% if speaker.user %}
-                    <td>{{ speaker.name }}</td>
-                    <td>{{ speaker.travel_assistance }}</td>
-                    <td>{{ speaker.accommodation_assistance }}</td>
-                  {% else %}
-                    <td><b>Unconfirmed co-presenter</b></td>
-                    <td><b>Unknown</b></td>
-                    <td><b>Unknown</b></td>
-                  {% endif %}
-                </tr>
-              {% endfor %}
-            </tbody>
-          </table>
-        </div>
-      </div>
-      <br />
     {% endif %}
-
-    <div>
-      <label class="col-sm-2 col-lg-2">Recording Release</label>
-      <div class="col-sm-10 col-lg-10">
-        <p>{{ proposal.recording_release }}&nbsp;</p>
-      </div>
-      &nbsp;
-    </div>
-
-    <div>
-      <label class="col-sm-2 col-lg-2">Materials Release</label>
-      <div class="col-sm-10 col-lg-10">
-        <p>{{ proposal.materials_release }}&nbsp;</p>
-      </div>
-      &nbsp;
-    </div>
+  </div>
+</div>
+{% endif %}
+{% endfor %}
+
+{% can_manage proposal as can_manage_proposal %}
+{% if can_manage_proposal or request.user.speaker_profile in proposal.speakers %}
+
+<div class="row my-4">
+  <h2 class="col-12">
+    Travel Assistance
+  </h2>
+</div>
+
+
+<div class="row">
+  <div class="col-12">
+    <table class="table">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>Travel</th>
+          <th>Accomodation</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for speaker in proposal.speakers %}
+        <tr>
+          {% if speaker.user %}
+          <td>{{ speaker.name }}</td>
+          <td>{{ speaker.travel_assistance }}</td>
+          <td>{{ speaker.accommodation_assistance }}</td>
+          {% else %}
+          <td><b>Unconfirmed co-presenter</b></td>
+          <td><b>Unknown</b></td>
+          <td><b>Unknown</b></td>
+          {% endif %}
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+</div>
+<br />
+{% endif %}
diff --git a/pinaxcon/templates/symposion/proposals/_proposal_row.html b/pinaxcon/templates/symposion/proposals/_proposal_row.html
index bea1451d279b2dc185e0ad4e0c74b471ca6a7db5..0cd8c4acc4ac828e4d5049ab22823a4d020ad286 100644
--- a/pinaxcon/templates/symposion/proposals/_proposal_row.html
+++ b/pinaxcon/templates/symposion/proposals/_proposal_row.html
@@ -1,13 +1,12 @@
-  <!-- {% if proposal.result.status == "accepted" %}
-    <div class="card card-success mx-4">
+  {% if proposal.result.status == "accepted" %}
+    <div class="card card-success border-primary mx-4 my-4">
   {% elif proposal.result.status == "rejected" %}
-    <div class="card card-danger mx-4">
+    <div class="card card-danger border-primary mx-4 my-4">
   {% elif proposal.result.status == "standby" %}
-    <div class="card card-warning mx-4">
+    <div class="card card-warning border-primary mx-4 my-4">
   {% else %}
-    <div class="card card-primary mx-4">
-  {% endif %} -->
-    <div class="card border-primary">
+    <div class="card card-primary border-primary mx-4 my-4">
+  {% endif %}
       <div class="card-body">
         <h4 class="card-title text-primary">
           {{ proposal.title }} 
diff --git a/pinaxcon/templates/symposion/proposals/base.html b/pinaxcon/templates/symposion/proposals/base.html
index 43cef910b9cbde8f69ccd6a1b8cbc509261a4f4c..999a0e9dddd3c3ba8e66d8fc8505ad58b4244d36 100644
--- a/pinaxcon/templates/symposion/proposals/base.html
+++ b/pinaxcon/templates/symposion/proposals/base.html
@@ -2,15 +2,8 @@
 {% load staticfiles %}
 
 
-{% block utility_body_outer %}
-{% block proposals_body_outer %}
-  <div class="l-content-page">
-    <div class="l-content-page--richtext">
-      {% block utility_body %}
-        {% block proposals_body %}
-        {% endblock %}
-      {% endblock %}
-    </div>
-  </div>
-{% endblock %}
+{% block utility_body %}
+  {% block proposals_body %}
+  {% endblock %}
 {% endblock %}
+
diff --git a/pinaxcon/templates/symposion/proposals/proposal_detail.html b/pinaxcon/templates/symposion/proposals/proposal_detail.html
index 0d8c85fd9ea0092fa1ab94d3a3e34384269de857..1768d0d1bff7072fdc5ad1247a063034b90a4c55 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_detail.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_detail.html
@@ -5,18 +5,17 @@
 {% block head_title %}{{ proposal.title }}{% endblock %}
 {% block page_title %}#{{ proposal.number }}: {{ proposal.title }} ({{ proposal.speaker }}){% endblock %}
 
-{% block proposals_body_outer %}
-  <div class="tabbable">
-    <ul class="nav nav-tabs">
-      <li class="active"><a href="#proposal-detail" data-toggle="tab">{% trans "Proposal Details" %}</a></li>
-      <li><a href="#supporting-document" data-toggle="tab">{% trans "Supporting Documents" %}</a></li>
-      <li><a href="#reviewer-feedback" data-toggle="tab">{% trans "Reviewer Feedback" %} ({{ proposal.messages.all|length }})</a></li>
+{% block proposals_body %}
+  <div>
+    <ul class="nav nav-pills mb-5">
+      <li class="nav-item"><a class="nav-link active" href="#proposal-detail" data-toggle="tab">{% trans "Proposal Details" %}</a></li>
+      <li class="nav-item"><a class="nav-link" href="#supporting-document" data-toggle="tab">{% trans "Supporting Documents" %}</a></li>
+      <li class="nav-item"><a class="nav-link" href="#reviewer-feedback" data-toggle="tab">{% trans "Reviewer Feedback" %} ({{ proposal.messages.all|length }})</a></li>
     </ul>
 
     <div class="tab-content">
       <div class="tab-pane active" id="proposal-detail">
         {% include "symposion/proposals/_proposal_fields.html" %}
-        <div class="btn-group">
           {% if not proposal.cancelled %}
             {% if request.user == proposal.speaker.user %}
               <a class="btn btn-lg btn-primary" href="{% url "proposal_edit" proposal.pk %}">{% trans "Edit this proposal" %}</a>
@@ -28,11 +27,13 @@
           {% else %}
             {% trans 'Cancelled' %}
           {% endif %}
-        </div>
       </div>
 
       <div class="tab-pane" id="supporting-document">
-        {% if proposal.supporting_documents.exists %}
+        <div class="row">
+          <div class="col-12">
+            <h2 class="my-4">Documents</h2>
+            {% if proposal.supporting_documents.exists %}
           <table class="table table-striped">
             {% for document in proposal.supporting_documents.all %}
               <tr>
@@ -46,26 +47,35 @@
               </tr>
             {% endfor %}
           </table>
-        {% else %}
+          {% else %}
           <p>{% trans 'No supporting documents attached to this proposal.' %}</p>
-        {% endif %}
-        <a class="btn btn-default btn-sm{% if proposal.cancelled %} btn-disabled{% endif %}" href="{% url "proposal_document_create" proposal.pk %}"><i class="fa fa-upload"></i> {% trans 'Add Document' %}</a>
+           {% endif %}
+           <a class="btn btn-primary {% if proposal.cancelled %} btn-disabled{% endif %}" href="{% url "proposal_document_create" proposal.pk %}"><i class="fa fa-upload"></i> {% trans 'Add Document' %}</a>
+          </div>
+        </div>
+        
+        
       </div>
 
       <div class="tab-pane" id="reviewer-feedback">
-        <h3>{% trans 'Conversation with Reviewers' %}</h3>
+        <div class="row">
+          <div class="col-12">
+            <h2 class="my-4">{% trans 'Conversation with Reviewers' %}</h2>
+          </div>
+        </div>
+        
         {% for message in proposal.messages.all %}
-          <div class="panel panel-default">
-            <div class="panel-body">
+          <div class="card">
+            <div class="card-body">
               <div class="comment monospace-text"><em>{{ message.message|safe }}</em></div>
             </div>
-            <div class="panel-heading">
+            <div class="card-footer">
               <div><b>{{ message.user.username }}</b> {{ message.submitted_at|timesince }} ago</div>
             </div>
           </div>
           <br />
         {% endfor %}
-        <h3>{% trans 'Leave a Message' %}</h3>
+        <h3 class="my-4">{% trans 'Leave a Message' %}</h3>
         <p>{% trans 'You can leave a message for the reviewers here.' %}</p>
         <form class="form-horizontal" action="" method="POST" accept-charset="utf-8">
           {% csrf_token %}
diff --git a/pinaxcon/templates/symposion/proposals/proposal_edit.html b/pinaxcon/templates/symposion/proposals/proposal_edit.html
index 55095879da1d9e4a4b0f3b3f123a21654c70837e..4a6c5dac2c2c1939d2ff19e4805472d1d036ee76 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_edit.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_edit.html
@@ -10,10 +10,8 @@
       {% csrf_token %}
       <fieldset>
         {% include "_form_snippet.html" with form=form %}
-        <div class="btn-group">
-            <input class="btn btn-primary" type="submit" value="Save" />
-            <a class="btn btn-default" href="{% url "proposal_detail" proposal.pk %}">Cancel</a>
-        </div>
+        <input class="btn btn-primary" type="submit" value="Save" />
+        <a class="btn btn-default" href="{% url "proposal_detail" proposal.pk %}">Cancel</a>
       </fieldset>
 
   </form>
diff --git a/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html b/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html
index 4445933e1c5fb3a4a6e1734ce4878dc3d707b569..3e0dde29a062c20a4a98773e7549d2ed5822b964 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_speaker_manage.html
@@ -6,14 +6,7 @@
 {% block head_title %}{% trans 'Proposal:' %} {{ proposal.title }}{% endblock %}
 
 {% block proposals_body %}
-    <h1></h1>
-
-    <p>
-      <a href="{% url "proposal_edit" proposal.pk %}">{% trans 'Edit proposal' %}
-      </a>
-    </p>
-
-    <h3>{% trans 'Current Speakers' %}</h3>
+    <h2 class="my-5">{% trans 'Current Speakers' %}</h2>
 
     {% for speaker in speakers %}
         {% if speaker.user %}
@@ -23,15 +16,14 @@
         {% endif %}
     {% endfor %}
 
-    <h3>{% trans 'Add another speaker' %}</h3>
+    <h3 class="mt-5">{% trans 'Add another speaker' %}</h3>
 
     <form class="form-horizontal" method="POST" action="" enctype="multipart/form-data">
         {% csrf_token %}
         <fieldset>
           {% include "_form_snippet.html" with form=add_speaker_form %}
-          <div class="btn-group">
-              <input type="submit" value="Add speaker" class="btn btn-primary" />
-          </div>
+            <input type="submit" value="Add speaker" class="btn btn-primary"/>
+            <a href="{% url "proposal_edit" proposal.pk %}" class="btn btn-light">{% trans 'Cancel' %}
         </fieldset>
     </form>
 {% endblock %}
diff --git a/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html b/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html
index f96abfed21c69058d079b774701a468e5e2086fd..de212cff886581b239a3f4fca5809151a1b0ff14 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_submit_kind.html
@@ -13,11 +13,8 @@
           <p>
             You will be able to edit your proposal after it has been submitted. The program committee may ask questions, provide feedback, and even suggest changes to your proposal as part of the review processes.
           </p>
-          <div class="btn-group">
-            <input class="btn btn-primary" type="submit" name="finish" value="Save" />
-            <!-- <span style="float: right; padding: 4px 6px">or</span> -->
-            <input class="btn btn-default" type="submit" name="add-speakers" value="Save and Add Additional Speakers" />
-          </div>
+          <input class="btn btn-primary" type="submit" name="finish" value="Save" />
+          <input class="btn btn-default" type="submit" name="add-speakers" value="Save and Add Additional Speakers" />
         </fieldset>
     </form>
 {% endblock %}
diff --git a/static/src/scss/app.scss b/static/src/scss/app.scss
index 880feb4f99a1cea4dea8c99f697f478340e1ea4f..3abf9906eafb4ee7a29ec41353568bb590a43e0f 100644
--- a/static/src/scss/app.scss
+++ b/static/src/scss/app.scss
@@ -93,10 +93,6 @@ footer {
 li.nav-item {
     height: 2.75rem;
 
-    a.nav-link {
-        padding-top: 0;
-    }
-
     &.active > a.nav-link {
         font-weight: 700;
     
@@ -258,3 +254,15 @@ main {
 ul.messagelist {
     margin-bottom: 0;
 }
+
+label.list-label {
+    font-weight: bold;
+}
+
+.nav-pills>.nav-item {
+    background-color: #f3f3f3;
+
+    a {
+        color: $primary;
+    }
+}