diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor
index 9421a2c..0edbf3c 100644
--- a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor
+++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor
@@ -10,7 +10,7 @@
 
 <div style="margin-top: 50px;">
 	<DxFormLayout CaptionPosition="CaptionPosition.Vertical" CssClass="w-100">
-		<DxFormLayoutItem Caption="Érkezés dátuma" ColSpanMd="2">
+		<DxFormLayoutItem Caption="Érkezés dátuma" ColSpanMd="2" CaptionCssClass="@(SelectedShipping != null && _shippingDates.Where(x=>DaysEqual(x.DateTime, SelectedShipping.ShippingDate)).All(x => x.IsMeasured) ? "text-success" : "")">
 			<DxDateEdit CssClass="cw-320"
 						DisplayFormat="m"
 						Format="m"
@@ -36,7 +36,7 @@
 			</DxDateEdit>
 		</DxFormLayoutItem>
 
-		<DxFormLayoutItem Caption="Kamion rendszáma:" ColSpanMd="2">
+		<DxFormLayoutItem Caption="Kamion rendszáma:" ColSpanMd="2" CaptionCssClass="@(SelectedShipping?.IsAllMeasured == true ? "text-success" : "")">
 			<DxComboBox Data="@NotMeasuredShippings"
 						@bind-Value="@SelectedShipping"
 						Text="Select licence plate"
@@ -52,33 +52,41 @@
 			</DxComboBox>
 		</DxFormLayoutItem>
 
-		<DxFormLayoutItem Caption="Partner:" ColSpanMd="3">
+		<DxFormLayoutItem Caption="Partner:" ColSpanMd="3" CaptionCssClass="@(SelectedShippingDocument?.IsAllMeasured == true ? "text-success" : "")">
 			<DxComboBox Data="@SelectedShipping?.ShippingDocuments"
-			            @bind-Value="@SelectedShippingDocument"
-			            Text="Select partner"
-			            ValueFieldName="@nameof(ShippingDocument.Id)"
-			            TextFieldName="@(nameof(ShippingDocument.Partner) + '.' + nameof(Partner.Name))"
-			            CssClass="cw-480"
-			            Context="ctxShippingDocument"
-			            SelectedDataItemChanged="@((SelectedDataItemChangedEventArgs<ShippingDocument> args) => OnSelectedShippingDocumentChanged(args))"
-			            InputId="cbShippingDocument">
+						@bind-Value="@SelectedShippingDocument"
+						Text="Select partner"
+						ValueFieldName="@nameof(ShippingDocument.Id)"
+						TextFieldName="@(nameof(ShippingDocument.Partner) + '.' + nameof(Partner.Name))"
+						CssClass="cw-480"
+						Context="ctxShippingDocument"
+						SelectedDataItemChanged="@((SelectedDataItemChangedEventArgs<ShippingDocument> args) => OnSelectedShippingDocumentChanged(args))"
+						InputId="cbShippingDocument">
 				<ItemDisplayTemplate>
 					<span class="@(ctxShippingDocument.DataItem.IsAllMeasured ? "text-success" : "")">@ctxShippingDocument.DisplayText</span>
 				</ItemDisplayTemplate>
 			</DxComboBox>
 		</DxFormLayoutItem>
 
-		<DxFormLayoutItem Caption="Termék:" ColSpanMd="5">
+		<DxFormLayoutItem Caption="Termék:" ColSpanMd="5" CaptionCssClass="@(SelectedShippingItem?.IsMeasured == true ? "text-success" : "")">
 			<DxComboBox Data="@SelectedShippingDocument?.ShippingItems"
-			            @bind-Value="@SelectedShippingItem"
-			            Text="Select item"
-			            ValueFieldName="@nameof(ShippingItem.Id)"
-			            TextFieldName="@(nameof(ShippingItem.Name))"
-			            CssClass="cw-480"
-			            Context="ctxShippingitem"
-			            SelectedDataItemChanged="@((SelectedDataItemChangedEventArgs<ShippingItem> args) => OnSelectedShippingItemChanged(args))"
-			            InputId="cbShippingItem">
+						@bind-Value="@SelectedShippingItem"
+						Text="Select item"
+						ValueFieldName="@nameof(ShippingItem.Id)"
+						TextFieldName="@(nameof(ShippingItem.Name))"
+						CssClass="cw-480"
+						Context="ctxShippingitem"
+						SelectedDataItemChanged="@((SelectedDataItemChangedEventArgs<ShippingItem> args) => OnSelectedShippingItemChanged(args))"
+						InputId="cbShippingItem">
 				<ItemDisplayTemplate>
+					@* 					<div class="combobox-item-template">
+						<img src="/images/ok_green_lt.jpg" alt="" />
+						<span class="icon counter-icon" aria-hidden="true"></span>
+						<div class="combobox-item-template-text">
+							<span>@ctxShippingitem.DisplayText</span>
+ 						</div>
+					</div>
+ *@					
 					<span class="@(ctxShippingitem.DataItem.IsMeasured ? "text-success" : "")">@ctxShippingitem.DisplayText)</span>
 				</ItemDisplayTemplate>
 			</DxComboBox>
@@ -94,17 +102,17 @@
 				  OnInvalidSubmit="@HandleInvalidSubmit">
 			<DataAnnotationsValidator />
 			<DxFormLayout Data="@SelectedShippingItem" CaptionPosition="CaptionPosition.Vertical" CssClass="w-100" ItemUpdating="@((pair) => OnItemUpdating(pair.Key, pair.Value))">
-				<DxFormLayoutItem Field="@nameof(ShippingItem.Name)" Caption="Item Name:" Enabled="false" ColSpanMd="6" />
-				<DxFormLayoutItem Field="@nameof(ShippingItem.GrossWeight)" Caption="GrossWeight:" Enabled="false" ColSpanMd="3" />
-				<DxFormLayoutItem Field="@nameof(ShippingItem.NetWeight)" Caption="NetWeight:" Enabled="false" ColSpanMd="3" />
+				<DxFormLayoutItem CaptionCssClass="@(SelectedShippingItem.IsMeasured ? "text-success" : "")" Field="@nameof(ShippingItem.Name)" Caption="Item Name:" Enabled="false" ColSpanMd="6" />
+				<DxFormLayoutItem CaptionCssClass="@(SelectedShippingItem.IsMeasured ? "text-success" : "")" Field="@nameof(ShippingItem.GrossWeight)" Caption="GrossWeight:" Enabled="false" ColSpanMd="3" />
+				<DxFormLayoutItem CaptionCssClass="@(SelectedShippingItem.IsMeasured ? "text-success" : "")" Field="@nameof(ShippingItem.NetWeight)" Caption="NetWeight:" Enabled="false" ColSpanMd="3" />
 
-				<DxFormLayoutItem Field="@nameof(ShippingItem.MeasuredGrossWeight)" Caption="MeasuredGrossWeight:" ColSpanMd="3" BeginRow="true">
+				<DxFormLayoutItem CaptionCssClass="@(SelectedShippingItem.IsMeasured ? "text-success" : "")" Field="@nameof(ShippingItem.MeasuredGrossWeight)" Caption="MeasuredGrossWeight:" ColSpanMd="3" BeginRow="true">
 				</DxFormLayoutItem>
 
-				<DxFormLayoutItem Field="@nameof(ShippingItem.MeasuredNetWeight)" Caption="MeasuredNetWeight:" ColSpanMd="3">
+				<DxFormLayoutItem CaptionCssClass="@(SelectedShippingItem.IsMeasured ? "text-success" : "")" Field="@nameof(ShippingItem.MeasuredNetWeight)" Caption="MeasuredNetWeight:" ColSpanMd="3">
 				</DxFormLayoutItem>
 
-				<DxFormLayoutItem Field="@nameof(ShippingItem.IsMeasured)" Enabled="false" Caption="IsMeasured:" ColSpanMd="6">
+				<DxFormLayoutItem CaptionCssClass="@(SelectedShippingItem.IsMeasured ? "text-success" : "")" Field="@nameof(ShippingItem.IsMeasured)" Enabled="false" Caption="Sikeres mérés:" ColSpanMd="6">
 				</DxFormLayoutItem>
 
 				<DxFormLayoutItem ColSpanMd="12" BeginRow="true">
@@ -112,7 +120,7 @@
 				</DxFormLayoutItem>
 
 				<DxFormLayoutItem ColSpanMd="12" BeginRow="true">
-					<DxButton Text="Mentés" Enabled="BtnSaveEnabled" SubmitFormOnClick="true" CssClass="w-100" />
+					<DxButton Text="@(SelectedShippingItem.IsMeasured ? "Módosít" : "Mentés")" Enabled="BtnSaveEnabled" SubmitFormOnClick="true" CssClass="w-100" />
 				</DxFormLayoutItem>
 			</DxFormLayout>
 		</EditForm>
diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.css b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.css
new file mode 100644
index 0000000..f4245c2
--- /dev/null
+++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.css
@@ -0,0 +1,36 @@
+.combobox-item-template {
+	display: flex;
+	align-items: center;
+}
+
+.combobox-item-template > img {
+	border-radius: 50%;
+	width: 2rem;
+	height: 2rem;
+}
+
+img + .combobox-item-template-text {
+	margin-left: 1rem;
+}
+
+.combobox-item-template-text {
+	display: flex;
+	flex-flow: column;
+}
+
+.combobox-item-template-employee-phone {
+	opacity: 0.65;
+}
+
+.icon {
+	margin-left: 0.5rem;
+	margin-right: 0.5rem;
+}
+
+.ok_green-icon {
+	--icon-mask-image: var(--icon-ok_green-mask-image);
+}
+
+.ismeasured-green {
+	color: green !important;
+}
\ No newline at end of file
diff --git a/FruitBankHybrid.Shared/wwwroot/app.css b/FruitBankHybrid.Shared/wwwroot/app.css
index 91af6aa..dc61a7a 100644
--- a/FruitBankHybrid.Shared/wwwroot/app.css
+++ b/FruitBankHybrid.Shared/wwwroot/app.css
@@ -56,6 +56,7 @@ h1:focus {
     --icon-home-mask-image: url("images/home-fluent.svg");
     --icon-weather-mask-image: url("images/weather-fluent.svg");
     --icon-counter-mask-image: url("images/counter-fluent.svg");
+    --icon-ok_green-mask-image: url("images/ok_green_lt.svg");
 }
 
 .icon {
diff --git a/FruitBankHybrid.Shared/wwwroot/images/ok_green_dt.png b/FruitBankHybrid.Shared/wwwroot/images/ok_green_dt.png
new file mode 100644
index 0000000..e2d884a
Binary files /dev/null and b/FruitBankHybrid.Shared/wwwroot/images/ok_green_dt.png differ
diff --git a/FruitBankHybrid.Shared/wwwroot/images/ok_green_dt.svg b/FruitBankHybrid.Shared/wwwroot/images/ok_green_dt.svg
new file mode 100644
index 0000000..420584b
--- /dev/null
+++ b/FruitBankHybrid.Shared/wwwroot/images/ok_green_dt.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.54998 18L3.84998 12.3L5.27498 10.875L9.54998 15.15L18.725 5.97498L20.15 7.39998L9.54998 18Z" fill="#E0E4DB"/>
+</svg>
diff --git a/FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.jpg b/FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.jpg
new file mode 100644
index 0000000..3830cf5
Binary files /dev/null and b/FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.jpg differ
diff --git a/FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.png b/FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.png
new file mode 100644
index 0000000..42f284a
Binary files /dev/null and b/FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.png differ
diff --git a/FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.svg b/FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.svg
new file mode 100644
index 0000000..05654f6
--- /dev/null
+++ b/FruitBankHybrid.Shared/wwwroot/images/ok_green_lt.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.54998 18L3.84998 12.3L5.27498 10.875L9.54998 15.15L18.725 5.97498L20.15 7.39998L9.54998 18Z" fill="#181D18"/>
+</svg>