diff --git a/scipost_django/submissions/templates/submissions/pool/_hx_submission_details.html b/scipost_django/submissions/templates/submissions/pool/_hx_submission_details.html
index 13fedfecdded7955f7b848f9a9212b53b8d45ab0..9f0e6e69abe9a228eaf01cfdc054dabb1d42b41d 100644
--- a/scipost_django/submissions/templates/submissions/pool/_hx_submission_details.html
+++ b/scipost_django/submissions/templates/submissions/pool/_hx_submission_details.html
@@ -1,25 +1,22 @@
 <details id="submission-{{ submission.pk }}-details"
-	 class="border border-2 mx-3"
+	 class="border border-2 mx-3 p-2 bg-primary bg-opacity-10"
 >
   <summary  style="list-style: none;"
-	    class="p-2 bg-primary bg-opacity-10"
+	    class="p-2"
   >
     {% include "submissions/pool/_submission_details_summary_contents.html" with submission=submission %}
 
   </summary>
 
   <div id="tabs-{{ submission.id }}"
-       class="m-2 p-2"
+       class="m-2 p-2 bg-white"
        hx-get="{% url 'submissions:pool:_hx_submission_tab' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr tab='info' %}"
        hx-trigger="toggle once from:#submission-{{ submission.pk }}-details"
-       hx-indicator="#indicator-tabs-{{ submission.id }}"
-    >
-  </div>
-  <span id="indicator-tabs-{{ submission.id }}" class="htmx-indicator p-1">
-    <button class="btn btn-sm btn-warning p-2" type="button" disabled>
+  >
+    <button class="htmx-indicator btn btn-sm btn-warning p-2" type="button" disabled>
       <small><strong>Loading...</strong></small>
       <div class="spinner-grow spinner-grow-sm ms-2" role="status" aria-hidden="true"></div>
     </button>
-  </span>
+  </div>
 
 </details>
diff --git a/scipost_django/submissions/templates/submissions/pool/_hx_submission_tab.html b/scipost_django/submissions/templates/submissions/pool/_hx_submission_tab.html
index 4ff6a3d9c13b20bbc7f48e861e7dc7a16973e6c4..c0cd6b24b3cc8d3117f347f4654c456e3a55ca1b 100644
--- a/scipost_django/submissions/templates/submissions/pool/_hx_submission_tab.html
+++ b/scipost_django/submissions/templates/submissions/pool/_hx_submission_tab.html
@@ -1,47 +1,36 @@
 <ul class="nav nav-pills justify-content-center">
+  {% if request.user.contributor.is_ed_admin %}
+    <li class="nav-item">
+      {% include "submissions/pool/_submission_tab_link.html" with submission=submission tab=tab target="edadmin" text="EdAdmin" %}
+    </li>
+  {% endif %}
   <li class="nav-item">
-    <a class="nav-link{% if tab == "info" %} active{% endif %}"
-       hx-get="{% url "submissions:pool:_hx_submission_tab" identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr tab='info' %}"
-       hx-target="#tabs-{{ submission.id }}"
-    >Submission<br>information</a>
+    {% include "submissions/pool/_submission_tab_link.html" with submission=submission tab=tab target="info" text="Submission information" %}
   </li>
   <li class="nav-item">
-    <a class="nav-link{% if tab == "refereeing" %} active{% endif %}"
-       hx-get="{% url "submissions:pool:_hx_submission_tab" identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr tab='refereeing' %}"
-       hx-target="#tabs-{{ submission.id }}"
-    >Refereeing<br>history</a>
+    {% include "submissions/pool/_submission_tab_link.html" with submission=submission tab=tab target="refereeing" text="Refereeing history" %}
   </li>
   <li class="nav-item">
-    <a class="nav-link{% if tab == "remarks" %} active{% endif %}"
-       hx-get="{% url "submissions:pool:_hx_submission_tab" identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr tab='remarks' %}"
-       hx-target="#tabs-{{ submission.id }}"
-    >Remarks</a>
+    {% include "submissions/pool/_submission_tab_link.html" with submission=submission tab=tab target="remarks" text="Remarks" %}
   </li>
   <li class="nav-item">
-    <a class="nav-link{% if tab == "graph" %} active{% endif %}"
-       hx-get="{% url "submissions:pool:_hx_submission_tab" identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr tab='graph' %}"
-       hx-target="#tabs-{{ submission.id }}"
-    >Graph</a>
+    {% include "submissions/pool/_submission_tab_link.html" with submission=submission tab=tab target="graph" text="Graphs" %}
   </li>
   <li class="nav-item">
-    <a class="nav-link{% if tab == "events" %} active{% endif %}"
-       hx-get="{% url "submissions:pool:_hx_submission_tab" identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr tab='events' %}"
-       hx-target="#tabs-{{ submission.id }}"
-    >Events</a>
+    {% include "submissions/pool/_submission_tab_link.html" with submission=submission tab=tab target="events" text="Events" %}
   </li>
-  {% if request.user.contributor.is_ed_admin %}
-    <li class="nav-item">
-      <a class="nav-link{% if tab == "edadmin" %} active{% endif %}"
-	 hx-get="{% url "submissions:pool:_hx_submission_tab" identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr tab='edadmin' %}"
-	 hx-target="#tabs-{{ submission.id }}"
-      >EdAdmin</a>
-    </li>
-  {% endif %}
   <li class="nav-item">
-    <a class="nav-link{% if tab == "old" %} active{% endif %}"
-       hx-get="{% url "submissions:pool:_hx_submission_tab" identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr tab='old' %}"
-       hx-target="#tabs-{{ submission.id }}"
-    >Old version</a>
+    {% include "submissions/pool/_submission_tab_link.html" with submission=submission tab=tab target="old" text="Old version" %}
+  </li>
+  <li class="nav-item">
+    <span id="tabs-{{ submission.id }}-indicator"
+	  class="htmx-indicator p-2"
+    >
+      <button class="btn btn-sm btn-warning" type="button" disabled>
+	<small><strong>Loading...</strong></small>
+	<div class="spinner-grow spinner-grow-sm ms-2" role="status" aria-hidden="true"></div>
+      </button>
+    </span>
   </li>
 </ul>
 <hr>