diff --git a/atlas/templates/atlas/case_display_block.html b/atlas/templates/atlas/case_display_block.html
index 6a63a4f9..b1ac8dde 100755
--- a/atlas/templates/atlas/case_display_block.html
+++ b/atlas/templates/atlas/case_display_block.html
@@ -46,21 +46,28 @@
{% for series in case.series.all %}
{% for finding in series.findings.all %}
+
+ Series: {{series}} |
+
{% if finding.findings.all %}
Findings: {% for f in finding.findings.all %}
- {{f.get_link}},
+ {{f.get_link}},
{% endfor %}
{% endif %}
-
- Structure: {% for s in finding.structures.all %}
- {{s.get_link}},
- {% endfor %}
-
-
- Description: {{finding.description}}
-
+ {% if finding.structures.all %}
+
+ Structure: {% for s in finding.structures.all %}
+ {{s.get_link}},
+ {% endfor %}
+
+ {% endif %}
+ {% if finding.description %}
+
+ Description: {{finding.description}}
+
+ {% endif %}
{% endfor %}