diff --git a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor
index 5c2ff14..8f17a84 100644
--- a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor
+++ b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor
@@ -1,8 +1,8 @@
 @if (DoorsList != null)
 {
-
-    <button @onclick="()=>getBackStatus()">STEP BACK</button>
-    <button @onclick="()=>proceedStatus()">NEXT STEP</button>
+    <div class="col-3 py-1"  style="cursor: pointer">
+        <DoorSvgObj LineColor="#2D3047" LineWidth="8" ObjH="200" ObjW="650"  ObjId="0" TextData="@baseDict"></DoorSvgObj>
+    </div>
     <div class="row">
         @if (DoorsList == null || DoorsList.Count == 0)
         { }
diff --git a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs
index 5f65dc1..52f92ba 100644
--- a/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs
+++ b/WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs
@@ -30,6 +30,8 @@ namespace WebDoorCreator.UI.Components.DoorMan
 
         protected int orderStatus { get; set; } = 10;
 
+        protected Dictionary<string, string> baseDict { get; set; } = new Dictionary<string, string>();
+
         [Inject]
         protected WebDoorCreatorService WDService { get; set; } = null!;
 
@@ -91,6 +93,7 @@ namespace WebDoorCreator.UI.Components.DoorMan
 
         protected async Task ReloadData()
         {
+            baseDict.Add("ADD NEW DOOR", "");
             if (currOrderId != -1)
             {
                 DoorsList = await WDService.DoorGetByOrderId(currOrderId);
diff --git a/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor b/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor
index b48e712..f29827e 100644
--- a/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor
+++ b/WebDoorCreator.UI/Components/Order/OrderStatusStep.razor
@@ -5,25 +5,6 @@
     {
         @foreach (var item in currListOrderStatus)
         {
-            @*<div class=" p-0 fs-5 d-flex justify-content-between flex-wrap align-content-center" style="width: calc((100%)/7)" @onclick="()=>doChangeStep(item.Value)">
-    @if (int.Parse(item.Value) == CurrOrderStatus)
-    {
-    <div class="tail-left" style="--itemColor: @item.DefaultVal"></div>
-    <div class="button2Click flex-fill text-center d-flex flex-wrap align-content-center" style="--itemColor: @item.DefaultVal">@item.Label</div>
-    <div class="arrow-right" style="--itemColor: @item.DefaultVal"></div>
-    }
-    else
-    {
-    @if (int.Parse(item.Value) < CurrOrderStatus)
-    {
-    <div class="flex-fill text-center" style="--itemColor: #6c757d">@item.Label <i class="fa-solid fa-check"></i></div>
-    }
-    else
-    {
-    <div class="flex-fill text-center" style="--itemColor: #6c757d">@item.Label</div>
-    }
-    }
-    </div>*@
 
             <div class="col px-0">
                 @if (int.Parse(item.Value) == CurrOrderStatus)
diff --git a/WebDoorCreator.UI/Data/WebDoorCreatorService.cs b/WebDoorCreator.UI/Data/WebDoorCreatorService.cs
index 3583dbd..02a5194 100644
--- a/WebDoorCreator.UI/Data/WebDoorCreatorService.cs
+++ b/WebDoorCreator.UI/Data/WebDoorCreatorService.cs
@@ -253,6 +253,39 @@ namespace WebDoorCreator.UI.Data
                 InputType = ""
             };
             listValues.Add(listValObj);
+            listValObj = new ListValuesTempModel()
+            {
+                TableName = "All",
+                FieldName = "DoorDefStep",
+                Value = "10",
+                Label = "Door",
+                Ordinal = 10,
+                DefaultVal = "#448AFF",
+                InputType = ""
+            };
+            listValues.Add(listValObj);
+            listValObj = new ListValuesTempModel()
+            {
+                TableName = "All",
+                FieldName = "DoorDefStep",
+                Value = "20",
+                Label = "Hardware",
+                Ordinal = 20,
+                DefaultVal = "#448AFF",
+                InputType = ""
+            };
+            listValues.Add(listValObj);
+            listValObj = new ListValuesTempModel()
+            {
+                TableName = "All",
+                FieldName = "DoorDefStep",
+                Value = "30",
+                Label = "Report",
+                Ordinal = 30,
+                DefaultVal = "#448AFF",
+                InputType = ""
+            };
+            listValues.Add(listValObj);
 
             // parto con obj base
             sizeVal = fIniDef.ReadString("Size", "Width", "0.0");
diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor b/WebDoorCreator.UI/Pages/DoorDefinition.razor
index dc8242f..6ae0fd1 100644
--- a/WebDoorCreator.UI/Pages/DoorDefinition.razor
+++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor
@@ -1,23 +1,22 @@
 @page "/DoorDefinition"
 
-<div class="d-flex justify-content-between">
+@*<div class="d-flex justify-content-between">
     <div>
         <h3>Door Definition</h3>
     </div>
     <ButtonsDoorDef idOrd="@idOrd" paramsChanged="@B_doorOpUpd" DoorId="@idDoor"></ButtonsDoorDef>
-</div>
+</div>*@
 <div class="row">
-    <div class="col-7">
+    <div class="col-7 pe-0">
         <div>
-            <DoorDefOrderTopRow currOrderStatus="@orderStatus"></DoorDefOrderTopRow>
+            <DoorDefOrderTopRow currOrderStatus="@orderStatus" bgColor="#AFCFD1"></DoorDefOrderTopRow>
         </div>
-        <div class="mb-3">
-            <StepsList E_StepChanged="@setStep" DoorDefStep="@currDefStep"></StepsList>
+        <div class="mb-3 ps-1 pe-0">
+            <DoorDefStepList CurrDoorDefStatus="currDefStep" E_CurrStep="setStep"></DoorDefStepList>
         </div>
-        <div>
-
+        <div class="ps-2">
             <CascadingValue Value="@WDCUService.userId">
-                @if (currDefStep == Core.Enum.DoorDefStep.Door)
+                @if (currDefStep == 10)
                 {
                     @if (ListBaseDoorOp != null)
                     {
@@ -25,14 +24,14 @@
                     }
                     @*<DoorSizingStep E_paramChanged="catchParamChange" DoorId="@idDoor"></DoorSizingStep>*@
                 }
-                else if (currDefStep == Core.Enum.DoorDefStep.Hardware)
+                else if (currDefStep == 20)
                 {
                     <HardwareList isHwStep="@setHwToNull" DoorId="@idDoor" Lingua="@userLang"></HardwareList>
                 }
             </CascadingValue>
         </div>
     </div>
-    <div class="col-5">
+    <div class="col-5 p-0">
         <DoorPreview SvgContent="@DoorSvgContent"></DoorPreview>
     </div>
 </div>
diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs
index 59e18dc..5c76f11 100644
--- a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs
+++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs
@@ -126,12 +126,12 @@ namespace WebDoorCreator.UI.Pages
         /// </summary>
         /// <param name="caughtDefStep"></param>
         /// <returns></returns>
-        protected async Task setStep(Core.Enum.DoorDefStep caughtDefStep)
+        protected async Task setStep(int caughtDefStep)
         {
             setHwToNull = false;
             await Task.Delay(1);
             currDefStep = caughtDefStep;
-            if (currDefStep == Core.Enum.DoorDefStep.Hardware)
+            if (currDefStep == 20)
             {
                 setHwToNull = true;
             }
@@ -147,7 +147,7 @@ namespace WebDoorCreator.UI.Pages
 
         #region Private Properties
 
-        private Core.Enum.DoorDefStep currDefStep { get; set; } = Core.Enum.DoorDefStep.Door;
+        private int currDefStep { get; set; } = 10;
         private List<DoorOpModel>? ListBaseDoorOp { get; set; } = null;
         private List<DoorOpModel>? ListHwDoorOp { get; set; } = null;
         private List<OrderStatusViewModel>? ListOrdersStatus { get; set; } = null;
diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor b/WebDoorCreator.UI/Pages/OrderDetails.razor
index bbc400e..634cdce 100644
--- a/WebDoorCreator.UI/Pages/OrderDetails.razor
+++ b/WebDoorCreator.UI/Pages/OrderDetails.razor
@@ -4,40 +4,35 @@
 
     @if (orderView != null)
     {
-        <div class="testataOrder px-5 d-flex justify-content-between bg-dark text-light" style="--bgStepColor: @stepColor">
-            <div class="border border-light rounded px-3 d-flex justify-content-between small">
-                <div >Insert Date:</div>
+        <div class="testataOrder px-5 d-flex justify-content-between text-light" style="--bgStepColor: @stepColor">
+            <div class="border-bottom border-light px-3 d-flex justify-content-between small">
+                <div>Insert Date:</div>
                 <div>&nbsp;</div>
                 <div class=" fw-bold">@orderView.DateIns</div>
             </div>
-            <div class="border border-light rounded px-3 d-flex justify-content-between small">
+            <div class="border-bottom border-light px-3 d-flex justify-content-between small">
                 <div>Order External Code:</div>
                 <div>&nbsp;</div>
                 <div class="fw-bold">@orderView.OrderExtCode</div>
             </div>
-            <div class="border border-light rounded px-3 d-flex justify-content-between small">
+            <div class="border-bottom border-light px-3 d-flex justify-content-between small">
                 <div>Models Number</div>
                 <div>&nbsp;</div>
                 <div class="fw-bold">@orderView.NumType</div>
             </div>
-            <div class="border border-light rounded px-3 d-flex justify-content-between small">
+            <div class="border-bottom border-light px-3 d-flex justify-content-between small">
                 <div class="text-center">Doors Number</div>
                 <div>&nbsp;</div>
                 <div class="fw-bold">@orderView.NumDoors</div>
             </div>
 
-            @*<div>
-        <span class="fs-5">LIST DOORS IN ORDER <b>@idOrd</b></span>
-        </div>
-        <div>
-        <div class="input-group">
-        <select @bind="@currMeaUnit" class="form-select">
-        <option value="mm">mm</option>
-        <option value="inch">inch</option>
-        </select>
-        <button class="btn btn-sm btn-success" @onclick="() => createDoor()">+ Add new door</button>
-        </div>
-        </div>*@
+            <div class="input-group">
+                <select @bind="@currMeaUnit" class="form-select">
+                    <option value="mm">mm</option>
+                    <option value="inch">inch</option>
+                </select>
+                <button class="btn btn-sm btn-success" @onclick="() => createDoor()">+ Add new door</button>
+            </div>
 
         </div>
     }
diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor.cs b/WebDoorCreator.UI/Pages/OrderDetails.razor.cs
index 5b096d3..b4fb19a 100644
--- a/WebDoorCreator.UI/Pages/OrderDetails.razor.cs
+++ b/WebDoorCreator.UI/Pages/OrderDetails.razor.cs
@@ -321,6 +321,7 @@ namespace WebDoorCreator.UI.Pages
         {
             await Task.Delay(1);
             stepColor = StepColor;
+            StateHasChanged();
         }
 
         #endregion Protected Methods
diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor.css b/WebDoorCreator.UI/Pages/OrderDetails.razor.css
index 18e1d7b..0860454 100644
--- a/WebDoorCreator.UI/Pages/OrderDetails.razor.css
+++ b/WebDoorCreator.UI/Pages/OrderDetails.razor.css
@@ -23,4 +23,5 @@
   /*display: flex;
     justify-content: space-around;*/
   font-size: 17px;
+  background-color: #031926;
 }
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor.less b/WebDoorCreator.UI/Pages/OrderDetails.razor.less
index 5191347..5285602 100644
--- a/WebDoorCreator.UI/Pages/OrderDetails.razor.less
+++ b/WebDoorCreator.UI/Pages/OrderDetails.razor.less
@@ -26,4 +26,5 @@
     /*display: flex;
     justify-content: space-around;*/
     font-size: 17px;
+    background-color: #031926;
 }
diff --git a/WebDoorCreator.UI/Pages/OrderDetails.razor.min.css b/WebDoorCreator.UI/Pages/OrderDetails.razor.min.css
index 7f16517..e27cb9d 100644
--- a/WebDoorCreator.UI/Pages/OrderDetails.razor.min.css
+++ b/WebDoorCreator.UI/Pages/OrderDetails.razor.min.css
@@ -1 +1 @@
-.cardStatus{border-radius:60px;background-color:var(--bgStepColor);transform:translate(0,-65px);padding:1rem 4rem 4.5rem 4rem;}.cardDoors{width:100%;border-radius:60px 60px 0 0;transform:translate(0,-120px);background-color:#fff;padding:0;box-shadow:rgba(0,0,0,.45) 0 -24px 27px -20px;}.testataOrder{border:3px solid var(--bgStepColor);padding:1rem 1rem 4.5rem 1rem;border-radius:60px 60px 20px 20px;transform:translate(63px,0);width:93%;z-index:-99999;position:relative;font-size:17px;}
\ No newline at end of file
+.cardStatus{border-radius:60px;background-color:var(--bgStepColor);transform:translate(0,-65px);padding:1rem 4rem 4.5rem 4rem;}.cardDoors{width:100%;border-radius:60px 60px 0 0;transform:translate(0,-120px);background-color:#fff;padding:0;box-shadow:rgba(0,0,0,.45) 0 -24px 27px -20px;}.testataOrder{border:3px solid var(--bgStepColor);padding:1rem 1rem 4.5rem 1rem;border-radius:60px 60px 20px 20px;transform:translate(63px,0);width:93%;z-index:-99999;position:relative;font-size:17px;background-color:#031926;}
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Shared/MainLayout.razor b/WebDoorCreator.UI/Shared/MainLayout.razor
index 82161dd..fdcbaff 100644
--- a/WebDoorCreator.UI/Shared/MainLayout.razor
+++ b/WebDoorCreator.UI/Shared/MainLayout.razor
@@ -16,14 +16,29 @@
             <NavMenuHorizontal></NavMenuHorizontal>
         </div>
 
-        <article class="content">
-            @Body
-        </article>
+        @if (NavManager.Uri.Contains("OrderDetails"))
+        {
+            <article class="px-2 content">
+                @Body
+            </article>
+        }
+        else if (NavManager.Uri.Contains("DoorDefinition"))
+        {
+            <article class="px-1 py-0 content">
+                @Body
+            </article>
+        }
+        else
+        {
+            <article class="px-4 content">
+                @Body
+            </article>
+        }
         @*<div class="fixed-bottom bottom-row px-2">
         <CmpFooter></CmpFooter>
         </div>*@
         @*<div class="bottom-row px-4 auth">
-            <LoginDisplay />
+        <LoginDisplay />
         </div>*@
     </main>
 </div>
diff --git a/WebDoorCreator.UI/Shared/MainLayout.razor.cs b/WebDoorCreator.UI/Shared/MainLayout.razor.cs
index 55b3afb..9a49cb5 100644
--- a/WebDoorCreator.UI/Shared/MainLayout.razor.cs
+++ b/WebDoorCreator.UI/Shared/MainLayout.razor.cs
@@ -1,6 +1,10 @@
+using Microsoft.AspNetCore.Components;
+
 namespace WebDoorCreator.UI.Shared
 {
     public partial class MainLayout
     {
+        [Inject]
+        protected NavigationManager NavManager { get; set; } = null!;
     }
 }
\ No newline at end of file