diff --git a/RIGS/templates/event_table.html b/RIGS/templates/event_table.html
index 1c390ebf..285d9bac 100644
--- a/RIGS/templates/event_table.html
+++ b/RIGS/templates/event_table.html
@@ -11,9 +11,10 @@
         </thead>
         <tbody>
         {% for event in events %}
+            <!---TODO: Red if all chips are red, amber if mixed, green if good to go + MIC...--->
             <tr class="
             {% if event.cancelled %}
-                text-muted
+                text-muted table-secondary
             {% elif not event.is_rig %}
                 info
             {% endif %}">
@@ -63,7 +64,6 @@
                         {% if event.dry_hire %}
                             <span class="badge badge-secondary">Dry Hire</span>
                         {% endif %}
-
                     </h4>
                     {% if event.is_rig and not event.cancelled %}
                         <h5>
@@ -87,17 +87,19 @@
                     {% endif %}
                 </td>
                 <!---MIC-->
-                <td class="text-center">
+                <td>
                     {% if event.mic %}
-                        "{{ event.mic.initials }}"
-                        <div>
+                        <div class="media">
                             {% if perms.RIGS.view_profile %}
                                 <a href="{% url 'profile_detail' event.mic.pk %}" class="modal-href">
-                                    <img src="{{ event.mic.profile_picture }}" class="event-mic-photo"/>
-                                </a>
-                            {% else %}
-                                <img src="{{ event.mic.profile_picture }}" class="event-mic-photo"/>
                             {% endif %}
+                                    <img src="{{ event.mic.profile_picture }}" class="event-mic-photo mr-3"/>
+                            {% if perms.RIGS.view_profile %}
+                                </a>
+                            {% endif %}
+                            <div class="media-body">
+                                <p>{{ event.mic.initials }}</p>
+                            </div>
                         </div>
                     {% elif event.is_rig %}
                         <span class="fas fa-exclamation"></span>
diff --git a/RIGS/templates/index.html b/RIGS/templates/index.html
index 032ec96e..64545609 100644
--- a/RIGS/templates/index.html
+++ b/RIGS/templates/index.html
@@ -16,28 +16,32 @@
     <div class="col-sm">
         <div class="card">
             <div class="card-header">
-                <h4 class="list-group-item-heading">RIGS</h4>
+                <h4 class="list-group-item-heading">Rigboard</h4>
             </div>
             <div class="list-group list-group-flush">
-                <a class="list-group-item" href="{% url 'rigboard' %}"><span class="fas fa-list"></span> Rigboard</a>
-                <a class="list-group-item" href="{% url 'web_calendar' %}"><span class="fas fa-calendar"></span> Calendar</a>
-                {% if perms.RIGS.add_event %}<a class="list-group-item" href="{% url 'event_create' %}"><span class="fas fa-plus"></span> New Event</a>{% endif %}
+                <a class="list-group-item list-group-item-action" href="{% url 'rigboard' %}"><i class="fas fa-list"></i> Rigboard</a>
+                <a class="list-group-item list-group-item-action" href="{% url 'web_calendar' %}"><i class="fas fa-calendar"></i> Calendar</a>
+                {% if perms.RIGS.add_event %}
+                    <a class="list-group-item list-group-item-action" href="{% url 'event_create' %}"><i class="fas fa-plus"></i> New Event</a>
+                {% endif %}
             </div>
             <div class="card-header">
                 <h4 class="list-group-item-heading">Asset Database</h4>
             </div>
             <div class="list-group list-group-flush">
-                <a class="list-group-item" href="{% url 'asset_index' %}"><span class="fas fa-tag"></span> Asset List </a>
-                {% if perms.assets.add_asset %}<a class="list-group-item" href="{% url 'asset_create' %}"><span class="fas fa-plus"></span> New Asset</a>{% endif %}
+                <a class="list-group-item list-group-item-action" href="{% url 'asset_index' %}"><i class="fas fa-tag"></i> Asset List </a>
+                {% if perms.assets.add_asset %}
+                    <a class="list-group-item list-group-item-action" href="{% url 'asset_create' %}"><i class="fas fa-plus"></i> New Asset</a>
+                {% endif %}
             </div>
             <div class="card-header">
                     <h4 class="list-group-item-heading">Quick Links</h4>
             </div>
             <div class="list-group list-group-flush">
-                    <a class="list-group-item" href="https://forum.nottinghamtec.co.uk" target="_blank"><span class="fas fa-link"></span> TEC Forum</a>
-                    <a class="list-group-item" href="//members.nottinghamtec.co.uk/wiki" target="_blank"><span class="fas fa-link"></span> TEC Wiki</a>
+                    <a class="list-group-item list-group-item-action" href="https://forum.nottinghamtec.co.uk" target="_blank"><i class="fas fa-comment-alt"></i> TEC Forum</a>
+                    <a class="list-group-item list-group-item-action" href="//members.nottinghamtec.co.uk/wiki" target="_blank"><i class="fas fa-pen-square"></i> TEC Wiki</a>
                     {% if perms.RIGS.view_event %}
-                    <a class="list-group-item" href="//members.nottinghamtec.co.uk/price" target="_blank"><span class="fas fa-link"></span> Price List</a>
+                        <a class="list-group-item list-group-item-action" href="//members.nottinghamtec.co.uk/price" target="_blank"><i class="fas fa-pound-sign"></i> Price List</a>
                     {% endif %}
             </div>
         </div>