diff --git a/MP-TAB-SERV/Components/FixOdl.razor b/MP-TAB-SERV/Components/FixOdl.razor
new file mode 100644
index 00000000..8856ac12
--- /dev/null
+++ b/MP-TAB-SERV/Components/FixOdl.razor
@@ -0,0 +1,21 @@
+
+<button class="btn btn-warning w-100" @onclick="toggleFixOdl"><i class="fa fa-check"></i> @txtBtnFixOdl</button>
+@if (forceOdl)
+{
+    <div class="row">
+        <div class="col-12">
+            <h1>Riassegnazione ODL</h1>
+        </div>
+        <div class="col-12">
+            <h4>Ultimi ODL lavorati:</h4>
+            ...tabella...
+        </div>
+        <div class="col-8">
+            cerca/selezione ODL (miei/tutti)
+        </div>
+        <div class="col-4">
+            <button calss="btn btn-lg btn-warning"><i class="fa-solid fa-plus"></i> Imposta ODL</button>
+        </div>
+    </div>
+}
+
diff --git a/MP-TAB-SERV/Components/FixOdl.razor.cs b/MP-TAB-SERV/Components/FixOdl.razor.cs
new file mode 100644
index 00000000..727da193
--- /dev/null
+++ b/MP-TAB-SERV/Components/FixOdl.razor.cs
@@ -0,0 +1,36 @@
+using Microsoft.AspNetCore.Components;
+using MP.Data.DatabaseModels;
+
+namespace MP_TAB_SERV.Components
+{
+    public partial class FixOdl
+    {
+        #region Public Properties
+
+        [Parameter]
+        public MappaStatoExpl? RecMSE { get; set; } = null;
+
+        #endregion Public Properties
+
+        #region Protected Properties
+
+        protected string txtBtnFixOdl { get => forceOdl ? "Fix ODL" : "Nascondi Fix"; }
+
+        #endregion Protected Properties
+
+        #region Protected Methods
+
+        protected void toggleFixOdl()
+        {
+            forceOdl = !forceOdl;
+        }
+
+        #endregion Protected Methods
+
+        #region Private Fields
+
+        private bool forceOdl = false;
+
+        #endregion Private Fields
+    }
+}
\ No newline at end of file
diff --git a/MP-TAB-SERV/Components/OdlMan.razor b/MP-TAB-SERV/Components/OdlMan.razor
index f701bc74..7c80034b 100644
--- a/MP-TAB-SERV/Components/OdlMan.razor
+++ b/MP-TAB-SERV/Components/OdlMan.razor
@@ -1,23 +1,23 @@
 
-<div class="col-12">
-    <MachSel RecMSE="RecMSE" E_MachSel="SetMacc"></MachSel>
-</div>
-
-<div>
-    <div class="d-flex justify-content-between">
-        @if (needConfProd)
+<div class="row">
+    <div class="col-12">
+        <MachSel RecMSE="RecMSE" E_MachSel="SetMacc"></MachSel>
+    </div>
+    @if (needConfProd)
+    {
+        <div class="col-12 text-danger">
+            <div class="fs-3">@lblWarnHead</div>
+            <div class="small">@lblWarnBody <b>@numPz2Conf</b> pz NC</div>
+        </div>
+        @if (!odlOk)
         {
-            <div class="col-12 text-danger">
-                <div class="fs-3">@lblWarnHead</div>
-                <div class="small">@lblWarnBody <b>@numPz2Conf</b> pz NC</div>
+            <div class="col-12">
+                <FixOdl RecMSE="RecMSE"></FixOdl>
             </div>
-            @if (!odlOk)
-            {
-                <div class="col-12">
-                    <button class="btn btn-warning w-100"><i class="fa fa-check"></i> Fix ODL</button>
-                </div>
-            }
         }
+    }
+    <div class="col-12">
+        Slave machine man
     </div>
     <div class="d-flex justify-content-between flex-wrap">
         <div class="col-12 col-sm-12 col-md-6 p-2">