diff --git a/.idea/.idea.FA_WEB/.idea/.gitignore b/.idea/.idea.FA_WEB/.idea/.gitignore
new file mode 100644
index 0000000..9587f30
--- /dev/null
+++ b/.idea/.idea.FA_WEB/.idea/.gitignore
@@ -0,0 +1,13 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/projectSettingsUpdater.xml
+/contentModel.xml
+/modules.xml
+/.idea.FA_WEB.iml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/.idea.FA_WEB/.idea/encodings.xml b/.idea/.idea.FA_WEB/.idea/encodings.xml
new file mode 100644
index 0000000..df87cf9
--- /dev/null
+++ b/.idea/.idea.FA_WEB/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.FA_WEB/.idea/indexLayout.xml b/.idea/.idea.FA_WEB/.idea/indexLayout.xml
new file mode 100644
index 0000000..7b08163
--- /dev/null
+++ b/.idea/.idea.FA_WEB/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.FA_WEB/.idea/vcs.xml b/.idea/.idea.FA_WEB/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/.idea.FA_WEB/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/OrdersManagement/Components/Pages/CustomerOrders.razor b/OrdersManagement/Components/Pages/CustomerOrders.razor
index 32ecf03..4259d02 100644
--- a/OrdersManagement/Components/Pages/CustomerOrders.razor
+++ b/OrdersManagement/Components/Pages/CustomerOrders.razor
@@ -23,32 +23,23 @@
           SelectedItemsChanged="SelectedItemsChanged">
 
         <GridColumns>
-            <GridColumn TItem="CustomerOrderDto" HeaderText="CO Number" PropertyName="CoNum">
+            <GridColumn TItem="CustomerOrderDto" HeaderText="Numer Zamówienia" PropertyName="CoNum">
                 @context.CoNum
             </GridColumn>
-            <GridColumn TItem="CustomerOrderDto" HeaderText="Customer Number" PropertyName="CustNum">
+            <GridColumn TItem="CustomerOrderDto" HeaderText="Zamówienie Klienta" PropertyName="CustNum">
+                @context.CustPo
+            </GridColumn>
+            <GridColumn TItem="CustomerOrderDto" HeaderText="Numer Klienta" PropertyName="CustNum">
                 @context.CustNum
             </GridColumn>
-            <GridColumn TItem="CustomerOrderDto" HeaderText="Recipient" PropertyName="CustSeq">
+            <GridColumn TItem="CustomerOrderDto" HeaderText="Odbiorca" PropertyName="CustSeq">
                 @context.CustSeq
             </GridColumn>
-            <GridColumn TItem="CustomerOrderDto" HeaderText="Last Update Date" PropertyName="CreateDate">
+            <GridColumn TItem="CustomerOrderDto" HeaderText="Data zamówienia" PropertyName="CreateDate">
                 @context.CreateDate
             </GridColumn>
-            <GridColumn TItem="CustomerOrderDto" HeaderText="Gate" PropertyName="Uf_FKR_EDI_Gate">
-                @context.Uf_FKR_EDI_Gate
-            </GridColumn>
-            <GridColumn TItem="CustomerOrderDto" HeaderText="RecipientCode" PropertyName="Uf_FKR_EDI_RecipientCode">
-                @context.Uf_FKR_EDI_RecipientCode
-            </GridColumn>
-            <GridColumn TItem="CustomerOrderDto" HeaderText="SellerCode" PropertyName="Uf_FKR_EDI_SellerCode">
-                @context.Uf_FKR_EDI_SellerCode
-            </GridColumn>
-            <GridColumn TItem="CustomerOrderDto" HeaderText="SenderCode" PropertyName="Uf_FKR_EDI_SenderCode">
-                @context.Uf_FKR_EDI_SenderCode
-            </GridColumn>
-            <GridColumn TItem="CustomerOrderDto" HeaderText="BuyerCode" PropertyName="Uf_FKR_EDI_BuyerCode">
-                @context.Uf_FKR_EDI_BuyerCode
+            <GridColumn TItem="CustomerOrderDto" HeaderText="Status" PropertyName="Stat">
+                @context.TranslatedStatus
             </GridColumn>
         </GridColumns>
     </Grid>
diff --git a/OrdersManagement/Components/Pages/EdiCustomerOrders.razor b/OrdersManagement/Components/Pages/EdiCustomerOrders.razor
index 3c1a7d7..8be9001 100644
--- a/OrdersManagement/Components/Pages/EdiCustomerOrders.razor
+++ b/OrdersManagement/Components/Pages/EdiCustomerOrders.razor
@@ -47,18 +47,18 @@
             <GridColumn TItem="EdiCustomerOrderDto" HeaderText="Zamówienie Klienta" PropertyName="CustomerPoNumber">
                 @context.CustomerPoNumber
             </GridColumn>
-            <GridColumn TItem="EdiCustomerOrderDto" HeaderText="Klient" PropertyName="CustomerNumber">
+            <GridColumn TItem="EdiCustomerOrderDto" HeaderText="Numer Klienta" PropertyName="CustomerNumber">
                 @context.CustomerNumber
             </GridColumn>
+            <GridColumn TItem="EdiCustomerOrderDto" HeaderText="Klient" PropertyName="CustomerName">
+                @context.CustomerName
+            </GridColumn>
             <GridColumn TItem="EdiCustomerOrderDto" HeaderText="Odbiorca" PropertyName="CustomerSequence">
                 @context.CustomerSequence
             </GridColumn>
             <GridColumn TItem="EdiCustomerOrderDto" HeaderText="Data Otrzymania" PropertyName="CreateDate">
                 @context.CreateDate
             </GridColumn>
-            <GridColumn TItem="EdiCustomerOrderDto" HeaderText="Klient" PropertyName="CustomerName">
-                @context.CustomerName
-            </GridColumn>
             <GridColumn TItem="EdiCustomerOrderDto" HeaderText="Zamówienie SL" PropertyName="SlOrderNumber">
                 @context.SlOrderNumber
             </GridColumn>
diff --git a/OrdersManagement/Components/Pages/ScheduleOrders.razor b/OrdersManagement/Components/Pages/ScheduleOrders.razor
index 3e15892..116ca26 100644
--- a/OrdersManagement/Components/Pages/ScheduleOrders.razor
+++ b/OrdersManagement/Components/Pages/ScheduleOrders.razor
@@ -4,41 +4,45 @@
 @inject NavigationManager NavigationManager
 @inherits LayoutComponentBase
 
-<h3>Zamówienia DELFOR </h3>
+<div class="row">
+    <h3>Zamówienia DELFOR </h3>
+</div>
+<br />
+<div class="row">
+    <Grid @ref="_grid"
+          TItem="ScheduleOrderDto"
+          Class="table table-hover table-bordered table-striped"
+          DataProvider="ScheduleOrdersDataProvider"
+          AllowFiltering="true"
+          Responsive="true"
+          AllowPaging="true"
+          PageSize="20"
+          AllowSelection="true"
+          AllowRowClick="true"
+          OnRowDoubleClick="OnRowDoubleClick">
 
-<Grid @ref="_grid"
-      TItem="ScheduleOrderDto"
-      Class="table table-hover table-bordered table-striped"
-      DataProvider="ScheduleOrdersDataProvider"
-      AllowFiltering="true"
-      Responsive="true"
-      AllowPaging="true"
-      PageSize="20"
-      AllowSelection="true"
-      AllowRowClick="true"
-      OnRowDoubleClick="OnRowDoubleClick">
-
-    <GridColumns>
-        <GridColumn TItem="ScheduleOrderDto" HeaderText="Zamówienie" PropertyName="OrderID">
-            @context.OrderID
-        </GridColumn>
-        <GridColumn TItem="ScheduleOrderDto" HeaderText="Zamówienie Klienta" PropertyName="PONum">
-            @context.PONum
-        </GridColumn>
-        <GridColumn TItem="ScheduleOrderDto" HeaderText="Odbiorca" PropertyName="RecipientCode">
-            @context.RecipientCode
-        </GridColumn>
-        <GridColumn TItem="ScheduleOrderDto" HeaderText="Klient" PropertyName="PurchaserCode">
-            @context.PurchaserCode
-        </GridColumn>
-        <GridColumn TItem="ScheduleOrderDto" HeaderText="Data Utworzenia" PropertyName="LastUpdateDate">
-            @context.LastUpdateDate
-        </GridColumn>
-        <GridColumn TItem="ScheduleOrderDto" HeaderText="Typ Dokumentu" PropertyName="DocType">
-            @context.DocType
-        </GridColumn>
-    </GridColumns>
-</Grid>
+        <GridColumns>
+            <GridColumn TItem="ScheduleOrderDto" HeaderText="Zamówienie" PropertyName="OrderID">
+                @context.OrderID
+            </GridColumn>
+            <GridColumn TItem="ScheduleOrderDto" HeaderText="Zamówienie Klienta" PropertyName="PONum">
+                @context.PONum
+            </GridColumn>
+            <GridColumn TItem="ScheduleOrderDto" HeaderText="Odbiorca" PropertyName="RecipientCode">
+                @context.RecipientCode
+            </GridColumn>
+            <GridColumn TItem="ScheduleOrderDto" HeaderText="Klient" PropertyName="PurchaserCode">
+                @context.PurchaserCode
+            </GridColumn>
+            <GridColumn TItem="ScheduleOrderDto" HeaderText="Data Utworzenia" PropertyName="LastUpdateDate">
+                @context.LastUpdateDate
+            </GridColumn>
+            <GridColumn TItem="ScheduleOrderDto" HeaderText="Typ Dokumentu" PropertyName="DocType">
+                @context.DocType
+            </GridColumn>
+        </GridColumns>
+    </Grid>    
+</div>
 
 @code {
     Grid<ScheduleOrderDto>? _grid;