diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor
index d0df140..f3d6b84 100644
--- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor
+++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor
@@ -109,14 +109,10 @@ else
                             }
                         }
                     </div>
+                    <button class="btnHighlight">
+                        <i class="fa-solid fa-highlighter"></i>
+                    </button>
                     <div class="testata" style="transform: translate(0, -9rem);">
-                        <div class="row">
-                            <div class="text-end">
-                                <button class="btnHighlight">
-                                    <i class="fa-solid fa-highlighter"></i>
-                                </button>
-                            </div>
-                        </div>
                         <div class="row borderBottom">
                             @if (isChangedVal())
                             {
diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css
index 5c12066..1db664c 100644
--- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css
+++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.css
@@ -48,7 +48,7 @@
   border: 5px solid #00838F;
   z-index: 99999;
   background: #03A9F4;
-  transform: translate(1.6rem, 1rem);
+  transform: translate(17.6rem, -8rem);
 }
 .btnCancel {
   border-radius: 50%;
diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less
index 55a60f5..4b81b05 100644
--- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less
+++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.less
@@ -36,7 +36,7 @@
 .btnHighlight {
     .btnGen;
     background: #03A9F4;
-    transform: translate(1.6rem, 1rem);
+    transform: translate(17.6rem, -8rem);
 }
 .btnCancel {
     .btnGen;
diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css
index 22bb871..293fec7 100644
--- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css
+++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.min.css
@@ -1 +1 @@
-.btnGen{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;}.btnDelete{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#b71c1c;transform:translate(25px,-1rem);}.btnClone{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#fff;transform:translate(1.6rem,-1rem);}.btnPDFSuccess{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#8e44ad;transform:translate(1rem,1rem);}.btnPDFPending{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#f1c40f;transform:translate(16rem,1rem);}.btnHighlight{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#03a9f4;transform:translate(1.6rem,1rem);}.btnCancel{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:var(--colorCode);transform:translate(-2rem,1rem);}.btnSave{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:var(--colorCode);transform:translate(-2.6rem,1rem);}.btnHeadTail{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.btnConfirm{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;border-bottom:3px solid #000;}.btnHead{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.borderTop{border-top:7px solid #00838f;}.borderBottom{border-bottom:7px solid #00838f;width:100%;}.modal-dialog{overflow-y:initial!important;}.modal-body{height:18.75rem;overflow-y:auto;}.testata{width:100%;}select,input{border:0;border-bottom:2px solid #000;background:none;height:2rem;}i{display:flex;align-items:center;justify-content:center;flex-wrap:wrap;font-size:1.1rem;}
\ No newline at end of file
+.btnGen{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;}.btnDelete{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#b71c1c;transform:translate(25px,-1rem);}.btnClone{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#fff;transform:translate(1.6rem,-1rem);}.btnPDFSuccess{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#8e44ad;transform:translate(1rem,1rem);}.btnPDFPending{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#f1c40f;transform:translate(16rem,1rem);}.btnHighlight{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:#03a9f4;transform:translate(17.6rem,-8rem);}.btnCancel{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:var(--colorCode);transform:translate(-2rem,1rem);}.btnSave{border-radius:50%;width:3.5rem;height:3.5rem;border:5px solid #00838f;z-index:99999;background:var(--colorCode);transform:translate(-2.6rem,1rem);}.btnHeadTail{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.btnConfirm{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;border-bottom:3px solid #000;}.btnHead{width:100%;padding:.8rem 0 .8rem 0;background:none;border:0;}.borderTop{border-top:7px solid #00838f;}.borderBottom{border-bottom:7px solid #00838f;width:100%;}.modal-dialog{overflow-y:initial!important;}.modal-body{height:18.75rem;overflow-y:auto;}.testata{width:100%;}select,input{border:0;border-bottom:2px solid #000;background:none;height:2rem;}i{display:flex;align-items:center;justify-content:center;flex-wrap:wrap;font-size:1.1rem;}
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Components/Order/OrderList.razor b/WebDoorCreator.UI/Components/Order/OrderList.razor
index 6afc7e5..675a1c4 100644
--- a/WebDoorCreator.UI/Components/Order/OrderList.razor
+++ b/WebDoorCreator.UI/Components/Order/OrderList.razor
@@ -11,7 +11,7 @@ else
                 <th>Order Date <Sorter ParamName="OrderDate" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
                 <th>Order Number <Sorter ParamName="OrderNumber" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
                 <th>Order Description</th>
-                <th class="text-end">Doors Number</th>
+                <th class="text-end">Quantity</th>
                 <th class="text-end">Model Number</th>
                 <th class="text-end">Order Status</th>
                 <th class="text-end">TOTAL COST</th>
diff --git a/WebDoorCreator.UI/Components/Order/OrderList.razor.cs b/WebDoorCreator.UI/Components/Order/OrderList.razor.cs
index cc3f796..89014f4 100644
--- a/WebDoorCreator.UI/Components/Order/OrderList.razor.cs
+++ b/WebDoorCreator.UI/Components/Order/OrderList.razor.cs
@@ -194,28 +194,29 @@ namespace WebDoorCreator.UI.Components.Order
                     {
                         switch (sortField)
                         {
-
-                            case "OrderNumber":
-                                if (sortAsc)
-                                {
-                                    ListOrdersStatus = SearchRecords.OrderBy(x => x.OrderExtCode).ToList();
-                                }
-                                else
-                                {
-                                    ListOrdersStatus = SearchRecords.OrderByDescending(x => x.OrderExtCode).ToList();
-                                }
-                                break;
-                            default:
                             case "OrderDate":
                                 if (sortAsc)
                                 {
-                                    ListOrdersStatus = SearchRecords.OrderByDescending(x => x.DateIns).ToList();
+                                    ListOrdersStatus = ListOrdersStatus.OrderBy(x => x.DateIns).ToList();
                                 }
                                 else
                                 {
-                                    ListOrdersStatus = SearchRecords.OrderBy(x => x.DateIns).ToList();
+                                    ListOrdersStatus = ListOrdersStatus.OrderByDescending(x => x.DateIns).ToList();
                                 }
                                 break;
+                            case "OrderNumber":
+                                if (sortAsc)
+                                {
+                                    ListOrdersStatus = ListOrdersStatus.OrderBy(x => x.OrderExtCode).ToList();
+                                }
+                                else
+                                {
+                                    ListOrdersStatus = ListOrdersStatus.OrderByDescending(x => x.OrderExtCode).ToList();
+                                }
+                                break;
+                            default:
+                                ListOrdersStatus = ListOrdersStatus.OrderByDescending(x => x.DateIns).ToList();
+                                break;
                         }
                     }
 
diff --git a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor
index c49079b..451d005 100644
--- a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor
+++ b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor
@@ -22,6 +22,8 @@
     <defs>
         <pattern id="@($"contImg_{ObjId}")" patternContentUnits="userSpaceOnUse" width="1" height="1">
             <image x="0" y="0" href="@ImagePath" width="50%" height="100%"></image>
+            <image x="0" y="0" href="images/Plus.png" width="30%" height="100%" style="transform: translate(-3px, -55px)" class="plusAnim"></image>
+            <image x="0" y="0" href="images/Minus.png" width="30%" height="100%" style="transform: translate(-3px, 42px)" class="minusAnim"></image>
         </pattern>
     </defs>
     <circle id="circleCont" cx="@CircleImg.cx" cy="@CircleImg.cy" r="@CircleImg.rad" fill="url(#@($"contImg_{ObjId}"))" @onclick="()=>execFunc()" style="cursor: pointer" />
diff --git a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.css b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.css
new file mode 100644
index 0000000..325bbda
--- /dev/null
+++ b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.css
@@ -0,0 +1,14 @@
+.plusAnim {
+  opacity: 0;
+  transition: 0.3s;
+}
+.plusAnim:hover {
+  opacity: 1;
+}
+.minusAnim {
+  opacity: 0;
+  transition: 0.3s;
+}
+.minusAnim:hover {
+  opacity: 1;
+}
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.less b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.less
new file mode 100644
index 0000000..23e48e0
--- /dev/null
+++ b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.less
@@ -0,0 +1,16 @@
+.plusAnim {
+    opacity: 0;
+    transition: 0.3s;
+}
+
+.plusAnim:hover {
+    opacity: 1
+}
+.minusAnim {
+    opacity: 0;
+    transition: 0.3s;
+}
+
+.minusAnim:hover {
+    opacity: 1
+}
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.min.css b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.min.css
new file mode 100644
index 0000000..00c9481
--- /dev/null
+++ b/WebDoorCreator.UI/Components/SvgComp/DoorSvgObj.razor.min.css
@@ -0,0 +1 @@
+.plusAnim{opacity:0;transition:.3s;}.plusAnim:hover{opacity:1;}.minusAnim{opacity:0;transition:.3s;}.minusAnim:hover{opacity:1;}
\ No newline at end of file
diff --git a/WebDoorCreator.UI/compilerconfig.json b/WebDoorCreator.UI/compilerconfig.json
index c8e2006..5271010 100644
--- a/WebDoorCreator.UI/compilerconfig.json
+++ b/WebDoorCreator.UI/compilerconfig.json
@@ -62,5 +62,9 @@
   {
     "outputFile": "Components/Report/ReportList.razor.css",
     "inputFile": "Components/Report/ReportList.razor.less"
+  },
+  {
+    "outputFile": "Components/SvgComp/DoorSvgObj.razor.css",
+    "inputFile": "Components/SvgComp/DoorSvgObj.razor.less"
   }
 ]
\ No newline at end of file
diff --git a/WebDoorCreator.UI/temp/Conf.yaml b/WebDoorCreator.UI/temp/Conf.yaml
index fc11bd9..1fab737 100644
--- a/WebDoorCreator.UI/temp/Conf.yaml
+++ b/WebDoorCreator.UI/temp/Conf.yaml
@@ -15,10 +15,10 @@ order:
 date: 2023-05-15T00:00:00.0000000+02:00
 piece: DO_1
 size:
-  width: 50
-  height: 50
+  width: 33.8125
+  height: 81.25
   thickness: 1.75
-swing: LHI
+swing: LH
 secure: UP
 material: wood
 profiles:
@@ -39,23 +39,37 @@ profiles:
     machining: ON
     overmaterial: 0.1
 hardware:
-  louver_cut_outs:
+  vision_cut_outs:
     - shape: Generic\Rect
-      length: 10.0000
-      width: 18.8125
-      bottom_rail: 8.0
-      lock_stile: 0.0
+      length: 30
+      width: 16
+      top_rail: 5.5
+      lock_stile: 0
+      radius: 0
       door_center: center
  
-  face_decoration:
-    - template: General\Decor_C
-      type: lines
-      depth: 0.0625
-      topdistance: 5.0
-      bottomdistance: 7.0
-      lockstiledistance: 4.0
-      hingestiledistance: 4.0
-      face: secure
+  mail_slots:
+    - template: Generic\Rect
+      height: 3
+      bottom_rail: 20
+      delta_center: 0
+ 
+  hinges:
+    - template: Generic Conceiled\StdConHingeDeepR
+      ToptoCL: 4.875
+      back_set: 0.125
+      thickness: 0.25
+    - template: Generic Conceiled\StdConHingeDeepR
+      ToptoCL: 4.875
+      back_set: 0.125
+      thickness: 0.25
+ 
+  locks:
+    - template: Generic\Std86
+      position: 45.875
+      back_set: 2.0
+      offset_WS: 0.0
+      side: lock_top
  
 
 ---
diff --git a/WebDoorCreator.UI/temp/Minus.svg b/WebDoorCreator.UI/temp/Minus.svg
new file mode 100644
index 0000000..672619b
--- /dev/null
+++ b/WebDoorCreator.UI/temp/Minus.svg
@@ -0,0 +1,3 @@
+<svg width="185" height="93" viewBox="0 0 185 93" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="185" height="93" fill="#FF0000" fill-opacity="0.5"/>
+</svg>
diff --git a/WebDoorCreator.UI/temp/Plus.svg b/WebDoorCreator.UI/temp/Plus.svg
new file mode 100644
index 0000000..cbd42b2
--- /dev/null
+++ b/WebDoorCreator.UI/temp/Plus.svg
@@ -0,0 +1,4 @@
+<svg width="185" height="93" viewBox="0 0 185 93" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="185" height="93" fill="#00FF00" fill-opacity="0.5"/>
+<path d="M89.0511 55.4233V35.3097H94.1364V55.4233H89.0511ZM81.5369 47.9091V42.8239H101.651V47.9091H81.5369Z" fill="white"/>
+</svg>
diff --git a/WebDoorCreator.UI/wwwroot/images/Minus.png b/WebDoorCreator.UI/wwwroot/images/Minus.png
new file mode 100644
index 0000000..3d9fa6a
Binary files /dev/null and b/WebDoorCreator.UI/wwwroot/images/Minus.png differ
diff --git a/WebDoorCreator.UI/wwwroot/images/Plus.png b/WebDoorCreator.UI/wwwroot/images/Plus.png
new file mode 100644
index 0000000..3c8e29f
Binary files /dev/null and b/WebDoorCreator.UI/wwwroot/images/Plus.png differ