diff --git a/Lux.UI/Components/Compo/OfferRowMan.razor b/Lux.UI/Components/Compo/OfferRowMan.razor
index c07a7706..a5c4a8b9 100644
--- a/Lux.UI/Components/Compo/OfferRowMan.razor
+++ b/Lux.UI/Components/Compo/OfferRowMan.razor
@@ -406,15 +406,16 @@ else
         <div class="modal" tabindex="-1" style="display:block; background-color: rgba(10,10,10,.6);" role="dialog">
             <div class="modal-dialog modal-xl">
                 <div class="modal-content">
-                    <div class="modal-header row modal-title">
-                        <div class="col-4 fs-3">
-                            Materiali (BOM)
-                        </div>
-                        <div class="col-4 text-center text-bg-secondary bg-gradient border border-2 rounded">
-                            <div class="fw-bold">@EditRecord.Note</div>
-                            <small class="small">@EditRecord.OfferRowUID</small>
-                        </div>
-                        <div class="col-4 text-end fs-4">
+                    <div class="modal-header">
+                        <div class="row w-100">
+                            <div class="col-4 fs-3">
+                                Materiali (BOM)
+                            </div>
+                            <div class="col-4 text-center text-bg-secondary bg-gradient border border-2 rounded">
+                                <div class="fw-bold">@EditRecord.Note</div>
+                                <small class="small">@EditRecord.OfferRowUID</small>
+                            </div>
+                            <div class="col-4 text-end fs-4">
                             <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" @onclick="ClosePopup">
                             </button>
                             <div class="form-check form-switch small" title="Abilita editing massivo">
@@ -422,6 +423,7 @@ else
                                 <label class="form-check-label">Mass Edit</label>
                             </div>
                         </div>
+                        </div>
                     </div>
                     <div class="modal-body">
                         <EditBom CurrRowRec="@EditRecord" MassEdit="enableMassEdit" BomList="CurrBomList" EC_Updated="UpdateBom"></EditBom>
@@ -436,18 +438,20 @@ else
         <div class="modal" tabindex="-1" style="display:block; background-color: rgba(10,10,10,.6);" role="dialog">
             <div class="modal-dialog modal-xl">
                 <div class="modal-content">
-                    <div class="modal-header row modal-title">
-                        <div class="col-4 fs-3">
-                            Lavorazioni (Cicli)
-                        </div>
-                        <div class="col-4 text-center border border-2 rounded">
-                            <div class="fw-bold">@EditRecord.Note</div>
-                            <small class="small">@EditRecord.OfferRowUID</small>
-                        </div>
-                        <div class="col-4 text-end fs-4">
+                    <div class="modal-header">
+                        <div class="row w-100">
+                            <div class="col-4 fs-3">
+                                Lavorazioni (Cicli)
+                            </div>
+                            <div class="col-4 text-center border border-2 rounded">
+                                <div class="fw-bold">@EditRecord.Note</div>
+                                <small class="small">@EditRecord.OfferRowUID</small>
+                            </div>
+                            <div class="col-4 text-end fs-4">
                             <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" @onclick="ClosePopup">
                             </button>
                         </div>
+                        </div>
                     </div>
                     <div class="modal-body">
                         <EditJob></EditJob>
diff --git a/Lux.UI/Components/Compo/WorkLoad/PartStatus.razor b/Lux.UI/Components/Compo/WorkLoad/PartStatus.razor
index e7f7e818..c8c766c0 100644
--- a/Lux.UI/Components/Compo/WorkLoad/PartStatus.razor
+++ b/Lux.UI/Components/Compo/WorkLoad/PartStatus.razor
@@ -1,26 +1,28 @@
 <div class="modal" tabindex="-1" style="display:block; background-color: rgba(10,10,10,.6);" role="dialog">
     <div class="modal-dialog modal-xl">
         <div class="modal-content">
-            <div class="modal-header row modal-title">
-                <div class="col-4 fs-3">
-                    Dettaglio Workload
-                    @if (DetailRecord.Workable)
-                    {
-                        <i class="fa-solid fa-thumbs-up text-success"></i>
-                    }
-                    else
-                    {
-                        <i class="fa-solid fa-thumbs-down text-danger"></i>
-                    }
-                </div>
-                <div class="col-4 text-center border border-2 rounded">
-                    <div class="fw-bold">Impianti considerati</div>
-                    <small class="small">@DetailRecord.ListMachinesJoin</small>
-                </div>
-                <div class="col-4 text-end fs-4">
-                    <button class="btn btn-lg btn-primary" @onclick="() => ReRunJob()"><i class="fa-solid fa-share-from-square" title="Riesecuzione Estimate"></i> Re-Run</button>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" @onclick="() => ClosePopup()">
-                    </button>
+            <div class="modal-header">
+                <div class="row w-100">
+                    <div class="col-4 fs-3">
+                        Dettaglio Workload
+                        @if (DetailRecord.Workable)
+                        {
+                            <i class="fa-solid fa-thumbs-up text-success"></i>
+                        }
+                        else
+                        {
+                            <i class="fa-solid fa-thumbs-down text-danger"></i>
+                        }
+                    </div>
+                    <div class="col-4 text-center border border-2 rounded">
+                        <div class="fw-bold">Impianti considerati</div>
+                        <small class="small">@DetailRecord.ListMachinesJoin</small>
+                    </div>
+                    <div class="col-4 text-end fs-4">
+                        <button class="btn btn-lg btn-primary" @onclick="() => ReRunJob()"><i class="fa-solid fa-share-from-square" title="Riesecuzione Estimate"></i> Re-Run</button>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" @onclick="() => ClosePopup()">
+                        </button>
+                    </div>
                 </div>
             </div>
             <div class="modal-body">
diff --git a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor
index 5cbc60d3..0c90e0b5 100644
--- a/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor
+++ b/Lux.UI/Components/Compo/WorkLoad/TimeEstim.razor
@@ -1,26 +1,28 @@
 <div class="modal" tabindex="-1" style="display:block; background-color: rgba(10,10,10,.6);" role="dialog">
     <div class="modal-dialog modal-xl">
         <div class="modal-content">
-            <div class="modal-header row modal-title">
-                <div class="col-4 fs-3">
-                    Assegnazione Workload
-                    @if (DetailRecord.Workable)
-                    {
-                        <i class="fa-solid fa-thumbs-up text-success"></i>
-                    }
-                    else
-                    {
-                        <i class="fa-solid fa-thumbs-down text-danger"></i>
-                    }
-                </div>
-                <div class="col-4 text-center border border-2 rounded">
-                    <div class="fw-bold">Impianti considerati</div>
-                    <small class="small">@DetailRecord.ListMachinesJoin</small>
-                </div>
-                <div class="col-4 text-end fs-4">
-                    <button class="btn btn-lg btn-primary" @onclick="() => ReRunJob()"><i class="fa-solid fa-share-from-square" title="Riesecuzione Estimate"></i> Re-Run</button>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" @onclick="() => ClosePopup()">
-                    </button>
+            <div class="modal-header">
+                <div class="row w-100">
+                    <div class="col-4 fs-3">
+                        Assegnazione Workload
+                        @if (DetailRecord.Workable)
+                        {
+                            <i class="fa-solid fa-thumbs-up text-success"></i>
+                        }
+                        else
+                        {
+                            <i class="fa-solid fa-thumbs-down text-danger"></i>
+                        }
+                    </div>
+                    <div class="col-4 text-center border border-2 rounded">
+                        <div class="fw-bold">Impianti considerati</div>
+                        <small class="small">@DetailRecord.ListMachinesJoin</small>
+                    </div>
+                    <div class="col-4 text-end fs-4">
+                        <button class="btn btn-lg btn-primary" @onclick="() => ReRunJob()"><i class="fa-solid fa-share-from-square" title="Riesecuzione Estimate"></i> Re-Run</button>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" @onclick="() => ClosePopup()">
+                        </button>
+                    </div>
                 </div>
             </div>
             <div class="modal-body">