diff --git a/LUX.UI/LUX.UI/Components/Compo/OfferMan.razor b/LUX.UI/LUX.UI/Components/Compo/OfferMan.razor
index 242f8972..2551861e 100644
--- a/LUX.UI/LUX.UI/Components/Compo/OfferMan.razor
+++ b/LUX.UI/LUX.UI/Components/Compo/OfferMan.razor
@@ -1,4 +1,77 @@
-<div class="modal" tabindex="-1" style="display:block; background-color: rgba(10,10,10,.6);" role="dialog">
+<div class="card shadow">
+    <div class="card-dialog card-xl">
+        <div class="card-content">
+            <div class="card-header">
+                <div class="card-title fs-4">Edit Offerta <b>@CurrRecord.OfferCode</b></div>
+                <button type="button" class="btn-close" data-bs-dismiss="card" aria-label="Close" @onclick="ClosePopup">
+                </button>
+            </div>
+            <div class="card-body">
+                <div class="row">
+                    <div class="col-3">
+                        <div class="form-floating mb-3">
+                            <select @bind="@CurrRecord.CustomerID" class="form-select">
+                                @foreach (var item in CustomersList)
+                                {
+                                    <option value="@item.CustomerID">@item.FirstName @item.LastName (@item.VAT)</option>
+                                }
+                            </select>
+                            <label class="small">Cliente</label>
+                        </div>
+                    </div>
+                    <div class="col-3">
+                        <div class="form-floating mb-3">
+                            <select @bind="@CurrRecord.DealerID" class="form-select">
+                                @foreach (var item in DealersList)
+                                {
+                                    <option value="@item.DealerID">@item.CompanyName | @item.FirstName @item.LastName</option>
+                                }
+                            </select>
+                            <label class="small">Rivenditore</label>
+                        </div>
+                    </div>
+                    <div class="col-2">
+                        <div class="form-floating mb-3">
+                            <select @bind="@CurrRecord.OffertState" class="form-select">
+                                @foreach (var item in Enum.GetValues(typeof(Core.Enum.OfferStates)))
+                                {
+                                    <option value="@item">@item</option>
+                                }
+                            </select>
+                            <label class="small">Stato</label>
+                        </div>
+                    </div>
+                    <div class="col-2">
+                        <div class="form-floating mb-3">
+                            <input @bind="@CurrRecord.Inserted" class="form-control" type="date">
+                            <label class="small">Data Ins.</label>
+                        </div>
+                    </div>
+                    <div class="col-2">
+                        <div class="form-floating mb-3">
+                            <input @bind="@CurrRecord.ValidUntil" class="form-control" type="date">
+                            <label class="small">Validit&agrave;</label>
+                        </div>
+                    </div>
+                    <div class="col-12">
+                        <div class="form-floating mb-3">
+                            <textarea @bind="@CurrRecord.Description" class="form-control" type="text"></textarea>
+                            <label class="small">Descrizione</label>
+                        </div>
+                    </div>
+                    <div class="col-6">
+                        <button class="btn btn-lg btn-success w-100"><i class="fa-solid fa-floppy-disk"></i> Save</button>
+                    </div>
+                    <div class="col-6">
+                        <button class="btn btn-lg btn-warning w-100"><i class="fa-solid fa-ban"></i> Cancel</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+@* <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">
@@ -30,13 +103,24 @@
                             <label class="small">Rivenditore</label>
                         </div>
                     </div>
-                    <div class="col-3">
+                    <div class="col-2">
+                        <div class="form-floating mb-3">
+                            <select @bind="@CurrRecord.OffertState" class="form-select">
+                                @foreach (var item in Enum.GetValues(typeof(Core.Enum.OfferStates)))
+                                {
+                                    <option value="@item">@item</option>
+                                }
+                            </select>
+                            <label class="small">Stato</label>
+                        </div>
+                    </div>
+                    <div class="col-2">
                         <div class="form-floating mb-3">
                             <input @bind="@CurrRecord.Inserted" class="form-control" type="date">
                             <label class="small">Data Ins.</label>
                         </div>
                     </div>
-                    <div class="col-3">
+                    <div class="col-2">
                         <div class="form-floating mb-3">
                             <input @bind="@CurrRecord.ValidUntil" class="form-control" type="date">
                             <label class="small">Validit&agrave;</label>
@@ -48,8 +132,14 @@
                             <label class="small">Descrizione</label>
                         </div>
                     </div>
+                    <div class="col-6">
+                        <button class="btn btn-lg btn-success w-100"><i class="fa-solid fa-floppy-disk"></i> Save</button>
+                    </div>
+                    <div class="col-6">
+                        <button class="btn btn-lg btn-warning w-100"><i class="fa-solid fa-ban"></i> Cancel</button>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div> *@
\ No newline at end of file
diff --git a/LUX.UI/LUX.UI/Components/Compo/OfferMan.razor.cs b/LUX.UI/LUX.UI/Components/Compo/OfferMan.razor.cs
index 9a0dd56a..9c429bc4 100644
--- a/LUX.UI/LUX.UI/Components/Compo/OfferMan.razor.cs
+++ b/LUX.UI/LUX.UI/Components/Compo/OfferMan.razor.cs
@@ -16,10 +16,8 @@ namespace Lux.UI.Components.Compo
 
         #endregion Public Properties
 
-#if false
         [Parameter]
-        public EventCallback EC_Updated { get; set; }
-#endif
+        public EventCallback<bool> EC_Updated { get; set; }
 
         #region Protected Properties
 
diff --git a/LUX.UI/LUX.UI/Components/Pages/Offers.razor b/LUX.UI/LUX.UI/Components/Pages/Offers.razor
index b28df0b7..6d26ebe1 100644
--- a/LUX.UI/LUX.UI/Components/Pages/Offers.razor
+++ b/LUX.UI/LUX.UI/Components/Pages/Offers.razor
@@ -1,18 +1,24 @@
 @page "/Offers"
 
 
-@if(EditRecord!=null)
+@* @if(EditRecord!=null)
 {
     <OfferMan CurrRecord="EditRecord" EC_Close="DoClose"></OfferMan>
-}
+} *@
 <div class="card shadow">
-    <div class="card-header d-flex justify-content-between">
-        <div class="px-0 fs-3">
-            <b>Offerte</b> <button class="btn btn-success" @onclick="DoAdd"><i class="fa-solid fa-cart-plus"></i> Nuova</button>
-        </div>
-        <div class="px-0">
-            Periodo | ricerca testo
+    <div class="card-header">
+        <div class=" d-flex justify-content-between">
+            <div class="px-0 fs-3">
+                <b>Offerte</b> <button class="btn btn-success" @onclick="DoAdd"><i class="fa-solid fa-cart-plus"></i> Nuova</button>
+            </div>
+            <div class="px-0">
+                Periodo | ricerca testo
+            </div>
         </div>
+        @if (EditRecord != null)
+        {
+            <OfferMan CurrRecord="EditRecord" EC_Close="DoClose"></OfferMan>
+        }
     </div>
     <div class="card-body">
         @if (isLoading || ListRecords == null)