diff --git a/allianceauth/timerboard/templates/timerboard/timertable.html b/allianceauth/timerboard/templates/timerboard/timertable.html
index 7ac0099c..3ee2c202 100644
--- a/allianceauth/timerboard/templates/timerboard/timertable.html
+++ b/allianceauth/timerboard/templates/timerboard/timertable.html
@@ -30,13 +30,21 @@
                 </td>
 
                 <td class="text-center">
+                    {% comment %} Objective: Hostile (BG: Danger) {% endcomment %}
                     {% if timer.objective == "Hostile" %}
-                        <div class="badge bg-danger">{% translate "Hostile" %}</div>
+                        <div class="badge bg-danger">
+
+                    {% comment %} Objective: Friendly (BG: Primare) {% endcomment %}
                     {% elif timer.objective == "Friendly" %}
-                        <div class="badge bg-primary">{% translate "Friendly" %}</div>
+                        <div class="badge bg-primary">
+
+                    {% comment %} Objective: Neutral (BG: Secondary) {% endcomment %}
                     {% elif timer.objective == "Neutral" %}
-                        <div class="badge bg-secondary">{% translate "Neutral" %}</div>
+                        <div class="badge bg-secondary">
                     {% endif %}
+
+                        {{ timer.get_objective_display }}
+                    </div>
                 </td>
 
                 <td class="text-center">
@@ -44,32 +52,27 @@
                 </td>
 
                 <td class="text-center">
+                    {% comment %} BG: Info {% endcomment %}
                     {% if timer.structure == "POCO" %}
                         <div class="badge bg-info">{% translate "POCO" %}</div>
-                    {% elif timer.structure == "Orbital Skyhook" %}
-                        <div class="badge bg-warning">{% translate "Orbital Skyhook" %}</div>
-                    {% elif timer.structure == "I-HUB" %}
-                        <div class="badge bg-warning">{% translate "I-HUB" %}</div>
-                    {% elif timer.structure == "TCU" %} {% comment %} Pending Removal {% endcomment %}
-                        <div class="badge bg-secondary">{% translate "TCU" %}</div>
                     {% elif timer.structure == "POS[S]" %}
                         <div class="badge bg-info">{% translate "POS [S]" %}</div>
                     {% elif timer.structure == "POS[M]" %}
                         <div class="badge bg-info">{% translate "POS [M]" %}</div>
                     {% elif timer.structure == "POS[L]" %}
                         <div class="badge bg-info">{% translate "POS [L]" %}</div>
-                    {% elif timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
-                        <div class="badge bg-danger">{% translate "Astrahus" %}</div>
-                    {% elif timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
-                        <div class="badge bg-danger">{% translate "Fortizar" %}</div>
-                    {% elif timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
-                        <div class="badge bg-danger">{% translate "Keepstar" %}</div>
+
+                    {% comment %} BG: Warning {% endcomment %}
+                    {% elif timer.structure == "Station" %}
+                        <div class="badge bg-warning">{% translate "Station" %}</div>
+                    {% elif timer.structure == "Orbital Skyhook" %}
+                        <div class="badge bg-warning">{% translate "Orbital Skyhook" %}</div>
+                    {% elif timer.structure == "I-HUB" %}
+                        <div class="badge bg-warning">{% translate "I-HUB" %}</div>
                     {% elif timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
                         <div class="badge bg-warning">{% translate "Raitaru" %}</div>
                     {% elif timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
                         <div class="badge bg-warning">{% translate "Azbel" %}</div>
-                    {% elif timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
-                        <div class="badge bg-danger">{% translate "Sotiyo" %}</div>
                     {% elif timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
                         <div class="badge bg-warning">{% translate "Athanor" %}</div>
                     {% elif timer.structure == "Refinery[L]" or timer.structure == "Tatara" %}
@@ -82,12 +85,30 @@
                         <div class="badge bg-warning">{% translate "Ansiblex Jump Gate" %}</div>
                     {% elif timer.structure == "Mercenary Den" %}
                         <div class="badge bg-warning">{% translate "Mercenary Den" %}</div>
-                    {% elif timer.structure == "Moon Mining Cycle" %}
-                        <div class="badge bg-success">{% translate "Moon Mining Cycle" %}</div>
                     {% elif timer.structure == "Metenox Moon Drill" %}
                         <div class="badge bg-warning">{% translate "Metenox Moon Drill" %}</div>
+
+                    {% comment %} BG: Danger {% endcomment %}
+                    {% elif timer.structure == "TCU" %}
+                        <div class="badge bg-danger">{% translate "TCU" %}</div>
+                    {% elif timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
+                        <div class="badge bg-danger">{% translate "Astrahus" %}</div>
+                    {% elif timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
+                        <div class="badge bg-danger">{% translate "Fortizar" %}</div>
+                    {% elif timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
+                        <div class="badge bg-danger">{% translate "Keepstar" %}</div>
+                    {% elif timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
+                        <div class="badge bg-danger">{% translate "Sotiyo" %}</div>
+
+                    {% comment %} BG: Secondary {% endcomment %}
+                    {% elif timer.structure == "TCU" %} {% comment %} Pending Removal {% endcomment %}
+                        <div class="badge bg-secondary">{% translate "TCU" %}</div>
                     {% elif timer.structure == "Other" %}
                         <div class="badge bg-secondary">{% translate "Other" %}</div>
+
+                    {% comment %} BG: Success {% endcomment %}
+                    {% elif timer.structure == "Moon Mining Cycle" %}
+                        <div class="badge bg-success">{% translate "Moon Mining Cycle" %}</div>
                     {% endif %}
                 </td>