diff --git a/rocky/rocky/templates/oois/ooi_detail.html b/rocky/rocky/templates/oois/ooi_detail.html
index c5647fa7f1a..bc0e3f16f7b 100644
--- a/rocky/rocky/templates/oois/ooi_detail.html
+++ b/rocky/rocky/templates/oois/ooi_detail.html
@@ -34,14 +34,14 @@
                 {% include "tasks/ooi_detail_task_list.html" %}
 
             </div>
-            <div>
-                {% if not ooi|is_finding and not ooi|is_finding_type %}
+            {% if not ooi|is_finding and not ooi|is_finding_type %}
+                <div>
                     {% include "oois/ooi_detail_findings_overview.html" with severity_summary=findings_severity_summary severity_summary_totals=severity_summary_totals %}
 
-                {% endif %}
-            </div>
+                </div>
+            {% endif %}
             <div>
-                <h2>{% translate "Scan" %} {{ ooi.human_readable }} {% translate "using boefjes" %}</h2>
+                <h2>{% translate "Scan" %} {% translate "using boefjes" %}</h2>
                 {% if enabled_boefjes_available %}
                     <div class="horizontal-view">
                         <div>
@@ -106,14 +106,16 @@ <h2>{% translate "Scan" %} {{ ooi.human_readable }} {% translate "using boefjes"
                                 {% translate "There are no boefjes enabled to scan an OOI of type" %} "{{ ooi.get_ooi_type }}". {% translate "See" %} <a href="{% url "katalogus" organization.code %}">KAT-alogus</a> {% translate "to find and enable boefjes that can scan within the current level." %}
                             </p>
                         {% else %}
-                            <p>
-                                {% translate "There are no boefjes available within the current clearance level of" %} "{{ ooi.scan_profile.human_readable }}".
-                                <br>
-                                {% translate "See" %} <a href="{% url "katalogus" organization.code %}">KAT-alogus</a> {% translate "to find and enable boefjes that can scan within the current level." %}
-                            </p>
-                            <p>
-                                <a href="{% ooi_url 'scan_profile_detail' ooi.primary_key organization.code query=mandatory_fields %}">{% translate "Or if you have the authorization, upgrade the clearance level of" %} "{{ ooi.human_readable }}".</a>
-                            </p>
+                            <div>
+                                <p>
+                                    {% translate "There are no boefjes available within the current clearance level of" %} "{{ ooi.scan_profile.human_readable }}".
+                                    <br>
+                                    {% translate "See" %} <a href="{% url "katalogus" organization.code %}">KAT-alogus</a> {% translate "to find and enable boefjes that can scan within the current level." %}
+                                </p>
+                                <p>
+                                    <a href="{% ooi_url 'scan_profile_detail' ooi.primary_key organization.code query=mandatory_fields %}">{% translate "Or if you have the authorization, upgrade the clearance level of" %} "{{ ooi.human_readable }}".</a>
+                                </p>
+                            </div>
                         {% endif %}
                     </div>
                 {% endif %}
diff --git a/rocky/rocky/templates/oois/ooi_detail_origins_inference.html b/rocky/rocky/templates/oois/ooi_detail_origins_inference.html
index ac808b9a651..b59972c6857 100644
--- a/rocky/rocky/templates/oois/ooi_detail_origins_inference.html
+++ b/rocky/rocky/templates/oois/ooi_detail_origins_inference.html
@@ -22,10 +22,13 @@ <h2>{% translate "Inferred by" %}</h2>
                                 <a href="{% ooi_url 'ooi_detail' inference.origin.source organization.code %}">{{ inference.origin.source }}</a>
                             </td>
                             <td>
-                                {% for param in params %}
-                                    <a href="{% ooi_url 'ooi_detail' param.reference organization.code %}">{{ param.reference }}</a>
-                                    <br>
-                                {% endfor %}
+                                <ul>
+                                    {% for param in params %}
+                                        <li>
+                                            <a href="{% ooi_url 'ooi_detail' param.reference organization.code %}">{{ param.reference }}</a>
+                                        </li>
+                                    {% endfor %}
+                                </ul>
                             </td>
                         </tr>
                     {% endfor %}
diff --git a/rocky/rocky/templates/oois/ooi_past_due_warning.html b/rocky/rocky/templates/oois/ooi_past_due_warning.html
index d2a42d8f26f..7e34306bd18 100644
--- a/rocky/rocky/templates/oois/ooi_past_due_warning.html
+++ b/rocky/rocky/templates/oois/ooi_past_due_warning.html
@@ -1,28 +1,30 @@
 {% load i18n %}
 
 <div class="warning">
-    <h2>
-        {% if ooi_current %}
-            {% translate "This object is past due" %}
-        {% else %}
-            {% translate "This object is past due and has been deleted" %}
-        {% endif %}
-    </h2>
-    <p>{% translate "This object is past due. You are viewing the object state in a past state." %}</p>
-    <ul>
-        {% if ooi_current %}
-            <li>{% translate "You will not be able to add Findings or other OOI's to past due objects." %}</li>
-            <li>
-                <a href="{% ooi_url 'ooi_detail' ooi_current.primary_key organization.code %}"
-                   title="{% blocktranslate with name=ooi_current.human_readable %}Show details for {{ name }}{% endblocktranslate %}">{% translate "View the current state" %}</a>
-            </li>
-        {% else %}
-            <li>
-                {% blocktranslate trimmed %}
-                    You will not be able to add Findings or other OOI's, this object has been deleted
-                    and is no longer available.
-                {% endblocktranslate %}
-            </li>
-        {% endif %}
-    </ul>
+    <div>
+        <h2>
+            {% if ooi_current %}
+                {% translate "This object is past due" %}
+            {% else %}
+                {% translate "This object is past due and has been deleted" %}
+            {% endif %}
+        </h2>
+        <p>{% translate "This object is past due. You are viewing the object state in a past state." %}</p>
+        <ul>
+            {% if ooi_current %}
+                <li>{% translate "You will not be able to add Findings or other OOI's to past due objects." %}</li>
+                <li>
+                    <a href="{% ooi_url 'ooi_detail' ooi_current.primary_key organization.code %}"
+                       title="{% blocktranslate with name=ooi_current.human_readable %}Show details for {{ name }}{% endblocktranslate %}">{% translate "View the current state" %}</a>
+                </li>
+            {% else %}
+                <li>
+                    {% blocktranslate trimmed %}
+                        You will not be able to add Findings or other OOI's, this object has been deleted
+                        and is no longer available.
+                    {% endblocktranslate %}
+                </li>
+            {% endif %}
+        </ul>
+    </div>
 </div>
diff --git a/rocky/rocky/templates/partials/ooi_detail_related_object.html b/rocky/rocky/templates/partials/ooi_detail_related_object.html
index f70076a4c1e..bfa1306a431 100644
--- a/rocky/rocky/templates/partials/ooi_detail_related_object.html
+++ b/rocky/rocky/templates/partials/ooi_detail_related_object.html
@@ -3,17 +3,13 @@
 <div class="horizontal-scroll">
     <h2>{% translate "Related objects" %}</h2>
     {% if not related %}
-        <p>
-            {% translate "No related objects added to" %} {{ ooi.get_ooi_type }}.
-            <br>
-            {% translate "Use the button below to add a related object." %}
-        </p>
+        <p>{% translate "No related object known for" %} {{ ooi.get_ooi_type }}.</p>
     {% endif %}
     {% if not ooi_past_due %}
         {% if not ooi|is_finding and not ooi|is_finding_type %}
             <div class="horizontal-view {% if related %}toolbar{% endif %}">
                 <a href="{% ooi_url "ooi_add_related" ooi.primary_key organization.code %}"
-                   class="button ghost">{% translate "Add" %}</a>
+                   class="button ghost">{% translate "Add related object" %}</a>
             </div>
         {% endif %}
     {% endif %}
@@ -32,7 +28,9 @@ <h2>{% translate "Related objects" %}</h2>
                         <td>
                             <a href="{% ooi_url "ooi_detail" related_ooi.reference organization.code query=related_ooi.mandatory_fields %}">{{ related_ooi.reference.human_readable }}</a>
                         </td>
-                        <td>{{ related_ooi.name }}</td>
+                        <td>
+                            <a href="{% url "ooi_list" organization.code %}?ooi_type={{ related_ooi.reference.class_ }}">{{ related_ooi.reference.class_ }}</a>
+                        </td>
                     </tr>
                 {% endfor %}
             </tbody>
diff --git a/rocky/rocky/templates/tasks/ooi_detail_task_list.html b/rocky/rocky/templates/tasks/ooi_detail_task_list.html
index 22db1ce5610..2ecd0775b6f 100644
--- a/rocky/rocky/templates/tasks/ooi_detail_task_list.html
+++ b/rocky/rocky/templates/tasks/ooi_detail_task_list.html
@@ -4,11 +4,10 @@
     <h2>{% translate "Tasks" %}</h2>
     {% ooi_url 'ooi_detail' ooi.primary_key organization.code query=mandatory_fields as this_url %}
     {% if not task_list %}
-        <p class="emphasized">{% translate "There are no tasks for" %} {{ ooi }}</p>
+        <p class="emphasized">{% translate "There have been no tasks" %}</p>
         {% include "tasks/partials/task_filter.html" with clear_filter_url=this_url %}
 
     {% else %}
-        <p class="emphasized">{% translate "List of tasks for" %} {{ ooi }}</p>
         {% include "tasks/partials/task_filter.html" with clear_filter_url=this_url %}
 
         <table rf-selector="table-scan-history">