diff --git a/get_together/templates/get_together/events/show_event.html b/get_together/templates/get_together/events/show_event.html
index a2edb2a..9f87372 100644
--- a/get_together/templates/get_together/events/show_event.html
+++ b/get_together/templates/get_together/events/show_event.html
@@ -96,7 +96,7 @@
 {% endblock %}
 
 {% block content %}
-<div class="fluid-container">
+<div class="fluid-container container-primary">
     <div class="row">
         <div class="col-md-9">
             {% if team.banner_img %}
@@ -156,28 +156,32 @@
             </p>
             {% endif %}
 
+            {% if event.summary %}
+            <div class="container container-secondary mt-3">
             <p>{{ event.summary|markdown }}</p>
+            </div>
+            {% endif %}
 
-            <table class="table">
+            <div class="container container-secondary mt-3">
             {% if event.parent %}
-            <tr>
-	            <td width="120px"><b>Part of:</b></td><td><a href="{{ event.parent.get_absolute_url }}" target="_blank">{{ event.parent.name }}</a></td>
-            </tr>
+            <div class="row mb-2">
+	            <div class="col-3" width="120px"><b>Part of:</b></div><div class="col-9"><a href="{{ event.parent.get_absolute_url }}" target="_blank">{{ event.parent.name }}</a></div>
+            </div>
             {% endif %}
             {% if event.series %}
-            <tr>
-	            <td width="120px"><b>Repeats:</b></td><td><a href="{{ event.series.get_absolute_url }}">
+            <div class="row mb-2">
+	            <div class="col-3" width="120px"><b>Repeats:</b></div><div class="col-9"><a href="{{ event.series.get_absolute_url }}">
                 {% for rule in event.series.recurrences.rrules %}
                 {{rule.to_text|capfirst}}
 	            {% endfor %}</a>
-            </td>
-            </tr>
+            </div>
+            </div>
             {% endif %}
-            <tr>
-	            <td width="120px"><b>Time:</b></td><td>{{ event.local_start_time }} - {{ event.local_end_time }}</td>
-            </tr>
-            <tr>
-	            <td width="120px"><b>Place:</b></td><td>
+            <div class="row mb-2">
+	            <div class="col-3" width="120px"><b>Time:</b></div><div class="col-9">{{ event.local_start_time }} - {{ event.local_end_time }}</div>
+            </div>
+            <div class="row mb-2">
+	            <div class="col-3" width="120px"><b>Place:</b></div><div class="col-9">
                       {% if event.place %}
                           <a class="" href="{% url 'show-place' event.place.id %}">{{ event.place.name }}</a>
                           {% if can_edit_event %}<a href="{% url 'add-place' event.id %}" class="btn btn-secondary btn-sm">Change</a>{% endif %}
@@ -186,18 +190,18 @@
                       {% else %}
                           No place selected yet.
                       {% endif %}
-	            </td>
-            </tr>
+	            </div>
+            </div>
             {% if event.web_url %}
-            <tr>
-	            <td width="120px"><b>Website:</b></td><td><a href="{{ event.web_url }}" target="_blank">{{ event.web_url }}</a></td>
-            </tr>
+            <div class="row mb-2">
+	            <div class="col-3" width="120px"><b>Website:</b></div><div class="col-9"><a href="{{ event.web_url }}" target="_blank">{{ event.web_url }}</a></div>
+            </div>
             {% endif %}
 
             {% if event.team.is_premium %}
-            <tr>
-	            <td width="120px"><b>Presentations:</b></td>
-                <td>
+            <div class="row mb-2">
+	            <div class="col-3" width="120px"><b>Presentations:</b></div>
+                <div class="col-9">
                     {% for presentation in presentation_list %}
                         <div><a href="{% url 'show-talk' presentation.talk.id %}">{{presentation.talk.title}}</a> by <a href="{% url 'show-speaker' presentation.talk.speaker.id %}">{{presentation.talk.speaker.user}}, {{presentation.talk.speaker.title}}</a></div>
                     {% endfor %}
@@ -207,14 +211,14 @@
                     {% if pending_presentations and can_edit_event %}
                     <a class="btn btn-success btn-sm" href="{% url 'schedule-event-talks' event.id %}">{{pending_presentations}} proposed talks</a>
                     {% endif %}
-                </td>
-            </tr>
+                </div>
+            </div>
             {% endif %}
-            </table>
+            </div>
 
-            <div class="container mt-3">
+            <div class="container container-secondary mt-3">
                 <div class="row">
-                    <div class="col"><hr/><h4>Comments</h4></div>
+                    <div class="col"><h4>Comments</h4></div>
                 </div>
                 <div class="row">
                     {% load mptt_tags %}
@@ -244,11 +248,11 @@
                             </div>
                         {% endrecursetree %}
                         {% if request.user.is_authenticated %}
-                        <div class="list-group-item pl-5">
+                        <div class="pl-5">
                         <form action="{% url 'comment-event' event.id %}" method="POST">
                             {% csrf_token %}
                             {{ comment_form.body }}
-                            <br/><button type="submit" class="btn btn-primary">Comment</button>
+                            <br/><button type="submit" class="btn btn-primary"><i class="pr-2 fa fa-comment"></i>Comment</button>
                         </form>
                         </div>
                         {% endif %}
@@ -258,7 +262,7 @@
         </div>
 
         <div class="col-md-3">
-            <div class="container">
+            <div class="container container-secondary mb-3">
                 {% if sponsor_count > 0 %}
                 <div class="row">
                     <div class="col"><h4>Sponsors</h4><hr/></div>
@@ -270,10 +274,11 @@
                     </div>
                 </div>
                 {% endfor %}
-                <div class="row mb-3"></div>
+            </div>
+            <div class="container container-secondary mb-3">
                 {% endif %}
                 <div class="row">
-                    <div class="col"><h4>Attendees ({{attendee_count}})</h4><hr/></div>
+                    <div class="col"><h4>Attendees ({{attendee_count}})</h4></div>
                 </div>
                 {% for attendee in attendee_list %}
                 <div class="row mb-3">
@@ -318,8 +323,10 @@
                     </div>
                 </div>
                 {% endfor %}
+            </div>
+            <div class="container container-secondary mb-3">
                 <div class="row">
-                    <div class="col"><hr/><h4>Photos</h4></div>
+                    <div class="col"><h4>Photos</h4></div>
                 </div>
                 <div class="row">
                 {% for photo in event.photos.all %}
@@ -340,7 +347,7 @@
                 </div>
                 {% if can_edit_event %}
                 <div class="row">
-                    <div class="col"><a class="btn btn-primary" href="{% url 'add-event-photo' event.id %}">Upload</a></div>
+                    <div class="col"><a class="btn btn-primary btn-sm" href="{% url 'add-event-photo' event.id %}"><i class="fa fa-upload"></i> Upload</a></div>
                 </div>
                 {% endif %}
             </div>