diff --git a/atlas/templates/atlas/case_display_block.html b/atlas/templates/atlas/case_display_block.html
index ba310810..bc1b4b85 100755
--- a/atlas/templates/atlas/case_display_block.html
+++ b/atlas/templates/atlas/case_display_block.html
@@ -35,7 +35,7 @@
             Condition:
             <ul>
                 {% for con in case.condition.all %}
-                    <li>{{con}}</li>
+                    <li>{{con.get_link}}</li>
                 {% endfor %}
             </ul>
             <details>
@@ -44,7 +44,11 @@
                 {% for series in case.series.all %}
                     {% for finding in series.findings.all %}
                         <div>
-                            Findings: {{finding.findings.all|join:", "}}<br />
+                            Findings: {% for f in finding.findings.all %}
+                                {{finding.get_link}},
+                            {% endfor %}
+
+                            <br />
                             Structure: {{finding.structure}}<br />
                             Description: {{finding.description}}<br />
                         </div>
@@ -56,7 +60,7 @@
                 <summary><b>Differentials</b></summary>
                 <ul>
                     {% for diff in case.differentialcase.all %}
-                        <li>{{diff.condition}} - {{diff.text}}</li>
+                        <li>{{diff.condition.get_link}} - {{diff.text}}</li>
                     {% endfor %}
                 </ul>
             </details>
diff --git a/atlas/templates/atlas/condition_detail.html b/atlas/templates/atlas/condition_detail.html
index e3b01435..3e3fbf56 100755
--- a/atlas/templates/atlas/condition_detail.html
+++ b/atlas/templates/atlas/condition_detail.html
@@ -18,7 +18,7 @@
         Synonyms: {{condition.synonym.all|join:", "}}<br />
         Parent: {{condition.parent.all|join:", "}}<br />
     </div>
-    <h4>Cases</h4>
+    <h4>Associated Cases</h4>
     <ul>
 
         {% for case in condition.case_set.all %}