diff --git a/templates/ops/capa_detail.html b/templates/ops/capa_detail.html
index 2fd7c0f..584919a 100644
--- a/templates/ops/capa_detail.html
+++ b/templates/ops/capa_detail.html
@@ -36,7 +36,7 @@
     <div class="stat-card">
       <table class="table table-sm table-borderless mb-0">
         <tr><td class="text-secondary">Batch</td><td><a href="{% url 'ops:batch_detail' record.batch.pk %}">{{ record.batch.batch_reference }}</a></td></tr>
-        <tr><td class="text-secondary">Status</td><td><span class="badge" {% if record.status == open %}bg-danger{% elif record.status == in_progress %}bg-warning text-dark{% else %}bg-success{% endif %} badge-status>{{ record.get_status_display }}</span></td></tr>
+        <tr><td class="text-secondary">Status</td><td><span class="badge {% if record.status == open %}bg-danger{% elif record.status == in_progress %}bg-warning text-dark{% else %}bg-success{% endif %} badge-status">{{ record.get_status_display }}</span></td></tr>
         <tr><td class="text-secondary">Assigned To</td><td>{{ record.assigned_to|default:'-' }}</td></tr>
         <tr><td class="text-secondary">Due Date</td><td>{{ record.due_date|date:'d/m/Y'|default:'-' }}</td></tr>
         <tr><td class="text-secondary">Created</td><td>{{ record.created_at|date:'d/m/Y H:i' }}</td></tr>
diff --git a/templates/ops/capa_list.html b/templates/ops/capa_list.html
index 5b39d91..80bbd06 100644
--- a/templates/ops/capa_list.html
+++ b/templates/ops/capa_list.html
@@ -34,7 +34,7 @@
       <tr>
         <td><strong>{{ r.batch.batch_reference }}</strong></td>
         <td>{{ r.issue_description|truncatewords:15 }}</td>
-        <td><span class="badge" {% if r.status == open %}bg-danger{% elif r.status == in_progress %}bg-warning text-dark{% else %}bg-success{% endif %} badge-status>{{ r.get_status_display }}</span></td>
+        <td><span class="badge {% if r.status == open %}bg-danger{% elif r.status == in_progress %}bg-warning text-dark{% else %}bg-success{% endif %} badge-status">{{ r.get_status_display }}</span></td>
         <td>{{ r.assigned_to|default:'-' }}</td>
         <td>{{ r.due_date|date:'d/m/Y'|default:'-' }}</td>
         <td>{{ r.created_at|date:'d/m/Y' }}</td>
diff --git a/templates/ops/coa_review_detail.html b/templates/ops/coa_review_detail.html
index 1a6cb96..99c1de7 100644
--- a/templates/ops/coa_review_detail.html
+++ b/templates/ops/coa_review_detail.html
@@ -17,7 +17,7 @@
       <h6 class="mb-3">Certificate Details</h6>
       <table class="table table-sm table-borderless mb-0">
         <tr><td class="text-secondary">Batch</td><td><a href="{% url 'ops:batch_detail' coa.batch.pk %}">{{ coa.batch.batch_reference }}</a></td></tr>
-        <tr><td class="text-secondary">Status</td><td><span class="badge" {% if coa.status == 'published' %}bg-success{% elif coa.status == 'superseded' %}bg-secondary{% else %}bg-warning text-dark{% endif %}>{{ coa.get_status_display }}</span></td></tr>
+        <tr><td class="text-secondary">Status</td><td><span class="badge {% if coa.status == 'published' %}bg-success{% elif coa.status == 'superseded' %}bg-secondary{% else %}bg-warning text-dark{% endif %}">{{ coa.get_status_display }}</span></td></tr>
         <tr><td class="text-secondary">Version</td><td>v{{ coa.version }}</td></tr>
         <tr><td class="text-secondary">Specification</td><td>{{ coa.spec_version|default:'-' }}</td></tr>
         <tr><td class="text-secondary">Issuer</td><td>{{ coa.issuer|default:'-' }}</td></tr>
@@ -56,7 +56,7 @@
         <button type="submit" class="btn btn-success w-100"><i class="bi bi-send"></i> Approve &amp; Publish</button>
       </form>
       {% else %}
-      <p class=text-muted mb-0">Commercial release approved. Buyer document and notification created.</p>
+      <p class="text-muted mb-0">Commercial release approved. Buyer document and notification created.</p>
       {% endif %}
     </div>
   </div>
diff --git a/templates/ops/coa_review_list.html b/templates/ops/coa_review_list.html
index 738b3da..1bae096 100644
--- a/templates/ops/coa_review_list.html
+++ b/templates/ops/coa_review_list.html
@@ -34,7 +34,7 @@
       <tr>
         <td><strong>{{ c.batch.batch_reference }}</strong></td>
         <td>v{{ c.version }}</td>
-        <td><span class="badge" {% if c.status == 'published' %}bg-success{% elif c.status == 'superseded' %}bg-secondary{% else %}bg-warning text-dark{% endif %}>{{ c.get_status_display }}</span></td>
+        <td><span class="badge {% if c.status == 'published' %}bg-success{% elif c.status == 'superseded' %}bg-secondary{% else %}bg-warning text-dark{% endif %}">{{ c.get_status_display }}</span></td>
         <td>{{ c.spec_version|default:'-' }}</td>
         <td>{{ c.quality_approved_by.full_name|default:'-' }}</td>
         <td>{{ c.issue_date|date:'d/m/Y'|default:'-' }}</td>
diff --git a/templates/ops/eudr_detail.html b/templates/ops/eudr_detail.html
index 552f68e..9167cdf 100644
--- a/templates/ops/eudr_detail.html
+++ b/templates/ops/eudr_detail.html
@@ -45,7 +45,7 @@
             <td>{{ link.harvest_intake.intake_date|date:'d/m/Y'|default:'-' }}</td>
             <td>{% if link.weight_allocated_kg %}{{ link.weight_allocated_kg }}{% elif link.harvest_intake %}{{ link.harvest_intake.weight_kg }}{% else %}-{% endif %}</td>
             <td>{{ link.harvest_intake.origin_zone.zone_code|default:'-' }}</td>
-            <td>{% if link.harvest_intake.origin_zone %}<span class="badge" {% if link.harvest_intake.origin_zone.verification_status == 'verified' %}bg-success{% elif link.harvest_intake.origin_zone.verification_status == 'rejected' %}bg-danger{% else %}bg-warning text-dark{% endif %}>{{ link.harvest_intake.origin_zone.get_verification_status_display }}</span>{% else %}-{% endif %}</td>
+            <td>{% if link.harvest_intake.origin_zone %}<span class="badge {% if link.harvest_intake.origin_zone.verification_status == 'verified' %}bg-success{% elif link.harvest_intake.origin_zone.verification_status == 'rejected' %}bg-danger{% else %}bg-warning text-dark{% endif %}">{{ link.harvest_intake.origin_zone.get_verification_status_display }}</span>{% else %}-{% endif %}</td>
             <td>{{ link.harvest_intake.collector_group.name|default:'-' }}</td>
           </tr>
           {% empty %}
@@ -62,7 +62,7 @@
       <h6 class="mb-3">Risk Assessments</h6>
       {% for r in risk_assessments %}
       <div class="border-bottom pb-2 mb-2">
-        <span class="badge" {% if r.risk_level == 'high' %}bg-danger{% elif r.risk_level == 'low' %}bg-success{% else %}bg-info text-dark{% endif %}>{{ r.get_risk_level_display }}</span>
+        <span class="badge {% if r.risk_level == 'high' %}bg-danger{% elif r.risk_level == 'low' %}bg-success{% else %}bg-info text-dark{% endif %}">{{ r.get_risk_level_display }}</span>
         <span class="text-muted small">by {{ r.assessed_by.full_name|default:'-' }} · {{ r.assessed_at|date:'d/m/Y H:i' }}</span>
         <div class="small mt-1">{{ r.basis }}</div>
       </div>
@@ -75,7 +75,7 @@
       <h6 class="mb-3">Mitigation Actions</h6>
       {% for m in mitigation_actions %}
       <div class="border-bottom pb-2 mb-2">
-        <span class="badge" {% if m.status == 'verified' %}bg-success{% elif m.status == 'completed' %}bg-primary{% else %}bg-warning text-dark{% endif %}>{{ m.get_status_display }}</span>
+        <span class="badge {% if m.status == 'verified' %}bg-success{% elif m.status == 'completed' %}bg-primary{% else %}bg-warning text-dark{% endif %}">{{ m.get_status_display }}</span>
         <span class="small">{{ m.action }} <span class="text-muted">(owner: {{ m.owner|default:'-' }}{% if m.due_date %}, due {{ m.due_date|date:'d/m/Y' }}{% endif %})</span></span>
       </div>
       {% empty %}
diff --git a/templates/ops/eudr_list.html b/templates/ops/eudr_list.html
index 4cb37bd..f646a21 100644
--- a/templates/ops/eudr_list.html
+++ b/templates/ops/eudr_list.html
@@ -38,13 +38,8 @@
       {% for c in cases %}
       <tr>
         <td><strong>{{ c.batch.batch_reference }}</strong></td>
-        <td><span class="badge"
-          {% if c.status == 'approved' %}bg-success
-          {% elif c.status == 'rejected' %}bg-danger
-          {% elif c.status == 'complete_for_review' %}bg-primary
-          {% elif c.status == 'mitigation_required' or c.status == 'risk_identified' %}bg-warning text-dark
-          {% else %}bg-secondary{% endif %}>{{ c.get_status_display }}</span></td>
-        <td><span class="badge" {% if c.risk_level == 'high' %}bg-danger{% elif c.risk_level == 'low' %}bg-success{% else %}bg-info text-dark{% endif %}>{{ c.get_risk_level_display }}</span></td>
+        <td><span class="badge {% if c.status == 'approved' %}bg-success{% elif c.status == 'rejected' %}bg-danger{% elif c.status == 'complete_for_review' %}bg-primary{% elif c.status == 'mitigation_required' or c.status == 'risk_identified' %}bg-warning text-dark{% else %}bg-secondary{% endif %}">{{ c.get_status_display }}</span></td>
+        <td><span class="badge {% if c.risk_level == 'high' %}bg-danger{% elif c.risk_level == 'low' %}bg-success{% else %}bg-info text-dark{% endif %}">{{ c.get_risk_level_display }}</span></td>
         <td>{{ c.approved_at|date:'d/m/Y H:i'|default:'-' }}</td>
         <td>{{ c.updated_at|date:'d/m/Y' }}</td>
         <td><a href="{% url 'ops:eudr_detail' c.pk %}" class="btn btn-sm btn-primary">Review</a></td>
diff --git a/templates/ops/intake_form.html b/templates/ops/intake_form.html
index c151659..6030129 100644
--- a/templates/ops/intake_form.html
+++ b/templates/ops/intake_form.html
@@ -11,7 +11,7 @@
 <div class="row g-3">
   <div class="col-md-7">
     <div class="stat-card">
-      <form method="post novalidate" id="intake-form" data-group-zones="{{ group_zones }}">
+      <form method="post" novalidate id="intake-form" data-group-zones="{{ group_zones }}">
         {% csrf_token %}
 
         {% if form.non_field_errors %}
diff --git a/templates/ops/qc_verify_detail.html b/templates/ops/qc_verify_detail.html
index 462b32a..421ad6a 100644
--- a/templates/ops/qc_verify_detail.html
+++ b/templates/ops/qc_verify_detail.html
@@ -42,7 +42,7 @@
         <button type="submit" name="approved" value="0" class="btn btn-outline-danger w-100"><i class="bi bi-x-circle"></i> Reject</button>
       </form>
       {% else %}
-      <p><span class="badge" {% if result.verification_status == 'approved' %}bg-success{% else %}bg-danger{% endif %}>{{ result.get_verification_status_display }}</span></p>
+      <p><span class="badge {% if result.verification_status == 'approved' %}bg-success{% else %}bg-danger{% endif %}">{{ result.get_verification_status_display }}</span></p>
       {% if result.verified_by %}<p class="text-muted mb-0">Verified by {{ result.verified_by.full_name|default:result.verified_by.email }} on {{ result.approved_at|date:'d/m/Y H:i' }}</p>{% endif %}
       {% endif %}
     </div>