diff --git a/scipost_django/production/templates/production/_hx_productionstream_details.html b/scipost_django/production/templates/production/_hx_productionstream_details.html
index 80295f9a893b2e1225b482eda2a325974bdd732e..a4977aae49aae0ab3e6416421763c205a13b2c18 100644
--- a/scipost_django/production/templates/production/_hx_productionstream_details.html
+++ b/scipost_django/production/templates/production/_hx_productionstream_details.html
@@ -6,7 +6,7 @@
 
 
   <div id="productionstream-{{ productionstream.id }}-details-contents"
-       class="m-2 p-2 bg-white"
+       class="p-2 mt-2 bg-white"
        hx-get="{% url 'production:_hx_productionstream_details_contents' productionstream_id=productionstream.id %}"
        hx-trigger="toggle once from:#productionstream-{{ productionstream.id }}-details"
        hx-indicator="#indicator-productionstream-{{ productionstream.id }}-details-contents"></div>
diff --git a/scipost_django/production/templates/production/_hx_productionstream_details_contents.html b/scipost_django/production/templates/production/_hx_productionstream_details_contents.html
index 4adcb5f0cd32795bed2cb88d901b50a5d2bc2567..7220bc147d89d26b85daa2a1ad624d1665c8ac7c 100644
--- a/scipost_django/production/templates/production/_hx_productionstream_details_contents.html
+++ b/scipost_django/production/templates/production/_hx_productionstream_details_contents.html
@@ -4,11 +4,11 @@
 
 {% get_obj_perms request.user for productionstream as "sub_perms" %}
 
-<div class="row">
+<div class="row mb-0">
   {% if "can_work_for_stream" in sub_perms or perms.scipost.can_assign_production_supervisor %}
     <div class="col-12 col-md d-flex flex-column">
  
-      <div class="accordion px-2 mb-2"
+      <div class="accordion"
            id="productionstream-{{ productionstream.id }}-actions-accordion">
         <h3>Actions</h3>
 
@@ -170,7 +170,7 @@
       {% if perms.scipost.can_draft_publication or perms.scipost.can_publish_accepted_submission %}
         <div class="mb-2 mb-md-0 mt-md-auto px-2">
  
-          <div class="row mb-0 g-2">
+          <div class="row mb-0 mt-2 g-2">
             {% if perms.scipost.can_publish_accepted_submission %}
               <div class="col-12 col-sm-auto col-md-12 col-lg-auto h-100 d-none-empty">
                 <div class="row m-0 d-none-empty">
@@ -202,7 +202,7 @@
   </div>
 
   <div id="productionstream-{{ productionstream.id }}-event-container"
-       class="col-12 col-md d-flex flex-column px-3">
+       class="col-12 col-md d-flex flex-column">
     {% comment %} This might be better to refactor with an OOB response on each event addition {% endcomment %}
     <h3>Events</h3>
     <div id="productionstream-{{ productionstream.id }}-event-list"
diff --git a/scipost_django/production/templates/production/_productionstream_events.html b/scipost_django/production/templates/production/_productionstream_events.html
index 28b1ed7d2fb9dadef06ba3d8d6142cfe57d03147..03918572a39b555c95fa419d05da8dd739d24842 100644
--- a/scipost_django/production/templates/production/_productionstream_events.html
+++ b/scipost_django/production/templates/production/_productionstream_events.html
@@ -50,15 +50,15 @@
       </tr>
       <tr>
 	
-        <td colspan="4" class="ps-4 pb-4">
+        <td colspan="4" class="py-1 px-3">
           {% if event.comments %}
-            <p class="mt-2 mb-0">
+            <div>
               {% if event.noted_to %}
                 <strong>To: {{ event.noted_to.user.first_name }} {{ event.noted_to.user.last_name }}</strong>
                 <br>
               {% endif %}
               {% automarkup event.comments %}
-            </p>
+            </div>
           {% endif %}
 
  
diff --git a/scipost_django/production/views.py b/scipost_django/production/views.py
index c8fc4bf24fa756e886138701586bd23f3c52b517..a25b1c9d433ab752c03a2fd21d6566c1adfeffd2 100644
--- a/scipost_django/production/views.py
+++ b/scipost_django/production/views.py
@@ -991,7 +991,7 @@ def mark_as_completed(request, stream_id):
     )
 
     return HttpResponse(
-        r"""<summary class="text-white bg-success summary-unstyled p-3">
+        r"""<summary class="text-white bg-success p-3">
                 Production Stream has been marked as completed.
             </summary>"""
     )