diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor
index ee22bad..1006ca8 100644
--- a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor
+++ b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor
@@ -17,12 +17,13 @@
 	<Columns>
 		<DxGridDataColumn FieldName="Id" SortIndex="0" SortOrder="GridColumnSortOrder.Descending" />
 		<DxGridDataColumn FieldName="CustomerId" />
-		<DxGridDataColumn FieldName="OrderTotal" />
 		
 		<DxGridDataColumn FieldName="OrderStatus" />
 		<DxGridDataColumn FieldName="IsMeasurable" ReadOnly="true" />
 		<DxGridDataColumn FieldName="MeasuringStatus" ReadOnly="true" />
 		@* <DxGridDataColumn FieldName="IsMeasured" ReadOnly="true" /> *@
+		
+		<DxGridDataColumn FieldName="OrderTotal" Caption="Végösszeg (br.)"/>
 
 		<DxGridDataColumn FieldName="IsAllOrderItemAvgWeightValid" ReadOnly="true" Caption="AvgWeightValid" />
 		
@@ -111,6 +112,34 @@
 		LoadingPanelVisibility.Visible = false;
 	}
 
+	// void OnCustomizeElement(GridCustomizeElementEventArgs e)
+	// {
+	// 	if (e.ElementType == GridElementType.DataCell)
+	// 	{
+	// 		//if (some_condition)
+	// 			e.Attributes["title"] = "some tooltip";
+	// 	}
+	// }
+
+	// void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
+	// {
+	// 	if (e.ElementType == GridElementType.DataCell)
+	// 	{
+	// 		var fieldName = ((DxGridDataColumn)e.Column).FieldName;
+	// 		var cellIdentifier = e.VisibleIndex + ":" + fieldName;
+            
+	// 		e.Attributes["data-id"] = cellIdentifier;
+	// 		e.Attributes["onmouseenter"] = EventCallback.Factory.Create<MouseEventArgs>(
+	// 			this,
+	// 			async _ =>
+	// 			{
+	// 				hoveredCellInfo = fieldName + ": " + e.Grid.GetRowValue(e.VisibleIndex, fieldName);
+	// 				selector = "td[data-id=\"" + cellIdentifier + "\"]";
+	// 				await Hint.ShowAsync();
+	// 			});
+	// 	}
+	// }
+
 	protected async Task OnActiveTabChanged(int activeTabIndex)
 	{
 		_activeTabIndex = activeTabIndex;
diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor
index 4cde8f1..bf0da5f 100644
--- a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor
+++ b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor
@@ -32,8 +32,6 @@
 		</DxGridDataColumn>
 
 		@* <DxGridDataColumn FieldName="ProductName" /> *@
-		<DxGridDataColumn FieldName="PriceInclTax" DisplayFormat="c" />
-		<DxGridDataColumn FieldName="UnitPriceInclTax" DisplayFormat="c" />
 
 		<DxGridDataColumn FieldName="Quantity" />
 		<DxGridDataColumn FieldName="NetWeight" />
@@ -41,6 +39,9 @@
 		<DxGridDataColumn FieldName="IsMeasurable" ReadOnly="true" />
 		<DxGridDataColumn FieldName="MeasuringStatus" ReadOnly="true" />
 		@* <DxGridDataColumn FieldName="IsMeasured" ReadOnly="true" /> *@
+		
+		<DxGridDataColumn FieldName="UnitPriceInclTax" Caption="Egységár (br.)" />
+		<DxGridDataColumn FieldName="PriceInclTax" Caption="Végösszeg (br.)" />
 
 		<DxGridDataColumn FieldName="AverageWeight" ReadOnly="true" Visible="false" Caption="AvgWeight" />
 		<DxGridDataColumn FieldName="AverageWeightDifference" ReadOnly="true" Visible="false" Caption="AvgWeightDiff" />
diff --git a/FruitBankHybrid.Shared/Components/GridShippingItemTemplate.razor b/FruitBankHybrid.Shared/Components/GridShippingItemTemplate.razor
index f95a4ec..2c641bd 100644
--- a/FruitBankHybrid.Shared/Components/GridShippingItemTemplate.razor
+++ b/FruitBankHybrid.Shared/Components/GridShippingItemTemplate.razor
@@ -20,8 +20,8 @@ FocusedRowChanged="Grid_FocusedRowChanged" *@
 
 <GridShippingItem @ref="Grid" IsMasterGrid="IsMasterGrid" DataSource="ShippingItems" AutoSaveLayoutName="GridShippingItem"
 				  SignalRClient="FruitBankSignalRClient" Logger="_logger"
-					  CssClass="@GridCss" ValidationEnabled="false" EditMode="GridEditMode.EditRow"
-					  FocusedRowChanged="Grid_FocusedRowChanged">
+				  CssClass="@GridCss" ValidationEnabled="false" EditMode="GridEditMode.EditRow"
+				  FocusedRowChanged="Grid_FocusedRowChanged">
 	@* <MgGridBase Data="ShippingItems" IsMasterGrid="IsMasterGrid" CssClass="@GridCss" AutoSaveLayoutName="GridShippingItem"
             ValidationEnabled="false" EditMode="GridEditMode.EditRow"
             EditModelSaving="Grid_EditModelSaving"
@@ -48,7 +48,8 @@ FocusedRowChanged="Grid_FocusedRowChanged" *@
 			</EditSettings>
 		</DxGridDataColumn>
 
-		@* <DxGridDataColumn FieldName="PalletId" Caption="pId" Width="125" /> *@
+		<DxGridDataColumn FieldName="@("ShippingDocument.Partner.Name")" Caption="Patner" Width="125" ReadOnly="true" />
+
 		<DxGridDataColumn FieldName="ProductId" Caption="Product">
 			<EditSettings>
 				<DxComboBoxSettings Data="ProductDtos"
@@ -91,7 +92,20 @@ FocusedRowChanged="Grid_FocusedRowChanged" *@
 		<DxGridDataColumn FieldName="Modified" ReadOnly="true" />
 		<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
 	</Columns>
-	<DetailRowTemplate>
+@* 	<DataColumnCellDisplayTemplate>
+		@{
+			if (context.DataColumn.FieldName == nameof(ShippingItem.ShippingDocumentId))
+			{
+				<span>@(String.Format("{0:P2}", context.Value))</span>
+				// format the value as percentage
+			}
+			else
+			{
+				<span>@context.DisplayText</span>
+			}
+		}
+	</DataColumnCellDisplayTemplate>
+ *@	<DetailRowTemplate>
 		@{
 			var shippingItemPallets = ((ShippingItem)context.DataItem).ShippingItemPallets;
 			<GridShippingItemPallets ShippingItemPallets="shippingItemPallets" IsMasterGrid="false"></GridShippingItemPallets>
@@ -100,7 +114,7 @@ FocusedRowChanged="Grid_FocusedRowChanged" *@
 	<ToolbarTemplate>
 		@if (IsMasterGrid)
 		{
-			<FruitBankToolbarTemplate Grid="Grid" OnReloadDataClick="() => ReloadDataFromDb(true)"/>
+			<FruitBankToolbarTemplate Grid="Grid" OnReloadDataClick="() => ReloadDataFromDb(true)" />
 		}
 	</ToolbarTemplate>
 	<GroupSummary>
diff --git a/FruitBankHybrid.Shared/Databases/DatabaseClient.cs b/FruitBankHybrid.Shared/Databases/DatabaseClient.cs
index 01ce922..a223791 100644
--- a/FruitBankHybrid.Shared/Databases/DatabaseClient.cs
+++ b/FruitBankHybrid.Shared/Databases/DatabaseClient.cs
@@ -60,12 +60,12 @@ public class ProductDtoTable(FruitBankSignalRClient fruitBankSignalRClient) : Mg
     private readonly SemaphoreSlim _semaphoreSlim = new(1);
     public async Task<ProductDtoTable> LoadDataAsync(bool onlyIfEmpty = true)
     {
-        if (onlyIfEmpty && Count != 0) return this;
+        if (onlyIfEmpty && Count > 0) return this;
 
         using (await _semaphoreSlim.UseWaitAsync())
         {
             //Előfordulhat, h egy másik szálban már megtörtént a refresh... - J.
-            if (onlyIfEmpty && Count != 0) return this;
+            if (onlyIfEmpty && Count > 0) return this;
 
             var items = (await fruitBankSignalRClient.GetProductDtoTableItems() ?? []);
 
@@ -86,11 +86,11 @@ public class OrderDtoTable(FruitBankSignalRClient fruitBankSignalRClient) : MgOb
 
     public async Task<OrderDtoTable> LoadDataAsync(bool onlyIfEmpty = true)
     {
-        if (onlyIfEmpty && Count != 0) return this;
+        if (onlyIfEmpty && Count > 0) return this;
 
         using (await _semaphoreSlim.UseWaitAsync())
         {
-            if (Count != 0) return this;
+            if (Count > 0) return this;
 
             var items = (await fruitBankSignalRClient.GetAllOrderDtoTableItems() ?? []);
 
diff --git a/FruitBankHybrid.Shared/Layout/NavMenu.razor b/FruitBankHybrid.Shared/Layout/NavMenu.razor
index da7c360..613268f 100644
--- a/FruitBankHybrid.Shared/Layout/NavMenu.razor
+++ b/FruitBankHybrid.Shared/Layout/NavMenu.razor
@@ -28,12 +28,12 @@
 			</div>
 			<div class="nav-item px-3">
 				<NavLink class="nav-link" href="MeasuringIn">
-					<span class="icon counter-icon" aria-hidden="true"></span> Bejövő mérés
+					<span class="icon counter-icon" aria-hidden="true"></span> Áru bevételezés
 				</NavLink>
 			</div>
 			<div class="nav-item px-3">
 				<NavLink class="nav-link" href="MeasuringOut">
-					<span class="icon counter-icon" aria-hidden="true"></span> Kimenő mérés
+					<span class="icon counter-icon" aria-hidden="true"></span> Áru kiadás
 				</NavLink>
 			</div>
 
diff --git a/FruitBankHybrid.Shared/Pages/Home.razor b/FruitBankHybrid.Shared/Pages/Home.razor
index f8eae27..0053c25 100644
--- a/FruitBankHybrid.Shared/Pages/Home.razor
+++ b/FruitBankHybrid.Shared/Pages/Home.razor
@@ -12,12 +12,12 @@ Welcome to your new app running on <em>@Factor</em> using <em>@Platform</em>.
 	<div class="col-md-3"></div>
 	<div class="col-md-3">
 		<NavLink href="MeasuringIn">
-			<DxButton Text="Bejövő mérés"></DxButton>
+			<DxButton Text="Áru bevételezés"></DxButton>
 		</NavLink>
 	</div>
 	<div class="col-md-3">
 		<NavLink href="MeasuringOut">
-			<DxButton Text="Kimenő mérés"></DxButton>
+			<DxButton Text="Áru kiadás"></DxButton>
 		</NavLink>
 	</div>
 	<div class="col-md-3"></div>
diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor
index 4eed6ec..08dfd58 100644
--- a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor
+++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor
@@ -8,7 +8,7 @@
 @using FruitBankHybrid.Shared.Services
 @using Mango.Nop.Core.Dtos
 
-<h3>Bejövő mérés</h3>
+<h3>Áru bevételezés</h3>
 
 <div style="margin-top: 50px;">
 	<DxLoadingPanel @bind-Visible="LoadingPanelVisible"
diff --git a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor
index dd3f9b8..f17b4bf 100644
--- a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor
+++ b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor
@@ -8,7 +8,7 @@
 @using FruitBankHybrid.Shared.Components
 @using FruitBankHybrid.Shared.Services
 @using Nop.Core.Domain.Orders
-<h3>Kimenő mérés</h3>
+<h3>Áru kiadás</h3>
 
 <DxDialogProvider />
 
diff --git a/FruitBankHybrid.Shared/wwwroot/app.css b/FruitBankHybrid.Shared/wwwroot/app.css
index 097605d..b3d657c 100644
--- a/FruitBankHybrid.Shared/wwwroot/app.css
+++ b/FruitBankHybrid.Shared/wwwroot/app.css
@@ -103,6 +103,7 @@ h1:focus {
 	font-weight: 700;
 	color: #161616;
 }
+
 /* DevExpress and Bootstrap Themes */
 .alt-item > td:not(.dxbl-grid-empty-cell),
 .alt-item > td:not(.dxbl-grid-indent-cell) {