diff --git a/compliance_checker/data/templates/ccheck.html.j2 b/compliance_checker/data/templates/ccheck.html.j2
index 2a51aef4..b3988210 100644
--- a/compliance_checker/data/templates/ccheck.html.j2
+++ b/compliance_checker/data/templates/ccheck.html.j2
@@ -1,13 +1,55 @@
+
+
+
-
+
{% if cc_url %}
{{testname}}
{% else %}
@@ -16,9 +58,18 @@
+
+
+
+
+
-
Corrective Actions
+
+
Corrective Actions
+
+
+
@@ -26,6 +77,7 @@
| {{ high_count }}
+
@@ -37,17 +89,31 @@
{% for result in all_priorities -%}
{% if result['weight'] == 3 -%}
- {% for msg in result['msgs']-%}
+
+
- {{result['name']}} |
- {{msg}} |
+ {% if result["msgs"]|length > 0 -%}
+ {{result['name']}} |
+
+ {% for msg in result['msgs'] -%}
+
+
+
+
+ {% endfor -%}
+ {% endif -%}
+ |
- {% endfor -%}
+
+
{% endif -%}
{% endfor -%}
+
{% else -%}
| {{ high_count }}
@@ -64,6 +130,9 @@
{% endif -%}
+
+
+
{% if medium_count -%}
@@ -80,22 +149,39 @@
Reasoning |
+
{% for result in all_priorities -%}
{% if result['weight'] == 2 -%}
- {% for msg in result['msgs']-%}
+
- {{result['name']}} |
- {{msg}} |
+ {% if result["msgs"]|length -%}
+ {{result['name']}} |
+
+ {% for msg in result['msgs'] -%}
+
+
+
+
+ {% endfor -%}
+ {% endif -%}
+ |
- {% endfor -%}
+
+
{% endif -%}
{% endfor -%}
+
{% endif -%}
+
+
+
{% if low_count -%}
@@ -112,21 +198,36 @@
Reasoning |
+
{% for result in all_priorities -%}
{% if result['weight'] == 1 -%}
- {% for msg in result['msgs']-%}
+
- {{result['name']}} |
- {{msg}} |
+ {% if result["msgs"]|length -%}
+ {{result['name']}} |
+
+ {% for msg in result['msgs'] -%}
+
+
+
+
+ {% endfor -%}
+ {% endif -%}
+ |
- {% endfor -%}
+
+
{% endif -%}
{% endfor -%}
+
{% endif -%}
+