diff --git a/Lux.UI/Components/Compo/Offer/OfferRowMan.razor b/Lux.UI/Components/Compo/Offer/OfferRowMan.razor
index 6b9d3212..8b2833bc 100644
--- a/Lux.UI/Components/Compo/Offer/OfferRowMan.razor
+++ b/Lux.UI/Components/Compo/Offer/OfferRowMan.razor
@@ -34,11 +34,11 @@
 else
 {
     <div class="card shadow shadow-sm">
-        <div class="card-header bg-success bg-opacity-50 bg-gradient">
+        <div class="card-header bg-success bg-opacity-50 bg-gradient px-2">
             <div class="d-flex justify-content-between">
                 @if (DisplayMode == DisplayMode.Preview)
                 {
-                    <div class="px-0 d-flex justify-content-between">
+                    <div class="d-flex justify-content-between">
                         <div class="px-1">
                             <b>@CurrRecord.OfferCode</b> <span class="small text-secondary">@CurrRecord.Envir</span>
                         </div>
@@ -46,7 +46,7 @@ else
                 }
                 else
                 {
-                    <div class="px-0 d-flex">
+                    <div class="d-flex">
                         @if (CurrRecord.Envir == EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW)
                         {
                             <div class="px-1">
@@ -273,23 +273,23 @@ else
                                                 </div>
                                             }
                                         </div>
-                                        <div class="row w-75">
-                                            <div class="col">
-                                                @if (item.CalcEnabled)
+                                        <div class="row py-2 w-75 justify-content-between align-items-center">
+                                            @if (item.CalcEnabled)
+                                            {
+                                                @if (item.Envir != EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW || !string.IsNullOrEmpty(item.FileName))
                                                 {
-                                                    @if (item.Envir != EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW || !string.IsNullOrEmpty(item.FileName))
-                                                    {
-                                                        <div class="d-flex justify-content-between align-items-center py-2 small">
-                                                            <div>@item.FileName</div>
-                                                            <div>@fSize(item.FileSize)</div>
-                                                        </div>
-                                                    }
+                                                    <div class="col">
+                                                        <div class="text-nowrap small">@item.FileName</div>
+                                                    </div>
+                                                    <div class="col text-end px-0">
+                                                        <div class="text-nowrap small">@fSize(item.FileSize)</div>
+                                                    </div>
                                                 }
-                                                @if (DisplayMode != DisplayMode.Preview && item.CalcEnabled && item.Envir == EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW)
-                                                {
-                                                    <div class="list-group-item py-1 small"><a href="@(DownloadUrl(item.OfferRowUID))" target="_blank" class="btn btn-sm btn-success">Download <i class="fa-solid fa-download"></i></a></div>
-                                                }
-                                            </div>
+                                            }
+                                            @if (DisplayMode != DisplayMode.Preview && item.CalcEnabled && item.Envir == EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW)
+                                            {
+                                                <div class="list-group-item py-1 small"><a href="@(DownloadUrl(item.OfferRowUID))" target="_blank" class="btn btn-sm btn-success">Download <i class="fa-solid fa-download"></i></a></div>
+                                            }
                                         </div>
                                         @* <ul class="list-group">
                                             <li class="list-group-item d-flex justify-content-between align-items-start align-items-center px-2 py-1">
diff --git a/Lux.UI/Components/Compo/Order/OrderRowMan.razor b/Lux.UI/Components/Compo/Order/OrderRowMan.razor
index ed473da0..7c1c81cb 100644
--- a/Lux.UI/Components/Compo/Order/OrderRowMan.razor
+++ b/Lux.UI/Components/Compo/Order/OrderRowMan.razor
@@ -211,10 +211,51 @@ else
                                     </td>
                                     <td class="align-top">
                                         <div class="align-content-center">
-                                            <ul class="list-group">
-                                                @* <li class="list-group-item d-flex justify-content-between align-items-start align-items-center px-2 py-1 active">
-                                                    @item.Original.Note
-                                                </li> *@
+                                            <div class="row justify-content-between align-items-center">
+                                                <div class="col fw-bold">@item.Original.OrderRowUID</div>
+                                                @if (ShowBom(item.Original))
+                                                {
+                                                    <div class="col">
+                                                        @if (CurrEditMode == EditMode.None)
+                                                        {
+                                                            <button class="btn btn-sm btn-primary" @onclick="() => RequestBom(item.Original)" title="Richiesta ricalcolo BOM">
+                                                                BOM <i class="fa-solid fa-arrow-right-arrow-left pe-2"></i>
+                                                                @if (item.Original.AwaitBom)
+                                                                {
+                                                                    <span class="text-warning spinner-grow spinner-grow-sm" aria-hidden="true"></span>
+                                                                }
+                                                            </button>
+                                                        }
+                                                        else
+                                                        {
+                                                            <button class="btn btn-sm btn-secondary disabled">
+                                                                BOM <i class="fa-solid fa-arrow-right-arrow-left pe-2"></i>
+                                                                @if (item.Original.AwaitBom)
+                                                                {
+                                                                    <span class="text-warning spinner-grow spinner-grow-sm" aria-hidden="true"></span>
+                                                                }
+                                                            </button>
+                                                        }
+                                                    </div>
+                                                }
+                                            </div>
+                                            @if (item.Original.Envir != EgwMultiEngineManager.Data.Constants.EXECENVIRONMENTS.WINDOW || !string.IsNullOrEmpty(item.Original.FileName))
+                                            {
+                                                <div class="row py-2 w-75 justify-content-between align-items-center">
+                                                    <div class="col">
+                                                        <div class="text-nowrap small">@item.Original.FileName</div>
+                                                    </div>
+                                                    <div class="col text-end px-0">
+                                                        <div class="text-nowrap small">@fSize(item.Original.FileSize)</div>
+                                                    </div>
+                                                </div>
+                                            }
+                                            <div class="row py-2 w-75 justify-content-between align-items-center">
+                                                <div class="col py-1 small">
+                                                    <button class="btn btn-sm btn-warning" @onclick="() => DoGenFabbisogni(item.Original)"><i class="fa-solid fa-basket-shopping"></i></button>
+                                                </div>
+                                            </div>
+                                            @* <ul class="list-group">
                                                 <li class="list-group-item d-flex justify-content-between align-items-start align-items-center px-2 py-1">
                                                     <div class="fw-bold">@item.Original.OrderRowUID</div>
                                                     @if (ShowBom(item.Original))
@@ -253,7 +294,7 @@ else
                                                     <li class="list-group-item d-flex justify-content-between align-items-start px-2 py-1 small">
                                                     <button class="btn btn-sm btn-warning" @onclick="()=>DoGenFabbisogni(item.Original)"><i class="fa-solid fa-basket-shopping"></i></button>
                                                         </li>
-                                            </ul>
+                                            </ul> *@
                                         </div>
                                     </td>
                                     @if (CurrEditMode == EditMode.RecData && EditRecord != null && EditRecord.OrderRowID == item.Original.OrderRowID)