diff --git a/jarvis/followup/templates/heightweight/list.html b/jarvis/followup/templates/heightweight/list.html
index e9a081c..f28184b 100644
--- a/jarvis/followup/templates/heightweight/list.html
+++ b/jarvis/followup/templates/heightweight/list.html
@@ -51,34 +51,26 @@
                             <td>
                                 {% if gymnast %}
                                     {% if gymnast.gender == 0 %}
-                                        {% if heightweight.bmi < 17 %}
-                                            <span class="text-danger"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
-                                        {% elif heightweight.bmi < 19 %}
+                                        {% if heightweight.bmi < 19 %}
                                             <span class="text-danger"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
                                         {% elif heightweight.bmi < 21 %}
-                                            <span class="text-danger"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
+                                            <span class="text-warning"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
                                         {% elif heightweight.bmi < 23 %}
-                                            <span class="text-danger"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
+                                            <span class="text-success"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
                                         {% elif heightweight.bmi < 25 %}
-                                            <span class="text-danger"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
-                                        {% elif heightweight.bmi < 27 %}
-                                            <span class="text-danger"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
+                                            <span class="text-warning"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
                                         {% else %}
                                             <span class="text-danger"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
                                         {% endif %}
                                     {% else %}
-                                        {% if heightweight.bmi < 19 %}
-                                            <span class="text-danger"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
-                                        {% elif heightweight.bmi < 21 %}
+                                        {% if heightweight.bmi < 21 %}
                                             <span class="text-danger"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
                                         {% elif heightweight.bmi < 23 %}
-                                            <span class="text-danger"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
+                                            <span class="text-warning"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
                                         {% elif heightweight.bmi < 25 %}
-                                            <span class="text-danger"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
+                                            <span class="text-success"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
                                         {% elif heightweight.bmi < 27 %}
-                                            <span class="text-danger"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
-                                        {% elif heightweight.bmi < 29 %}
-                                            <span class="text-danger"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
+                                            <span class="text-warning"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
                                         {% else %}
                                             <span class="text-danger"><b>{{ heightweight.bmi | floatformat:2 }}</b></span>
                                         {% endif %}