diff --git a/server.js b/server.js
index 90defdc..793eb0d 100644
--- a/server.js
+++ b/server.js
@@ -866,14 +866,11 @@ function renderOrderForm(step, stepKey = "demografi", fppTests = [], mouId = "")
     pemeriksaan: `
       <div class="stack">
         <div class="panel" style="padding:0; box-shadow:none; background:transparent; border:0">
-          ${panelHeader("Mandatory", "Select examinations from the FPP catalog. Only doctortest=true rows are interactive.")}
+          ${panelHeader("Mandatory", "Select examinations from the FPP catalog. Only doctortest=true rows are interactive.", '<button class="btn btn-primary" type="submit">Submit order</button>')}
           <div class="note-box fpp-selection-summary">
             <strong>Selected tests</strong>
             <p id="order-selected-count">0 selected</p>
           </div>
-          <div class="topbar-actions" style="justify-content:flex-start; margin: 0 0 14px;">
-            <button class="btn btn-primary" type="submit">Submit order</button>
-          </div>
           ${
             packedGroups.length
               ? `<div class="fpp-select-board">${packedGroups
@@ -964,10 +961,7 @@ function renderOrderForm(step, stepKey = "demografi", fppTests = [], mouId = "")
             ${stepBody}
             <div class="topbar-actions" style="justify-content: space-between; margin-top: 10px;">
               <a class="btn btn-secondary" href="/orders/new/${prev ? prev[0] : "demografi"}">Back</a>
-              <div class="pill-row">
-                <a class="btn btn-ghost" href="/orders">Save draft</a>
-                ${next ? `<a class="btn btn-primary" href="/orders/new/${next[0]}" hx-get="/fragments/forms/order-step/${next[0]}" hx-target="#order-step-fragment" hx-push-url="true">Continue</a>` : ""}
-              </div>
+              ${next ? `<a class="btn btn-primary" href="/orders/new/${next[0]}" hx-get="/fragments/forms/order-step/${next[0]}" hx-target="#order-step-fragment" hx-push-url="true">Continue</a>` : ""}
             </div>
           </div>
         </section>