diff --git a/GWMS.Data/DatabaseModels/WeekPlanModel.cs b/GWMS.Data/DatabaseModels/WeekPlanModel.cs
index db2c672..84ffbc6 100644
--- a/GWMS.Data/DatabaseModels/WeekPlanModel.cs
+++ b/GWMS.Data/DatabaseModels/WeekPlanModel.cs
@@ -28,7 +28,7 @@ namespace GWMS.Data.DatabaseModels
 
         public DayOfWeek DayNum { get; set; } = DayOfWeek.Monday;
 
-        public int DeliveryHour { get; set; } = 13;
+        public int DeliveryHour { get; set; }
 
         [MaxLength(250)]
         public string Note { get; set; } = "";
diff --git a/GWMS.UI/Components/WeekPlanEditor.razor b/GWMS.UI/Components/WeekPlanEditor.razor
index 700e45c..a7cf5eb 100644
--- a/GWMS.UI/Components/WeekPlanEditor.razor
+++ b/GWMS.UI/Components/WeekPlanEditor.razor
@@ -19,120 +19,101 @@
             <DataAnnotationsValidator />
             <div class="row">
                 <div class="col-9 col-lg-10">
-                    @*<div class="row mb-2">
-                            <div class="col-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fas fa-puzzle-piece"></i></span>
-                                    </div>
-                                    <InputText @bind-Value="_currItem.UserName" class="form-control" title="User Name" />
-                                </div>
-                            </div>
-                            <div class="col-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fas fa-user"></i></span>
-                                    </div>
-                                    <InputText @bind-Value="_currItem.Lastname" class="form-control" title="Cognome" />
-                                </div>
-                            </div>
-                            <div class="col-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="far fa-user"></i></span>
-                                    </div>
-                                    <InputText @bind-Value="_currItem.Firstname" class="form-control" title="Nome" />
-                                </div>
-                            </div>
-                            <div class="col-2">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">
-                                            <i class="fas fa-user-shield"></i>
-                                        </span>
-                                    </div>
-                                    <select @bind="_currItem.Livello" class="form-control">
-                                        @foreach (var itemVal in Enum.GetValues(typeof(GWMS.Data.UserLevel)))
-                                        {
-                                            <option>@itemVal</option>
-                                        }
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="col-1">
-                                <div class="custom-control custom-switch">
-                                    <input type="checkbox" class="custom-control-input" id="switchAtt" title="attivo" @bind="_currItem.IsActive">
-                                    <label class="custom-control-label" for="switchAtt">Att</label>
+                    <div class="row mb-2">
+                        <div class="col-4">
+                            <div class="input-group input-group-sm">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fas fa-puzzle-piece"></i></span>
                                 </div>
+                                <select @bind="_currItem.DayNum" class="form-control" title="Giorno">
+                                    @foreach (var itemVal in Enum.GetValues(typeof(DayOfWeek)))
+                                    {
+                                        <option>@itemVal</option>
+                                    }
+                                </select>
                             </div>
                         </div>
-                        <div class="row">
-                            <div class="col-3">
-                                <div class="input-group input-group-sm">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fas fa-at"></i></span>
-                                    </div>
-                                    <InputText @bind-Value="_currItem.Email" class="form-control" title="Email" />
+                        <div class="col-4">
+                            <div class="input-group input-group-sm">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="fas fa-user"></i></span>
                                 </div>
+                                <select @bind="_currItem.DeliveryHour" class="form-control" title="Ora">
+                                    @for (int iHour = 0; iHour < 24; iHour++)
+                                    {
+                                        <option>@iHour</option>
+                                    }
+                                </select>
                             </div>
-                            <div class="col-3">
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">
-                                            <span class="fas fa-gas-pump" aria-hidden="true"></span>
-                                        </span>
-                                    </div>
-                                    <select @bind="_currItem.MaskPlantId" class="form-control form-control-sm">
-                                        <option value="0">--- Tutti ---</option>
-                                        @if (PlantsList != null)
+                        </div>
+                        <div class="col-4">
+                            <div class="input-group input-group-sm">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text"><i class="far fa-user"></i></span>
+                                </div>
+                                <InputText @bind-Value="_currItem.Note" class="form-control" title="Qty" />
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-4">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text">
+                                        <span class="fas fa-gas-pump" aria-hidden="true"></span>
+                                    </span>
+                                </div>
+                                <select @bind="_currItem.PlantId" class="form-control form-control-sm">
+                                    <option value="0">--- Tutti ---</option>
+                                    @if (PlantsList != null)
+                                    {
+                                        foreach (var item in PlantsList)
                                         {
-                                            foreach (var item in PlantsList)
-                                            {
-                                                <option value="@item.PlantId">@item.PlantCode | @item.PlantDesc</option>
-                                            }
+                                            <option value="@item.PlantId">@item.PlantCode | @item.PlantDesc</option>
                                         }
-                                    </select>
-                                </div>
+                                    }
+                                </select>
                             </div>
-                            <div class="col-3">
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">
-                                            <span class="fas fa-industry" aria-hidden="true"></span>
-                                        </span>
-                                    </div>
-                                    <select @bind="_currItem.MaskSupplierId" class="form-control form-control-sm">
-                                        <option value="0">--- Tutti ---</option>
-                                        @if (SuppliersList != null)
+                        </div>
+                        <div class="col-4">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text">
+                                        <span class="fas fa-industry" aria-hidden="true"></span>
+                                    </span>
+                                </div>
+                                <select @bind="_currItem.SupplierId" class="form-control form-control-sm">
+                                    <option value="0">--- Tutti ---</option>
+                                    @if (SuppliersList != null)
+                                    {
+                                        foreach (var item in SuppliersList)
                                         {
-                                            foreach (var item in SuppliersList)
-                                            {
-                                                <option value="@item.SupplierId">@item.SupplierCode | @item.SupplierDesc</option>
-                                            }
+                                            <option value="@item.SupplierId">@item.SupplierCode | @item.SupplierDesc</option>
                                         }
-                                    </select>
-                                </div>
+                                    }
+                                </select>
                             </div>
-                            <div class="col-3">
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text">
-                                            <span class="fas fa-truck-moving" aria-hidden="true"></span>
-                                        </span>
-                                    </div>
-                                    <select @bind="_currItem.MaskTranspId" class="form-control form-control-sm" title="Trasportatore">
-                                        <option value="0">--- Tutti ---</option>
-                                        @if (TransportersList != null)
+                        </div>
+                        <div class="col-4">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text">
+                                        <span class="fas fa-truck-moving" aria-hidden="true"></span>
+                                    </span>
+                                </div>
+                                <select @bind="_currItem.TransporterId" class="form-control form-control-sm" title="Trasportatore">
+                                    <option value="0">--- Tutti ---</option>
+                                    @if (TransportersList != null)
+                                    {
+                                        foreach (var item in TransportersList)
                                         {
-                                            foreach (var item in TransportersList)
-                                            {
-                                                <option value="@item.TransporterId">@item.TransporterCode | @item.TransporterDesc</option>
-                                            }
+                                            <option value="@item.TransporterId">@item.TransporterCode | @item.TransporterDesc</option>
                                         }
-                                    </select>
-                                </div>
+                                    }
+                                </select>
                             </div>
-                        </div>*@
+                        </div>
+                    </div>
                 </div>
 
                 <div class="col-3 col-lg-2">
diff --git a/GWMS.UI/Pages/WeekPlan.razor b/GWMS.UI/Pages/WeekPlan.razor
index 14498cb..60e453a 100644
--- a/GWMS.UI/Pages/WeekPlan.razor
+++ b/GWMS.UI/Pages/WeekPlan.razor
@@ -16,7 +16,7 @@
     <div class="card-body">
         @if (currRecord != null)
         {
-            <WeekPlanEditor Basket="@currRecord" DataReset="ResetData" DataUpdated="UpdateData"></WeekPlanEditor>
+            <WeekPlanEditor currItem="@currRecord" DataReset="ResetData" DataUpdated="UpdateData"></WeekPlanEditor>
         }
         <div class="row">
             <div class="col-10 text-center">
diff --git a/GWMS.UI/Pages/WeekPlan.razor.cs b/GWMS.UI/Pages/WeekPlan.razor.cs
index 2b9be63..4f46faf 100644
--- a/GWMS.UI/Pages/WeekPlan.razor.cs
+++ b/GWMS.UI/Pages/WeekPlan.razor.cs
@@ -170,7 +170,7 @@ namespace GWMS.UI.Pages
             {
                 DayNum = DayOfWeek.Sunday,
                 DeliveryHour = 14,
-                Note = ""
+                Note = "18K"
             };
             currRecord = newRecord;
         }