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 %}