diff --git a/EstateManagementUI.BlazorServer.Tests/EstateManagementUI.BlazorServer.Tests.csproj b/EstateManagementUI.BlazorServer.Tests/EstateManagementUI.BlazorServer.Tests.csproj
index 335d3e57..22656015 100644
--- a/EstateManagementUI.BlazorServer.Tests/EstateManagementUI.BlazorServer.Tests.csproj
+++ b/EstateManagementUI.BlazorServer.Tests/EstateManagementUI.BlazorServer.Tests.csproj
@@ -38,4 +38,8 @@
     <Using Include="Xunit" />
   </ItemGroup>
 
+	<ItemGroup>
+		<CoverletExcludeByFile Include="**/*.razor*" />
+	</ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/EstateManagementUI.BlazorServer.Tests/Pages/BaseTest.cs b/EstateManagementUI.BlazorServer.Tests/Pages/BaseTest.cs
index 7f8b9676..1ec82ac5 100644
--- a/EstateManagementUI.BlazorServer.Tests/Pages/BaseTest.cs
+++ b/EstateManagementUI.BlazorServer.Tests/Pages/BaseTest.cs
@@ -3,6 +3,7 @@
 using Bunit.TestDoubles;
 using EstateManagementUI.BlazorServer.Components.Permissions;
 using EstateManagementUI.BlazorServer.Permissions;
+using EstateManagementUI.BlazorServer.UIServices;
 using MediatR;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
@@ -20,6 +21,7 @@ protected BaseTest() {
         this._mockPermissionService = new Mock<IPermissionService>();
         this._mockPermissionStore = new Mock<IPermissionStore>();
         this._fakeNavigationManager = new FakeNavigationManager();
+        this.EstateUIService = new Mock<IEstateUIService>();
 
         this._mockPermissionKeyProvider.Setup(x => x.GetKey()).Returns("test-key");
         this._mockPermissionService.Setup(x => x.HasPermissionAsync(It.IsAny<PermissionSection>(), It.IsAny<PermissionFunction>())).ReturnsAsync(true);
@@ -31,6 +33,7 @@ protected BaseTest() {
         this.Services.AddSingleton(this._mockPermissionService.Object);
         this.Services.AddSingleton(this._mockAuthStateProvider.Object);
         this.Services.AddSingleton(this._mockPermissionStore.Object);
+        this.Services.AddSingleton(this.EstateUIService.Object);
 
 
         // Add required permission components that render their children
@@ -50,6 +53,7 @@ protected BaseTest() {
     protected readonly Mock<AuthenticationStateProvider> _mockAuthStateProvider;
     protected readonly Mock<IPermissionStore> _mockPermissionStore;
     protected readonly FakeNavigationManager _fakeNavigationManager;
+    protected readonly Mock<IEstateUIService> EstateUIService;
 
     /// <summary>
     /// Minimal test double for NavigationManager.
diff --git a/EstateManagementUI.BlazorServer.Tests/Pages/Estate/EstateIndexPageTests.cs b/EstateManagementUI.BlazorServer.Tests/Pages/Estate/EstateIndexPageTests.cs
index 4b6dd9d5..b1cb3081 100644
--- a/EstateManagementUI.BlazorServer.Tests/Pages/Estate/EstateIndexPageTests.cs
+++ b/EstateManagementUI.BlazorServer.Tests/Pages/Estate/EstateIndexPageTests.cs
@@ -1,8 +1,10 @@
 using AngleSharp.Dom;
 using Bunit;
+using Castle.Components.DictionaryAdapter;
 using EstateManagementUI.BlazorServer.Common;
+using EstateManagementUI.BlazorServer.Models;
 using EstateManagementUI.BlazorServer.Tests.Pages.FileProcessing;
-using EstateManagementUI.BusinessLogic.Models;
+using EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects;
 using EstateManagementUI.BusinessLogic.Requests;
 using Microsoft.AspNetCore.Components.Web;
 using Moq;
@@ -18,22 +20,19 @@ public class EstateIndexPageTests : BaseTest
     public void EstateIndex_RendersCorrectly()
     {
         // Arrange
-        EstateModel estate = new() {
-            EstateId = Guid.NewGuid(),
-            EstateName = "Test Estate",
-            Reference = "EST001"
-        };
-        
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetEstateQuery>(), default))
-            .ReturnsAsync(Result.Success(estate));
-        _mockMediator.Setup(x => x.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<RecentMerchantsModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<RecentContractModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<OperatorModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<OperatorDropDownModel>()));
+        BlazorServer.Models.EstateModel estate = new(Guid.NewGuid(), "Test Estate", "EST001");
+        estate = estate with {
+                ContractCount = 0,
+                RecentContracts = new List<Models.RecentContractModel>(),
+                OperatorCount = 0,
+                AllOperators = new List<Models.OperatorDropDownModel>(),
+                AssignedOperators = new List<Models.OperatorModel>(),
+                MerchantCount = 0,
+                RecentMerchants = new List<Models.RecentMerchantsModel>(),
+                UserCount = 0
+            };    
+            
+        this.EstateUIService.Setup(e => e.LoadEstate(It.IsAny<CorrelationId>(), It.IsAny<Guid>())).ReturnsAsync(Result.Success(estate));
 
         // Act
         IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
@@ -46,23 +45,19 @@ public void EstateIndex_RendersCorrectly()
     public void EstateIndex_DisplaysEstateDetails()
     {
         // Arrange
-        EstateModel estate = new() {
-            EstateId = Guid.NewGuid(),
-            EstateName = "Test Estate",
-            Reference = "EST001",
-            Operators = new List<EstateOperatorModel>()
+        BlazorServer.Models.EstateModel estate = new(Guid.NewGuid(), "Test Estate", "EST001");
+        estate = estate with
+        {
+            ContractCount = 0,
+            RecentContracts = new List<Models.RecentContractModel>(),
+            OperatorCount = 0,
+            AllOperators = new List<Models.OperatorDropDownModel>(),
+            AssignedOperators = new List<Models.OperatorModel>(),
+            MerchantCount = 0,
+            RecentMerchants = new List<Models.RecentMerchantsModel>(),
+            UserCount = 0
         };
-
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetEstateQuery>(), default))
-            .ReturnsAsync(Result.Success(estate));
-        _mockMediator.Setup(x => x.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<RecentMerchantsModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<RecentContractModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<OperatorModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<OperatorDropDownModel>()));
+        this.EstateUIService.Setup(e => e.LoadEstate(It.IsAny<CorrelationId>(), It.IsAny<Guid>())).ReturnsAsync(Result.Success(estate));
 
         // Act
         IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
@@ -75,16 +70,19 @@ public void EstateIndex_DisplaysEstateDetails()
     public void EstateIndex_HasCorrectPageTitle()
     {
         // Arrange
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetEstateQuery>(), default))
-            .ReturnsAsync(Result.Success(new EstateModel { EstateId = Guid.NewGuid() }));
-        _mockMediator.Setup(x => x.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<RecentMerchantsModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<RecentContractModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<OperatorModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<OperatorDropDownModel>()));
+        BlazorServer.Models.EstateModel estate = new(Guid.NewGuid(), "Test Estate", "EST001");
+        estate = estate with
+        {
+            ContractCount = 0,
+            RecentContracts = new List<Models.RecentContractModel>(),
+            OperatorCount = 0,
+            AllOperators = new List<Models.OperatorDropDownModel>(),
+            AssignedOperators = new List<Models.OperatorModel>(),
+            MerchantCount = 0,
+            RecentMerchants = new List<Models.RecentMerchantsModel>(),
+            UserCount = 0
+        };
+        this.EstateUIService.Setup(e => e.LoadEstate(It.IsAny<CorrelationId>(), It.IsAny<Guid>())).ReturnsAsync(Result.Success(estate));
 
         // Act
         IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
@@ -150,13 +148,13 @@ public void EstateIndex_AddOperator_Success_UpdatesAssignedOperators()
             RequireCustomMerchantNumber = true,
             RequireCustomTerminalNumber = false
         };
-        
-        _mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorQuery>(), default))
-            .ReturnsAsync(Result.Success(operatorDetails));
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateCommands.AddOperatorToEstateCommand>(), default))
-            .ReturnsAsync(Result.Success());
-        
+
+        this.EstateUIService.Setup(e => e.AddOperatorToEstate(It.IsAny<CorrelationId>(), It.IsAny<Guid>(), It.IsAny<String>())).ReturnsAsync(Result.Success);
+
         IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
+        cut.Instance.SetDelayOverride(0);
+        cut.Render(); // required to trigger re-render
+
         cut.WaitForState(() => !cut.Markup.Contains("animate-spin"), TimeSpan.FromSeconds(5));
         
         // Switch to operators tab
@@ -176,7 +174,7 @@ public void EstateIndex_AddOperator_Success_UpdatesAssignedOperators()
         addButton.Click();
 
         // Assert
-        cut.WaitForAssertion(() => cut.Markup.ShouldContain("Operator added successfully"), timeout: TimeSpan.FromSeconds(5));
+        cut.WaitForAssertion(() => cut.Markup.ShouldContain("Operator added successfully"), timeout: TimeSpan.FromSeconds(10));
         
     }
 
@@ -191,10 +189,9 @@ public void EstateIndex_AddOperator_Failure_ShowsErrorMessage()
         };
         
         SetupSuccessfulDataLoadWithOperators(new List<OperatorDropDownModel> { operatorToAdd });
-        
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateCommands.AddOperatorToEstateCommand>(), default))
-            .ReturnsAsync(Result.Failure("Failed to add operator"));
-        
+
+        this.EstateUIService.Setup(e => e.AddOperatorToEstate(It.IsAny<CorrelationId>(), It.IsAny<Guid>(), It.IsAny<String>())).ReturnsAsync(Result.Failure);
+
         IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
         cut.WaitForState(() => !cut.Markup.Contains("animate-spin"), TimeSpan.FromSeconds(5));
         
@@ -215,7 +212,6 @@ public void EstateIndex_AddOperator_Failure_ShowsErrorMessage()
         addButton.Click();
 
         // Assert
-        _mockMediator.Verify(x => x.Send(It.IsAny<EstateCommands.AddOperatorToEstateCommand>(), default), Times.AtLeastOnce());
         cut.WaitForAssertion(() => cut.Markup.ShouldContain("Failed to add operator"), timeout: TimeSpan.FromSeconds(5));
     }
 
@@ -232,11 +228,12 @@ public void EstateIndex_RemoveOperator_Success_RemovesFromList()
         };
         
         SetupSuccessfulDataLoadWithAssignedOperators(new List<OperatorModel> { assignedOperator });
-        
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateCommands.RemoveOperatorFromEstateCommand>(), default))
-            .ReturnsAsync(Result.Success());
-        
+
+        this.EstateUIService.Setup(e => e.RemoveOperatorFromEstate(It.IsAny<CorrelationId>(), It.IsAny<Guid>(), It.IsAny<Guid>())).ReturnsAsync(Result.Success);
+
         IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
+        cut.Instance.SetDelayOverride(0);
+        cut.Render(); // required to trigger re-render
         cut.WaitForState(() => !cut.Markup.Contains("animate-spin"), TimeSpan.FromSeconds(5));
         
         // Switch to operators tab
@@ -266,10 +263,9 @@ public void EstateIndex_RemoveOperator_Failure_ShowsErrorMessage()
         };
         
         SetupSuccessfulDataLoadWithAssignedOperators(new List<OperatorModel> { assignedOperator });
-        
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateCommands.RemoveOperatorFromEstateCommand>(), default))
-            .ReturnsAsync(Result.Failure("Failed to remove operator"));
-        
+
+        this.EstateUIService.Setup(e => e.RemoveOperatorFromEstate(It.IsAny<CorrelationId>(), It.IsAny<Guid>(), It.IsAny<Guid>())).ReturnsAsync(Result.Failure(String.Empty));
+
         IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
         cut.WaitForState(() => !cut.Markup.Contains("animate-spin"), TimeSpan.FromSeconds(5));
         
@@ -362,117 +358,15 @@ public void EstateIndex_DisplaysNoContracts_WhenEmpty()
         // Assert
         cut.Markup.ShouldContain("No contracts found");
     }
-
-    [Fact]
-    public void EstateIndex_LoadEstateData_EstateQueryFails_NavigatesToError()
-    {
-        // Arrange
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetEstateQuery>(), default))
-            .ReturnsAsync(Result.Failure("Failed to load estate"));
-        _mockMediator.Setup(x => x.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<RecentMerchantsModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<RecentContractModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<OperatorModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<OperatorDropDownModel>()));
-        
-        // Act
-        IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
-        cut.WaitForState(() => !cut.Markup.Contains("animate-spin"), TimeSpan.FromSeconds(5));
-
-        // Assert
-        _fakeNavigationManager.Uri.ShouldContain("error");
-    }
-
-    [Fact]
-    public void EstateIndex_LoadEstateData_MerchantQueryFails_NavigatesToError()
-    {
-        // Arrange
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetEstateQuery>(), default))
-            .ReturnsAsync(Result.Success(new EstateModel { EstateId = Guid.NewGuid() }));
-        _mockMediator.Setup(x => x.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), default))
-            .ReturnsAsync(Result.Failure("Failed to load merchants"));
-        _mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<RecentContractModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<OperatorModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<OperatorDropDownModel>()));
-        
-        // Act
-        IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
-        cut.WaitForState(() => !cut.Markup.Contains("animate-spin"), TimeSpan.FromSeconds(5));
-
-        // Assert
-        _fakeNavigationManager.Uri.ShouldContain("error");
-    }
-
-    [Fact]
-    public void EstateIndex_LoadEstateData_ContractQueryFails_NavigatesToError()
-    {
-        // Arrange
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetEstateQuery>(), default))
-            .ReturnsAsync(Result.Success(new EstateModel { EstateId = Guid.NewGuid() }));
-        _mockMediator.Setup(x => x.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<RecentMerchantsModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), default))
-            .ReturnsAsync(Result.Failure("Failed to load contracts"));
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<OperatorModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<OperatorDropDownModel>()));
-        
-        // Act
-        IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
-        cut.WaitForState(() => !cut.Markup.Contains("animate-spin"), TimeSpan.FromSeconds(5));
-        
-        // Assert
-        _fakeNavigationManager.Uri.ShouldContain("error");
-    }
-
+    
     [Fact]
-    public void EstateIndex_LoadEstateData_AssignedOperatorsQueryFails_NavigatesToError()
+    public void EstateIndex_LoadEstateData_LoadFails_NavigatesToError()
     {
         // Arrange
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetEstateQuery>(), default))
-            .ReturnsAsync(Result.Success(new EstateModel { EstateId = Guid.NewGuid() }));
-        _mockMediator.Setup(x => x.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<RecentMerchantsModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<RecentContractModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), default))
-            .ReturnsAsync(Result.Failure("Failed to load assigned operators"));
-        _mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<OperatorDropDownModel>()));
-        
-        // Act
-        IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
-        cut.WaitForState(() => !cut.Markup.Contains("animate-spin"), TimeSpan.FromSeconds(5));
-        
-        // Assert
-        _fakeNavigationManager.Uri.ShouldContain("error");
-    }
+        this.EstateUIService.Setup(e => e.LoadEstate(It.IsAny<CorrelationId>(), It.IsAny<Guid>())).ReturnsAsync(Result.Failure());
 
-    [Fact]
-    public void EstateIndex_LoadEstateData_AllOperatorsQueryFails_NavigatesToError()
-    {
-        // Arrange
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetEstateQuery>(), default))
-            .ReturnsAsync(Result.Success(new EstateModel { EstateId = Guid.NewGuid() }));
-        _mockMediator.Setup(x => x.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<RecentMerchantsModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<RecentContractModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), default))
-            .ReturnsAsync(Result.Success(new List<OperatorModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), default))
-            .ReturnsAsync(Result.Failure("Failed to load operators"));
-        
         // Act
         IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
-        cut.WaitForState(() => !cut.Markup.Contains("animate-spin"), TimeSpan.FromSeconds(5));
         
         // Assert
         _fakeNavigationManager.Uri.ShouldContain("error");
@@ -524,119 +418,7 @@ public void EstateIndex_DisplaysNoOperators_WhenNoneAssigned()
         // Assert
         cut.WaitForAssertion(() => cut.Markup.ShouldContain("No operators assigned"), timeout: TimeSpan.FromSeconds(5));
     }
-
-    [Fact]
-    public void EstateIndex_AddOperator_WhenGetOperatorQueryFails_NavigatesToError()
-    {
-        // Arrange
-        Guid operatorId = Guid.NewGuid();
-        OperatorDropDownModel operatorToAdd = new() {
-            OperatorId = operatorId,
-            OperatorName = "Test Operator"
-        };
-        
-        SetupSuccessfulDataLoadWithOperators(new List<OperatorDropDownModel> { operatorToAdd });
-        
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateCommands.AddOperatorToEstateCommand>(), default))
-            .ReturnsAsync(Result.Success());
-        _mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorQuery>(), default))
-            .ReturnsAsync(Result.Failure("Failed to get operator details"));
-        
-        IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
-        cut.WaitForState(() => !cut.Markup.Contains("animate-spin"), TimeSpan.FromSeconds(5));
-        
-        // Switch to operators tab
-        IRefreshableElementCollection<IElement> buttons = cut.FindAll("button");
-        IElement? operatorsButton = buttons.FirstOrDefault(b => b.TextContent.Contains("Operators"));
-        operatorsButton?.Click();
-        
-        // Click Add Operator button
-        IElement addOperatorButton = cut.Find("#addOperatorButton");
-        addOperatorButton.Click();
-        
-        // Act - Select operator and add
-        IElement selectElement = cut.Find("select");
-        selectElement.Change(operatorId.ToString());
-        IElement addButton = cut.FindAll("button")
-            .First(b => b.TextContent.Trim() == "Add" && (b.GetAttribute("id") ?? "") != "addOperatorButton");
-        addButton.Click();
-
-        // Assert - Should navigate to error page
-        _fakeNavigationManager.Uri.ShouldContain("error");
-    }
-
-    [Fact]
-    public void EstateIndex_AddOperator_WhenException_ShowsErrorMessage()
-    {
-        // Arrange
-        Guid operatorId = Guid.NewGuid();
-        OperatorDropDownModel operatorToAdd = new() {
-            OperatorId = operatorId,
-            OperatorName = "Test Operator"
-        };
-        
-        SetupSuccessfulDataLoadWithOperators(new List<OperatorDropDownModel> { operatorToAdd });
-        
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateCommands.AddOperatorToEstateCommand>(), default))
-            .ThrowsAsync(new Exception("Test exception"));
-        
-        IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
-        cut.WaitForState(() => !cut.Markup.Contains("animate-spin"), TimeSpan.FromSeconds(5));
-        
-        // Switch to operators tab
-        IRefreshableElementCollection<IElement> buttons = cut.FindAll("button");
-        IElement? operatorsButton = buttons.FirstOrDefault(b => b.TextContent.Contains("Operators"));
-        operatorsButton?.Click();
-        
-        // Click Add Operator button
-        IElement addOperatorButton = cut.Find("#addOperatorButton");
-        addOperatorButton.Click();
-        
-        // Act - Select operator and add
-        IElement selectElement = cut.Find("select");
-        selectElement.Change(operatorId.ToString());
-        IElement addButton = cut.FindAll("button")
-            .First(b => b.TextContent.Trim() == "Add" && (b.GetAttribute("id") ?? "") != "addOperatorButton");
-        addButton.Click();
-
-        // Assert
-        cut.WaitForAssertion(() => cut.Markup.ShouldContain("An error occurred: Test exception"), timeout: TimeSpan.FromSeconds(5));
-    }
-
-    [Fact]
-    public void EstateIndex_RemoveOperator_WhenException_ShowsErrorMessage()
-    {
-        // Arrange
-        Guid operatorId = Guid.NewGuid();
-        OperatorModel assignedOperator = new() {
-            OperatorId = operatorId,
-            Name = "Test Operator",
-            RequireCustomMerchantNumber = true,
-            RequireCustomTerminalNumber = false
-        };
-        
-        SetupSuccessfulDataLoadWithAssignedOperators(new List<OperatorModel> { assignedOperator });
-        
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateCommands.RemoveOperatorFromEstateCommand>(), default))
-            .ThrowsAsync(new Exception("Test exception"));
-        
-        IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
-        cut.WaitForState(() => !cut.Markup.Contains("animate-spin"), TimeSpan.FromSeconds(5));
-        
-        // Switch to operators tab
-        IRefreshableElementCollection<IElement> buttons = cut.FindAll("button");
-        IElement? operatorsButton = buttons.FirstOrDefault(b => b.TextContent.Contains("Operators"));
-        operatorsButton?.Click();
-        
-        // Act - Remove operator
-        IRefreshableElementCollection<IElement> removeButtons = cut.FindAll("button");
-        IElement? removeButton = removeButtons.FirstOrDefault(b => b.TextContent.Contains("Remove"));
-        removeButton?.Click();
-        
-        // Assert
-        cut.WaitForAssertion(() => cut.Markup.ShouldContain("An error occurred: Test exception"), timeout: TimeSpan.FromSeconds(5));
-    }
-
+    
     [Fact]
     public void EstateIndex_SuccessMessage_ClearsWhenSwitchingTabs()
     {
@@ -650,10 +432,9 @@ public void EstateIndex_SuccessMessage_ClearsWhenSwitchingTabs()
         };
         
         SetupSuccessfulDataLoadWithAssignedOperators(new List<OperatorModel> { assignedOperator });
-        
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateCommands.RemoveOperatorFromEstateCommand>(), default))
-            .ReturnsAsync(Result.Success());
-        
+
+        this.EstateUIService.Setup(e => e.RemoveOperatorFromEstate(It.IsAny<CorrelationId>(), It.IsAny<Guid>(), It.IsAny<Guid>())).ReturnsAsync(Result.Success);
+
         IRenderedComponent<EstateIndex> cut = RenderComponent<EstateIndex>();
         cut.WaitForState(() => !cut.Markup.Contains("animate-spin"), TimeSpan.FromSeconds(5));
         
@@ -684,16 +465,19 @@ private void SetupSuccessfulDataLoad(List<RecentMerchantsModel>? merchants = nul
                                          List<OperatorModel>? assignedOperators = null,
                                          List<OperatorDropDownModel>? operators = null)
     {
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetEstateQuery>(), default))
-            .ReturnsAsync(Result.Success(new EstateModel { EstateId = Guid.NewGuid(), EstateName = "Test Estate" }));
-        _mockMediator.Setup(x => x.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), default))
-            .ReturnsAsync(Result.Success(merchants ?? new List<RecentMerchantsModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), default))
-            .ReturnsAsync(Result.Success(contracts ?? new List<RecentContractModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), default))
-            .ReturnsAsync(Result.Success(assignedOperators ?? new List<OperatorModel>()));
-        _mockMediator.Setup(x => x.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), default))
-            .ReturnsAsync(Result.Success(operators ?? new List<OperatorDropDownModel>()));
+        BlazorServer.Models.EstateModel estate = new(Guid.NewGuid(), "Test Estate", "EST001");
+        estate = estate with
+        {
+            ContractCount = 5,
+            RecentContracts = contracts ?? new List<RecentContractModel>(),
+            OperatorCount = 3,
+            AllOperators = operators ?? new List<OperatorDropDownModel>(),
+            AssignedOperators = assignedOperators ?? new List<OperatorModel>(),
+            MerchantCount = 10,
+            RecentMerchants = merchants ?? new List<RecentMerchantsModel>(),
+            UserCount = 2
+        };
+        this.EstateUIService.Setup(e => e.LoadEstate(It.IsAny<CorrelationId>(), It.IsAny<Guid>())).ReturnsAsync(Result.Success(estate));
     }
 
     private void SetupSuccessfulDataLoadWithOperators(List<OperatorDropDownModel> operators)
diff --git a/EstateManagementUI.BlazorServer.Tests/UIServices/EstateUIServiceTests.cs b/EstateManagementUI.BlazorServer.Tests/UIServices/EstateUIServiceTests.cs
new file mode 100644
index 00000000..199c35ed
--- /dev/null
+++ b/EstateManagementUI.BlazorServer.Tests/UIServices/EstateUIServiceTests.cs
@@ -0,0 +1,301 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EstateManagementUI.BlazorServer.UIServices;
+using EstateManagementUI.BusinessLogic.Models;
+using EstateManagementUI.BusinessLogic.Requests;
+using Moq;
+using Shouldly;
+using SimpleResults;
+using Xunit;
+using MediatR;
+
+namespace EstateManagementUI.BlazorServer.Tests.UIServices
+{
+    public class EstateUIServiceTests
+    {
+        private readonly Mock<IMediator> _mockMediator;
+        private readonly EstateUIService _service;
+
+        public EstateUIServiceTests()
+        {
+            _mockMediator = new Mock<IMediator>();
+            _service = new EstateUIService(_mockMediator.Object);
+        }
+
+        [Fact]
+        public async Task LoadEstate_ReturnsMappedModel_WhenAllQueriesSucceed()
+        {
+            // Arrange
+            var estateId = Guid.NewGuid();
+            var correlationId = CorrelationIdHelper.New();
+
+            var bizEstate = new BusinessLogic.Models.EstateModel
+            {
+                EstateId = estateId,
+                EstateName = "Test Estate",
+                Reference = "REF001",
+                Merchants = new List<BusinessLogic.Models.EstateMerchantModel> { new() { MerchantId = Guid.NewGuid(), Name = "M1", Reference = "R1" } },
+                Contracts = new List<BusinessLogic.Models.EstateContractModel> { new() { ContractId = Guid.NewGuid(), Name = "C1", OperatorName = "Op" } },
+                Operators = new List<BusinessLogic.Models.EstateOperatorModel> { new() { OperatorId = Guid.NewGuid(), Name = "OpAssigned" } },
+                Users = new List<BusinessLogic.Models.EstateUserModel> { new() { UserId = Guid.NewGuid(), EmailAddress = "u@x" } }
+            };
+
+            var recentMerchants = new List<BusinessLogic.Models.RecentMerchantsModel>
+            {
+                new() { MerchantId = Guid.NewGuid(), Name = "RecentM", Reference = "RM", CreatedDateTime = DateTime.UtcNow }
+            };
+
+            var recentContracts = new List<BusinessLogic.Models.RecentContractModel>
+            {
+                new() { ContractId = Guid.NewGuid(), Description = "RecentC", OperatorName = "Op" }
+            };
+
+            var assignedOperators = new List<BusinessLogic.Models.OperatorModel>
+            {
+                new() { OperatorId = bizEstate.Operators!.First().OperatorId, Name = "OpAssigned" }
+            };
+
+            var allOperators = new List<BusinessLogic.Models.OperatorDropDownModel>
+            {
+                new() { OperatorId = Guid.NewGuid(), OperatorName = "OpA" },
+                new() { OperatorId = assignedOperators[0].OperatorId, OperatorName = "OpAssigned" }
+            };
+
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetEstateQuery>(), It.IsAny<CancellationToken>()))
+                         .ReturnsAsync(Result.Success(bizEstate));
+            _mockMediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), It.IsAny<CancellationToken>()))
+                         .ReturnsAsync(Result.Success(recentMerchants));
+            _mockMediator.Setup(m => m.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), It.IsAny<CancellationToken>()))
+                         .ReturnsAsync(Result.Success(recentContracts));
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), It.IsAny<CancellationToken>()))
+                         .ReturnsAsync(Result.Success(assignedOperators));
+            _mockMediator.Setup(m => m.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), It.IsAny<CancellationToken>()))
+                         .ReturnsAsync(Result.Success(allOperators));
+
+            // Act
+            var result = await _service.LoadEstate(correlationId, estateId);
+
+            // Assert
+            result.IsSuccess.ShouldBeTrue();
+            var model = result.Data!;
+            model.EstateId.ShouldBe(estateId);
+            model.EstateName.ShouldBe("Test Estate");
+            model.MerchantCount.ShouldBe(1);
+            model.ContractCount.ShouldBe(1);
+            model.UserCount.ShouldBe(1);
+            model.AllOperators.ShouldNotBeNull();
+            model.AllOperators.ShouldContain(op => op.OperatorName == "OpA");
+            model.AssignedOperators.ShouldNotBeEmpty();
+            model.RecentMerchants.ShouldNotBeEmpty();
+            model.RecentContracts.ShouldNotBeEmpty();
+        }
+
+        [Fact]
+        public async Task LoadEstate_ReturnsFailure_WhenEstateQueryFails()
+        {
+            // Arrange
+            var estateId = Guid.NewGuid();
+            var correlationId = CorrelationIdHelper.New();
+
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetEstateQuery>(), It.IsAny<CancellationToken>()))
+                         .ReturnsAsync(Result.Failure("estate fail"));
+
+            // Provide success for other queries so the service behaviour is isolated
+            _mockMediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), It.IsAny<CancellationToken>()))
+                         .ReturnsAsync(Result.Success(new List<BusinessLogic.Models.RecentMerchantsModel>()));
+            _mockMediator.Setup(m => m.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), It.IsAny<CancellationToken>()))
+                         .ReturnsAsync(Result.Success(new List<BusinessLogic.Models.RecentContractModel>()));
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), It.IsAny<CancellationToken>()))
+                         .ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorModel>()));
+            _mockMediator.Setup(m => m.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), It.IsAny<CancellationToken>()))
+                         .ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorDropDownModel>()));
+
+            // Act
+            var result = await _service.LoadEstate(correlationId, estateId);
+
+            // Assert
+            result.IsFailed.ShouldBeTrue();
+        }
+
+        [Fact]
+        public async Task LoadEstate_ReturnsFailure_WhenRecentMerchantQueryFails()
+        {
+            // Arrange
+            var estateId = Guid.NewGuid();
+            var correlationId = CorrelationIdHelper.New();
+
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetEstateQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success());
+            _mockMediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Failure());
+            _mockMediator.Setup(m => m.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success(new List<BusinessLogic.Models.RecentContractModel>()));
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorModel>()));
+            _mockMediator.Setup(m => m.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorDropDownModel>()));
+
+            // Act
+            var result = await _service.LoadEstate(correlationId, estateId);
+
+            // Assert
+            result.IsFailed.ShouldBeTrue();
+        }
+
+        [Fact]
+        public async Task LoadEstate_ReturnsFailure_WhenRecentContractsQueryFails()
+        {
+            // Arrange
+            var estateId = Guid.NewGuid();
+            var correlationId = CorrelationIdHelper.New();
+
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetEstateQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success(new EstateModel()));
+            _mockMediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success(new List<RecentMerchantsModel>()));
+            _mockMediator.Setup(m => m.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Failure());
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorModel>()));
+            _mockMediator.Setup(m => m.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorDropDownModel>()));
+
+            // Act
+            var result = await _service.LoadEstate(correlationId, estateId);
+
+            // Assert
+            result.IsFailed.ShouldBeTrue();
+        }
+
+        [Fact]
+        public async Task LoadEstate_ReturnsFailure_WhenGetAssignedOperatorsQueryFails()
+        {
+            // Arrange
+            var estateId = Guid.NewGuid();
+            var correlationId = CorrelationIdHelper.New();
+
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetEstateQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success(new EstateModel()));
+            _mockMediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success(new List<RecentMerchantsModel>()));
+            _mockMediator.Setup(m => m.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success(new List<RecentContractModel>()));
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Failure());
+            _mockMediator.Setup(m => m.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success(new List<BusinessLogic.Models.OperatorDropDownModel>()));
+
+            // Act
+            var result = await _service.LoadEstate(correlationId, estateId);
+
+            // Assert
+            result.IsFailed.ShouldBeTrue();
+        }
+
+        [Fact]
+        public async Task LoadEstate_ReturnsFailure_WhenGetOperatorsForDropDownQueryFails()
+        {
+            // Arrange
+            var estateId = Guid.NewGuid();
+            var correlationId = CorrelationIdHelper.New();
+
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetEstateQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success(new EstateModel()));
+            _mockMediator.Setup(m => m.Send(It.IsAny<MerchantQueries.GetRecentMerchantsQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success(new List<RecentMerchantsModel>()));
+            _mockMediator.Setup(m => m.Send(It.IsAny<ContractQueries.GetRecentContractsQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success(new List<RecentContractModel>()));
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateQueries.GetAssignedOperatorsQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Success(new List<OperatorModel>()));
+            _mockMediator.Setup(m => m.Send(It.IsAny<OperatorQueries.GetOperatorsForDropDownQuery>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Failure());
+
+            // Act
+            var result = await _service.LoadEstate(correlationId, estateId);
+
+            // Assert
+            result.IsFailed.ShouldBeTrue();
+        }
+
+        [Fact]
+        public async Task AddOperatorToEstate_CallsMediatorWithAddCommand_OnSuccess()
+        {
+            // Arrange
+            var estateId = Guid.NewGuid();
+            var correlationId = CorrelationIdHelper.New();
+            var operatorId = Guid.NewGuid();
+            var operatorIdString = operatorId.ToString();
+
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateCommands.AddOperatorToEstateCommand>(), It.IsAny<CancellationToken>()))
+                         .ReturnsAsync(Result.Success);
+
+            // Act
+            var result = await _service.AddOperatorToEstate(correlationId, estateId, operatorIdString);
+
+            // Assert
+            result.IsSuccess.ShouldBeTrue();
+            _mockMediator.Verify(m => m.Send(It.Is<EstateCommands.AddOperatorToEstateCommand>(c =>
+                c.EstateId == estateId && c.OperatorId == operatorId), It.IsAny<CancellationToken>()), Times.Once);
+        }
+
+        [Fact]
+        public async Task AddOperatorToEstate_ReturnsFailure_WhenMediatorFails()
+        {
+            // Arrange
+            var estateId = Guid.NewGuid();
+            var correlationId = CorrelationIdHelper.New();
+            var operatorId = Guid.NewGuid();
+
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateCommands.AddOperatorToEstateCommand>(), It.IsAny<CancellationToken>()))
+                         .ReturnsAsync(Result.Failure);
+
+            // Act
+            var result = await _service.AddOperatorToEstate(correlationId, estateId, operatorId.ToString());
+
+            // Assert
+            result.IsFailed.ShouldBeTrue();
+        }
+
+        [Fact]
+        public async Task RemoveOperatorFromEstate_ShouldCallRemoveCommand()
+        {
+            // Arrange
+            var estateId = Guid.NewGuid();
+            var correlationId = CorrelationIdHelper.New();
+            var operatorId = Guid.NewGuid();
+
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateCommands.RemoveOperatorFromEstateCommand>(), It.IsAny<CancellationToken>()))
+                         .ReturnsAsync(Result.Success);
+
+            // Act
+            var result = await _service.RemoveOperatorFromEstate(correlationId, estateId, operatorId);
+
+            // Assert - the service should send a RemoveOperatorFromEstateCommand
+            result.IsSuccess.ShouldBeTrue();
+            _mockMediator.Verify(m => m.Send(It.Is<EstateCommands.RemoveOperatorFromEstateCommand>(c =>
+                c.EstateId == estateId && c.OperatorId == operatorId), It.IsAny<CancellationToken>()), Times.Once);
+        }
+
+
+        [Fact]
+        public async Task RemoveOperatorFromEstate_ReturnsFailure_WhenMediatorFails()
+        {
+            // Arrange
+            var estateId = Guid.NewGuid();
+            var correlationId = CorrelationIdHelper.New();
+            var operatorId = Guid.NewGuid();
+
+            _mockMediator.Setup(m => m.Send(It.IsAny<EstateCommands.RemoveOperatorFromEstateCommand>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(Result.Failure);
+
+            // Act
+            var result = await _service.RemoveOperatorFromEstate(correlationId, estateId, operatorId);
+
+            // Assert - the service should send a RemoveOperatorFromEstateCommand
+            result.IsFailed.ShouldBeTrue();
+        }
+    }
+}
\ No newline at end of file
diff --git a/EstateManagementUI.BlazorServer/Components/Pages/Contracts/Edit.razor.cs b/EstateManagementUI.BlazorServer/Components/Pages/Contracts/Edit.razor.cs
index 9b4b5d16..29d1e4ab 100644
--- a/EstateManagementUI.BlazorServer/Components/Pages/Contracts/Edit.razor.cs
+++ b/EstateManagementUI.BlazorServer/Components/Pages/Contracts/Edit.razor.cs
@@ -131,7 +131,7 @@ private async Task HandleAddProduct()
                     CloseAddProductModal();
                     
                     // Small delay so user sees confirmation (adjust duration as needed)
-                    await Task.Delay(2500);
+                    await this.WaitOnUIRefresh();
 
                     await LoadContract();
 
@@ -196,7 +196,7 @@ private async Task HandleAddFee()
                     CloseAddFeeModal();
 
                     // Small delay so user sees confirmation (adjust duration as needed)
-                    await Task.Delay(2500);
+                    await this.WaitOnUIRefresh();
 
                     await LoadContract();
 
@@ -252,9 +252,9 @@ private async Task RemoveFee(Guid productId, Guid feeId)
             if (result.IsSuccess)
             {
                 successMessage = "Transaction fee removed successfully";
-                
+
                 // Small delay so user sees confirmation (adjust duration as needed)
-                await Task.Delay(2500);
+                await this.WaitOnUIRefresh();
 
                 await LoadContract();
             }
diff --git a/EstateManagementUI.BlazorServer/Components/Pages/Estate/Index.razor b/EstateManagementUI.BlazorServer/Components/Pages/Estate/Index.razor
index f27c9f20..61ea565d 100644
--- a/EstateManagementUI.BlazorServer/Components/Pages/Estate/Index.razor
+++ b/EstateManagementUI.BlazorServer/Components/Pages/Estate/Index.razor
@@ -1,11 +1,10 @@
 @page "/estate"
 @using EstateManagementUI.BlazorServer.Common
+@using EstateManagementUI.BlazorServer.UIServices
 @inherits AuthorizedComponentBase
 @rendermode InteractiveServer
-@inject AuthenticationStateProvider AuthenticationStateProvider
 @inject NavigationManager NavigationManager
-@inject IMediator Mediator
-@inject IPermissionService PermissionService
+@inject IEstateUIService EstateUIService
 
 <PageTitle>Estate Management</PageTitle>
 
@@ -21,7 +20,7 @@
             <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600"></div>
         </div>
     }
-    else if (estate != null)
+    else
     {
         <!-- Tabs -->
         <div class="bg-white rounded-lg shadow-md">
@@ -62,7 +61,7 @@
                                 <div class="flex items-center justify-between">
                                     <div>
                                         <p class="text-sm text-gray-600 mb-1">Total Merchants</p>
-                                        <p class="text-3xl font-bold text-gray-900">@(estate.Merchants?.Count ?? 0)</p>
+                                        <p class="text-3xl font-bold text-gray-900">@(estate.MerchantCount)</p>
                                     </div>
                                     <svg class="w-12 h-12 text-blue-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 11V7a4 4 0 00-8 0v4M5 9h14l1 12H4L5 9z"></path>
@@ -74,7 +73,7 @@
                                 <div class="flex items-center justify-between">
                                     <div>
                                         <p class="text-sm text-gray-600 mb-1">Total Operators</p>
-                                        <p class="text-3xl font-bold text-gray-900">@(estate.Operators?.Count ?? 0)</p>
+                                        <p class="text-3xl font-bold text-gray-900">@(estate.OperatorCount)</p>
                                     </div>
                                     <svg class="w-12 h-12 text-green-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 6V4m0 2a2 2 0 100 4m0-4a2 2 0 110 4m-6 8a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4m6 6v10m6-2a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4"></path>
@@ -86,7 +85,7 @@
                                 <div class="flex items-center justify-between">
                                     <div>
                                         <p class="text-sm text-gray-600 mb-1">Total Contracts</p>
-                                        <p class="text-3xl font-bold text-gray-900">@(estate.Operators?.Count ?? 0)</p>
+                                        <p class="text-3xl font-bold text-gray-900">@(estate.ContractCount)</p>
                                     </div>
                                     <svg class="w-12 h-12 text-purple-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path>
@@ -98,7 +97,7 @@
                                 <div class="flex items-center justify-between">
                                     <div>
                                         <p class="text-sm text-gray-600 mb-1">Total Users</p>
-                                        <p class="text-3xl font-bold text-gray-900">@(estate.Users?.Count ?? 0)</p>
+                                        <p class="text-3xl font-bold text-gray-900">@(estate.UserCount)</p>
                                     </div>
                                     <svg class="w-12 h-12 text-yellow-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4.354a4 4 0 110 5.292M15 21H3v-1a6 6 0 0112 0v1zm0 0h6v-1a6 6 0 00-9-5.197M13 7a4 4 0 11-8 0 4 4 0 018 0z"></path>
@@ -115,10 +114,10 @@
                                     <h2 class="text-lg font-semibold text-gray-900">Recent Merchants</h2>
                                     <a href="/merchants" class="text-blue-600 hover:text-blue-800 text-sm font-medium">View All →</a>
                                 </div>
-                                @if (merchants != null && merchants.Any())
+                                @if (@estate.RecentMerchants != null && @estate.RecentMerchants.Any())
                                 {
                                     <div class="space-y-3">
-                                        @foreach (var merchant in merchants)
+                                        @foreach (var merchant in @estate.RecentMerchants)
                                         {
                                             <div class="flex items-center justify-between p-3 bg-white rounded-lg">
                                                 <div>
@@ -146,10 +145,10 @@
                                     <h2 class="text-lg font-semibold text-gray-900">Contracts</h2>
                                     <a href="/contracts" class="text-blue-600 hover:text-blue-800 text-sm font-medium">View All →</a>
                                 </div>
-                                @if (contracts != null && contracts.Any())
+                                @if (estate.RecentContracts != null && estate.RecentContracts.Any())
                                 {
                                     <div class="space-y-3">
-                                        @foreach (var contract in contracts.Take(5))
+                                        @foreach (var contract in estate.RecentContracts.Take(5))
                                         {
                                             <div class="flex items-center justify-between p-3 bg-white rounded-lg">
                                                 <div>
@@ -204,9 +203,9 @@
                                 <div class="flex space-x-2">
                                     <select @bind="selectedOperatorId" class="input flex-1">
                                         <option value="">Select an operator...</option>
-                                        @if (availableOperators != null)
+                                        @if (estate.AllOperators != null)
                                         {
-                                            @foreach (var op in availableOperators)
+                                            @foreach (var op in estate.AllOperators)
                                             {
                                                 <option value="@op.OperatorId">@op.OperatorName</option>
                                             }
@@ -219,14 +218,14 @@
                             </div>
                         }
 
-                        @if (assignedOperators == null || !assignedOperators.Any())
+                        @if (estate.AssignedOperators == null || !estate.AssignedOperators.Any())
                         {
                             <p class="text-gray-500 text-center py-8">No operators assigned</p>
                         }
                         else
                         {
                             <div class="space-y-2">
-                                @foreach (var op in assignedOperators)
+                                @foreach (var op in estate.AssignedOperators)
                                 {
                                     <div class="flex items-center justify-between p-3 bg-gray-50 rounded-lg">
                                         <div>
@@ -254,10 +253,4 @@
             </div>
         </div>
     }
-    else
-    {
-        <div class="bg-white rounded-lg shadow-md p-6">
-            <p class="text-gray-600">Unable to load estate information.</p>
-        </div>
-    }
 </div>
diff --git a/EstateManagementUI.BlazorServer/Components/Pages/Estate/Index.razor.cs b/EstateManagementUI.BlazorServer/Components/Pages/Estate/Index.razor.cs
index 5c5c72fd..26b2a586 100644
--- a/EstateManagementUI.BlazorServer/Components/Pages/Estate/Index.razor.cs
+++ b/EstateManagementUI.BlazorServer/Components/Pages/Estate/Index.razor.cs
@@ -2,186 +2,107 @@
 using EstateManagementUI.BlazorServer.Factories;
 using EstateManagementUI.BlazorServer.Models;
 using EstateManagementUI.BlazorServer.Permissions;
+using EstateManagementUI.BusinessLogic.BackendAPI.DataTransferObjects;
 using EstateManagementUI.BusinessLogic.Requests;
+using MediatR;
 using Microsoft.AspNetCore.Components.Authorization;
 using Shared.Results;
 using SimpleResults;
 
-namespace EstateManagementUI.BlazorServer.Components.Pages.Estate
-{
-    public partial class Index
-    {
-        private bool isLoading = true;
-        private EstateModel? estate;
-        private List<RecentMerchantsModel> merchants;
-        private List<OperatorDropDownModel>? availableOperators;
-        private List<OperatorModel> assignedOperators = new();
-        private List<RecentContractModel> contracts;
-        private string activeTab = "overview";
-        private bool showAddOperator = false;
-        private string? selectedOperatorId;
-        private string? successMessage;
-        private string? errorMessage;
-
-        protected override async Task OnAfterRenderAsync(bool firstRender)
-        {
-            if (!firstRender)
-            {
-                await base.OnAfterRenderAsync(firstRender);
-                return;
-            }
-            try {
-                await base.OnInitializedAsync();
-
-                await RequirePermission(PermissionSection.Estate, PermissionFunction.View);
-                CorrelationId correlationId = new(Guid.NewGuid());
-                Guid estateId = await this.GetEstateId();
-                var result = await this.LoadEstateData(correlationId, estateId);
-                if (result.IsFailed) {
-                    this.NavigationManager.NavigateToErrorPage();
-                    return;
-                }
-            }
-            finally
-            {
-                isLoading = false;
-                this.StateHasChanged();
-            }
-        }
-
-        private async Task<Result> LoadEstateData(CorrelationId correlationId, Guid estateId)
-        {
-            Task<Result<BusinessLogic.Models.EstateModel>> estateTask = Mediator.Send(new EstateQueries.GetEstateQuery(correlationId, estateId));
-            Task<Result<List<BusinessLogic.Models.RecentMerchantsModel>>> merchantTask = Mediator.Send(new MerchantQueries.GetRecentMerchantsQuery(correlationId, estateId));
-            Task<Result<List<BusinessLogic.Models.RecentContractModel>>> contractsTask = Mediator.Send(new ContractQueries.GetRecentContractsQuery(correlationId, estateId));
-            Task<Result<List<BusinessLogic.Models.OperatorModel>>> assignedOperatorsTask = Mediator.Send(new EstateQueries.GetAssignedOperatorsQuery(correlationId, estateId));
-            Task<Result<List<BusinessLogic.Models.OperatorDropDownModel>>> allOperatorsTask= Mediator.Send(new OperatorQueries.GetOperatorsForDropDownQuery(correlationId, estateId));
-
-            await Task.WhenAll(estateTask, merchantTask, contractsTask, assignedOperatorsTask, allOperatorsTask);
-            
-            if (estateTask.Result.IsFailed)
-                return ResultHelpers.CreateFailure(estateTask.Result);
-            estate = ModelFactory.ConvertFrom(estateTask.Result.Data);
+namespace EstateManagementUI.BlazorServer.Components.Pages.Estate;
 
-            if (merchantTask.Result.IsFailed)
-                return ResultHelpers.CreateFailure(merchantTask.Result);
-            this.merchants = ModelFactory.ConvertFrom(merchantTask.Result.Data);
+public partial class Index {
+    private bool isLoading = true;
+    private EstateModel? estate;
+    //private string activeTab = "overview";
+    private bool showAddOperator = false;
+    private string? selectedOperatorId;
 
-            if (contractsTask.Result.IsFailed)
-                return ResultHelpers.CreateFailure(contractsTask.Result);
-            this.contracts = ModelFactory.ConvertFrom(contractsTask.Result.Data);
+    public Index() {
+        this.SetActiveTab("overview");
+    }
 
-            if (assignedOperatorsTask.Result.IsFailed)
-                return ResultHelpers.CreateFailure(assignedOperatorsTask.Result);
-            this.assignedOperators = ModelFactory.ConvertFrom(assignedOperatorsTask.Result.Data);
+    protected override async Task OnAfterRenderAsync(bool firstRender) {
+        if (!firstRender) {
+            return;
+        }
 
-            if (allOperatorsTask.Result.IsFailed)
-                return ResultHelpers.CreateFailure(allOperatorsTask.Result);
+        Result authResult = await RequirePermission(PermissionSection.Estate, PermissionFunction.View);
+        if (authResult.IsFailed)
+            return;
 
-            List<OperatorDropDownModel> unfiltered = ModelFactory.ConvertFrom(allOperatorsTask.Result.Data);
-            this.availableOperators = unfiltered
-                .Where(u => !this.assignedOperators.Any(a => a.OperatorId == u.OperatorId))
-                .Select(u => new OperatorDropDownModel
-                {
-                    OperatorId = u.OperatorId,
-                    OperatorName = u.OperatorName
-                })
-                .ToList();
+        Result result = await this.LoadEstateData();
+        if (result.IsFailed) {
+            this.NavigationManager.NavigateToErrorPage();
+            return;
+        }
 
+        isLoading = false;
+        this.StateHasChanged();
+    }
 
-            return Result.Success();
+    private async Task<Result> LoadEstateData() {
+        CorrelationId correlationId = new(Guid.NewGuid());
+        Guid estateId = await this.GetEstateId();
+        Result<EstateModel> result = await this.EstateUIService.LoadEstate(correlationId, estateId);
+        if (result.IsFailed) {
+            return ResultHelpers.CreateFailure(result);
         }
 
+        estate = result.Data;
+        return Result.Success();
+    }
+        
+    private async Task AddOperatorToEstate() {
+        if (string.IsNullOrEmpty(selectedOperatorId)) return;
 
-        private void SetActiveTab(string tab)
-        {
-            activeTab = tab;
-            ClearMessages();
-        }
+        ClearMessages();
 
-        private void ClearMessages()
-        {
-            successMessage = null;
-            errorMessage = null;
-        }
+        try {
+            CorrelationId correlationId = new CorrelationId(Guid.NewGuid());
+            Guid estateId = await this.GetEstateId();
+            
+            var result = await this.EstateUIService.AddOperatorToEstate(correlationId, estateId, this.selectedOperatorId);
 
-        private async Task AddOperatorToEstate()
-        {
-            if (string.IsNullOrEmpty(selectedOperatorId)) return;
-
-            ClearMessages();
-
-            try {
-                var correlationId = new CorrelationId(Guid.NewGuid());
-                Guid estateId = await this.GetEstateId();
-                var operatorId = Guid.Parse(selectedOperatorId);
-
-                var command = new EstateCommands.AddOperatorToEstateCommand(correlationId, estateId, operatorId);
-
-                var result = await Mediator.Send(command);
-
-                if (result.IsSuccess) {
-                    successMessage = "Operator added successfully";
-                    selectedOperatorId = null;
-                    showAddOperator = false;
-
-                    // Add to assigned list
-                    var op = availableOperators?.FirstOrDefault(o => o.OperatorId == operatorId);
-                    if (op != null && !assignedOperators.Any(a => a.OperatorId == operatorId)) {
-                        OperatorQueries.GetOperatorQuery query = new OperatorQueries.GetOperatorQuery(CorrelationIdHelper.New(), await this.GetEstateId(), operatorId);
-                        var operatorResult = await Mediator.Send(query);
-                        if (operatorResult.IsFailed) {
-                            this.NavigationManager.NavigateToErrorPage();
-                            //return;
-                        }
-
-                        assignedOperators.Add(new OperatorModel() { OperatorId = operatorResult.Data.OperatorId, Name = operatorResult.Data.Name, RequireCustomMerchantNumber = operatorResult.Data.RequireCustomMerchantNumber, RequireCustomTerminalNumber = operatorResult.Data.RequireCustomTerminalNumber });
-                    }
-                }
-                else {
-                    errorMessage = result.Message ?? "Failed to add operator";
-                }
-            }
-            catch (Exception ex) {
-                errorMessage = $"An error occurred: {ex.Message}";
+            if (result.IsSuccess) {
+                successMessage = "Operator added successfully";
+                selectedOperatorId = null;
+                showAddOperator = false;
+
+                await this.LoadEstateData();
             }
-            finally {
-                // Small delay so user sees confirmation (adjust duration as needed)
-                await Task.Delay(2500);
-                this.StateHasChanged();
+            else {
+                errorMessage = "Failed to add operator";
             }
         }
+        finally {
+            // Small delay so user sees confirmation (adjust duration as needed)
+            await this.WaitOnUIRefresh();
+            this.StateHasChanged();
+        }
+    }
+
+    private async Task RemoveOperatorFromEstate(Guid operatorId) {
+        ClearMessages();
+
+        try {
+            CorrelationId correlationId = new CorrelationId(Guid.NewGuid());
+            Guid estateId = await this.GetEstateId();
+            var result = await this.EstateUIService.RemoveOperatorFromEstate(correlationId, estateId, operatorId);
 
-        private async Task RemoveOperatorFromEstate(Guid operatorId)
-        {
-            ClearMessages();
-
-            try
-            {
-                var correlationId = new CorrelationId(Guid.NewGuid());
-                Guid estateId = await this.GetEstateId();
-                var command = new EstateCommands.RemoveOperatorFromEstateCommand(
-                    correlationId,
-                    estateId,
-                    operatorId
-                );
-
-                var result = await Mediator.Send(command);
-
-                if (result.IsSuccess)
-                {
-                    successMessage = "Operator removed successfully";
-                    assignedOperators.RemoveAll(o => o.OperatorId == operatorId);
-                }
-                else
-                {
-                    errorMessage = result.Message ?? "Failed to remove operator";
-                }
+            if (result.IsSuccess) {
+                successMessage = "Operator removed successfully";
+                await this.LoadEstateData();
             }
-            catch (Exception ex)
-            {
-                errorMessage = $"An error occurred: {ex.Message}";
+            else {
+                errorMessage = "Failed to remove operator";
             }
         }
+        finally {
+            // Small delay so user sees confirmation (adjust duration as needed)
+            await this.WaitOnUIRefresh();
+            this.StateHasChanged();
+        }
     }
-}
+
+}
\ No newline at end of file
diff --git a/EstateManagementUI.BlazorServer/Components/Pages/Merchants/Deposit.razor.cs b/EstateManagementUI.BlazorServer/Components/Pages/Merchants/Deposit.razor.cs
index b2ed5f03..780a37be 100644
--- a/EstateManagementUI.BlazorServer/Components/Pages/Merchants/Deposit.razor.cs
+++ b/EstateManagementUI.BlazorServer/Components/Pages/Merchants/Deposit.razor.cs
@@ -79,7 +79,7 @@ private async Task HandleSubmit()
                 StateHasChanged();
 
                 // Small delay so user sees confirmation (adjust duration as needed)
-                await Task.Delay(2500);
+                await this.WaitOnUIRefresh();
 
                 // Navigate back to merchant list on success
                 NavigationManager.NavigateTo("/merchants");
diff --git a/EstateManagementUI.BlazorServer/Components/Pages/Merchants/Edit.razor.cs b/EstateManagementUI.BlazorServer/Components/Pages/Merchants/Edit.razor.cs
index 1c0c8e48..61034e37 100644
--- a/EstateManagementUI.BlazorServer/Components/Pages/Merchants/Edit.razor.cs
+++ b/EstateManagementUI.BlazorServer/Components/Pages/Merchants/Edit.razor.cs
@@ -235,8 +235,8 @@ private async Task SaveAllChanges()
                 StateHasChanged();
 
                 // Small delay so user sees confirmation (adjust duration as needed)
-                await Task.Delay(2500);
-                
+                await this.WaitOnUIRefresh();
+
                 // Navigate to edit page
                 NavigationManager.NavigateTo($"/merchants");
             }
diff --git a/EstateManagementUI.BlazorServer/Components/Pages/Merchants/New.razor.cs b/EstateManagementUI.BlazorServer/Components/Pages/Merchants/New.razor.cs
index f95766fb..d3f0942c 100644
--- a/EstateManagementUI.BlazorServer/Components/Pages/Merchants/New.razor.cs
+++ b/EstateManagementUI.BlazorServer/Components/Pages/Merchants/New.razor.cs
@@ -56,7 +56,7 @@ private async Task HandleSubmit()
                 StateHasChanged();
 
                 // Small delay so user sees confirmation (adjust duration as needed)
-                await Task.Delay(2500);
+                await this.WaitOnUIRefresh();
 
                 // Navigate to merchant list
                 NavigationManager.NavigateTo($"/merchants");
diff --git a/EstateManagementUI.BlazorServer/Components/Pages/Operators/Edit.razor.cs b/EstateManagementUI.BlazorServer/Components/Pages/Operators/Edit.razor.cs
index b0feb206..7532e308 100644
--- a/EstateManagementUI.BlazorServer/Components/Pages/Operators/Edit.razor.cs
+++ b/EstateManagementUI.BlazorServer/Components/Pages/Operators/Edit.razor.cs
@@ -90,7 +90,7 @@ private async Task HandleSubmit()
                     StateHasChanged();
 
                     // Small delay so user sees confirmation (adjust duration as needed)
-                    await Task.Delay(2500);
+                    await this.WaitOnUIRefresh();
 
                     NavigationManager.NavigateTo("/operators");
                 }
diff --git a/EstateManagementUI.BlazorServer/Components/Pages/Operators/New.razor.cs b/EstateManagementUI.BlazorServer/Components/Pages/Operators/New.razor.cs
index 7f531872..5b7974ee 100644
--- a/EstateManagementUI.BlazorServer/Components/Pages/Operators/New.razor.cs
+++ b/EstateManagementUI.BlazorServer/Components/Pages/Operators/New.razor.cs
@@ -54,7 +54,7 @@ private async Task HandleSubmit()
                 StateHasChanged();
 
                 // Small delay so user sees confirmation (adjust duration as needed)
-                await Task.Delay(2500);
+                await this.WaitOnUIRefresh();
 
 
                 // Navigate to operators list with success
diff --git a/EstateManagementUI.BlazorServer/Components/Pages/Reporting/AnalyticalCharts.razor b/EstateManagementUI.BlazorServer/Components/Pages/Reporting/AnalyticalCharts.razor
index fde2e011..2837d922 100644
--- a/EstateManagementUI.BlazorServer/Components/Pages/Reporting/AnalyticalCharts.razor
+++ b/EstateManagementUI.BlazorServer/Components/Pages/Reporting/AnalyticalCharts.razor
@@ -5,6 +5,7 @@
 @rendermode InteractiveServer
 @inject IMediator Mediator
 @inject IJSRuntime JSRuntime
+@inherits CustomComponentBase
 @inject ILogger<AnalyticalCharts> Logger
 @inject AuthenticationStateProvider AuthenticationStateProvider
 
@@ -191,7 +192,7 @@
         if (firstRender)
         {
             // Give Chart.js time to load from CDN
-            await Task.Delay(100);
+            await this.WaitOnUIRefresh();
         }
         
         if (!isLoading && salesCountData != null && salesValueData != null)
diff --git a/EstateManagementUI.BlazorServer/Components/Permissions/AuthorizedComponentBase.cs b/EstateManagementUI.BlazorServer/Components/Permissions/AuthorizedComponentBase.cs
index da0751a9..0f4c45b5 100644
--- a/EstateManagementUI.BlazorServer/Components/Permissions/AuthorizedComponentBase.cs
+++ b/EstateManagementUI.BlazorServer/Components/Permissions/AuthorizedComponentBase.cs
@@ -5,7 +5,37 @@
 using System.Security.Claims;
 using SimpleResults;
 
-public abstract class AuthorizedComponentBase : ComponentBase
+public abstract class CustomComponentBase : ComponentBase {
+
+    private Int32? DelayOverride;
+
+    public void SetDelayOverride(Int32 delay) => this.DelayOverride = delay;
+
+    public async Task WaitOnUIRefresh(Int32 delay=2500) {
+        Int32 localDelay = delay;
+        if (this.DelayOverride.HasValue) {
+            localDelay = this.DelayOverride.GetValueOrDefault();
+        }
+        await Task.Delay(localDelay);
+    }
+
+    protected string? successMessage;
+    protected string? errorMessage;
+    protected string activeTab;
+    protected void ClearMessages()
+    {
+        successMessage = null;
+        errorMessage = null;
+    }
+
+    protected void SetActiveTab(string tab)
+    {
+        activeTab = tab;
+        ClearMessages();
+    }
+}
+
+public abstract class AuthorizedComponentBase : CustomComponentBase
 {
     [CascadingParameter]
     private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
@@ -22,15 +52,17 @@ protected override async Task OnInitializedAsync() {
     [Inject] protected IPermissionService PermissionService { get; set; } = default!;
     [Inject] protected NavigationManager NavigationManager { get; set; } = default!;
 
-    protected async Task RequirePermission(PermissionSection permissionSection, PermissionFunction permissionFunction)
+    protected async Task<Result> RequirePermission(PermissionSection permissionSection, PermissionFunction permissionFunction)
     {
         // Do a permission check here
         Boolean hasPermission = await this.PermissionService.HasPermissionAsync(permissionSection, permissionFunction);
         if (hasPermission == false)
         {
             this.NavigationManager.NavigateToAccessDeniedPage();
-            return;
+            return Result.Unauthorized();
         }
+
+        return Result.Success();
     }
 
     protected async Task<Guid> GetEstateId() {
diff --git a/EstateManagementUI.BlazorServer/Factories/ModelFactory.cs b/EstateManagementUI.BlazorServer/Factories/ModelFactory.cs
index 953f2a0f..36aa666e 100644
--- a/EstateManagementUI.BlazorServer/Factories/ModelFactory.cs
+++ b/EstateManagementUI.BlazorServer/Factories/ModelFactory.cs
@@ -6,11 +6,6 @@
 using ContractModel = EstateManagementUI.BlazorServer.Models.ContractModel;
 using ContractProductModel = EstateManagementUI.BlazorServer.Models.ContractProductModel;
 using ContractProductTransactionFeeModel = EstateManagementUI.BlazorServer.Models.ContractProductTransactionFeeModel;
-using EstateContractModel = EstateManagementUI.BlazorServer.Models.EstateContractModel;
-using EstateMerchantModel = EstateManagementUI.BlazorServer.Models.EstateMerchantModel;
-using EstateModel = EstateManagementUI.BlazorServer.Models.EstateModel;
-using EstateOperatorModel = EstateManagementUI.BlazorServer.Models.EstateOperatorModel;
-using EstateUserModel = EstateManagementUI.BlazorServer.Models.EstateUserModel;
 using FileDetailsModel = EstateManagementUI.BlazorServer.Models.FileDetailsModel;
 using FileImportLogModel = EstateManagementUI.BlazorServer.Models.FileImportLogModel;
 using MerchantContractModel = EstateManagementUI.BlazorServer.Models.MerchantContractModel;
diff --git a/EstateManagementUI.BlazorServer/Models/Models.cs b/EstateManagementUI.BlazorServer/Models/Models.cs
index 7ebee164..282e18e7 100644
--- a/EstateManagementUI.BlazorServer/Models/Models.cs
+++ b/EstateManagementUI.BlazorServer/Models/Models.cs
@@ -2,49 +2,17 @@
 
 namespace EstateManagementUI.BlazorServer.Models;
 
-// Estate Models
-public class EstateModel
-{
-    public Guid EstateId { get; set; }
-    public string? EstateName { get; set; }
-    public string? Reference { get; set; }
-    public List<EstateOperatorModel>? Operators { get; set; }
-    public List<EstateMerchantModel>? Merchants { get; set; }
-    public List<EstateContractModel>? Contracts { get; set; }
-    public List<EstateUserModel>? Users { get; set; }
-}
-
-public class EstateUserModel
-{
-    public Guid UserId { get; set; }
-    public string? EmailAddress { get; set; }
-    public DateTime CreatedDateTime { get; set; }
-}
-
-public class EstateOperatorModel
-{
-    public Guid OperatorId { get; set; }
-    public string? Name { get; set; }
-    public bool RequireCustomMerchantNumber { get; set; }
-    public bool RequireCustomTerminalNumber { get; set; }
-    public DateTime CreatedDateTime { get; set; }
+public record EstateModel(Guid EstateId, string? EstateName, string? Reference) {
+    public Int32 MerchantCount { get; init; }
+    public Int32 OperatorCount { get; init; }
+    public Int32 ContractCount { get; init; }
+    public Int32 UserCount { get; init; }
+    public List<RecentMerchantsModel> RecentMerchants { get; init; }
+    public List<RecentContractModel> RecentContracts { get; init; }
+    public List<OperatorModel> AssignedOperators { get; init; }
+    public List<OperatorDropDownModel> AllOperators { get; init; }
 }
 
-public class EstateContractModel
-{
-    public Guid OperatorId { get; set; }
-    public Guid ContractId { get; set; }
-    public string? Name { get; set; }
-    public string? OperatorName { get; set; }
-}
-
-
-public class EstateMerchantModel
-{
-    public Guid MerchantId { get; set; }
-    public string? Name { get; set; }
-    public string? Reference { get; set; }
-}
 
 public class MerchantModel
 {
diff --git a/EstateManagementUI.BlazorServer/Program.cs b/EstateManagementUI.BlazorServer/Program.cs
index 1abe3ca5..e12b192e 100644
--- a/EstateManagementUI.BlazorServer/Program.cs
+++ b/EstateManagementUI.BlazorServer/Program.cs
@@ -19,17 +19,15 @@
 using System.Net;
 using System.Security.Cryptography.X509Certificates;
 using ClientProxyBase;
+using EstateManagementUI.BlazorServer.Components.Pages.Estate;
+using EstateManagementUI.BlazorServer.UIServices;
 using SecurityService.Client;
 using Shared.General;
 using TransactionProcessor.Client;
 
 var builder = WebApplication.CreateBuilder(args);
 
-// Ensure web host uses the exe folder as content root (services default to System32 otherwise)
-builder.Host.UseContentRoot(AppContext.BaseDirectory);
-
 // Load hosting.json configuration for port settings
-//builder.Configuration.AddJsonFile("hosting.json", optional: true, reloadOnChange: true)
 builder.Configuration
     .AddJsonFile("/home/txnproc/config/appsettings.json", true, true)
     .AddJsonFile($"/home/txnproc/config/appsettings.{builder.Environment.EnvironmentName}.json", optional: true)
@@ -242,6 +240,8 @@
     builder.Services.RegisterHttpClient<IEstateReportingApiClient, EstateReportingApiClient>();
     builder.Services.RegisterHttpClient<ISecurityServiceClient, SecurityServiceClient>();
     builder.Services.RegisterHttpClient<ITransactionProcessorClient, TransactionProcessorClient>();
+    
+    builder.Services.AddSingleton<IEstateUIService, EstateUIService>();
 }
 
 builder.Host.UseWindowsService();
diff --git a/EstateManagementUI.BlazorServer/UIServices/EstateUIService.cs b/EstateManagementUI.BlazorServer/UIServices/EstateUIService.cs
new file mode 100644
index 00000000..396de2da
--- /dev/null
+++ b/EstateManagementUI.BlazorServer/UIServices/EstateUIService.cs
@@ -0,0 +1,101 @@
+using EstateManagementUI.BlazorServer.Factories;
+using EstateManagementUI.BlazorServer.Models;
+using EstateManagementUI.BusinessLogic.Requests;
+using MediatR;
+using Shared.Results;
+using SimpleResults;
+
+namespace EstateManagementUI.BlazorServer.UIServices
+{
+    public interface IEstateUIService
+    {
+        Task<Result<EstateModel>> LoadEstate(CorrelationId correlationId, Guid estateId);
+
+        Task<Result> AddOperatorToEstate(CorrelationId correlationId, Guid estateId, String selectedOperatorId);
+        Task<Result> RemoveOperatorFromEstate(CorrelationId correlationId, Guid estateId, Guid selectedOperatorId);
+    }
+
+    public class EstateUIService : IEstateUIService
+    {
+        private readonly IMediator Mediator;
+
+        public EstateUIService(IMediator mediator)
+        {
+            this.Mediator = mediator;
+        }
+
+        public async Task<Result<EstateModel>> LoadEstate(CorrelationId correlationId,
+                                                          Guid estateId)
+        {
+            Task<Result<BusinessLogic.Models.EstateModel>> estateTask = Mediator.Send(new EstateQueries.GetEstateQuery(correlationId, estateId));
+            Task<Result<List<BusinessLogic.Models.RecentMerchantsModel>>> merchantTask = Mediator.Send(new MerchantQueries.GetRecentMerchantsQuery(correlationId, estateId));
+            Task<Result<List<BusinessLogic.Models.RecentContractModel>>> contractsTask = Mediator.Send(new ContractQueries.GetRecentContractsQuery(correlationId, estateId));
+            Task<Result<List<BusinessLogic.Models.OperatorModel>>> assignedOperatorsTask = Mediator.Send(new EstateQueries.GetAssignedOperatorsQuery(correlationId, estateId));
+            Task<Result<List<BusinessLogic.Models.OperatorDropDownModel>>> allOperatorsTask = Mediator.Send(new OperatorQueries.GetOperatorsForDropDownQuery(correlationId, estateId));
+
+            await Task.WhenAll(estateTask, merchantTask, contractsTask, assignedOperatorsTask, allOperatorsTask);
+
+            if (estateTask.Result.IsFailed)
+                return ResultHelpers.CreateFailure(estateTask.Result);
+
+            if (merchantTask.Result.IsFailed)
+                return ResultHelpers.CreateFailure(merchantTask.Result);
+            var merchants = ModelFactory.ConvertFrom(merchantTask.Result.Data);
+
+            if (contractsTask.Result.IsFailed)
+                return ResultHelpers.CreateFailure(contractsTask.Result);
+            var contracts = ModelFactory.ConvertFrom(contractsTask.Result.Data);
+
+            if (assignedOperatorsTask.Result.IsFailed)
+                return ResultHelpers.CreateFailure(assignedOperatorsTask.Result);
+            var assignedOperators = ModelFactory.ConvertFrom(assignedOperatorsTask.Result.Data);
+
+            if (allOperatorsTask.Result.IsFailed)
+                return ResultHelpers.CreateFailure(allOperatorsTask.Result);
+
+            List<OperatorDropDownModel> unfiltered = ModelFactory.ConvertFrom(allOperatorsTask.Result.Data);
+            var availableOperators = unfiltered.Where(u => !assignedOperators.Any(a => a.OperatorId == u.OperatorId)).Select(u => new OperatorDropDownModel { OperatorId = u.OperatorId, OperatorName = u.OperatorName }).ToList();
+            var estateModel = estateTask.Result.Data;
+            var resultModel = new EstateModel(estateModel.EstateId, estateModel.EstateName, estateModel.Reference);
+            resultModel = resultModel with
+            {
+                MerchantCount = estateModel.Merchants.Count,
+                AllOperators = availableOperators,
+                AssignedOperators = assignedOperators,
+                ContractCount = estateModel.Contracts.Count,
+                RecentContracts = contracts,
+                RecentMerchants = merchants,
+                UserCount = estateModel.Users.Count,
+            };
+
+            return Result.Success(resultModel);
+        }
+
+        public async Task<Result> AddOperatorToEstate(CorrelationId correlationId,
+                                              Guid estateId, String selectedOperatorId)
+        {
+            var operatorId = Guid.Parse(selectedOperatorId);
+
+            var command = new EstateCommands.AddOperatorToEstateCommand(correlationId, estateId, operatorId);
+
+            var result = await Mediator.Send(command);
+            if (result.IsFailed)
+                return ResultHelpers.CreateFailure(result);
+
+            return Result.Success();
+        }
+
+        public async Task<Result> RemoveOperatorFromEstate(CorrelationId correlationId,
+                                                           Guid estateId,
+                                                           Guid operatorId)
+        {
+            var command = new EstateCommands.RemoveOperatorFromEstateCommand(correlationId, estateId, operatorId);
+
+            var result = await Mediator.Send(command);
+            if (result.IsFailed)
+                return ResultHelpers.CreateFailure(result);
+
+            return Result.Success();
+        }
+    }
+}
\ No newline at end of file
diff --git a/EstateManagmentUI.BusinessLogic/Models/Models.cs b/EstateManagmentUI.BusinessLogic/Models/Models.cs
index 509c5893..d5df449a 100644
--- a/EstateManagmentUI.BusinessLogic/Models/Models.cs
+++ b/EstateManagmentUI.BusinessLogic/Models/Models.cs
@@ -12,7 +12,8 @@ public class EstateModel
     public List<EstateUserModel>? Users { get; set; }
 }
 
-public class EstateUserModel {
+public class EstateUserModel
+{
     public Guid UserId { get; set; }
     public string? EmailAddress { get; set; }
     public DateTime CreatedDateTime { get; set; }
@@ -36,7 +37,8 @@ public class EstateContractModel
 }
 
 
-public class EstateMerchantModel {
+public class EstateMerchantModel
+{
     public Guid MerchantId { get; set; }
     public string? Name { get; set; }
     public string? Reference { get; set; }