diff --git a/RIGS/templates/event_detail.html b/RIGS/templates/event_detail.html
index c7965434..a1de143d 100644
--- a/RIGS/templates/event_detail.html
+++ b/RIGS/templates/event_detail.html
@@ -62,12 +62,12 @@
                     <table class="table table-sm">
                         <thead>
                             <tr>
-                                <th scope="col">Crewmember</th>
+                                <th scope="col">Name</th>
                                 <th scope="col">Vehicle</th>
                                 <th scope="col">Start Time</th>
                                 <th scope="col">Role</th>
                                 <th scope="col">End Time</th>
-                                <th scope="col">{% if self.request.user.pk is form.event.mic.pk %}<a href="{% url 'event_checkin_override' event.pk %}" class="btn btn-sm btn-success"><span class="fas fa-plus"></span> Add</a>{% endif %}</th>
+                                <th scope="col">{% if request.user.pk is event.mic.pk %}<a href="{% url 'event_checkin_override' event.pk %}" class="btn btn-sm btn-success"><span class="fas fa-plus"></span> Add</a>{% endif %}</th>
                             </tr>
                         </thead>
                         <tbody id="crewmembers">
@@ -78,7 +78,7 @@
                                 <td>{{crew.time}}</td>
                                 <td>{{crew.role}}</td>
                                 <td>{% if crew.end_time %}{{crew.end_time}}{% else %}<span class="text-success fas fa-clock" data-toggle="tooltip" title="This person is currently checked into this event"></span>{% endif %}</td>
-                                <td>{% if crew.end_time %}{% if crew.person.pk == request.user.pk or crew.event.mic.pk == request.user.pk %}{% button 'edit' 'edit_checkin' crew.pk clazz='btn-sm modal-href' %}{% endif %}{%endif%}</td>
+                                <td>{% if crew.end_time %}{% if crew.person.pk == request.user.pk or event.mic.pk == request.user.pk %}{% button 'edit' 'edit_checkin' crew.pk clazz='btn-sm modal-href' %}{% endif %}{%endif%}</td>
                             </tr>
                             {% empty %}
                             <tr>
diff --git a/RIGS/templates/hs/eventcheckin_form.html b/RIGS/templates/hs/eventcheckin_form.html
index f1640158..f6c80995 100644
--- a/RIGS/templates/hs/eventcheckin_form.html
+++ b/RIGS/templates/hs/eventcheckin_form.html
@@ -55,12 +55,12 @@
             <div class="form-group">
                 <label for="{{ form.role.id_for_label }}" class="col col-form-label">Role</label>
                 <div class="row pl-3">
-                    <div class="col">
+                    <div class="col-md-6 col-sm-12">
                         <button type="button" class="btn btn-primary" onclick="document.getElementById('id_role').value='MIC'">MIC</button>
                         <button type="button" class="btn btn-danger" onclick="document.getElementById('id_role').value='Power MIC'">Power MIC</button>
                         <button type="button" class="btn btn-info" onclick="document.getElementById('id_role').value='Crew'">Crew</button>
                     </div>
-                    <div class="col">
+                    <div class="col-md-6 mt-2">
                         {% render_field form.role class+="form-control" placeholder="Other (enter text)" %}
                     </div>
                 </div>
@@ -68,11 +68,11 @@
             <div class="form-group">
                 <label for="{{ form.vehicle.id_for_label }}" class="col col-form-label">Vehicle (if applicable)</label>
                 <div class="row pl-3">
-                    <div class="col">
+                    <div class="col-md-6 col-sm-12">
                         <button type="button" class="btn btn-primary" onclick="document.getElementById('id_vehicle').value='Virgil'"><span class="fas fa-truck-moving"></span> Virgil</button>
                         <button type="button" class="btn btn-secondary" onclick="document.getElementById('id_vehicle').value='Virgil + Erms'"><span class="fas fa-trailer"></span><span class="fas fa-truck-moving"></span> Virgil + Erms</button>
                     </div>
-                    <div class="col">
+                    <div class="col-md-6 mt-2">
                         {% render_field form.vehicle class+="form-control" placeholder="Other (enter text)" %}
                     </div>
                 </div>
diff --git a/templates/index.html b/templates/index.html
index d53d130e..fb039286 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8,11 +8,13 @@
 <div class="row">
     <h1 class="col-sm-12 pb-3">R<small class="text-muted">ig</small> I<small class="text-muted">nformation</small> G<small class="text-muted">athering</small> S<small class="text-muted">ystem</small></h1>
     <h2 class="col-sm-12 pb-3">Welcome back {{ user.get_full_name }}, there {%if rig_count == 1 %}is one rig coming up{%else%}are {{ rig_count|apnumber }} rigs coming up.{%endif%}</h2>
+    {% if now %}
     <div class="col-sm-12 alert alert-primary rounded-0 mx-auto">
     {% for event in now %}
     Event {{ event }} is happening now! <a href="{% url 'event_checkin' event.pk %}" class="btn btn-success btn-sm modal-href align-baseline {% if request.user.current_event %}disabled{%endif%}"><span class="fas fa-user-clock"></span> <span class="d-none d-sm-inline">Check In</span></a><br/>
     {% endfor %}
     </div>
+    {% endif %}
     <div class="col-sm-4 mb-3">
         <div class="card">
             <img class="card-img-top d-none d-sm-block" src="{% static 'imgs/rigs.jpg' %}" alt="Some lights and haze, very purple" style="height: 150px; object-fit: cover;">
@@ -29,7 +31,6 @@
     </div>
     <div class="col-sm-4 mb-3">
         <div class="card">
-            {% now "m-d" as todays_date %}
             <img class="card-img-top d-none d-sm-block" src="{% if todays_date == '04-01' %}{% static 'imgs/tappytaptap.gif' %}{%else%}{% static 'imgs/assets.jpg' %}{%endif%}" alt="M32 sound desk close up of the faders" style="height: 150px; object-fit: cover;">
             <h4 class="card-header">Asset Database</h4>
             <div class="list-group list-group-flush">