diff --git a/FruitBankHybrid.Shared/Components/Toolbars/FruitBankToolbarTemplate.razor b/FruitBankHybrid.Shared/Components/Toolbars/FruitBankToolbarTemplate.razor
index 71c54ef..f183083 100644
--- a/FruitBankHybrid.Shared/Components/Toolbars/FruitBankToolbarTemplate.razor
+++ b/FruitBankHybrid.Shared/Components/Toolbars/FruitBankToolbarTemplate.razor
@@ -27,7 +27,7 @@
 			<DxToolbarItem Text="To PDF" Click="ExportPdfItem_Click" />
 		</Items>
 	</DxToolbarItem>
-	<DxToolbarItem Text="Reload data" BeginGroup="true" Click="ReloadData_Click" />
+	<DxToolbarItem Text="Reload data" BeginGroup="true" Click="ReloadData_Click" Enabled="@BtnReloadDataEnabled" />
 	<DxToolbarItem BeginGroup="true">
 	</DxToolbarItem>
 	@* 				<DxToolbarItem BeginGroup="true">
@@ -46,6 +46,8 @@
 
 	public ToolbarBase Toolbar { get; set; }
 	const string ExportFileName = "ExportResult";
+
+	public bool BtnReloadDataEnabled = true;
 	public bool EditItemsEnabled { get; set; } = true;
 	private LoggerClient<GridShippingItemTemplate> _logger;
 
@@ -56,7 +58,9 @@
 
 	async Task ReloadData_Click(ToolbarItemClickEventArgs e)
 	{
+		BtnReloadDataEnabled = false;
 		await OnReloadDataClick.InvokeAsync();
+		BtnReloadDataEnabled = true;
 	}
 
 	async Task NewItem_Click()
diff --git a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor
index e196164..5b34809 100644
--- a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor
+++ b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor
@@ -48,7 +48,6 @@
 											<a>@ctxOrderDate.Day.ToString()</a>
 										}
 									}
-or
 								</DayCellTemplate>
 							</DxDateEdit>
 						</div>
diff --git a/FruitBankHybrid/MauiProgram.cs b/FruitBankHybrid/MauiProgram.cs
index 87b193b..ada3e32 100644
--- a/FruitBankHybrid/MauiProgram.cs
+++ b/FruitBankHybrid/MauiProgram.cs
@@ -33,7 +33,6 @@ namespace FruitBankHybrid
             builder.Services.AddSingleton<IAcLogWriterClientBase, BrowserConsoleLogWriter>();
             #endif
             
-            builder.Services.AddSingleton<ObjectLock>();
             builder.Services.AddSingleton<LoggedInModel>();
             builder.Services.AddScoped<FruitBankSignalRClient>();
             builder.Services.AddSingleton<DatabaseClient>();