diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 0000000..a2a88bf
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,940 @@
+# Aquiis Property Management System - AI Agent Instructions
+
+## Development Workflow
+
+### Feature Branch Strategy
+
+**CRITICAL: Use the feature → development → main workflow. Main branch is protected and only accepts pull requests.**
+
+**Branch Hierarchy:**
+
+```
+main (protected, production-ready)
+  ↑ Pull Request (after CI passes)
+development (integration testing)
+  ↑ Direct merge
+feature/Phase-X-Feature-Name
+```
+
+**Workflow:**
+
+1. **Create Feature Branch from Development**:
+
+   ```bash
+   # Ensure you're on development branch
+   git checkout development
+   git pull origin development
+
+   # Create feature branch
+   git checkout -b feature/Phase-X-Feature-Name
+   ```
+
+   - Use descriptive names: `feature/Phase-6-Workflow-Services-and-Automation`
+   - Always branch from `development`, never from `main`
+
+2. **Development on Feature Branch**:
+   - All commits for the feature go to the feature branch
+   - Build and test frequently to ensure no breaking changes
+   - Keep commits focused and atomic
+   - Push feature branch to remote regularly for backup
+
+3. **Merge to Development** (after feature is complete and tested):
+
+   ```bash
+   # Ensure build succeeds with 0 errors
+   dotnet build Aquiis.sln
+
+   # Switch to development and merge
+   git checkout development
+   git pull origin development
+   git merge feature/Phase-X-Feature-Name
+
+   # Test the merged code in development
+   dotnet build Aquiis.sln
+   dotnet test
+   ```
+
+4. **Create Pull Request to Main**:
+
+   ```bash
+   # Push development branch to remote
+   git push origin development
+   ```
+
+   - Create pull request on GitHub: `development` → `main`
+   - Wait for CI tests to pass
+   - Review and merge PR on GitHub.com
+
+5. **Pull Changes Locally**:
+
+   ```bash
+   # Switch to main and pull merged changes
+   git checkout main
+   git pull origin main
+
+   # Test locally to verify
+   dotnet build Aquiis.sln
+   dotnet test
+   ```
+
+**Branch Protection Rules:**
+
+- **Main**: Protected, requires pull request, cannot push directly
+- **Development**: Integration branch for testing features before PR
+- **Feature branches**: Short-lived, deleted after merge to development
+
+---
+
+## Project Overview
+
+Aquiis is a multi-tenant property management system built with **ASP.NET Core 9.0 + Blazor Server**. It manages properties, tenants, leases, invoices, payments, documents, inspections, and maintenance requests with role-based access control.
+
+## Architecture Fundamentals
+
+### Multi-Tenant Design
+
+- **Critical**: Every entity has an `OrganizationId` for tenant isolation
+- **UserContextService** (`Services/UserContextService.cs`) provides cached access to current user's `OrganizationId`
+- All service methods MUST filter by `OrganizationId` - this is handled automatically by `BaseService<TEntity>`
+- Never hard-code organization filtering - always use `await _userContext.GetActiveOrganizationIdAsync()`
+
+### Service Layer Architecture
+
+Aquiis uses a **layered service architecture** with entity-specific services inheriting from a base service:
+
+**Service Hierarchy:**
+
+```
+BaseService<TEntity>                    (2-Aquiis.Application/Services/BaseService.cs)
+  ├─ LeaseService                       (Entity-specific CRUD + business logic)
+  ├─ PropertyService
+  ├─ TenantService
+  ├─ InvoiceService
+  ├─ MaintenanceService
+  └─ [Entity]Service
+
+Workflow Services                       (2-Aquiis.Application/Services/Workflows/)
+  ├─ LeaseWorkflowService               (Complex lease lifecycle management)
+  ├─ ApplicationWorkflowService         (Rental application processing)
+  └─ AccountWorkflowService             (User account workflows)
+
+Legacy:
+  └─ PropertyManagementService          (Being phased out - do not extend)
+```
+
+**BaseService<TEntity> Pattern:**
+
+All entity services inherit from `BaseService<TEntity>` which provides:
+
+- ✅ **Automatic organization isolation** - All queries filtered by `OrganizationId`
+- ✅ **Audit field management** - `CreatedBy`, `CreatedOn`, `LastModifiedBy`, `LastModifiedOn` set automatically
+- ✅ **Soft delete support** - Respects `ApplicationSettings.SoftDeleteEnabled`
+- ✅ **Validation hooks** - Override `ValidateEntityAsync()` for custom rules
+- ✅ **Lifecycle hooks** - `SetCreateDefaultsAsync()`, `AfterCreateAsync()`
+
+**Standard CRUD Methods (inherited from BaseService):**
+
+- `GetByIdAsync(Guid id)` - Retrieves entity with org isolation
+- `GetAllAsync()` - Returns all entities for active organization
+- `CreateAsync(TEntity entity)` - Creates with automatic tracking fields
+- `UpdateAsync(TEntity entity)` - Updates with org verification
+- `DeleteAsync(Guid id)` - Soft/hard deletes based on settings
+
+**Entity-Specific Service Pattern:**
+
+```csharp
+public class LeaseService : BaseService<Lease>
+{
+    public LeaseService(
+        ApplicationDbContext context,
+        ILogger<LeaseService> logger,
+        IUserContextService userContext,
+        IOptions<ApplicationSettings> settings)
+        : base(context, logger, userContext, settings)
+    {
+    }
+
+    // Override for custom validation
+    protected override async Task ValidateEntityAsync(Lease entity)
+    {
+        // Check for overlapping leases
+        // Validate date ranges
+        // Business rule validation
+
+        await base.ValidateEntityAsync(entity);
+    }
+
+    // Add entity-specific methods
+    public async Task<List<Lease>> GetLeasesForPropertyAsync(Guid propertyId)
+    {
+        var orgId = await _userContext.GetActiveOrganizationIdAsync();
+
+        return await _dbSet
+            .Where(l => l.PropertyId == propertyId && !l.IsDeleted)
+            .Include(l => l.Property)
+            .Include(l => l.Tenant)
+            .Where(l => l.Property.OrganizationId == orgId)
+            .ToListAsync();
+    }
+}
+```
+
+**Workflow Services Pattern:**
+
+For complex multi-step business processes, use workflow services:
+
+```csharp
+public class LeaseWorkflowService : BaseWorkflowService, IWorkflowState<LeaseStatus>
+{
+    // State machine for lease transitions
+    public bool IsValidTransition(LeaseStatus from, LeaseStatus to)
+
+    // Workflow orchestration methods
+    public async Task<WorkflowResult> ActivateLeaseAsync(Guid leaseId)
+    public async Task<WorkflowResult> RenewLeaseAsync(Guid leaseId, RenewalData data)
+    public async Task<WorkflowResult> TerminateLeaseAsync(Guid leaseId, string reason)
+}
+```
+
+**When to Use Each:**
+
+- **Entity Service** - CRUD operations, simple queries, validation
+- **Workflow Service** - Multi-step processes, state transitions, orchestration
+- **PropertyManagementService** - Legacy code only (do not extend)
+
+**Blazor Component Injection:**
+
+```csharp
+@inject LeaseService LeaseService
+@inject PropertyService PropertyService
+@inject TenantService TenantService
+
+// NOT: @inject PropertyManagementService (legacy)
+```
+
+**CRITICAL: Tracking Fields Must Be Set at Service Layer**
+
+All tracking fields and organization context MUST be set at the **service layer**, never in UI components:
+
+- **Tracking Fields**: `CreatedBy`, `CreatedOn`, `LastModifiedBy`, `LastModifiedOn`, `OrganizationId`
+- **Source of Truth**: Services inject `UserContextService` to get current user and active organization
+- **Security**: UI cannot manipulate tracking fields or bypass organization isolation
+- **Maintainability**: All tracking logic centralized in services (change once, apply everywhere)
+- **Simplicity**: UI components don't need to inject `UserContextService` or pass these values
+
+**Service Method Pattern (CORRECT):**
+
+```csharp
+// Service injects UserContextService
+private readonly UserContextService _userContext;
+
+// Create method - tracking fields set internally
+public async Task<Property> CreatePropertyAsync(Property property)
+{
+    var userId = await _userContext.GetUserIdAsync();
+    var activeOrgId = await _userContext.GetActiveOrganizationIdAsync();
+
+    // Service sets tracking fields - UI never touches these
+    property.CreatedBy = userId;
+    property.CreatedOn = DateTime.UtcNow;
+    property.OrganizationId = activeOrgId;
+
+    _dbContext.Properties.Add(property);
+    await _dbContext.SaveChangesAsync();
+    return property;
+}
+
+// Update method - LastModified tracking + org security check
+public async Task<bool> UpdatePropertyAsync(Property property)
+{
+    var userId = await _userContext.GetUserIdAsync();
+    var activeOrgId = await _userContext.GetActiveOrganizationIdAsync();
+
+    // Verify property belongs to active organization (security)
+    var existing = await _dbContext.Properties
+        .FirstOrDefaultAsync(p => p.Id == property.Id && p.OrganizationId == activeOrgId);
+
+    if (existing == null) return false;
+
+    // Service sets tracking fields
+    property.LastModifiedBy = userId;
+    property.LastModifiedOn = DateTime.UtcNow;
+    property.OrganizationId = activeOrgId; // Prevent org hijacking
+
+    _dbContext.Entry(existing).CurrentValues.SetValues(property);
+    await _dbContext.SaveChangesAsync();
+    return true;
+}
+
+// Query method - automatic active organization filtering
+public async Task<List<Property>> GetPropertiesAsync()
+{
+    var activeOrgId = await _userContext.GetActiveOrganizationIdAsync();
+
+    return await _dbContext.Properties
+        .Where(p => p.OrganizationId == activeOrgId && !p.IsDeleted)
+        .ToListAsync();
+}
+```
+
+**UI Pattern (CORRECT):**
+
+```csharp
+// UI only passes entity - NO userId, NO organizationId
+private async Task CreateProperty()
+{
+    // Simple, clean, secure
+    var created = await PropertyService.CreatePropertyAsync(newProperty);
+    Navigation.NavigateTo("/propertymanagement/properties");
+}
+```
+
+**❌ ANTI-PATTERN (DO NOT DO THIS):**
+
+```csharp
+// BAD: UI passes tracking values (insecure, boilerplate, wrong layer)
+public async Task<Property> CreatePropertyAsync(Property property, string userId, string organizationId)
+{
+    property.CreatedBy = userId;
+    property.OrganizationId = organizationId;
+    // ...
+}
+
+// BAD: UI must inject UserContextService (wrong responsibility)
+@inject UserContextService UserContext
+
+private async Task CreateProperty()
+{
+    var userId = await UserContext.GetUserIdAsync();
+    var orgId = await UserContext.GetActiveOrganizationIdAsync();
+    await PropertyService.CreatePropertyAsync(newProperty, userId, orgId); // WRONG
+}
+```
+
+**Key Principles:**
+
+1. Services own tracking field logic - UI never sets these values
+2. All queries automatically filter by active organization (via UserContextService)
+3. Update operations verify entity belongs to active org (security)
+4. UI components stay simple - just pass entities, no context plumbing
+5. Future refactoring happens in services only (change once, not in 40+ UI files)
+
+### Component Architecture
+
+Aquiis uses a **three-tier component hierarchy** to enable code reuse across SimpleStart and Professional products while maintaining different complexity levels:
+
+**Component Tiers:**
+
+```
+Entity Components (Tier 1)          (3-Aquiis.UI.Shared/Components/Entities/)
+  ├─ Pure presentation components
+  ├─ Minimal business logic
+  ├─ Maximum reusability
+  └─ Examples: LeaseListView, PropertyCard, TenantSearchBox
+
+Feature Components (Tier 2)         (3-Aquiis.UI.Shared/Features/)
+  ├─ Fully-featured implementations
+  ├─ Complete CRUD operations
+  ├─ Business logic included
+  ├─ Service injection
+  └─ Examples: LeaseManagement, PropertyManagement, TenantManagement
+
+Product Pages (Tier 3)              (4-Aquiis.SimpleStart/Features/ or 5-Aquiis.Professional/Features/)
+  ├─ Composition layer
+  ├─ Product-specific UX
+  ├─ Routing decisions
+  └─ Examples: SimpleStart uses Feature components directly, Professional uses custom compositions
+```
+
+**When to Use Each Tier:**
+
+- **Entity Component**: Building block UI elements (lists, cards, search boxes)
+  - Example: `LeaseListView.razor` displays leases with filters and grouping
+  - Usage: `<LeaseListView Leases="@leases" GroupedLeases="@groupedLeases" />`
+- **Feature Component**: Complete feature implementation ready to use
+  - Example: `LeaseManagement.razor` provides full lease CRUD with navigation
+  - Usage: SimpleStart: `<LeaseManagement />` (5 lines), Professional: Custom composition
+- **Product Page**: Top-level routing and product-specific UX
+  - Example: SimpleStart `/propertymanagement/leases` → Uses LeaseManagement directly
+  - Example: Professional `/leases` → Custom layout with LeaseListView + custom panels
+
+**File Naming & Organization:**
+
+```
+3-Aquiis.UI.Shared/
+  ├── Components/
+  │   ├── Common/          (Cross-cutting: EntityFilterBar, Modal, etc.)
+  │   └── Entities/        (Entity-specific: Leases/, Properties/, Tenants/)
+  └── Features/
+      ├── PropertyManagement/
+      ├── LeaseManagement/
+      └── TenantManagement/
+
+4-Aquiis.SimpleStart/Features/
+  └── PropertyManagement/Index.razor (@page "/propertymanagement/leases")
+
+5-Aquiis.Professional/Features/
+  └── Leases/Index.razor (@page "/leases")
+```
+
+**Shared UI Components:**
+
+The `Components/Common/` folder contains reusable components used across all entities:
+
+- **EntityFilterBar.razor**: Generic filter bar with optional search, status, priority, type filters
+  - Generic types: `TStatus`, `TPriority`, `TType` (unconstrained for flexibility)
+  - Optional elements: `ShowSearch`, `ShowStatusFilter`, `ShowGroupToggle`, etc.
+  - Custom filter slot: `<SecondaryFilter>` RenderFragment for entity-specific filters
+  - Pattern: `@if (ShowProperty && data.Any())` for conditional rendering
+
+- **LeaseMetricsCard.razor**: Dashboard metric display with icon, title, value, trend
+- **Modal.razor**: Reusable modal dialog with customizable content and actions
+- **ConfirmDialog.razor**: Confirmation prompts with Yes/No actions
+
+**Example: SimpleStart vs Professional Usage:**
+
+```csharp
+// SimpleStart: Direct feature usage (simple, fast to implement)
+@page "/propertymanagement/leases"
+<LeaseManagement />
+
+// Professional: Custom composition (flexible, branded UX)
+@page "/leases"
+<div class="professional-layout">
+    <LeaseListView Leases="@leases" OnLeaseSelected="@HandleSelection" />
+    <CustomLeaseDetailsPanel SelectedLease="@selectedLease" />
+</div>
+```
+
+### Soft Delete Pattern
+
+- Entities inherit from `BaseModel` which provides audit fields (`CreatedOn`, `CreatedBy`, `LastModifiedOn`, `LastModifiedBy`, `IsDeleted`)
+- **Never hard delete** - always set `IsDeleted = true` when deleting
+- Controlled by `ApplicationSettings.SoftDeleteEnabled` configuration
+- All queries must filter `.Where(x => !x.IsDeleted)` - this is non-negotiable
+
+### Authentication & Authorization
+
+- ASP.NET Core Identity with custom `ApplicationUser` (adds `OrganizationId`, `FirstName`, `LastName`)
+- Three primary roles: `Administrator`, `PropertyManager`, `Tenant` (defined in `ApplicationConstants`)
+- Use `@attribute [Authorize(Roles = "Administrator,PropertyManager")]` on Blazor pages
+- User context pattern: Inject `UserContextService` instead of repeatedly querying `AuthenticationStateProvider`
+
+## Property & Tenant Lifecycle Workflows
+
+### Property Status Management
+
+Properties follow a status-driven lifecycle (string values from `ApplicationConstants.PropertyStatuses`):
+
+- **Available** - Ready to market and show to prospects
+- **ApplicationPending** - One or more applications submitted and under review
+- **LeasePending** - Application approved, lease offered, awaiting tenant signature
+- **Occupied** - Active lease in place
+- **UnderRenovation** - Not marketable, undergoing repairs/upgrades
+- **OffMarket** - Temporarily unavailable
+
+**Important:** `Property.Status` is a `string` field (max 50 chars), NOT an enum. Always use `ApplicationConstants.PropertyStatuses.*` constants.
+
+**Status transitions are automatic** based on application/lease workflow events.
+
+### Prospect-to-Tenant Journey
+
+1. **Lead/Inquiry** → ProspectiveTenant created with Status: `Inquiry`
+2. **Tour Scheduled** → Tour record created, Status: `TourScheduled`
+3. **Tour Completed** → Status: `Toured`, interest level captured
+4. **Application Submitted** → RentalApplication created, **Property.Status → ApplicationPending**, Status: `ApplicationSubmitted`
+   - **Page:** `/propertymanagement/prospects/{id}/submit-application`
+   - Application fee collected (per-application, non-refundable)
+   - Application valid for 30 days, auto-expires if not processed
+   - Property status automatically changes from Available to ApplicationPending
+   - All required fields: current address, landlord info, employment, references
+   - Income-to-rent ratio calculated and displayed
+5. **Screening** → ApplicationScreening created (background + credit checks), Status: `UnderReview`
+   - **Page:** `/propertymanagement/applications/{id}/review` (Initiate Screening button)
+   - Background check requested with status tracking
+   - Credit check requested with credit score capture
+   - Overall screening result: Pending, Passed, Failed, ConditionalPass
+6. **Application Approved** → Lease created with Status: `Offered`, **Property.Status → LeasePending**, Status: `ApplicationApproved`
+   - **Page:** `/propertymanagement/applications/{id}/review` (Approve button after screening passes)
+   - All other pending applications for this property auto-denied
+   - Lease offer expires in 30 days if not signed
+   - `Lease.OfferedOn` and `Lease.ExpiresOn` (30 days) are set
+7. **Lease Signed** → **Tenant created from ProspectiveTenant**, SecurityDeposit collected, **Property.Status → Occupied**, Status: `ConvertedToTenant`
+   - **Page:** `/propertymanagement/leases/{id}/accept`
+   - `TenantConversionService` handles conversion with validation
+   - `Tenant.ProspectiveTenantId` links back to prospect for audit trail
+   - `Lease.SignedOn` timestamp recorded for compliance
+   - SecurityDeposit must be paid in full upfront
+   - Move-in inspection auto-scheduled
+8. **Lease Declined** → **Property.Status → Available or ApplicationPending** (if other apps exist), Status: `LeaseDeclined`
+   - `Lease.DeclinedOn` timestamp recorded
+9. **Application Denied** → Status: `ApplicationDenied`, Property returns to Available if no other pending apps
+
+**Key Services:**
+
+- `TenantConversionService` - Handles ProspectiveTenant → Tenant conversion
+  - `ConvertProspectToTenantAsync(prospectId, userId)` - Creates tenant with audit trail
+  - Returns existing Tenant if already converted (idempotent operation)
+  - `IsProspectAlreadyConvertedAsync()` - Prevents duplicate conversions
+  - `GetProspectHistoryForTenantAsync()` - Retrieves full prospect history for compliance
+
+**Key Pages:**
+
+- `GenerateLeaseOffer.razor` - `/propertymanagement/applications/{id}/generate-lease-offer`
+  - Generates lease offer from approved application
+  - Sets `Lease.OfferedOn` and `Lease.ExpiresOn` (30 days)
+  - Updates Property.Status to LeasePending
+  - Auto-denies all competing applications for the property
+  - Accessible to PropertyManager and Administrator roles only
+
+- `AcceptLease.razor` - `/propertymanagement/leases/{id}/accept`
+  - Accepts lease offer with full signature audit trail
+  - Captures: timestamp, IP address, user ID, payment method
+  - Calls TenantConversionService to create Tenant record
+  - Sets `Lease.SignedOn`, updates status to Active
+  - Updates Property.Status to Occupied
+  - Prevents acceptance of expired offers (checks `Lease.ExpiresOn`)
+  - Includes decline workflow (sets `Lease.DeclinedOn`)
+
+**Lease Lifecycle Fields:**
+
+- `OfferedOn` (DateTime?) - When lease offer was generated
+- `SignedOn` (DateTime?) - When tenant accepted/signed the lease
+- `DeclinedOn` (DateTime?) - When tenant declined the offer
+- `ExpiresOn` (DateTime?) - Offer expiration date (30 days from OfferedOn)
+
+**Status Constants:**
+
+- ProspectiveStatuses: `LeaseOffered`, `LeaseDeclined`, `ConvertedToTenant`
+- ApplicationStatuses: `LeaseOffered`, `LeaseAccepted`, `LeaseDeclined`
+- LeaseStatuses: `Offered`, `Active`, `Declined`, `Terminated`, `Expired`
+
+### Multi-Lease Support
+
+- Tenants can have **multiple active leases simultaneously**
+- Same tenant can lease multiple units in same or different buildings
+- Each lease has independent security deposit, dividend tracking, and payment schedule
+
+### Security Deposit Investment Model
+
+**Investment Pool Approach:**
+
+- All security deposits pooled into investment account
+- Annual earnings distributed as dividends
+- Organization takes configurable percentage (default 20%), remainder distributed to tenants
+- Dividend = (TenantShare / ActiveLeaseCount) per lease
+- **Losses absorbed by organization** - no negative dividends
+
+**Dividend Distribution Rules:**
+
+- **Pro-rated** for tenants who moved in mid-year (e.g., 6 months = 50% dividend)
+- Distributed at year-end even if tenant has moved out (sent to forwarding address)
+- Tenant chooses: apply as lease credit OR receive as check
+- Each active lease gets separate dividend (tenant with 2 leases gets 2 dividends)
+
+**Tracking:**
+
+- `SecurityDepositInvestmentPool` - annual pool performance
+- `SecurityDepositDividend` - per-lease dividend with payment method choice
+- Full audit trail of investment performance visible in tenant portal
+
+### E-Signature & Audit Trail
+
+- Lease offers require acceptance (checkbox "I Accept" for dev/demo)
+- Full signature audit: IP address, timestamp, document version, user agent
+- Lease offer expires after 30 days if not signed
+- Unsigned leases roll to month-to-month at higher rate
+
+## Code Patterns & Conventions
+
+### Enums & Constants Location
+
+- **Status and type values** stored as string constants in `ApplicationConstants.cs` static classes
+- Example: `ApplicationConstants.PropertyStatuses.Available`, `ApplicationConstants.LeaseStatuses.Active`
+- **Enums** (PropertyStatus, ProspectStatus, etc.) defined in `ApplicationSettings.cs` for type safety but NOT used in database
+- Database fields use `string` type with validation against ApplicationConstants values
+- Never hard-code status/type values - always reference ApplicationConstants classes
+
+### Blazor Component Structure
+
+```csharp
+@page "/propertymanagement/entities/create"
+@using Aquiis.SimpleStart.Components.PropertyManagement.Entities
+@attribute [Authorize(Roles = "Administrator,PropertyManager")]
+@inject PropertyService PropertyService
+@inject UserContextService UserContext
+@inject NavigationManager Navigation
+@rendermode InteractiveServer
+
+// Component code follows...
+```
+
+### Creating Entities
+
+```csharp
+// UI component creates entity with business data only
+private async Task CreateEntity()
+{
+    // Service handles CreatedBy, CreatedOn, OrganizationId automatically
+    var created = await PropertyService.AddEntityAsync(entity);
+    Navigation.NavigateTo("/propertymanagement/entities");
+}
+```
+
+**Note:** Do NOT set tracking fields in UI. The service layer automatically sets:
+
+- `CreatedBy` - from `UserContextService.GetUserIdAsync()`
+- `CreatedOn` - `DateTime.UtcNow`
+- `OrganizationId` - from `UserContextService.GetActiveOrganizationIdAsync()`
+
+### Service Method Pattern
+
+```csharp
+// Service method automatically handles organization context and tracking
+public async Task<List<Entity>> GetEntitiesAsync()
+{
+    // Get active organization from UserContextService (injected in constructor)
+    var activeOrgId = await _userContext.GetActiveOrganizationIdAsync();
+
+    return await _dbContext.Entities
+        .Include(e => e.RelatedEntity)
+        .Where(e => !e.IsDeleted && e.OrganizationId == activeOrgId)
+        .ToListAsync();
+}
+
+// Create method sets tracking fields internally
+public async Task<Entity> AddEntityAsync(Entity entity)
+{
+    var userId = await _userContext.GetUserIdAsync();
+    var activeOrgId = await _userContext.GetActiveOrganizationIdAsync();
+
+    // Service owns this logic - UI never sets these
+    entity.CreatedBy = userId;
+    entity.CreatedOn = DateTime.UtcNow;
+    entity.OrganizationId = activeOrgId;
+
+    _dbContext.Entities.Add(entity);
+    await _dbContext.SaveChangesAsync();
+    return entity;
+}
+```
+
+**Important:** Never expose `organizationId` or `userId` as parameters in service methods. Services get these values from `UserContextService` automatically.
+
+### Constants Usage
+
+- All dropdown values come from `ApplicationConstants` (never hard-code)
+- Examples: `ApplicationConstants.LeaseStatuses.Active`, `ApplicationConstants.PropertyTypes.Apartment`
+- Status/type classes are nested: `ApplicationConstants.PaymentMethods.AllPaymentMethods`
+
+### Entity Relationships
+
+- Properties have many Leases, Documents, Inspections
+- Leases belong to Property and Tenant
+- Invoices belong to Lease (get Property/Tenant through navigation)
+- Always use `.Include()` to eager-load related entities in services
+
+## Development Workflows
+
+### Database Changes
+
+1. **EF Core Migrations**: Primary approach for schema changes
+   - Migrations stored in `Data/Migrations/`
+   - Run `dotnet ef migrations add MigrationName --project Aquiis.SimpleStart`
+   - Apply with `dotnet ef database update --project Aquiis.SimpleStart`
+   - Generate SQL script: `dotnet ef migrations script --output schema.sql`
+2. **SQL Scripts**: Reference scripts in `Data/Scripts/` (not executed, for documentation)
+3. Update `ApplicationDbContext.cs` with DbSet and entity configuration
+4. Connection string in `appsettings.json`: `"DefaultConnection": "DataSource=Infrastructure/Data/app.db;Cache=Shared"`
+5. **Database**: SQLite (not SQL Server) - scripts will be SQLite syntax
+
+### Development Workflows
+
+**Running the Application:**
+
+- **Ctrl+Shift+B** to run `dotnet watch` (hot reload, default build task)
+- **F5** in VS Code to debug (configured in `.vscode/launch.json`)
+- Or: `dotnet run` in `Aquiis.SimpleStart/` directory
+- Default URLs: Check terminal output for ports
+- Default admin: `superadmin@example.local` / `SuperAdmin@123!`
+
+### Build Tasks (VS Code)
+
+- `build` - Debug build (Ctrl+Shift+B)
+- `watch` - Hot reload development mode
+- `build-release` - Production build
+- `publish` - Create deployment package
+
+### Background Services
+
+- **ScheduledTaskService** runs daily/hourly automated tasks
+  - Daily tasks: Late fee application, inspection scheduling, lease expiration notifications
+  - Hourly tasks: Data cleanup, cache refresh
+- Registered as hosted service in `Program.cs`
+- Add new scheduled tasks to `ScheduledTaskService.cs` with proper scoping
+- Pattern: Create scoped service instances to access DbContext (avoid singleton issues)
+
+## PDF Generation
+
+- Uses **QuestPDF 2025.7.4** with Community License (configured in Program.cs)
+- PDF generators in `Components/PropertyManagement/Documents/` (e.g., `LeasePdfGenerator.cs`)
+- Always save generated PDFs to `Documents` table with proper associations
+- Pattern: Generate → Save to DB → Return Document object → Navigate to view
+
+## File Naming & Organization
+
+### Component Structure
+
+```
+Components/PropertyManagement/[Entity]/
+  ├── [Entity].cs (Model - inherits BaseModel)
+  ├── Pages/
+  │   ├── [Entities].razor (List view)
+  │   ├── Create[Entity].razor
+  │   ├── View[Entity].razor
+  │   └── Edit[Entity].razor
+  └── [Entity]PdfGenerator.cs (if applicable)
+```
+
+### Route Patterns
+
+- List: `/propertymanagement/entities`
+- Create: `/propertymanagement/entities/create`
+- View: `/propertymanagement/entities/view/{id:int}`
+- Edit: `/propertymanagement/entities/edit/{id:int}`
+
+## Common Pitfalls to Avoid
+
+1. **DO NOT** access `ApplicationDbContext` directly in components - always use entity-specific services
+2. **DO NOT** extend or add methods to `PropertyManagementService` - it's legacy code being phased out
+3. **DO NOT** forget `OrganizationId` filtering - security breach waiting to happen
+4. **DO NOT** hard-code status values - use `ApplicationConstants` classes
+5. **DO NOT** hard delete entities - always soft delete (check `SoftDeleteEnabled` setting)
+6. **DO NOT** set tracking fields (`CreatedBy`, `CreatedOn`, `LastModifiedBy`, `LastModifiedOn`) in UI - services handle this automatically
+7. **DO NOT** query without `.Include()` for navigation properties you'll need
+8. **DO NOT** use `!` null-forgiving operator without null checks - validate properly
+9. **DO NOT** create services without inheriting from `BaseService<TEntity>` - you'll lose org isolation and audit tracking
+10. **DO NOT** forget to register new services in `DependencyInjection.cs`
+
+## Toast Notifications
+
+- Use `ToastService` (singleton) for user feedback instead of JavaScript alerts
+- Pattern: `await JSRuntime.InvokeVoidAsync("toastService.showSuccess", "Message")`
+- Types: Success, Error, Warning, Info
+- Auto-dismiss after 5 seconds (configurable)
+
+## Document Management
+
+- Binary storage in `Documents.FileData` (VARBINARY(MAX))
+- View in browser: Use Blob URLs via `wwwroot/js/fileDownload.js`
+- Download: Base64 encode and trigger download
+- 10MB upload limit configured in components
+
+## Financial Features
+
+- Late fees auto-applied by `ScheduledTaskService` (daily at 2 AM)
+- Payment tracking updates invoice status automatically
+- Financial reports use `FinancialReportService` with PDF export
+- Decimal precision: 18,2 for all monetary values
+
+## Inspection Tracking
+
+- 26-item checklist organized in 5 categories (Exterior, Interior, Kitchen, Bathroom, Systems)
+- Routine inspections update `Property.NextRoutineInspectionDueDate`
+- Generate PDFs with `InspectionPdfGenerator` and save to Documents
+
+## Key Files to Reference
+
+- `Program.cs` - Service registration, Identity config, startup logic
+- `ApplicationConstants.cs` - All dropdown values, roles, statuses
+- `BaseService.cs` - Abstract base service with org isolation and audit tracking
+- `[Entity]Service.cs` - Entity-specific service patterns (LeaseService, PropertyService, etc.)
+- `[Entity]WorkflowService.cs` - Workflow orchestration patterns for complex state machines
+- `UserContextService.cs` - Multi-tenant context access
+- `BaseModel.cs` - Audit field structure
+- `ApplicationDbContext.cs` - Entity relationships
+- `EntityFilterBar.razor` - Generic reusable filter component pattern
+- `DependencyInjection.cs` - Service registration in Application layer
+
+## When Adding New Features
+
+1. **Create entity model** inheriting `BaseModel` with `OrganizationId` property
+2. **Add DbSet** to `ApplicationDbContext` with proper relationships and configuration
+3. **Create EF Core migration**: `dotnet ef migrations add [Name] --project Aquiis.SimpleStart`
+4. **Create entity-specific service** inheriting `BaseService<TEntity>`:
+   - Add constructor with dependencies (DbContext, Logger, UserContext, Settings)
+   - Override `ValidateEntityAsync()` for business rules
+   - Add entity-specific query methods with org filtering
+   - Register service in DI container (`2-Aquiis.Application/DependencyInjection.cs`)
+5. **Create workflow service** (if complex state transitions needed):
+   - Inherit from `BaseWorkflowService`
+   - Implement `IWorkflowState<TStatus>` if status machine required
+   - Add orchestration methods for multi-step processes
+   - Register in DI container
+6. **Create Blazor components** following three-tier architecture:
+   - Entity component (if reusable primitive needed)
+   - Feature component (complete CRUD implementation)
+   - Product pages (composition and routing)
+7. **Add constants** to `ApplicationConstants` for status/type values
+8. **Update navigation** in `NavMenu.razor` if top-level feature
+9. **Add scheduled tasks** to `ScheduledTaskService` if automation needed
+
+**Example Entity Service Creation:**
+
+```csharp
+// 2-Aquiis.Application/Services/[Entity]Service.cs
+public class DocumentService : BaseService<Document>
+{
+    public DocumentService(
+        ApplicationDbContext context,
+        ILogger<DocumentService> logger,
+        IUserContextService userContext,
+        IOptions<ApplicationSettings> settings)
+        : base(context, logger, userContext, settings)
+    {
+    }
+
+    protected override async Task ValidateEntityAsync(Document entity)
+    {
+        if (entity.FileData == null || entity.FileData.Length == 0)
+            throw new ValidationException("Document must have file data");
+
+        if (entity.FileData.Length > 10 * 1024 * 1024) // 10MB limit
+            throw new ValidationException("File size cannot exceed 10MB");
+
+        await base.ValidateEntityAsync(entity);
+    }
+
+    public async Task<List<Document>> GetDocumentsForPropertyAsync(Guid propertyId)
+    {
+        var orgId = await _userContext.GetActiveOrganizationIdAsync();
+
+        return await _dbSet
+            .Where(d => d.PropertyId == propertyId && !d.IsDeleted)
+            .Include(d => d.Property)
+            .Where(d => d.Property.OrganizationId == orgId)
+            .ToListAsync();
+    }
+}
+
+// Register in DependencyInjection.cs
+services.AddScoped<DocumentService>();
+```
+
+## Code Style Notes
+
+- Use async/await consistently (no `.Result` or `.Wait()`)
+- Prefer explicit typing over `var` for service/entity types
+- Use string interpolation for logging: `$"Processing {entityId}"`
+- Handle errors with try-catch and user-friendly messages
+- Include XML comments on service methods describing purpose
+
+## Documentation & Roadmap Management
+
+### Documentation Structure
+
+The project maintains comprehensive documentation organized by implementation status and version:
+
+**Roadmap Folder** (`/Documentation/Roadmap/`):
+
+- **Purpose:** Implementation planning and feature proposals
+- **Status:** Active consideration - may be approved or rejected
+- **Workflow:** One file at a time - focus on current implementation
+- **File Naming:** Descriptive names (e.g., `00-PROPERTY-TENANT-LIFECYCLE-ROADMAP.md`)
+- **Rejection:** Rejected proposals have rejection reason added at the top of the file
+
+**Version Folders** (`/Documentation/vX.X.X/`):
+
+- **Purpose:** Completed implementation notes for each version release
+- **Status:** Historical record of what was actually implemented
+- **Content:** Feature additions, changes, and implementation details for that specific release
+- **File Naming:** Match feature/module names (e.g., `multi-organization-management.md`)
+
+### Semantic Versioning & Database Management
+
+The project follows **Semantic Versioning (MAJOR.MINOR.PATCH)**:
+
+- **MAJOR** version (X.0.0): Breaking changes that trigger database schema updates
+- **MINOR** version (0.X.0): Significant UI changes or new features (backward compatible)
+- **PATCH** version (0.0.X): Bug fixes, minor updates, safe application updates
+
+**Current Development Status:**
+
+- **Production version:** v0.1.1 (in production)
+- **Development version:** v0.2.0 (current work in progress)
+- **Next major milestone:** v1.0.0 (when entity refactoring stabilizes)
+
+**Database Version Management:**
+
+The database filename and schema version are tracked separately from the application patch version:
+
+**Configuration in `appsettings.json`:**
+
+```json
+{
+  "ConnectionStrings": {
+    "DefaultConnection": "DataSource=Infrastructure/Data/app_v0.0.0.db;Cache=Shared"
+  },
+  "DatabaseSettings": {
+    "DatabaseFileName": "app_v0.0.0.db",
+    "PreviousDatabaseFileName": "",
+    "SchemaVersion": "0.0.0"
+  }
+}
+```
+
+**Versioning Rules:**
+
+1. **Database filename** follows pattern: `app_v{MAJOR}.{MINOR}.0.db`
+   - Tracks MAJOR and MINOR app versions only (ignores PATCH)
+   - Example: App v2.1.25 uses database `app_v2.1.0.db`
+   - Current: App v0.2.0 uses database `app_v0.0.0.db` (pre-v1.0.0)
+
+2. **Schema version** (`SchemaVersion` in settings):
+   - Matches database filename version
+   - Example: `app_v2.1.0.db` has `SchemaVersion: "2.1.0"`
+   - Current: `SchemaVersion: "0.0.0"` (active refactoring phase)
+
+3. **Version 1.0.0 milestone**:
+   - At v1.0.0, database management becomes more formal
+   - Database filename becomes: `app_v1.0.0.db` (from `app_v0.0.0.db`)
+   - `SchemaVersion` initializes to `"1.0.0"`
+   - Indicates entity models have stabilized
+
+4. **Migration triggers**:
+   - MAJOR version bump → Database schema migration required
+   - MINOR version bump → Database filename updates (new .db file)
+   - PATCH version bump → No database changes (application updates only)
+
+**Example Version Progression:**
+
+| App Version | Database File | Schema Version | Notes                               |
+| ----------- | ------------- | -------------- | ----------------------------------- |
+| v0.1.1      | app_v0.0.0.db | 0.0.0          | Production (active refactoring)     |
+| v0.2.0      | app_v0.0.0.db | 0.0.0          | Development (same schema)           |
+| v1.0.0      | app_v1.0.0.db | 1.0.0          | Milestone (entities stabilized)     |
+| v1.0.5      | app_v1.0.0.db | 1.0.0          | Patches (no DB change)              |
+| v1.1.0      | app_v1.1.0.db | 1.1.0          | Minor (new DB file)                 |
+| v1.1.8      | app_v1.1.0.db | 1.1.0          | Patches (same DB)                   |
+| v2.0.0      | app_v2.0.0.db | 2.0.0          | Major (breaking changes, migration) |
+
+**Implementation Workflow:**
+
+1. When incrementing MAJOR or MINOR version:
+   - Update `DatabaseFileName` in `appsettings.json` to new version
+   - Update `SchemaVersion` to match
+   - Set `PreviousDatabaseFileName` to old database name (for migration reference)
+   - Create EF Core migration if schema changes required
+
+2. When incrementing PATCH version:
+   - No changes to database settings
+   - Application version increments only
+
+3. Document completed features in `/Documentation/v{MAJOR}.{MINOR}.{PATCH}/`
+
+**Pre-v1.0.0 Strategy:**
+
+- Database remains at `app_v0.0.0.db` until v1.0.0
+- Allows rapid iteration and entity refactoring
+- Schema migrations managed via EF Core Migrations folder
+- At v1.0.0 release, formalize database versioning with `app_v1.0.0.db`
diff --git a/0-Aquiis.Core/Constants/ApplicationConstants.cs b/0-Aquiis.Core/Constants/ApplicationConstants.cs
index e6f7437..3d8e5a6 100644
--- a/0-Aquiis.Core/Constants/ApplicationConstants.cs
+++ b/0-Aquiis.Core/Constants/ApplicationConstants.cs
@@ -50,7 +50,7 @@ public static class OrganizationRoles
             /// <summary>
             /// PropertyManager - Full property management features (no admin/settings access)
             /// </summary>
-            public const string PropertyManager = "Property Manager";
+            public const string PropertyManager = "PropertyManager";
 
             /// <summary>
             /// Maintenance - Maintenance requests, work orders, and vendors
@@ -176,6 +176,7 @@ public static class InvoiceStatuses
             public const string Paid = "Paid";
             public const string Overdue = "Overdue";
             public const string Cancelled = "Cancelled";
+            public const string Voided = "Voided";
 
             public static IReadOnlyList<string> AllInvoiceStatuses { get; } = new List<string>
             {
@@ -183,7 +184,8 @@ public static class InvoiceStatuses
                 PaidPartial,
                 Paid,
                 Overdue,
-                Cancelled
+                Cancelled,
+                Voided
             };
         }
 
@@ -193,13 +195,15 @@ public static class PaymentStatuses
             public const string Pending = "Pending";
             public const string Failed = "Failed";
             public const string Refunded = "Refunded";
+            public const string Voided = "Voided";
 
             public static IReadOnlyList<string> AllPaymentStatuses { get; } = new List<string>
             {
                 Completed,
                 Pending,
                 Failed,
-                Refunded
+                Refunded,
+                Voided
             };
         }
         public static class InspectionTypes
@@ -275,6 +279,13 @@ public static class LeaseStatuses {
                 Terminated,
                 Expired
             };
+
+            public static IReadOnlyList<string> DefaultStatuses { get; } = new List<string>
+            {
+                Active,
+                MonthToMonth,
+                Terminated
+            };
         }
 
         
@@ -359,6 +370,44 @@ public static class MaintenanceRequestTypes
             };
         }
 
+        /// <summary>
+        /// Repair type categories for logging work performed on properties.
+        /// Used by the Repair entity (work WITHOUT workflow).
+        /// </summary>
+        public static class RepairTypes
+        {
+            public const string Plumbing = "Plumbing";
+            public const string Electrical = "Electrical";
+            public const string HeatingCooling = "Heating/Cooling";
+            public const string Appliance = "Appliance";
+            public const string Structural = "Structural";
+            public const string Landscaping = "Landscaping";
+            public const string PestControl = "Pest Control";
+            public const string Painting = "Painting";
+            public const string Carpentry = "Carpentry";
+            public const string Flooring = "Flooring";
+            public const string Roofing = "Roofing";
+            public const string Windows = "Windows/Doors";
+            public const string Other = "Other";
+
+            public static IReadOnlyList<string> AllRepairTypes { get; } = new List<string>
+            {
+                Plumbing,
+                Electrical,
+                HeatingCooling,
+                Appliance,
+                Structural,
+                Landscaping,
+                PestControl,
+                Painting,
+                Carpentry,
+                Flooring,
+                Roofing,
+                Windows,
+                Other
+            };
+        }
+
         public static class MaintenanceRequestPriorities
         {
             public const string Low = "Low";
diff --git a/0-Aquiis.Core/Constants/ApplicationSettings.cs b/0-Aquiis.Core/Constants/ApplicationSettings.cs
index e15454b..80fc7e8 100644
--- a/0-Aquiis.Core/Constants/ApplicationSettings.cs
+++ b/0-Aquiis.Core/Constants/ApplicationSettings.cs
@@ -9,6 +9,7 @@ public class ApplicationSettings
         public string Repository { get; set; } = string.Empty;
         public bool SoftDeleteEnabled { get; set; }
         public string SchemaVersion { get; set; } = "1.0.0";
+        public int MaxOrganizationUsers { get; set; } = 0; // 0 = unlimited (Professional), 3 = SimpleStart limit
     }
 
     // Property & Tenant Lifecycle Enums
diff --git a/0-Aquiis.Core/Entities/MaintenanceRequest.cs b/0-Aquiis.Core/Entities/MaintenanceRequest.cs
index 1d4a508..6b0cca9 100644
--- a/0-Aquiis.Core/Entities/MaintenanceRequest.cs
+++ b/0-Aquiis.Core/Entities/MaintenanceRequest.cs
@@ -67,6 +67,23 @@ public class MaintenanceRequest : BaseModel, ISchedulableEntity
         public virtual Property? Property { get; set; }
         public virtual Lease? Lease { get; set; }
 
+        /// <summary>
+        /// Collection of repairs that comprise this maintenance request.
+        /// A MaintenanceRequest CONSISTS of one or more Repairs (composition relationship).
+        /// Professional product: MR must have at least one repair before completion.
+        /// </summary>
+        public virtual ICollection<Repair> Repairs { get; set; } = new List<Repair>();
+
+        // Computed properties for repair aggregation
+        [NotMapped]
+        public decimal TotalRepairCost => Repairs?.Sum(r => r.Cost) ?? 0;
+
+        [NotMapped]
+        public int RepairCount => Repairs?.Count ?? 0;
+
+        [NotMapped]
+        public int TotalRepairDuration => Repairs?.Sum(r => r.DurationMinutes) ?? 0;
+
         // Computed property for days open
         [NotMapped]
         public int DaysOpen
diff --git a/0-Aquiis.Core/Entities/Organization.cs b/0-Aquiis.Core/Entities/Organization.cs
index d1521e9..6c4db00 100644
--- a/0-Aquiis.Core/Entities/Organization.cs
+++ b/0-Aquiis.Core/Entities/Organization.cs
@@ -41,7 +41,7 @@ public class Organization
         public bool IsDeleted { get; set; } = false;
 
         // Navigation properties
-        public virtual ICollection<UserOrganization> UserOrganizations { get; set; } = new List<UserOrganization>();
+        public virtual ICollection<OrganizationUser> OrganizationUsers { get; set; } = new List<OrganizationUser>();
         public virtual ICollection<Property> Properties { get; set; } = new List<Property>();
         public virtual ICollection<Tenant> Tenants { get; set; } = new List<Tenant>();
         public virtual ICollection<Lease> Leases { get; set; } = new List<Lease>();
diff --git a/0-Aquiis.Core/Entities/UserOrganization.cs b/0-Aquiis.Core/Entities/OrganizationUser.cs
similarity index 95%
rename from 0-Aquiis.Core/Entities/UserOrganization.cs
rename to 0-Aquiis.Core/Entities/OrganizationUser.cs
index 9789e98..aa881c5 100644
--- a/0-Aquiis.Core/Entities/UserOrganization.cs
+++ b/0-Aquiis.Core/Entities/OrganizationUser.cs
@@ -8,11 +8,11 @@ namespace Aquiis.Core.Entities
     /// <summary>
     /// Junction table for multi-organization user assignments with role-based permissions
     /// </summary>
-    public class UserOrganization
+    public class OrganizationUser
     {
 
         [RequiredGuid]
-        [Display(Name = "UserOrganization ID")]
+        [Display(Name = "OrganizationUser ID")]
         public Guid Id { get; set; } = Guid.NewGuid();
 
         /// <summary>
diff --git a/0-Aquiis.Core/Entities/Payment.cs b/0-Aquiis.Core/Entities/Payment.cs
index 614580e..03e652d 100644
--- a/0-Aquiis.Core/Entities/Payment.cs
+++ b/0-Aquiis.Core/Entities/Payment.cs
@@ -10,6 +10,11 @@ public class Payment : BaseModel
         [Display(Name = "Organization ID")]
         public Guid OrganizationId { get; set; } = Guid.Empty;
 
+        [Required]
+        [StringLength(50)]
+        [Display(Name = "Payment Number")]
+        public string PaymentNumber { get; set; } = string.Empty;
+
         [Required]
         public Guid InvoiceId { get; set; }
 
diff --git a/0-Aquiis.Core/Entities/Property.cs b/0-Aquiis.Core/Entities/Property.cs
index d6164cb..4279a11 100644
--- a/0-Aquiis.Core/Entities/Property.cs
+++ b/0-Aquiis.Core/Entities/Property.cs
@@ -124,6 +124,8 @@ public class Property : BaseModel
         // Navigation properties
         public virtual ICollection<Lease> Leases { get; set; } = new List<Lease>();
         public virtual ICollection<Document> Documents { get; set; } = new List<Document>();
+        public virtual ICollection<Repair> Repairs { get; set; } = new List<Repair>();
+        public virtual ICollection<MaintenanceRequest> MaintenanceRequests { get; set; } = new List<MaintenanceRequest>();
 
         // Computed property for pending application count
         [NotMapped]
diff --git a/0-Aquiis.Core/Entities/Repair.cs b/0-Aquiis.Core/Entities/Repair.cs
new file mode 100644
index 0000000..d6fd4dd
--- /dev/null
+++ b/0-Aquiis.Core/Entities/Repair.cs
@@ -0,0 +1,134 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Aquiis.Core.Validation;
+
+namespace Aquiis.Core.Entities;
+
+/// <summary>
+/// Represents work performed on a property WITHOUT workflow/status tracking.
+/// Repairs capture what work was done (or is being done) without the complexity
+/// of MaintenanceRequest workflow (no Status, Priority, or Assignment).
+/// Use CompletedOn to determine if work is finished (null = in progress, date = completed).
+/// </summary>
+public class Repair : BaseModel
+{
+    // Core Identity
+    [RequiredGuid]
+    [Display(Name = "Organization ID")]
+    public Guid OrganizationId { get; set; } = Guid.Empty;
+
+    [RequiredGuid]
+    public Guid PropertyId { get; set; }
+
+    // Optional Relationships (Soft References)
+    /// <summary>
+    /// Optional: Links this repair to a MaintenanceRequest workflow (Professional product).
+    /// Null for standalone repairs (SimpleStart product).
+    /// </summary>
+    public Guid? MaintenanceRequestId { get; set; }
+
+    /// <summary>
+    /// Optional: Links this repair to a specific lease/tenant.
+    /// </summary>
+    public Guid? LeaseId { get; set; }
+
+    // Repair Details
+    [Required]
+    [StringLength(200)]
+    [Display(Name = "Description")]
+    public string Description { get; set; } = string.Empty;
+
+    [StringLength(50)]
+    [Display(Name = "Repair Type")]
+    public string RepairType { get; set; } = string.Empty; // From ApplicationConstants.RepairTypes
+
+    /// <summary>
+    /// Optional: Date when work was actually completed.
+    /// Null = work in progress or not yet completed.
+    /// Date = work finished on this date.
+    /// Since Repairs have no Status field, CompletedOn provides definitive completion date.
+    /// </summary>
+    [Display(Name = "Completed On")]
+    public DateTime? CompletedOn { get; set; }
+
+    // Cost & Duration
+    [Column(TypeName = "decimal(18,2)")]
+    [Display(Name = "Cost")]
+    public decimal Cost { get; set; }
+
+    [Display(Name = "Duration (Minutes)")]
+    public int DurationMinutes { get; set; } // Time spent on repair
+
+    // Who did the work
+    [StringLength(100)]
+    [Display(Name = "Contractor/Company Name")]
+    public string ContractorName { get; set; } = string.Empty; // Company or person name (e.g., "ABC Plumbing & Heating" or "John Doe")
+
+    [StringLength(100)]
+    [Display(Name = "Contact Person")]
+    public string ContactPerson { get; set; } = string.Empty; // Specific person at company (optional for companies)
+
+    [StringLength(20)]
+    [Display(Name = "Contractor Phone")]
+    public string ContractorPhone { get; set; } = string.Empty; // Optional: "555-1234"
+
+    /// <summary>
+    /// Optional: Link to Contractor entity when contractor list is implemented.
+    /// When null, contractor details are stored in text fields (ContractorName/ContactPerson/ContractorPhone).
+    /// </summary>
+    [Display(Name = "Contractor ID")]
+    public Guid? ContractorId { get; set; }
+
+    /// <summary>
+    /// Future: Link to formal Contact entity when added to the system.
+    /// </summary>
+    public Guid? ContactId { get; set; }
+
+    // Additional Details
+    [StringLength(2000)]
+    [Display(Name = "Notes")]
+    public string Notes { get; set; } = string.Empty;
+
+    [StringLength(500)]
+    [Display(Name = "Parts Replaced")]
+    public string PartsReplaced { get; set; } = string.Empty; // e.g., "Faucet cartridge, shower seal"
+
+    [Display(Name = "Warranty Applies")]
+    public bool WarrantyApplies { get; set; } = false;
+
+    [Display(Name = "Warranty Expires On")]
+    public DateTime? WarrantyExpiresOn { get; set; }
+
+    // Navigation Properties
+    public virtual Property? Property { get; set; }
+    public virtual MaintenanceRequest? MaintenanceRequest { get; set; }
+    public virtual Lease? Lease { get; set; }
+
+    // Computed Properties
+    [NotMapped]
+    [Display(Name = "Duration")]
+    public string DurationDisplay
+    {
+        get
+        {
+            if (DurationMinutes < 60)
+                return $"{DurationMinutes} minutes";
+
+            var hours = DurationMinutes / 60;
+            var minutes = DurationMinutes % 60;
+            return minutes > 0
+                ? $"{hours}h {minutes}m"
+                : $"{hours} hour{(hours > 1 ? "s" : "")}";
+        }
+    }
+
+    [NotMapped]
+    [Display(Name = "Under Warranty")]
+    public bool IsUnderWarranty => WarrantyApplies &&
+                                   WarrantyExpiresOn.HasValue &&
+                                   WarrantyExpiresOn.Value > DateTime.Today;
+
+    [NotMapped]
+    [Display(Name = "Completed")]
+    public bool IsCompleted => CompletedOn.HasValue; //Provides quick check for completion status. If no value, work is In Progess in the display.
+}
diff --git a/0-Aquiis.Core/Entities/UserProfile.cs b/0-Aquiis.Core/Entities/UserProfile.cs
new file mode 100644
index 0000000..eb57330
--- /dev/null
+++ b/0-Aquiis.Core/Entities/UserProfile.cs
@@ -0,0 +1,54 @@
+using System;
+
+namespace Aquiis.Core.Entities;
+
+/// <summary>
+/// User profile information stored in business context (ApplicationDbContext).
+/// Separate from Identity (AspNetUsers) to enable single-context queries with business entities.
+/// Email is denormalized for query simplification (considered read-only in B2B context).
+/// </summary>
+public class UserProfile : BaseModel
+{
+    /// <summary>
+    /// Foreign key to AspNetUsers.Id (Identity context).
+    /// This links the profile to the authentication user.
+    /// </summary>
+    public string UserId { get; set; } = string.Empty;
+    
+    // Personal Information (denormalized from Identity for query efficiency)
+    
+    /// <summary>
+    /// User's email address (cached from AspNetUsers).
+    /// Considered read-only - changes require sync with Identity table.
+    /// </summary>
+    public string Email { get; set; } = string.Empty;
+    
+    public string FirstName { get; set; } = string.Empty;
+    public string LastName { get; set; } = string.Empty;
+    public string? PhoneNumber { get; set; }
+    
+    // Organization Context
+    
+    /// <summary>
+    /// User's "home" organization - their primary/default organization.
+    /// </summary>
+    public Guid? OrganizationId { get; set; }
+    
+    /// <summary>
+    /// Currently active organization the user is viewing/working with.
+    /// Can differ from home organization for users with multi-org access.
+    /// </summary>
+    public Guid? ActiveOrganizationId { get; set; }
+    
+    // Computed Properties
+    
+    /// <summary>
+    /// Full name combining first and last name.
+    /// </summary>
+    public string FullName => $"{FirstName} {LastName}".Trim();
+    
+    /// <summary>
+    /// Display name for UI - uses full name if available, falls back to email.
+    /// </summary>
+    public string DisplayName => string.IsNullOrWhiteSpace(FullName) ? Email : FullName;
+}
diff --git a/0-Aquiis.Core/Interfaces/Services/IUserContextService.cs b/0-Aquiis.Core/Interfaces/Services/IUserContextService.cs
index 78ad844..8e1cfb6 100644
--- a/0-Aquiis.Core/Interfaces/Services/IUserContextService.cs
+++ b/0-Aquiis.Core/Interfaces/Services/IUserContextService.cs
@@ -1,3 +1,5 @@
+using Aquiis.Core.Entities;
+
 namespace Aquiis.Core.Interfaces.Services;
 
 /// <summary>
@@ -30,4 +32,27 @@ public interface IUserContextService
     /// Gets the current user's OrganizationId (DEPRECATED: Use GetActiveOrganizationIdAsync).
     /// </summary>
     Task<Guid?> GetOrganizationIdAsync();
+
+    /// <summary>
+    /// Forces a refresh of the cached user data.
+    /// Call this if user data has been updated and you need to reload it.
+    /// </summary>
+    Task RefreshAsync();
+
+    Task<Organization?> GetActiveOrganizationAsync();
+
+    Task<string?> GetCurrentOrganizationRoleAsync();
+       
+    Task<bool> IsAccountOwnerAsync();
+   
+
+    /// <summary>
+    /// Switch the user's active organization
+    /// </summary>
+    Task<bool> SwitchOrganizationAsync(Guid organizationId);
+
+    /// <summary>
+    /// Check if the current user has a specific permission in their active organization
+    /// </summary>
+    Task<bool> HasPermissionAsync(string permission);
 }
\ No newline at end of file
diff --git a/0-Aquiis.Core/Utilities/CalendarEventRouter.cs b/0-Aquiis.Core/Utilities/CalendarEventRouter.cs
index 05050c5..e283663 100644
--- a/0-Aquiis.Core/Utilities/CalendarEventRouter.cs
+++ b/0-Aquiis.Core/Utilities/CalendarEventRouter.cs
@@ -19,9 +19,9 @@ public static class CalendarEventRouter
 
             return evt.SourceEntityType switch
             {
-                nameof(Tour) => $"/PropertyManagement/Tours/Details/{evt.SourceEntityId}",
-                nameof(Inspection) => $"/PropertyManagement/Inspections/View/{evt.SourceEntityId}",
-                nameof(MaintenanceRequest) => $"/PropertyManagement/Maintenance/View/{evt.SourceEntityId}",
+                nameof(Tour) => $"/PropertyManagement/Tours/{evt.SourceEntityId}",
+                nameof(Inspection) => $"/PropertyManagement/Inspections/{evt.SourceEntityId}",
+                nameof(MaintenanceRequest) => $"/PropertyManagement/Maintenance/{evt.SourceEntityId}",
                 // Add new schedulable entity routes here as they are created
                 _ => null
             };
diff --git a/0-Aquiis.Core/Utilities/StringSanitizer.cs b/0-Aquiis.Core/Utilities/StringSanitizer.cs
new file mode 100644
index 0000000..bb5254b
--- /dev/null
+++ b/0-Aquiis.Core/Utilities/StringSanitizer.cs
@@ -0,0 +1,97 @@
+namespace Aquiis.Core.Utilities;
+
+/// <summary>
+/// Provides string sanitization and normalization utilities for consistent data storage.
+/// </summary>
+public static class StringSanitizer
+{
+    /// <summary>
+    /// Trims leading and trailing whitespace from a string.
+    /// Returns empty string if input is null or whitespace.
+    /// </summary>
+    public static string Trim(string? value)
+    {
+        return value?.Trim() ?? string.Empty;
+    }
+
+    /// <summary>
+    /// Trims and converts to lowercase for case-insensitive comparisons.
+    /// Useful for emails, usernames, etc.
+    /// </summary>
+    public static string NormalizeForComparison(string? value)
+    {
+        return value?.Trim().ToLowerInvariant() ?? string.Empty;
+    }
+
+    /// <summary>
+    /// Normalizes email addresses: trims and converts to lowercase.
+    /// </summary>
+    public static string NormalizeEmail(string? email)
+    {
+        return email?.Trim().ToLowerInvariant() ?? string.Empty;
+    }
+
+    /// <summary>
+    /// Normalizes phone numbers: removes all non-digit characters.
+    /// Example: "(555) 123-4567" becomes "5551234567"
+    /// </summary>
+    public static string NormalizePhoneNumber(string? phoneNumber)
+    {
+        if (string.IsNullOrWhiteSpace(phoneNumber))
+            return string.Empty;
+
+        return new string(phoneNumber.Where(char.IsDigit).ToArray());
+    }
+
+    /// <summary>
+    /// Formats a normalized phone number for display.
+    /// Example: "5551234567" becomes "(555) 123-4567"
+    /// </summary>
+    public static string FormatPhoneNumber(string? phoneNumber)
+    {
+        var normalized = NormalizePhoneNumber(phoneNumber);
+        
+        if (normalized.Length == 10)
+        {
+            return $"({normalized.Substring(0, 3)}) {normalized.Substring(3, 3)}-{normalized.Substring(6, 4)}";
+        }
+        else if (normalized.Length == 11 && normalized.StartsWith("1"))
+        {
+            return $"+1 ({normalized.Substring(1, 3)}) {normalized.Substring(4, 3)}-{normalized.Substring(7, 4)}";
+        }
+
+        return phoneNumber ?? string.Empty;
+    }
+
+    /// <summary>
+    /// Collapses multiple consecutive spaces into a single space and trims.
+    /// Example: "Hello    World  " becomes "Hello World"
+    /// </summary>
+    public static string CollapseWhitespace(string? value)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+            return string.Empty;
+
+        return string.Join(" ", value.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries));
+    }
+
+    /// <summary>
+    /// Removes all whitespace from a string.
+    /// Useful for IDs, codes, etc.
+    /// </summary>
+    public static string RemoveWhitespace(string? value)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+            return string.Empty;
+
+        return new string(value.Where(c => !char.IsWhiteSpace(c)).ToArray());
+    }
+
+    /// <summary>
+    /// Sanitizes a string for safe display by trimming and collapsing whitespace.
+    /// </summary>
+    public static string Sanitize(string? value)
+    {
+        return CollapseWhitespace(value);
+    }
+}
diff --git a/0-Aquiis.Core/Validation/TrimAttribute.cs b/0-Aquiis.Core/Validation/TrimAttribute.cs
new file mode 100644
index 0000000..522ed7a
--- /dev/null
+++ b/0-Aquiis.Core/Validation/TrimAttribute.cs
@@ -0,0 +1,28 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Aquiis.Core.Validation;
+
+/// <summary>
+/// Validation attribute that automatically trims string values during model binding.
+/// Removes leading and trailing whitespace from the property value.
+/// </summary>
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
+public class TrimAttribute : ValidationAttribute
+{
+    protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
+    {
+        if (value is string stringValue && !string.IsNullOrEmpty(stringValue))
+        {
+            var trimmedValue = stringValue.Trim();
+            
+            // Use reflection to set the trimmed value back to the property
+            var propertyInfo = validationContext.ObjectType.GetProperty(validationContext.MemberName!);
+            if (propertyInfo != null && propertyInfo.CanWrite)
+            {
+                propertyInfo.SetValue(validationContext.ObjectInstance, trimmedValue);
+            }
+        }
+
+        return ValidationResult.Success;
+    }
+}
diff --git a/1-Aquiis.Infrastructure/Data/ApplicationDbContext.cs b/1-Aquiis.Infrastructure/Data/ApplicationDbContext.cs
index 825dad4..47b36fa 100644
--- a/1-Aquiis.Infrastructure/Data/ApplicationDbContext.cs
+++ b/1-Aquiis.Infrastructure/Data/ApplicationDbContext.cs
@@ -16,6 +16,40 @@ public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options)
         {
         }
 
+        public override int SaveChanges()
+        {
+            SanitizeStringProperties();
+            return base.SaveChanges();
+        }
+
+        public override Task<int> SaveChangesAsync(CancellationToken cancellationToken = default)
+        {
+            SanitizeStringProperties();
+            return base.SaveChangesAsync(cancellationToken);
+        }
+
+        private void SanitizeStringProperties()
+        {
+            var entries = ChangeTracker.Entries()
+                .Where(e => e.State == EntityState.Added || e.State == EntityState.Modified);
+
+            foreach (var entry in entries)
+            {
+                foreach (var property in entry.Properties)
+                {
+                    if (property.Metadata.ClrType == typeof(string) && property.CurrentValue != null)
+                    {
+                        var value = property.CurrentValue as string;
+                        if (!string.IsNullOrEmpty(value))
+                        {
+                            // Trim leading/trailing whitespace
+                            property.CurrentValue = value.Trim();
+                        }
+                    }
+                }
+            }
+        }
+
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             base.OnConfiguring(optionsBuilder);
@@ -35,6 +69,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         public DbSet<Document> Documents { get; set; }
         public DbSet<Inspection> Inspections { get; set; }
         public DbSet<MaintenanceRequest> MaintenanceRequests { get; set; }
+        public DbSet<Repair> Repairs { get; set; }
         public DbSet<OrganizationSettings> OrganizationSettings { get; set; }
         public DbSet<SchemaVersion> SchemaVersions { get; set; }
         public DbSet<ChecklistTemplate> ChecklistTemplates { get; set; }
@@ -54,7 +89,10 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         
         // Multi-organization support
         public DbSet<Organization> Organizations { get; set; }
-        public DbSet<UserOrganization> UserOrganizations { get; set; }
+        public DbSet<OrganizationUser> OrganizationUsers { get; set; }
+        
+        // User profiles (business context - separate from Identity)
+        public DbSet<UserProfile> UserProfiles { get; set; }
         
         // Workflow audit logging
         public DbSet<WorkflowAuditLog> WorkflowAuditLogs { get; set; }
@@ -234,7 +272,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<MaintenanceRequest>(entity =>
             {
                 entity.HasOne(m => m.Property)
-                    .WithMany()
+                    .WithMany(p => p.MaintenanceRequests)
                     .HasForeignKey(m => m.PropertyId)
                     .OnDelete(DeleteBehavior.Restrict);
 
@@ -252,6 +290,39 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 entity.HasIndex(e => e.RequestedOn);
             });
 
+            // Configure Repair entity
+            modelBuilder.Entity<Repair>(entity =>
+            {
+                // Required relationship: Property (Restrict - can't delete property with repairs)
+                entity.HasOne(r => r.Property)
+                    .WithMany(p => p.Repairs)
+                    .HasForeignKey(r => r.PropertyId)
+                    .OnDelete(DeleteBehavior.Restrict);
+
+                // Optional relationship: MaintenanceRequest (SetNull - repairs can outlive MR)
+                entity.HasOne(r => r.MaintenanceRequest)
+                    .WithMany(mr => mr.Repairs)
+                    .HasForeignKey(r => r.MaintenanceRequestId)
+                    .OnDelete(DeleteBehavior.SetNull);
+
+                // Optional relationship: Lease (SetNull - repairs can outlive lease)
+                entity.HasOne(r => r.Lease)
+                    .WithMany()
+                    .HasForeignKey(r => r.LeaseId)
+                    .OnDelete(DeleteBehavior.SetNull);
+
+                // Decimal precision for Cost field
+                entity.Property(e => e.Cost).HasPrecision(18, 2);
+                
+                // Indexes for query optimization
+                entity.HasIndex(e => e.OrganizationId);
+                entity.HasIndex(e => e.PropertyId);
+                entity.HasIndex(e => e.MaintenanceRequestId);
+                entity.HasIndex(e => e.LeaseId);
+                entity.HasIndex(e => e.CompletedOn);
+                entity.HasIndex(e => e.RepairType);
+            });
+
             // Configure OrganizationSettings entity
             modelBuilder.Entity<OrganizationSettings>(entity =>
             {
@@ -499,13 +570,13 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 // No navigation property configured here
             });
 
-            // Configure UserOrganization entity
-            modelBuilder.Entity<UserOrganization>(entity =>
+            // Configure OrganizationUser entity
+            modelBuilder.Entity<OrganizationUser>(entity =>
             {
                 entity.HasKey(e => e.Id);
                 
                 entity.HasOne(uo => uo.Organization)
-                    .WithMany(o => o.UserOrganizations)
+                    .WithMany(o => o.OrganizationUsers)
                     .HasForeignKey(uo => uo.OrganizationId)
                     .OnDelete(DeleteBehavior.Cascade);
                 
@@ -607,6 +678,24 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 entity.Property(e => e.CostPerSMS).HasPrecision(18, 4);
             });
 
+            // Configure UserProfile entity
+            modelBuilder.Entity<UserProfile>(entity =>
+            {
+                entity.HasKey(e => e.Id);
+                
+                // Unique constraint: one profile per user
+                entity.HasIndex(e => e.UserId).IsUnique();
+                
+                // Additional indexes for common queries
+                entity.HasIndex(e => e.Email);
+                entity.HasIndex(e => e.OrganizationId);
+                entity.HasIndex(e => e.ActiveOrganizationId);
+                entity.HasIndex(e => e.IsDeleted);
+                
+                // Note: No navigation property to AspNetUsers (different context)
+                // UserId is a string FK to Identity context, but no EF relationship configured
+            });
+
             // Seed System Checklist Templates
             SeedChecklistTemplates(modelBuilder);
         }
diff --git a/1-Aquiis.Infrastructure/Data/Migrations/20260104205822_InitialCreate.Designer.cs b/1-Aquiis.Infrastructure/Data/Migrations/20260104205822_InitialCreate.Designer.cs
index 7cc048d..0a34aa3 100644
--- a/1-Aquiis.Infrastructure/Data/Migrations/20260104205822_InitialCreate.Designer.cs
+++ b/1-Aquiis.Infrastructure/Data/Migrations/20260104205822_InitialCreate.Designer.cs
@@ -3263,7 +3263,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.ToTable("Tours");
                 });
 
-            modelBuilder.Entity("Aquiis.Core.Entities.UserOrganization", b =>
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
@@ -3320,7 +3320,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.HasIndex("UserId", "OrganizationId")
                         .IsUnique();
 
-                    b.ToTable("UserOrganizations");
+                    b.ToTable("OrganizationUsers");
                 });
 
             modelBuilder.Entity("Aquiis.Core.Entities.WorkflowAuditLog", b =>
@@ -3937,10 +3937,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
                     b.Navigation("ProspectiveTenant");
                 });
 
-            modelBuilder.Entity("Aquiis.Core.Entities.UserOrganization", b =>
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
                 {
                     b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
-                        .WithMany("UserOrganizations")
+                        .WithMany("OrganizationUsers")
                         .HasForeignKey("OrganizationId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -3991,7 +3991,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
 
                     b.Navigation("Tenants");
 
-                    b.Navigation("UserOrganizations");
+                    b.Navigation("OrganizationUsers");
                 });
 
             modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
diff --git a/1-Aquiis.Infrastructure/Data/Migrations/20260104205822_InitialCreate.cs b/1-Aquiis.Infrastructure/Data/Migrations/20260104205822_InitialCreate.cs
index 5257751..cc241fc 100644
--- a/1-Aquiis.Infrastructure/Data/Migrations/20260104205822_InitialCreate.cs
+++ b/1-Aquiis.Infrastructure/Data/Migrations/20260104205822_InitialCreate.cs
@@ -481,7 +481,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 });
 
             migrationBuilder.CreateTable(
-                name: "UserOrganizations",
+                name: "OrganizationUsers",
                 columns: table => new
                 {
                     Id = table.Column<Guid>(type: "TEXT", nullable: false),
@@ -500,9 +500,9 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_UserOrganizations", x => x.Id);
+                    table.PrimaryKey("PK_OrganizationUsers", x => x.Id);
                     table.ForeignKey(
-                        name: "FK_UserOrganizations_Organizations_OrganizationId",
+                        name: "FK_OrganizationUsers_Organizations_OrganizationId",
                         column: x => x.OrganizationId,
                         principalTable: "Organizations",
                         principalColumn: "Id",
@@ -1839,23 +1839,23 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 column: "Status");
 
             migrationBuilder.CreateIndex(
-                name: "IX_UserOrganizations_IsActive",
-                table: "UserOrganizations",
+                name: "IX_OrganizationUsers_IsActive",
+                table: "OrganizationUsers",
                 column: "IsActive");
 
             migrationBuilder.CreateIndex(
-                name: "IX_UserOrganizations_OrganizationId",
-                table: "UserOrganizations",
+                name: "IX_OrganizationUsers_OrganizationId",
+                table: "OrganizationUsers",
                 column: "OrganizationId");
 
             migrationBuilder.CreateIndex(
-                name: "IX_UserOrganizations_Role",
-                table: "UserOrganizations",
+                name: "IX_OrganizationUsers_Role",
+                table: "OrganizationUsers",
                 column: "Role");
 
             migrationBuilder.CreateIndex(
-                name: "IX_UserOrganizations_UserId_OrganizationId",
-                table: "UserOrganizations",
+                name: "IX_OrganizationUsers_UserId_OrganizationId",
+                table: "OrganizationUsers",
                 columns: new[] { "UserId", "OrganizationId" },
                 unique: true);
 
@@ -2018,7 +2018,7 @@ protected override void Down(MigrationBuilder migrationBuilder)
                 name: "Tours");
 
             migrationBuilder.DropTable(
-                name: "UserOrganizations");
+                name: "OrganizationUsers");
 
             migrationBuilder.DropTable(
                 name: "WorkflowAuditLogs");
diff --git a/1-Aquiis.Infrastructure/Data/Migrations/20260114233331_AddUserProfileTable.Designer.cs b/1-Aquiis.Infrastructure/Data/Migrations/20260114233331_AddUserProfileTable.Designer.cs
new file mode 100644
index 0000000..2cb376c
--- /dev/null
+++ b/1-Aquiis.Infrastructure/Data/Migrations/20260114233331_AddUserProfileTable.Designer.cs
@@ -0,0 +1,4097 @@
+// <auto-generated />
+using System;
+using Aquiis.Infrastructure.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Aquiis.Infrastructure.Data.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20260114233331_AddUserProfileTable")]
+    partial class AddUserProfileTable
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.1");
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ApplicationScreening", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("BackgroundCheckCompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("BackgroundCheckNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("BackgroundCheckPassed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("BackgroundCheckRequested")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("BackgroundCheckRequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreditCheckCompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreditCheckNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("CreditCheckPassed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("CreditCheckRequested")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("CreditCheckRequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("CreditScore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OverallResult")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResultNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("OverallResult");
+
+                    b.HasIndex("RentalApplicationId")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationScreenings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarEvent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Color")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EndOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EventType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Icon")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Location")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SourceEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SourceEntityType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EventType");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("SourceEntityId");
+
+                    b.HasIndex("StartOn");
+
+                    b.HasIndex("SourceEntityType", "SourceEntityId");
+
+                    b.ToTable("CalendarEvents");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AutoCreateEvents")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultColor")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultIcon")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DisplayOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ShowOnCalendar")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("OrganizationId", "EntityType")
+                        .IsUnique();
+
+                    b.ToTable("CalendarSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ChecklistType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CompletedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GeneralNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistTemplateId");
+
+                    b.HasIndex("ChecklistType");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("Checklists");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CategorySection")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ItemOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ItemText")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhotoUrl")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RequiresValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SectionOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistId");
+
+                    b.ToTable("ChecklistItems");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Category")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSystemTemplate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Category");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("ChecklistTemplates");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000001"),
+                            Category = "Tour",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Standard property showing checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Property Tour",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000002"),
+                            Category = "MoveIn",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Move-in inspection checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Move-In",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000003"),
+                            Category = "MoveOut",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Move-out inspection checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Move-Out",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000004"),
+                            Category = "Tour",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Open house event checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Open House",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        });
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplateItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AllowsNotes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CategorySection")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRequired")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ItemOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ItemText")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RequiresValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SectionOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistTemplateId");
+
+                    b.ToTable("ChecklistTemplateItems");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000001"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Greeted prospect and verified appointment",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000002"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Reviewed property exterior and curb appeal",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000003"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Showed parking area/garage",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000004"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 4,
+                            ItemText = "Toured living room/common areas",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000005"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 5,
+                            ItemText = "Showed all bedrooms",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000006"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 6,
+                            ItemText = "Showed all bathrooms",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000007"),
+                            AllowsNotes = true,
+                            CategorySection = "Kitchen & Appliances",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 7,
+                            ItemText = "Toured kitchen and demonstrated appliances",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 3
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000008"),
+                            AllowsNotes = true,
+                            CategorySection = "Kitchen & Appliances",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 8,
+                            ItemText = "Explained which appliances are included",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 3
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000009"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 9,
+                            ItemText = "Explained HVAC system and thermostat controls",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000010"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 10,
+                            ItemText = "Reviewed utility responsibilities (tenant vs landlord)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000011"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 11,
+                            ItemText = "Showed water heater location",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000012"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 12,
+                            ItemText = "Showed storage areas (closets, attic, basement)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000013"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 13,
+                            ItemText = "Showed laundry facilities",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000014"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 14,
+                            ItemText = "Showed outdoor space (yard, patio, balcony)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000015"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 15,
+                            ItemText = "Discussed monthly rent amount",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000016"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 16,
+                            ItemText = "Explained security deposit and move-in costs",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000017"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 17,
+                            ItemText = "Reviewed lease term length and start date",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000018"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 18,
+                            ItemText = "Explained pet policy",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000019"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 19,
+                            ItemText = "Explained application process and requirements",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000020"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 20,
+                            ItemText = "Reviewed screening process (background, credit check)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000021"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 21,
+                            ItemText = "Answered all prospect questions",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000022"),
+                            AllowsNotes = true,
+                            CategorySection = "Assessment",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 22,
+                            ItemText = "Prospect Interest Level",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = true,
+                            SectionOrder = 8
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000023"),
+                            AllowsNotes = true,
+                            CategorySection = "Assessment",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 23,
+                            ItemText = "Overall showing feedback and notes",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 8
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000024"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Document property condition",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000025"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Collect keys and access codes",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000026"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Review lease terms with tenant",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000027"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Inspect property condition",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000028"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Collect all keys and access devices",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000029"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Document damages and needed repairs",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000030"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Set up signage and directional markers",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000031"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Prepare information packets",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000032"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Set up visitor sign-in sheet",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        });
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocumentType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("FileData")
+                        .IsRequired()
+                        .HasColumnType("BLOB");
+
+                    b.Property<string>("FileExtension")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FilePath")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FileType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("InvoiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PaymentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvoiceId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PaymentId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Inspection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionItemsRequired")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomSinkGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomSinkNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomToiletGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomToiletNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomTubShowerGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomTubShowerNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomVentilationGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomVentilationNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("CarbonMonoxideDetectorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CarbonMonoxideDetectorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ElectricalSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ElectricalSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorDoorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorDoorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorFoundationGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorFoundationNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorGuttersGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorGuttersNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorRoofGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorRoofNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorSidingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorSidingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorWindowsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorWindowsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GeneralNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("HvacSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("HvacSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InspectedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InspectionType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorCeilingsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorCeilingsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorDoorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorDoorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorFloorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorFloorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorWallsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorWallsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorWindowsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorWindowsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("KitchenAppliancesGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenAppliancesNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenCabinetsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenCabinetsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenCountersGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenCountersNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenSinkPlumbingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenSinkPlumbingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("LandscapingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LandscapingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OverallCondition")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("PlumbingSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("PlumbingSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SmokeDetectorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SmokeDetectorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.ToTable("Inspections");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("AmountPaid")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DueOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("InvoicedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("LateFeeAmount")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool?>("LateFeeApplied")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LateFeeAppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("ReminderSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ReminderSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("InvoiceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Invoices");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ActualMoveOutDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DeclinedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ExpectedMoveOutDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseOfferId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("OfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PreviousLeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("ProposedRenewalRent")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("RenewalNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("RenewalNotificationSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("RenewalNotificationSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RenewalNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("RenewalOfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RenewalReminderSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RenewalResponseOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RenewalStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("SecurityDeposit")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("SignedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("TerminationNoticedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TerminationReason")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Terms")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Leases");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.LeaseOffer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ConvertedLeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("OfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RespondedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResponseNotes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("SecurityDeposit")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Terms")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("RentalApplicationId");
+
+                    b.ToTable("LeaseOffers");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ActualCost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("AssignedTo")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("EstimatedCost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedBy")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedByEmail")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedByPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("RequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResolutionNotes")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ScheduledOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("Priority");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("RequestedOn");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("MaintenanceRequests");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Note", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Content")
+                        .IsRequired()
+                        .HasMaxLength(5000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserFullName")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Notes");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.NotificationPreferences", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<TimeSpan>("DailyDigestTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmailAddress")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EmailApplicationStatusChange")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailInspectionScheduled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailLeaseExpiring")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailMaintenanceUpdate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailPaymentDue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailPaymentReceived")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableDailyDigest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableEmailNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableInAppNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableSMSNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableWeeklyDigest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SMSLeaseExpiringUrgent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SMSMaintenanceEmergency")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SMSPaymentDue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("WeeklyDigestDay")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("UserId", "OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("NotificationPreferences");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Organization", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OwnerId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("State")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsActive");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("Organizations");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationEmailSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DailyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("DailyLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EmailsSentThisMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EmailsSentToday")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableSsl")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FromEmail")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FromName")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsEmailEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVerified")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastEmailSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastError")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastErrorOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastVerifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("MonthlyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("MonthlyLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PlanType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SendGridApiKeyEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SmtpPort")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SmtpServer")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("StatsLastUpdatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationEmailSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSMSSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("AccountBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AccountType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("CostPerSMS")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DailyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSMSEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVerified")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastError")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastSMSSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastVerifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("MonthlyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderName")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SMSSentThisMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SMSSentToday")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("StatsLastUpdatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioAccountSidEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioAuthTokenEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioPhoneNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationSMSSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AllowTenantDividendChoice")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ApplicationExpirationDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ApplicationFeeEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("AutoCalculateSecurityDeposit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DefaultApplicationFee")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultDividendPaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DividendDistributionMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("LateFeeAutoApply")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("LateFeeEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("LateFeeGracePeriodDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("LateFeePercentage")
+                        .HasPrecision(5, 4)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MaxLateFeeAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OrganizationId")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("OrganizationSharePercentage")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<int>("PaymentReminderDaysBefore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("PaymentReminderEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RefundProcessingDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SecurityDepositInvestmentEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("SecurityDepositMultiplier")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<int>("TourNoShowGracePeriodHours")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GrantedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("GrantedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RevokedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Role")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsActive");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Role");
+
+                    b.HasIndex("UserId", "OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationUsers");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Payment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("InvoiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("PaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("InvoiceId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Payments");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Bathrooms")
+                        .HasMaxLength(3)
+                        .HasColumnType("decimal(3,1)");
+
+                    b.Property<int>("Bedrooms")
+                        .HasMaxLength(3)
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("City")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAvailable")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastRoutineInspectionDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("NextRoutineInspectionDueDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PropertyType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RoutineInspectionIntervalMonths")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SquareFeet")
+                        .HasMaxLength(7)
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("State")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UnitNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ZipCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Properties");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateOfBirth")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DesiredMoveInDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("FirstContactedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationNumber")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationState")
+                        .HasMaxLength(2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("InterestedPropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Phone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Source")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("InterestedPropertyId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("ProspectiveTenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ApplicationFee")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("ApplicationFeePaid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ApplicationFeePaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ApplicationFeePaymentMethod")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("AppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentAddress")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentCity")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("CurrentRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CurrentState")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentZipCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DecidedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DecisionBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DenialReason")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmployerName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("EmploymentLengthMonths")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("JobTitle")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LandlordName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LandlordPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyIncome")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Phone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Relationship")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Phone")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Relationship")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AppliedOn");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("RentalApplications");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SchemaVersion", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SchemaVersions");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateReceived")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("DeductionsAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("DeductionsReason")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InInvestmentPool")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PoolEntryDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PoolExitDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("RefundAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("RefundMethod")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RefundProcessedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RefundReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TransactionReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InInvestmentPool");
+
+                    b.HasIndex("LeaseId")
+                        .IsUnique();
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("SecurityDeposits");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositDividend", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("BaseDividendAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("ChoiceMadeOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DividendAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<Guid>("InvestmentPoolId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MailingAddress")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("MonthsInPool")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PaymentProcessedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ProrationFactor")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<Guid>("SecurityDepositId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvestmentPoolId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("SecurityDepositId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("Year");
+
+                    b.ToTable("SecurityDepositDividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositInvestmentPool", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ActiveLeaseCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DividendPerLease")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("DividendsCalculatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DividendsDistributedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("EndingBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("OrganizationShare")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("OrganizationSharePercentage")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<decimal>("ReturnRate")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<decimal>("StartingBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("TenantShareTotal")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("TotalEarnings")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("Year")
+                        .IsUnique();
+
+                    b.ToTable("SecurityDepositInvestmentPools");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateOfBirth")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmergencyContactName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmergencyContactPhone")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationNumber")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email")
+                        .IsUnique();
+
+                    b.HasIndex("IdentificationNumber")
+                        .IsUnique();
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Tenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tour", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ChecklistId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ConductedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Feedback")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InterestLevel")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ScheduledOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("ScheduledOn");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("Tours");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.UserProfile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ActiveOrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActiveOrganizationId");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("IsDeleted");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("UserProfiles");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.WorkflowAuditLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Action")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FromStatus")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Metadata")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PerformedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("PerformedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reason")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ToStatus")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Action");
+
+                    b.HasIndex("EntityId");
+
+                    b.HasIndex("EntityType");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PerformedBy");
+
+                    b.HasIndex("PerformedOn");
+
+                    b.HasIndex("EntityType", "EntityId");
+
+                    b.ToTable("WorkflowAuditLogs");
+                });
+
+            modelBuilder.Entity("Notification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Category")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmailError")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EmailSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EmailSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ReadOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RecipientUserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("RelatedEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RelatedEntityType")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SMSError")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SMSSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("SMSSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SendEmail")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SendInApp")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SendSMS")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("SentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Category");
+
+                    b.HasIndex("IsRead");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("RecipientUserId");
+
+                    b.HasIndex("SentOn");
+
+                    b.ToTable("Notifications");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ApplicationScreening", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.RentalApplication", "RentalApplication")
+                        .WithOne("Screening")
+                        .HasForeignKey("Aquiis.Core.Entities.ApplicationScreening", "RentalApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("RentalApplication");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarEvent", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.ChecklistTemplate", "ChecklistTemplate")
+                        .WithMany("Checklists")
+                        .HasForeignKey("ChecklistTemplateId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("ChecklistTemplate");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistItem", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Checklist", "Checklist")
+                        .WithMany("Items")
+                        .HasForeignKey("ChecklistId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Checklist");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplateItem", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.ChecklistTemplate", "ChecklistTemplate")
+                        .WithMany("Items")
+                        .HasForeignKey("ChecklistTemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ChecklistTemplate");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Document", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Invoice", "Invoice")
+                        .WithMany()
+                        .HasForeignKey("InvoiceId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany("Documents")
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Payment", "Payment")
+                        .WithMany()
+                        .HasForeignKey("PaymentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("Documents")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Invoice");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Payment");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Inspection", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany("Invoices")
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Leases")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("Leases")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany("Leases")
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.LeaseOffer", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany()
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.RentalApplication", "RentalApplication")
+                        .WithMany()
+                        .HasForeignKey("RentalApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+
+                    b.Navigation("RentalApplication");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.NotificationPreferences", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationEmailSettings", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSMSSettings", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany("OrganizationUsers")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Payment", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Invoice", "Invoice")
+                        .WithMany("Payments")
+                        .HasForeignKey("InvoiceId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Invoice");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Properties")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "InterestedProperty")
+                        .WithMany()
+                        .HasForeignKey("InterestedPropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("InterestedProperty");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany("Applications")
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositDividend", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.SecurityDepositInvestmentPool", "InvestmentPool")
+                        .WithMany("Dividends")
+                        .HasForeignKey("InvestmentPoolId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.SecurityDeposit", "SecurityDeposit")
+                        .WithMany("Dividends")
+                        .HasForeignKey("SecurityDepositId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("InvestmentPool");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("SecurityDeposit");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Tenants")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tour", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Checklist", "Checklist")
+                        .WithMany()
+                        .HasForeignKey("ChecklistId");
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany("Tours")
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Checklist");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+                });
+
+            modelBuilder.Entity("Notification", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.Navigation("Items");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplate", b =>
+                {
+                    b.Navigation("Checklists");
+
+                    b.Navigation("Items");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.Navigation("Payments");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.Navigation("Documents");
+
+                    b.Navigation("Invoices");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Organization", b =>
+                {
+                    b.Navigation("Leases");
+
+                    b.Navigation("OrganizationUsers");
+
+                    b.Navigation("Properties");
+
+                    b.Navigation("Tenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.Navigation("Documents");
+
+                    b.Navigation("Leases");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.Navigation("Applications");
+
+                    b.Navigation("Tours");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.Navigation("Screening");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.Navigation("Dividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositInvestmentPool", b =>
+                {
+                    b.Navigation("Dividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.Navigation("Leases");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/1-Aquiis.Infrastructure/Data/Migrations/20260114233331_AddUserProfileTable.cs b/1-Aquiis.Infrastructure/Data/Migrations/20260114233331_AddUserProfileTable.cs
new file mode 100644
index 0000000..1fc7e3b
--- /dev/null
+++ b/1-Aquiis.Infrastructure/Data/Migrations/20260114233331_AddUserProfileTable.cs
@@ -0,0 +1,71 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Aquiis.Infrastructure.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddUserProfileTable : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "UserProfiles",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    UserId = table.Column<string>(type: "TEXT", nullable: false),
+                    Email = table.Column<string>(type: "TEXT", nullable: false),
+                    FirstName = table.Column<string>(type: "TEXT", nullable: false),
+                    LastName = table.Column<string>(type: "TEXT", nullable: false),
+                    PhoneNumber = table.Column<string>(type: "TEXT", nullable: true),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    ActiveOrganizationId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
+                    CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    LastModifiedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    LastModifiedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: true),
+                    IsDeleted = table.Column<bool>(type: "INTEGER", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_UserProfiles", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UserProfiles_ActiveOrganizationId",
+                table: "UserProfiles",
+                column: "ActiveOrganizationId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UserProfiles_Email",
+                table: "UserProfiles",
+                column: "Email");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UserProfiles_IsDeleted",
+                table: "UserProfiles",
+                column: "IsDeleted");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UserProfiles_OrganizationId",
+                table: "UserProfiles",
+                column: "OrganizationId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UserProfiles_UserId",
+                table: "UserProfiles",
+                column: "UserId",
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "UserProfiles");
+        }
+    }
+}
diff --git a/1-Aquiis.Infrastructure/Data/Migrations/20260117025048_AddPaymentNumberField.Designer.cs b/1-Aquiis.Infrastructure/Data/Migrations/20260117025048_AddPaymentNumberField.Designer.cs
new file mode 100644
index 0000000..a8ad23e
--- /dev/null
+++ b/1-Aquiis.Infrastructure/Data/Migrations/20260117025048_AddPaymentNumberField.Designer.cs
@@ -0,0 +1,4102 @@
+// <auto-generated />
+using System;
+using Aquiis.Infrastructure.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Aquiis.Infrastructure.Data.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20260117025048_AddPaymentNumberField")]
+    partial class AddPaymentNumberField
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.1");
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ApplicationScreening", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("BackgroundCheckCompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("BackgroundCheckNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("BackgroundCheckPassed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("BackgroundCheckRequested")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("BackgroundCheckRequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreditCheckCompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreditCheckNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("CreditCheckPassed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("CreditCheckRequested")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("CreditCheckRequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("CreditScore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OverallResult")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResultNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("OverallResult");
+
+                    b.HasIndex("RentalApplicationId")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationScreenings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarEvent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Color")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EndOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EventType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Icon")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Location")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SourceEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SourceEntityType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EventType");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("SourceEntityId");
+
+                    b.HasIndex("StartOn");
+
+                    b.HasIndex("SourceEntityType", "SourceEntityId");
+
+                    b.ToTable("CalendarEvents");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AutoCreateEvents")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultColor")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultIcon")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DisplayOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ShowOnCalendar")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("OrganizationId", "EntityType")
+                        .IsUnique();
+
+                    b.ToTable("CalendarSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ChecklistType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CompletedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GeneralNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistTemplateId");
+
+                    b.HasIndex("ChecklistType");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("Checklists");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CategorySection")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ItemOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ItemText")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhotoUrl")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RequiresValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SectionOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistId");
+
+                    b.ToTable("ChecklistItems");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Category")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSystemTemplate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Category");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("ChecklistTemplates");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000001"),
+                            Category = "Tour",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Standard property showing checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Property Tour",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000002"),
+                            Category = "MoveIn",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Move-in inspection checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Move-In",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000003"),
+                            Category = "MoveOut",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Move-out inspection checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Move-Out",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000004"),
+                            Category = "Tour",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Open house event checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Open House",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        });
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplateItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AllowsNotes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CategorySection")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRequired")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ItemOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ItemText")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RequiresValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SectionOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistTemplateId");
+
+                    b.ToTable("ChecklistTemplateItems");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000001"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Greeted prospect and verified appointment",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000002"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Reviewed property exterior and curb appeal",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000003"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Showed parking area/garage",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000004"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 4,
+                            ItemText = "Toured living room/common areas",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000005"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 5,
+                            ItemText = "Showed all bedrooms",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000006"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 6,
+                            ItemText = "Showed all bathrooms",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000007"),
+                            AllowsNotes = true,
+                            CategorySection = "Kitchen & Appliances",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 7,
+                            ItemText = "Toured kitchen and demonstrated appliances",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 3
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000008"),
+                            AllowsNotes = true,
+                            CategorySection = "Kitchen & Appliances",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 8,
+                            ItemText = "Explained which appliances are included",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 3
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000009"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 9,
+                            ItemText = "Explained HVAC system and thermostat controls",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000010"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 10,
+                            ItemText = "Reviewed utility responsibilities (tenant vs landlord)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000011"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 11,
+                            ItemText = "Showed water heater location",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000012"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 12,
+                            ItemText = "Showed storage areas (closets, attic, basement)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000013"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 13,
+                            ItemText = "Showed laundry facilities",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000014"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 14,
+                            ItemText = "Showed outdoor space (yard, patio, balcony)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000015"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 15,
+                            ItemText = "Discussed monthly rent amount",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000016"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 16,
+                            ItemText = "Explained security deposit and move-in costs",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000017"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 17,
+                            ItemText = "Reviewed lease term length and start date",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000018"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 18,
+                            ItemText = "Explained pet policy",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000019"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 19,
+                            ItemText = "Explained application process and requirements",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000020"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 20,
+                            ItemText = "Reviewed screening process (background, credit check)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000021"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 21,
+                            ItemText = "Answered all prospect questions",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000022"),
+                            AllowsNotes = true,
+                            CategorySection = "Assessment",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 22,
+                            ItemText = "Prospect Interest Level",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = true,
+                            SectionOrder = 8
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000023"),
+                            AllowsNotes = true,
+                            CategorySection = "Assessment",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 23,
+                            ItemText = "Overall showing feedback and notes",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 8
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000024"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Document property condition",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000025"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Collect keys and access codes",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000026"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Review lease terms with tenant",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000027"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Inspect property condition",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000028"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Collect all keys and access devices",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000029"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Document damages and needed repairs",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000030"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Set up signage and directional markers",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000031"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Prepare information packets",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000032"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Set up visitor sign-in sheet",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        });
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocumentType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("FileData")
+                        .IsRequired()
+                        .HasColumnType("BLOB");
+
+                    b.Property<string>("FileExtension")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FilePath")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FileType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("InvoiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PaymentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvoiceId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PaymentId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Inspection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionItemsRequired")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomSinkGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomSinkNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomToiletGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomToiletNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomTubShowerGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomTubShowerNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomVentilationGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomVentilationNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("CarbonMonoxideDetectorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CarbonMonoxideDetectorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ElectricalSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ElectricalSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorDoorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorDoorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorFoundationGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorFoundationNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorGuttersGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorGuttersNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorRoofGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorRoofNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorSidingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorSidingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorWindowsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorWindowsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GeneralNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("HvacSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("HvacSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InspectedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InspectionType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorCeilingsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorCeilingsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorDoorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorDoorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorFloorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorFloorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorWallsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorWallsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorWindowsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorWindowsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("KitchenAppliancesGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenAppliancesNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenCabinetsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenCabinetsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenCountersGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenCountersNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenSinkPlumbingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenSinkPlumbingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("LandscapingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LandscapingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OverallCondition")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("PlumbingSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("PlumbingSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SmokeDetectorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SmokeDetectorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.ToTable("Inspections");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("AmountPaid")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DueOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("InvoicedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("LateFeeAmount")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool?>("LateFeeApplied")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LateFeeAppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("ReminderSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ReminderSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("InvoiceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Invoices");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ActualMoveOutDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DeclinedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ExpectedMoveOutDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseOfferId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("OfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PreviousLeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("ProposedRenewalRent")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("RenewalNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("RenewalNotificationSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("RenewalNotificationSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RenewalNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("RenewalOfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RenewalReminderSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RenewalResponseOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RenewalStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("SecurityDeposit")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("SignedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("TerminationNoticedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TerminationReason")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Terms")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Leases");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.LeaseOffer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ConvertedLeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("OfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RespondedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResponseNotes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("SecurityDeposit")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Terms")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("RentalApplicationId");
+
+                    b.ToTable("LeaseOffers");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ActualCost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("AssignedTo")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("EstimatedCost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedBy")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedByEmail")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedByPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("RequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResolutionNotes")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ScheduledOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("Priority");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("RequestedOn");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("MaintenanceRequests");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Note", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Content")
+                        .IsRequired()
+                        .HasMaxLength(5000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserFullName")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Notes");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.NotificationPreferences", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<TimeSpan>("DailyDigestTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmailAddress")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EmailApplicationStatusChange")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailInspectionScheduled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailLeaseExpiring")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailMaintenanceUpdate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailPaymentDue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailPaymentReceived")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableDailyDigest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableEmailNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableInAppNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableSMSNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableWeeklyDigest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SMSLeaseExpiringUrgent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SMSMaintenanceEmergency")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SMSPaymentDue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("WeeklyDigestDay")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("UserId", "OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("NotificationPreferences");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Organization", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OwnerId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("State")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsActive");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("Organizations");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationEmailSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DailyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("DailyLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EmailsSentThisMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EmailsSentToday")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableSsl")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FromEmail")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FromName")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsEmailEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVerified")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastEmailSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastError")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastErrorOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastVerifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("MonthlyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("MonthlyLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PlanType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SendGridApiKeyEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SmtpPort")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SmtpServer")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("StatsLastUpdatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationEmailSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSMSSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("AccountBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AccountType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("CostPerSMS")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DailyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSMSEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVerified")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastError")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastSMSSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastVerifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("MonthlyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderName")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SMSSentThisMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SMSSentToday")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("StatsLastUpdatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioAccountSidEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioAuthTokenEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioPhoneNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationSMSSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AllowTenantDividendChoice")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ApplicationExpirationDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ApplicationFeeEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("AutoCalculateSecurityDeposit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DefaultApplicationFee")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultDividendPaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DividendDistributionMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("LateFeeAutoApply")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("LateFeeEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("LateFeeGracePeriodDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("LateFeePercentage")
+                        .HasPrecision(5, 4)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MaxLateFeeAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OrganizationId")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("OrganizationSharePercentage")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<int>("PaymentReminderDaysBefore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("PaymentReminderEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RefundProcessingDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SecurityDepositInvestmentEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("SecurityDepositMultiplier")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<int>("TourNoShowGracePeriodHours")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GrantedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("GrantedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RevokedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Role")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsActive");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Role");
+
+                    b.HasIndex("UserId", "OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationUsers");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Payment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("InvoiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("PaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("InvoiceId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Payments");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Bathrooms")
+                        .HasMaxLength(3)
+                        .HasColumnType("decimal(3,1)");
+
+                    b.Property<int>("Bedrooms")
+                        .HasMaxLength(3)
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("City")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAvailable")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastRoutineInspectionDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("NextRoutineInspectionDueDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PropertyType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RoutineInspectionIntervalMonths")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SquareFeet")
+                        .HasMaxLength(7)
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("State")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UnitNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ZipCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Properties");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateOfBirth")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DesiredMoveInDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("FirstContactedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationNumber")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationState")
+                        .HasMaxLength(2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("InterestedPropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Phone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Source")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("InterestedPropertyId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("ProspectiveTenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ApplicationFee")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("ApplicationFeePaid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ApplicationFeePaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ApplicationFeePaymentMethod")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("AppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentAddress")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentCity")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("CurrentRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CurrentState")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentZipCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DecidedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DecisionBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DenialReason")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmployerName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("EmploymentLengthMonths")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("JobTitle")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LandlordName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LandlordPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyIncome")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Phone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Relationship")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Phone")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Relationship")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AppliedOn");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("RentalApplications");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SchemaVersion", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SchemaVersions");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateReceived")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("DeductionsAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("DeductionsReason")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InInvestmentPool")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PoolEntryDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PoolExitDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("RefundAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("RefundMethod")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RefundProcessedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RefundReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TransactionReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InInvestmentPool");
+
+                    b.HasIndex("LeaseId")
+                        .IsUnique();
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("SecurityDeposits");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositDividend", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("BaseDividendAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("ChoiceMadeOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DividendAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<Guid>("InvestmentPoolId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MailingAddress")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("MonthsInPool")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PaymentProcessedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ProrationFactor")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<Guid>("SecurityDepositId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvestmentPoolId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("SecurityDepositId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("Year");
+
+                    b.ToTable("SecurityDepositDividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositInvestmentPool", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ActiveLeaseCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DividendPerLease")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("DividendsCalculatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DividendsDistributedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("EndingBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("OrganizationShare")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("OrganizationSharePercentage")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<decimal>("ReturnRate")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<decimal>("StartingBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("TenantShareTotal")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("TotalEarnings")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("Year")
+                        .IsUnique();
+
+                    b.ToTable("SecurityDepositInvestmentPools");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateOfBirth")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmergencyContactName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmergencyContactPhone")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationNumber")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email")
+                        .IsUnique();
+
+                    b.HasIndex("IdentificationNumber")
+                        .IsUnique();
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Tenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tour", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ChecklistId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ConductedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Feedback")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InterestLevel")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ScheduledOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("ScheduledOn");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("Tours");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.UserProfile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ActiveOrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActiveOrganizationId");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("IsDeleted");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("UserProfiles");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.WorkflowAuditLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Action")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FromStatus")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Metadata")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PerformedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("PerformedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reason")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ToStatus")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Action");
+
+                    b.HasIndex("EntityId");
+
+                    b.HasIndex("EntityType");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PerformedBy");
+
+                    b.HasIndex("PerformedOn");
+
+                    b.HasIndex("EntityType", "EntityId");
+
+                    b.ToTable("WorkflowAuditLogs");
+                });
+
+            modelBuilder.Entity("Notification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Category")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmailError")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EmailSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EmailSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ReadOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RecipientUserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("RelatedEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RelatedEntityType")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SMSError")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SMSSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("SMSSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SendEmail")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SendInApp")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SendSMS")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("SentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Category");
+
+                    b.HasIndex("IsRead");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("RecipientUserId");
+
+                    b.HasIndex("SentOn");
+
+                    b.ToTable("Notifications");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ApplicationScreening", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.RentalApplication", "RentalApplication")
+                        .WithOne("Screening")
+                        .HasForeignKey("Aquiis.Core.Entities.ApplicationScreening", "RentalApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("RentalApplication");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarEvent", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.ChecklistTemplate", "ChecklistTemplate")
+                        .WithMany("Checklists")
+                        .HasForeignKey("ChecklistTemplateId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("ChecklistTemplate");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistItem", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Checklist", "Checklist")
+                        .WithMany("Items")
+                        .HasForeignKey("ChecklistId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Checklist");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplateItem", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.ChecklistTemplate", "ChecklistTemplate")
+                        .WithMany("Items")
+                        .HasForeignKey("ChecklistTemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ChecklistTemplate");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Document", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Invoice", "Invoice")
+                        .WithMany()
+                        .HasForeignKey("InvoiceId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany("Documents")
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Payment", "Payment")
+                        .WithMany()
+                        .HasForeignKey("PaymentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("Documents")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Invoice");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Payment");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Inspection", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany("Invoices")
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Leases")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("Leases")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany("Leases")
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.LeaseOffer", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany()
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.RentalApplication", "RentalApplication")
+                        .WithMany()
+                        .HasForeignKey("RentalApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+
+                    b.Navigation("RentalApplication");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.NotificationPreferences", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationEmailSettings", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSMSSettings", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany("OrganizationUsers")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Payment", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Invoice", "Invoice")
+                        .WithMany("Payments")
+                        .HasForeignKey("InvoiceId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Invoice");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Properties")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "InterestedProperty")
+                        .WithMany()
+                        .HasForeignKey("InterestedPropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("InterestedProperty");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany("Applications")
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositDividend", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.SecurityDepositInvestmentPool", "InvestmentPool")
+                        .WithMany("Dividends")
+                        .HasForeignKey("InvestmentPoolId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.SecurityDeposit", "SecurityDeposit")
+                        .WithMany("Dividends")
+                        .HasForeignKey("SecurityDepositId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("InvestmentPool");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("SecurityDeposit");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Tenants")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tour", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Checklist", "Checklist")
+                        .WithMany()
+                        .HasForeignKey("ChecklistId");
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany("Tours")
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Checklist");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+                });
+
+            modelBuilder.Entity("Notification", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.Navigation("Items");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplate", b =>
+                {
+                    b.Navigation("Checklists");
+
+                    b.Navigation("Items");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.Navigation("Payments");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.Navigation("Documents");
+
+                    b.Navigation("Invoices");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Organization", b =>
+                {
+                    b.Navigation("Leases");
+
+                    b.Navigation("OrganizationUsers");
+
+                    b.Navigation("Properties");
+
+                    b.Navigation("Tenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.Navigation("Documents");
+
+                    b.Navigation("Leases");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.Navigation("Applications");
+
+                    b.Navigation("Tours");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.Navigation("Screening");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.Navigation("Dividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositInvestmentPool", b =>
+                {
+                    b.Navigation("Dividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.Navigation("Leases");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/1-Aquiis.Infrastructure/Data/Migrations/20260117025048_AddPaymentNumberField.cs b/1-Aquiis.Infrastructure/Data/Migrations/20260117025048_AddPaymentNumberField.cs
new file mode 100644
index 0000000..dcf4007
--- /dev/null
+++ b/1-Aquiis.Infrastructure/Data/Migrations/20260117025048_AddPaymentNumberField.cs
@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Aquiis.Infrastructure.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddPaymentNumberField : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "PaymentNumber",
+                table: "Payments",
+                type: "TEXT",
+                maxLength: 50,
+                nullable: false,
+                defaultValue: "");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "PaymentNumber",
+                table: "Payments");
+        }
+    }
+}
diff --git a/1-Aquiis.Infrastructure/Data/Migrations/20260122142531_AddRepairEntity.Designer.cs b/1-Aquiis.Infrastructure/Data/Migrations/20260122142531_AddRepairEntity.Designer.cs
new file mode 100644
index 0000000..07e1479
--- /dev/null
+++ b/1-Aquiis.Infrastructure/Data/Migrations/20260122142531_AddRepairEntity.Designer.cs
@@ -0,0 +1,4238 @@
+// <auto-generated />
+using System;
+using Aquiis.Infrastructure.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Aquiis.Infrastructure.Data.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20260122142531_AddRepairEntity")]
+    partial class AddRepairEntity
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.1");
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ApplicationScreening", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("BackgroundCheckCompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("BackgroundCheckNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("BackgroundCheckPassed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("BackgroundCheckRequested")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("BackgroundCheckRequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreditCheckCompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreditCheckNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("CreditCheckPassed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("CreditCheckRequested")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("CreditCheckRequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("CreditScore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OverallResult")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResultNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("OverallResult");
+
+                    b.HasIndex("RentalApplicationId")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationScreenings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarEvent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Color")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EndOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EventType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Icon")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Location")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SourceEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SourceEntityType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EventType");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("SourceEntityId");
+
+                    b.HasIndex("StartOn");
+
+                    b.HasIndex("SourceEntityType", "SourceEntityId");
+
+                    b.ToTable("CalendarEvents");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AutoCreateEvents")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultColor")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultIcon")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DisplayOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ShowOnCalendar")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("OrganizationId", "EntityType")
+                        .IsUnique();
+
+                    b.ToTable("CalendarSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ChecklistType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CompletedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GeneralNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistTemplateId");
+
+                    b.HasIndex("ChecklistType");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("Checklists");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CategorySection")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ItemOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ItemText")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhotoUrl")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RequiresValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SectionOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistId");
+
+                    b.ToTable("ChecklistItems");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Category")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSystemTemplate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Category");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("ChecklistTemplates");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000001"),
+                            Category = "Tour",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Standard property showing checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Property Tour",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000002"),
+                            Category = "MoveIn",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Move-in inspection checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Move-In",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000003"),
+                            Category = "MoveOut",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Move-out inspection checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Move-Out",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000004"),
+                            Category = "Tour",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Open house event checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Open House",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        });
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplateItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AllowsNotes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CategorySection")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRequired")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ItemOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ItemText")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RequiresValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SectionOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistTemplateId");
+
+                    b.ToTable("ChecklistTemplateItems");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000001"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Greeted prospect and verified appointment",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000002"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Reviewed property exterior and curb appeal",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000003"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Showed parking area/garage",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000004"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 4,
+                            ItemText = "Toured living room/common areas",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000005"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 5,
+                            ItemText = "Showed all bedrooms",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000006"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 6,
+                            ItemText = "Showed all bathrooms",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000007"),
+                            AllowsNotes = true,
+                            CategorySection = "Kitchen & Appliances",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 7,
+                            ItemText = "Toured kitchen and demonstrated appliances",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 3
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000008"),
+                            AllowsNotes = true,
+                            CategorySection = "Kitchen & Appliances",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 8,
+                            ItemText = "Explained which appliances are included",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 3
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000009"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 9,
+                            ItemText = "Explained HVAC system and thermostat controls",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000010"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 10,
+                            ItemText = "Reviewed utility responsibilities (tenant vs landlord)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000011"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 11,
+                            ItemText = "Showed water heater location",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000012"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 12,
+                            ItemText = "Showed storage areas (closets, attic, basement)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000013"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 13,
+                            ItemText = "Showed laundry facilities",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000014"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 14,
+                            ItemText = "Showed outdoor space (yard, patio, balcony)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000015"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 15,
+                            ItemText = "Discussed monthly rent amount",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000016"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 16,
+                            ItemText = "Explained security deposit and move-in costs",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000017"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 17,
+                            ItemText = "Reviewed lease term length and start date",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000018"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 18,
+                            ItemText = "Explained pet policy",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000019"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 19,
+                            ItemText = "Explained application process and requirements",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000020"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 20,
+                            ItemText = "Reviewed screening process (background, credit check)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000021"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 21,
+                            ItemText = "Answered all prospect questions",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000022"),
+                            AllowsNotes = true,
+                            CategorySection = "Assessment",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 22,
+                            ItemText = "Prospect Interest Level",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = true,
+                            SectionOrder = 8
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000023"),
+                            AllowsNotes = true,
+                            CategorySection = "Assessment",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 23,
+                            ItemText = "Overall showing feedback and notes",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 8
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000024"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Document property condition",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000025"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Collect keys and access codes",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000026"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Review lease terms with tenant",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000027"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Inspect property condition",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000028"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Collect all keys and access devices",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000029"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Document damages and needed repairs",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000030"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Set up signage and directional markers",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000031"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Prepare information packets",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000032"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Set up visitor sign-in sheet",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        });
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocumentType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("FileData")
+                        .IsRequired()
+                        .HasColumnType("BLOB");
+
+                    b.Property<string>("FileExtension")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FilePath")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FileType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("InvoiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PaymentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvoiceId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PaymentId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Inspection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionItemsRequired")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomSinkGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomSinkNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomToiletGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomToiletNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomTubShowerGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomTubShowerNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomVentilationGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomVentilationNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("CarbonMonoxideDetectorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CarbonMonoxideDetectorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ElectricalSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ElectricalSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorDoorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorDoorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorFoundationGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorFoundationNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorGuttersGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorGuttersNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorRoofGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorRoofNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorSidingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorSidingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorWindowsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorWindowsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GeneralNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("HvacSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("HvacSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InspectedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InspectionType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorCeilingsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorCeilingsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorDoorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorDoorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorFloorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorFloorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorWallsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorWallsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorWindowsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorWindowsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("KitchenAppliancesGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenAppliancesNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenCabinetsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenCabinetsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenCountersGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenCountersNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenSinkPlumbingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenSinkPlumbingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("LandscapingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LandscapingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OverallCondition")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("PlumbingSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("PlumbingSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SmokeDetectorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SmokeDetectorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.ToTable("Inspections");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("AmountPaid")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DueOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("InvoicedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("LateFeeAmount")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool?>("LateFeeApplied")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LateFeeAppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("ReminderSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ReminderSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("InvoiceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Invoices");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ActualMoveOutDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DeclinedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ExpectedMoveOutDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseOfferId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("OfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PreviousLeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("ProposedRenewalRent")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("RenewalNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("RenewalNotificationSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("RenewalNotificationSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RenewalNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("RenewalOfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RenewalReminderSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RenewalResponseOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RenewalStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("SecurityDeposit")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("SignedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("TerminationNoticedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TerminationReason")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Terms")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Leases");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.LeaseOffer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ConvertedLeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("OfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RespondedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResponseNotes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("SecurityDeposit")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Terms")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("RentalApplicationId");
+
+                    b.ToTable("LeaseOffers");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ActualCost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("AssignedTo")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("EstimatedCost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedBy")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedByEmail")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedByPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("RequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResolutionNotes")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ScheduledOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("Priority");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("RequestedOn");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("MaintenanceRequests");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Note", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Content")
+                        .IsRequired()
+                        .HasMaxLength(5000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserFullName")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Notes");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.NotificationPreferences", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<TimeSpan>("DailyDigestTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmailAddress")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EmailApplicationStatusChange")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailInspectionScheduled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailLeaseExpiring")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailMaintenanceUpdate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailPaymentDue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailPaymentReceived")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableDailyDigest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableEmailNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableInAppNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableSMSNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableWeeklyDigest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SMSLeaseExpiringUrgent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SMSMaintenanceEmergency")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SMSPaymentDue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("WeeklyDigestDay")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("UserId", "OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("NotificationPreferences");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Organization", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OwnerId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("State")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsActive");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("Organizations");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationEmailSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DailyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("DailyLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EmailsSentThisMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EmailsSentToday")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableSsl")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FromEmail")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FromName")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsEmailEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVerified")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastEmailSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastError")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastErrorOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastVerifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("MonthlyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("MonthlyLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PlanType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SendGridApiKeyEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SmtpPort")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SmtpServer")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("StatsLastUpdatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationEmailSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSMSSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("AccountBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AccountType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("CostPerSMS")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DailyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSMSEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVerified")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastError")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastSMSSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastVerifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("MonthlyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderName")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SMSSentThisMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SMSSentToday")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("StatsLastUpdatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioAccountSidEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioAuthTokenEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioPhoneNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationSMSSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AllowTenantDividendChoice")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ApplicationExpirationDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ApplicationFeeEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("AutoCalculateSecurityDeposit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DefaultApplicationFee")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultDividendPaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DividendDistributionMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("LateFeeAutoApply")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("LateFeeEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("LateFeeGracePeriodDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("LateFeePercentage")
+                        .HasPrecision(5, 4)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MaxLateFeeAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OrganizationId")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("OrganizationSharePercentage")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<int>("PaymentReminderDaysBefore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("PaymentReminderEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RefundProcessingDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SecurityDepositInvestmentEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("SecurityDepositMultiplier")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<int>("TourNoShowGracePeriodHours")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GrantedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("GrantedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RevokedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Role")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsActive");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Role");
+
+                    b.HasIndex("UserId", "OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationUsers");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Payment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("InvoiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("PaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("InvoiceId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Payments");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Bathrooms")
+                        .HasMaxLength(3)
+                        .HasColumnType("decimal(3,1)");
+
+                    b.Property<int>("Bedrooms")
+                        .HasMaxLength(3)
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("City")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAvailable")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastRoutineInspectionDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("NextRoutineInspectionDueDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PropertyType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RoutineInspectionIntervalMonths")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SquareFeet")
+                        .HasMaxLength(7)
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("State")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UnitNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ZipCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Properties");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateOfBirth")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DesiredMoveInDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("FirstContactedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationNumber")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationState")
+                        .HasMaxLength(2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("InterestedPropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Phone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Source")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("InterestedPropertyId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("ProspectiveTenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ApplicationFee")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("ApplicationFeePaid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ApplicationFeePaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ApplicationFeePaymentMethod")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("AppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentAddress")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentCity")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("CurrentRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CurrentState")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentZipCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DecidedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DecisionBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DenialReason")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmployerName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("EmploymentLengthMonths")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("JobTitle")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LandlordName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LandlordPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyIncome")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Phone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Relationship")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Phone")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Relationship")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AppliedOn");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("RentalApplications");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Repair", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CompletedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ContactId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContractorName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContractorPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Cost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("MaintenanceRequestId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PartsReplaced")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RepairType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("WarrantyApplies")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("WarrantyExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("MaintenanceRequestId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("RepairType");
+
+                    b.ToTable("Repairs");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SchemaVersion", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SchemaVersions");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateReceived")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("DeductionsAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("DeductionsReason")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InInvestmentPool")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PoolEntryDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PoolExitDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("RefundAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("RefundMethod")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RefundProcessedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RefundReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TransactionReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InInvestmentPool");
+
+                    b.HasIndex("LeaseId")
+                        .IsUnique();
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("SecurityDeposits");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositDividend", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("BaseDividendAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("ChoiceMadeOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DividendAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<Guid>("InvestmentPoolId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MailingAddress")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("MonthsInPool")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PaymentProcessedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ProrationFactor")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<Guid>("SecurityDepositId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvestmentPoolId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("SecurityDepositId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("Year");
+
+                    b.ToTable("SecurityDepositDividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositInvestmentPool", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ActiveLeaseCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DividendPerLease")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("DividendsCalculatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DividendsDistributedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("EndingBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("OrganizationShare")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("OrganizationSharePercentage")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<decimal>("ReturnRate")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<decimal>("StartingBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("TenantShareTotal")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("TotalEarnings")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("Year")
+                        .IsUnique();
+
+                    b.ToTable("SecurityDepositInvestmentPools");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateOfBirth")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmergencyContactName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmergencyContactPhone")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationNumber")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email")
+                        .IsUnique();
+
+                    b.HasIndex("IdentificationNumber")
+                        .IsUnique();
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Tenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tour", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ChecklistId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ConductedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Feedback")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InterestLevel")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ScheduledOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("ScheduledOn");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("Tours");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.UserProfile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ActiveOrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActiveOrganizationId");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("IsDeleted");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("UserProfiles");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.WorkflowAuditLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Action")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FromStatus")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Metadata")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PerformedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("PerformedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reason")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ToStatus")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Action");
+
+                    b.HasIndex("EntityId");
+
+                    b.HasIndex("EntityType");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PerformedBy");
+
+                    b.HasIndex("PerformedOn");
+
+                    b.HasIndex("EntityType", "EntityId");
+
+                    b.ToTable("WorkflowAuditLogs");
+                });
+
+            modelBuilder.Entity("Notification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Category")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmailError")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EmailSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EmailSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ReadOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RecipientUserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("RelatedEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RelatedEntityType")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SMSError")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SMSSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("SMSSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SendEmail")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SendInApp")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SendSMS")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("SentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Category");
+
+                    b.HasIndex("IsRead");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("RecipientUserId");
+
+                    b.HasIndex("SentOn");
+
+                    b.ToTable("Notifications");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ApplicationScreening", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.RentalApplication", "RentalApplication")
+                        .WithOne("Screening")
+                        .HasForeignKey("Aquiis.Core.Entities.ApplicationScreening", "RentalApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("RentalApplication");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarEvent", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.ChecklistTemplate", "ChecklistTemplate")
+                        .WithMany("Checklists")
+                        .HasForeignKey("ChecklistTemplateId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("ChecklistTemplate");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistItem", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Checklist", "Checklist")
+                        .WithMany("Items")
+                        .HasForeignKey("ChecklistId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Checklist");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplateItem", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.ChecklistTemplate", "ChecklistTemplate")
+                        .WithMany("Items")
+                        .HasForeignKey("ChecklistTemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ChecklistTemplate");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Document", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Invoice", "Invoice")
+                        .WithMany()
+                        .HasForeignKey("InvoiceId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany("Documents")
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Payment", "Payment")
+                        .WithMany()
+                        .HasForeignKey("PaymentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("Documents")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Invoice");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Payment");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Inspection", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany("Invoices")
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Leases")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("Leases")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany("Leases")
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.LeaseOffer", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany()
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.RentalApplication", "RentalApplication")
+                        .WithMany()
+                        .HasForeignKey("RentalApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+
+                    b.Navigation("RentalApplication");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.NotificationPreferences", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationEmailSettings", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSMSSettings", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany("OrganizationUsers")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Payment", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Invoice", "Invoice")
+                        .WithMany("Payments")
+                        .HasForeignKey("InvoiceId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Invoice");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Properties")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "InterestedProperty")
+                        .WithMany()
+                        .HasForeignKey("InterestedPropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("InterestedProperty");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany("Applications")
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Repair", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.MaintenanceRequest", "MaintenanceRequest")
+                        .WithMany("Repairs")
+                        .HasForeignKey("MaintenanceRequestId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("MaintenanceRequest");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositDividend", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.SecurityDepositInvestmentPool", "InvestmentPool")
+                        .WithMany("Dividends")
+                        .HasForeignKey("InvestmentPoolId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.SecurityDeposit", "SecurityDeposit")
+                        .WithMany("Dividends")
+                        .HasForeignKey("SecurityDepositId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("InvestmentPool");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("SecurityDeposit");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Tenants")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tour", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Checklist", "Checklist")
+                        .WithMany()
+                        .HasForeignKey("ChecklistId");
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany("Tours")
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Checklist");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+                });
+
+            modelBuilder.Entity("Notification", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.Navigation("Items");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplate", b =>
+                {
+                    b.Navigation("Checklists");
+
+                    b.Navigation("Items");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.Navigation("Payments");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.Navigation("Documents");
+
+                    b.Navigation("Invoices");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.Navigation("Repairs");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Organization", b =>
+                {
+                    b.Navigation("Leases");
+
+                    b.Navigation("OrganizationUsers");
+
+                    b.Navigation("Properties");
+
+                    b.Navigation("Tenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.Navigation("Documents");
+
+                    b.Navigation("Leases");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.Navigation("Applications");
+
+                    b.Navigation("Tours");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.Navigation("Screening");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.Navigation("Dividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositInvestmentPool", b =>
+                {
+                    b.Navigation("Dividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.Navigation("Leases");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/1-Aquiis.Infrastructure/Data/Migrations/20260122142531_AddRepairEntity.cs b/1-Aquiis.Infrastructure/Data/Migrations/20260122142531_AddRepairEntity.cs
new file mode 100644
index 0000000..d353785
--- /dev/null
+++ b/1-Aquiis.Infrastructure/Data/Migrations/20260122142531_AddRepairEntity.cs
@@ -0,0 +1,103 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Aquiis.Infrastructure.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddRepairEntity : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Repairs",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    PropertyId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    MaintenanceRequestId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    LeaseId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    Description = table.Column<string>(type: "TEXT", maxLength: 200, nullable: false),
+                    RepairType = table.Column<string>(type: "TEXT", maxLength: 50, nullable: false),
+                    CompletedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    Cost = table.Column<decimal>(type: "decimal(18,2)", precision: 18, scale: 2, nullable: false),
+                    DurationMinutes = table.Column<int>(type: "INTEGER", nullable: false),
+                    CompletedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    ContractorName = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    ContractorPhone = table.Column<string>(type: "TEXT", maxLength: 20, nullable: false),
+                    ContactId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    Notes = table.Column<string>(type: "TEXT", maxLength: 2000, nullable: false),
+                    PartsReplaced = table.Column<string>(type: "TEXT", maxLength: 500, nullable: false),
+                    WarrantyApplies = table.Column<bool>(type: "INTEGER", nullable: false),
+                    WarrantyExpiresOn = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
+                    CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    LastModifiedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    LastModifiedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: true),
+                    IsDeleted = table.Column<bool>(type: "INTEGER", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Repairs", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Repairs_Leases_LeaseId",
+                        column: x => x.LeaseId,
+                        principalTable: "Leases",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.SetNull);
+                    table.ForeignKey(
+                        name: "FK_Repairs_MaintenanceRequests_MaintenanceRequestId",
+                        column: x => x.MaintenanceRequestId,
+                        principalTable: "MaintenanceRequests",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.SetNull);
+                    table.ForeignKey(
+                        name: "FK_Repairs_Properties_PropertyId",
+                        column: x => x.PropertyId,
+                        principalTable: "Properties",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Repairs_CompletedOn",
+                table: "Repairs",
+                column: "CompletedOn");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Repairs_LeaseId",
+                table: "Repairs",
+                column: "LeaseId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Repairs_MaintenanceRequestId",
+                table: "Repairs",
+                column: "MaintenanceRequestId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Repairs_OrganizationId",
+                table: "Repairs",
+                column: "OrganizationId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Repairs_PropertyId",
+                table: "Repairs",
+                column: "PropertyId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Repairs_RepairType",
+                table: "Repairs",
+                column: "RepairType");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Repairs");
+        }
+    }
+}
diff --git a/1-Aquiis.Infrastructure/Data/Migrations/20260122152750_RenameCompletedByToContactPersonAndAddContractorId.Designer.cs b/1-Aquiis.Infrastructure/Data/Migrations/20260122152750_RenameCompletedByToContactPersonAndAddContractorId.Designer.cs
new file mode 100644
index 0000000..9c64e1d
--- /dev/null
+++ b/1-Aquiis.Infrastructure/Data/Migrations/20260122152750_RenameCompletedByToContactPersonAndAddContractorId.Designer.cs
@@ -0,0 +1,4241 @@
+// <auto-generated />
+using System;
+using Aquiis.Infrastructure.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Aquiis.Infrastructure.Data.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20260122152750_RenameCompletedByToContactPersonAndAddContractorId")]
+    partial class RenameCompletedByToContactPersonAndAddContractorId
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.1");
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ApplicationScreening", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("BackgroundCheckCompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("BackgroundCheckNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("BackgroundCheckPassed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("BackgroundCheckRequested")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("BackgroundCheckRequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreditCheckCompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreditCheckNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("CreditCheckPassed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("CreditCheckRequested")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("CreditCheckRequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("CreditScore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OverallResult")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResultNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("OverallResult");
+
+                    b.HasIndex("RentalApplicationId")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationScreenings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarEvent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Color")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EndOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EventType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Icon")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Location")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SourceEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SourceEntityType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EventType");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("SourceEntityId");
+
+                    b.HasIndex("StartOn");
+
+                    b.HasIndex("SourceEntityType", "SourceEntityId");
+
+                    b.ToTable("CalendarEvents");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AutoCreateEvents")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultColor")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultIcon")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DisplayOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ShowOnCalendar")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("OrganizationId", "EntityType")
+                        .IsUnique();
+
+                    b.ToTable("CalendarSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ChecklistType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CompletedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GeneralNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistTemplateId");
+
+                    b.HasIndex("ChecklistType");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("Checklists");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CategorySection")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ItemOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ItemText")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhotoUrl")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RequiresValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SectionOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistId");
+
+                    b.ToTable("ChecklistItems");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Category")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSystemTemplate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Category");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("ChecklistTemplates");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000001"),
+                            Category = "Tour",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Standard property showing checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Property Tour",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000002"),
+                            Category = "MoveIn",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Move-in inspection checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Move-In",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000003"),
+                            Category = "MoveOut",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Move-out inspection checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Move-Out",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000004"),
+                            Category = "Tour",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Open house event checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Open House",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        });
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplateItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AllowsNotes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CategorySection")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRequired")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ItemOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ItemText")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RequiresValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SectionOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistTemplateId");
+
+                    b.ToTable("ChecklistTemplateItems");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000001"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Greeted prospect and verified appointment",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000002"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Reviewed property exterior and curb appeal",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000003"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Showed parking area/garage",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000004"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 4,
+                            ItemText = "Toured living room/common areas",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000005"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 5,
+                            ItemText = "Showed all bedrooms",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000006"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 6,
+                            ItemText = "Showed all bathrooms",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000007"),
+                            AllowsNotes = true,
+                            CategorySection = "Kitchen & Appliances",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 7,
+                            ItemText = "Toured kitchen and demonstrated appliances",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 3
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000008"),
+                            AllowsNotes = true,
+                            CategorySection = "Kitchen & Appliances",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 8,
+                            ItemText = "Explained which appliances are included",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 3
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000009"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 9,
+                            ItemText = "Explained HVAC system and thermostat controls",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000010"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 10,
+                            ItemText = "Reviewed utility responsibilities (tenant vs landlord)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000011"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 11,
+                            ItemText = "Showed water heater location",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000012"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 12,
+                            ItemText = "Showed storage areas (closets, attic, basement)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000013"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 13,
+                            ItemText = "Showed laundry facilities",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000014"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 14,
+                            ItemText = "Showed outdoor space (yard, patio, balcony)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000015"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 15,
+                            ItemText = "Discussed monthly rent amount",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000016"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 16,
+                            ItemText = "Explained security deposit and move-in costs",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000017"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 17,
+                            ItemText = "Reviewed lease term length and start date",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000018"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 18,
+                            ItemText = "Explained pet policy",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000019"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 19,
+                            ItemText = "Explained application process and requirements",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000020"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 20,
+                            ItemText = "Reviewed screening process (background, credit check)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000021"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 21,
+                            ItemText = "Answered all prospect questions",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000022"),
+                            AllowsNotes = true,
+                            CategorySection = "Assessment",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 22,
+                            ItemText = "Prospect Interest Level",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = true,
+                            SectionOrder = 8
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000023"),
+                            AllowsNotes = true,
+                            CategorySection = "Assessment",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 23,
+                            ItemText = "Overall showing feedback and notes",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 8
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000024"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Document property condition",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000025"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Collect keys and access codes",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000026"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Review lease terms with tenant",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000027"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Inspect property condition",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000028"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Collect all keys and access devices",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000029"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Document damages and needed repairs",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000030"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Set up signage and directional markers",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000031"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Prepare information packets",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000032"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Set up visitor sign-in sheet",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        });
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocumentType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("FileData")
+                        .IsRequired()
+                        .HasColumnType("BLOB");
+
+                    b.Property<string>("FileExtension")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FilePath")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FileType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("InvoiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PaymentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvoiceId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PaymentId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Inspection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionItemsRequired")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomSinkGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomSinkNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomToiletGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomToiletNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomTubShowerGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomTubShowerNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomVentilationGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomVentilationNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("CarbonMonoxideDetectorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CarbonMonoxideDetectorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ElectricalSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ElectricalSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorDoorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorDoorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorFoundationGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorFoundationNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorGuttersGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorGuttersNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorRoofGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorRoofNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorSidingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorSidingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorWindowsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorWindowsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GeneralNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("HvacSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("HvacSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InspectedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InspectionType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorCeilingsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorCeilingsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorDoorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorDoorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorFloorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorFloorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorWallsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorWallsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorWindowsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorWindowsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("KitchenAppliancesGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenAppliancesNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenCabinetsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenCabinetsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenCountersGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenCountersNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenSinkPlumbingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenSinkPlumbingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("LandscapingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LandscapingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OverallCondition")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("PlumbingSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("PlumbingSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SmokeDetectorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SmokeDetectorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.ToTable("Inspections");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("AmountPaid")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DueOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("InvoicedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("LateFeeAmount")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool?>("LateFeeApplied")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LateFeeAppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("ReminderSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ReminderSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("InvoiceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Invoices");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ActualMoveOutDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DeclinedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ExpectedMoveOutDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseOfferId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("OfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PreviousLeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("ProposedRenewalRent")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("RenewalNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("RenewalNotificationSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("RenewalNotificationSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RenewalNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("RenewalOfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RenewalReminderSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RenewalResponseOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RenewalStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("SecurityDeposit")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("SignedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("TerminationNoticedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TerminationReason")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Terms")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Leases");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.LeaseOffer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ConvertedLeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("OfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RespondedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResponseNotes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("SecurityDeposit")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Terms")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("RentalApplicationId");
+
+                    b.ToTable("LeaseOffers");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ActualCost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("AssignedTo")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("EstimatedCost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedBy")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedByEmail")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedByPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("RequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResolutionNotes")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ScheduledOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("Priority");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("RequestedOn");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("MaintenanceRequests");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Note", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Content")
+                        .IsRequired()
+                        .HasMaxLength(5000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserFullName")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Notes");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.NotificationPreferences", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<TimeSpan>("DailyDigestTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmailAddress")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EmailApplicationStatusChange")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailInspectionScheduled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailLeaseExpiring")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailMaintenanceUpdate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailPaymentDue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailPaymentReceived")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableDailyDigest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableEmailNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableInAppNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableSMSNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableWeeklyDigest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SMSLeaseExpiringUrgent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SMSMaintenanceEmergency")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SMSPaymentDue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("WeeklyDigestDay")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("UserId", "OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("NotificationPreferences");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Organization", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OwnerId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("State")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsActive");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("Organizations");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationEmailSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DailyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("DailyLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EmailsSentThisMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EmailsSentToday")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableSsl")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FromEmail")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FromName")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsEmailEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVerified")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastEmailSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastError")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastErrorOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastVerifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("MonthlyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("MonthlyLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PlanType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SendGridApiKeyEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SmtpPort")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SmtpServer")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("StatsLastUpdatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationEmailSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSMSSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("AccountBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AccountType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("CostPerSMS")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DailyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSMSEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVerified")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastError")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastSMSSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastVerifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("MonthlyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderName")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SMSSentThisMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SMSSentToday")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("StatsLastUpdatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioAccountSidEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioAuthTokenEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioPhoneNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationSMSSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AllowTenantDividendChoice")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ApplicationExpirationDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ApplicationFeeEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("AutoCalculateSecurityDeposit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DefaultApplicationFee")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultDividendPaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DividendDistributionMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("LateFeeAutoApply")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("LateFeeEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("LateFeeGracePeriodDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("LateFeePercentage")
+                        .HasPrecision(5, 4)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MaxLateFeeAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OrganizationId")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("OrganizationSharePercentage")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<int>("PaymentReminderDaysBefore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("PaymentReminderEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RefundProcessingDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SecurityDepositInvestmentEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("SecurityDepositMultiplier")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<int>("TourNoShowGracePeriodHours")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GrantedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("GrantedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RevokedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Role")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsActive");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Role");
+
+                    b.HasIndex("UserId", "OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationUsers");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Payment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("InvoiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("PaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("InvoiceId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Payments");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Bathrooms")
+                        .HasMaxLength(3)
+                        .HasColumnType("decimal(3,1)");
+
+                    b.Property<int>("Bedrooms")
+                        .HasMaxLength(3)
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("City")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAvailable")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastRoutineInspectionDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("NextRoutineInspectionDueDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PropertyType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RoutineInspectionIntervalMonths")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SquareFeet")
+                        .HasMaxLength(7)
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("State")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UnitNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ZipCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Properties");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateOfBirth")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DesiredMoveInDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("FirstContactedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationNumber")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationState")
+                        .HasMaxLength(2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("InterestedPropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Phone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Source")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("InterestedPropertyId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("ProspectiveTenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ApplicationFee")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("ApplicationFeePaid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ApplicationFeePaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ApplicationFeePaymentMethod")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("AppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentAddress")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentCity")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("CurrentRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CurrentState")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentZipCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DecidedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DecisionBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DenialReason")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmployerName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("EmploymentLengthMonths")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("JobTitle")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LandlordName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LandlordPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyIncome")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Phone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Relationship")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Phone")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Relationship")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AppliedOn");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("RentalApplications");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Repair", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ContactId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContactPerson")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ContractorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContractorName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContractorPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Cost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("MaintenanceRequestId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PartsReplaced")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RepairType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("WarrantyApplies")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("WarrantyExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("MaintenanceRequestId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("RepairType");
+
+                    b.ToTable("Repairs");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SchemaVersion", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SchemaVersions");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateReceived")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("DeductionsAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("DeductionsReason")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InInvestmentPool")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PoolEntryDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PoolExitDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("RefundAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("RefundMethod")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RefundProcessedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RefundReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TransactionReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InInvestmentPool");
+
+                    b.HasIndex("LeaseId")
+                        .IsUnique();
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("SecurityDeposits");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositDividend", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("BaseDividendAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("ChoiceMadeOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DividendAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<Guid>("InvestmentPoolId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MailingAddress")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("MonthsInPool")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PaymentProcessedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ProrationFactor")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<Guid>("SecurityDepositId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvestmentPoolId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("SecurityDepositId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("Year");
+
+                    b.ToTable("SecurityDepositDividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositInvestmentPool", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ActiveLeaseCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DividendPerLease")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("DividendsCalculatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DividendsDistributedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("EndingBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("OrganizationShare")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("OrganizationSharePercentage")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<decimal>("ReturnRate")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<decimal>("StartingBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("TenantShareTotal")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("TotalEarnings")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("Year")
+                        .IsUnique();
+
+                    b.ToTable("SecurityDepositInvestmentPools");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateOfBirth")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmergencyContactName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmergencyContactPhone")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationNumber")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email")
+                        .IsUnique();
+
+                    b.HasIndex("IdentificationNumber")
+                        .IsUnique();
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Tenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tour", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ChecklistId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ConductedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Feedback")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InterestLevel")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ScheduledOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("ScheduledOn");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("Tours");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.UserProfile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ActiveOrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActiveOrganizationId");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("IsDeleted");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("UserProfiles");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.WorkflowAuditLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Action")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FromStatus")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Metadata")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PerformedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("PerformedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reason")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ToStatus")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Action");
+
+                    b.HasIndex("EntityId");
+
+                    b.HasIndex("EntityType");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PerformedBy");
+
+                    b.HasIndex("PerformedOn");
+
+                    b.HasIndex("EntityType", "EntityId");
+
+                    b.ToTable("WorkflowAuditLogs");
+                });
+
+            modelBuilder.Entity("Notification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Category")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmailError")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EmailSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EmailSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ReadOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RecipientUserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("RelatedEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RelatedEntityType")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SMSError")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SMSSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("SMSSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SendEmail")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SendInApp")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SendSMS")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("SentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Category");
+
+                    b.HasIndex("IsRead");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("RecipientUserId");
+
+                    b.HasIndex("SentOn");
+
+                    b.ToTable("Notifications");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ApplicationScreening", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.RentalApplication", "RentalApplication")
+                        .WithOne("Screening")
+                        .HasForeignKey("Aquiis.Core.Entities.ApplicationScreening", "RentalApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("RentalApplication");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarEvent", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.ChecklistTemplate", "ChecklistTemplate")
+                        .WithMany("Checklists")
+                        .HasForeignKey("ChecklistTemplateId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("ChecklistTemplate");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistItem", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Checklist", "Checklist")
+                        .WithMany("Items")
+                        .HasForeignKey("ChecklistId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Checklist");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplateItem", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.ChecklistTemplate", "ChecklistTemplate")
+                        .WithMany("Items")
+                        .HasForeignKey("ChecklistTemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ChecklistTemplate");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Document", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Invoice", "Invoice")
+                        .WithMany()
+                        .HasForeignKey("InvoiceId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany("Documents")
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Payment", "Payment")
+                        .WithMany()
+                        .HasForeignKey("PaymentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("Documents")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Invoice");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Payment");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Inspection", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany("Invoices")
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Leases")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("Leases")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany("Leases")
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.LeaseOffer", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany()
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.RentalApplication", "RentalApplication")
+                        .WithMany()
+                        .HasForeignKey("RentalApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+
+                    b.Navigation("RentalApplication");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.NotificationPreferences", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationEmailSettings", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSMSSettings", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany("OrganizationUsers")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Payment", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Invoice", "Invoice")
+                        .WithMany("Payments")
+                        .HasForeignKey("InvoiceId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Invoice");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Properties")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "InterestedProperty")
+                        .WithMany()
+                        .HasForeignKey("InterestedPropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("InterestedProperty");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany("Applications")
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Repair", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.MaintenanceRequest", "MaintenanceRequest")
+                        .WithMany("Repairs")
+                        .HasForeignKey("MaintenanceRequestId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("MaintenanceRequest");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositDividend", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.SecurityDepositInvestmentPool", "InvestmentPool")
+                        .WithMany("Dividends")
+                        .HasForeignKey("InvestmentPoolId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.SecurityDeposit", "SecurityDeposit")
+                        .WithMany("Dividends")
+                        .HasForeignKey("SecurityDepositId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("InvestmentPool");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("SecurityDeposit");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Tenants")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tour", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Checklist", "Checklist")
+                        .WithMany()
+                        .HasForeignKey("ChecklistId");
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany("Tours")
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Checklist");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+                });
+
+            modelBuilder.Entity("Notification", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.Navigation("Items");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplate", b =>
+                {
+                    b.Navigation("Checklists");
+
+                    b.Navigation("Items");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.Navigation("Payments");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.Navigation("Documents");
+
+                    b.Navigation("Invoices");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.Navigation("Repairs");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Organization", b =>
+                {
+                    b.Navigation("Leases");
+
+                    b.Navigation("OrganizationUsers");
+
+                    b.Navigation("Properties");
+
+                    b.Navigation("Tenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.Navigation("Documents");
+
+                    b.Navigation("Leases");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.Navigation("Applications");
+
+                    b.Navigation("Tours");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.Navigation("Screening");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.Navigation("Dividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositInvestmentPool", b =>
+                {
+                    b.Navigation("Dividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.Navigation("Leases");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/1-Aquiis.Infrastructure/Data/Migrations/20260122152750_RenameCompletedByToContactPersonAndAddContractorId.cs b/1-Aquiis.Infrastructure/Data/Migrations/20260122152750_RenameCompletedByToContactPersonAndAddContractorId.cs
new file mode 100644
index 0000000..5a7a776
--- /dev/null
+++ b/1-Aquiis.Infrastructure/Data/Migrations/20260122152750_RenameCompletedByToContactPersonAndAddContractorId.cs
@@ -0,0 +1,39 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Aquiis.Infrastructure.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class RenameCompletedByToContactPersonAndAddContractorId : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "CompletedBy",
+                table: "Repairs",
+                newName: "ContactPerson");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ContractorId",
+                table: "Repairs",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ContractorId",
+                table: "Repairs");
+
+            migrationBuilder.RenameColumn(
+                name: "ContactPerson",
+                table: "Repairs",
+                newName: "CompletedBy");
+        }
+    }
+}
diff --git a/1-Aquiis.Infrastructure/Data/Migrations/20260127184357_AddTestEntityAndPropertyTestField.Designer.cs b/1-Aquiis.Infrastructure/Data/Migrations/20260127184357_AddTestEntityAndPropertyTestField.Designer.cs
new file mode 100644
index 0000000..afd2770
--- /dev/null
+++ b/1-Aquiis.Infrastructure/Data/Migrations/20260127184357_AddTestEntityAndPropertyTestField.Designer.cs
@@ -0,0 +1,4314 @@
+// <auto-generated />
+using System;
+using Aquiis.Infrastructure.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Aquiis.Infrastructure.Data.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20260127184357_AddTestEntityAndPropertyTestField")]
+    partial class AddTestEntityAndPropertyTestField
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.1");
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ApplicationScreening", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("BackgroundCheckCompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("BackgroundCheckNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("BackgroundCheckPassed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("BackgroundCheckRequested")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("BackgroundCheckRequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreditCheckCompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreditCheckNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("CreditCheckPassed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("CreditCheckRequested")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("CreditCheckRequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("CreditScore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OverallResult")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResultNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("OverallResult");
+
+                    b.HasIndex("RentalApplicationId")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationScreenings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarEvent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Color")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EndOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EventType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Icon")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Location")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SourceEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SourceEntityType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EventType");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("SourceEntityId");
+
+                    b.HasIndex("StartOn");
+
+                    b.HasIndex("SourceEntityType", "SourceEntityId");
+
+                    b.ToTable("CalendarEvents");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AutoCreateEvents")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultColor")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultIcon")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DisplayOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ShowOnCalendar")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("OrganizationId", "EntityType")
+                        .IsUnique();
+
+                    b.ToTable("CalendarSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ChecklistType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CompletedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GeneralNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistTemplateId");
+
+                    b.HasIndex("ChecklistType");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("Checklists");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CategorySection")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ItemOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ItemText")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhotoUrl")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RequiresValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SectionOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistId");
+
+                    b.ToTable("ChecklistItems");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Category")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSystemTemplate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Category");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("ChecklistTemplates");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000001"),
+                            Category = "Tour",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Standard property showing checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Property Tour",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000002"),
+                            Category = "MoveIn",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Move-in inspection checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Move-In",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000003"),
+                            Category = "MoveOut",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Move-out inspection checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Move-Out",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000004"),
+                            Category = "Tour",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Open house event checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Open House",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        });
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplateItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AllowsNotes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CategorySection")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRequired")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ItemOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ItemText")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RequiresValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SectionOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistTemplateId");
+
+                    b.ToTable("ChecklistTemplateItems");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000001"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Greeted prospect and verified appointment",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000002"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Reviewed property exterior and curb appeal",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000003"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Showed parking area/garage",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000004"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 4,
+                            ItemText = "Toured living room/common areas",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000005"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 5,
+                            ItemText = "Showed all bedrooms",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000006"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 6,
+                            ItemText = "Showed all bathrooms",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000007"),
+                            AllowsNotes = true,
+                            CategorySection = "Kitchen & Appliances",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 7,
+                            ItemText = "Toured kitchen and demonstrated appliances",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 3
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000008"),
+                            AllowsNotes = true,
+                            CategorySection = "Kitchen & Appliances",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 8,
+                            ItemText = "Explained which appliances are included",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 3
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000009"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 9,
+                            ItemText = "Explained HVAC system and thermostat controls",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000010"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 10,
+                            ItemText = "Reviewed utility responsibilities (tenant vs landlord)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000011"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 11,
+                            ItemText = "Showed water heater location",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000012"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 12,
+                            ItemText = "Showed storage areas (closets, attic, basement)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000013"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 13,
+                            ItemText = "Showed laundry facilities",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000014"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 14,
+                            ItemText = "Showed outdoor space (yard, patio, balcony)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000015"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 15,
+                            ItemText = "Discussed monthly rent amount",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000016"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 16,
+                            ItemText = "Explained security deposit and move-in costs",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000017"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 17,
+                            ItemText = "Reviewed lease term length and start date",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000018"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 18,
+                            ItemText = "Explained pet policy",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000019"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 19,
+                            ItemText = "Explained application process and requirements",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000020"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 20,
+                            ItemText = "Reviewed screening process (background, credit check)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000021"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 21,
+                            ItemText = "Answered all prospect questions",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000022"),
+                            AllowsNotes = true,
+                            CategorySection = "Assessment",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 22,
+                            ItemText = "Prospect Interest Level",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = true,
+                            SectionOrder = 8
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000023"),
+                            AllowsNotes = true,
+                            CategorySection = "Assessment",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 23,
+                            ItemText = "Overall showing feedback and notes",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 8
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000024"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Document property condition",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000025"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Collect keys and access codes",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000026"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Review lease terms with tenant",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000027"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Inspect property condition",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000028"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Collect all keys and access devices",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000029"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Document damages and needed repairs",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000030"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Set up signage and directional markers",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000031"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Prepare information packets",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000032"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Set up visitor sign-in sheet",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        });
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocumentType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("FileData")
+                        .IsRequired()
+                        .HasColumnType("BLOB");
+
+                    b.Property<string>("FileExtension")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FilePath")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FileType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("InvoiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PaymentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvoiceId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PaymentId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Inspection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionItemsRequired")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomSinkGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomSinkNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomToiletGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomToiletNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomTubShowerGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomTubShowerNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomVentilationGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomVentilationNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("CarbonMonoxideDetectorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CarbonMonoxideDetectorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ElectricalSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ElectricalSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorDoorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorDoorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorFoundationGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorFoundationNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorGuttersGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorGuttersNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorRoofGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorRoofNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorSidingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorSidingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorWindowsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorWindowsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GeneralNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("HvacSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("HvacSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InspectedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InspectionType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorCeilingsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorCeilingsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorDoorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorDoorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorFloorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorFloorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorWallsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorWallsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorWindowsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorWindowsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("KitchenAppliancesGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenAppliancesNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenCabinetsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenCabinetsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenCountersGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenCountersNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenSinkPlumbingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenSinkPlumbingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("LandscapingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LandscapingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OverallCondition")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("PlumbingSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("PlumbingSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SmokeDetectorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SmokeDetectorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.ToTable("Inspections");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("AmountPaid")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DueOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("InvoicedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("LateFeeAmount")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool?>("LateFeeApplied")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LateFeeAppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("ReminderSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ReminderSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("InvoiceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Invoices");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ActualMoveOutDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DeclinedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ExpectedMoveOutDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseOfferId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("OfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PreviousLeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("ProposedRenewalRent")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("RenewalNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("RenewalNotificationSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("RenewalNotificationSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RenewalNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("RenewalOfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RenewalReminderSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RenewalResponseOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RenewalStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("SecurityDeposit")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("SignedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("TerminationNoticedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TerminationReason")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Terms")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Leases");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.LeaseOffer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ConvertedLeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("OfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RespondedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResponseNotes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("SecurityDeposit")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Terms")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("RentalApplicationId");
+
+                    b.ToTable("LeaseOffers");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ActualCost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("AssignedTo")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("EstimatedCost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedBy")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedByEmail")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedByPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("RequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResolutionNotes")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ScheduledOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("Priority");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("RequestedOn");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("MaintenanceRequests");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Note", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Content")
+                        .IsRequired()
+                        .HasMaxLength(5000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserFullName")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Notes");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.NotificationPreferences", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<TimeSpan>("DailyDigestTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmailAddress")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EmailApplicationStatusChange")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailInspectionScheduled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailLeaseExpiring")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailMaintenanceUpdate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailPaymentDue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailPaymentReceived")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableDailyDigest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableEmailNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableInAppNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableSMSNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableWeeklyDigest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SMSLeaseExpiringUrgent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SMSMaintenanceEmergency")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SMSPaymentDue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("WeeklyDigestDay")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("UserId", "OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("NotificationPreferences");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Organization", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OwnerId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("State")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsActive");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("Organizations");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationEmailSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DailyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("DailyLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EmailsSentThisMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EmailsSentToday")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableSsl")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FromEmail")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FromName")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsEmailEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVerified")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastEmailSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastError")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastErrorOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastVerifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("MonthlyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("MonthlyLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PlanType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SendGridApiKeyEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SmtpPort")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SmtpServer")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("StatsLastUpdatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationEmailSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSMSSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("AccountBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AccountType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("CostPerSMS")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DailyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSMSEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVerified")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastError")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastSMSSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastVerifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("MonthlyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderName")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SMSSentThisMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SMSSentToday")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("StatsLastUpdatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioAccountSidEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioAuthTokenEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioPhoneNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationSMSSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AllowTenantDividendChoice")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ApplicationExpirationDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ApplicationFeeEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("AutoCalculateSecurityDeposit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DefaultApplicationFee")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultDividendPaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DividendDistributionMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("LateFeeAutoApply")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("LateFeeEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("LateFeeGracePeriodDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("LateFeePercentage")
+                        .HasPrecision(5, 4)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MaxLateFeeAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OrganizationId")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("OrganizationSharePercentage")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<int>("PaymentReminderDaysBefore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("PaymentReminderEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RefundProcessingDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SecurityDepositInvestmentEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("SecurityDepositMultiplier")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<int>("TourNoShowGracePeriodHours")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GrantedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("GrantedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RevokedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Role")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsActive");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Role");
+
+                    b.HasIndex("UserId", "OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationUsers");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Payment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("InvoiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("PaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("InvoiceId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Payments");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Bathrooms")
+                        .HasMaxLength(3)
+                        .HasColumnType("decimal(3,1)");
+
+                    b.Property<int>("Bedrooms")
+                        .HasMaxLength(3)
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("City")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAvailable")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastRoutineInspectionDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("NextRoutineInspectionDueDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PropertyType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RoutineInspectionIntervalMonths")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SquareFeet")
+                        .HasMaxLength(7)
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("State")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TestField")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UnitNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ZipCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Properties");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateOfBirth")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DesiredMoveInDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("FirstContactedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationNumber")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationState")
+                        .HasMaxLength(2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("InterestedPropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Phone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Source")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("InterestedPropertyId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("ProspectiveTenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ApplicationFee")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("ApplicationFeePaid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ApplicationFeePaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ApplicationFeePaymentMethod")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("AppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentAddress")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentCity")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("CurrentRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CurrentState")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentZipCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DecidedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DecisionBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DenialReason")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmployerName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("EmploymentLengthMonths")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("JobTitle")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LandlordName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LandlordPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyIncome")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Phone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Relationship")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Phone")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Relationship")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AppliedOn");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("RentalApplications");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Repair", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ContactId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContactPerson")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ContractorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContractorName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContractorPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Cost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("MaintenanceRequestId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PartsReplaced")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RepairType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("WarrantyApplies")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("WarrantyExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("MaintenanceRequestId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("RepairType");
+
+                    b.ToTable("Repairs");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SchemaVersion", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SchemaVersions");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateReceived")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("DeductionsAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("DeductionsReason")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InInvestmentPool")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PoolEntryDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PoolExitDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("RefundAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("RefundMethod")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RefundProcessedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RefundReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TransactionReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InInvestmentPool");
+
+                    b.HasIndex("LeaseId")
+                        .IsUnique();
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("SecurityDeposits");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositDividend", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("BaseDividendAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("ChoiceMadeOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DividendAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<Guid>("InvestmentPoolId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MailingAddress")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("MonthsInPool")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PaymentProcessedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ProrationFactor")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<Guid>("SecurityDepositId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvestmentPoolId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("SecurityDepositId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("Year");
+
+                    b.ToTable("SecurityDepositDividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositInvestmentPool", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ActiveLeaseCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DividendPerLease")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("DividendsCalculatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DividendsDistributedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("EndingBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("OrganizationShare")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("OrganizationSharePercentage")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<decimal>("ReturnRate")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<decimal>("StartingBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("TenantShareTotal")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("TotalEarnings")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("Year")
+                        .IsUnique();
+
+                    b.ToTable("SecurityDepositInvestmentPools");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateOfBirth")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmergencyContactName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmergencyContactPhone")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationNumber")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email")
+                        .IsUnique();
+
+                    b.HasIndex("IdentificationNumber")
+                        .IsUnique();
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Tenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.TestEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("TestDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TestDescription")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("TestFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TestName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("TestNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsDeleted");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("TestName");
+
+                    b.ToTable("TestEntities");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tour", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ChecklistId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ConductedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Feedback")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InterestLevel")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ScheduledOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("ScheduledOn");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("Tours");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.UserProfile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ActiveOrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActiveOrganizationId");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("IsDeleted");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("UserProfiles");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.WorkflowAuditLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Action")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FromStatus")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Metadata")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PerformedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("PerformedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reason")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ToStatus")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Action");
+
+                    b.HasIndex("EntityId");
+
+                    b.HasIndex("EntityType");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PerformedBy");
+
+                    b.HasIndex("PerformedOn");
+
+                    b.HasIndex("EntityType", "EntityId");
+
+                    b.ToTable("WorkflowAuditLogs");
+                });
+
+            modelBuilder.Entity("Notification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Category")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmailError")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EmailSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EmailSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ReadOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RecipientUserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("RelatedEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RelatedEntityType")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SMSError")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SMSSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("SMSSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SendEmail")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SendInApp")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SendSMS")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("SentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Category");
+
+                    b.HasIndex("IsRead");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("RecipientUserId");
+
+                    b.HasIndex("SentOn");
+
+                    b.ToTable("Notifications");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ApplicationScreening", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.RentalApplication", "RentalApplication")
+                        .WithOne("Screening")
+                        .HasForeignKey("Aquiis.Core.Entities.ApplicationScreening", "RentalApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("RentalApplication");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarEvent", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.ChecklistTemplate", "ChecklistTemplate")
+                        .WithMany("Checklists")
+                        .HasForeignKey("ChecklistTemplateId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("ChecklistTemplate");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistItem", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Checklist", "Checklist")
+                        .WithMany("Items")
+                        .HasForeignKey("ChecklistId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Checklist");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplateItem", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.ChecklistTemplate", "ChecklistTemplate")
+                        .WithMany("Items")
+                        .HasForeignKey("ChecklistTemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ChecklistTemplate");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Document", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Invoice", "Invoice")
+                        .WithMany()
+                        .HasForeignKey("InvoiceId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany("Documents")
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Payment", "Payment")
+                        .WithMany()
+                        .HasForeignKey("PaymentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("Documents")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Invoice");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Payment");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Inspection", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany("Invoices")
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Leases")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("Leases")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany("Leases")
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.LeaseOffer", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany()
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.RentalApplication", "RentalApplication")
+                        .WithMany()
+                        .HasForeignKey("RentalApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+
+                    b.Navigation("RentalApplication");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("MaintenanceRequests")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.NotificationPreferences", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationEmailSettings", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSMSSettings", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany("OrganizationUsers")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Payment", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Invoice", "Invoice")
+                        .WithMany("Payments")
+                        .HasForeignKey("InvoiceId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Invoice");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Properties")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "InterestedProperty")
+                        .WithMany()
+                        .HasForeignKey("InterestedPropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("InterestedProperty");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany("Applications")
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Repair", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.MaintenanceRequest", "MaintenanceRequest")
+                        .WithMany("Repairs")
+                        .HasForeignKey("MaintenanceRequestId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("Repairs")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("MaintenanceRequest");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositDividend", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.SecurityDepositInvestmentPool", "InvestmentPool")
+                        .WithMany("Dividends")
+                        .HasForeignKey("InvestmentPoolId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.SecurityDeposit", "SecurityDeposit")
+                        .WithMany("Dividends")
+                        .HasForeignKey("SecurityDepositId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("InvestmentPool");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("SecurityDeposit");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Tenants")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.TestEntity", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tour", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Checklist", "Checklist")
+                        .WithMany()
+                        .HasForeignKey("ChecklistId");
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany("Tours")
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Checklist");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+                });
+
+            modelBuilder.Entity("Notification", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.Navigation("Items");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplate", b =>
+                {
+                    b.Navigation("Checklists");
+
+                    b.Navigation("Items");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.Navigation("Payments");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.Navigation("Documents");
+
+                    b.Navigation("Invoices");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.Navigation("Repairs");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Organization", b =>
+                {
+                    b.Navigation("Leases");
+
+                    b.Navigation("OrganizationUsers");
+
+                    b.Navigation("Properties");
+
+                    b.Navigation("Tenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.Navigation("Documents");
+
+                    b.Navigation("Leases");
+
+                    b.Navigation("MaintenanceRequests");
+
+                    b.Navigation("Repairs");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.Navigation("Applications");
+
+                    b.Navigation("Tours");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.Navigation("Screening");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.Navigation("Dividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositInvestmentPool", b =>
+                {
+                    b.Navigation("Dividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.Navigation("Leases");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/1-Aquiis.Infrastructure/Data/Migrations/20260127184357_AddTestEntityAndPropertyTestField.cs b/1-Aquiis.Infrastructure/Data/Migrations/20260127184357_AddTestEntityAndPropertyTestField.cs
new file mode 100644
index 0000000..281ef18
--- /dev/null
+++ b/1-Aquiis.Infrastructure/Data/Migrations/20260127184357_AddTestEntityAndPropertyTestField.cs
@@ -0,0 +1,76 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Aquiis.Infrastructure.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddTestEntityAndPropertyTestField : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "TestField",
+                table: "Properties",
+                type: "TEXT",
+                maxLength: 100,
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "TestEntities",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    TestName = table.Column<string>(type: "TEXT", maxLength: 200, nullable: false),
+                    TestDescription = table.Column<string>(type: "TEXT", maxLength: 500, nullable: true),
+                    TestDate = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    TestNumber = table.Column<int>(type: "INTEGER", nullable: false),
+                    TestFlag = table.Column<bool>(type: "INTEGER", nullable: false),
+                    CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
+                    CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    LastModifiedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    LastModifiedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: true),
+                    IsDeleted = table.Column<bool>(type: "INTEGER", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TestEntities", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_TestEntities_Organizations_OrganizationId",
+                        column: x => x.OrganizationId,
+                        principalTable: "Organizations",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TestEntities_IsDeleted",
+                table: "TestEntities",
+                column: "IsDeleted");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TestEntities_OrganizationId",
+                table: "TestEntities",
+                column: "OrganizationId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TestEntities_TestName",
+                table: "TestEntities",
+                column: "TestName");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "TestEntities");
+
+            migrationBuilder.DropColumn(
+                name: "TestField",
+                table: "Properties");
+        }
+    }
+}
diff --git a/1-Aquiis.Infrastructure/Data/Migrations/20260127190738_RemoveTestEntityAndPropertyTestField.Designer.cs b/1-Aquiis.Infrastructure/Data/Migrations/20260127190738_RemoveTestEntityAndPropertyTestField.Designer.cs
new file mode 100644
index 0000000..da1b16c
--- /dev/null
+++ b/1-Aquiis.Infrastructure/Data/Migrations/20260127190738_RemoveTestEntityAndPropertyTestField.Designer.cs
@@ -0,0 +1,4245 @@
+// <auto-generated />
+using System;
+using Aquiis.Infrastructure.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Aquiis.Infrastructure.Data.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20260127190738_RemoveTestEntityAndPropertyTestField")]
+    partial class RemoveTestEntityAndPropertyTestField
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.1");
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ApplicationScreening", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("BackgroundCheckCompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("BackgroundCheckNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("BackgroundCheckPassed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("BackgroundCheckRequested")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("BackgroundCheckRequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CreditCheckCompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreditCheckNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("CreditCheckPassed")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("CreditCheckRequested")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("CreditCheckRequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("CreditScore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OverallResult")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResultNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("OverallResult");
+
+                    b.HasIndex("RentalApplicationId")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationScreenings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarEvent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Color")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EndOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EventType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Icon")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Location")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SourceEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SourceEntityType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EventType");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("SourceEntityId");
+
+                    b.HasIndex("StartOn");
+
+                    b.HasIndex("SourceEntityType", "SourceEntityId");
+
+                    b.ToTable("CalendarEvents");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AutoCreateEvents")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultColor")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultIcon")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DisplayOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ShowOnCalendar")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("OrganizationId", "EntityType")
+                        .IsUnique();
+
+                    b.ToTable("CalendarSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ChecklistType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CompletedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GeneralNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistTemplateId");
+
+                    b.HasIndex("ChecklistType");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("Checklists");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CategorySection")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ItemOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ItemText")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhotoUrl")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RequiresValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SectionOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistId");
+
+                    b.ToTable("ChecklistItems");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Category")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSystemTemplate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Category");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("ChecklistTemplates");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000001"),
+                            Category = "Tour",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Standard property showing checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Property Tour",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000002"),
+                            Category = "MoveIn",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Move-in inspection checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Move-In",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000003"),
+                            Category = "MoveOut",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Move-out inspection checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Move-Out",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0001-000000000004"),
+                            Category = "Tour",
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            Description = "Open house event checklist",
+                            IsDeleted = false,
+                            IsSystemTemplate = true,
+                            Name = "Open House",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000")
+                        });
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplateItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AllowsNotes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CategorySection")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ChecklistTemplateId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRequired")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ItemOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ItemText")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RequiresValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SectionOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistTemplateId");
+
+                    b.ToTable("ChecklistTemplateItems");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000001"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Greeted prospect and verified appointment",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000002"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Reviewed property exterior and curb appeal",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000003"),
+                            AllowsNotes = true,
+                            CategorySection = "Arrival & Introduction",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Showed parking area/garage",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000004"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 4,
+                            ItemText = "Toured living room/common areas",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000005"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 5,
+                            ItemText = "Showed all bedrooms",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000006"),
+                            AllowsNotes = true,
+                            CategorySection = "Interior Tour",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 6,
+                            ItemText = "Showed all bathrooms",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 2
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000007"),
+                            AllowsNotes = true,
+                            CategorySection = "Kitchen & Appliances",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 7,
+                            ItemText = "Toured kitchen and demonstrated appliances",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 3
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000008"),
+                            AllowsNotes = true,
+                            CategorySection = "Kitchen & Appliances",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 8,
+                            ItemText = "Explained which appliances are included",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 3
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000009"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 9,
+                            ItemText = "Explained HVAC system and thermostat controls",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000010"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 10,
+                            ItemText = "Reviewed utility responsibilities (tenant vs landlord)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000011"),
+                            AllowsNotes = true,
+                            CategorySection = "Utilities & Systems",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 11,
+                            ItemText = "Showed water heater location",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 4
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000012"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 12,
+                            ItemText = "Showed storage areas (closets, attic, basement)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000013"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 13,
+                            ItemText = "Showed laundry facilities",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000014"),
+                            AllowsNotes = true,
+                            CategorySection = "Storage & Amenities",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 14,
+                            ItemText = "Showed outdoor space (yard, patio, balcony)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 5
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000015"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 15,
+                            ItemText = "Discussed monthly rent amount",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000016"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 16,
+                            ItemText = "Explained security deposit and move-in costs",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000017"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 17,
+                            ItemText = "Reviewed lease term length and start date",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000018"),
+                            AllowsNotes = true,
+                            CategorySection = "Lease Terms",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 18,
+                            ItemText = "Explained pet policy",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 6
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000019"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 19,
+                            ItemText = "Explained application process and requirements",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000020"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 20,
+                            ItemText = "Reviewed screening process (background, credit check)",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000021"),
+                            AllowsNotes = true,
+                            CategorySection = "Next Steps",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 21,
+                            ItemText = "Answered all prospect questions",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 7
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000022"),
+                            AllowsNotes = true,
+                            CategorySection = "Assessment",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 22,
+                            ItemText = "Prospect Interest Level",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = true,
+                            SectionOrder = 8
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000023"),
+                            AllowsNotes = true,
+                            CategorySection = "Assessment",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000001"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 23,
+                            ItemText = "Overall showing feedback and notes",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 8
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000024"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Document property condition",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000025"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Collect keys and access codes",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000026"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000002"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Review lease terms with tenant",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000027"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Inspect property condition",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000028"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Collect all keys and access devices",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000029"),
+                            AllowsNotes = true,
+                            CategorySection = "General",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000003"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Document damages and needed repairs",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000030"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 1,
+                            ItemText = "Set up signage and directional markers",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000031"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 2,
+                            ItemText = "Prepare information packets",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        },
+                        new
+                        {
+                            Id = new Guid("00000000-0000-0000-0002-000000000032"),
+                            AllowsNotes = true,
+                            CategorySection = "Preparation",
+                            ChecklistTemplateId = new Guid("00000000-0000-0000-0001-000000000004"),
+                            CreatedBy = "",
+                            CreatedOn = new DateTime(2025, 11, 30, 0, 0, 0, 0, DateTimeKind.Utc),
+                            IsDeleted = false,
+                            IsRequired = true,
+                            ItemOrder = 3,
+                            ItemText = "Set up visitor sign-in sheet",
+                            OrganizationId = new Guid("00000000-0000-0000-0000-000000000000"),
+                            RequiresValue = false,
+                            SectionOrder = 1
+                        });
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DocumentType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("FileData")
+                        .IsRequired()
+                        .HasColumnType("BLOB");
+
+                    b.Property<string>("FileExtension")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FilePath")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FileType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("InvoiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PaymentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvoiceId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PaymentId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Inspection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ActionItemsRequired")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomSinkGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomSinkNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomToiletGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomToiletNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomTubShowerGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomTubShowerNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("BathroomVentilationGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("BathroomVentilationNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("CarbonMonoxideDetectorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CarbonMonoxideDetectorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ElectricalSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ElectricalSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorDoorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorDoorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorFoundationGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorFoundationNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorGuttersGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorGuttersNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorRoofGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorRoofNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorSidingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorSidingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("ExteriorWindowsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ExteriorWindowsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GeneralNotes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("HvacSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("HvacSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InspectedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InspectionType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorCeilingsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorCeilingsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorDoorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorDoorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorFloorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorFloorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorWallsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorWallsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InteriorWindowsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("InteriorWindowsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("KitchenAppliancesGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenAppliancesNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenCabinetsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenCabinetsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenCountersGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenCountersNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("KitchenSinkPlumbingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KitchenSinkPlumbingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("LandscapingGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LandscapingNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OverallCondition")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("PlumbingSystemGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("PlumbingSystemNotes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SmokeDetectorsGood")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SmokeDetectorsNotes")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.ToTable("Inspections");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("AmountPaid")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DueOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("InvoicedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("LateFeeAmount")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool?>("LateFeeApplied")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LateFeeAppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("ReminderSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ReminderSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("InvoiceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Invoices");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ActualMoveOutDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DeclinedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ExpectedMoveOutDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseOfferId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("OfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("PreviousLeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("ProposedRenewalRent")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("RenewalNotes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("RenewalNotificationSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("RenewalNotificationSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RenewalNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("RenewalOfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RenewalReminderSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RenewalResponseOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RenewalStatus")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("SecurityDeposit")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("SignedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("TerminationNoticedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TerminationReason")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Terms")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Leases");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.LeaseOffer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ConvertedLeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("OfferedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("RentalApplicationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RespondedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResponseNotes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("SecurityDeposit")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Terms")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("RentalApplicationId");
+
+                    b.ToTable("LeaseOffers");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ActualCost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("AssignedTo")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("EstimatedCost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedBy")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedByEmail")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RequestedByPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("RequestedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ResolutionNotes")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ScheduledOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("Priority");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("RequestedOn");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("MaintenanceRequests");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Note", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Content")
+                        .IsRequired()
+                        .HasMaxLength(5000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserFullName")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Notes");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.NotificationPreferences", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<TimeSpan>("DailyDigestTime")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmailAddress")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EmailApplicationStatusChange")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailInspectionScheduled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailLeaseExpiring")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailMaintenanceUpdate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailPaymentDue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EmailPaymentReceived")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableDailyDigest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableEmailNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableInAppNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableSMSNotifications")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableWeeklyDigest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SMSLeaseExpiringUrgent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SMSMaintenanceEmergency")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SMSPaymentDue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("WeeklyDigestDay")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("UserId", "OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("NotificationPreferences");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Organization", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OwnerId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("State")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsActive");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("Organizations");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationEmailSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DailyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("DailyLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EmailsSentThisMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("EmailsSentToday")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableSsl")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("FromEmail")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FromName")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsEmailEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVerified")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastEmailSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastError")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastErrorOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastVerifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("MonthlyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("MonthlyLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PlanType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SendGridApiKeyEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SmtpPort")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SmtpServer")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("StatsLastUpdatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationEmailSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSMSSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("AccountBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AccountType")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("CostPerSMS")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DailyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSMSEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVerified")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastError")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastSMSSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastVerifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("MonthlyCountResetOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderName")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SMSSentThisMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SMSSentToday")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("StatsLastUpdatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioAccountSidEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioAuthTokenEncrypted")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TwilioPhoneNumber")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationSMSSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSettings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("AllowTenantDividendChoice")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ApplicationExpirationDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ApplicationFeeEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("AutoCalculateSecurityDeposit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DefaultApplicationFee")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DefaultDividendPaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DividendDistributionMonth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("LateFeeAutoApply")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("LateFeeEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("LateFeeGracePeriodDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("LateFeePercentage")
+                        .HasPrecision(5, 4)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MaxLateFeeAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OrganizationId")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("OrganizationSharePercentage")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<int>("PaymentReminderDaysBefore")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("PaymentReminderEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RefundProcessingDays")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SecurityDepositInvestmentEnabled")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<decimal>("SecurityDepositMultiplier")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<int>("TourNoShowGracePeriodHours")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationSettings");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GrantedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("GrantedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RevokedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Role")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsActive");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Role");
+
+                    b.HasIndex("UserId", "OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationUsers");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Payment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("InvoiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("PaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("InvoiceId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Payments");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Bathrooms")
+                        .HasMaxLength(3)
+                        .HasColumnType("decimal(3,1)");
+
+                    b.Property<int>("Bedrooms")
+                        .HasMaxLength(3)
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("City")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsAvailable")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastRoutineInspectionDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("NextRoutineInspectionDueDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PropertyType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RoutineInspectionIntervalMonths")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SquareFeet")
+                        .HasMaxLength(7)
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("State")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UnitNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ZipCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Properties");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateOfBirth")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DesiredMoveInDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("FirstContactedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationNumber")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationState")
+                        .HasMaxLength(2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("InterestedPropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Phone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Source")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("InterestedPropertyId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("ProspectiveTenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ApplicationFee")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("ApplicationFeePaid")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ApplicationFeePaidOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ApplicationFeePaymentMethod")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("AppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentAddress")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentCity")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("CurrentRent")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CurrentState")
+                        .IsRequired()
+                        .HasMaxLength(2)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CurrentZipCode")
+                        .IsRequired()
+                        .HasMaxLength(10)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DecidedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DecisionBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DenialReason")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmployerName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("EmploymentLengthMonths")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("JobTitle")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LandlordName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LandlordPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("MonthlyIncome")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Phone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference1Relationship")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Name")
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Phone")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reference2Relationship")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AppliedOn");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("RentalApplications");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Repair", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ContactId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContactPerson")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ContractorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContractorName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContractorPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Cost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("MaintenanceRequestId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PartsReplaced")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RepairType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("WarrantyApplies")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("WarrantyExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("MaintenanceRequestId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("RepairType");
+
+                    b.ToTable("Repairs");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SchemaVersion", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("AppliedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SchemaVersions");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Amount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateReceived")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("DeductionsAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("DeductionsReason")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("InInvestmentPool")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PoolEntryDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PoolExitDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal?>("RefundAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("RefundMethod")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RefundProcessedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RefundReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TransactionReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InInvestmentPool");
+
+                    b.HasIndex("LeaseId")
+                        .IsUnique();
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("SecurityDeposits");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositDividend", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("BaseDividendAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("ChoiceMadeOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DividendAmount")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<Guid>("InvestmentPoolId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MailingAddress")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("MonthsInPool")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentMethod")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PaymentProcessedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PaymentReference")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("ProrationFactor")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<Guid>("SecurityDepositId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InvestmentPoolId");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("SecurityDepositId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("Year");
+
+                    b.ToTable("SecurityDepositDividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositInvestmentPool", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ActiveLeaseCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("DividendPerLease")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("DividendsCalculatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DividendsDistributedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("EndingBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("OrganizationShare")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("OrganizationSharePercentage")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<decimal>("ReturnRate")
+                        .HasPrecision(18, 6)
+                        .HasColumnType("decimal(18,6)");
+
+                    b.Property<decimal>("StartingBalance")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("TenantShareTotal")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("TotalEarnings")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<int>("Year")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Status");
+
+                    b.HasIndex("Year")
+                        .IsUnique();
+
+                    b.ToTable("SecurityDepositInvestmentPools");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateOfBirth")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmergencyContactName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmergencyContactPhone")
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IdentificationNumber")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email")
+                        .IsUnique();
+
+                    b.HasIndex("IdentificationNumber")
+                        .IsUnique();
+
+                    b.HasIndex("OrganizationId");
+
+                    b.ToTable("Tenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tour", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("CalendarEventId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ChecklistId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ConductedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Feedback")
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InterestLevel")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ProspectiveTenantId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("ScheduledOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ChecklistId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("ProspectiveTenantId");
+
+                    b.HasIndex("ScheduledOn");
+
+                    b.HasIndex("Status");
+
+                    b.ToTable("Tours");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.UserProfile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ActiveOrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActiveOrganizationId");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("IsDeleted");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("UserProfiles");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.WorkflowAuditLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Action")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("EntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("FromStatus")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Metadata")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PerformedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("PerformedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Reason")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ToStatus")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Action");
+
+                    b.HasIndex("EntityId");
+
+                    b.HasIndex("EntityType");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PerformedBy");
+
+                    b.HasIndex("PerformedOn");
+
+                    b.HasIndex("EntityType", "EntityId");
+
+                    b.ToTable("WorkflowAuditLogs");
+                });
+
+            modelBuilder.Entity("Notification", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Category")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EmailError")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EmailSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("EmailSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRead")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("ReadOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RecipientUserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("RelatedEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RelatedEntityType")
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SMSError")
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SMSSent")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("SMSSentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("SendEmail")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SendInApp")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("SendSMS")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("SentOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Category");
+
+                    b.HasIndex("IsRead");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("RecipientUserId");
+
+                    b.HasIndex("SentOn");
+
+                    b.ToTable("Notifications");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ApplicationScreening", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.RentalApplication", "RentalApplication")
+                        .WithOne("Screening")
+                        .HasForeignKey("Aquiis.Core.Entities.ApplicationScreening", "RentalApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("RentalApplication");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.CalendarEvent", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.ChecklistTemplate", "ChecklistTemplate")
+                        .WithMany("Checklists")
+                        .HasForeignKey("ChecklistTemplateId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("ChecklistTemplate");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistItem", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Checklist", "Checklist")
+                        .WithMany("Items")
+                        .HasForeignKey("ChecklistId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Checklist");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplateItem", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.ChecklistTemplate", "ChecklistTemplate")
+                        .WithMany("Items")
+                        .HasForeignKey("ChecklistTemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ChecklistTemplate");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Document", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Invoice", "Invoice")
+                        .WithMany()
+                        .HasForeignKey("InvoiceId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany("Documents")
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Payment", "Payment")
+                        .WithMany()
+                        .HasForeignKey("PaymentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("Documents")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Invoice");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Payment");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Inspection", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany("Invoices")
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Lease");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Leases")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("Leases")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany("Leases")
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.LeaseOffer", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany()
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.RentalApplication", "RentalApplication")
+                        .WithMany()
+                        .HasForeignKey("RentalApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+
+                    b.Navigation("RentalApplication");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("MaintenanceRequests")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.NotificationPreferences", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationEmailSettings", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationSMSSettings", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany("OrganizationUsers")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Payment", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Invoice", "Invoice")
+                        .WithMany("Payments")
+                        .HasForeignKey("InvoiceId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Invoice");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Properties")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "InterestedProperty")
+                        .WithMany()
+                        .HasForeignKey("InterestedPropertyId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("InterestedProperty");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany("Applications")
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Repair", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.MaintenanceRequest", "MaintenanceRequest")
+                        .WithMany("Repairs")
+                        .HasForeignKey("MaintenanceRequestId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("Repairs")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("MaintenanceRequest");
+
+                    b.Navigation("Property");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositDividend", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.SecurityDepositInvestmentPool", "InvestmentPool")
+                        .WithMany("Dividends")
+                        .HasForeignKey("InvestmentPoolId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.SecurityDeposit", "SecurityDeposit")
+                        .WithMany("Dividends")
+                        .HasForeignKey("SecurityDepositId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("InvestmentPool");
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("SecurityDeposit");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", null)
+                        .WithMany("Tenants")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tour", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Checklist", "Checklist")
+                        .WithMany()
+                        .HasForeignKey("ChecklistId");
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("Aquiis.Core.Entities.ProspectiveTenant", "ProspectiveTenant")
+                        .WithMany("Tours")
+                        .HasForeignKey("ProspectiveTenantId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Checklist");
+
+                    b.Navigation("Property");
+
+                    b.Navigation("ProspectiveTenant");
+                });
+
+            modelBuilder.Entity("Notification", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Checklist", b =>
+                {
+                    b.Navigation("Items");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ChecklistTemplate", b =>
+                {
+                    b.Navigation("Checklists");
+
+                    b.Navigation("Items");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Invoice", b =>
+                {
+                    b.Navigation("Payments");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Lease", b =>
+                {
+                    b.Navigation("Documents");
+
+                    b.Navigation("Invoices");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.Navigation("Repairs");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Organization", b =>
+                {
+                    b.Navigation("Leases");
+
+                    b.Navigation("OrganizationUsers");
+
+                    b.Navigation("Properties");
+
+                    b.Navigation("Tenants");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
+                {
+                    b.Navigation("Documents");
+
+                    b.Navigation("Leases");
+
+                    b.Navigation("MaintenanceRequests");
+
+                    b.Navigation("Repairs");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
+                {
+                    b.Navigation("Applications");
+
+                    b.Navigation("Tours");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.RentalApplication", b =>
+                {
+                    b.Navigation("Screening");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
+                {
+                    b.Navigation("Dividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.SecurityDepositInvestmentPool", b =>
+                {
+                    b.Navigation("Dividends");
+                });
+
+            modelBuilder.Entity("Aquiis.Core.Entities.Tenant", b =>
+                {
+                    b.Navigation("Leases");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/1-Aquiis.Infrastructure/Data/Migrations/20260127190738_RemoveTestEntityAndPropertyTestField.cs b/1-Aquiis.Infrastructure/Data/Migrations/20260127190738_RemoveTestEntityAndPropertyTestField.cs
new file mode 100644
index 0000000..8a1c80e
--- /dev/null
+++ b/1-Aquiis.Infrastructure/Data/Migrations/20260127190738_RemoveTestEntityAndPropertyTestField.cs
@@ -0,0 +1,76 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Aquiis.Infrastructure.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class RemoveTestEntityAndPropertyTestField : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "TestEntities");
+
+            migrationBuilder.DropColumn(
+                name: "TestField",
+                table: "Properties");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "TestField",
+                table: "Properties",
+                type: "TEXT",
+                maxLength: 100,
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "TestEntities",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    CreatedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: false),
+                    CreatedOn = table.Column<DateTime>(type: "TEXT", nullable: false),
+                    IsDeleted = table.Column<bool>(type: "INTEGER", nullable: false),
+                    LastModifiedBy = table.Column<string>(type: "TEXT", maxLength: 100, nullable: true),
+                    LastModifiedOn = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    OrganizationId = table.Column<Guid>(type: "TEXT", maxLength: 100, nullable: false),
+                    TestDate = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    TestDescription = table.Column<string>(type: "TEXT", maxLength: 500, nullable: true),
+                    TestFlag = table.Column<bool>(type: "INTEGER", nullable: false),
+                    TestName = table.Column<string>(type: "TEXT", maxLength: 200, nullable: false),
+                    TestNumber = table.Column<int>(type: "INTEGER", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TestEntities", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_TestEntities_Organizations_OrganizationId",
+                        column: x => x.OrganizationId,
+                        principalTable: "Organizations",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TestEntities_IsDeleted",
+                table: "TestEntities",
+                column: "IsDeleted");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TestEntities_OrganizationId",
+                table: "TestEntities",
+                column: "OrganizationId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TestEntities_TestName",
+                table: "TestEntities",
+                column: "TestName");
+        }
+    }
+}
diff --git a/1-Aquiis.Infrastructure/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/1-Aquiis.Infrastructure/Data/Migrations/ApplicationDbContextModelSnapshot.cs
index 5eb5864..095e216 100644
--- a/1-Aquiis.Infrastructure/Data/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/1-Aquiis.Infrastructure/Data/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -15,7 +15,7 @@ partial class ApplicationDbContextModelSnapshot : ModelSnapshot
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "9.0.11");
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.1");
 
             modelBuilder.Entity("Aquiis.Core.Entities.ApplicationScreening", b =>
                 {
@@ -2355,6 +2355,66 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("OrganizationSettings");
                 });
 
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("GrantedBy")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("GrantedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("RevokedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Role")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsActive");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("Role");
+
+                    b.HasIndex("UserId", "OrganizationId")
+                        .IsUnique();
+
+                    b.ToTable("OrganizationUsers");
+                });
+
             modelBuilder.Entity("Aquiis.Core.Entities.Payment", b =>
                 {
                     b.Property<Guid>("Id")
@@ -2405,6 +2465,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(50)
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("PaymentNumber")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
                     b.HasKey("Id");
 
                     b.HasIndex("DocumentId");
@@ -2774,6 +2839,115 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("RentalApplications");
                 });
 
+            modelBuilder.Entity("Aquiis.Core.Entities.Repair", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("CompletedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ContactId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContactPerson")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ContractorId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContractorName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ContractorPhone")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("TEXT");
+
+                    b.Property<decimal>("Cost")
+                        .HasPrecision(18, 2)
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("CreatedBy")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("CreatedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastModifiedOn")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("LeaseId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("MaintenanceRequestId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Notes")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("OrganizationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PartsReplaced")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PropertyId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RepairType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("WarrantyApplies")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("WarrantyExpiresOn")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CompletedOn");
+
+                    b.HasIndex("LeaseId");
+
+                    b.HasIndex("MaintenanceRequestId");
+
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("RepairType");
+
+                    b.ToTable("Repairs");
+                });
+
             modelBuilder.Entity("Aquiis.Core.Entities.SchemaVersion", b =>
                 {
                     b.Property<int>("Id")
@@ -3260,46 +3434,48 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("Tours");
                 });
 
-            modelBuilder.Entity("Aquiis.Core.Entities.UserOrganization", b =>
+            modelBuilder.Entity("Aquiis.Core.Entities.UserProfile", b =>
                 {
                     b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ActiveOrganizationId")
                         .HasColumnType("TEXT");
 
                     b.Property<string>("CreatedBy")
                         .IsRequired()
+                        .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
                     b.Property<DateTime>("CreatedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("GrantedBy")
+                    b.Property<string>("Email")
                         .IsRequired()
                         .HasColumnType("TEXT");
 
-                    b.Property<DateTime>("GrantedOn")
+                    b.Property<string>("FirstName")
+                        .IsRequired()
                         .HasColumnType("TEXT");
 
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("INTEGER");
-
                     b.Property<bool>("IsDeleted")
                         .HasColumnType("INTEGER");
 
                     b.Property<string>("LastModifiedBy")
+                        .HasMaxLength(100)
                         .HasColumnType("TEXT");
 
                     b.Property<DateTime?>("LastModifiedOn")
                         .HasColumnType("TEXT");
 
-                    b.Property<Guid>("OrganizationId")
+                    b.Property<string>("LastName")
+                        .IsRequired()
                         .HasColumnType("TEXT");
 
-                    b.Property<DateTime?>("RevokedOn")
+                    b.Property<Guid?>("OrganizationId")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("Role")
-                        .IsRequired()
+                    b.Property<string>("PhoneNumber")
                         .HasColumnType("TEXT");
 
                     b.Property<string>("UserId")
@@ -3308,16 +3484,18 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasKey("Id");
 
-                    b.HasIndex("IsActive");
+                    b.HasIndex("ActiveOrganizationId");
 
-                    b.HasIndex("OrganizationId");
+                    b.HasIndex("Email");
 
-                    b.HasIndex("Role");
+                    b.HasIndex("IsDeleted");
 
-                    b.HasIndex("UserId", "OrganizationId")
+                    b.HasIndex("OrganizationId");
+
+                    b.HasIndex("UserId")
                         .IsUnique();
 
-                    b.ToTable("UserOrganizations");
+                    b.ToTable("UserProfiles");
                 });
 
             modelBuilder.Entity("Aquiis.Core.Entities.WorkflowAuditLog", b =>
@@ -3741,7 +3919,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .OnDelete(DeleteBehavior.SetNull);
 
                     b.HasOne("Aquiis.Core.Entities.Property", "Property")
-                        .WithMany()
+                        .WithMany("MaintenanceRequests")
                         .HasForeignKey("PropertyId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
@@ -3784,6 +3962,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Organization");
                 });
 
+            modelBuilder.Entity("Aquiis.Core.Entities.OrganizationUser", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
+                        .WithMany("OrganizationUsers")
+                        .HasForeignKey("OrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Organization");
+                });
+
             modelBuilder.Entity("Aquiis.Core.Entities.Payment", b =>
                 {
                     b.HasOne("Aquiis.Core.Entities.Document", "Document")
@@ -3846,6 +4035,31 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("ProspectiveTenant");
                 });
 
+            modelBuilder.Entity("Aquiis.Core.Entities.Repair", b =>
+                {
+                    b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
+                        .WithMany()
+                        .HasForeignKey("LeaseId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.MaintenanceRequest", "MaintenanceRequest")
+                        .WithMany("Repairs")
+                        .HasForeignKey("MaintenanceRequestId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Aquiis.Core.Entities.Property", "Property")
+                        .WithMany("Repairs")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Lease");
+
+                    b.Navigation("MaintenanceRequest");
+
+                    b.Navigation("Property");
+                });
+
             modelBuilder.Entity("Aquiis.Core.Entities.SecurityDeposit", b =>
                 {
                     b.HasOne("Aquiis.Core.Entities.Lease", "Lease")
@@ -3934,17 +4148,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("ProspectiveTenant");
                 });
 
-            modelBuilder.Entity("Aquiis.Core.Entities.UserOrganization", b =>
-                {
-                    b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
-                        .WithMany("UserOrganizations")
-                        .HasForeignKey("OrganizationId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Organization");
-                });
-
             modelBuilder.Entity("Notification", b =>
                 {
                     b.HasOne("Aquiis.Core.Entities.Organization", "Organization")
@@ -3980,15 +4183,20 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Invoices");
                 });
 
+            modelBuilder.Entity("Aquiis.Core.Entities.MaintenanceRequest", b =>
+                {
+                    b.Navigation("Repairs");
+                });
+
             modelBuilder.Entity("Aquiis.Core.Entities.Organization", b =>
                 {
                     b.Navigation("Leases");
 
+                    b.Navigation("OrganizationUsers");
+
                     b.Navigation("Properties");
 
                     b.Navigation("Tenants");
-
-                    b.Navigation("UserOrganizations");
                 });
 
             modelBuilder.Entity("Aquiis.Core.Entities.Property", b =>
@@ -3996,6 +4204,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Documents");
 
                     b.Navigation("Leases");
+
+                    b.Navigation("MaintenanceRequests");
+
+                    b.Navigation("Repairs");
                 });
 
             modelBuilder.Entity("Aquiis.Core.Entities.ProspectiveTenant", b =>
diff --git a/2-Aquiis.Application/DependencyInjection.cs b/2-Aquiis.Application/DependencyInjection.cs
index e5dd138..943c938 100644
--- a/2-Aquiis.Application/DependencyInjection.cs
+++ b/2-Aquiis.Application/DependencyInjection.cs
@@ -1,4 +1,5 @@
 using Aquiis.Application.Services;
+using Aquiis.Application.Services.PdfGenerators;
 using Aquiis.Application.Services.Workflows;
 using Aquiis.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
@@ -37,6 +38,7 @@ public static IServiceCollection AddApplication(
         services.AddScoped<InvoiceService>();
         services.AddScoped<LeaseNotificationService>();
         services.AddScoped<LeaseOfferService>();
+        services.AddScoped<LeasePdfGenerator>();
         services.AddScoped<LeaseService>();
         services.AddScoped<LeaseWorkflowService>();
         services.AddScoped<MaintenanceNotificationService>();
@@ -49,6 +51,7 @@ public static IServiceCollection AddApplication(
         services.AddScoped<PropertyService>();
         services.AddScoped<ProspectiveTenantService>();
         services.AddScoped<RentalApplicationService>();
+        services.AddScoped<RepairService>();
         services.AddScoped<ScheduledTaskService>();
         services.AddScoped<SchemaValidationService>();
         services.AddScoped<ScreeningService>();
diff --git a/2-Aquiis.Application/Services/CalendarEventService.cs b/2-Aquiis.Application/Services/CalendarEventService.cs
index 09aeb29..573b6ee 100644
--- a/2-Aquiis.Application/Services/CalendarEventService.cs
+++ b/2-Aquiis.Application/Services/CalendarEventService.cs
@@ -142,12 +142,28 @@ public async Task<List<CalendarEvent>> GetEventsAsync(
         /// </summary>
         public async Task<CalendarEvent> CreateCustomEventAsync(CalendarEvent calendarEvent)
         {
-            calendarEvent.EventType = CalendarEventTypes.Custom;
+            // Service sets tracking fields - UI should not set these
+            var organizationId = await _userContextService.GetActiveOrganizationIdAsync();
+            var userId = await _userContextService.GetUserIdAsync();
+            
+            calendarEvent.Id = Guid.NewGuid();
+            calendarEvent.OrganizationId = organizationId ?? Guid.Empty;
+            calendarEvent.CreatedBy = userId ?? string.Empty;
+            calendarEvent.CreatedOn = DateTime.UtcNow;
+            
+            // Not linked to a source entity (user-created from calendar UI)
             calendarEvent.SourceEntityId = null;
             calendarEvent.SourceEntityType = null;
-            calendarEvent.Color = CalendarEventTypes.GetColor(CalendarEventTypes.Custom);
-            calendarEvent.Icon = CalendarEventTypes.GetIcon(CalendarEventTypes.Custom);
-            calendarEvent.CreatedOn = DateTime.UtcNow;
+            
+            // Set color and icon from event type if not already set
+            if (string.IsNullOrEmpty(calendarEvent.Color))
+            {
+                calendarEvent.Color = CalendarEventTypes.GetColor(calendarEvent.EventType ?? CalendarEventTypes.Custom);
+            }
+            if (string.IsNullOrEmpty(calendarEvent.Icon))
+            {
+                calendarEvent.Icon = CalendarEventTypes.GetIcon(calendarEvent.EventType ?? CalendarEventTypes.Custom);
+            }
 
             _context.CalendarEvents.Add(calendarEvent);
             await _context.SaveChangesAsync();
@@ -160,9 +176,12 @@ public async Task<CalendarEvent> CreateCustomEventAsync(CalendarEvent calendarEv
         /// </summary>
         public async Task<CalendarEvent?> UpdateCustomEventAsync(CalendarEvent calendarEvent)
         {
+            var organizationId = await _userContextService.GetActiveOrganizationIdAsync();
+            var userId = await _userContextService.GetUserIdAsync();
+            
             var existing = await _context.CalendarEvents
                 .FirstOrDefaultAsync(e => e.Id == calendarEvent.Id 
-                    && e.OrganizationId == calendarEvent.OrganizationId 
+                    && e.OrganizationId == organizationId
                     && e.SourceEntityType == null
                     && !e.IsDeleted);
 
@@ -176,8 +195,10 @@ public async Task<CalendarEvent> CreateCustomEventAsync(CalendarEvent calendarEv
             existing.PropertyId = calendarEvent.PropertyId;
             existing.Location = calendarEvent.Location;
             existing.Status = calendarEvent.Status;
-            existing.LastModifiedBy = calendarEvent.LastModifiedBy;
-            existing.LastModifiedOn = calendarEvent.LastModifiedOn;
+            
+            // Service sets tracking fields
+            existing.LastModifiedBy = userId ?? string.Empty;
+            existing.LastModifiedOn = DateTime.UtcNow;
 
             await _context.SaveChangesAsync();
 
diff --git a/2-Aquiis.Application/Services/DocumentNotificationService.cs b/2-Aquiis.Application/Services/DocumentNotificationService.cs
index 06ce32b..fbdcf99 100644
--- a/2-Aquiis.Application/Services/DocumentNotificationService.cs
+++ b/2-Aquiis.Application/Services/DocumentNotificationService.cs
@@ -47,7 +47,7 @@ public async Task CheckDocumentExpirationsAsync()
             foreach (var organizationId in organizations)
             {
                 // Get admin users for this organization
-                var adminUsers = await _dbContext.UserOrganizations
+                var adminUsers = await _dbContext.OrganizationUsers
                     .Where(uom => uom.OrganizationId == organizationId &&
                                  uom.Role == "Admin" &&
                                  !uom.IsDeleted)
diff --git a/2-Aquiis.Application/Services/InspectionService.cs b/2-Aquiis.Application/Services/InspectionService.cs
index dd4b945..8a20dfb 100644
--- a/2-Aquiis.Application/Services/InspectionService.cs
+++ b/2-Aquiis.Application/Services/InspectionService.cs
@@ -2,7 +2,6 @@
 using Aquiis.Core.Constants;
 using Aquiis.Core.Entities;
 using Aquiis.Core.Interfaces;
-using Aquiis.Application.Services;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -115,6 +114,25 @@ public async Task<List<Inspection>> GetByPropertyIdAsync(Guid propertyId)
                 .ToListAsync();
         }
 
+        /// <summary>
+        /// Gets the most recent routine inspection for a property.
+        /// </summary>
+        public async Task<Inspection?> GetLastRoutineInspectionAsync(Guid propertyId)
+        {
+            var organizationId = await GetActiveOrganizationIdAsync();
+
+            return await _context.Inspections
+                .Include(i => i.Property)
+                .Include(i => i.Lease)
+                    .ThenInclude(l => l!.Tenant)
+                .Where(i => i.PropertyId == propertyId 
+                    && i.InspectionType == ApplicationConstants.InspectionTypes.Routine
+                    && !i.IsDeleted 
+                    && i.OrganizationId == organizationId)
+                .OrderByDescending(i => i.CompletedOn)
+                .FirstOrDefaultAsync();
+        }
+
         /// <summary>
         /// Gets a single inspection by ID with related data.
         /// </summary>
diff --git a/2-Aquiis.Application/Services/LeaseService.cs b/2-Aquiis.Application/Services/LeaseService.cs
index b129647..3b2d26a 100644
--- a/2-Aquiis.Application/Services/LeaseService.cs
+++ b/2-Aquiis.Application/Services/LeaseService.cs
@@ -110,6 +110,38 @@ public override async Task<Lease> CreateAsync(Lease entity)
                 var property = await _context.Properties.FindAsync(entity.PropertyId);
                 if (property != null)
                 {
+                    property.Status = ApplicationConstants.PropertyStatuses.Occupied;
+                    property.IsAvailable = false;
+                    property.LastModifiedOn = DateTime.UtcNow;
+                    property.LastModifiedBy = await _userContext.GetUserIdAsync();
+                    _context.Properties.Update(property);
+                    await _context.SaveChangesAsync();
+                }
+            }
+
+            return lease;
+        }
+
+        /// <summary>
+        /// Updates a lease and manages property status based on lease status changes.
+        /// </summary>
+        public override async Task<Lease> UpdateAsync(Lease entity)
+        {
+            // Get the existing lease to check for status changes
+            var existingLease = await _context.Leases.AsNoTracking()
+                .FirstOrDefaultAsync(l => l.Id == entity.Id);
+
+            var lease = await base.UpdateAsync(entity);
+
+            // Handle property status when lease becomes active
+            if (existingLease != null && 
+                existingLease.Status != ApplicationConstants.LeaseStatuses.Active &&
+                entity.Status == ApplicationConstants.LeaseStatuses.Active)
+            {
+                var property = await _context.Properties.FindAsync(entity.PropertyId);
+                if (property != null)
+                {
+                    property.Status = ApplicationConstants.PropertyStatuses.Occupied;
                     property.IsAvailable = false;
                     property.LastModifiedOn = DateTime.UtcNow;
                     property.LastModifiedBy = await _userContext.GetUserIdAsync();
@@ -178,6 +210,7 @@ public override async Task<bool> DeleteAsync(Guid id)
                     .Include(l => l.Document)
                     .Include(l => l.Documents)
                     .Include(l => l.Invoices)
+                        .ThenInclude(i => i.Payments)
                     .Where(l => l.Id == leaseId
                         && !l.IsDeleted
                         && l.Property.OrganizationId == organizationId)
@@ -205,7 +238,7 @@ public async Task<List<Lease>> GetLeasesWithRelationsAsync()
                     .Include(l => l.Property)
                     .Include(l => l.Tenant)
                     .Where(l => !l.IsDeleted && l.Property.OrganizationId == organizationId)
-                    .OrderByDescending(l => l.CreatedOn)
+                    .OrderByDescending(l => l.StartDate)
                     .ToListAsync();
             }
             catch (Exception ex)
diff --git a/2-Aquiis.Application/Services/NotificationService.cs b/2-Aquiis.Application/Services/NotificationService.cs
index cc5275d..5e9c7fd 100644
--- a/2-Aquiis.Application/Services/NotificationService.cs
+++ b/2-Aquiis.Application/Services/NotificationService.cs
@@ -116,8 +116,8 @@ public async Task<Notification> NotifyAllUsersAsync(
         Guid? relatedEntityId = null,
         string? relatedEntityType = null)
     {
-        // Query users through UserOrganizations to find all users in the organization
-        var userIds = await _context.UserOrganizations
+        // Query users through OrganizationUsers to find all users in the organization
+        var userIds = await _context.OrganizationUsers
             .Where(uo => uo.OrganizationId == organizationId && uo.IsActive && !uo.IsDeleted)
             .Select(uo => uo.UserId)
             .ToListAsync();
diff --git a/2-Aquiis.Application/Services/OrganizationService.cs b/2-Aquiis.Application/Services/OrganizationService.cs
index 9605793..cd6d59d 100644
--- a/2-Aquiis.Application/Services/OrganizationService.cs
+++ b/2-Aquiis.Application/Services/OrganizationService.cs
@@ -2,6 +2,7 @@
 using Aquiis.Core.Constants;
 using Aquiis.Core.Interfaces.Services;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
 
 namespace Aquiis.Application.Services
 {
@@ -9,11 +10,16 @@ public class OrganizationService
     {
         private readonly ApplicationDbContext _dbContext;
         private readonly IUserContextService _userContext;
+        private readonly ApplicationSettings _settings;
 
-        public OrganizationService(ApplicationDbContext dbContext, IUserContextService userContextService)
+        public OrganizationService(
+            ApplicationDbContext dbContext, 
+            IUserContextService userContextService,
+            IOptions<ApplicationSettings> settings)
         {
             _dbContext = dbContext;
             _userContext = userContextService;
+            _settings = settings.Value;
         }
 
         #region CRUD Operations
@@ -37,8 +43,8 @@ public async Task<Organization> CreateOrganizationAsync(string ownerId, string n
 
             _dbContext.Organizations.Add(organization);
 
-            // Create Owner entry in UserOrganizations
-            var userOrganization = new UserOrganization
+            // Create Owner entry in OrganizationUsers
+            var OrganizationUser = new OrganizationUser
             {
                 Id = Guid.NewGuid(),
                 UserId = ownerId,
@@ -51,7 +57,7 @@ public async Task<Organization> CreateOrganizationAsync(string ownerId, string n
                 CreatedBy = ownerId
             };
 
-            _dbContext.UserOrganizations.Add(userOrganization);
+            _dbContext.OrganizationUsers.Add(OrganizationUser);
 
             // add organization settings record with defaults
             var settings = new OrganizationSettings
@@ -96,8 +102,8 @@ public async Task<Organization> CreateOrganizationAsync(Organization organizatio
 
             _dbContext.Organizations.Add(organization);
 
-            // Create Owner entry in UserOrganizations
-            var userOrganization = new UserOrganization
+            // Create Owner entry in OrganizationUsers
+            var OrganizationUser = new OrganizationUser
             {
                 Id = Guid.NewGuid(),
                 UserId = userId,
@@ -110,7 +116,7 @@ public async Task<Organization> CreateOrganizationAsync(Organization organizatio
                 CreatedBy = userId
             };
 
-            _dbContext.UserOrganizations.Add(userOrganization);
+            _dbContext.OrganizationUsers.Add(OrganizationUser);
             await _dbContext.SaveChangesAsync();
 
             // add organization settings record with defaults
@@ -143,7 +149,7 @@ public async Task<Organization> CreateOrganizationAsync(Organization organizatio
         public async Task<Organization?> GetOrganizationByIdAsync(Guid organizationId)
         {
             return await _dbContext.Organizations
-                .Include(o => o.UserOrganizations)
+                .Include(o => o.OrganizationUsers)
                 .FirstOrDefaultAsync(o => o.Id == organizationId && !o.IsDeleted);
         }
 
@@ -159,11 +165,11 @@ public async Task<List<Organization>> GetOwnedOrganizationsAsync(string userId)
         }
 
         /// <summary>
-        /// Get all organizations a user has access to (via UserOrganizations)
+        /// Get all organizations a user has access to (via OrganizationUsers)
         /// </summary>
-        public async Task<List<UserOrganization>> GetUserOrganizationsAsync(string userId)
+        public async Task<List<OrganizationUser>> GetOrganizationUsersAsync(string userId)
         {
-            return await _dbContext.UserOrganizations
+            return await _dbContext.OrganizationUsers
                 .Include(uo => uo.Organization)
                 .Where(uo => uo.UserId == userId && uo.IsActive && !uo.IsDeleted)
                 .Where(uo => !uo.Organization.IsDeleted)
@@ -205,8 +211,8 @@ public async Task<bool> DeleteOrganizationAsync(Guid organizationId, string dele
             organization.LastModifiedOn = DateTime.UtcNow;
             organization.LastModifiedBy = deletedBy;
 
-            // Soft delete all UserOrganizations entries
-            var userOrgs = await _dbContext.UserOrganizations
+            // Soft delete all OrganizationUsers entries
+            var userOrgs = await _dbContext.OrganizationUsers
                 .Where(uo => uo.OrganizationId == organizationId)
                 .ToListAsync();
 
@@ -250,7 +256,7 @@ public async Task<bool> IsAdministratorAsync(string userId, Guid organizationId)
         /// </summary>
         public async Task<bool> CanAccessOrganizationAsync(string userId, Guid organizationId)
         {
-            return await _dbContext.UserOrganizations
+            return await _dbContext.OrganizationUsers
                 .AnyAsync(uo => uo.UserId == userId 
                     && uo.OrganizationId == organizationId 
                     && uo.IsActive 
@@ -262,7 +268,7 @@ public async Task<bool> CanAccessOrganizationAsync(string userId, Guid organizat
         /// </summary>
         public async Task<string?> GetUserRoleForOrganizationAsync(string userId, Guid organizationId)
         {
-            var userOrg = await _dbContext.UserOrganizations
+            var userOrg = await _dbContext.OrganizationUsers
                 .FirstOrDefaultAsync(uo => uo.UserId == userId 
                     && uo.OrganizationId == organizationId 
                     && uo.IsActive 
@@ -289,8 +295,26 @@ public async Task<bool> GrantOrganizationAccessAsync(string userId, Guid organiz
             if (organization == null || organization.IsDeleted)
                 return false;
 
+            // Check user limit for SimpleStart (MaxOrganizationUsers > 0)
+            if (_settings.MaxOrganizationUsers > 0)
+            {
+                var currentUserCount = await _dbContext.OrganizationUsers
+                    .Where(ou => ou.OrganizationId == organizationId
+                              && ou.UserId != ApplicationConstants.SystemUser.Id
+                              && ou.IsActive
+                              && !ou.IsDeleted)
+                    .CountAsync();
+
+                if (currentUserCount >= _settings.MaxOrganizationUsers)
+                {
+                    throw new InvalidOperationException(
+                        $"User limit reached. SimpleStart allows maximum {_settings.MaxOrganizationUsers} user accounts (including system account). " +
+                        "Upgrade to Aquiis Professional for unlimited users.");
+                }
+            }
+
             // Check if user already has access
-            var existing = await _dbContext.UserOrganizations
+            var existing = await _dbContext.OrganizationUsers
                 .FirstOrDefaultAsync(uo => uo.UserId == userId && uo.OrganizationId == organizationId);
 
             if (existing != null)
@@ -314,7 +338,7 @@ public async Task<bool> GrantOrganizationAccessAsync(string userId, Guid organiz
             else
             {
                 // Create new access
-                var userOrganization = new UserOrganization
+                var OrganizationUser = new OrganizationUser
                 {
                     Id = Guid.NewGuid(),
                     UserId = userId,
@@ -327,7 +351,7 @@ public async Task<bool> GrantOrganizationAccessAsync(string userId, Guid organiz
                     CreatedBy = grantedBy
                 };
 
-                _dbContext.UserOrganizations.Add(userOrganization);
+                _dbContext.OrganizationUsers.Add(OrganizationUser);
             }
 
             await _dbContext.SaveChangesAsync();
@@ -339,7 +363,7 @@ public async Task<bool> GrantOrganizationAccessAsync(string userId, Guid organiz
         /// </summary>
         public async Task<bool> RevokeOrganizationAccessAsync(string userId, Guid organizationId, string revokedBy)
         {
-            var userOrg = await _dbContext.UserOrganizations
+            var userOrg = await _dbContext.OrganizationUsers
                 .FirstOrDefaultAsync(uo => uo.UserId == userId 
                     && uo.OrganizationId == organizationId 
                     && uo.IsActive);
@@ -373,7 +397,7 @@ public async Task<bool> UpdateUserRoleAsync(string userId, Guid organizationId,
             if (!ApplicationConstants.OrganizationRoles.IsValid(newRole))
                 throw new ArgumentException($"Invalid role: {newRole}");
 
-            var userOrg = await _dbContext.UserOrganizations
+            var userOrg = await _dbContext.OrganizationUsers
                 .FirstOrDefaultAsync(uo => uo.UserId == userId 
                     && uo.OrganizationId == organizationId 
                     && uo.IsActive 
@@ -401,9 +425,9 @@ public async Task<bool> UpdateUserRoleAsync(string userId, Guid organizationId,
         /// <summary>
         /// Get all users with access to an organization
         /// </summary>
-        public async Task<List<UserOrganization>> GetOrganizationUsersAsync(Guid organizationId)
+        public async Task<List<OrganizationUser>> GetOrganizationUsersAsync(Guid organizationId)
         {
-            return await _dbContext.UserOrganizations
+            return await _dbContext.OrganizationUsers
                 .Where(uo => uo.OrganizationId == organizationId && uo.IsActive && !uo.IsDeleted && uo.UserId != ApplicationConstants.SystemUser.Id)
                 .OrderBy(uo => uo.Role)
                 .ThenBy(uo => uo.UserId)
@@ -413,13 +437,13 @@ public async Task<List<UserOrganization>> GetOrganizationUsersAsync(Guid organiz
         /// <summary>
         /// Get all organization assignments for a user (including revoked)
         /// </summary>
-        public async Task<List<UserOrganization>> GetUserAssignmentsAsync()
+        public async Task<List<OrganizationUser>> GetUserAssignmentsAsync()
         {
             var userId = await _userContext.GetUserIdAsync();
             if (string.IsNullOrEmpty(userId))
                 throw new InvalidOperationException("Cannot get user assignments: User ID is not available in context.");
 
-            return await _dbContext.UserOrganizations
+            return await _dbContext.OrganizationUsers
                 .Include(uo => uo.Organization)
                 .Where(uo => uo.UserId == userId && !uo.IsDeleted && uo.UserId != ApplicationConstants.SystemUser.Id)
                 .OrderByDescending(uo => uo.IsActive)
@@ -430,13 +454,13 @@ public async Task<List<UserOrganization>> GetUserAssignmentsAsync()
         /// <summary>
         /// Get all organization assignments for a user (including revoked)
         /// </summary>
-        public async Task<List<UserOrganization>> GetActiveUserAssignmentsAsync()
+        public async Task<List<OrganizationUser>> GetActiveUserAssignmentsAsync()
         {
             var userId = await _userContext.GetUserIdAsync();
             if (string.IsNullOrEmpty(userId))
                 throw new InvalidOperationException("Cannot get user assignments: User ID is not available in context.");
 
-            return await _dbContext.UserOrganizations
+            return await _dbContext.OrganizationUsers
                 .Include(uo => uo.Organization)
                 .Where(uo => uo.UserId == userId && !uo.IsDeleted && uo.IsActive && uo.UserId != ApplicationConstants.SystemUser.Id)
                 .OrderByDescending(uo => uo.IsActive)
diff --git a/2-Aquiis.Application/Services/PaymentService.cs b/2-Aquiis.Application/Services/PaymentService.cs
index 9c10a33..11993e4 100644
--- a/2-Aquiis.Application/Services/PaymentService.cs
+++ b/2-Aquiis.Application/Services/PaymentService.cs
@@ -77,7 +77,8 @@ protected override async Task ValidateEntityAsync(Payment entity)
                         .SumAsync(p => p.Amount);
 
                     var totalWithThisPayment = existingPayments + entity.Amount;
-                    var invoiceTotal = invoice.Amount + (invoice.LateFeeAmount ?? 0);
+                    // Invoice amount already includes late fees (added by ScheduledTaskService)
+                    var invoiceTotal = invoice.Amount;
 
                     if (totalWithThisPayment > invoiceTotal)
                     {
@@ -105,6 +106,12 @@ protected override async Task ValidateEntityAsync(Payment entity)
         /// </summary>
         public override async Task<Payment> CreateAsync(Payment entity)
         {
+            // Auto-generate payment number if not provided
+            if (string.IsNullOrWhiteSpace(entity.PaymentNumber))
+            {
+                entity.PaymentNumber = await GeneratePaymentNumberAsync();
+            }
+
             var payment = await base.CreateAsync(entity);
             await UpdateInvoiceAfterPaymentChangeAsync(payment.InvoiceId);
             return payment;
@@ -252,6 +259,34 @@ public async Task<List<Payment>> GetPaymentsByDateRangeAsync(DateTime startDate,
             }
         }
 
+         /// <summary>
+        /// Gets payments with all related entities loaded.
+        /// </summary>
+        public async Task<List<Payment>> GetPaymentsWithRelationsAsync()
+        {
+            try
+            {
+                var organizationId = await _userContext.GetActiveOrganizationIdAsync();
+
+                return await _context.Payments
+                    .Include(p => p.Invoice)
+                        .ThenInclude(i => i.Lease)
+                            .ThenInclude(l => l.Property)
+                    .Include(p => p.Invoice)
+                        .ThenInclude(i => i.Lease)
+                            .ThenInclude(l => l.Tenant)
+                    .Include(p => p.Document)
+                    .Where(p => !p.IsDeleted
+                        && p.OrganizationId == organizationId)
+                    .ToListAsync();
+            }
+            catch (Exception ex)
+            {
+                await HandleExceptionAsync(ex, "GetPaymentsWithRelations");
+                throw;
+            }
+        }
+
         /// <summary>
         /// Calculates the total payments received within a date range.
         /// </summary>
@@ -339,6 +374,32 @@ public async Task<decimal> GetTotalPaidForInvoiceAsync(Guid invoiceId)
             }
         }
 
+        /// <summary>
+        /// Generates a unique payment number in the format PYMT-YYYYMMDD-####.
+        /// </summary>
+        public async Task<string> GeneratePaymentNumberAsync()
+        {
+            try
+            {
+                var organizationId = await _userContext.GetActiveOrganizationIdAsync();
+                var today = DateTime.Now.Date;
+                
+                // Get count of payments for today to generate sequential number
+                var todayPaymentCount = await _context.Payments
+                    .Where(p => p.OrganizationId == organizationId 
+                        && p.PaidOn.Date == today)
+                    .CountAsync();
+
+                var nextNumber = todayPaymentCount + 1;
+                return $"PYMT-{DateTime.Now:yyyyMMdd}-{nextNumber:D4}";
+            }
+            catch (Exception ex)
+            {
+                await HandleExceptionAsync(ex, "GeneratePaymentNumber");
+                throw;
+            }
+        }
+
         /// <summary>
         /// Updates the invoice status and paid amount after a payment change.
         /// </summary>
@@ -359,39 +420,45 @@ private async Task UpdateInvoiceAfterPaymentChangeAsync(Guid invoiceId)
 
                     invoice.AmountPaid = totalPaid;
 
-                    var totalDue = invoice.Amount + (invoice.LateFeeAmount ?? 0);
+                    // Total due is the invoice amount (which includes late fees already added by ScheduledTaskService)
+                    var totalDue = invoice.Amount;
 
                     // Update invoice status based on payment
-                    if (totalPaid >= totalDue)
-                    {
-                        invoice.Status = ApplicationConstants.InvoiceStatuses.Paid;
-                        invoice.PaidOn = invoice.Payments
-                            .Where(p => !p.IsDeleted)
-                            .OrderByDescending(p => p.PaidOn)
-                            .FirstOrDefault()?.PaidOn ?? DateTime.UtcNow;
-                    }
-                    else if (totalPaid > 0 && invoice.Status != ApplicationConstants.InvoiceStatuses.Cancelled)
+                    // Don't change status if invoice is Cancelled or Voided
+                    if (invoice.Status != ApplicationConstants.InvoiceStatuses.Cancelled 
+                        && invoice.Status != ApplicationConstants.InvoiceStatuses.Voided)
                     {
-                        // Invoice is partially paid
-                        if (invoice.DueOn < DateTime.Today)
+                        if (totalPaid >= totalDue)
                         {
-                            invoice.Status = ApplicationConstants.InvoiceStatuses.Overdue;
+                            invoice.Status = ApplicationConstants.InvoiceStatuses.Paid;
+                            invoice.PaidOn = invoice.Payments
+                                .Where(p => !p.IsDeleted)
+                                .OrderByDescending(p => p.PaidOn)
+                                .FirstOrDefault()?.PaidOn ?? DateTime.UtcNow;
                         }
-                        else
-                        {
-                            invoice.Status = ApplicationConstants.InvoiceStatuses.Pending;
-                        }
-                    }
-                    else if (invoice.Status != ApplicationConstants.InvoiceStatuses.Cancelled)
-                    {
-                        // No payments
-                        if (invoice.DueOn < DateTime.Today)
+                        else if (totalPaid > 0)
                         {
-                            invoice.Status = ApplicationConstants.InvoiceStatuses.Overdue;
+                            // Invoice is partially paid
+                            if (invoice.DueOn < DateTime.Today)
+                            {
+                                invoice.Status = ApplicationConstants.InvoiceStatuses.Overdue;
+                            }
+                            else
+                            {
+                                invoice.Status = ApplicationConstants.InvoiceStatuses.PaidPartial;
+                            }
                         }
                         else
                         {
-                            invoice.Status = ApplicationConstants.InvoiceStatuses.Pending;
+                            // No payments
+                            if (invoice.DueOn < DateTime.Today)
+                            {
+                                invoice.Status = ApplicationConstants.InvoiceStatuses.Overdue;
+                            }
+                            else
+                            {
+                                invoice.Status = ApplicationConstants.InvoiceStatuses.Pending;
+                            }
                         }
                     }
 
diff --git a/2-Aquiis.Application/Services/PropertyService.cs b/2-Aquiis.Application/Services/PropertyService.cs
index 3cbabc5..aa29d2f 100644
--- a/2-Aquiis.Application/Services/PropertyService.cs
+++ b/2-Aquiis.Application/Services/PropertyService.cs
@@ -69,6 +69,8 @@ public override async Task<Property> CreateAsync(Property property)
                 return await _context.Properties
                     .Include(p => p.Leases)
                     .Include(p => p.Documents)
+                    .Include(p => p.Repairs)
+                    .Include(p => p.MaintenanceRequests)
                     .FirstOrDefaultAsync(p => p.Id == propertyId && 
                                             p.OrganizationId == organizationId && 
                                             !p.IsDeleted);
@@ -98,6 +100,8 @@ public async Task<List<Property>> GetPropertiesWithRelationsAsync()
                 return await _context.Properties
                     .Include(p => p.Leases)
                     .Include(p => p.Documents)
+                    .Include(p => p.Repairs)
+                    .Include(p => p.MaintenanceRequests)
                     .Where(p => !p.IsDeleted && p.OrganizationId == organizationId)
                     .ToListAsync();
             }
@@ -234,7 +238,7 @@ public async Task<decimal> CalculateOccupancyRateAsync()
                 var organizationId = await _userContext.GetActiveOrganizationIdAsync();
 
                 var totalProperties = await _context.Properties
-                    .CountAsync(p => !p.IsDeleted && p.IsAvailable && p.OrganizationId == organizationId);
+                    .CountAsync(p => !p.IsDeleted && p.OrganizationId == organizationId);
 
                 if (totalProperties == 0)
                 {
@@ -243,7 +247,6 @@ public async Task<decimal> CalculateOccupancyRateAsync()
 
                 var occupiedProperties = await _context.Properties
                     .CountAsync(p => !p.IsDeleted && 
-                                    p.IsAvailable && 
                                     p.OrganizationId == organizationId &&
                                     _context.Leases.Any(l =>
                                         l.PropertyId == p.Id &&
@@ -259,6 +262,164 @@ public async Task<decimal> CalculateOccupancyRateAsync()
             }
         }
 
+        /// <summary>
+        /// Calculates the annual occupancy rate for a single property based on days occupied.
+        /// Default period starts April 1 of current year (fiscal year).
+        /// </summary>
+        /// <param name="propertyId">Property ID to calculate occupancy for</param>
+        /// <param name="periodStart">Start date of annual period (defaults to April 1 of current year)</param>
+        /// <returns>Occupancy rate as percentage (0-100)</returns>
+        public async Task<decimal> CalculatePropertyOccupancyRateAsync(Guid propertyId, DateTime? periodStart = null)
+        {
+            try
+            {
+                var organizationId = await _userContext.GetActiveOrganizationIdAsync();
+
+                // Default to April 1 of current year if not specified
+                var startDate = periodStart ?? new DateTime(DateTime.Today.Year, 4, 1);
+                var endDate = startDate.AddYears(1).AddDays(-1);
+
+                // Get all leases for this property that overlap with the period
+                // Include all occupied statuses: Active, Renewed, Month-to-Month, Notice Given, Terminated
+                var leases = await _context.Leases
+                    .Where(l => l.PropertyId == propertyId &&
+                               l.OrganizationId == organizationId &&
+                               !l.IsDeleted &&
+                               (l.Status == ApplicationConstants.LeaseStatuses.Active || 
+                                l.Status == ApplicationConstants.LeaseStatuses.Renewed ||
+                                l.Status == ApplicationConstants.LeaseStatuses.MonthToMonth ||
+                                l.Status == ApplicationConstants.LeaseStatuses.NoticeGiven ||
+                                l.Status == ApplicationConstants.LeaseStatuses.Terminated) &&
+                               l.StartDate <= endDate)
+                    .ToListAsync();
+
+                // Calculate days occupied within the period
+                var daysOccupied = 0;
+                foreach (var lease in leases)
+                {
+                    // For terminated leases, use ActualMoveOutDate; otherwise use EndDate
+                    var effectiveEndDate = lease.Status == ApplicationConstants.LeaseStatuses.Terminated && lease.ActualMoveOutDate.HasValue
+                        ? lease.ActualMoveOutDate.Value
+                        : lease.EndDate;
+                    
+                    // Only count if lease overlaps with report period
+                    if (effectiveEndDate >= startDate)
+                    {
+                        var leaseStart = lease.StartDate < startDate ? startDate : lease.StartDate;
+                        var leaseEnd = effectiveEndDate > endDate ? endDate : effectiveEndDate;
+                    
+                        if (leaseEnd >= leaseStart)
+                        {
+                            daysOccupied += (leaseEnd - leaseStart).Days + 1; // +1 to include both start and end dates
+                        }
+                    }
+                }
+
+                // Calculate total days in period
+                var totalDays = (endDate - startDate).Days + 1;
+
+                // Return occupancy rate as percentage
+                return totalDays > 0 ? (decimal)daysOccupied / totalDays * 100 : 0;
+            }
+            catch (Exception ex)
+            {
+                await HandleExceptionAsync(ex, "CalculatePropertyOccupancyRate");
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Calculates the annual occupancy rate for the entire portfolio.
+        /// Average of all properties' occupancy rates weighted by number of properties.
+        /// Default period starts April 1 of current year (fiscal year).
+        /// </summary>
+        /// <param name="periodStart">Start date of annual period (defaults to April 1 of current year)</param>
+        /// <returns>Portfolio occupancy rate as percentage (0-100)</returns>
+        public async Task<decimal> CalculatePortfolioOccupancyRateAsync(DateTime? periodStart = null)
+        {
+            try
+            {
+                var organizationId = await _userContext.GetActiveOrganizationIdAsync();
+
+                // Get all properties for the organization
+                var properties = await _context.Properties
+                    .Where(p => !p.IsDeleted && p.OrganizationId == organizationId)
+                    .Select(p => p.Id)
+                    .ToListAsync();
+
+                if (properties.Count == 0)
+                {
+                    return 0;
+                }
+
+                // Calculate total occupied days and total available days across all properties
+                // Default to current fiscal year (April 1 - March 31)
+                // If today is Jan-Mar, use April 1 of previous year
+                // If today is Apr-Dec, use April 1 of current year
+                DateTime startDate;
+                if (periodStart.HasValue)
+                {
+                    startDate = periodStart.Value;
+                }
+                else
+                {
+                    var today = DateTime.Today;
+                    startDate = today.Month < 4 
+                        ? new DateTime(today.Year - 1, 4, 1) 
+                        : new DateTime(today.Year, 4, 1);
+                }
+                var endDate = startDate.AddYears(1).AddDays(-1);
+                var totalDays = (endDate - startDate).Days + 1;
+
+                var totalDaysOccupied = 0;
+                var totalDaysAvailable = properties.Count * totalDays;
+
+                // For each property, calculate days occupied
+                foreach (var propertyId in properties)
+                {
+                    var leases = await _context.Leases
+                        .Where(l => l.PropertyId == propertyId &&
+                                   l.OrganizationId == organizationId &&
+                                   !l.IsDeleted &&
+                                   (l.Status == ApplicationConstants.LeaseStatuses.Active || 
+                                    l.Status == ApplicationConstants.LeaseStatuses.Renewed ||
+                                    l.Status == ApplicationConstants.LeaseStatuses.MonthToMonth ||
+                                    l.Status == ApplicationConstants.LeaseStatuses.NoticeGiven ||
+                                    l.Status == ApplicationConstants.LeaseStatuses.Terminated) &&
+                                   l.StartDate <= endDate)
+                        .ToListAsync();
+
+                    foreach (var lease in leases)
+                    {
+                        // For terminated leases, use ActualMoveOutDate; otherwise use EndDate
+                        var effectiveEndDate = lease.Status == ApplicationConstants.LeaseStatuses.Terminated && lease.ActualMoveOutDate.HasValue
+                            ? lease.ActualMoveOutDate.Value
+                            : lease.EndDate;
+                        
+                        // Only count if lease overlaps with report period
+                        if (effectiveEndDate >= startDate)
+                        {
+                            var leaseStart = lease.StartDate < startDate ? startDate : lease.StartDate;
+                            var leaseEnd = effectiveEndDate > endDate ? endDate : effectiveEndDate;
+                        
+                            if (leaseEnd >= leaseStart)
+                            {
+                                totalDaysOccupied += (leaseEnd - leaseStart).Days + 1;
+                            }
+                        }
+                    }
+                }
+
+                // Return portfolio occupancy rate
+                return totalDaysAvailable > 0 ? (decimal)totalDaysOccupied / totalDaysAvailable * 100 : 0;
+            }
+            catch (Exception ex)
+            {
+                await HandleExceptionAsync(ex, "CalculatePortfolioOccupancyRate");
+                throw;
+            }
+        }
+
         /// <summary>
         /// Retrieves properties that need routine inspection.
         /// </summary>
diff --git a/2-Aquiis.Application/Services/RepairService.cs b/2-Aquiis.Application/Services/RepairService.cs
new file mode 100644
index 0000000..1d96373
--- /dev/null
+++ b/2-Aquiis.Application/Services/RepairService.cs
@@ -0,0 +1,346 @@
+using Aquiis.Core.Constants;
+using Aquiis.Core.Entities;
+using Aquiis.Core.Interfaces.Services;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Aquiis.Application.Services;
+
+/// <summary>
+/// Service for managing repairs (work performed on properties WITHOUT workflow/status tracking).
+/// Repairs can be standalone or part of a MaintenanceRequest composition.
+/// </summary>
+public class RepairService : BaseService<Repair>
+{
+    public RepairService(
+        ApplicationDbContext context,
+        ILogger<RepairService> logger,
+        IUserContextService userContext,
+        IOptions<ApplicationSettings> settings)
+        : base(context, logger, userContext, settings)
+    {
+    }
+
+    /// <summary>
+    /// Validates repair business rules before create/update.
+    /// </summary>
+    protected override async Task ValidateEntityAsync(Repair entity)
+    {
+        var orgId = await _userContext.GetActiveOrganizationIdAsync();
+
+        // Validate PropertyId exists and belongs to active organization
+        var propertyExists = await _context.Properties
+            .AnyAsync(p => p.Id == entity.PropertyId && p.OrganizationId == orgId && !p.IsDeleted);
+        
+        if (!propertyExists)
+        {
+            throw new InvalidOperationException("Property not found or does not belong to your organization.");
+        }
+
+        // Validate MaintenanceRequestId if provided
+        if (entity.MaintenanceRequestId.HasValue)
+        {
+            var maintenanceRequest = await _context.MaintenanceRequests
+                .Include(mr => mr.Property)
+                .FirstOrDefaultAsync(mr => mr.Id == entity.MaintenanceRequestId.Value && !mr.IsDeleted);
+
+            if (maintenanceRequest == null)
+            {
+                throw new InvalidOperationException("Maintenance request not found.");
+            }
+
+            if (maintenanceRequest.Property?.OrganizationId != orgId)
+            {
+                throw new InvalidOperationException("Maintenance request does not belong to your organization.");
+            }
+
+            // Ensure repair belongs to same property as maintenance request
+            if (maintenanceRequest.PropertyId != entity.PropertyId)
+            {
+                throw new InvalidOperationException("Repair must belong to the same property as the maintenance request.");
+            }
+        }
+
+        // Validate LeaseId if provided
+        if (entity.LeaseId.HasValue)
+        {
+            var lease = await _context.Leases
+                .Include(l => l.Property)
+                .FirstOrDefaultAsync(l => l.Id == entity.LeaseId.Value && !l.IsDeleted);
+
+            if (lease == null)
+            {
+                throw new InvalidOperationException("Lease not found.");
+            }
+
+            if (lease.Property?.OrganizationId != orgId)
+            {
+                throw new InvalidOperationException("Lease does not belong to your organization.");
+            }
+
+            // Ensure repair belongs to same property as lease
+            if (lease.PropertyId != entity.PropertyId)
+            {
+                throw new InvalidOperationException("Repair must belong to the same property as the lease.");
+            }
+        }
+
+        // Validate CompletedOn not in future
+        if (entity.CompletedOn.HasValue && entity.CompletedOn.Value > DateTime.UtcNow)
+        {
+            throw new InvalidOperationException("Completion date cannot be in the future.");
+        }
+
+        // Validate Cost is non-negative
+        if (entity.Cost < 0)
+        {
+            throw new InvalidOperationException("Cost cannot be negative.");
+        }
+
+        // Validate DurationMinutes is non-negative
+        if (entity.DurationMinutes < 0)
+        {
+            throw new InvalidOperationException("Duration cannot be negative.");
+        }
+
+        // Validate warranty dates
+        if (entity.WarrantyApplies && entity.WarrantyExpiresOn.HasValue)
+        {
+            if (!entity.CompletedOn.HasValue)
+            {
+                throw new InvalidOperationException("Warranty expiration date requires a completion date.");
+            }
+
+            if (entity.WarrantyExpiresOn.Value <= entity.CompletedOn.Value)
+            {
+                throw new InvalidOperationException("Warranty expiration date must be after completion date.");
+            }
+        }
+
+        await base.ValidateEntityAsync(entity);
+    }
+
+    /// <summary>
+    /// Gets all repairs for the active organization with Property navigation included.
+    /// Overrides base method to include navigation properties.
+    /// </summary>
+    public override async Task<List<Repair>> GetAllAsync()
+    {
+        var orgId = await _userContext.GetActiveOrganizationIdAsync();
+
+        return await _dbSet
+            .Where(r => !r.IsDeleted && r.OrganizationId == orgId)
+            .Include(r => r.Property)
+            .OrderByDescending(r => r.CompletedOn ?? r.CreatedOn)
+            .ToListAsync();
+    }
+
+    /// <summary>
+    /// Gets all repairs for a specific property.
+    /// </summary>
+    public async Task<List<Repair>> GetRepairsByPropertyAsync(Guid propertyId)
+    {
+        var orgId = await _userContext.GetActiveOrganizationIdAsync();
+
+        return await _dbSet
+            .Where(r => r.PropertyId == propertyId && !r.IsDeleted)
+            .Include(r => r.Property)
+            .Include(r => r.MaintenanceRequest)
+            .Include(r => r.Lease)
+            .Where(r => r.Property!.OrganizationId == orgId)
+            .OrderByDescending(r => r.CompletedOn ?? r.CreatedOn)
+            .ToListAsync();
+    }
+
+    /// <summary>
+    /// Gets all repairs that are part of a specific maintenance request.
+    /// </summary>
+    public async Task<List<Repair>> GetRepairsByMaintenanceRequestAsync(Guid maintenanceRequestId)
+    {
+        var orgId = await _userContext.GetActiveOrganizationIdAsync();
+
+        return await _dbSet
+            .Where(r => r.MaintenanceRequestId == maintenanceRequestId && !r.IsDeleted)
+            .Include(r => r.Property)
+            .Include(r => r.MaintenanceRequest)
+            .Include(r => r.Lease)
+            .Where(r => r.Property!.OrganizationId == orgId)
+            .OrderByDescending(r => r.CompletedOn ?? r.CreatedOn)
+            .ToListAsync();
+    }
+
+    /// <summary>
+    /// Gets all standalone repairs (not associated with any maintenance request).
+    /// These are repairs logged directly without workflow.
+    /// </summary>
+    public async Task<List<Repair>> GetStandaloneRepairsAsync()
+    {
+        var orgId = await _userContext.GetActiveOrganizationIdAsync();
+
+        return await _dbSet
+            .Where(r => r.MaintenanceRequestId == null && !r.IsDeleted)
+            .Include(r => r.Property)
+            .Include(r => r.Lease)
+            .Where(r => r.Property!.OrganizationId == orgId)
+            .OrderByDescending(r => r.CompletedOn ?? r.CreatedOn)
+            .ToListAsync();
+    }
+
+    /// <summary>
+    /// Gets all repairs completed within a date range.
+    /// </summary>
+    public async Task<List<Repair>> GetRepairsByDateRangeAsync(DateTime startDate, DateTime endDate)
+    {
+        var orgId = await _userContext.GetActiveOrganizationIdAsync();
+
+        return await _dbSet
+            .Where(r => r.CompletedOn.HasValue && 
+                       r.CompletedOn.Value >= startDate && 
+                       r.CompletedOn.Value <= endDate && 
+                       !r.IsDeleted)
+            .Include(r => r.Property)
+            .Include(r => r.MaintenanceRequest)
+            .Include(r => r.Lease)
+            .Where(r => r.Property!.OrganizationId == orgId)
+            .OrderByDescending(r => r.CompletedOn)
+            .ToListAsync();
+    }
+
+    /// <summary>
+    /// Gets repairs in progress (CompletedOn is null).
+    /// </summary>
+    public async Task<List<Repair>> GetRepairsInProgressAsync()
+    {
+        var orgId = await _userContext.GetActiveOrganizationIdAsync();
+
+        return await _dbSet
+            .Where(r => !r.CompletedOn.HasValue && !r.IsDeleted)
+            .Include(r => r.Property)
+            .Include(r => r.MaintenanceRequest)
+            .Include(r => r.Lease)
+            .Where(r => r.Property!.OrganizationId == orgId)
+            .OrderByDescending(r => r.CreatedOn)
+            .ToListAsync();
+    }
+
+    /// <summary>
+    /// Gets repair cost summary by property, optionally filtered by date range.
+    /// </summary>
+    public async Task<Dictionary<Guid, decimal>> GetRepairCostsByPropertyAsync(DateTime? startDate = null, DateTime? endDate = null)
+    {
+        var orgId = await _userContext.GetActiveOrganizationIdAsync();
+
+        var query = _dbSet
+            .Where(r => !r.IsDeleted)
+            .Include(r => r.Property)
+            .Where(r => r.Property!.OrganizationId == orgId);
+
+        if (startDate.HasValue)
+        {
+            query = query.Where(r => r.CompletedOn.HasValue && r.CompletedOn.Value >= startDate.Value);
+        }
+
+        if (endDate.HasValue)
+        {
+            query = query.Where(r => r.CompletedOn.HasValue && r.CompletedOn.Value <= endDate.Value);
+        }
+
+        return await query
+            .GroupBy(r => r.PropertyId)
+            .Select(g => new { PropertyId = g.Key, TotalCost = g.Sum(r => r.Cost) })
+            .ToDictionaryAsync(x => x.PropertyId, x => x.TotalCost);
+    }
+
+    /// <summary>
+    /// Gets all repairs currently under warranty.
+    /// </summary>
+    public async Task<List<Repair>> GetRepairsUnderWarrantyAsync()
+    {
+        var orgId = await _userContext.GetActiveOrganizationIdAsync();
+        var today = DateTime.UtcNow;
+
+        return await _dbSet
+            .Where(r => r.WarrantyApplies && 
+                       r.WarrantyExpiresOn.HasValue && 
+                       r.WarrantyExpiresOn.Value >= today && 
+                       !r.IsDeleted)
+            .Include(r => r.Property)
+            .Include(r => r.MaintenanceRequest)
+            .Include(r => r.Lease)
+            .Where(r => r.Property!.OrganizationId == orgId)
+            .OrderBy(r => r.WarrantyExpiresOn)
+            .ToListAsync();
+    }
+
+    /// <summary>
+    /// Gets repairs by type for reporting/analytics.
+    /// </summary>
+    public async Task<Dictionary<string, int>> GetRepairCountsByTypeAsync(DateTime? startDate = null, DateTime? endDate = null)
+    {
+        var orgId = await _userContext.GetActiveOrganizationIdAsync();
+
+        var query = _dbSet
+            .Where(r => !r.IsDeleted)
+            .Include(r => r.Property)
+            .Where(r => r.Property!.OrganizationId == orgId);
+
+        if (startDate.HasValue)
+        {
+            query = query.Where(r => r.CompletedOn.HasValue && r.CompletedOn.Value >= startDate.Value);
+        }
+
+        if (endDate.HasValue)
+        {
+            query = query.Where(r => r.CompletedOn.HasValue && r.CompletedOn.Value <= endDate.Value);
+        }
+
+        return await query
+            .GroupBy(r => r.RepairType)
+            .Select(g => new { RepairType = g.Key, Count = g.Count() })
+            .ToDictionaryAsync(x => x.RepairType, x => x.Count);
+    }
+
+    /// <summary>
+    /// Gets total repair costs for the organization within a date range.
+    /// </summary>
+    public async Task<decimal> GetTotalRepairCostsAsync(DateTime? startDate = null, DateTime? endDate = null)
+    {
+        var orgId = await _userContext.GetActiveOrganizationIdAsync();
+
+        var query = _dbSet
+            .Where(r => !r.IsDeleted)
+            .Include(r => r.Property)
+            .Where(r => r.Property!.OrganizationId == orgId);
+
+        if (startDate.HasValue)
+        {
+            query = query.Where(r => r.CompletedOn.HasValue && r.CompletedOn.Value >= startDate.Value);
+        }
+
+        if (endDate.HasValue)
+        {
+            query = query.Where(r => r.CompletedOn.HasValue && r.CompletedOn.Value <= endDate.Value);
+        }
+
+        return await query.SumAsync(r => r.Cost);
+    }
+
+    /// <summary>
+    /// Marks a repair as completed (sets CompletedOn to current timestamp).
+    /// </summary>
+    public async Task<Repair?> CompleteRepairAsync(Guid repairId)
+    {
+        var repair = await GetByIdAsync(repairId);
+        if (repair == null) return null;
+
+        if (repair.CompletedOn.HasValue)
+        {
+            throw new InvalidOperationException("Repair is already marked as completed.");
+        }
+
+        repair.CompletedOn = DateTime.UtcNow;
+        await UpdateAsync(repair);
+        return repair;
+    }
+}
diff --git a/2-Aquiis.Application/Services/SchemaValidationService.cs b/2-Aquiis.Application/Services/SchemaValidationService.cs
index 49e2b32..7762c14 100644
--- a/2-Aquiis.Application/Services/SchemaValidationService.cs
+++ b/2-Aquiis.Application/Services/SchemaValidationService.cs
@@ -52,7 +52,7 @@ public SchemaValidationService(
                         dbVersion);
                 }
 
-                _logger.LogInformation("Schema version validated successfully: {Version}", dbVersion);
+                _logger.LogDebug("Schema version validated successfully: {Version}", dbVersion);
                 return (true, $"Schema version {dbVersion} is valid", dbVersion);
             }
             catch (Exception ex)
diff --git a/2-Aquiis.Application/Services/SimpleStartFinancialReportService.cs b/2-Aquiis.Application/Services/SimpleStartFinancialReportService.cs
new file mode 100644
index 0000000..99cf7c3
--- /dev/null
+++ b/2-Aquiis.Application/Services/SimpleStartFinancialReportService.cs
@@ -0,0 +1,307 @@
+using Aquiis.Application.Services;
+using Aquiis.Core.Constants;
+using Aquiis.Core.Entities;
+using Aquiis.Infrastructure.Data;
+using Microsoft.EntityFrameworkCore;
+
+namespace Aquiis.Application.Services;
+
+/// <summary>
+/// SimpleStart-specific financial report service that uses Repairs for expenses
+/// instead of MaintenanceRequests (which are used in Professional edition).
+/// </summary>
+public class SimpleStartFinancialReportService
+{
+    private readonly IDbContextFactory<ApplicationDbContext> _contextFactory;
+
+    public SimpleStartFinancialReportService(IDbContextFactory<ApplicationDbContext> contextFactory)
+    {
+        _contextFactory = contextFactory;
+    }
+
+    /// <summary>
+    /// Generate income statement for a specific period and optional property.
+    /// Uses Repairs for expense tracking (SimpleStart approach).
+    /// </summary>
+    public async Task<IncomeStatement> GenerateIncomeStatementAsync(
+        Guid organizationId,
+        DateTime startDate,
+        DateTime endDate,
+        Guid? propertyId = null)
+    {
+        using var context = await _contextFactory.CreateDbContextAsync();
+
+        var statement = new IncomeStatement
+        {
+            StartDate = startDate,
+            EndDate = endDate,
+            PropertyId = propertyId
+        };
+
+        // Get property name if filtering by property
+        if (propertyId.HasValue)
+        {
+            var property = await context.Properties
+                .Where(p => p.Id == propertyId.Value && p.OrganizationId == organizationId)
+                .FirstOrDefaultAsync();
+            statement.PropertyName = property?.Address;
+        }
+
+        // Calculate total rent income from payments (all payments are rent payments)
+        var paymentsQuery = context.Payments
+            .Include(p => p.Invoice)
+            .ThenInclude(i => i.Lease)
+            .Where(p => p.Invoice.Lease.Property.OrganizationId == organizationId &&
+                       p.PaidOn >= startDate &&
+                       p.PaidOn <= endDate);
+
+        if (propertyId.HasValue)
+        {
+            paymentsQuery = paymentsQuery.Where(p => p.Invoice.Lease.PropertyId == propertyId.Value);
+        }
+
+        var totalPayments = await paymentsQuery.SumAsync(p => p.Amount);
+        statement.TotalRentIncome = totalPayments;
+        statement.TotalOtherIncome = 0; // No other income tracked currently
+
+        // Get repair expenses (SimpleStart uses Repairs instead of MaintenanceRequests)
+        var repairsQuery = context.Repairs
+            .Where(r => !r.IsDeleted &&
+                       r.OrganizationId == organizationId &&
+                       r.CompletedOn.HasValue &&
+                       r.CompletedOn.Value >= startDate &&
+                       r.CompletedOn.Value <= endDate &&
+                       r.Cost > 0);
+
+        if (propertyId.HasValue)
+        {
+            repairsQuery = repairsQuery.Where(r => r.PropertyId == propertyId.Value);
+        }
+
+        var repairs = await repairsQuery.ToListAsync();
+
+        // All repair costs go to MaintenanceExpenses
+        statement.MaintenanceExpenses = repairs.Sum(r => r.Cost);
+
+        // Other expense categories are currently zero (no data tracked for these yet)
+        statement.UtilityExpenses = 0;
+        statement.InsuranceExpenses = 0;
+        statement.TaxExpenses = 0;
+        statement.ManagementFees = 0;
+        statement.OtherExpenses = 0;
+
+        return statement;
+    }
+
+    /// <summary>
+    /// Generate property performance comparison report.
+    /// Uses Repairs for expense tracking (SimpleStart approach).
+    /// </summary>
+    public async Task<List<PropertyPerformance>> GeneratePropertyPerformanceAsync(
+        Guid organizationId,
+        DateTime startDate,
+        DateTime endDate)
+    {
+        using var context = await _contextFactory.CreateDbContextAsync();
+
+        var properties = await context.Properties
+            .Where(p => p.OrganizationId == organizationId)
+            .ToListAsync();
+
+        var performance = new List<PropertyPerformance>();
+        var totalDays = (endDate - startDate).Days + 1;
+
+        foreach (var property in properties)
+        {
+            // Calculate income from rent payments
+            var income = await context.Payments
+                .Include(p => p.Invoice)
+                .ThenInclude(i => i.Lease)
+                .Where(p => p.Invoice.Lease.PropertyId == property.Id &&
+                           p.PaidOn >= startDate &&
+                           p.PaidOn <= endDate)
+                .SumAsync(p => p.Amount);
+
+            // Calculate expenses from repairs (SimpleStart approach)
+            var expenses = await context.Repairs
+                .Where(r => !r.IsDeleted &&
+                           r.PropertyId == property.Id &&
+                           r.OrganizationId == organizationId &&
+                           r.CompletedOn.HasValue &&
+                           r.CompletedOn.Value >= startDate &&
+                           r.CompletedOn.Value <= endDate &&
+                           r.Cost > 0)
+                .SumAsync(r => r.Cost);
+
+            // Calculate occupancy days
+            // Include occupied lease statuses: Active, Renewed, Month-to-Month, Notice Given
+            // Also include Terminated to count actual days occupied before move-out
+            var leases = await context.Leases
+                .Where(l => l.PropertyId == property.Id &&
+                           !l.IsDeleted &&
+                           (l.Status == ApplicationConstants.LeaseStatuses.Active || 
+                            l.Status == ApplicationConstants.LeaseStatuses.Renewed ||
+                            l.Status == ApplicationConstants.LeaseStatuses.MonthToMonth ||
+                            l.Status == ApplicationConstants.LeaseStatuses.NoticeGiven ||
+                            l.Status == ApplicationConstants.LeaseStatuses.Terminated) &&
+                           l.StartDate <= endDate)
+                .ToListAsync();
+
+            var occupancyDays = 0;
+            foreach (var lease in leases)
+            {
+                // For terminated leases, use ActualMoveOutDate; otherwise use EndDate
+                var effectiveEndDate = lease.Status == ApplicationConstants.LeaseStatuses.Terminated && lease.ActualMoveOutDate.HasValue
+                    ? lease.ActualMoveOutDate.Value
+                    : lease.EndDate;
+
+                // Only count if lease overlaps with report period
+                if (effectiveEndDate >= startDate)
+                {
+                    var leaseStart = lease.StartDate > startDate ? lease.StartDate : startDate;
+                    var leaseEnd = effectiveEndDate < endDate ? effectiveEndDate : endDate;
+                    
+                    if (leaseEnd >= leaseStart)
+                    {
+                        occupancyDays += (leaseEnd - leaseStart).Days + 1;
+                    }
+                }
+            }
+
+            // Calculate ROI (simplified - based on profit margin since we don't track purchase price)
+            var roi = income > 0
+                ? ((income - expenses) / income) * 100
+                : 0;
+
+            performance.Add(new PropertyPerformance
+            {
+                PropertyId = property.Id,
+                PropertyName = property.Address,
+                PropertyAddress = property.Address,
+                TotalIncome = income,
+                TotalExpenses = expenses,
+                ROI = roi,
+                OccupancyDays = occupancyDays,
+                TotalDays = totalDays
+            });
+        }
+
+        return performance.OrderByDescending(p => p.NetIncome).ToList();
+    }
+
+    /// <summary>
+    /// Generate tax report data for Schedule E.
+    /// Uses Repairs for expense tracking (SimpleStart approach).
+    /// </summary>
+    public async Task<List<TaxReportData>> GenerateTaxReportAsync(Guid organizationId, int year, Guid? propertyId = null)
+    {
+        using var context = await _contextFactory.CreateDbContextAsync();
+        var startDate = new DateTime(year, 1, 1);
+        var endDate = new DateTime(year, 12, 31);
+
+        var propertiesQuery = context.Properties.Where(p => p.OrganizationId == organizationId);
+        if (propertyId.HasValue)
+        {
+            propertiesQuery = propertiesQuery.Where(p => p.Id == propertyId.Value);
+        }
+
+        var properties = await propertiesQuery.ToListAsync();
+        var taxReports = new List<TaxReportData>();
+
+        foreach (var property in properties)
+        {
+            // Calculate rent income from payments
+            var rentIncome = await context.Payments
+                .Include(p => p.Invoice)
+                .ThenInclude(i => i.Lease)
+                .Where(p => p.Invoice.Lease.PropertyId == property.Id &&
+                           p.PaidOn >= startDate &&
+                           p.PaidOn <= endDate)
+                .SumAsync(p => p.Amount);
+
+            // Get repair expenses (SimpleStart approach)
+            var repairExpenses = await context.Repairs
+                .Where(r => !r.IsDeleted &&
+                           r.PropertyId == property.Id &&
+                           r.OrganizationId == organizationId &&
+                           r.CompletedOn.HasValue &&
+                           r.CompletedOn.Value >= startDate &&
+                           r.CompletedOn.Value <= endDate &&
+                           r.Cost > 0)
+                .ToListAsync();
+
+            // Calculate depreciation (simplified - 27.5 years for residential rental)
+            // Note: Since we don't track purchase price, this should be manually entered
+            var depreciationAmount = 0m;
+
+            var totalRepairCost = repairExpenses.Sum(r => r.Cost);
+
+            var taxReport = new TaxReportData
+            {
+                Year = year,
+                PropertyId = property.Id,
+                PropertyName = property.Address,
+                TotalRentIncome = rentIncome,
+                DepreciationAmount = depreciationAmount,
+
+                // Currently only repairs are tracked
+                Advertising = 0,
+                Cleaning = 0,
+                Insurance = 0,
+                Legal = 0,
+                Management = 0,
+                MortgageInterest = 0,
+                Repairs = totalRepairCost, // All repair costs
+                Supplies = 0,
+                Taxes = 0,
+                Utilities = 0,
+                Other = 0
+            };
+
+            taxReport.TotalExpenses = totalRepairCost;
+
+            taxReports.Add(taxReport);
+        }
+
+        return taxReports;
+    }
+
+    /// <summary>
+    /// Generate rent roll report showing all properties and tenants.
+    /// This method is the same as base FinancialReportService since it doesn't involve expenses.
+    /// </summary>
+    public async Task<List<RentRollItem>> GenerateRentRollAsync(Guid organizationId, DateTime asOfDate)
+    {
+        using var context = await _contextFactory.CreateDbContextAsync();
+
+        var rentRoll = await context.Leases
+            .Include(l => l.Property)
+            .Include(l => l.Tenant)
+            .Include(l => l.Invoices)
+            .ThenInclude(i => i.Payments)
+            .Where(l => l.Property.OrganizationId == organizationId &&
+                       l.Tenant != null &&
+                       l.StartDate <= asOfDate &&
+                       l.EndDate >= asOfDate)
+            .OrderBy(l => l.Property.Address)
+            .ThenBy(l => l.Tenant!.LastName)
+            .Select(l => new RentRollItem
+            {
+                PropertyId = l.PropertyId,
+                PropertyName = l.Property.Address,
+                PropertyAddress = l.Property.Address,
+                TenantId = l.TenantId,
+                TenantName = $"{l.Tenant!.FirstName} {l.Tenant!.LastName}",
+                LeaseStatus = l.Status,
+                LeaseStartDate = l.StartDate,
+                LeaseEndDate = l.EndDate,
+                MonthlyRent = l.MonthlyRent,
+                SecurityDeposit = l.SecurityDeposit,
+                TotalPaid = l.Invoices.SelectMany(i => i.Payments).Sum(p => p.Amount),
+                TotalDue = l.Invoices.Where(i => i.Status != "Cancelled").Sum(i => i.Amount)
+            })
+            .ToListAsync();
+
+        return rentRoll;
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Components/Common/EntityFilterBar.razor b/3-Aquiis.UI.Shared/Components/Common/EntityFilterBar.razor
new file mode 100644
index 0000000..bf979ed
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Common/EntityFilterBar.razor
@@ -0,0 +1,164 @@
+@namespace Aquiis.UI.Shared.Components.Common
+@typeparam TStatus
+@typeparam TPriority
+@typeparam TType
+
+<div class="row mb-3">
+    @* Search Box *@
+    @if (ShowSearch)
+    {
+        <div class="col-md-3">
+            <div class="input-group">
+                <span class="input-group-text"><i class="bi bi-search"></i></span>
+                <input type="text" class="form-control" 
+                       placeholder="@SearchPlaceholder" 
+                       value="@SearchTerm" 
+                       @oninput="HandleSearchInput" />
+            </div>
+        </div>
+    }
+
+    @* Status Filter *@
+    @if (ShowStatusFilter && StatusOptions.Any())
+    {
+        <div class="col-md-3">
+            <select class="form-select" value="@StatusFilter" @onchange="HandleStatusChange">
+                <option value="">@StatusLabel</option>
+                @foreach (var status in StatusOptions)
+                {
+                    <option value="@status">@status</option>
+                }
+            </select>
+        </div>
+    }
+
+    @* Priority Filter *@
+    @if (ShowPriorityFilter && PriorityOptions.Any())
+    {
+        <div class="col-md-3">
+            <select class="form-select" value="@PriorityFilter" @onchange="HandlePriorityChange">
+                <option value="">@PriorityLabel</option>
+                @foreach (var priority in PriorityOptions)
+                {
+                    <option value="@priority">@priority</option>
+                }
+            </select>
+        </div>
+    }
+
+    @* Type Filter *@
+    @if (ShowTypeFilter && TypeOptions.Any())
+    {
+        <div class="col-md-3">
+            <select class="form-select" value="@TypeFilter" @onchange="HandleTypeChange">
+                <option value="">@TypeLabel</option>
+                @foreach (var type in TypeOptions)
+                {
+                    <option value="@type">@type</option>
+                }
+            </select>
+        </div>
+    }
+
+    @* Custom Secondary Filter *@
+    @if (SecondaryFilter != null)
+    {
+        <div class="col-md-3">
+            @SecondaryFilter
+        </div>
+    }
+
+    @* Group Toggle *@
+    @if (ShowGroupToggle && GroupedDataAvailable)
+    {
+        <div class="col-md-auto">
+            <div class="form-check form-switch pt-2">
+                <input class="form-check-input" type="checkbox" id="@GroupToggleId"
+                       checked="@GroupByProperty" 
+                       @onchange="HandleGroupToggle">
+                <label class="form-check-label" for="@GroupToggleId">@GroupLabel</label>
+            </div>
+        </div>
+    }
+
+    @* Clear Filters Button *@
+    @if (ShowClearButton)
+    {
+        <div class="col-md-auto">
+            <button class="btn btn-outline-secondary" @onclick="OnClearFilters">
+                <i class="bi bi-x-circle"></i> Clear Filters
+            </button>
+        </div>
+    }
+</div>
+
+@code {
+    // Search parameters
+    [Parameter] public bool ShowSearch { get; set; } = true;
+    [Parameter] public string SearchPlaceholder { get; set; } = "Search...";
+    [Parameter] public string SearchTerm { get; set; } = string.Empty;
+    [Parameter] public EventCallback<string> OnSearchChanged { get; set; }
+
+    // Status filter parameters
+    [Parameter] public bool ShowStatusFilter { get; set; } = true;
+    [Parameter] public string StatusLabel { get; set; } = "All Statuses";
+    [Parameter] public string StatusFilter { get; set; } = string.Empty;
+    [Parameter] public List<TStatus> StatusOptions { get; set; } = new();
+    [Parameter] public EventCallback<string> OnStatusChanged { get; set; }
+
+    // Priority filter parameters
+    [Parameter] public bool ShowPriorityFilter { get; set; } = false;
+    [Parameter] public string PriorityLabel { get; set; } = "All Priorities";
+    [Parameter] public string PriorityFilter { get; set; } = string.Empty;
+    [Parameter] public List<TPriority> PriorityOptions { get; set; } = new();
+    [Parameter] public EventCallback<string> OnPriorityChanged { get; set; }
+
+    // Type filter parameters
+    [Parameter] public bool ShowTypeFilter { get; set; } = false;
+    [Parameter] public string TypeLabel { get; set; } = "All Types";
+    [Parameter] public string TypeFilter { get; set; } = string.Empty;
+    [Parameter] public List<TType> TypeOptions { get; set; } = new();
+    [Parameter] public EventCallback<string> OnTypeChanged { get; set; }
+
+    // Custom secondary filter
+    [Parameter] public RenderFragment? SecondaryFilter { get; set; }
+
+    // Group toggle parameters
+    [Parameter] public bool ShowGroupToggle { get; set; } = false;
+    [Parameter] public bool GroupedDataAvailable { get; set; }
+    [Parameter] public string GroupLabel { get; set; } = "Group by Property";
+    [Parameter] public bool GroupByProperty { get; set; }
+    [Parameter] public EventCallback<bool> OnGroupToggled { get; set; }
+
+    // Clear button parameters
+    [Parameter] public bool ShowClearButton { get; set; } = false;
+    [Parameter] public EventCallback OnClearFilters { get; set; }
+
+    // Generate unique ID for the toggle to avoid label conflicts
+    private string GroupToggleId => $"groupToggle_{Guid.NewGuid():N}";
+
+    private async Task HandleSearchInput(ChangeEventArgs e)
+    {
+        await OnSearchChanged.InvokeAsync(e.Value?.ToString() ?? string.Empty);
+    }
+
+    private async Task HandleStatusChange(ChangeEventArgs e)
+    {
+        await OnStatusChanged.InvokeAsync(e.Value?.ToString() ?? string.Empty);
+    }
+
+    private async Task HandlePriorityChange(ChangeEventArgs e)
+    {
+        await OnPriorityChanged.InvokeAsync(e.Value?.ToString() ?? string.Empty);
+    }
+
+    private async Task HandleTypeChange(ChangeEventArgs e)
+    {
+        await OnTypeChanged.InvokeAsync(e.Value?.ToString() ?? string.Empty);
+    }
+
+    private async Task HandleGroupToggle(ChangeEventArgs e)
+    {
+        await OnGroupToggled.InvokeAsync(e.Value is bool boolValue && boolValue);
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Components/Common/MetricsCard.razor b/3-Aquiis.UI.Shared/Components/Common/MetricsCard.razor
new file mode 100644
index 0000000..301a165
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Common/MetricsCard.razor
@@ -0,0 +1,32 @@
+<div class="col">
+    <div class="card text-white @ColorClass">
+        <div class="card-body">
+            <div class="d-flex justify-content-between">
+                <div>
+                    <h4>@Count</h4>
+                    <p class="card-text">@Title</p>
+                </div>
+                <div class="align-self-center">
+                    <i class="@IconCssClass" style="font-size: 2rem;"></i>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@code {
+    [Parameter]
+    public RenderFragment? ChildContent { get; set; }
+
+    [Parameter]
+    public string Title { get; set; } = string.Empty;
+
+    [Parameter]
+    public string Count { get; set; } = string.Empty;
+
+    [Parameter]
+    public string? IconCssClass { get; set; }
+
+    [Parameter]
+    public string? ColorClass { get; set; }
+
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Common/TrimmedInputText.razor b/3-Aquiis.UI.Shared/Components/Common/TrimmedInputText.razor
new file mode 100644
index 0000000..b83584d
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Common/TrimmedInputText.razor
@@ -0,0 +1,31 @@
+@inherits InputText
+
+@*
+    A text input component that automatically trims leading and trailing whitespace
+    on blur (when user leaves the field). Extends standard InputText functionality.
+    
+    Usage:
+    <TrimmedInputText @bind-Value="Model.FirstName" class="form-control" />
+*@
+
+<input @attributes="AdditionalAttributes"
+       class="@CssClass"
+       value="@CurrentValue"
+       @oninput="HandleInput"
+       @onblur="HandleBlur" />
+
+@code {
+    private void HandleInput(ChangeEventArgs e)
+    {
+        CurrentValueAsString = e.Value?.ToString();
+    }
+
+    private void HandleBlur(FocusEventArgs e)
+    {
+        // Trim the value when user leaves the field
+        if (!string.IsNullOrEmpty(CurrentValueAsString))
+        {
+            CurrentValueAsString = CurrentValueAsString.Trim();
+        }
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Components/Common/UserAvatar.razor b/3-Aquiis.UI.Shared/Components/Common/UserAvatar.razor
new file mode 100644
index 0000000..6bfa197
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Common/UserAvatar.razor
@@ -0,0 +1,40 @@
+
+<div class="avatar rounded-circle d-flex align-items-center justify-content-center" 
+     style="width: @(Size)px; height: @(Size)px; background-color: #e0e0e0; font-size: @(Size / 2)px; color: #555;">
+    @if (!string.IsNullOrWhiteSpace(FirstName) || !string.IsNullOrWhiteSpace(LastName))
+    {
+        @GetInitials()
+    }
+    else
+    {
+        <i class="bi bi-person-fill"></i>
+    }
+</div>
+
+@code {
+    [Parameter, EditorRequired]
+    public int Size { get; set; } = 48;
+
+    [Parameter , EditorRequired]
+    public string FirstName { get; set; } = string.Empty;
+
+    [Parameter , EditorRequired]
+    public string LastName { get; set; } = string.Empty;
+
+    private string GetInitials()
+    {
+        var initials = string.Empty;
+
+        if (!string.IsNullOrWhiteSpace(FirstName))
+        {
+            initials += FirstName[0];
+        }
+
+        if (!string.IsNullOrWhiteSpace(LastName))
+        {
+            initials += LastName[0];
+        }
+
+        return initials.ToUpper();
+    }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Documents/DocumentListView.razor b/3-Aquiis.UI.Shared/Components/Entities/Documents/DocumentListView.razor
new file mode 100644
index 0000000..382dde5
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Documents/DocumentListView.razor
@@ -0,0 +1,173 @@
+@using Aquiis.Core.Entities
+
+<div class="card">
+    <div class="card-header d-flex justify-content-between align-items-center @HeaderCssClass">
+        <h5 class="mb-0">
+            <i class="bi bi-file-earmark-text"></i> Documents
+        </h5>
+        @if (ShowUploadButton && OnUploadDocument.HasDelegate)
+        {
+            <button class="btn btn-sm btn-primary" @onclick="OnUploadDocument">
+                <i class="bi bi-upload"></i> Upload Document
+            </button>
+        }
+    </div>
+    <div class="card-body">
+        @if (Documents == null)
+        {
+            <div class="text-center py-3">
+                <div class="spinner-border text-primary" role="status">
+                    <span class="visually-hidden">Loading...</span>
+                </div>
+            </div>
+        }
+        else if (!Documents.Any())
+        {
+            <p class="text-muted text-center py-3">No documents uploaded for this property.</p>
+        }
+        else
+        {
+            @if (ShowGroupByType && GroupedDocuments != null && GroupedDocuments.Any())
+            {
+                @foreach (var group in GroupedDocuments)
+                {
+                    <div class="mb-4">
+                        <h6 class="text-muted mb-2">
+                            <i class="bi bi-folder"></i> @group.Key (@group.Count())
+                        </h6>
+                        <div class="list-group">
+                            @foreach (var document in group.OrderByDescending(d => d.CreatedOn))
+                            {
+                                <div class="list-group-item">
+                                    @RenderDocumentItem(document)
+                                </div>
+                            }
+                        </div>
+                    </div>
+                }
+            }
+            else
+            {
+                <div class="list-group list-group-flush">
+                    @foreach (var document in Documents.OrderByDescending(d => d.CreatedOn))
+                    {
+                        <div class="list-group-item">
+                            @RenderDocumentItem(document)
+                        </div>
+                    }
+                </div>
+            }
+        }
+    </div>
+</div>
+
+@code {
+    [Parameter]
+    public List<Document>? Documents { get; set; }
+
+    [Parameter]
+    public bool ShowUploadButton { get; set; } = true;
+
+    [Parameter]
+    public string HeaderCssClass { get; set; } = "";
+
+    [Parameter]
+    public bool ShowGroupByType { get; set; } = false;
+
+    [Parameter]
+    public EventCallback OnUploadDocument { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnViewDocument { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnDownloadDocument { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnDeleteDocument { get; set; }
+
+    private IEnumerable<IGrouping<string, Document>>? GroupedDocuments => 
+        Documents?.GroupBy(d => d.DocumentType ?? "Other");
+
+    private RenderFragment RenderDocumentItem(Document document) => __builder =>
+    {
+        <div class="d-flex justify-content-between align-items-start">
+            <div class="flex-grow-1">
+                <h6 class="mb-1">
+                    <i class="bi @GetFileIcon(document.FileName)"></i>
+                    @if (OnViewDocument.HasDelegate)
+                    {
+                        <a href="javascript:void(0)" @onclick="() => OnViewDocument.InvokeAsync(document.Id)" class="text-decoration-none">
+                            @document.FileName
+                        </a>
+                    }
+                    else
+                    {
+                        @document.FileName
+                    }
+                </h6>
+                <div>
+                    @if (!ShowGroupByType && !string.IsNullOrEmpty(document.DocumentType))
+                    {
+                        <span class="badge bg-secondary me-2">@document.DocumentType</span>
+                    }
+                    <small class="text-muted">
+                        @FormatFileSize(document.FileSize)
+                        • Uploaded @document.CreatedOn.ToString("MMM dd, yyyy")
+                    </small>
+                </div>
+                @if (!string.IsNullOrEmpty(document.Description))
+                {
+                    <small class="text-muted d-block mt-1">@document.Description</small>
+                }
+            </div>
+            <div class="btn-group ms-3">
+                @if (OnViewDocument.HasDelegate)
+                {
+                    <button class="btn btn-sm btn-outline-primary" @onclick="() => OnViewDocument.InvokeAsync(document.Id)" title="View">
+                        <i class="bi bi-eye"></i>
+                    </button>
+                }
+                @if (OnDownloadDocument.HasDelegate)
+                {
+                    <button class="btn btn-sm btn-outline-secondary" @onclick="() => OnDownloadDocument.InvokeAsync(document.Id)" title="Download">
+                        <i class="bi bi-download"></i>
+                    </button>
+                }
+                @if (OnDeleteDocument.HasDelegate)
+                {
+                    <button class="btn btn-sm btn-outline-danger" @onclick="() => OnDeleteDocument.InvokeAsync(document.Id)" title="Delete">
+                        <i class="bi bi-trash"></i>
+                    </button>
+                }
+            </div>
+        </div>
+    };
+
+    private string GetFileIcon(string fileName)
+    {
+        var extension = Path.GetExtension(fileName)?.ToLower();
+        return extension switch
+        {
+            ".pdf" => "bi-file-pdf text-danger",
+            ".doc" or ".docx" => "bi-file-word text-primary",
+            ".xls" or ".xlsx" => "bi-file-excel text-success",
+            ".jpg" or ".jpeg" or ".png" or ".gif" => "bi-file-image text-info",
+            ".zip" or ".rar" => "bi-file-zip text-warning",
+            _ => "bi-file-earmark"
+        };
+    }
+
+    private string FormatFileSize(long bytes)
+    {
+        string[] sizes = { "B", "KB", "MB", "GB" };
+        double len = bytes;
+        int order = 0;
+        while (len >= 1024 && order < sizes.Length - 1)
+        {
+            order++;
+            len = len / 1024;
+        }
+        return $"{len:0.##} {sizes[order]}";
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Inspections/InspectionChecklistItem.razor b/3-Aquiis.UI.Shared/Components/Entities/Inspections/InspectionChecklistItem.razor
new file mode 100644
index 0000000..3cf8ddf
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Inspections/InspectionChecklistItem.razor
@@ -0,0 +1,51 @@
+<div class="row mb-3 pb-2 border-bottom">
+    <div class="col-md-4 d-flex align-items-center">
+        <label class="form-label mb-0">@Label</label>
+    </div>
+    <div class="col-md-2 d-flex align-items-center">
+        <div class="form-check form-switch">
+            <input class="form-check-input" type="checkbox" role="switch" 
+                   checked="@IsGood" 
+                   @onchange="OnIsGoodChanged" 
+                   id="@($"check_{Label.Replace(" ", "_")}")" />
+            <label class="form-check-label text-success" for="@($"check_{Label.Replace(" ", "_")}")">
+                @(IsGood ? "Good" : "Issue")
+            </label>
+        </div>
+    </div>
+    <div class="col-md-6">
+        <input type="text" class="form-control form-control-sm" 
+               value="@Notes" 
+               @oninput="OnNotesChanged"
+               placeholder="Notes (if issues found)" />
+    </div>
+</div>
+
+@code {
+    [Parameter]
+    public string Label { get; set; } = string.Empty;
+
+    [Parameter]
+    public bool IsGood { get; set; } = true;
+
+    [Parameter]
+    public EventCallback<bool> IsGoodChanged { get; set; }
+
+    [Parameter]
+    public string? Notes { get; set; }
+
+    [Parameter]
+    public EventCallback<string?> NotesChanged { get; set; }
+
+    private async Task OnIsGoodChanged(ChangeEventArgs e)
+    {
+        IsGood = e.Value is bool b && b;
+        await IsGoodChanged.InvokeAsync(IsGood);
+    }
+
+    private async Task OnNotesChanged(ChangeEventArgs e)
+    {
+        Notes = e.Value?.ToString();
+        await NotesChanged.InvokeAsync(Notes);
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Inspections/InspectionModalView.razor b/3-Aquiis.UI.Shared/Components/Entities/Inspections/InspectionModalView.razor
new file mode 100644
index 0000000..f7e6d8b
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Inspections/InspectionModalView.razor
@@ -0,0 +1,134 @@
+@using Aquiis.Core.Entities
+
+<div class="row mb-3">
+    <div class="col-md-3">
+        <strong>Inspection Date:</strong>
+        <p>@Inspection.CompletedOn.ToString("MMMM dd, yyyy")</p>
+    </div>
+    <div class="col-md-3">
+        <strong>Type:</strong>
+        <p><span class="badge bg-info">@Inspection.InspectionType</span></p>
+    </div>
+    <div class="col-md-3">
+        <strong>Overall Condition:</strong>
+        <p><span class="badge @GetConditionBadge(Inspection.OverallCondition)">@Inspection.OverallCondition</span></p>
+    </div>
+    <div class="col-md-3">
+        <strong>Inspected By:</strong>
+        <p>@(Inspection.InspectedBy ?? "Not specified")</p>
+    </div>
+</div>
+
+@if (Inspection.Lease != null)
+{
+    <div class="row mb-3">
+        <div class="col-12">
+            <strong>Tenant:</strong> @Inspection.Lease.Tenant?.FullName
+        </div>
+    </div>
+}
+
+<!-- Inspection Sections -->
+<InspectionSectionView Title="Exterior" Icon="house" Items="GetExteriorItems(Inspection)" />
+<InspectionSectionView Title="Interior" Icon="door-open" Items="GetInteriorItems(Inspection)" />
+<InspectionSectionView Title="Kitchen" Icon="cup-hot" Items="GetKitchenItems(Inspection)" />
+<InspectionSectionView Title="Bathroom" Icon="droplet" Items="GetBathroomItems(Inspection)" />
+<InspectionSectionView Title="Systems & Safety" Icon="gear" Items="GetSystemsItems(Inspection)" />
+
+<!-- Overall Assessment -->
+@if (!string.IsNullOrEmpty(Inspection.GeneralNotes))
+{
+    <div class="card mb-2">
+        <div class="card-header">
+            <h6 class="mb-0"><i class="bi bi-clipboard-data"></i> General Notes</h6>
+        </div>
+        <div class="card-body">
+            <p class="mb-0">@Inspection.GeneralNotes</p>
+        </div>
+    </div>
+}
+
+@if (!string.IsNullOrEmpty(Inspection.ActionItemsRequired))
+{
+    <div class="alert alert-warning mb-0">
+        <strong><i class="bi bi-exclamation-triangle"></i> Action Items Required:</strong>
+        <p class="mb-0 mt-2">@Inspection.ActionItemsRequired</p>
+    </div>
+}
+
+@code {
+    [Parameter]
+    public Inspection Inspection { get; set; } = default!;
+
+    private string GetConditionBadge(string condition)
+    {
+        return condition switch
+        {
+            "Excellent" => "bg-success",
+            "Good" => "bg-info",
+            "Fair" => "bg-warning",
+            "Poor" => "bg-danger",
+            _ => "bg-secondary"
+        };
+    }
+
+    private List<(string Label, bool IsGood, string? Notes)> GetExteriorItems(Inspection inspection)
+    {
+        return new List<(string Label, bool IsGood, string? Notes)>
+        {
+            ("Roof", inspection.ExteriorRoofGood, inspection.ExteriorRoofNotes),
+            ("Gutters & Downspouts", inspection.ExteriorGuttersGood, inspection.ExteriorGuttersNotes),
+            ("Siding/Exterior Walls", inspection.ExteriorSidingGood, inspection.ExteriorSidingNotes),
+            ("Windows (Exterior)", inspection.ExteriorWindowsGood, inspection.ExteriorWindowsNotes),
+            ("Doors (Exterior)", inspection.ExteriorDoorsGood, inspection.ExteriorDoorsNotes),
+            ("Foundation", inspection.ExteriorFoundationGood, inspection.ExteriorFoundationNotes),
+            ("Landscaping", inspection.LandscapingGood, inspection.LandscapingNotes)
+        };
+    }
+
+    private List<(string Label, bool IsGood, string? Notes)> GetInteriorItems(Inspection inspection)
+    {
+        return new List<(string Label, bool IsGood, string? Notes)>
+        {
+            ("Walls", inspection.InteriorWallsGood, inspection.InteriorWallsNotes),
+            ("Ceilings", inspection.InteriorCeilingsGood, inspection.InteriorCeilingsNotes),
+            ("Floors", inspection.InteriorFloorsGood, inspection.InteriorFloorsNotes),
+            ("Doors (Interior)", inspection.InteriorDoorsGood, inspection.InteriorDoorsNotes),
+            ("Windows (Interior)", inspection.InteriorWindowsGood, inspection.InteriorWindowsNotes)
+        };
+    }
+
+    private List<(string Label, bool IsGood, string? Notes)> GetKitchenItems(Inspection inspection)
+    {
+        return new List<(string Label, bool IsGood, string? Notes)>
+        {
+            ("Appliances", inspection.KitchenAppliancesGood, inspection.KitchenAppliancesNotes),
+            ("Cabinets", inspection.KitchenCabinetsGood, inspection.KitchenCabinetsNotes),
+            ("Countertops", inspection.KitchenCountersGood, inspection.KitchenCountersNotes),
+            ("Sink & Plumbing", inspection.KitchenSinkPlumbingGood, inspection.KitchenSinkPlumbingNotes)
+        };
+    }
+
+    private List<(string Label, bool IsGood, string? Notes)> GetBathroomItems(Inspection inspection)
+    {
+        return new List<(string Label, bool IsGood, string? Notes)>
+        {
+            ("Toilet", inspection.BathroomToiletGood, inspection.BathroomToiletNotes),
+            ("Sink & Vanity", inspection.BathroomSinkGood, inspection.BathroomSinkNotes),
+            ("Tub/Shower", inspection.BathroomTubShowerGood, inspection.BathroomTubShowerNotes),
+            ("Ventilation", inspection.BathroomVentilationGood, inspection.BathroomVentilationNotes)
+        };
+    }
+
+    private List<(string Label, bool IsGood, string? Notes)> GetSystemsItems(Inspection inspection)
+    {
+        return new List<(string Label, bool IsGood, string? Notes)>
+        {
+            ("HVAC System", inspection.HvacSystemGood, inspection.HvacSystemNotes),
+            ("Electrical System", inspection.ElectricalSystemGood, inspection.ElectricalSystemNotes),
+            ("Plumbing System", inspection.PlumbingSystemGood, inspection.PlumbingSystemNotes),
+            ("Smoke Detectors", inspection.SmokeDetectorsGood, inspection.SmokeDetectorsNotes),
+            ("Carbon Monoxide Detectors", inspection.CarbonMonoxideDetectorsGood, inspection.CarbonMonoxideDetectorsNotes)
+        };
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Inspections/InspectionSectionView.razor b/3-Aquiis.UI.Shared/Components/Entities/Inspections/InspectionSectionView.razor
new file mode 100644
index 0000000..5fe9a2e
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Inspections/InspectionSectionView.razor
@@ -0,0 +1,60 @@
+<div class="card mb-3">
+    <div class="card-header">
+        <h5 class="mb-0"><i class="bi bi-@Icon"></i> @Title</h5>
+    </div>
+    <div class="card-body">
+        @if (Items != null && Items.Any())
+        {
+            <div class="table-responsive">
+                <table class="table table-sm table-hover mb-0">
+                    <thead>
+                        <tr>
+                            <th style="width: 40%;">Item</th>
+                            <th style="width: 15%;">Status</th>
+                            <th style="width: 45%;">Notes</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var item in Items)
+                        {
+                            <tr>
+                                <td>@item.Label</td>
+                                <td>
+                                    @if (item.IsGood)
+                                    {
+                                        <span class="badge bg-success"><i class="bi bi-check-circle"></i> Good</span>
+                                    }
+                                    else
+                                    {
+                                        <span class="badge bg-danger"><i class="bi bi-x-circle"></i> Issue</span>
+                                    }
+                                </td>
+                                <td>
+                                    @if (!string.IsNullOrEmpty(item.Notes))
+                                    {
+                                        <span class="text-muted">@item.Notes</span>
+                                    }
+                                    else
+                                    {
+                                        <span class="text-muted">-</span>
+                                    }
+                                </td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            </div>
+        }
+    </div>
+</div>
+
+@code {
+    [Parameter]
+    public string Title { get; set; } = string.Empty;
+
+    [Parameter]
+    public string Icon { get; set; } = "clipboard-check";
+
+    [Parameter]
+    public List<(string Label, bool IsGood, string? Notes)>? Items { get; set; }
+}
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Inspections/RoutineInspectionCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Inspections/RoutineInspectionCard.razor
new file mode 100644
index 0000000..975c62f
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Inspections/RoutineInspectionCard.razor
@@ -0,0 +1,148 @@
+@using Aquiis.Core.Entities
+
+<div class="card">
+    <div class="card-header d-flex justify-content-between align-items-center">
+        <h5 class="mb-0">
+            <i class="bi bi-clipboard-check"></i> Routine Inspections
+        </h5>
+        @if (ShowScheduleButton && OnCompleteInspection.HasDelegate)
+        {
+            <button class="btn btn-sm btn-primary" @onclick="OnCompleteInspection">
+                <i class="bi bi-clipboard-check"></i> Complete Inspection
+            </button>
+        }
+    </div>
+    <div class="card-body">
+        <div class="row">
+            @if (LastInspection != null && LastInspection.Id != Guid.Empty)
+            {
+                <div class="col-md-6">
+                    <div class="border-end pe-3">
+                        <h6 class="text-muted mb-2">Last Inspection</h6>
+                        <div class="d-flex align-items-center mb-2">
+                            <i class="bi bi-calendar-check text-success me-2" style="font-size: 1.5rem;"></i>
+                            <div>
+                                <div class="fw-bold">@LastInspection.CompletedOn.ToString("MMMM dd, yyyy")</div>
+                                <small class="text-muted">@GetDaysAgo(LastInspection.CompletedOn)</small>
+                            </div>
+                        </div>
+                        @if (ShowLastInspectionDetails)
+                        {
+                            <div class="mt-3">
+                                <small class="text-muted d-block">Type: <strong>@LastInspection.InspectionType</strong></small>
+                                @if (!string.IsNullOrEmpty(LastInspection.InspectedBy))
+                                {
+                                    <small class="text-muted d-block">Inspector: @LastInspection.InspectedBy</small>
+                                }
+                            </div>
+                            @if (ShowViewButton && OnViewInspection.HasDelegate)
+                            {
+                                <button class="btn btn-sm btn-outline-primary mt-2" @onclick="() => OnViewInspection.InvokeAsync(LastInspection.Id)">
+                                    <i class="bi bi-eye"></i> View Report
+                                </button>
+                            }
+                        }
+                    </div>
+                </div>
+            }
+            else
+            {
+                <div class="col-md-6">
+                    <div class="border-end pe-3">
+                        <h6 class="text-muted mb-2">Last Inspection</h6>
+                        <p class="text-muted"><small>No inspections recorded.</small></p>
+                    </div>
+                </div>
+            }
+
+            <div class="col-md-6 @(LastInspection != null && LastInspection.Id != Guid.Empty ? "ps-3" : "")">
+                <h6 class="text-muted mb-2">Next Inspection</h6>
+                @if (NextInspectionDate.HasValue)
+                {
+                    <div class="d-flex align-items-center mb-2">
+                        @if (IsOverdue)
+                        {
+                            <i class="bi bi-exclamation-triangle text-danger me-2" style="font-size: 1.5rem;"></i>
+                            <div>
+                                <div class="fw-bold text-danger">@NextInspectionDate.Value.ToString("MMMM dd, yyyy")</div>
+                                <small class="text-danger">Overdue by @GetOverdueDays() days</small>
+                            </div>
+                        }
+                        else if (IsDueSoon)
+                        {
+                            <i class="bi bi-calendar-event text-warning me-2" style="font-size: 1.5rem;"></i>
+                            <div>
+                                <div class="fw-bold text-warning">@NextInspectionDate.Value.ToString("MMMM dd, yyyy")</div>
+                                <small class="text-muted">Due in @GetDaysUntil() days</small>
+                            </div>
+                        }
+                        else
+                        {
+                            <i class="bi bi-calendar-event text-primary me-2" style="font-size: 1.5rem;"></i>
+                            <div>
+                                <div class="fw-bold">@NextInspectionDate.Value.ToString("MMMM dd, yyyy")</div>
+                                <small class="text-muted">In @GetDaysUntil() days</small>
+                            </div>
+                        }
+                    </div>
+                }
+                else
+                {
+                    <p class="text-muted">Not scheduled</p>
+                    @if (ShowScheduleButton && OnCompleteInspection.HasDelegate)
+                    {
+                        <button class="btn btn-sm btn-warning" @onclick="OnCompleteInspection">
+                            <i class="bi bi-clipboard-check"></i> Complete Inspection
+                        </button>
+                    }
+                }
+            </div>
+        </div>
+    </div>
+</div>
+
+@code {
+    [Parameter]
+    public Inspection? LastInspection { get; set; }
+
+    [Parameter]
+    public DateTime? NextInspectionDate { get; set; }
+
+    [Parameter]
+    public bool ShowScheduleButton { get; set; } = true;
+
+    [Parameter]
+    public bool ShowViewButton { get; set; } = true;
+
+    [Parameter]
+    public bool ShowLastInspectionDetails { get; set; } = true;
+
+    [Parameter]
+    public EventCallback OnCompleteInspection { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnViewInspection { get; set; }
+
+    private bool IsOverdue => NextInspectionDate.HasValue && NextInspectionDate.Value < DateTime.Today;
+    private bool IsDueSoon => NextInspectionDate.HasValue && NextInspectionDate.Value >= DateTime.Today && NextInspectionDate.Value <= DateTime.Today.AddDays(30);
+
+    private string GetDaysAgo(DateTime date)
+    {
+        var days = (DateTime.Today - date.Date).Days;
+        if (days == 0) return "Today";
+        if (days == 1) return "Yesterday";
+        return $"{days} days ago";
+    }
+
+    private int GetDaysUntil()
+    {
+        if (!NextInspectionDate.HasValue) return 0;
+        return (NextInspectionDate.Value.Date - DateTime.Today).Days;
+    }
+
+    private int GetOverdueDays()
+    {
+        if (!NextInspectionDate.HasValue) return 0;
+        return (DateTime.Today - NextInspectionDate.Value.Date).Days;
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Invoices/InvoiceList.razor b/3-Aquiis.UI.Shared/Components/Entities/Invoices/InvoiceList.razor
new file mode 100644
index 0000000..057863d
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Invoices/InvoiceList.razor
@@ -0,0 +1,74 @@
+<div class="card mb-3">
+    <div class="card-header d-flex justify-content-between align-items-center @HeaderCssClass">
+        <h5 class="mb-0"><i class="bi bi-receipt"></i> @Title</h5>
+        <button class="btn btn-sm btn-outline-primary" @onclick="() => OnViewAll.InvokeAsync()">View All</button>
+    </div>
+    <div class="card-body">
+        @if (Invoices.Any())
+        {
+            <div class="list-group list-group-flush">
+                @foreach (var invoice in Invoices.OrderByDescending(i => i.InvoiceNumber))
+                {
+                    <div class="list-group-item">
+                        <div class="d-flex w-100 justify-content-between">
+                            <h6 class="mb-1">
+                                <a href="#" class="text-decoration-none" @onclick="() => OnViewItem.InvokeAsync(invoice.Id)">
+                                    @invoice.InvoiceNumber
+                                </a>
+                            </h6>
+                            <small>@invoice.InvoicedOn.ToString("MMM dd, yyyy")</small>
+                        </div>
+                        <p class="mb-1">@invoice.Lease?.Tenant?.FullName</p>
+                        <div class="d-flex justify-content-between">
+                            <div>
+                                <small class="text-muted">Due: @invoice.DueOn.ToString("MMM dd, yyyy")</small>
+                                @if (invoice.IsOverdue)
+                                {
+                                    <br>
+                                    <small class="text-danger">@invoice.DaysOverdue days overdue</small>
+                                }
+                            </div>
+                            <div class="text-end">
+                                <span class="badge @GetInvoiceStatusBadgeClass(invoice.Status)">@invoice.Status</span>
+                                <br>
+                                <small class="text-muted">@invoice.Amount.ToString("C")</small>
+                            </div>
+                        </div>
+                    </div>
+                }
+            </div>
+        }
+        else
+        {
+            <p class="text-muted">No outstanding invoices.</p>
+        }
+    </div>
+</div>
+@code {
+    [Parameter, EditorRequired]
+    
+    public List<Invoice> Invoices { get; set; } = new();
+
+    [Parameter]
+    public string Title { get; set; } = "Invoices";
+
+    [Parameter]
+    public string HeaderCssClass { get; set; } = "";
+
+    [Parameter]
+    public EventCallback OnViewAll { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnViewItem { get; set; }
+
+    private string GetInvoiceStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            ApplicationConstants.InvoiceStatuses.Paid => "bg-success",
+            ApplicationConstants.InvoiceStatuses.PaidPartial => "bg-warning text-dark",
+            ApplicationConstants.InvoiceStatuses.Overdue => "bg-danger",
+            _ => "bg-secondary"
+        };
+    }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Leases/ActiveLeaseCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Leases/ActiveLeaseCard.razor
new file mode 100644
index 0000000..b3c8679
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Leases/ActiveLeaseCard.razor
@@ -0,0 +1,187 @@
+@using Aquiis.Core.Entities
+
+<div class="card">
+    <div class="card-header d-flex justify-content-between align-items-center">
+        <h5 class="mb-0">
+            <i class="bi bi-file-text"></i> Active Lease
+        </h5>
+        @if (Lease != null && ShowViewButton && OnViewLease.HasDelegate)
+        {
+            <button class="btn btn-sm btn-outline-primary" @onclick="() => OnViewLease.InvokeAsync(Lease.Id)">
+                <i class="bi bi-eye"></i> View Details
+            </button>
+        }
+    </div>
+    <div class="card-body">
+        @if (Lease == null)
+        {
+            <div class="alert alert-info mb-0">
+                <i class="bi bi-info-circle"></i> No active lease for this property.
+                @if (ShowCreateButton && OnCreateLease.HasDelegate)
+                {
+                    <button class="btn btn-sm btn-primary ms-2" @onclick="OnCreateLease">
+                        <i class="bi bi-plus-circle"></i> Create Lease
+                    </button>
+                }
+            </div>
+        }
+        else
+        {
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="mb-3">
+                        <label class="text-muted small">Tenant</label>
+                        <div class="fw-bold">
+                            @if (Lease.Tenant != null)
+                            {
+                                <i class="bi bi-person"></i> @Lease.Tenant.FullName
+                                @if (ShowTenantContact && !string.IsNullOrEmpty(Lease.Tenant.Email))
+                                {
+                                    <br>
+                                    <small class="text-muted">@Lease.Tenant.Email</small>
+                                }
+                                @if (ShowTenantContact && !string.IsNullOrEmpty(Lease.Tenant.PhoneNumber))
+                                {
+                                    <br>
+                                    <small class="text-muted">@Lease.Tenant.PhoneNumber</small>
+                                }
+                            }
+                            else
+                            {
+                                <span class="text-muted">Not assigned</span>
+                            }
+                        </div>
+                    </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-3">
+                        <label class="text-muted small">Status</label>
+                        <div>
+                            <span class="badge @GetStatusBadgeClass(Lease.Status)">@Lease.Status</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="mb-3">
+                        <label class="text-muted small">Lease Term</label>
+                        <div>
+                            <i class="bi bi-calendar-range"></i>
+                            <strong>@Lease.StartDate.ToString("MMM dd, yyyy")</strong> to
+                            <strong>@Lease.EndDate.ToString("MMM dd, yyyy")</strong>
+                        </div>
+                        <small class="text-muted">@GetRemainingDays() remaining</small>
+                    </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="mb-3">
+                        <label class="text-muted small">Monthly Rent</label>
+                        <div class="fs-4 text-primary fw-bold">
+                            @Lease.MonthlyRent.ToString("C")
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            @if (ShowFinancialDetails)
+            {
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="mb-3">
+                            <label class="text-muted small">Security Deposit</label>
+                            <div class="fw-bold">@Lease.SecurityDeposit.ToString("C")</div>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+
+                    </div>
+                </div>
+            }
+
+            @if (IsExpiringSoon)
+            {
+                <div class="alert alert-warning mb-0 mt-2">
+                    <i class="bi bi-exclamation-triangle"></i>
+                    <strong>Lease expiring soon!</strong> This lease expires in @GetDaysUntilExpiration() days.
+                    @if (ShowRenewButton && OnRenewLease.HasDelegate)
+                    {
+                        <button class="btn btn-sm btn-warning ms-2" @onclick="() => OnRenewLease.InvokeAsync(Lease.Id)">
+                            <i class="bi bi-arrow-repeat"></i> Renew Lease
+                        </button>
+                    }
+                </div>
+            }
+        }
+    </div>
+</div>
+
+@code {
+    [Parameter]
+    public Lease? Lease { get; set; }
+
+    [Parameter]
+    public bool ShowViewButton { get; set; } = true;
+
+    [Parameter]
+    public bool ShowCreateButton { get; set; } = true;
+
+    [Parameter]
+    public bool ShowRenewButton { get; set; } = true;
+
+    [Parameter]
+    public bool ShowTenantContact { get; set; } = true;
+
+    [Parameter]
+    public bool ShowFinancialDetails { get; set; } = true;
+
+    [Parameter]
+    public EventCallback<Guid> OnViewLease { get; set; }
+
+    [Parameter]
+    public EventCallback OnCreateLease { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnRenewLease { get; set; }
+
+    private bool IsExpiringSoon => Lease != null && Lease.EndDate <= DateTime.Today.AddDays(60) && Lease.EndDate >= DateTime.Today;
+
+    private string GetStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            "Active" => "bg-success",
+            "Pending" => "bg-warning",
+            "Expired" => "bg-danger",
+            "Terminated" => "bg-secondary",
+            "Offered" => "bg-info",
+            _ => "bg-secondary"
+        };
+    }
+
+    private string GetRemainingDays()
+    {
+        if (Lease == null) return "";
+
+        var days = (Lease.EndDate - DateTime.Today).Days;
+        
+        if (days < 0)
+            return "Expired";
+        if (days == 0)
+            return "Expires today";
+        if (days == 1)
+            return "1 day";
+        if (days < 30)
+            return $"{days} days";
+        
+        var months = days / 30;
+        return months == 1 ? "1 month" : $"{months} months";
+    }
+
+    private int GetDaysUntilExpiration()
+    {
+        if (Lease == null) return 0;
+        return (Lease.EndDate - DateTime.Today).Days;
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseCard.razor
new file mode 100644
index 0000000..e69de29
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseDetailsCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseDetailsCard.razor
new file mode 100644
index 0000000..77a827e
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseDetailsCard.razor
@@ -0,0 +1,141 @@
+
+@namespace Aquiis.UI.Shared.Components.Entities.Leases
+
+<div class="card">
+    <div class="card-header d-flex justify-content-between align-items-center">
+        <h5 class="mb-0">Lease Information</h5>
+        <span class="badge @GetStatusBadgeClass(Lease.Status)">
+            @Lease.Status
+        </span>
+    </div>
+    <div class="card-body">
+        <div class="row">
+            <div class="col-md-6 mb-3">
+                <strong>Property:</strong>
+                <p>@Lease.Property?.Address</p>
+                <small class="text-muted">@Lease.Property?.City, @Lease.Property?.State</small>
+            </div>
+            <div class="col-md-6 mb-3">
+                <strong>Tenant:</strong>
+                @if (Lease.Tenant != null)
+                {
+                    <p>@Lease.Tenant.FullName</p>
+                    <small class="text-muted">@Lease.Tenant.Email</small>
+                }
+                else
+                {
+                    <p class="text-warning"><i class="bi bi-hourglass-split"></i> Lease Offer - Awaiting Acceptance</p>
+                    <small class="text-muted">Tenant will be assigned upon acceptance</small>
+                }
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-6 mb-3">
+                <strong>Start Date:</strong>
+                <p>@Lease.StartDate.ToString("MMMM dd, yyyy")</p>
+            </div>
+            <div class="col-md-6 mb-3">
+                <strong>End Date:</strong>
+                <p>@Lease.EndDate.ToString("MMMM dd, yyyy")</p>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-6 mb-3">
+                <strong>Monthly Rent:</strong>
+                <p class="text-success fw-bold">@Lease.MonthlyRent.ToString("C")</p>
+            </div>
+            <div class="col-md-6 mb-3">
+                <strong>Security Deposit:</strong>
+                <p>@Lease.SecurityDeposit.ToString("C")</p>
+            </div>
+        </div>
+
+        @if (!string.IsNullOrEmpty(Lease.Terms))
+        {
+            <div class="row">
+                <div class="col-md-12 mb-3">
+                    <strong>Lease Terms:</strong>
+                    <p>@Lease.Terms</p>
+                </div>
+            </div>
+        }
+
+        @if (!string.IsNullOrEmpty(Lease.Notes))
+        {
+            <div class="row">
+                <div class="col-md-12 mb-3">
+                    <strong>Notes:</strong>
+                    <p>@Lease.Notes</p>
+                </div>
+            </div>
+        }
+
+        <div class="row">
+            <div class="col-md-6 mb-3">
+                <strong>Created:</strong>
+                <p>@Lease.CreatedOn.ToString("MMMM dd, yyyy")</p>
+            </div>
+            @if (Lease.LastModifiedOn.HasValue)
+            {
+                <div class="col-md-6 mb-3">
+                    <strong>Last Modified:</strong>
+                    <p>@Lease.LastModifiedOn.Value.ToString("MMMM dd, yyyy")</p>
+                </div>
+            }
+        </div>
+
+        @if (Lease.IsActive)
+        {
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="alert alert-info">
+                        <i class="bi bi-info-circle"></i>
+                        <strong>Active Lease:</strong> This lease is currently active with @Lease.DaysRemaining days remaining.
+                    </div>
+                </div>
+            </div>
+        }
+    </div>
+</div>
+
+@code {
+    [Parameter, EditorRequired]
+    public Lease Lease { get; set; }
+
+    private List<Invoice> recentInvoices = new List<Invoice>();
+
+    protected override void OnInitialized()
+    {
+        recentInvoices = Lease.Invoices?
+            .OrderByDescending(i => i.InvoicedOn)
+            .ToList() ?? new List<Invoice>();
+    }
+
+    private string GetStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            "Active" => "bg-success",
+            "Pending" => "bg-warning",
+            "Expired" => "bg-secondary",
+            "Terminated" => "bg-danger",
+            _ => "bg-secondary"
+        };
+    }
+
+    private string GetRenewalStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            "Pending" => "secondary",
+            "Offered" => "info",
+            "Accepted" => "success",
+            "Declined" => "danger",
+            "Expired" => "dark",
+            _ => "secondary"
+        };
+    }
+
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseDocumentsCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseDocumentsCard.razor
new file mode 100644
index 0000000..5bddf0c
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseDocumentsCard.razor
@@ -0,0 +1,94 @@
+
+@namespace Aquiis.UI.Shared.Components.Entities.Leases
+@using Microsoft.AspNetCore.Http
+
+<div class="card mt-3">
+    <div class="card-header d-flex justify-content-between align-items-center">
+        <h5 class="mb-0">Documents</h5>
+        <span class="badge bg-secondary">@LeaseDocuments.Count</span>
+    </div>
+    <div class="card-body">
+        <div class="list-group">
+            @foreach (var doc in LeaseDocuments.OrderByDescending(d => d.CreatedOn))
+            {
+                <div class="list-group-item">
+                    <div class="d-flex justify-content-between align-items-start">
+                        <div class="flex-grow-1">
+                            <div class="d-flex align-items-center mb-1">
+                                <i class="bi @GetFileIcon(doc.FileExtension) me-2"></i>
+                                <strong>@doc.FileName</strong>
+                            </div>
+                            @if (!string.IsNullOrEmpty(doc.Description))
+                            {
+                                <small class="text-muted d-block">@doc.Description</small>
+                            }
+                            <small class="text-muted">
+                                <span class="badge @GetDocumentTypeBadge(doc.DocumentType)">@doc.DocumentType</span>
+                                @doc.FileSizeFormatted | @doc.CreatedOn.ToString("MMM dd, yyyy")
+                            </small>
+                        </div>
+                        <div class="btn-group btn-group-sm">
+                            <button class="btn btn-outline-info" @onclick="() => ViewDocument(doc)" title="View">
+                                <i class="bi bi-eye"></i>
+                            </button>
+                            <button class="btn btn-outline-primary" @onclick="() => DownloadDocument(doc)" title="Download">
+                                <i class="bi bi-download"></i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            }
+        </div>
+        <div class="mt-2">
+            <button class="btn btn-sm btn-outline-secondary w-100" @onclick="ViewDocuments">
+                <i class="bi bi-folder"></i> View All Documents
+            </button>
+        </div>
+    </div>
+</div>
+
+@code {
+    [Parameter, EditorRequired]
+    public Lease Lease { get; set; } = new Lease();
+
+    [Parameter, EditorRequired]
+    public List<Document> LeaseDocuments { get; set; } = new List<Document>();
+
+    private string GetFileIcon(string? extension)
+    {
+        return extension?.ToLower() switch
+        {
+            ".pdf" => "bi-file-earmark-pdf-fill text-danger",
+            ".doc" or ".docx" => "bi-file-earmark-word-fill text-primary",
+            ".xls" or ".xlsx" => "bi-file-earmark-excel-fill text-success",
+            ".png" or ".jpg" or ".jpeg" => "bi-file-earmark-image-fill text-warning",
+            _ => "bi-file-earmark-fill text-secondary",
+        };
+    }
+
+    private string GetDocumentTypeBadge(string documentType)
+    {
+        return documentType.ToLower() switch
+        {
+            "lease agreement" => "bg-primary",
+            "inspection report" => "bg-info",
+            "maintenance record" => "bg-warning",
+            _ => "bg-secondary",
+        };
+    }
+
+    private void ViewDocument(Document doc)
+    {
+        // Implement document viewing logic here
+    }
+
+    private void DownloadDocument(Document doc)
+    {
+        // Implement document downloading logic here
+    }
+
+    private void ViewDocuments()
+    {
+        // Implement navigation to documents page here
+    }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseLifeCycleCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseLifeCycleCard.razor
new file mode 100644
index 0000000..04afb9a
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseLifeCycleCard.razor
@@ -0,0 +1,57 @@
+
+<div>
+@* Lease Lifecycle Management Card *@
+@if (Lease.Status == "Active" || Lease.Status == "MonthToMonth" || Lease.Status == "NoticeGiven")
+{
+    <div class="card mt-3 border-warning">
+        <div class="card-header bg-warning text-dark">
+            <h5 class="mb-0"><i class="bi bi-exclamation-triangle"></i> Lease Management</h5>
+        </div>
+        <div class="card-body">
+            <div class="d-grid gap-2">
+                @if (Lease.Status == "Active" || Lease.Status == "MonthToMonth")
+                {
+                    <button class="btn btn-outline-warning" @onclick="() => OnShowTerminationNoticeModal.InvokeAsync(null)">
+                        <i class="bi bi-calendar-x"></i> Record Termination Notice
+                    </button>
+                    <button class="btn btn-outline-danger" @onclick="() => OnShowEarlyTerminationModal.InvokeAsync(null)">
+                        <i class="bi bi-x-octagon"></i> Early Termination
+                    </button>
+                    <button class="btn btn-outline-secondary" @onclick="() => OnShowConvertMTMModal.InvokeAsync(null)">
+                        <i class="bi bi-arrow-repeat"></i> Convert to Month-to-Month
+                    </button>
+                }
+                @if (Lease.Status == "NoticeGiven")
+                {
+                    <div class="alert alert-info mb-2">
+                        <small>
+                            <strong>Notice Given:</strong> @Lease.TerminationNoticedOn?.ToString("MMM dd, yyyy")<br/>
+                            <strong>Expected Move-Out:</strong> @Lease.ExpectedMoveOutDate?.ToString("MMM dd, yyyy")
+                        </small>
+                    </div>
+                    <button class="btn btn-primary" @onclick="() => OnShowMoveOutModal.InvokeAsync(null)">
+                        <i class="bi bi-box-seam"></i> Complete Move-Out
+                    </button>
+                    <button class="btn btn-outline-danger" @onclick="() => OnShowEarlyTerminationModal.InvokeAsync(null)">
+                        <i class="bi bi-x-octagon"></i> Early Termination
+                    </button>
+                }
+            </div>
+        </div>
+    </div>
+}
+</div>
+
+@code {
+    [Parameter]
+    public Lease Lease { get; set; } = new Lease();
+
+    [Parameter]
+    public EventCallback OnShowTerminationNoticeModal { get; set; }
+    [Parameter]
+    public EventCallback OnShowEarlyTerminationModal { get; set; }
+    [Parameter]
+    public EventCallback OnShowConvertMTMModal { get; set; }
+    [Parameter]
+    public EventCallback OnShowMoveOutModal { get; set; }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseList.razor b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseList.razor
new file mode 100644
index 0000000..8843e91
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseList.razor
@@ -0,0 +1,178 @@
+<div class="card">
+    <div class="card-header d-flex justify-content-between align-items-center @HeaderCssClass">
+        <h5 class="mb-0">
+            <i class="bi bi-calendar-event"></i> @Title
+        </h5>
+        <NavLink href="propertymanagement/leases" class="btn btn-sm btn-outline-primary">
+            View All
+        </NavLink>
+    </div>
+    <div class="card-body">
+        @if (isLoading)
+        {
+            <div class="text-center py-4">
+                <div class="spinner-border spinner-border-sm" role="status">
+                    <span class="visually-hidden">Loading...</span>
+                </div>
+            </div>
+        }
+        else if (expiringLeases == null || !expiringLeases.Any())
+        {
+            <p class="text-muted mb-0">No leases expiring in the next 90 days.</p>
+        }
+        else
+        {
+            <div class="mb-2">
+                <div class="btn-group btn-group-sm" role="group">
+                    <input type="radio" class="btn-check" name="renewalFilter" id="filter30" value="30" 
+                           checked="@(selectedFilter == 30)" @onchange="() => FilterLeases(30)" />
+                    <label class="btn btn-outline-primary" for="filter30">
+                        30 Days <span class="badge bg-danger">@leases30Days.Count()</span>
+                    </label>
+
+                    <input type="radio" class="btn-check" name="renewalFilter" id="filter60" value="60"
+                           checked="@(selectedFilter == 60)" @onchange="() => FilterLeases(60)" />
+                    <label class="btn btn-outline-primary" for="filter60">
+                        60 Days <span class="badge bg-warning">@leases60Days.Count()</span>
+                    </label>
+
+                    <input type="radio" class="btn-check" name="renewalFilter" id="filter90" value="90"
+                           checked="@(selectedFilter == 90)" @onchange="() => FilterLeases(90)" />
+                    <label class="btn btn-outline-primary" for="filter90">
+                        90 Days <span class="badge bg-info">@leases90Days.Count()</span>
+                    </label>
+                </div>
+            </div>
+
+            <div class="list-group list-group-flush" style="max-height: 400px; overflow-y: auto;">
+                @foreach (var lease in GetFilteredLeases())
+                {
+                    var daysRemaining = (lease.EndDate - DateTime.Today).Days;
+                    var urgencyClass = daysRemaining <= 30 ? "danger" : daysRemaining <= 60 ? "warning" : "info";
+                    var urgencyIcon = daysRemaining <= 30 ? "exclamation-triangle-fill" : daysRemaining <= 60 ? "exclamation-circle-fill" : "info-circle-fill";
+                    
+                    <div class="list-group-item list-group-item-action">
+                        <div class="d-flex w-100 justify-content-between align-items-start">
+                            <div class="flex-grow-1">
+                                <h6 class="mb-1">
+                                    <i class="bi @urgencyIcon text-@urgencyClass"></i>
+                                    @lease.Property?.Address
+                                </h6>
+                                <p class="mb-1 small">
+                                    <strong>Tenant:</strong> @lease.Tenant?.FullName<br/>
+                                    <strong>End Date:</strong> @lease.EndDate.ToString("MMM dd, yyyy")<br/>
+                                    <strong>Current Rent:</strong> @lease.MonthlyRent.ToString("C")
+                                    @if (lease.ProposedRenewalRent.HasValue)
+                                    {
+                                        <span class="text-muted"> → @lease.ProposedRenewalRent.Value.ToString("C")</span>
+                                    }
+                                </p>
+                                @if (!string.IsNullOrEmpty(lease.RenewalStatus))
+                                {
+                                    <span class="badge bg-@GetStatusBadgeClass(lease.RenewalStatus)">
+                                        @lease.RenewalStatus
+                                    </span>
+                                }
+                            </div>
+                            <div class="text-end ms-3">
+                                <span class="badge bg-@urgencyClass rounded-pill">
+                                    @daysRemaining days
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                }
+            </div>
+
+            <div class="card-footer">
+                <small class="text-muted">
+                    <i class="bi bi-info-circle"></i>
+                    Showing @GetFilteredLeases().Count() of @Leases.Count() leases
+                </small>
+            </div>
+        }
+    </div>
+</div>
+
+@code {
+    [Parameter]
+    public string Title { get; set; } = "Leases";
+
+    [Parameter]
+    public string HeaderCssClass { get; set; } = "";
+
+    [Parameter]
+    public List<Lease> Leases { get; set; } = new();
+
+    private List<Lease> expiringLeases = new();
+    private List<Lease> leases30Days = new();
+    private List<Lease> leases60Days = new();
+    private List<Lease> leases90Days = new();
+    private bool isLoading = true;
+    private int selectedFilter = 30;
+
+
+    private async Task LoadExpiringLeases()
+    {
+        try
+        {
+            isLoading = true;
+            var today = DateTime.Today;
+
+            expiringLeases = Leases
+                .Where(l => l.Status == "Active" && 
+                           l.EndDate >= today && 
+                           l.EndDate <= today.AddDays(90))
+                .OrderBy(l => l.EndDate)
+                .ToList();
+
+            leases30Days = expiringLeases
+                .Where(l => l.EndDate <= today.AddDays(30))
+                .ToList();
+
+            leases60Days = expiringLeases
+                .Where(l => l.EndDate <= today.AddDays(60))
+                .ToList();
+
+            leases90Days = expiringLeases;
+        }
+        catch (Exception ex)
+        {
+            // Log error
+            Console.WriteLine($"Error loading expiring leases: {ex.Message}");
+        }
+        finally
+        {
+            isLoading = false;
+        }
+    }
+
+    private void FilterLeases(int days)
+    {
+        selectedFilter = days;
+    }
+
+    private List<Lease> GetFilteredLeases()
+    {
+        return selectedFilter switch
+        {
+            30 => leases30Days,
+            60 => leases60Days,
+            90 => leases90Days,
+            _ => expiringLeases
+        };
+    }
+
+    private string GetStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            "Pending" => "secondary",
+            "Offered" => "info",
+            "Accepted" => "success",
+            "Declined" => "danger",
+            "Expired" => "dark",
+            _ => "secondary"
+        };
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseListView.razor b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseListView.razor
new file mode 100644
index 0000000..c0480aa
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseListView.razor
@@ -0,0 +1,400 @@
+@namespace Aquiis.UI.Shared.Components.Entities.Leases
+@using Aquiis.Core.Entities
+@using Aquiis.UI.Shared.Components.Common
+
+
+@if (ShowMetrics)
+{
+    <!-- #region Metrics Card -->
+    <LeaseMetricsCard
+        ActiveCount="@ActiveCount"
+        ExpiringSoonCount="@ExpiringSoonCount"
+        TotalMonthlyRent="@TotalMonthlyRent"
+        ShowActive="true" ShowExpiringSoon="true" ShowTotalMonthlyRent="true" />
+    <!-- #endregion -->
+}
+
+<EntityFilterBar TStatus="string" TPriority="string" TType="string"
+    SearchPlaceholder="Search leases..."
+    SearchTerm="@SearchTerm"
+    OnSearchChanged="@HandleSearchChanged"
+    StatusLabel="All Lease Statuses"
+    StatusFilter="@StatusFilter"
+    StatusOptions="@leaseStatuses"
+    OnStatusChanged="@HandleStatusFilterChanged"
+    ShowGroupToggle="true"
+    GroupedDataAvailable="@GroupedLeases.Any()"
+    GroupByProperty="@GroupByProperty"
+    OnGroupToggled="@HandleGroupByPropertyChanged">
+    <SecondaryFilter>
+        <select class="form-select" value="@TenantFilter" @onchange="HandleTenantFilterChanged">
+            <option value="">All Tenants</option>
+            @foreach (var tenant in AvailableTenants)
+            {
+                <option value="@tenant.Id">@tenant.FullName</option>
+            }
+        </select>
+    </SecondaryFilter>
+</EntityFilterBar>
+
+
+
+<div class="card">
+    <div class="card-body">
+        @if (GroupByProperty)
+        {
+            @foreach (var propertyGroup in GroupedLeases)
+            {
+                var property = propertyGroup.First().Property;
+                var propertyLeaseCount = propertyGroup.Count();
+                var activeLeaseCount = propertyGroup.Count(l => l.Status == "Active");
+                var isExpanded = ExpandedProperties.Contains(propertyGroup.Key.GetHashCode());
+                
+                <div class="card mb-3">
+                    <div class="card-header" style="cursor: pointer;" @onclick="() => HandleTogglePropertyGroup(propertyGroup.Key)">
+                        <div class="d-flex justify-content-between align-items-center">
+                            <div>
+                                <i class="bi @(isExpanded ? "bi-chevron-down" : "bi-chevron-right")"></i>
+                                <strong>@property?.Address</strong>
+                                <span class="ms-3 text-muted">@property?.City, @property?.State @property?.ZipCode</span>
+                            </div>
+                            <div>
+                                <span class="badge bg-success me-2">@activeLeaseCount active</span>
+                                <span class="badge bg-secondary">@propertyLeaseCount total lease(s)</span>
+                            </div>
+                        </div>
+                    </div>
+                    @if (isExpanded)
+                    {
+                        <div class="card-body p-0">
+                            <table class="table table-hover mb-0">
+                                <thead class="table">
+                                    <tr>
+                                        <th>Tenant</th>
+                                        <th>Start Date</th>
+                                        <th>End Date</th>
+                                        <th>Monthly Rent</th>
+                                        <th>Status</th>
+                                        @if (ShowActions)
+                                        {
+                                            <th>Actions</th>
+                                        }
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach (var lease in propertyGroup)
+                                    {
+                                        <tr class="@(lease.IsActive ? "" : "table-warning")">
+                                            <td>
+                                                @if (lease.Tenant != null)
+                                                {
+                                                    <strong>@lease.Tenant.FullName</strong>
+                                                    <br />
+                                                    <small class="text-muted">@lease.Tenant.Email</small>
+                                                }
+                                                else
+                                                {
+                                                    <span class="text-warning"><i class="bi bi-hourglass-split"></i> Pending Acceptance</span>
+                                                    <br />
+                                                    <small class="text-muted">Lease offer awaiting tenant</small>
+                                                }
+                                            </td>
+                                            <td>@lease.StartDate.ToString("MMM dd, yyyy")</td>
+                                            <td>@lease.EndDate.ToString("MMM dd, yyyy")</td>
+                                            <td>@lease.MonthlyRent.ToString("C")</td>
+                                            <td>
+                                                <span class="badge @GetStatusBadgeClass(lease.Status)">
+                                                    @lease.Status
+                                                </span>
+                                                @if (lease.IsActive && lease.DaysRemaining <= 30 && lease.DaysRemaining > 0)
+                                                {
+                                                    <br />
+                                                    <small class="text-warning">@lease.DaysRemaining days remaining</small>
+                                                }
+                                            </td>
+                                            @if (ShowActions)
+                                            {
+                                                <td>
+                                                    <div class="btn-group btn-group-sm">
+                                                        <button class="btn btn-outline-primary" @onclick="() => HandleView(lease.Id)" title="View">
+                                                            <i class="bi bi-eye"></i>
+                                                        </button>
+                                                        @if (ShowEditDelete)
+                                                        {
+                                                            <button class="btn btn-outline-secondary" @onclick="() => HandleEdit(lease.Id)" title="Edit">
+                                                                <i class="bi bi-pencil"></i>
+                                                            </button>
+                                                            <button class="btn btn-outline-danger" @onclick="() => HandleDelete(lease.Id)" title="Delete">
+                                                                <i class="bi bi-trash"></i>
+                                                            </button>
+                                                        }
+                                                    </div>
+                                                </td>
+                                            }
+                                        </tr>
+                                    }
+                                </tbody>
+                            </table>
+                        </div>
+                    }
+                </div>
+            }
+        }
+        else
+        {
+            <div class="table-responsive">
+                <table class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th @onclick="() => HandleSort(nameof(Lease.Property))" style="cursor: pointer;">
+                                Property
+                                @if (SortColumn == nameof(Lease.Property))
+                                {
+                                    <i class="bi bi-@(SortAscending ? "arrow-up" : "arrow-down")"></i>
+                                }
+                            </th>
+                            <th @onclick="() => HandleSort(nameof(Lease.Tenant))" style="cursor: pointer;">
+                                Tenant
+                                @if (SortColumn == nameof(Lease.Tenant))
+                                {
+                                    <i class="bi bi-@(SortAscending ? "arrow-up" : "arrow-down")"></i>
+                                }
+                            </th>
+                            <th @onclick="() => HandleSort(nameof(Lease.StartDate))" style="cursor: pointer;">
+                                Start Date
+                                @if (SortColumn == nameof(Lease.StartDate))
+                                {
+                                    <i class="bi bi-@(SortAscending ? "arrow-up" : "arrow-down")"></i>
+                                }
+                            </th>
+                            <th @onclick="() => HandleSort(nameof(Lease.EndDate))" style="cursor: pointer;">
+                                End Date
+                                @if (SortColumn == nameof(Lease.EndDate))
+                                {
+                                    <i class="bi bi-@(SortAscending ? "arrow-up" : "arrow-down")"></i>
+                                }
+                            </th>
+                            <th @onclick="() => HandleSort(nameof(Lease.MonthlyRent))" style="cursor: pointer;">
+                                Monthly Rent
+                                @if (SortColumn == nameof(Lease.MonthlyRent))
+                                {
+                                    <i class="bi bi-@(SortAscending ? "arrow-up" : "arrow-down")"></i>
+                                }
+                            </th>
+                            <th @onclick="() => HandleSort(nameof(Lease.Status))" style="cursor: pointer;">
+                                Status
+                                @if (SortColumn == nameof(Lease.Status))
+                                {
+                                    <i class="bi bi-@(SortAscending ? "arrow-up" : "arrow-down")"></i>
+                                }
+                            </th>
+                            @if (ShowActions)
+                            {
+                                <th>Actions</th>
+                            }
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var lease in Leases)
+                        {
+                            <tr class="@(lease.IsActive ? "" : "table-warning")" id="lease-@lease.Id">
+                                <td>
+                                    <strong>@lease.Property?.Address</strong>
+                                    @if (lease.Property != null)
+                                    {
+                                        <br />
+                                        <small class="text-muted">@lease.Property.City, @lease.Property.State</small>
+                                    }
+                                </td>
+                                <td>
+                                    @if (lease.Tenant != null)
+                                    {
+                                        <strong>@lease.Tenant.FullName</strong>
+                                        <br />
+                                        <small class="text-muted">@lease.Tenant.Email</small>
+                                    }
+                                    else
+                                    {
+                                        <span class="text-warning"><i class="bi bi-hourglass-split"></i> Pending Acceptance</span>
+                                        <br />
+                                        <small class="text-muted">Lease offer awaiting tenant</small>
+                                    }
+                                </td>
+                                <td>@lease.StartDate.ToString("MMM dd, yyyy")</td>
+                                <td>@lease.EndDate.ToString("MMM dd, yyyy")</td>
+                                <td>@lease.MonthlyRent.ToString("C")</td>
+                                <td>
+                                    <span class="badge @GetStatusBadgeClass(lease.Status)">
+                                        @lease.Status
+                                    </span>
+                                    @if (lease.IsActive && lease.DaysRemaining <= 30 && lease.DaysRemaining > 0)
+                                    {
+                                        <br />
+                                        <small class="text-warning">@lease.DaysRemaining days remaining</small>
+                                    }
+                                </td>
+                                @if (ShowActions)
+                                {
+                                    <td>
+                                        <div class="btn-group btn-group-sm">
+                                            <button class="btn btn-outline-primary" @onclick="() => HandleView(lease.Id)" title="View">
+                                                <i class="bi bi-eye"></i>
+                                            </button>
+                                            @if (ShowEditDelete)
+                                            {
+                                                <button class="btn btn-outline-secondary" @onclick="() => HandleEdit(lease.Id)" title="Edit">
+                                                    <i class="bi bi-pencil"></i>
+                                                </button>
+                                                <button class="btn btn-outline-danger" @onclick="() => HandleDelete(lease.Id)" title="Delete">
+                                                    <i class="bi bi-trash"></i>
+                                                </button>
+                                            }
+                                        </div>
+                                    </td>
+                                }
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            </div>
+        }
+    </div>
+</div>
+
+@code {
+    [Parameter, EditorRequired]
+    public List<Lease> Leases { get; set; } = new();
+    
+    [Parameter]
+    public IEnumerable<IGrouping<Guid, Lease>> GroupedLeases { get; set; } = Enumerable.Empty<IGrouping<Guid, Lease>>();
+    
+    [Parameter]
+    public List<Tenant> AvailableTenants { get; set; } = new();
+    
+    [Parameter]
+    public HashSet<int> ExpandedProperties { get; set; } = new();
+    
+    [Parameter]
+    public bool GroupByProperty { get; set; } = false;
+    
+    [Parameter]
+    public bool ShowMetrics { get; set; } = true;
+    
+    [Parameter]
+    public bool ShowActions { get; set; } = true;
+    
+    [Parameter]
+    public bool ShowEditDelete { get; set; } = true;
+    
+    [Parameter]
+    public string SearchTerm { get; set; } = string.Empty;
+    
+    [Parameter]
+    public string StatusFilter { get; set; } = string.Empty;
+    
+    [Parameter]
+    public string TenantFilter { get; set; } = string.Empty;
+    
+    [Parameter]
+    public string SortColumn { get; set; } = nameof(Lease.StartDate);
+    
+    [Parameter]
+    public bool SortAscending { get; set; } = false;
+    
+    [Parameter]
+    public int ActiveCount { get; set; }
+    
+    [Parameter]
+    public int ExpiringSoonCount { get; set; }
+    
+    [Parameter]
+    public decimal TotalMonthlyRent { get; set; }
+    
+    [Parameter]
+    public EventCallback<string> OnSearchChanged { get; set; }
+    
+    [Parameter]
+    public EventCallback<string> OnStatusFilterChanged { get; set; }
+    
+    [Parameter]
+    public EventCallback<string> OnTenantFilterChanged { get; set; }
+    
+    [Parameter]
+    public EventCallback<bool> OnGroupByPropertyChanged { get; set; }
+    
+    [Parameter]
+    public EventCallback<(string Column, bool Ascending)> OnSort { get; set; }
+    
+    [Parameter]
+    public EventCallback<Guid> OnTogglePropertyGroup { get; set; }
+    
+    [Parameter]
+    public EventCallback<Guid> OnView { get; set; }
+    
+    [Parameter]
+    public EventCallback<Guid> OnEdit { get; set; }
+    
+    [Parameter]
+    public EventCallback<Guid> OnDelete { get; set; }
+
+    // Lease status options for filter dropdown
+    private List<string> leaseStatuses = new() { "Active", "Expired", "Terminated", "Pending" };
+    
+    private async Task HandleSearchChanged(string searchTerm)
+    {
+        await OnSearchChanged.InvokeAsync(searchTerm);
+    }
+    
+    private async Task HandleStatusFilterChanged(string status)
+    {
+        await OnStatusFilterChanged.InvokeAsync(status);
+    }
+    
+    private async Task HandleTenantFilterChanged(ChangeEventArgs e)
+    {
+        await OnTenantFilterChanged.InvokeAsync(e.Value?.ToString() ?? string.Empty);
+    }
+    
+    private async Task HandleGroupByPropertyChanged(bool groupByProperty)
+    {
+        await OnGroupByPropertyChanged.InvokeAsync(groupByProperty);
+    }
+    
+    private async Task HandleSort(string column)
+    {
+        var ascending = SortColumn == column ? !SortAscending : true;
+        await OnSort.InvokeAsync((column, ascending));
+    }
+    
+    private async Task HandleTogglePropertyGroup(Guid propertyId)
+    {
+        await OnTogglePropertyGroup.InvokeAsync(propertyId);
+    }
+    
+    private async Task HandleView(Guid leaseId)
+    {
+        await OnView.InvokeAsync(leaseId);
+    }
+    
+    private async Task HandleEdit(Guid leaseId)
+    {
+        await OnEdit.InvokeAsync(leaseId);
+    }
+    
+    private async Task HandleDelete(Guid leaseId)
+    {
+        await OnDelete.InvokeAsync(leaseId);
+    }
+    
+    private string GetStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            "Active" => "bg-success",
+            "Pending" => "bg-info",
+            "Expired" => "bg-warning",
+            "Terminated" => "bg-danger",
+            _ => "bg-secondary"
+        };
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseMetricsCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseMetricsCard.razor
new file mode 100644
index 0000000..6623422
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseMetricsCard.razor
@@ -0,0 +1,64 @@
+<div class="row mb-3">
+    @if(ShowActive){
+    <div class="col-md-3">
+        <div class="card text-white bg-success">
+            <div class="card-body">
+                <h6>Active Leases</h6>
+                <h4>@ActiveCount</h4>
+            </div>
+        </div>
+    </div>
+    }
+    @if(ShowExpiringSoon){
+    <div class="col-md-3">
+        <div class="card text-white bg-warning">
+            <div class="card-body">
+                <h6>Expiring Soon</h6>
+                <h4>@ExpiringSoonCount</h4>
+            </div>
+        </div>
+    </div>
+    }
+    @if(ShowTotalCount){
+    <div class="col-md-3">
+        <div class="card text-white bg-primary">
+            <div class="card-body">
+                <h6>Total Leases</h6>
+                <h4>@TotalCount</h4>
+            </div>
+        </div>
+    </div>
+    }
+     @if(ShowTotalMonthlyRent){
+    <div class="col-md-3">
+        <div class="card text-white bg-info">
+            <div class="card-body">
+                <h6>Total Rent/Month</h6>
+                <h4>@TotalMonthlyRent.ToString("C")</h4>
+            </div>
+        </div>
+    </div>
+    }
+</div>
+@code {
+    [Parameter]
+    public int ActiveCount { get; set; }
+
+    [Parameter]
+    public int ExpiringSoonCount { get; set; }
+
+    [Parameter]
+    public decimal TotalMonthlyRent { get; set; }
+
+    [Parameter]
+    public int TotalCount { get; set; }
+
+    [Parameter]
+    public bool ShowActive { get; set; } = false;
+    [Parameter]
+    public bool ShowExpiringSoon { get; set; } = false;
+    [Parameter]
+    public bool ShowTotalMonthlyRent { get; set; } = false;
+    [Parameter]
+    public bool ShowTotalCount { get; set; } = false;
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Leases/LeasePaymentsCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeasePaymentsCard.razor
new file mode 100644
index 0000000..283047e
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeasePaymentsCard.razor
@@ -0,0 +1,51 @@
+
+@namespace Aquiis.UI.Shared.Components.Entities.Leases
+
+<div class="card mb-4">
+    <div class="card-header">
+        <h5 class="card-title mb-0">Invoice Payments</h5>
+    </div>
+    <div class="card-body">
+        @if (InvoicePayments != null && InvoicePayments.Any())
+        {
+            <div class="list-group">
+                @foreach (var payment in InvoicePayments.OrderByDescending(p => p.PaidOn))
+                {
+                    <div class="list-group-item">
+                        <div class="d-flex justify-content-between align-items-start">
+                            <div class="flex-grow-1">
+                                <div class="d-flex align-items-center mb-1">
+                                    <strong>@payment.InvoiceId</strong>
+                                </div>
+                                <small class="text-muted">
+                                    @payment.Amount.ToString("C") | @payment.PaidOn.ToString("MMM dd, yyyy")
+                                </small>
+                            </div>
+                            <div class="btn-group btn-group-sm">
+                                <button class="btn btn-outline-info" @onclick="() => OnViewPayment.InvokeAsync(payment.Id)" title="View">
+                                    <i class="bi bi-eye"></i>
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                }
+            </div>
+        }
+        else
+        {
+            <p class="text-muted">No payments found for this lease.</p>
+        }
+    </div>
+</div>
+
+
+@code {
+    [Parameter, EditorRequired]
+    public Lease Lease { get; set; }
+
+    [Parameter, EditorRequired]
+    public IEnumerable<Payment> InvoicePayments { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnViewPayment { get; set; }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseQuickActionsCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseQuickActionsCard.razor
new file mode 100644
index 0000000..b24e96c
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseQuickActionsCard.razor
@@ -0,0 +1,74 @@
+
+<div class="card">
+    <div class="card-header">
+        <h5 class="mb-0">Quick Actions</h5>
+    </div>
+    <div class="card-body">
+        <div class="d-grid gap-2">
+            <button class="btn btn-outline-primary" @onclick="() => OnEdit.InvokeAsync()">
+                <i class="bi bi-pencil"></i> Edit Lease
+            </button>
+            <button class="btn btn-outline-success" @onclick="() => OnCreateInvoice.InvokeAsync(Lease.Id)">
+                <i class="bi bi-receipt"></i> Create Invoice
+            </button>
+            <button class="btn btn-outline-info" @onclick="() => OnViewInvoices.InvokeAsync(Lease.Id)">
+                <i class="bi bi-list-check"></i> View Invoices
+            </button>
+            <button class="btn btn-outline-secondary" @onclick="() => OnViewDocuments.InvokeAsync(Lease.Id)">
+                <i class="bi bi-folder"></i> View Documents
+            </button>
+            @if (Lease.DocumentId == null)
+            {
+                <button class="btn btn-outline-warning" @onclick="() => OnGenerateLeaseDocument.InvokeAsync(Lease.Id)" disabled="@IsGenerating">
+                    @if (IsGenerating)
+                    {
+                        <span class="spinner-border spinner-border-sm me-2" role="status"></span>
+                        <span>Generating...</span>
+                    }
+                    else
+                    {
+                        <i class="bi bi-file-pdf"></i>
+                        <span> Generate PDF</span>
+                    }
+                </button>
+            }
+            else
+            {
+                <button class="btn btn-primary" @onclick="() => OnViewDocument.InvokeAsync(Lease.Id)">
+                    <i class="bi bi-eye"></i> View PDF
+                </button>
+                <button class="btn btn-outline-primary" @onclick="() => OnDownloadDocument.InvokeAsync(Lease.Id)">
+                    <i class="bi bi-download"></i> Download PDF
+                </button>
+            }
+        </div>
+    </div>
+</div>
+
+@code {
+    [Parameter]
+    public Lease Lease { get; set; } = new Lease();
+
+    [Parameter]
+    public EventCallback OnEdit { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnCreateInvoice { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnViewInvoices { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnViewDocuments { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnGenerateLeaseDocument { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnViewDocument { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnDownloadDocument { get; set; }
+    [Parameter]
+    public bool IsGenerating { get; set; } = false;
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseRenewalCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseRenewalCard.razor
new file mode 100644
index 0000000..1b1dc88
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseRenewalCard.razor
@@ -0,0 +1,164 @@
+<div class="col-md-4">
+        @if (Lease.IsExpiringSoon)
+        {
+            <div class="card border-warning mb-3">
+                <div class="card-header bg-warning text-dark">
+                    <h5 class="mb-0">
+                        <i class="bi bi-exclamation-triangle-fill"></i> Renewal Alert
+                    </h5>
+                </div>
+                <div class="card-body">
+                    <p class="mb-2">
+                        <strong>Expires in:</strong> 
+                        <span class="text-danger fw-bold">@Lease.DaysRemaining days</span>
+                    </p>
+                    <p class="mb-2">
+                        <strong>End Date:</strong> @Lease.EndDate.ToString("MMM dd, yyyy")
+                    </p>
+                    
+                    @if (!string.IsNullOrEmpty(Lease.RenewalStatus))
+                    {
+                        <p class="mb-2">
+                            <strong>Status:</strong> 
+                            <span class="badge bg-@GetRenewalStatusBadgeClass(Lease.RenewalStatus)">
+                                @Lease.RenewalStatus
+                            </span>
+                        </p>
+                    }
+
+                    @if (Lease.ProposedRenewalRent.HasValue)
+                    {
+                        <p class="mb-2">
+                            <strong>Proposed Rent:</strong> @Lease.ProposedRenewalRent.Value.ToString("C")
+                            @if (Lease.ProposedRenewalRent != Lease.MonthlyRent)
+                            {
+                                var increase = Lease.ProposedRenewalRent.Value - Lease.MonthlyRent;
+                                var percentage = (increase / Lease.MonthlyRent) * 100;
+                                <small class="text-muted">
+                                    (@(increase > 0 ? "+" : "")@increase.ToString("C"), @percentage.ToString("F1")%)
+                                </small>
+                            }
+                        </p>
+                    }
+
+                    @if (Lease.RenewalNotificationSentOn.HasValue)
+                    {
+                        <small class="text-muted d-block mb-2">
+                            Notification sent: @Lease.RenewalNotificationSentOn.Value.ToString("MMM dd, yyyy")
+                        </small>
+                    }
+
+                    @if (!string.IsNullOrEmpty(Lease.RenewalNotes))
+                    {
+                        <hr/>
+                        <small>
+                            <strong>Notes:</strong><br/>
+                            @Lease.RenewalNotes
+                        </small>
+                    }
+
+                    <div class="d-grid gap-2 mt-3">
+                        @if (Lease.RenewalStatus == "Pending" || string.IsNullOrEmpty(Lease.RenewalStatus))
+                        {
+                            <button class="btn btn-success btn-sm" @onclick="() => ShowRenewalOfferModal()">
+                                <i class="bi bi-envelope-check"></i> Send Renewal Offer
+                            </button>
+                            <button class="btn btn-outline-primary btn-sm" @onclick="GenerateRenewalOfferPdf" disabled="@isGeneratingPdf">
+                                @if (isGeneratingPdf)
+                                {
+                                    <span class="spinner-border spinner-border-sm me-1"></span>
+                                }
+                                else
+                                {
+                                    <i class="bi bi-file-pdf"></i>
+                                }
+                                Generate Offer Letter
+                            </button>
+                        }
+                        @if (Lease.RenewalStatus == "Offered")
+                        {
+                            <button class="btn btn-outline-success btn-sm" @onclick="() => MarkRenewalAccepted()">
+                                <i class="bi bi-check-circle"></i> Mark as Accepted
+                            </button>
+                            <button class="btn btn-outline-danger btn-sm" @onclick="() => MarkRenewalDeclined()">
+                                <i class="bi bi-x-circle"></i> Mark as Declined
+                            </button>
+                            <button class="btn btn-outline-primary btn-sm" @onclick="GenerateRenewalOfferPdf" disabled="@isGeneratingPdf">
+                                @if (isGeneratingPdf)
+                                {
+                                    <span class="spinner-border spinner-border-sm me-1"></span>
+                                }
+                                else
+                                {
+                                    <i class="bi bi-file-pdf"></i>
+                                }
+                                Generate Offer Letter
+                            </button>
+                        }
+                    </div>
+                </div>
+            </div>
+        }
+    </div>
+
+@code {
+    [Parameter, EditorRequired]
+    public Lease Lease { get; set; }
+
+    private bool isGeneratingPdf = false;
+    
+    private void ShowRenewalOfferModal()
+    {
+        // Logic to show modal for sending renewal offer
+    }
+
+    private async Task GenerateRenewalOfferPdf()
+    {
+        isGeneratingPdf = true;
+        try
+        {
+            // Logic to generate PDF
+            await Task.Delay(2000); // Simulate PDF generation delay
+        }
+        finally
+        {
+            isGeneratingPdf = false;
+        }
+    }
+
+    private void MarkRenewalAccepted()
+    {
+        // Logic to mark renewal as accepted
+    }
+
+    private void MarkRenewalDeclined()
+    {
+        // Logic to mark renewal as declined
+    }
+
+    private string GetStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            "Active" => "bg-success",
+            "Pending" => "bg-warning",
+            "Expired" => "bg-secondary",
+            "Terminated" => "bg-danger",
+            _ => "bg-secondary"
+        };
+    }
+
+    private string GetRenewalStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            "Pending" => "secondary",
+            "Offered" => "info",
+            "Accepted" => "success",
+            "Declined" => "danger",
+            "Expired" => "dark",
+            _ => "secondary"
+        };
+    }
+    
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseRenewalList.razor b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseRenewalList.razor
new file mode 100644
index 0000000..26b938b
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseRenewalList.razor
@@ -0,0 +1,189 @@
+@namespace Aquiis.UI.Shared.Components.Entities.Leases
+<div class="card mb-3">
+    <div class="card-header d-flex justify-content-between align-items-center @HeaderCssClass">
+        <h5 class="mb-0">
+            <i class="bi bi-calendar-event"></i> @Title
+        </h5>
+        <button class="btn btn-sm btn-outline-primary" @onclick="() => OnViewAll.InvokeAsync()">
+            View All
+        </button>
+    </div>
+    <div class="card-body">
+        @if (isLoading)
+        {
+            <div class="text-center py-4">
+                <div class="spinner-border spinner-border-sm" role="status">
+                    <span class="visually-hidden">Loading...</span>
+                </div>
+            </div>
+        }
+        else if (Leases == null || !Leases.Any())
+        {
+            <p class="text-muted mb-0">No leases expiring in the next 90 days.</p>
+        }
+        else
+        {
+            <div class="mb-2">
+                <div class="btn-group btn-group-sm" role="group">
+                    <input type="radio" class="btn-check" name="renewalFilter" id="filter30" value="30" 
+                           checked="@(selectedFilter == 30)" @onchange="() => FilterLeases(30)" />
+                    <label class="btn btn-outline-primary" for="filter30">
+                        30 Days <span class="badge bg-danger">@leases30Days.Count()</span>
+                    </label>
+
+                    <input type="radio" class="btn-check" name="renewalFilter" id="filter60" value="60"
+                           checked="@(selectedFilter == 60)" @onchange="() => FilterLeases(60)" />
+                    <label class="btn btn-outline-primary" for="filter60">
+                        60 Days <span class="badge bg-warning">@(leases60Days.Count() - leases30Days.Count())</span>
+                    </label>
+
+                    <input type="radio" class="btn-check" name="renewalFilter" id="filter90" value="90"
+                           checked="@(selectedFilter == 90)" @onchange="() => FilterLeases(90)" />
+                    <label class="btn btn-outline-primary" for="filter90">
+                        90 Days <span class="badge bg-info">@(leases90Days.Count() - leases60Days.Count())</span>
+                    </label>
+                </div>
+            </div>
+
+            <div class="list-group list-group-flush" style="max-height: 400px; overflow-y: auto;">
+                @foreach (var lease in GetFilteredLeases())
+                {
+                    var daysRemaining = (lease.EndDate - DateTime.Today).Days;
+                    var urgencyClass = daysRemaining <= 30 ? "danger" : daysRemaining <= 60 ? "warning" : "info";
+                    var urgencyIcon = daysRemaining <= 30 ? "exclamation-triangle-fill" : daysRemaining <= 60 ? "exclamation-circle-fill" : "info-circle-fill";
+                    
+                    <div class="list-group-item list-group-item-action">
+                        <div class="d-flex w-100 justify-content-between align-items-start">
+                            <div class="flex-grow-1">
+                                <h6 class="mb-1">
+                                    <i class="bi @urgencyIcon text-@urgencyClass"></i>
+                                    <a href="#" @onclick="() => OnViewLease.InvokeAsync(lease.Id)">@lease.Property?.Address</a>
+                                </h6>
+                                <p class="mb-1 small">
+                                    <strong>Tenant:</strong> @lease.Tenant?.FullName<br/>
+                                    <strong>End Date:</strong> @lease.EndDate.ToString("MMM dd, yyyy")<br/>
+                                    <strong>Current Rent:</strong> @lease.MonthlyRent.ToString("C")
+                                    @if (lease.ProposedRenewalRent.HasValue)
+                                    {
+                                        <span class="text-muted"> → @lease.ProposedRenewalRent.Value.ToString("C")</span>
+                                    }
+                                </p>
+                                @if (!string.IsNullOrEmpty(lease.RenewalStatus))
+                                {
+                                    <span class="badge bg-@GetStatusBadgeClass(lease.RenewalStatus)">
+                                        @lease.RenewalStatus
+                                    </span>
+                                }
+                            </div>
+                            <div class="text-end ms-3">
+                                <span class="badge bg-@urgencyClass rounded-pill">
+                                    @daysRemaining days
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                }
+            </div>
+
+            <div class="card-footer">
+                <small class="text-muted">
+                    <i class="bi bi-info-circle"></i>
+                    Showing @GetFilteredLeases().Count() of @Leases.Count() expiring leases
+                </small>
+            </div>
+        }
+    </div>
+</div>
+
+@code {
+
+    [Parameter]
+    public string Title { get; set; } = "Upcoming Lease Renewals";
+
+    [Parameter]
+    public string HeaderCssClass { get; set; } = "";
+
+    [Parameter]
+    public List<Lease> Leases { get; set; } = new();
+
+    private List<Lease> leases30Days = new();
+    private List<Lease> leases60Days = new();
+    private List<Lease> leases90Days = new();
+    private bool isLoading = true; 
+    private int selectedFilter = 60;
+
+    [Parameter]
+    public EventCallback OnViewAll { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnViewLease { get; set; }
+
+    [Parameter]
+    public EventCallback<int> OnFilterChanged { get; set; }
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadLeases();
+    }
+
+    private async Task LoadLeases()
+    {
+        try
+        {
+            isLoading = true;
+            var today = DateTime.Today;
+
+            leases30Days = Leases
+                .Where(l => l.EndDate <= today.AddDays(30))
+                .ToList();
+
+            leases60Days = Leases
+                .Where(l => l.EndDate <= today.AddDays(60))
+                .ToList();
+
+            leases90Days = Leases
+                .Where(l => l.EndDate <= today.AddDays(90))
+                .ToList();
+        }
+        catch (Exception ex)
+        {
+            // Log error
+            Console.WriteLine($"Error loading expiring leases: {ex.Message}");
+        }
+        finally
+        {
+            isLoading = false;
+        }
+    }
+
+    private async Task FilterLeases(int days)
+    {
+        selectedFilter = days;
+        await OnFilterChanged.InvokeAsync(days);
+        StateHasChanged();
+    }
+
+    private List<Lease> GetFilteredLeases()
+    {
+        return selectedFilter switch
+        {
+            30 => leases30Days,
+            60 => leases60Days,
+            90 => leases90Days,
+            _ => Leases
+        };
+    }
+
+    private string GetStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            "Pending" => "secondary",
+            "Offered" => "info",
+            "Accepted" => "success",
+            "Declined" => "danger",
+            "Expired" => "dark",
+            _ => "secondary"
+        };
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseSearchAndFilter.razor b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseSearchAndFilter.razor
new file mode 100644
index 0000000..926639f
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseSearchAndFilter.razor
@@ -0,0 +1,104 @@
+
+@namespace Aquiis.UI.Shared.Components.Entities.Leases
+
+<div class="row mb-3">
+    <div class="col-md-3">
+        <div class="input-group">
+            <span class="input-group-text"><i class="bi bi-search"></i></span>
+            <input type="text" class="form-control" placeholder="Search leases..." 
+                   value="@SearchTerm" 
+                   @oninput="HandleSearchChanged" />
+        </div>
+    </div>
+    <div class="col-md-3">
+        <select class="form-select" value="@StatusFilter" @onchange="HandleStatusFilterChanged">
+            <option value="">All Lease Statuses</option>
+            <option value="Active">Active</option>
+            <option value="Expired">Expired</option>
+            <option value="Terminated">Terminated</option>
+            <option value="Pending">Pending</option>
+        </select>
+    </div>
+    <div class="col-md-3">
+        <select class="form-select" value="@TenantFilter" @onchange="HandleTenantFilterChanged">
+            <option value="">All Tenants</option>
+            @foreach (var tenant in AvailableTenants)
+            {
+                <option value="@tenant.Id">@tenant.FullName</option>
+            }
+        </select>
+    </div>
+    @if (AllowGrouping)
+    {
+        <div class="col-md-3">
+            <div class="form-check form-switch pt-2">
+                <input class="form-check-input" type="checkbox" id="groupByProperty" 
+                       checked="@GroupByProperty" 
+                       @onchange="HandleGroupByPropertyChanged">
+                <label class="form-check-label" for="groupByProperty">
+                    Group by Property
+                </label>
+            </div>
+        </div>
+    }
+</div>
+@code {
+    [Parameter]
+    public string SearchTerm { get; set; } = string.Empty;
+
+    [Parameter]
+    public string StatusFilter { get; set; } = string.Empty;
+
+    [Parameter]
+    public Guid TenantFilter { get; set; } = Guid.Empty;
+
+    [Parameter]
+    public List<Tenant> AvailableTenants { get; set; } = new();
+
+    [Parameter]
+    public EventCallback<string> OnSearchChanged { get; set; }
+
+    [Parameter]
+    public EventCallback<string> OnStatusFilterChanged { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnTenantFilterChanged { get; set; }
+
+    [Parameter]
+    public bool GroupByProperty { get; set; } = false;
+
+    [Parameter]
+    public bool AllowGrouping { get; set; } = true;
+
+    [Parameter]
+    public EventCallback<bool> OnGroupByPropertyChanged { get; set; }
+    
+    private async Task HandleSearchChanged(ChangeEventArgs e)
+    {
+        var value = e.Value?.ToString() ?? string.Empty;
+        await OnSearchChanged.InvokeAsync(value);
+    }
+
+    private async Task HandleStatusFilterChanged(ChangeEventArgs e)
+    {
+        var value = e.Value?.ToString() ?? string.Empty;
+        await OnStatusFilterChanged.InvokeAsync(value);
+    }
+
+    private async Task HandleTenantFilterChanged(ChangeEventArgs e)
+    {
+        var value = e.Value?.ToString() ?? string.Empty;
+        Guid tenantId = Guid.Empty;
+        if (Guid.TryParse(value, out var parsedId))
+        {
+            tenantId = parsedId;
+        }
+        await OnTenantFilterChanged.InvokeAsync(tenantId);
+    }
+    private async Task HandleGroupByPropertyChanged(ChangeEventArgs e)
+    {
+        var value = e.Value?.ToString() ?? "false";
+        bool isChecked = bool.TryParse(value, out var parsed) && parsed;
+        await OnGroupByPropertyChanged.InvokeAsync(isChecked);
+    }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseSummaryCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseSummaryCard.razor
new file mode 100644
index 0000000..8c34ab3
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseSummaryCard.razor
@@ -0,0 +1,42 @@
+
+<div>
+    @* Lease Summary Card *@
+    <div class="card mt-3">
+        <div class="card-header">
+            <h5 class="mb-0">Lease Summary</h5>
+        </div>
+        <div class="card-body">
+            <p><strong>Duration:</strong> @((Lease.EndDate - Lease.StartDate).Days) days</p>
+            <p><strong>Total Rent:</strong> @((Lease.MonthlyRent * 12).ToString("C"))/year</p>
+            @if (Lease.IsActive)
+            {
+                <p><strong>Days Remaining:</strong> @Lease.DaysRemaining</p>
+            }
+            @if (RecentInvoices.Any())
+            {
+                <hr />
+                <small class="text-muted">
+                    <strong>Recent Invoices:</strong><br />
+                    @foreach (var invoice in RecentInvoices.Take(3))
+                    {
+                        <span class="badge @(invoice.Status == "Paid" ? "bg-success" : "bg-warning") me-1">
+                            <a href="#" @onclick="() => OnViewInvoice.InvokeAsync(invoice.Id)">@invoice.InvoiceNumber</a>
+                        </span>
+                    }
+                </small>
+            }
+        </div>
+    </div>
+</div>
+@code {
+    [Parameter, EditorRequired]
+    public Lease Lease { get; set; } = new Lease();
+
+    [Parameter]
+    public EventCallback<Guid> OnViewInvoice { get; set; }
+
+    [Parameter]
+    public List<Invoice> RecentInvoices { get; set; } = new List<Invoice>();
+
+    
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseTransactionsCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseTransactionsCard.razor
new file mode 100644
index 0000000..9df95fc
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Leases/LeaseTransactionsCard.razor
@@ -0,0 +1,58 @@
+
+@namespace Aquiis.UI.Shared.Components.Entities.Leases
+
+<div class="card mt-3">
+    <div class="card-header d-flex justify-content-between align-items-center">
+        <h5 class="mb-0">Lease Invoices</h5>
+        <span class="badge bg-secondary">@LeaseInvoices.Count</span>
+    </div>
+    <div class="card-body">
+        <div class="list-group">
+            @foreach (var invoice in LeaseInvoices.OrderByDescending(i => i.InvoiceNumber))
+            {
+                <div class="list-group-item">
+                    <div class="d-flex justify-content-between align-items-start">
+                        <div class="flex-grow-1">
+                            <div class="d-flex align-items-center mb-1">
+                                <strong><a href="/propertymanagement/invoices/@invoice.Id" class="text-decoration-none">@invoice.InvoiceNumber</a></strong>
+                            </div>
+                            <small class="text-muted">
+                                @invoice.BalanceDue.ToString("C") | @invoice.InvoicedOn.ToString("MMM dd, yyyy")
+                            </small>
+                        </div>
+                        <div class="btn-group btn-group-sm">
+                            <button class="btn btn-outline-info" @onclick="() => OnViewInvoice.InvokeAsync(invoice.Id)" title="View">
+                                <i class="bi bi-eye"></i>
+                            </button>
+                            @if(invoice.BalanceDue > 0)
+                            {
+                            <button class="btn btn-outline-primary" @onclick="() => OnMakePayment.InvokeAsync(invoice.Id)" title="Make Payment">
+                                <i class="bi bi-credit-card"></i>
+                            </button>
+                            }
+                        </div>
+                    </div>
+                </div>
+            }
+        </div>
+    </div>
+</div>
+
+
+
+
+
+
+@code {
+    [Parameter, EditorRequired]
+    public Lease Lease { get; set; } = new Lease();
+
+    [Parameter, EditorRequired]
+    public List<Invoice> LeaseInvoices { get; set; } = new List<Invoice>();
+
+    [Parameter, EditorRequired]
+    public EventCallback<Guid> OnViewInvoice { get; set; }
+
+    [Parameter, EditorRequired]
+    public EventCallback<Guid> OnMakePayment { get; set; }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/MaintenanceRequests/MaintenanceRequestCard.razor b/3-Aquiis.UI.Shared/Components/Entities/MaintenanceRequests/MaintenanceRequestCard.razor
new file mode 100644
index 0000000..e69de29
diff --git a/3-Aquiis.UI.Shared/Components/Entities/MaintenanceRequests/MaintenanceRequestDetails.razor b/3-Aquiis.UI.Shared/Components/Entities/MaintenanceRequests/MaintenanceRequestDetails.razor
new file mode 100644
index 0000000..e69de29
diff --git a/3-Aquiis.UI.Shared/Components/Entities/MaintenanceRequests/MaintenanceRequestForm.razor b/3-Aquiis.UI.Shared/Components/Entities/MaintenanceRequests/MaintenanceRequestForm.razor
new file mode 100644
index 0000000..e69de29
diff --git a/3-Aquiis.UI.Shared/Components/Entities/MaintenanceRequests/MaintenanceRequestListView.razor b/3-Aquiis.UI.Shared/Components/Entities/MaintenanceRequests/MaintenanceRequestListView.razor
new file mode 100644
index 0000000..decfb2c
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/MaintenanceRequests/MaintenanceRequestListView.razor
@@ -0,0 +1,104 @@
+
+@inject NavigationManager Navigation
+@namespace Aquiis.UI.Shared.Components.Entities.MaintenanceRequests
+@using Microsoft.AspNetCore.Http
+
+ <div class="card mt-3">
+    <div class="card-header d-flex justify-content-between align-items-center @HeaderCssClass">
+        <h5 class="mb-0">Maintenance Requests</h5>
+        <button class="btn btn-sm btn-primary" @onclick="CreateMaintenanceRequest">
+            <i class="bi bi-plus-circle"></i> New Request
+        </button>
+    </div>
+    <div class="card-body">
+        @if (MaintenanceRequests.Any())
+        {
+            <div class="list-group">
+                @foreach (var request in MaintenanceRequests.OrderByDescending(r => r.RequestedOn).Take(5))
+                {
+                    <div class="list-group-item">
+                        <div class="d-flex justify-content-between align-items-start">
+                            <div class="flex-grow-1">
+                                <div class="d-flex align-items-center mb-1">
+                                    <strong class="me-2">@request.Title</strong>
+                                    <span class="badge @request.PriorityBadgeClass me-1">@request.Priority</span>
+                                    <span class="badge @request.StatusBadgeClass">@request.Status</span>
+                                    @if (request.IsOverdue)
+                                    {
+                                        <i class="bi bi-exclamation-triangle-fill text-danger ms-2" title="Overdue"></i>
+                                    }
+                                </div>
+                                <small class="text-muted d-block mb-1">@request.RequestType</small>
+                                <small class="text-muted">
+                                    Requested: @request.RequestedOn.ToString("MMM dd, yyyy")
+                                    @if (request.ScheduledOn.HasValue)
+                                    {
+                                        <span> | Scheduled: @request.ScheduledOn.Value.ToString("MMM dd, yyyy")</span>
+                                    }
+                                </small>
+                            </div>
+                            <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewMaintenanceRequest(request.Id)">
+                                <i class="bi bi-eye"></i>
+                            </button>
+                        </div>
+                    </div>
+                }
+            </div>
+            @if (MaintenanceRequests.Count > 5)
+            {
+                <div class="mt-2">
+                    <small class="text-muted">Showing 5 of @MaintenanceRequests.Count requests</small>
+                </div>
+            }
+            <div class="mt-2">
+                <button class="btn btn-sm btn-outline-secondary w-100" @onclick="ViewAllMaintenanceRequests">
+                    <i class="bi bi-list-ul"></i> View All Maintenance Requests
+                </button>
+            </div>
+        }
+        else
+        {
+            <div class="text-center text-muted py-3">
+                <i class="bi bi-tools" style="font-size: 2rem;"></i>
+                <p class="mb-0 mt-2">No maintenance requests for this property</p>
+                <button class="btn btn-sm btn-primary mt-2" @onclick="CreateMaintenanceRequest">
+                    <i class="bi bi-plus-circle"></i> Create First Request
+                </button>
+            </div>
+        }
+    </div>
+</div>
+@code {
+    [Parameter, EditorRequired]
+    public List<MaintenanceRequest> MaintenanceRequests { get; set; } = default!;
+
+    [Parameter, EditorRequired]
+    public Guid PropertyId { get; set; }
+
+    [Parameter]
+    public string HeaderCssClass { get; set; } = "";
+
+    [Parameter]
+    public EventCallback<Guid> OnViewRequest { get; set; }
+
+    [Parameter]
+    public EventCallback OnCreateRequest { get; set; }
+
+    [Parameter]
+    public EventCallback OnViewAllRequests { get; set; }
+
+    private void CreateMaintenanceRequest()
+    {
+        OnCreateRequest.InvokeAsync();
+    }
+
+    private void ViewMaintenanceRequest(Guid requestId)
+    {
+        OnViewRequest.InvokeAsync(requestId);
+    }
+
+    private void ViewAllMaintenanceRequests()
+    {
+        OnViewAllRequests.InvokeAsync();
+    }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/OrganizationUsers/OrganizationUserViewModel.cs b/3-Aquiis.UI.Shared/Components/Entities/OrganizationUsers/OrganizationUserViewModel.cs
new file mode 100644
index 0000000..917a532
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/OrganizationUsers/OrganizationUserViewModel.cs
@@ -0,0 +1,32 @@
+using Aquiis.Core.Entities;
+
+namespace Aquiis.UI.Shared.Components.Entities.OrganizationUsers;
+
+
+/// <summary>
+/// View model representing a user's membership in an organization.
+/// Combines data from OrganizationUser entity and ApplicationUser (AspNetUsers).
+/// </summary>
+public class OrganizationUserViewModel
+{
+    // From OrganizationUser entity
+    public Guid Id { get; set; } // OrganizationUser.Id
+    public Guid OrganizationId { get; set; }
+    public string UserId { get; set; } = string.Empty;
+    public string Role { get; set; } = string.Empty;
+    public bool IsActive { get; set; }
+    public DateTime GrantedOn { get; set; }
+    public DateTime? RevokedOn { get; set; }
+    public string? GrantedBy { get; set; } // UserId of granter
+    public string? GrantedByEmail { get; set; } // Email of granter (from UserProfile join)
+    
+    // From UserProfile
+    public string Email { get; set; } = string.Empty;
+    public string FirstName { get; set; } = string.Empty;
+    public string LastName { get; set; } = string.Empty;
+    public string? PhoneNumber { get; set; }
+    
+    // Computed properties
+    public string FullName => $"{FirstName} {LastName}".Trim();
+    public string DisplayRole => Role;
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/OrganizationUsers/UserAccessCard.razor b/3-Aquiis.UI.Shared/Components/Entities/OrganizationUsers/UserAccessCard.razor
new file mode 100644
index 0000000..412d251
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/OrganizationUsers/UserAccessCard.razor
@@ -0,0 +1,55 @@
+
+@using Aquiis.Core.Entities
+@using Aquiis.Core.Constants
+@namespace Aquiis.UI.Shared.Components.Entities.OrganizationUsers
+
+
+<div class="card">
+    <div class="card-header">
+        <h6 class="mb-0"><i class="bi bi-shield-check"></i> Your Access</h6>
+    </div>
+    <div class="card-body">
+        <p><strong>Your Role:</strong></p>
+        <p>
+            <span class="badge @GetRoleBadgeClass(CurrentUserRole) fs-6">
+                @CurrentUserRole
+            </span>
+        </p>
+        <hr />
+        <p class="small mb-0">
+            @if (isOwner)
+            {
+                <span>You have full control over this organization as the Owner.</span>
+            }
+            else if (isAdministrator)
+            {
+                <span>You have administrative access to this organization.</span>
+            }
+            else
+            {
+                <span>You have limited access to this organization.</span>
+            }
+        </p>
+    </div>
+</div>
+
+@code {
+
+    [Parameter, EditorRequired]
+    public string CurrentUserRole { get; set; }
+
+    private bool isOwner => CurrentUserRole == ApplicationConstants.OrganizationRoles.Owner;
+    private bool isAdministrator => CurrentUserRole == ApplicationConstants.OrganizationRoles.Administrator;
+
+     private string GetRoleBadgeClass(string role)
+    {
+        return role switch
+        {
+            ApplicationConstants.OrganizationRoles.Owner => "bg-primary",
+            ApplicationConstants.OrganizationRoles.Administrator => "bg-info",
+            ApplicationConstants.OrganizationRoles.PropertyManager => "bg-success",
+            ApplicationConstants.OrganizationRoles.User => "bg-secondary",
+            _ => "bg-secondary"
+        };
+    }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/OrganizationUsers/UserProfileCard.razor b/3-Aquiis.UI.Shared/Components/Entities/OrganizationUsers/UserProfileCard.razor
new file mode 100644
index 0000000..a19e4d4
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/OrganizationUsers/UserProfileCard.razor
@@ -0,0 +1,25 @@
+
+@namespace Aquiis.UI.Shared.Components.Entities.OrganizationUsers
+
+<div class="card mb-3">
+    <div class="card-body d-flex align-items-center">
+        <div class="me-3">
+            <Aquiis.UI.Shared.Components.Common.UserAvatar 
+                Size="64" 
+                FirstName="@OrganizationUserViewModel!.FirstName" 
+                LastName="@OrganizationUserViewModel!.LastName" />
+        </div>
+        <div>
+            <h5 class="card-title mb-1">@OrganizationUserViewModel!.FirstName @OrganizationUserViewModel!.LastName</h5>
+            <p class="card-text mb-1"><strong>Email:</strong> @OrganizationUserViewModel!.Email</p>
+            <p class="card-text mb-0"><strong>Role:</strong> @OrganizationUserViewModel!.Role</p>
+        </div>
+    </div>
+</div>
+
+@code {
+
+    [Parameter, EditorRequired]
+    public OrganizationUserViewModel? OrganizationUserViewModel { get; set; } = new();
+
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Organizations/OrganizationCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Organizations/OrganizationCard.razor
new file mode 100644
index 0000000..e5f767e
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Organizations/OrganizationCard.razor
@@ -0,0 +1,72 @@
+@using Aquiis.Core.Entities
+@using Aquiis.Application.Services
+@using Aquiis.Core.Constants
+
+@namespace Aquiis.UI.Shared.Components.Entities.Organizations
+
+<!-- Organization Information Card -->
+        <div class="card mb-4">
+            <div class="card-header d-flex justify-content-between align-items-center">
+                <h5 class="mb-0">Organization Information</h5>
+                <button class="btn btn-sm btn-primary" @onclick="() =>OnEdit.InvokeAsync()">
+                    <i class="bi bi-pencil"></i> Edit
+                </button>
+            </div>
+            @if(OrganizationViewModel?.Organization != null)
+            {
+            <div class="card-body">
+                <dl class="row">
+                    <dt class="col-sm-3">Organization Name:</dt>
+                    <dd class="col-sm-9"><strong>@OrganizationViewModel?.Organization?.Name</strong></dd>
+
+                    <dt class="col-sm-3">Display Name:</dt>
+                    <dd class="col-sm-9">@(OrganizationViewModel?.Organization?.DisplayName ?? "-")</dd>
+
+                    <dt class="col-sm-3">State:</dt>
+                    <dd class="col-sm-9">@(OrganizationViewModel?.Organization?.State ?? "-")</dd>
+
+                    <dt class="col-sm-3">Status:</dt>
+                    <dd class="col-sm-9">
+                        @if (OrganizationViewModel?.Organization?.IsActive == true)
+                        {
+                            <span class="badge bg-success">Active</span>
+                        }
+                        else
+                        {
+                            <span class="badge bg-secondary">Inactive</span>
+                        }
+                    </dd>
+
+                    <dt class="col-sm-3">Owner:</dt>
+                    <dd class="col-sm-9">@OrganizationViewModel?.OrganizationOwner?.Email</dd>
+
+                    <dt class="col-sm-3">Created On:</dt>
+                    <dd class="col-sm-9">@OrganizationViewModel?.Organization?.CreatedOn.ToString("MMMM dd, yyyy")</dd>
+
+                    @if (OrganizationViewModel?.Organization?.LastModifiedOn.HasValue == true)
+                    {
+                        <dt class="col-sm-3">Last Modified:</dt>
+                        <dd class="col-sm-9">@OrganizationViewModel?.Organization?.LastModifiedOn.Value.ToString("MMMM dd, yyyy")</dd>
+                    }
+                </dl>
+            </div>
+            }
+            else
+            {
+                <div class="card-body">
+                    <div class="text-center text-muted">
+                        Organization details are not available.
+                    </div>
+                </div>
+            }
+        </div>
+
+@code {
+     
+    [Parameter, EditorRequired]
+    public OrganizationViewModel? OrganizationViewModel { get; set; } = new();
+
+    [Parameter]
+    public EventCallback OnEdit { get; set; }
+
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Organizations/OrganizationUserStatistics.razor b/3-Aquiis.UI.Shared/Components/Entities/Organizations/OrganizationUserStatistics.razor
new file mode 100644
index 0000000..c08fe30
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Organizations/OrganizationUserStatistics.razor
@@ -0,0 +1,34 @@
+
+@namespace Aquiis.UI.Shared.Components.Entities.Organizations
+@using Aquiis.UI.Shared.Components.Entities.OrganizationUsers
+ <!-- Quick Stats Card -->
+<div class="card mb-4">
+    <div class="card-header">
+        <h6 class="mb-0"><i class="bi bi-bar-chart"></i> Quick Stats</h6>
+    </div>
+    <div class="card-body">
+        <dl class="row mb-0">
+            <dt class="col-sm-7">Total Users:</dt>
+            <dd class="col-sm-5 text-end"><strong>@OrganizationUsers.Count</strong></dd>
+
+            <dt class="col-sm-7">Active Users:</dt>
+            <dd class="col-sm-5 text-end"><strong>@OrganizationUsers.Count(u => u.IsActive)</strong></dd>
+
+            <dt class="col-sm-7">Owners:</dt>
+            <dd class="col-sm-5 text-end"><strong>@OrganizationUsers.Count(u => u.Role == ApplicationConstants.OrganizationRoles.Owner)</strong></dd>
+
+            <dt class="col-sm-7">Administrators:</dt>
+            <dd class="col-sm-5 text-end"><strong>@OrganizationUsers.Count(u => u.Role == ApplicationConstants.OrganizationRoles.Administrator)</strong></dd>
+
+            <dt class="col-sm-7">Property Managers:</dt>
+            <dd class="col-sm-5 text-end"><strong>@OrganizationUsers.Count(u => u.Role == ApplicationConstants.OrganizationRoles.PropertyManager)</strong></dd>
+        </dl>
+    </div>
+</div>
+
+@code {
+    [Parameter, EditorRequired]
+    public OrganizationViewModel OrganizationViewModel { get; set; }
+
+    public List<OrganizationUserViewModel> OrganizationUsers => OrganizationViewModel.OrganizationUsers;
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Organizations/OrganizationUsersListView.razor b/3-Aquiis.UI.Shared/Components/Entities/Organizations/OrganizationUsersListView.razor
new file mode 100644
index 0000000..eacc86b
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Organizations/OrganizationUsersListView.razor
@@ -0,0 +1,101 @@
+
+@namespace Aquiis.UI.Shared.Components.Entities.Organizations
+@using Aquiis.UI.Shared.Components.Entities.OrganizationUsers
+
+<!-- Users with Access Card -->
+<div class="card">
+    <div class="card-header d-flex justify-content-between align-items-center">
+        <h5 class="mb-0">Users with Access</h5>
+        @if (IsOwner || IsAdministrator && IsCurrentOrganization)
+        {
+            <button class="btn btn-sm btn-primary" @onclick="() => OnManageUsers.InvokeAsync()">
+                <i class="bi bi-people"></i> Manage Users
+            </button>
+        }
+    </div>
+    <div class="card-body p-0">
+        @if (!OrganizationUsers.Any())
+        {
+            <div class="p-3 text-center text-muted">
+                No users assigned to this organization.
+            </div>
+        }
+        else
+        {
+            <div class="table-responsive">
+                <table class="table table-hover mb-0">
+                    <thead>
+                        <tr>
+                            <th>User</th>
+                            <th>Role</th>
+                            <th>Granted By</th>
+                            <th>Granted On</th>
+                            <th>Status</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var orgUser in OrganizationUsers)
+                        {
+                            <tr>
+                                <td>
+                                    <div>
+                                        <strong>@orgUser.Email</strong>
+                                    </div>
+                                </td>
+                                <td>
+                                    <span class="badge @GetRoleBadgeClass(orgUser.Role)">
+                                        @orgUser.Role
+                                    </span>
+                                </td>
+                                <td>@(orgUser.GrantedByEmail ?? "Unknown")</td>
+                                <td>@orgUser.GrantedOn.ToString("MMM dd, yyyy")</td>
+                                <td>
+                                    @if (orgUser.IsActive && orgUser.RevokedOn == null)
+                                    {
+                                        <span class="badge bg-success">Active</span>
+                                    }
+                                    else
+                                    {
+                                        <span class="badge bg-danger">Revoked</span>
+                                    }
+                                </td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            </div>
+        }
+    </div>
+</div>
+
+@code {
+
+    [Parameter, EditorRequired]
+    public OrganizationViewModel? OrganizationViewModel { get; set; } = new();
+
+    public List<OrganizationUserViewModel> OrganizationUsers => OrganizationViewModel?.OrganizationUsers ?? new List<OrganizationUserViewModel>();
+
+    [Parameter, EditorRequired]
+    public bool IsOwner { get; set; } = false;
+    [Parameter, EditorRequired]
+    public bool IsAdministrator { get; set; } = false;
+
+    [Parameter, EditorRequired]
+    public bool IsCurrentOrganization { get; set; } = false;
+
+    [Parameter]
+    public EventCallback OnManageUsers { get; set; }
+
+    private string GetRoleBadgeClass(string role)
+    {
+        return role switch
+        {
+            ApplicationConstants.OrganizationRoles.Owner => "bg-primary",
+            ApplicationConstants.OrganizationRoles.Administrator => "bg-info",
+            ApplicationConstants.OrganizationRoles.PropertyManager => "bg-success",
+            ApplicationConstants.OrganizationRoles.User => "bg-secondary",
+            _ => "bg-secondary"
+        };
+    }
+  
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Organizations/OrganizationViewModel.cs b/3-Aquiis.UI.Shared/Components/Entities/Organizations/OrganizationViewModel.cs
new file mode 100644
index 0000000..1c454bf
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Organizations/OrganizationViewModel.cs
@@ -0,0 +1,11 @@
+using Aquiis.Core.Entities;
+using Aquiis.UI.Shared.Components.Entities.OrganizationUsers;
+
+namespace Aquiis.UI.Shared.Components.Entities.Organizations;
+
+public class OrganizationViewModel
+{
+    public Organization? Organization { get; set; }
+    public OrganizationUserViewModel? OrganizationOwner { get; set; }
+    public List<OrganizationUserViewModel> OrganizationUsers { get; set; } = new();
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyCard.razor
new file mode 100644
index 0000000..6c5eeea
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyCard.razor
@@ -0,0 +1,198 @@
+@namespace Aquiis.UI.Shared.Components.Entities.Properties
+@using Aquiis.Core.Entities
+@using Aquiis.Core.Constants
+
+<div class="card h-100">
+    <div class="card-body">
+        <div class="d-flex justify-content-between align-items-start mb-2">
+            <h5 class="card-title">@Address</h5>
+            <span class="badge @GetStatusBadgeClass()">
+                @Status
+            </span>
+        </div>
+        <p class="text-muted mb-2">@City, @State @ZipCode</p>
+        
+        @if (!string.IsNullOrWhiteSpace(Description))
+        {
+            <p class="card-text mb-2">@Description</p>
+        }
+        
+        <div class="row text-center mb-3">
+            <div class="col-4">
+                <small class="text-muted">Bedrooms</small>
+                <div class="fw-bold">@Bedrooms</div>
+            </div>
+            <div class="col-4">
+                <small class="text-muted">Bathrooms</small>
+                <div class="fw-bold">@Bathrooms</div>
+            </div>
+            <div class="col-4">
+                <small class="text-muted">Sq Ft</small>
+                <div class="fw-bold">@SquareFeet.ToString("N0")</div>
+            </div>
+        </div>
+        
+        <div class="text-center mb-3">
+            <span class="h4 text-primary">@MonthlyRent.ToString("C")</span>
+            <small class="text-muted">/month</small>
+        </div>
+    </div>
+    
+    @if (ShowActions)
+    {
+        <div class="card-footer">
+            <div class="btn-group w-100">
+                <button class="btn btn-outline-primary" @onclick="HandleView">
+                    <i class="bi bi-eye"></i> View
+                </button>
+                @if (ShowEditDelete)
+                {
+                    <button class="btn btn-outline-secondary" @onclick="HandleEdit">
+                        <i class="bi bi-pencil"></i> Edit
+                    </button>
+                    <button class="btn btn-outline-danger" 
+                            @onclick="HandleDelete">
+                        <i class="bi bi-trash"></i> Delete
+                    </button>
+                }
+            </div>
+        </div>
+    }
+</div>
+
+@code {
+    /// <summary>
+    /// Property ID
+    /// </summary>
+    [Parameter, EditorRequired]
+    public Guid PropertyId { get; set; }
+    
+    /// <summary>
+    /// Property address
+    /// </summary>
+    [Parameter, EditorRequired]
+    public string Address { get; set; } = string.Empty;
+    
+    /// <summary>
+    /// Unit number (optional)
+    /// </summary>
+    [Parameter]
+    public string? UnitNumber { get; set; }
+    
+    /// <summary>
+    /// City
+    /// </summary>
+    [Parameter, EditorRequired]
+    public string City { get; set; } = string.Empty;
+    
+    /// <summary>
+    /// State
+    /// </summary>
+    [Parameter, EditorRequired]
+    public string State { get; set; } = string.Empty;
+    
+    /// <summary>
+    /// Zip code
+    /// </summary>
+    [Parameter, EditorRequired]
+    public string ZipCode { get; set; } = string.Empty;
+    
+    /// <summary>
+    /// Property description
+    /// </summary>
+    [Parameter]
+    public string? Description { get; set; }
+    
+    /// <summary>
+    /// Number of bedrooms
+    /// </summary>
+    [Parameter]
+    public int Bedrooms { get; set; }
+    
+    /// <summary>
+    /// Number of bathrooms
+    /// </summary>
+    [Parameter]
+    public decimal Bathrooms { get; set; }
+    
+    /// <summary>
+    /// Square footage
+    /// </summary>
+    [Parameter]
+    public int SquareFeet { get; set; }
+    
+    /// <summary>
+    /// Monthly rent amount
+    /// </summary>
+    [Parameter]
+    public decimal MonthlyRent { get; set; }
+    
+    /// <summary>
+    /// Property status
+    /// </summary>
+    [Parameter, EditorRequired]
+    public string Status { get; set; } = string.Empty;
+    
+    /// <summary>
+    /// Whether to show action buttons
+    /// </summary>
+    [Parameter]
+    public bool ShowActions { get; set; } = true;
+    
+    /// <summary>
+    /// Whether to show edit/delete buttons (requires ShowActions = true)
+    /// </summary>
+    [Parameter]
+    public bool ShowEditDelete { get; set; } = true;
+    
+    /// <summary>
+    /// Callback when View button is clicked
+    /// </summary>
+    [Parameter]
+    public EventCallback<Guid> OnView { get; set; }
+    
+    /// <summary>
+    /// Callback when Edit button is clicked
+    /// </summary>
+    [Parameter]
+    public EventCallback<Guid> OnEdit { get; set; }
+    
+    /// <summary>
+    /// Callback when Delete button is clicked
+    /// </summary>
+    [Parameter]
+    public EventCallback<Guid> OnDelete { get; set; }
+    
+    private string DisplayAddress => string.IsNullOrWhiteSpace(UnitNumber) 
+        ? Address 
+        : $"{Address}, {UnitNumber}";
+    
+    private async Task HandleView()
+    {
+        await OnView.InvokeAsync(PropertyId);
+    }
+    
+    private async Task HandleEdit()
+    {
+        await OnEdit.InvokeAsync(PropertyId);
+    }
+    
+    private async Task HandleDelete()
+    {
+        await OnDelete.InvokeAsync(PropertyId);
+    }
+    
+    private string GetStatusBadgeClass()
+    {
+        return Status switch
+        {
+            var s when s == ApplicationConstants.PropertyStatuses.Available => "bg-success",
+            var s when s == ApplicationConstants.PropertyStatuses.ApplicationPending => "bg-info",
+            var s when s == ApplicationConstants.PropertyStatuses.LeasePending => "bg-warning",
+            var s when s == ApplicationConstants.PropertyStatuses.Occupied => "bg-danger",
+            var s when s == ApplicationConstants.PropertyStatuses.UnderRenovation => "bg-secondary",
+            var s when s == ApplicationConstants.PropertyStatuses.OffMarket => "bg-dark",
+            _ => "bg-secondary"
+        };
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyDetails.razor b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyDetails.razor
new file mode 100644
index 0000000..26907dc
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyDetails.razor
@@ -0,0 +1,114 @@
+@namespace Aquiis.UI.Shared.Components.Entities.Properties
+@using Aquiis.Core.Entities
+@using Aquiis.Core.Constants
+
+<div class="card">
+    <div class="card-header d-flex justify-content-between align-items-center @HeaderCssClass">
+        <h5 class="mb-0">Property Information</h5>
+        <span class="badge @GetAvailabilityBadgeClass()">
+            @Property.Status
+        </span>
+        @if (OnEdit.HasDelegate)
+        {
+            <button class="btn btn-sm btn-outline-primary" @onclick="OnEdit">
+                <i class="bi bi-pencil-square"></i> Edit
+            </button>
+        }
+    </div>
+    <div class="card-body">
+        <div class="row">
+            <div class="col-md-12 mb-3">
+                <strong>Address:</strong>
+                <p class="mb-1">@Property.Address @(!string.IsNullOrWhiteSpace(Property.UnitNumber) ? $", {Property.UnitNumber}" : "")</p>
+                <small class="text-muted">@Property.City, @Property.State @Property.ZipCode</small>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-6 mb-3">
+                <strong>Property Type:</strong>
+                <p>@Property.PropertyType</p>
+            </div>
+            <div class="col-md-6 mb-3">
+                <strong>Monthly Rent:</strong>
+                <p class="text-success fw-bold">@Property.MonthlyRent.ToString("C")</p>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-4 mb-3">
+                <strong>Bedrooms:</strong>
+                <p>@Property.Bedrooms</p>
+            </div>
+            <div class="col-md-4 mb-3">
+                <strong>Bathrooms:</strong>
+                <p>@Property.Bathrooms</p>
+            </div>
+            <div class="col-md-4 mb-3">
+                <strong>Square Feet:</strong>
+                <p>@Property.SquareFeet.ToString("N0")</p>
+            </div>
+        </div>
+
+        @if (!string.IsNullOrEmpty(Property.Description))
+        {
+            <div class="row">
+                <div class="col-md-12 mb-3">
+                    <strong>Description:</strong>
+                    <p>@Property.Description</p>
+                </div>
+            </div>
+        }
+
+        @if (ShowDates)
+        {
+            <div class="row">
+                <div class="col-md-6 mb-3">
+                    <strong>Created:</strong>
+                    <p>@Property.CreatedOn.ToString("MMMM dd, yyyy")</p>
+                </div>
+                @if (Property.LastModifiedOn.HasValue)
+                {
+                    <div class="col-md-6 mb-3">
+                        <strong>Last Modified:</strong>
+                        <p>@Property.LastModifiedOn.Value.ToString("MMMM dd, yyyy")</p>
+                    </div>
+                }
+            </div>
+        }
+    </div>
+</div>
+
+@code {
+    /// <summary>
+    /// Property entity to display
+    /// </summary>
+    [Parameter, EditorRequired]
+    public Property Property { get; set; } = default!;
+
+    [Parameter]
+    public EventCallback OnEdit { get; set; }
+
+    [Parameter]
+    public string HeaderCssClass { get; set; } = "";
+    
+    /// <summary>
+    /// Whether to show created/modified dates
+    /// </summary>
+    [Parameter]
+    public bool ShowDates { get; set; } = true;
+    
+    private string GetAvailabilityBadgeClass()
+    {
+        return Property.Status switch
+        {
+            ApplicationConstants.PropertyStatuses.Available => "bg-success",
+            ApplicationConstants.PropertyStatuses.ApplicationPending => "bg-warning text-dark",
+            ApplicationConstants.PropertyStatuses.LeasePending => "bg-info",
+            ApplicationConstants.PropertyStatuses.Occupied => "bg-danger",
+            ApplicationConstants.PropertyStatuses.UnderRenovation => "bg-secondary",
+            ApplicationConstants.PropertyStatuses.OffMarket => "bg-dark text-white",
+            _ => "bg-secondary"
+        };
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyForm.razor b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyForm.razor
new file mode 100644
index 0000000..8c2fdbf
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyForm.razor
@@ -0,0 +1,167 @@
+
+@namespace Aquiis.UI.Shared.Components.Entities.Properties
+
+ <EditForm Model="Model" OnValidSubmit="() => OnValidSubmit.InvokeAsync(Model)" FormName="@FormName">
+    <DataAnnotationsValidator />
+    
+    @if (!string.IsNullOrEmpty(ErrorMessage))
+    {
+        <div class="alert alert-danger" role="alert">
+            @ErrorMessage
+        </div>
+    }
+
+    <div class="row">
+        <div class="col-md-12 mb-3">
+            <label class="form-label">Address *</label>
+            <InputText @bind-Value="Model.Address" class="form-control" placeholder="Enter property address" />
+            <ValidationMessage For="() => Model.Address" class="text-danger" />
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-8 mb-3">
+            <label class="form-label">Unit Number</label>
+            <InputText @bind-Value="Model.UnitNumber" class="form-control" placeholder="e.g., Apt 2B, Unit 101" />
+            <ValidationMessage For="() => Model.UnitNumber" class="text-danger" />
+        </div>
+        @* <div class="col-md-4 mb-3">
+            <label class="form-label" for="@Model.ZipCode">Postal Code</label>
+            <InputText @bind-Value="Model.ZipCode" class="form-control" placeholder="#####-####" />
+            <ValidationMessage For="() => Model.ZipCode" class="text-danger" />
+        </div> *@
+    </div>
+
+    <div class="row">
+        <div class="col-md-4 mb-3">
+            <label class="form-label">City</label>
+            <InputText @bind-Value="Model.City" class="form-control" placeholder="City" />
+            <ValidationMessage For="() => Model.City" class="text-danger" />
+        </div>
+        <div class="col-md-4 mb-3">
+            <label class="form-label">State</label>
+            <InputSelect @bind-Value="Model.State" class="form-select">
+                <option value="">Select State</option>
+                @foreach (var state in States.StatesArray())
+                {
+                    <option value="@state.Abbreviation">@state.Name</option>
+                }
+            </InputSelect>
+            <ValidationMessage For="() => Model.State" class="text-danger" />
+        </div>
+        <div class="col-md-4 mb-3">
+            <label class="form-label" for="@Model.ZipCode">Postal Code</label>
+            <InputText @bind-Value="Model.ZipCode" class="form-control" placeholder="#####-####" />
+            <ValidationMessage For="() => Model.ZipCode" class="text-danger" />
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-6 mb-3">
+            <label class="form-label">Property Type *</label>
+            <InputSelect @bind-Value="Model.PropertyType" class="form-select">
+                <option value="">Select property type</option>
+                <option value="House">House</option>
+                <option value="Apartment">Apartment</option>
+                <option value="Condo">Condo</option>
+                <option value="Townhouse">Townhouse</option>
+                <option value="Duplex">Duplex</option>
+                <option value="Commercial">Commercial</option>
+                <option value="Other">Other</option>
+            </InputSelect>
+            <ValidationMessage For="() => Model.PropertyType" class="text-danger" />
+        </div>
+        <div class="col-md-6 mb-3">
+            <label class="form-label">Monthly Rent *</label>
+            <InputNumber @bind-Value="Model.MonthlyRent" class="form-control" placeholder="0.00" />
+            <ValidationMessage For="() => Model.MonthlyRent" class="text-danger" />
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-6 mb-3">
+            <label class="form-label">Status *</label>
+            <InputSelect @bind-Value="Model.Status" class="form-select">
+                <option value="@ApplicationConstants.PropertyStatuses.Available">Available</option>
+                <option value="@ApplicationConstants.PropertyStatuses.ApplicationPending">Application Pending</option>
+                <option value="@ApplicationConstants.PropertyStatuses.LeasePending">Lease Pending</option>
+                <option value="@ApplicationConstants.PropertyStatuses.Occupied">Occupied</option>
+                <option value="@ApplicationConstants.PropertyStatuses.UnderRenovation">Under Renovation</option>
+                <option value="@ApplicationConstants.PropertyStatuses.OffMarket">Off Market</option>
+            </InputSelect>
+            <ValidationMessage For="() => Model.Status" class="text-danger" />
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-4 mb-3">
+            <label class="form-label">Bedrooms</label>
+            <InputNumber @bind-Value="Model.Bedrooms" class="form-control" />
+            <ValidationMessage For="() => Model.Bedrooms" class="text-danger" />
+        </div>
+        <div class="col-md-4 mb-3">
+            <label class="form-label">Bathrooms</label>
+            <InputNumber @bind-Value="Model.Bathrooms" class="form-control" />
+            <ValidationMessage For="() => Model.Bathrooms" class="text-danger" />
+        </div>
+        <div class="col-md-4 mb-3">
+            <label class="form-label">Square Feet</label>
+            <InputNumber @bind-Value="Model.SquareFeet" class="form-control" />
+            <ValidationMessage For="() => Model.SquareFeet" class="text-danger" />
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-12 mb-3">
+            <label class="form-label">Description</label>
+            <InputTextArea @bind-Value="Model.Description" class="form-control" rows="4" placeholder="Property description and features" />
+            <ValidationMessage For="() => Model.Description" class="text-danger" />
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-12 mb-3">
+            <div class="form-check">
+                <InputCheckbox @bind-Value="Model.IsAvailable" class="form-check-input" />
+                <label class="form-check-label">
+                    Property is available for rent
+                </label>
+            </div>
+        </div>
+    </div>
+
+    <div class="d-flex gap-2">
+        <button type="submit" class="btn btn-primary" disabled="@IsSubmitting">
+            @if (IsSubmitting)
+            {
+                <span class="spinner-border spinner-border-sm me-2" role="status"></span>
+            }
+            @SubmitButtonText
+        </button>
+        <button type="button" class="btn btn-secondary" @onclick="() => OnCancel.InvokeAsync()">Cancel</button>
+    </div>
+</EditForm>
+@code {
+
+    [Parameter, EditorRequired]
+    public PropertyFormModel Model {get; set;} = new PropertyFormModel(); 
+                        
+    [Parameter]
+    public string FormName { get; set; } = "create-property";
+
+    [Parameter]
+    public string SubmitButtonText { get; set; } = "Submit";
+
+    [Parameter]
+    public bool IsSubmitting { get; set; } = false;
+
+    [Parameter]
+    public string ErrorMessage { get; set; } = string.Empty;
+
+    [Parameter]
+    public EventCallback<PropertyFormModel> OnValidSubmit { get; set; }
+
+    [Parameter]
+    public EventCallback OnCancel { get; set; }
+
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyFormModel.cs b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyFormModel.cs
new file mode 100644
index 0000000..c7a1075
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyFormModel.cs
@@ -0,0 +1,54 @@
+using System.ComponentModel.DataAnnotations;
+using Aquiis.Core.Constants;
+
+namespace Aquiis.UI.Shared.Components.Entities.Properties;
+
+/// <summary>
+/// Form model for property create/edit operations
+/// </summary>
+public class PropertyFormModel
+{
+    [Required(ErrorMessage = "Address is required")]
+    [StringLength(200, ErrorMessage = "Address cannot exceed 200 characters")]
+    public string Address { get; set; } = string.Empty;
+
+    [StringLength(50, ErrorMessage = "Unit number cannot exceed 50 characters")]
+    public string? UnitNumber { get; set; }
+
+    [StringLength(100, ErrorMessage = "City cannot exceed 100 characters")]
+    public string City { get; set; } = string.Empty;
+
+    [StringLength(50, ErrorMessage = "State cannot exceed 50 characters")]
+    public string State { get; set; } = string.Empty;
+
+    [StringLength(20, ErrorMessage = "Zip Code cannot exceed 20 characters")]
+    [DataType(DataType.PostalCode)]
+    [RegularExpression(@"^\d{5}(-\d{4})?$", ErrorMessage = "Invalid Zip Code format.")]
+    public string ZipCode { get; set; } = string.Empty;
+
+    [Required(ErrorMessage = "Property type is required")]
+    [StringLength(50, ErrorMessage = "Property type cannot exceed 50 characters")]
+    public string PropertyType { get; set; } = string.Empty;
+
+    [Required(ErrorMessage = "Monthly rent is required")]
+    [Range(0.01, double.MaxValue, ErrorMessage = "Monthly rent must be greater than 0")]
+    public decimal MonthlyRent { get; set; }
+
+    [Range(0, int.MaxValue, ErrorMessage = "Bedrooms cannot be negative")]
+    public int Bedrooms { get; set; }
+
+    [Range(0.0, double.MaxValue, ErrorMessage = "Bathrooms cannot be negative")]
+    public decimal Bathrooms { get; set; }
+
+    [Range(0, int.MaxValue, ErrorMessage = "Square feet cannot be negative")]
+    public int SquareFeet { get; set; }
+
+    [StringLength(1000, ErrorMessage = "Description cannot exceed 1000 characters")]
+    public string Description { get; set; } = string.Empty;
+
+    [Required(ErrorMessage = "Status is required")]
+    [StringLength(50, ErrorMessage = "Status cannot exceed 50 characters")]
+    public string Status { get; set; } = ApplicationConstants.PropertyStatuses.Available;
+
+    public bool IsAvailable { get; set; } = true;
+}
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyList.razor b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyList.razor
new file mode 100644
index 0000000..f95bac4
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyList.razor
@@ -0,0 +1,69 @@
+<div class="card mb-3">
+    <div class="card-header @HeaderCssClass">
+        <h5><i class="bi bi-house"></i> @Title</h5>
+    </div>
+    <div class="card-body">
+        @if (Properties.Any())
+        {
+            <div class="list-group list-group-flush">
+                @foreach (var property in Properties)
+                {
+                    <div class="list-group-item d-flex justify-content-between align-items-center">
+                        <div>
+                            <h6 class="mb-1">
+                                <a href="javascript:void(0);" class="text-decoration-none" @onclick="() => OnViewProperty.InvokeAsync(property.Id)">
+                                    @property.Address
+                                </a>
+                            </h6>
+                            <small class="text-muted">@property.City, @property.State - @property.PropertyType</small>
+                        </div>
+                        <div class="text-end">
+                            <span class="badge @GetStatusBadgeClass(property.Status) mb-1">@FormatPropertyStatus(property.Status)</span>
+                            <br>
+                            <small class="text-muted">@property.MonthlyRent.ToString("C")</small>
+                        </div>
+                    </div>
+                }
+            </div>
+        }
+        else
+        {
+            <p class="text-muted">No properties found.</p>
+        }
+    </div>
+</div>
+@code {
+    [Parameter]
+    public List<Property> Properties { get; set; } = new();
+
+    [Parameter]
+    public string Title { get; set; } = "Properties";
+
+    [Parameter]
+    public string HeaderCssClass { get; set; } = "";
+
+    [Parameter]
+    public EventCallback<Guid> OnViewProperty { get; set; }
+
+    private string GetStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            ApplicationConstants.PropertyStatuses.Available => "bg-success",
+            ApplicationConstants.PropertyStatuses.Occupied => "bg-primary",
+            //ApplicationConstants.PropertyStatuses.Maintenance => "bg-warning text-dark",
+            _ => "bg-secondary"
+        };
+    }
+
+    private string FormatPropertyStatus(string status)
+    {
+        return status switch
+        {
+            ApplicationConstants.PropertyStatuses.Available => "Available",
+            ApplicationConstants.PropertyStatuses.Occupied => "Occupied",
+            //ApplicationConstants.PropertyStatuses.Maintenance => "Under Maintenance",
+            _ => "Unknown"
+        };
+    }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyListView.razor b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyListView.razor
new file mode 100644
index 0000000..d36a091
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyListView.razor
@@ -0,0 +1,352 @@
+@namespace Aquiis.UI.Shared.Components.Entities.Properties
+@using Aquiis.Core.Entities
+@using Aquiis.Core.Constants
+
+<div class="row mb-3">
+    <div class="col-md-4">
+        <div class="input-group">
+            <span class="input-group-text"><i class="bi bi-search"></i></span>
+            <input type="text" class="form-control" placeholder="Search properties..." 
+                   value="@SearchTerm" 
+                   @oninput="HandleSearchChanged" />
+        </div>
+    </div>
+    <div class="col-md-4">
+        <select class="form-select" value="@StatusFilter" @onchange="HandleStatusFilterChanged">
+            <option value="">All Properties</option>
+            <option value="Available">Available</option>
+            <option value="Pending">Pending Lease</option>
+            <option value="Occupied">Occupied</option>
+        </select>
+    </div>
+    <div class="col-md-4">
+        <button class="btn btn-outline-secondary" @onclick="OnClearFilters">
+            <i class="bi bi-x-circle"></i> Clear Filters
+        </button>
+    </div>
+</div>
+
+@if (ShowMetrics)
+{
+    <PropertyMetricsCard 
+        ShowAvailableProperties="true" 
+        ShowLeasePendingProperties="false" 
+        ShowOccupiedProperties="true" 
+        ShowTotalMonthlyRent="true"
+        TotalPropertiesCount="@TotalCount"
+        AvailableCount="@AvailableCount"
+        PendingCount="@PendingCount"
+        OccupiedCount="@OccupiedCount"
+        TotalMonthlyRent="@TotalMonthlyRent" />
+}
+
+@if (ViewMode == PropertyListViewMode.Grid)
+{
+    <!-- Grid View -->
+    <div class="row">
+        @foreach (var property in Properties)
+        {
+            <div class="col-md-6 col-lg-4 mb-4" id="property-@property.Id">
+                <PropertyCard 
+                    PropertyId="@property.Id"
+                    Address="@property.Address"
+                    UnitNumber="@property.UnitNumber"
+                    City="@property.City"
+                    State="@property.State"
+                    ZipCode="@property.ZipCode"
+                    Description="@property.Description"
+                    Bedrooms="@property.Bedrooms"
+                    Bathrooms="@property.Bathrooms"
+                    SquareFeet="@property.SquareFeet"
+                    MonthlyRent="@property.MonthlyRent"
+                    Status="@property.Status"
+                    ShowEditDelete="@ShowEditDelete"
+                    OnView="@OnView"
+                    OnEdit="@OnEdit"
+                    OnDelete="@OnDelete" />
+            </div>
+        }
+    </div>
+}
+else
+{
+    <!-- Table View -->
+    <div class="card">
+        <div class="card-body p-0">
+            <div class="table-responsive">
+                <table class="table table-hover mb-0">
+                    <thead>
+                        <tr>
+                            <th @onclick="() => HandleSort(nameof(Property.Address))" style="cursor: pointer;">
+                                Address
+                                @if (SortColumn == nameof(Property.Address))
+                                {
+                                    <i class="bi bi-@(SortAscending ? "arrow-up" : "arrow-down")"></i>
+                                }
+                            </th>
+                            <th @onclick="() => HandleSort(nameof(Property.City))" style="cursor: pointer;">
+                                City
+                                @if (SortColumn == nameof(Property.City))
+                                {
+                                    <i class="bi bi-@(SortAscending ? "arrow-up" : "arrow-down")"></i>
+                                }
+                            </th>
+                            <th @onclick="() => HandleSort(nameof(Property.PropertyType))" style="cursor: pointer;">
+                                Type
+                                @if (SortColumn == nameof(Property.PropertyType))
+                                {
+                                    <i class="bi bi-@(SortAscending ? "arrow-up" : "arrow-down")"></i>
+                                }
+                            </th>
+                            <th class="text-center">Beds</th>
+                            <th class="text-center">Baths</th>
+                            <th class="text-end" @onclick="() => HandleSort(nameof(Property.SquareFeet))" style="cursor: pointer;">
+                                Sq Ft
+                                @if (SortColumn == nameof(Property.SquareFeet))
+                                {
+                                    <i class="bi bi-@(SortAscending ? "arrow-up" : "arrow-down")"></i>
+                                }
+                            </th>
+                            <th @onclick="() => HandleSort(nameof(Property.Status))" style="cursor: pointer;">
+                                Status
+                                @if (SortColumn == nameof(Property.Status))
+                                {
+                                    <i class="bi bi-@(SortAscending ? "arrow-up" : "arrow-down")"></i>
+                                }
+                            </th>
+                            <th class="text-end" @onclick="() => HandleSort(nameof(Property.MonthlyRent))" style="cursor: pointer;">
+                                Rent
+                                @if (SortColumn == nameof(Property.MonthlyRent))
+                                {
+                                    <i class="bi bi-@(SortAscending ? "arrow-up" : "arrow-down")"></i>
+                                }
+                            </th>
+                            <th class="text-center">Actions</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var property in Properties)
+                        {
+                            <tr id="property-@property.Id">
+                                <td>
+                                    <strong>@property.Address @(!string.IsNullOrWhiteSpace(property.UnitNumber) ? $", {property.UnitNumber}" : "")</strong>
+                                    <br />
+                                    <small class="text-muted">@property.State @property.ZipCode</small>
+                                </td>
+                                <td>@property.City</td>
+                                <td>@property.PropertyType</td>
+                                <td class="text-center">@property.Bedrooms</td>
+                                <td class="text-center">@property.Bathrooms</td>
+                                <td class="text-end">@property.SquareFeet.ToString("N0")</td>
+                                <td>
+                                    <span class="badge @GetStatusBadgeClass(property.Status)">
+                                        @FormatPropertyStatus(property.Status)
+                                    </span>
+                                </td>
+                                <td class="text-end">
+                                    <strong class="text-primary">@property.MonthlyRent.ToString("C")</strong>
+                                </td>
+                                <td class="text-center">
+                                    <div class="btn-group btn-group-sm">
+                                        <button class="btn btn-outline-primary" @onclick="() => HandleView(property.Id)" title="View">
+                                            <i class="bi bi-eye"></i>
+                                        </button>
+                                        @if (ShowEditDelete)
+                                        {
+                                            <button class="btn btn-outline-secondary" @onclick="() => HandleEdit(property.Id)" title="Edit">
+                                                <i class="bi bi-pencil"></i>
+                                            </button>
+                                            <button class="btn btn-outline-danger" 
+                                                    @onclick="() => HandleDelete(property.Id)">
+                                                <i class="bi bi-trash"></i>
+                                            </button>
+                                        }
+                                    </div>
+                                </td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+}
+
+@code {
+    /// <summary>
+    /// List of properties to display
+    /// </summary>
+    [Parameter, EditorRequired]
+    public List<Property> Properties { get; set; } = new();
+    
+    /// <summary>
+    /// View mode (Grid or List/Table)
+    /// </summary>
+    [Parameter]
+    public PropertyListViewMode ViewMode { get; set; } = PropertyListViewMode.Grid;
+    
+    /// <summary>
+    /// Whether to show metrics cards
+    /// </summary>
+    [Parameter]
+    public bool ShowMetrics { get; set; } = true;
+    
+    /// <summary>
+    /// Whether to show edit/delete buttons
+    /// </summary>
+    [Parameter]
+    public bool ShowEditDelete { get; set; } = true;
+    
+    /// <summary>
+    /// Current search term
+    /// </summary>
+    [Parameter]
+    public string SearchTerm { get; set; } = string.Empty;
+    
+    /// <summary>
+    /// Current status filter
+    /// </summary>
+    [Parameter]
+    public string StatusFilter { get; set; } = string.Empty;
+    
+    /// <summary>
+    /// Current sort column
+    /// </summary>
+    [Parameter]
+    public string SortColumn { get; set; } = nameof(Property.Address);
+    
+    /// <summary>
+    /// Sort direction
+    /// </summary>
+    [Parameter]
+    public bool SortAscending { get; set; } = true;
+
+     /// <summary>
+    /// Total properties count (for metrics)
+    /// </summary>
+    [Parameter]
+    public int TotalCount { get; set; }
+    
+    /// <summary>
+    /// Available properties count (for metrics)
+    /// </summary>
+    [Parameter]
+    public int AvailableCount { get; set; }
+    
+    /// <summary>
+    /// Pending properties count (for metrics)
+    /// </summary>
+    [Parameter]
+    public int PendingCount { get; set; }
+    
+    /// <summary>
+    /// Occupied properties count (for metrics)
+    /// </summary>
+    [Parameter]
+    public int OccupiedCount { get; set; }
+    
+    /// <summary>
+    /// Total monthly rent (for metrics)
+    /// </summary>
+    [Parameter]
+    public decimal TotalMonthlyRent { get; set; }
+    
+    /// <summary>
+    /// Callback when search term changes
+    /// </summary>
+    [Parameter]
+    public EventCallback<string> OnSearchChanged { get; set; }
+    
+    /// <summary>
+    /// Callback when status filter changes
+    /// </summary>
+    [Parameter]
+    public EventCallback<string> OnStatusFilterChanged { get; set; }
+    
+    /// <summary>
+    /// Callback when filters are cleared
+    /// </summary>
+    [Parameter]
+    public EventCallback OnClearFilters { get; set; }
+    
+    /// <summary>
+    /// Callback when sort is requested
+    /// </summary>
+    [Parameter]
+    public EventCallback<(string Column, bool Ascending)> OnSort { get; set; }
+    
+    /// <summary>
+    /// Callback when View button is clicked
+    /// </summary>
+    [Parameter]
+    public EventCallback<Guid> OnView { get; set; }
+    
+    /// <summary>
+    /// Callback when Edit button is clicked
+    /// </summary>
+    [Parameter]
+    public EventCallback<Guid> OnEdit { get; set; }
+    
+    /// <summary>
+    /// Callback when Delete button is clicked
+    /// </summary>
+    [Parameter]
+    public EventCallback<Guid> OnDelete { get; set; }
+    
+    private async Task HandleSearchChanged(ChangeEventArgs e)
+    {
+        await OnSearchChanged.InvokeAsync(e.Value?.ToString() ?? string.Empty);
+    }
+    
+    private async Task HandleStatusFilterChanged(ChangeEventArgs e)
+    {
+        await OnStatusFilterChanged.InvokeAsync(e.Value?.ToString() ?? string.Empty);
+    }
+    
+    private async Task HandleSort(string column)
+    {
+        var ascending = SortColumn == column ? !SortAscending : true;
+        await OnSort.InvokeAsync((column, ascending));
+    }
+    
+    private async Task HandleView(Guid propertyId)
+    {
+        await OnView.InvokeAsync(propertyId);
+    }
+    
+    private async Task HandleEdit(Guid propertyId)
+    {
+        await OnEdit.InvokeAsync(propertyId);
+    }
+    
+    private async Task HandleDelete(Guid propertyId)
+    {
+        await OnDelete.InvokeAsync(propertyId);
+    }
+    
+    private string GetStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            var s when s == ApplicationConstants.PropertyStatuses.Available => "bg-success",
+            var s when s == ApplicationConstants.PropertyStatuses.ApplicationPending => "bg-info",
+            var s when s == ApplicationConstants.PropertyStatuses.LeasePending => "bg-warning",
+            var s when s == ApplicationConstants.PropertyStatuses.Occupied => "bg-danger",
+            var s when s == ApplicationConstants.PropertyStatuses.UnderRenovation => "bg-secondary",
+            var s when s == ApplicationConstants.PropertyStatuses.OffMarket => "bg-dark",
+            _ => "bg-secondary"
+        };
+    }
+    
+    private string FormatPropertyStatus(string status)
+    {
+        return status switch
+        {
+            var s when s == ApplicationConstants.PropertyStatuses.ApplicationPending => "Application Pending",
+            var s when s == ApplicationConstants.PropertyStatuses.LeasePending => "Lease Pending",
+            var s when s == ApplicationConstants.PropertyStatuses.UnderRenovation => "Under Renovation",
+            var s when s == ApplicationConstants.PropertyStatuses.OffMarket => "Off Market",
+            _ => status
+        };
+    }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyListViewMode.cs b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyListViewMode.cs
new file mode 100644
index 0000000..bf96091
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyListViewMode.cs
@@ -0,0 +1,17 @@
+namespace Aquiis.UI.Shared.Components.Entities.Properties;
+
+/// <summary>
+/// Defines the display mode for property list views
+/// </summary>
+public enum PropertyListViewMode
+{
+    /// <summary>
+    /// Display properties in a grid of cards
+    /// </summary>
+    Grid,
+    
+    /// <summary>
+    /// Display properties in a table/list format
+    /// </summary>
+    Table
+}
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyMetricsCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyMetricsCard.razor
new file mode 100644
index 0000000..6acfc4b
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyMetricsCard.razor
@@ -0,0 +1,119 @@
+@using Aquiis.UI.Shared.Components.Common
+<div class="row">
+     @if(ShowTotalProperties){
+    <MetricsCard Title="Total Properties" 
+                 IconCssClass="bi bi-house-fill" 
+                 ColorClass="bg-primary"
+                 Count="@TotalPropertiesCount.ToString()" />
+    }
+    @if(ShowAvailableProperties){
+    <MetricsCard Title="Available Properties" 
+                 IconCssClass="bi bi-check-circle" 
+                 ColorClass="bg-success"
+                 Count="@AvailableCount.ToString()" />
+    
+    }
+    @if(ShowOccupiedProperties){
+    <MetricsCard Title="Occupied Properties" 
+                 IconCssClass="bi bi-check-circle" 
+                 ColorClass="bg-danger"
+                 Count="@OccupiedCount.ToString()" />
+    }
+    @if(ShowLeasePendingProperties){
+    <MetricsCard Title="Pending Leases" 
+                 IconCssClass="bi bi-file-text" 
+                 ColorClass="bg-secondary"
+                 Count="@PendingCount.ToString()" />
+    }
+
+    @if(ShowActiveLeases){
+    <MetricsCard Title="Active Leases" 
+                 IconCssClass="bi bi-file-text" 
+                 ColorClass="bg-secondary"
+                 Count="@ActiveLeasesCount.ToString()" />
+    }
+
+    @if(ShowTotalTenants){
+    <MetricsCard Title="Total Tenants" 
+                 IconCssClass="bi bi-people-fill" 
+                 ColorClass="bg-info"
+                 Count="@TotalTenantCount.ToString()" />
+    }
+
+    @if(ShowActiveTenants){
+    <MetricsCard Title="Active Tenants" 
+                 IconCssClass="bi bi-people-fill" 
+                 ColorClass="bg-info"
+                 Count="@ActiveTenantsCount.ToString()" />
+    }
+    
+    @if(ShowOccupancyRate){
+    <MetricsCard Title="Occupancy Rate" 
+                 IconCssClass="bi bi-bar-chart-fill" 
+                 ColorClass="bg-info"
+                 Count="@($"{OccupancyRate:F1}%")" />
+    }
+
+    @if(ShowTotalMonthlyRent){
+    <MetricsCard Title="Total Rent/Month" 
+                 IconCssClass="bi bi-currency-dollar" 
+                 ColorClass="bg-info"
+                 Count="@TotalMonthlyRent.ToString("C")" />
+    }
+</div>
+
+@code {
+    [Parameter]
+    public bool ShowTotalProperties { get; set; } = true;
+
+    [Parameter]
+    public bool ShowAvailableProperties { get; set; } = false;
+
+    [Parameter]
+    public bool ShowLeasePendingProperties { get; set; } = false;
+
+    [Parameter]
+    public bool ShowOccupiedProperties { get; set; } = false;
+    
+    [Parameter]
+    public bool ShowTotalMonthlyRent { get; set; } = false;
+
+    [Parameter]
+    public bool ShowActiveTenants { get; set; } = false;
+
+    [Parameter]
+    public bool ShowTotalTenants { get; set; } = false;
+
+    [Parameter]
+    public bool ShowActiveLeases { get; set; } = false;
+
+    [Parameter]
+    public bool ShowOccupancyRate { get; set; } = false;
+
+    [Parameter]
+    public int TotalPropertiesCount { get; set; }
+
+    [Parameter]
+    public int ActiveTenantsCount { get; set; }
+
+    [Parameter]
+    public int TotalTenantCount { get; set; }
+
+    [Parameter]
+    public int ActiveLeasesCount { get; set; }
+
+    [Parameter]
+    public int AvailableCount { get; set; }
+
+    [Parameter]
+    public int PendingCount { get; set; }
+
+    [Parameter]
+    public int OccupiedCount { get; set; }
+
+    [Parameter]
+    public decimal TotalMonthlyRent { get; set; }
+
+    [Parameter]
+    public decimal OccupancyRate { get; set; }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyOccupancyMetricsCard.razor b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyOccupancyMetricsCard.razor
new file mode 100644
index 0000000..e5490a4
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Properties/PropertyOccupancyMetricsCard.razor
@@ -0,0 +1,70 @@
+<div class="row">
+    <div class="row mb-3">
+        @if(ShowAvailable){
+        <div class="col-md-3">
+            <div class="card text-white bg-success">
+                <div class="card-body">
+                    <h6>Available</h6>
+                    <h4>@AvailableCount</h4>
+                </div>
+            </div>
+        </div>
+        }
+        @if(ShowPending){
+        <div class="col-md-3">
+            <div class="card text-white bg-info">
+                <div class="card-body">
+                    <h6>Pending Lease</h6>
+                    <h4>@PendingCount</h4>
+                </div>
+            </div>
+        </div>
+        }
+        @if(ShowOccupied){
+        <div class="col-md-3">
+            <div class="card text-white bg-warning">
+                <div class="card-body">
+                    <h6>Occupied</h6>
+                    <h4>@OccupiedCount</h4>
+                </div>
+            </div>
+        </div>
+        }
+        @if(ShowMonthlyRent){
+        <div class="col-md-3">
+            <div class="card text-white bg-primary">
+                <div class="card-body">
+                    <h6>Total Rent/Month</h6>
+                    <h4>@TotalMonthlyRent.ToString("C")</h4>
+                </div>
+            </div>
+        </div>
+        }
+    </div>
+</div>
+
+    @code {
+        [Parameter]
+        public bool ShowAvailable { get; set; } = true;
+
+        [Parameter]
+        public bool ShowPending { get; set; } = true;
+
+        [Parameter]
+        public bool ShowOccupied { get; set; } = true;
+        
+        [Parameter]
+        public bool ShowMonthlyRent { get; set; } = true;
+
+        [Parameter]
+        public int AvailableCount { get; set; }
+
+        [Parameter]
+        public int PendingCount { get; set; }
+
+        [Parameter]
+        public int OccupiedCount { get; set; }
+
+        [Parameter]
+        public decimal TotalMonthlyRent { get; set; }
+    }
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Components/Entities/Repairs/RepairList.razor b/3-Aquiis.UI.Shared/Components/Entities/Repairs/RepairList.razor
new file mode 100644
index 0000000..9e4a7d0
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Components/Entities/Repairs/RepairList.razor
@@ -0,0 +1,171 @@
+<div class="card mb-3">
+    <div class="card-header d-flex justify-content-between align-items-center @HeaderCssClass">
+        <h5 class="mb-0">
+            <i class="bi bi-tools"></i> @Title
+        </h5>
+        <div class="btn-group">
+            <button @onclick="() => OnViewAllRepairs.InvokeAsync()" class="btn btn-sm btn-outline-primary">View All</button>
+
+            @if (ShowAddButton && OnAddRepair.HasDelegate)
+            {
+                <button class="btn btn-sm btn-primary" @onclick="OnAddRepair">
+                    <i class="bi bi-plus-circle"></i> Add Repair
+                </button>
+            }
+        </div>
+    </div>
+    <div class="card-body">
+        @if (Repairs == null)
+        {
+            <div class="text-center py-3">
+                <div class="spinner-border text-primary" role="status">
+                    <span class="visually-hidden">Loading...</span>
+                </div>
+            </div>
+        }
+        else if (!Repairs.Any())
+        {
+            <p class="text-muted text-center py-3">No repairs recorded for this property.</p>
+        }
+        else
+        {
+            <div class="list-group list-group-flush">
+                @foreach (var repair in Repairs.OrderByDescending(r => r.CompletedOn ?? r.CreatedOn))
+                {
+                    <div class="list-group-item">
+                        <div class="d-flex justify-content-between align-items-start">
+                            <div class="flex-grow-1">
+                                <h6 class="mb-1">
+                                    @if (ShowLinks && OnViewRepair.HasDelegate)
+                                    {
+                                        <a href="javascript:void(0)" @onclick="() => OnViewRepair.InvokeAsync(repair.Id)" class="text-decoration-none">
+                                            @repair.Description
+                                        </a>
+                                    }
+                                    else
+                                    {
+                                        @repair.Description
+                                    }
+                                </h6>
+                                <div class="mb-2">
+                                    <small class="text-muted">
+                                        <span class="badge bg-secondary me-2">@repair.RepairType</span>
+                                        @if (!string.IsNullOrEmpty(repair.ContractorName))
+                                        {
+                                            <i class="bi bi-person"></i> @repair.ContractorName
+                                        }
+                                    </small>
+                                </div>
+                                @if (!string.IsNullOrEmpty(repair.PartsReplaced))
+                                {
+                                    <small class="text-muted d-block">
+                                        <i class="bi bi-gear"></i> Parts: @repair.PartsReplaced
+                                    </small>
+                                }
+                            </div>
+                            <div class="text-end ms-3">
+                                @if (repair.CompletedOn.HasValue)
+                                {
+                                    <span class="badge bg-success mb-1">Completed</span>
+                                    <br>
+                                    <small class="text-muted">@repair.CompletedOn.Value.ToString("MMM dd, yyyy")</small>
+                                }
+                                else
+                                {
+                                    <span class="badge bg-warning mb-1">In Progress</span>
+                                    <br>
+                                    <small class="text-muted">Started @repair.CreatedOn.ToString("MMM dd, yyyy")</small>
+                                }
+                                @if (repair.Cost > 0)
+                                {
+                                    <div class="mt-1">
+                                        <strong class="text-primary">@repair.Cost.ToString("C")</strong>
+                                    </div>
+                                }
+                            </div>
+                        </div>
+                        @if (repair.DurationMinutes > 0 || repair.WarrantyApplies)
+                        {
+                            <div class="mt-2 pt-2 border-top">
+                                <small class="text-muted">
+                                    @if (repair.DurationMinutes > 0)
+                                    {
+                                        <span class="me-3">
+                                            <i class="bi bi-clock"></i> Duration: @FormatDuration(repair.DurationMinutes)
+                                        </span>
+                                    }
+                                    @if (repair.WarrantyApplies && repair.WarrantyExpiresOn.HasValue)
+                                    {
+                                        <span>
+                                            <i class="bi bi-shield-check"></i> Warranty until @repair.WarrantyExpiresOn.Value.ToString("MMM dd, yyyy")
+                                        </span>
+                                    }
+                                </small>
+                            </div>
+                        }
+                    </div>
+                }
+            </div>
+
+            @if (ShowTotalCost)
+            {
+                <div class="card-footer">
+                    <div class="d-flex justify-content-between">
+                        <strong>Total Repair Costs:</strong>
+                        <strong class="text-primary">@Repairs.Sum(r => r.Cost).ToString("C")</strong>
+                    </div>
+                    @if (Repairs.Any(r => !r.CompletedOn.HasValue))
+                    {
+                        <div class="d-flex justify-content-between mt-1">
+                            <small class="text-muted">In Progress:</small>
+                            <small class="text-muted">@Repairs.Where(r => !r.CompletedOn.HasValue).Sum(r => r.Cost).ToString("C")</small>
+                        </div>
+                    }
+                </div>
+            }
+        }
+    </div>
+</div>
+
+@code {
+    [Parameter]
+    public List<Repair>? Repairs { get; set; }
+
+    [Parameter]
+    public string Title { get; set; } = "Repairs";
+
+    [Parameter]
+    public string HeaderCssClass { get; set; } = "";
+
+    [Parameter]
+    public bool ShowAddButton { get; set; } = true;
+
+    [Parameter]
+    public bool ShowLinks { get; set; } = true;
+
+    [Parameter]
+    public bool ShowTotalCost { get; set; } = true;
+
+    [Parameter]
+    public EventCallback OnAddRepair { get; set; }
+
+    [Parameter]
+    public EventCallback<Guid> OnViewRepair { get; set; }
+
+    [Parameter]
+    public EventCallback OnViewAllRepairs { get; set; }
+
+    private string FormatDuration(int minutes)
+    {
+        if (minutes < 60)
+            return $"{minutes} min";
+        
+        var hours = minutes / 60;
+        var remainingMinutes = minutes % 60;
+        
+        if (remainingMinutes == 0)
+            return $"{hours} hr";
+        
+        return $"{hours} hr {remainingMinutes} min";
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Components/Layout/SharedMainLayout.razor b/3-Aquiis.UI.Shared/Components/Layout/SharedMainLayout.razor
index 039975d..411ab22 100644
--- a/3-Aquiis.UI.Shared/Components/Layout/SharedMainLayout.razor
+++ b/3-Aquiis.UI.Shared/Components/Layout/SharedMainLayout.razor
@@ -1,14 +1,15 @@
 @inherits LayoutComponentBase
 @namespace Aquiis.UI.Shared.Components.Layout
 @using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.EntityFrameworkCore.Metadata.Internal
 
-<div class="page" data-theme="@Theme" @key="Theme">
-    <div class="sidebar">
+<div class="page" data-bs-theme="@Theme" @key="Theme">
+    <div class="sidebar" @key="@($"sidebar-{Theme}")">
         @SidebarContent
     </div>
 
-    <main>
-        <div class="top-row px-4">
+    <main @key="@($"main-{Theme}")">
+        <div class="top-row px-4" @key="@($"{Theme}-top-row")">
             <AuthorizeView>
                 <NotAuthorized>
                     @NotAuthorizedContent
@@ -19,7 +20,7 @@
             </AuthorizeView>
         </div>
 
-        <article class="content px-4" @key="@($"{Theme}-content")">
+        <article class="content px-4" @key="@($"article-{Theme}")">
             @ChildContent
         </article>
     </main>
diff --git a/3-Aquiis.UI.Shared/Components/Layout/SharedMainLayout.razor.css b/3-Aquiis.UI.Shared/Components/Layout/SharedMainLayout.razor.css
index a5e98b0..e6da861 100644
--- a/3-Aquiis.UI.Shared/Components/Layout/SharedMainLayout.razor.css
+++ b/3-Aquiis.UI.Shared/Components/Layout/SharedMainLayout.razor.css
@@ -15,7 +15,7 @@ article.content {
 }
 
 .sidebar {
-  background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
+  background-color: var(--bs-tertiary-bg);
 }
 
 .top-row {
diff --git a/3-Aquiis.UI.Shared/Features/Notifications/NotificationBell.razor b/3-Aquiis.UI.Shared/Components/Notifications/NotificationBell.razor
similarity index 98%
rename from 3-Aquiis.UI.Shared/Features/Notifications/NotificationBell.razor
rename to 3-Aquiis.UI.Shared/Components/Notifications/NotificationBell.razor
index e69c61a..4a96dd0 100644
--- a/3-Aquiis.UI.Shared/Features/Notifications/NotificationBell.razor
+++ b/3-Aquiis.UI.Shared/Components/Notifications/NotificationBell.razor
@@ -1,9 +1,7 @@
+@using Aquiis.Application.Services
 @inject NotificationService NotificationService
 @inject NavigationManager NavigationManager
-@namespace Aquiis.UI.Shared.Features.Notifications
-@using Aquiis.Application.Services
-
-<PageTitle>Notification Bell</PageTitle>
+@namespace Aquiis.UI.Shared.Components.Notifications
 
 @if (isLoading)
 {
@@ -15,7 +13,7 @@ else if (notifications.Count > 0)
 {
     <div class="dropdown notification-dropdown">
         <div class="notification-bell">
-            <button class="notification-bell-button" @onclick="ToggleDropdown">
+            <button class="notification-bell-button dropdown-toggle" @onclick="ToggleDropdown">
                 <i class="@((notificationCount > 0) ? "bi bi-bell-fill" : "bi bi-bell-slash")"></i> Notifications
                 <span class="notification-bell-badge">@notificationCount</span>
             </button>
diff --git a/3-Aquiis.UI.Shared/Features/Notifications/NotificationCenter.razor b/3-Aquiis.UI.Shared/Components/Notifications/NotificationCenter.razor
similarity index 99%
rename from 3-Aquiis.UI.Shared/Features/Notifications/NotificationCenter.razor
rename to 3-Aquiis.UI.Shared/Components/Notifications/NotificationCenter.razor
index ecd335c..bac8261 100644
--- a/3-Aquiis.UI.Shared/Features/Notifications/NotificationCenter.razor
+++ b/3-Aquiis.UI.Shared/Components/Notifications/NotificationCenter.razor
@@ -1,9 +1,7 @@
 @using Aquiis.Core.Constants
 @inject NotificationService NotificationService
 @inject NavigationManager NavigationManager
-@namespace Aquiis.UI.Shared.Features.Notifications
-
-<PageTitle>Notification Center</PageTitle>
+@namespace Aquiis.UI.Shared.Components.Notifications
 
 <div class="d-flex justify-content-between align-items-center mb-4">
         <div>
diff --git a/3-Aquiis.UI.Shared/Features/Notifications/NotificationPreferences.razor b/3-Aquiis.UI.Shared/Components/Notifications/NotificationPreferences.razor
similarity index 99%
rename from 3-Aquiis.UI.Shared/Features/Notifications/NotificationPreferences.razor
rename to 3-Aquiis.UI.Shared/Components/Notifications/NotificationPreferences.razor
index fc6939b..81a5ecd 100644
--- a/3-Aquiis.UI.Shared/Features/Notifications/NotificationPreferences.razor
+++ b/3-Aquiis.UI.Shared/Components/Notifications/NotificationPreferences.razor
@@ -4,7 +4,7 @@
 @inject NotificationService NotificationService
 @inject NavigationManager Navigation
 @inject IJSRuntime JSRuntime
-@namespace Aquiis.UI.Shared.Features.Notifications
+@namespace Aquiis.UI.Shared.Components.Notifications
 
 <div class="container-fluid py-4">
     <!-- Header -->
diff --git a/4-Aquiis.SimpleStart/Shared/Components/OrganizationSwitcher.razor b/3-Aquiis.UI.Shared/Components/OrganizationSwitcher/OrganizationSwitcher.razor
similarity index 81%
rename from 4-Aquiis.SimpleStart/Shared/Components/OrganizationSwitcher.razor
rename to 3-Aquiis.UI.Shared/Components/OrganizationSwitcher/OrganizationSwitcher.razor
index 8405134..ea94f50 100644
--- a/4-Aquiis.SimpleStart/Shared/Components/OrganizationSwitcher.razor
+++ b/3-Aquiis.UI.Shared/Components/OrganizationSwitcher/OrganizationSwitcher.razor
@@ -1,18 +1,22 @@
 @using Aquiis.Core.Entities
 @using Aquiis.Application.Services
 @using Aquiis.Core.Constants
+@using Aquiis.Core.Interfaces.Services
+@using Microsoft.AspNetCore.Http
+@using System.ComponentModel
 @inject OrganizationService OrganizationService
-@inject UserContextService UserContext
 @inject NavigationManager Navigation
 @implements IDisposable
 
+@namespace Aquiis.UI.Shared.Components.OrganizationSwitcher
+
 @if (isLoading)
 {
     <div class="org-switcher-skeleton">
         <span class="spinner-border spinner-border-sm" role="status"></span>
     </div>
 }
-else if (accessibleOrganizations.Count > 0)
+else if (accessibleOrganizations.Count > 1)
 {
     <div class="dropdown org-switcher">
         <button class="btn btn-outline-secondary dropdown-toggle" type="button" @onclick="ToggleDropdown">
@@ -68,9 +72,25 @@ else if (accessibleOrganizations.Count > 0)
         </ul>
     </div>
 }
+else {
+    <div class="org-switcher">
+        <div class="btn btn-outline-secondary btn-no-transition">
+            <i class="bi bi-building me-2"></i>
+            <span class="org-name">@(currentOrg?.DisplayName ?? currentOrg?.Name ?? "No Organization")</span>
+            @if (!string.IsNullOrEmpty(currentRole))
+            {
+                <span class="badge @GetRoleBadgeClass(currentRole) ms-2">@currentRole</span>
+            }
+        </div>
+    </div>
+}
 
 @code {
-    private List<UserOrganization> accessibleOrganizations = new();
+
+    [Parameter, EditorRequired]
+    public IUserContextService UserContext { get; set; } = default!;
+
+    private List<OrganizationUser> accessibleOrganizations = new();
     private Organization? currentOrg;
     private string? currentRole;
     private bool isAccountOwner;
@@ -129,6 +149,11 @@ else if (accessibleOrganizations.Count > 0)
                     
                     // Get current role in active organization
                     currentRole = await UserContext.GetCurrentOrganizationRoleAsync();
+
+                    if(currentRole == "PropertyManager")
+                    {
+                        currentRole = "Property Manager";
+                    }
                 }
                 catch (InvalidOperationException)
                 {
@@ -182,8 +207,27 @@ else if (accessibleOrganizations.Count > 0)
             ApplicationConstants.OrganizationRoles.Owner => "bg-primary",
             ApplicationConstants.OrganizationRoles.Administrator => "bg-info",
             ApplicationConstants.OrganizationRoles.PropertyManager => "bg-success",
+            "Property Manager" => "bg-success", // Handle spaced version
             ApplicationConstants.OrganizationRoles.User => "bg-secondary",
             _ => "bg-secondary"
         };
     }
 }
+<style>
+    .btn-no-transition {
+        transition: none !important;
+        cursor: default !important;
+        pointer-events: none;
+        border: 1px solid var(--bs-border-color);
+        border-radius: 0.375rem;
+        padding: 0.5rem 1rem;
+        color: var(--bs-body-color);
+    }
+    
+    .btn-no-transition:hover,
+    .btn-no-transition:focus,
+    .btn-no-transition:active {
+        transform: none !important;
+        @* box-shadow: none !important; *@
+    }
+</style>
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Features/Administration/Organizations/OrganizationDetails.razor b/3-Aquiis.UI.Shared/Features/Administration/Organizations/OrganizationDetails.razor
new file mode 100644
index 0000000..ae24f76
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/Administration/Organizations/OrganizationDetails.razor
@@ -0,0 +1,67 @@
+@using Aquiis.Core.Entities
+@using Aquiis.Application.Services
+@using Aquiis.Core.Constants
+@using Aquiis.UI.Shared.Components.Entities.OrganizationUsers
+@using Aquiis.UI.Shared.Components.Entities.Organizations
+
+@namespace Aquiis.UI.Shared.Features.Organizations
+
+<div class="row">
+    <div class="col-md-8">
+        
+        <!--  Organization Information Card-->
+        <OrganizationCard OrganizationViewModel="OrganizationViewModel" OnEdit="OnEdit" />
+
+        <!-- Users with Access Card -->
+        <OrganizationUsersListView 
+            OrganizationViewModel="@OrganizationViewModel"
+            IsOwner="@IsOwner" 
+            IsAdministrator="@IsAdministrator" 
+            IsCurrentOrganization="@IsCurrentOrganization"
+            OnManageUsers="OnManageUsers"/>
+    </div>
+
+    <div class="col-md-4">
+        <!-- Quick Stats Card -->
+        <OrganizationUserStatistics OrganizationViewModel="@OrganizationViewModel" />
+
+        <!-- Your Access Card -->
+        @if (CurrentUserViewModel != null)
+        {
+            <UserProfileCard OrganizationUserViewModel="@CurrentUserViewModel" />
+        }
+        <UserAccessCard CurrentUserRole="@CurrentUserRole" />
+    </div>
+</div>
+
+@code {
+
+    [Parameter, EditorRequired]
+    public OrganizationViewModel? OrganizationViewModel { get; set; }
+
+    [Parameter, EditorRequired]
+    public string CurrentUserRole { get; set; } = string.Empty;
+
+    [Parameter, EditorRequired]
+    public bool IsOwner { get; set; }
+
+    [Parameter, EditorRequired]
+    public bool IsAdministrator { get; set; }
+
+    [Parameter, EditorRequired]
+    public bool IsCurrentOrganization { get; set; }
+
+    [Parameter]
+    public OrganizationUserViewModel? CurrentUserViewModel { get; set; }
+
+    [Parameter]
+    public EventCallback OnManageUsers { get; set; }
+
+    [Parameter]
+    public EventCallback OnEdit { get; set; }
+
+    public Organization? Organization => OrganizationViewModel?.Organization;
+
+    public List<OrganizationUserViewModel> OrganizationUsers => OrganizationViewModel?.OrganizationUsers ?? new List<OrganizationUserViewModel>();
+
+}
diff --git a/3-Aquiis.UI.Shared/Features/Administration/Organizations/OrganizationForm.razor b/3-Aquiis.UI.Shared/Features/Administration/Organizations/OrganizationForm.razor
new file mode 100644
index 0000000..14362bb
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/Administration/Organizations/OrganizationForm.razor
@@ -0,0 +1,2 @@
+@using Aquiis.UI.Shared.Components.Entities.Organizations
+
diff --git a/3-Aquiis.UI.Shared/Features/Administration/Organizations/OrganizationListView.razor b/3-Aquiis.UI.Shared/Features/Administration/Organizations/OrganizationListView.razor
new file mode 100644
index 0000000..2c48e38
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/Administration/Organizations/OrganizationListView.razor
@@ -0,0 +1,232 @@
+@using Aquiis.UI.Shared.Components.Entities.Organizations
+@* @using Aquiis.Core.Entities
+@using Aquiis.Application.Services
+@using Aquiis.Core.Constants
+@using Microsoft.AspNetCore.Authorization *@
+
+
+
+@* @inject OrganizationService OrganizationService
+@inject UserContextService UserContext
+@inject NavigationManager Navigation
+@inject ToastService ToastService
+
+@attribute [OrganizationAuthorize("Owner", "Administrator")]
+@rendermode InteractiveServer
+
+<div class="container-fluid">
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <div>
+            <h1><i class="bi bi-building"></i> Organizations</h1>
+            <p class="text-muted mb-0">Manage your organizations and access</p>
+        </div>
+        <OrganizationAuthorizeView Roles="Owner">
+            <button class="btn btn-primary" @onclick="NavigateToCreate">
+                <i class="bi bi-plus-circle"></i> Create Organization
+            </button>
+        </OrganizationAuthorizeView>
+    </div>
+
+    @if (isLoading)
+    {
+        <div class="text-center py-5">
+            <div class="spinner-border" role="status">
+                <span class="visually-hidden">Loading...</span>
+            </div>
+        </div>
+    }
+    else if (!organizations.Any())
+    {
+        <div class="alert alert-info">
+            <i class="bi bi-info-circle"></i> No organizations found.
+            <OrganizationAuthorizeView Roles="Owner">
+                <a href="/administration/organizations/create" class="alert-link">Create your first organization</a>
+            </OrganizationAuthorizeView>
+        </div>
+    }
+    else
+    {
+        <div class="row mb-3">
+            <div class="col-md-6">
+                <div class="input-group">
+                    <span class="input-group-text"><i class="bi bi-search"></i></span>
+                    <input type="text" class="form-control" placeholder="Search organizations..." @bind="searchTerm" @bind:event="oninput" @onkeyup="ApplyFilters" />
+                </div>
+            </div>
+        </div>
+
+        <div class="card">
+            <div class="card-body p-0">
+                <div class="table-responsive">
+                    <table class="table table-hover mb-0">
+                        <thead>
+                            <tr>
+                                <th>Organization Name</th>
+                                <th>Display Name</th>
+                                <th>State</th>
+                                <th>Your Role</th>
+                                <th>Status</th>
+                                <th class="text-end">Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach (var userOrg in filteredOrganizations)
+                            {
+                                <tr>
+                                    <td>
+                                        <strong>@userOrg.Organization.Name</strong>
+                                    </td>
+                                    <td>@(userOrg.Organization.DisplayName ?? "-")</td>
+                                    <td>@(userOrg.Organization.State ?? "-")</td>
+                                    <td>
+                                        <span class="badge @GetRoleBadgeClass(userOrg.Role)">
+                                            @userOrg.Role
+                                        </span>
+                                    </td>
+                                    <td>
+                                        @if (userOrg.Organization.IsActive)
+                                        {
+                                            <span class="badge bg-success">Active</span>
+                                        }
+                                        else
+                                        {
+                                            <span class="badge bg-secondary">Inactive</span>
+                                        }
+                                    </td>
+                                    <td class="text-end">
+                                        <div class="btn-group btn-group-sm">
+                                            <button class="btn btn-outline-primary" @onclick="() => NavigateToView(userOrg.OrganizationId)" title="View Details">
+                                                <i class="bi bi-eye"></i>
+                                            </button>
+                                            @if (userOrg.Role == ApplicationConstants.OrganizationRoles.Owner)
+                                            {
+                                                <button class="btn btn-outline-secondary" @onclick="() => NavigateToEdit(userOrg.OrganizationId)" title="Edit">
+                                                    <i class="bi bi-pencil"></i>
+                                                </button>
+                                            }
+                                            @if (userOrg.Role == ApplicationConstants.OrganizationRoles.Owner || userOrg.Role == ApplicationConstants.OrganizationRoles.Administrator)
+                                            {
+                                                <button class="btn btn-outline-info" @onclick="() => NavigateToManageUsers(userOrg.OrganizationId)" title="Manage Users">
+                                                    <i class="bi bi-people"></i>
+                                                </button>
+                                            }
+                                        </div>
+                                    </td>
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+
+        <div class="mt-3 text-muted">
+            <small>Showing @filteredOrganizations.Count of @organizations.Count organization(s)</small>
+        </div>
+    }
+</div>
+
+@code {
+    private bool isLoading = true;
+    private List<OrganizationUser> organizations = new();
+    private List<OrganizationUser> filteredOrganizations = new();
+    private string searchTerm = string.Empty;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadOrganizations();
+    }
+
+    private async Task LoadOrganizations()
+    {
+        isLoading = true;
+        try
+        {
+            var userId = await UserContext.GetUserIdAsync();
+            if (!string.IsNullOrEmpty(userId))
+            {
+                organizations = await OrganizationService.GetActiveUserAssignmentsAsync();
+                filteredOrganizations = organizations;
+            }
+        }
+        catch (Exception ex)
+        {
+            ToastService.ShowError($"Error loading organizations: {ex.Message}");
+        }
+        finally
+        {
+            isLoading = false;
+        }
+    }
+
+    private void ApplyFilters()
+    {
+        if (string.IsNullOrWhiteSpace(searchTerm))
+        {
+            filteredOrganizations = organizations;
+        }
+        else
+        {
+            var search = searchTerm.ToLower();
+            filteredOrganizations = organizations.Where(o =>
+                (o.Organization.Name?.ToLower().Contains(search) ?? false) ||
+                (o.Organization.DisplayName?.ToLower().Contains(search) ?? false) ||
+                (o.Organization.State?.ToLower().Contains(search) ?? false) ||
+                (o.Role?.ToLower().Contains(search) ?? false)
+            ).ToList();
+        }
+    }
+
+    private string GetRoleBadgeClass(string role)
+    {
+        return role switch
+        {
+            ApplicationConstants.OrganizationRoles.Owner => "bg-primary",
+            ApplicationConstants.OrganizationRoles.Administrator => "bg-info",
+            ApplicationConstants.OrganizationRoles.PropertyManager => "bg-success",
+            ApplicationConstants.OrganizationRoles.User => "bg-secondary",
+            _ => "bg-secondary"
+        };
+    }
+
+    private void NavigateToCreate()
+    {
+        Navigation.NavigateTo("/administration/organizations/create");
+    }
+
+    private void NavigateToView(Guid organizationId)
+    {
+        Navigation.NavigateTo($"/administration/organizations/view/{organizationId}");
+    }
+
+    private void NavigateToEdit(Guid organizationId)
+    {
+        Navigation.NavigateTo($"/administration/organizations/edit/{organizationId}");
+    }
+
+    private void NavigateToManageUsers(Guid organizationId)
+    {
+        Navigation.NavigateTo($"/administration/organizations/{organizationId}/users");
+    }
+} *@
+
+@if(Organizations == null || !Organizations.Any())
+{
+    <div class="alert alert-info">
+        <i class="bi bi-info-circle"></i> No organizations available.
+    </div>
+}
+else
+{
+    <div class="list-group">
+        @foreach (var organization in Organizations)
+        {
+            <OrganizationCard OrganizationViewModel="organization" />
+        }
+    </div>
+}
+
+@code {
+    [Parameter, EditorRequired]
+    public List<OrganizationViewModel> Organizations { get; set; } = new();
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertiesManagement/Properties/PropertyList.razor b/3-Aquiis.UI.Shared/Features/PropertiesManagement/Properties/PropertyList.razor
deleted file mode 100644
index 80f9762..0000000
--- a/3-Aquiis.UI.Shared/Features/PropertiesManagement/Properties/PropertyList.razor
+++ /dev/null
@@ -1,28 +0,0 @@
-@using Aquiis.UI.Shared.Components.Common
-@using Aquiis.Core.Entities
-@using Aquiis.Application.Services
-
-@inject PropertyService PropertyService
-
-<div>
-    <h3>Property List</h3>
-    <DataTable Items="@properties" TItem="Aquiis.Core.Entities.Property" TableCssClass="table table-hover mb-0">
-        <HeaderTemplate>
-            <th style="cursor:pointer">Property</th>
-            <th>Status</th>
-        </HeaderTemplate>
-        <RowTemplate Context="prop">
-            <td>@prop.Address</td>
-            <td>@prop.Status</td>
-        </RowTemplate>
-    </DataTable>
-</div>
-
-@code {
-    private IEnumerable<Property> properties = new List<Property>();
-    
-    protected override async Task OnInitializedAsync()
-    {
-        properties = await PropertyService.GetPropertiesWithRelationsAsync();
-    }
-}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Invoices/CreateForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Invoices/CreateForm.razor
new file mode 100644
index 0000000..7e8f0df
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Invoices/CreateForm.razor
@@ -0,0 +1,310 @@
+@using Aquiis.Core.Entities
+@using Aquiis.Core.Validation
+@using Aquiis.Application.Services
+@using Microsoft.AspNetCore.Components.Authorization
+@using System.ComponentModel.DataAnnotations
+@inject NavigationManager NavigationManager
+@inject InvoiceService InvoiceService
+@inject LeaseService LeaseService
+@rendermode InteractiveServer
+
+<div class="d-flex justify-content-between align-items-center mb-4">
+    <h1><i class="bi bi-receipt"></i> Create Invoice</h1>
+    <button class="btn btn-outline-secondary" @onclick="Cancel">
+        <i class="bi bi-x-lg"></i> Cancel
+    </button>
+</div>
+
+@if (errorMessage != null)
+{
+    <div class="alert alert-danger alert-dismissible fade show" role="alert">
+        @errorMessage
+        <button type="button" class="btn-close" @onclick="() => errorMessage = null"></button>
+    </div>
+}
+
+@if (successMessage != null)
+{
+    <div class="alert alert-success alert-dismissible fade show" role="alert">
+        @successMessage
+        <button type="button" class="btn-close" @onclick="() => successMessage = null"></button>
+    </div>
+}
+
+<div class="row">
+    <div class="col-md-8">
+        <div class="card">
+            <div class="card-header">
+                <h5 class="mb-0">Invoice Information</h5>
+            </div>
+            <div class="card-body">
+                <Microsoft.AspNetCore.Components.Forms.EditForm Model="invoiceModel" OnValidSubmit="HandleCreateInvoice">
+                    <DataAnnotationsValidator />
+                    <ValidationSummary class="text-danger" />
+
+                    <div class="mb-3">
+                        <label class="form-label">Invoice Number</label>
+                        <InputText @bind-Value="invoiceModel.InvoiceNumber" class="form-control" readonly />
+                        <ValidationMessage For="() => invoiceModel.InvoiceNumber" class="text-danger" />
+                    </div>
+
+                    <div class="row mb-3">
+                        <div class="col-md-6">
+                            <label class="form-label">Invoice Date <span class="text-danger">*</span></label>
+                            <InputDate @bind-Value="invoiceModel.InvoicedOn" class="form-control" />
+                            <ValidationMessage For="() => invoiceModel.InvoicedOn" class="text-danger" />
+                        </div>
+                        <div class="col-md-6">
+                            <label class="form-label">Due Date <span class="text-danger">*</span></label>
+                            <InputDate @bind-Value="invoiceModel.DueOn" class="form-control" />
+                            <ValidationMessage For="() => invoiceModel.DueOn" class="text-danger" />
+                        </div>
+                    </div>
+
+                    <div class="mb-3">
+                        <label class="form-label">Lease <span class="text-danger">*</span></label>
+                        <InputSelect @bind-Value="invoiceModel.LeaseId" @bind-Value:after="OnLeaseSelected" class="form-select">
+                            <option value="0">-- Select Lease --</option>
+                            @if (leases != null)
+                            {
+                                @foreach (var lease in leases)
+                                {
+                                    <option value="@lease.Id">
+                                        @lease.Property?.Address - @lease.Tenant?.FullName (@lease.MonthlyRent.ToString("C")/month)
+                                    </option>
+                                }
+                            }
+                        </InputSelect>
+                        <ValidationMessage For="() => invoiceModel.LeaseId" class="text-danger" />
+                    </div>
+
+                    <div class="mb-3">
+                        <label class="form-label">Description <span class="text-danger">*</span></label>
+                        <InputText @bind-Value="invoiceModel.Description" class="form-control" placeholder="e.g., Monthly Rent - January 2025" />
+                        <ValidationMessage For="() => invoiceModel.Description" class="text-danger" />
+                    </div>
+
+                    <div class="row mb-3">
+                        <div class="col-md-6">
+                            <label class="form-label">Amount <span class="text-danger">*</span></label>
+                            <div class="input-group">
+                                <span class="input-group-text">$</span>
+                                <InputNumber @bind-Value="invoiceModel.Amount" class="form-control" step="0.01" />
+                            </div>
+                            <ValidationMessage For="() => invoiceModel.Amount" class="text-danger" />
+                        </div>
+                        <div class="col-md-6">
+                            <label class="form-label">Status</label>
+                            <InputSelect @bind-Value="invoiceModel.Status" class="form-select">
+                                <option value="Pending">Pending</option>
+                                <option value="Paid">Paid</option>
+                                <option value="Cancelled">Cancelled</option>
+                            </InputSelect>
+                            <ValidationMessage For="() => invoiceModel.Status" class="text-danger" />
+                        </div>
+                    </div>
+
+                    @if (invoiceModel.Status == "Paid")
+                    {
+                        <div class="row mb-3">
+                            <div class="col-md-6">
+                                <label class="form-label">Paid Amount</label>
+                                <div class="input-group">
+                                    <span class="input-group-text">$</span>
+                                    <InputNumber @bind-Value="invoiceModel.AmountPaid" class="form-control" step="0.01" />
+                                </div>
+                                <ValidationMessage For="() => invoiceModel.AmountPaid" class="text-danger" />
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Paid On</label>
+                                <InputDate @bind-Value="invoiceModel.PaidOn" class="form-control" />
+                                <ValidationMessage For="() => invoiceModel.PaidOn" class="text-danger" />
+                            </div>
+                        </div>
+                    }
+
+                    <div class="mb-3">
+                        <label class="form-label">Notes</label>
+                        <InputTextArea @bind-Value="invoiceModel.Notes" class="form-control" rows="3" placeholder="Additional notes or comments..." />
+                        <ValidationMessage For="() => invoiceModel.Notes" class="text-danger" />
+                    </div>
+
+                    <div class="d-flex gap-2">
+                        <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
+                            @if (isSubmitting)
+                            {
+                                <span class="spinner-border spinner-border-sm me-2" role="status"></span>
+                            }
+                            <i class="bi bi-check-lg"></i> Create Invoice
+                        </button>
+                        <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
+                    </div>
+                </Microsoft.AspNetCore.Components.Forms.EditForm>
+            </div>
+        </div>
+    </div>
+
+    <div class="col-md-4">
+        <div class="card">
+            <div class="card-header">
+                <h5 class="mb-0">Tips</h5>
+            </div>
+            <div class="card-body">
+                <ul class="list-unstyled">
+                    <li class="mb-2">
+                        <i class="bi bi-info-circle text-primary"></i>
+                        Invoice numbers are automatically generated
+                    </li>
+                    <li class="mb-2">
+                        <i class="bi bi-info-circle text-primary"></i>
+                        Select an active lease to create an invoice
+                    </li>
+                    <li class="mb-2">
+                        <i class="bi bi-info-circle text-primary"></i>
+                        The amount defaults to the lease's monthly rent
+                    </li>
+                    <li class="mb-2">
+                        <i class="bi bi-info-circle text-primary"></i>
+                        Use clear descriptions to identify the invoice purpose
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
+
+@code {
+    private InvoiceModel invoiceModel = new InvoiceModel();
+    private List<Lease>? leases;
+    private string? errorMessage;
+    private string? successMessage;
+    private bool isSubmitting = false;
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public Guid? LeaseId { get; set; }
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadLeases();
+        invoiceModel.InvoiceNumber = await InvoiceService.GenerateInvoiceNumberAsync();
+        invoiceModel.InvoicedOn = DateTime.Now;
+        invoiceModel.DueOn = DateTime.Now.AddDays(30);
+        if (LeaseId.HasValue)
+        {
+            invoiceModel.LeaseId = LeaseId.Value;
+            OnLeaseSelected();
+        }
+    }
+
+    private async Task LoadLeases()
+    {
+        var allLeases = await LeaseService.GetAllAsync();
+        leases = allLeases.Where(l => l.Status == "Active").ToList();
+    }
+
+    private void OnLeaseSelected()
+    {
+        if (invoiceModel.LeaseId != Guid.Empty)
+        {
+            var selectedLease = leases?.FirstOrDefault(l => l.Id == invoiceModel.LeaseId);
+            if (selectedLease != null)
+            {
+                invoiceModel.Amount = selectedLease.MonthlyRent;
+                
+                // Generate description based on current month/year
+                var currentMonth = DateTime.Now.ToString("MMMM yyyy");
+                invoiceModel.Description = $"Monthly Rent - {currentMonth}";
+            }
+        }
+    }
+
+    private async Task HandleCreateInvoice()
+    {
+        try
+        {
+            isSubmitting = true;
+            errorMessage = null;
+            successMessage = null;
+
+            var authState = await AuthenticationStateTask;
+            var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+
+            if (string.IsNullOrEmpty(userId))
+            {
+                errorMessage = "User not authenticated.";
+                return;
+            }
+
+            var invoice = new Invoice
+            {
+                LeaseId = invoiceModel.LeaseId,
+                InvoiceNumber = invoiceModel.InvoiceNumber,
+                InvoicedOn = invoiceModel.InvoicedOn,
+                DueOn = invoiceModel.DueOn,
+                Amount = invoiceModel.Amount,
+                Description = invoiceModel.Description,
+                Status = invoiceModel.Status,
+                AmountPaid = invoiceModel.Status == "Paid" ? invoiceModel.AmountPaid : 0,
+                PaidOn = invoiceModel.Status == "Paid" ? invoiceModel.PaidOn : null,
+                Notes = invoiceModel.Notes ?? string.Empty
+            };
+
+            await InvoiceService.CreateAsync(invoice);
+
+            NavigationManager.NavigateTo($"/propertymanagement/leases/{invoiceModel.LeaseId}");
+        }
+        catch (Exception ex)
+        {
+            errorMessage = $"Error creating invoice: {ex.Message}";
+        }
+        finally
+        {
+            isSubmitting = false;
+        }
+    }
+
+    private void Cancel()
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/leases/{invoiceModel.LeaseId}");
+    }
+
+    public class InvoiceModel
+    {
+        [RequiredGuid(ErrorMessage = "Lease is required")]
+        public Guid LeaseId { get; set; }
+
+        [Required(ErrorMessage = "Invoice number is required")]
+        [StringLength(50, ErrorMessage = "Invoice number cannot exceed 50 characters")]
+        public string InvoiceNumber { get; set; } = string.Empty;
+
+        [Required(ErrorMessage = "Invoice date is required")]
+        public DateTime InvoicedOn { get; set; } = DateTime.Now;
+
+        [Required(ErrorMessage = "Due date is required")]
+        public DateTime DueOn { get; set; } = DateTime.Now.AddDays(30);
+
+        [Required(ErrorMessage = "Amount is required")]
+        [Range(0.01, double.MaxValue, ErrorMessage = "Amount must be greater than 0")]
+        public decimal Amount { get; set; }
+
+        [Required(ErrorMessage = "Description is required")]
+        [StringLength(100, ErrorMessage = "Description cannot exceed 100 characters")]
+        public string Description { get; set; } = string.Empty;
+
+        [Required]
+        [StringLength(50)]
+        public string Status { get; set; } = "Pending";
+
+        [Range(0, double.MaxValue, ErrorMessage = "Amount paid cannot be negative")]
+        public decimal AmountPaid { get; set; }
+
+        public DateTime? PaidOn { get; set; }
+
+        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
+        public string? Notes { get; set; }
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Invoices/EditForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Invoices/EditForm.razor
new file mode 100644
index 0000000..51e2be7
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Invoices/EditForm.razor
@@ -0,0 +1,388 @@
+@using Aquiis.Core.Entities
+@using Aquiis.Core.Validation
+@using Aquiis.Application.Services
+@using Microsoft.AspNetCore.Components.Authorization
+@using System.ComponentModel.DataAnnotations
+@inject NavigationManager NavigationManager
+@inject InvoiceService InvoiceService
+@inject LeaseService LeaseService
+@rendermode InteractiveServer
+
+<div class="d-flex justify-content-between align-items-center mb-4">
+    <h1><i class="bi bi-receipt"></i> Edit Invoice</h1>
+    <button class="btn btn-outline-secondary" @onclick="Cancel">
+        <i class="bi bi-x-lg"></i> Cancel
+    </button>
+</div>
+
+@if (errorMessage != null)
+{
+    <div class="alert alert-danger alert-dismissible fade show" role="alert">
+        @errorMessage
+        <button type="button" class="btn-close" @onclick="() => errorMessage = null"></button>
+    </div>
+}
+
+@if (successMessage != null)
+{
+    <div class="alert alert-success alert-dismissible fade show" role="alert">
+        @successMessage
+        <button type="button" class="btn-close" @onclick="() => successMessage = null"></button>
+    </div>
+}
+
+@if (invoice == null)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else
+{
+    <div class="row">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">
+                    <h5 class="mb-0">Invoice Information</h5>
+                </div>
+                <div class="card-body">
+                    <Microsoft.AspNetCore.Components.Forms.EditForm Model="invoiceModel" OnValidSubmit="UpdateInvoice">
+                        <DataAnnotationsValidator />
+                        <ValidationSummary class="text-danger" />
+
+                        <div class="mb-3">
+                            <label class="form-label">Invoice Number</label>
+                            <InputText @bind-Value="invoiceModel.InvoiceNumber" class="form-control" readonly />
+                            <ValidationMessage For="() => invoiceModel.InvoiceNumber" class="text-danger" />
+                        </div>
+
+                        <div class="row mb-3">
+                            <div class="col-md-6">
+                                <label class="form-label">Invoice Date <span class="text-danger">*</span></label>
+                                <InputDate @bind-Value="invoiceModel.InvoicedOn" class="form-control" />
+                                <ValidationMessage For="() => invoiceModel.InvoicedOn" class="text-danger" />
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Due Date <span class="text-danger">*</span></label>
+                                <InputDate @bind-Value="invoiceModel.DueOn" class="form-control" />
+                                <ValidationMessage For="() => invoiceModel.DueOn" class="text-danger" />
+                            </div>
+                        </div>
+
+                        <div class="mb-3">
+                            <label class="form-label">Lease</label>
+                            <InputSelect @bind-Value="invoiceModel.LeaseId" class="form-select" disabled>
+                                @if (leases != null)
+                                {
+                                    @foreach (var lease in leases)
+                                    {
+                                        <option value="@lease.Id">
+                                            @lease.Property?.Address - @lease.Tenant?.FullName (@lease.MonthlyRent.ToString("C")/month)
+                                        </option>
+                                    }
+                                }
+                            </InputSelect>
+                            <small class="text-muted">Lease cannot be changed after invoice creation</small>
+                        </div>
+
+                        <div class="mb-3">
+                            <label class="form-label">Description <span class="text-danger">*</span></label>
+                            <InputText @bind-Value="invoiceModel.Description" class="form-control" />
+                            <ValidationMessage For="() => invoiceModel.Description" class="text-danger" />
+                        </div>
+
+                        <div class="row mb-3">
+                            <div class="col-md-6">
+                                <label class="form-label">Amount <span class="text-danger">*</span></label>
+                                <div class="input-group">
+                                    <span class="input-group-text">$</span>
+                                    <InputNumber @bind-Value="invoiceModel.Amount" class="form-control" step="0.01" />
+                                </div>
+                                <ValidationMessage For="() => invoiceModel.Amount" class="text-danger" />
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Status</label>
+                                <InputSelect @bind-Value="invoiceModel.Status" class="form-select">
+                                    <option value="Pending">Pending</option>
+                                    <option value="Paid">Paid</option>
+                                    <option value="Overdue">Overdue</option>
+                                    <option value="Cancelled">Cancelled</option>
+                                </InputSelect>
+                                <ValidationMessage For="() => invoiceModel.Status" class="text-danger" />
+                            </div>
+                        </div>
+
+                        <div class="row mb-3">
+                            <div class="col-md-6">
+                                <label class="form-label">Paid Amount</label>
+                                <div class="input-group">
+                                    <span class="input-group-text">$</span>
+                                    <InputNumber @bind-Value="invoiceModel.AmountPaid" class="form-control" step="0.01" />
+                                </div>
+                                <ValidationMessage For="() => invoiceModel.AmountPaid" class="text-danger" />
+                                <small class="text-muted">Balance Due: @((invoiceModel.Amount - invoiceModel.AmountPaid).ToString("C"))</small>
+                            </div>
+                            <div class="col-md-6">
+                                <label class="form-label">Paid Date</label>
+                                <InputDate @bind-Value="invoiceModel.PaidOn" class="form-control" />
+                                <ValidationMessage For="() => invoiceModel.PaidOn" class="text-danger" />
+                            </div>
+                        </div>
+
+                        <div class="mb-3">
+                            <label class="form-label">Notes</label>
+                            <InputTextArea @bind-Value="invoiceModel.Notes" class="form-control" rows="3" />
+                            <ValidationMessage For="() => invoiceModel.Notes" class="text-danger" />
+                        </div>
+
+                        <div class="d-flex gap-2">
+                            <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
+                                @if (isSubmitting)
+                                {
+                                    <span class="spinner-border spinner-border-sm me-2" role="status"></span>
+                                }
+                                <i class="bi bi-check-lg"></i> Save Changes
+                            </button>
+                            <button type="button" class="btn btn-outline-primary" @onclick="ViewInvoice">View Invoice</button>
+                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
+                        </div>
+                    </Microsoft.AspNetCore.Components.Forms.EditForm>
+                </div>
+            </div>
+        </div>
+
+        <div class="col-md-4">
+            <div class="card mb-3">
+                <div class="card-header">
+                    <h5 class="mb-0">Invoice Actions</h5>
+                </div>
+                <div class="card-body">
+                    <div class="d-grid gap-2">
+                        <button class="btn btn-outline-primary" @onclick="ViewInvoice">
+                            <i class="bi bi-eye"></i> View Invoice
+                        </button>
+                        @if (invoice.Status != "Paid" && invoice.BalanceDue > 0)
+                        {
+                            <button class="btn btn-outline-success" @onclick="RecordPayment">
+                                <i class="bi bi-cash"></i> Record Payment
+                            </button>
+                        }
+                        <button class="btn btn-outline-info" @onclick="ViewLease">
+                            <i class="bi bi-file-text"></i> View Lease
+                        </button>
+                    </div>
+                </div>
+            </div>
+
+            <div class="card">
+                <div class="card-header">
+                    <h5 class="mb-0">Invoice Summary</h5>
+                </div>
+                <div class="card-body">
+                    <div class="mb-2">
+                        <small class="text-muted">Status</small>
+                        <div>
+                            <span class="badge @GetStatusBadgeClass(invoice.Status)">@invoice.Status</span>
+                        </div>
+                    </div>
+                    <div class="mb-2">
+                        <small class="text-muted">Invoice Amount</small>
+                        <div class="fw-bold">@invoice.Amount.ToString("C")</div>
+                    </div>
+                    <div class="mb-2">
+                        <small class="text-muted">Paid Amount</small>
+                        <div class="text-success">@invoice.AmountPaid.ToString("C")</div>
+                    </div>
+                    <div class="mb-2">
+                        <small class="text-muted">Balance Due</small>
+                        <div class="fw-bold @(invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
+                            @invoice.BalanceDue.ToString("C")
+                        </div>
+                    </div>
+                    @if (invoice.IsOverdue)
+                    {
+                        <div class="alert alert-danger mb-0 mt-2">
+                            <small>
+                                <i class="bi bi-exclamation-triangle"></i>
+                                @invoice.DaysOverdue days overdue
+                            </small>
+                        </div>
+                    }
+                </div>
+            </div>
+        </div>
+    </div>
+}
+
+@code {
+    [Parameter]
+    public Guid InvoiceId { get; set; }
+
+    private Invoice? invoice;
+    private InvoiceModel invoiceModel = new InvoiceModel();
+    private List<Lease>? leases;
+    private string? errorMessage;
+    private string? successMessage;
+    private bool isSubmitting = false;
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadInvoice();
+        await LoadLeases();
+    }
+
+    private async Task LoadInvoice()
+    {
+        invoice = await InvoiceService.GetByIdAsync(InvoiceId);
+        
+        if (invoice != null)
+        {
+            invoiceModel = new InvoiceModel
+            {
+                LeaseId = invoice.LeaseId,
+                InvoiceNumber = invoice.InvoiceNumber,
+                InvoicedOn = invoice.InvoicedOn,
+                DueOn = invoice.DueOn,
+                Amount = invoice.Amount,
+                Description = invoice.Description,
+                Status = invoice.Status,
+                AmountPaid = invoice.AmountPaid,
+                PaidOn = invoice.PaidOn,
+                Notes = invoice.Notes
+            };
+        }
+    }
+
+    private async Task LoadLeases()
+    {
+        var authState = await AuthenticationStateTask;
+        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+
+        if (!string.IsNullOrEmpty(userId))
+        {
+            leases = await LeaseService.GetAllAsync();
+        }
+    }
+
+    private async Task UpdateInvoice()
+    {
+        try
+        {
+            isSubmitting = true;
+            errorMessage = null;
+            successMessage = null;
+
+            var authState = await AuthenticationStateTask;
+            var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+
+            if (string.IsNullOrEmpty(userId))
+            {
+                errorMessage = "User not authenticated.";
+                return;
+            }
+
+            if (invoice == null)
+            {
+                errorMessage = "Invoice not found.";
+                return;
+            }
+
+            invoice.InvoicedOn = invoiceModel.InvoicedOn;
+            invoice.DueOn = invoiceModel.DueOn;
+            invoice.Amount = invoiceModel.Amount;
+            invoice.Description = invoiceModel.Description;
+            invoice.Status = invoiceModel.Status;
+            invoice.AmountPaid = invoiceModel.AmountPaid;
+            invoice.PaidOn = invoiceModel.PaidOn;
+            invoice.Notes = invoiceModel.Notes ?? string.Empty;
+
+            await InvoiceService.UpdateAsync(invoice);
+
+            successMessage = "Invoice updated successfully!";
+        }
+        catch (Exception ex)
+        {
+            errorMessage = $"Error updating invoice: {ex.Message}";
+        }
+        finally
+        {
+            isSubmitting = false;
+        }
+    }
+
+    private string GetStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            "Paid" => "bg-success",
+            "Pending" => "bg-warning",
+            "Overdue" => "bg-danger",
+            "Cancelled" => "bg-secondary",
+            _ => "bg-info"
+        };
+    }
+
+    private void ViewInvoice()
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/invoices/{InvoiceId}");
+    }
+
+    private void ViewLease()
+    {
+        if (invoice?.LeaseId != null)
+        {
+            NavigationManager.NavigateTo($"/propertymanagement/leases/{invoice.LeaseId}");
+        }
+    }
+
+    private void RecordPayment()
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/payments/create?invoiceId={InvoiceId}");
+    }
+
+    private void Cancel()
+    {
+        NavigationManager.NavigateTo("/propertymanagement/invoices");
+    }
+
+    public class InvoiceModel
+    {
+        [RequiredGuid(ErrorMessage = "Lease is required")]
+        public Guid LeaseId { get; set; }
+
+        [Required(ErrorMessage = "Invoice number is required")]
+        [StringLength(50, ErrorMessage = "Invoice number cannot exceed 50 characters")]
+        public string InvoiceNumber { get; set; } = string.Empty;
+
+        [Required(ErrorMessage = "Invoice date is required")]
+        public DateTime InvoicedOn { get; set; }
+
+        [Required(ErrorMessage = "Due date is required")]
+        public DateTime DueOn { get; set; }
+
+        [Required(ErrorMessage = "Amount is required")]
+        [Range(0.01, double.MaxValue, ErrorMessage = "Amount must be greater than 0")]
+        public decimal Amount { get; set; }
+
+        [Required(ErrorMessage = "Description is required")]
+        [StringLength(100, ErrorMessage = "Description cannot exceed 100 characters")]
+        public string Description { get; set; } = string.Empty;
+
+        [Required]
+        [StringLength(50)]
+        public string Status { get; set; } = "Pending";
+
+        [Range(0, double.MaxValue, ErrorMessage = "Paid amount cannot be negative")]
+        public decimal AmountPaid { get; set; }
+
+        public DateTime? PaidOn { get; set; }
+
+        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
+        public string? Notes { get; set; }
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Invoices/ListForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Invoices/ListForm.razor
new file mode 100644
index 0000000..9820738
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Invoices/ListForm.razor
@@ -0,0 +1,585 @@
+@using Aquiis.Core.Entities
+@using Aquiis.Application.Services
+@using Microsoft.AspNetCore.Components.Authorization
+@inject NavigationManager Navigation
+@inject InvoiceService InvoiceService
+@inject IJSRuntime JSRuntime
+@rendermode InteractiveServer
+
+<div class="d-flex justify-content-between align-items-center mb-4">
+    <h1><span class="bi bi-receipt" aria-hidden="true"></span> Invoices</h1>
+    <button class="btn btn-primary" @onclick="CreateInvoice">
+        <i class="bi bi-plus-lg"></i> Create Invoice
+    </button>
+</div>
+
+@if (invoices == null)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else if (!invoices.Any())
+{
+    <div class="alert alert-info">
+        <h4>No Invoices Found</h4>
+        <p>Get started by creating your first invoice.</p>
+        <button class="btn btn-primary" @onclick="CreateInvoice">Create First Invoice</button>
+    </div>
+}
+else
+{
+    <div class="row mb-3">
+        <div class="col-md-3">
+            <div class="input-group">
+                <span class="input-group-text"><i class="bi bi-search"></i></span>
+                <input type="text" class="form-control" placeholder="Search invoices..." @bind="searchTerm" @onkeyup="FilterInvoices" />
+            </div>
+        </div>
+        <div class="col-md-3">
+            <select class="form-select" @bind="selectedStatus" @bind:after="FilterInvoices">
+                <option value="">All Statuses</option>
+                <option value="Pending">Pending</option>
+                <option value="Paid">Paid</option>
+                <option value="Overdue">Overdue</option>
+                <option value="Cancelled">Cancelled</option>
+            </select>
+        </div>
+        <div class="col-md-3">
+            <div class="form-check form-switch pt-2">
+                <input class="form-check-input" type="checkbox" id="groupByProperty" @bind="groupByProperty" @bind:after="FilterInvoices">
+                <label class="form-check-label" for="groupByProperty">
+                    Group by Property
+                </label>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <button class="btn btn-outline-secondary" @onclick="ClearFilters">
+                <i class="bi bi-x-circle"></i> Clear Filters
+            </button>
+        </div>
+    </div>
+
+    <div class="row mb-3">
+        <div class="col-md-3">
+            <div class="card text-white bg-warning">
+                <div class="card-body">
+                    <h6>Pending</h6>
+                    <h4>@pendingCount</h4>
+                    <small>@pendingAmount.ToString("C")</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white bg-success">
+                <div class="card-body">
+                    <h6>Paid</h6>
+                    <h4>@paidCount</h4>
+                    <small>@paidAmount.ToString("C")</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white bg-danger">
+                <div class="card-body">
+                    <h6>Overdue</h6>
+                    <h4>@overdueCount</h4>
+                    <small>@overdueAmount.ToString("C")</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white bg-info">
+                <div class="card-body">
+                    <h6>Total</h6>
+                    <h4>@filteredInvoices.Count</h4>
+                    <small>@totalAmount.ToString("C")</small>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="card">
+        <div class="card-body">
+            @if (groupByProperty)
+            {
+                @foreach (var propertyGroup in groupedInvoices)
+                {
+                    var property = propertyGroup.First().Lease?.Property;
+                    var propertyInvoiceCount = propertyGroup.Count();
+                    var propertyTotal = propertyGroup.Sum(i => i.Amount);
+                    var propertyBalance = propertyGroup.Sum(i => i.BalanceDue);
+                    var isExpanded = expandedProperties.Contains(propertyGroup.Key.GetHashCode());
+                    
+                    <div class="card mb-3">
+                        <div class="card-header" style="cursor: pointer;" @onclick="() => TogglePropertyGroup(propertyGroup.Key)">
+                            <div class="d-flex justify-content-between align-items-center">
+                                <div>
+                                    <i class="bi @(isExpanded ? "bi-chevron-down" : "bi-chevron-right")"></i>
+                                    <strong>@property?.Address</strong>
+                                    <span class="ms-3 text-muted">@property?.City, @property?.State @property?.ZipCode</span>
+                                </div>
+                                <div>
+                                    <span class="badge bg-secondary me-2">@propertyInvoiceCount invoice(s)</span>
+                                    <span class="me-2">Total: <strong>@propertyTotal.ToString("C")</strong></span>
+                                    <span>Balance: <strong class="@(propertyBalance > 0 ? "text-danger" : "text-success")">@propertyBalance.ToString("C")</strong></span>
+                                </div>
+                            </div>
+                        </div>
+                        @if (isExpanded)
+                        {
+                            <div class="card-body p-0">
+                                <table class="table table-hover mb-0">
+                                    <thead class="table">
+                                        <tr>
+                                            <th>Invoice #</th>
+                                            <th>Tenant</th>
+                                            <th>Invoice Date</th>
+                                            <th>Due Date</th>
+                                            <th>Amount</th>
+                                            <th>Balance Due</th>
+                                            <th>Status</th>
+                                            <th>Actions</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach (var invoice in propertyGroup)
+                                        {
+                                            <tr @onclick="() => ViewInvoice(invoice.Id)" style="cursor: pointer;">
+                                                <td>
+                                                    <strong>@invoice.InvoiceNumber</strong>
+                                                    <br />
+                                                    <small class="text-muted">@invoice.Description</small>
+                                                </td>
+                                                <td>@invoice.Lease?.Tenant?.FullName</td>
+                                                <td>@invoice.InvoicedOn.ToString("MMM dd, yyyy")</td>
+                                                <td>
+                                                    @invoice.DueOn.ToString("MMM dd, yyyy")
+                                                    @if (invoice.IsOverdue)
+                                                    {
+                                                        <br />
+                                                        <small class="text-danger">@invoice.DaysOverdue days overdue</small>
+                                                    }
+                                                </td>
+                                                <td>@invoice.Amount.ToString("C")</td>
+                                                <td>
+                                                    <strong class="@(invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
+                                                        @invoice.BalanceDue.ToString("C")
+                                                    </strong>
+                                                </td>
+                                                <td>
+                                                    <span class="badge @GetStatusBadgeClass(invoice.Status)">
+                                                        @invoice.Status
+                                                    </span>
+                                                </td>
+                                                <td @onclick:stopPropagation="true">
+                                                    <div class="btn-group" role="group">
+                                                        <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewInvoice(invoice.Id)" title="View">
+                                                            <i class="bi bi-eye"></i>
+                                                        </button>
+                                                        <button class="btn btn-sm btn-outline-secondary" @onclick="() => EditInvoice(invoice.Id)" title="Edit">
+                                                            <i class="bi bi-pencil"></i>
+                                                        </button>
+                                                        <button class="btn btn-sm btn-outline-danger" @onclick="() => DeleteInvoice(invoice)" title="Delete">
+                                                            <i class="bi bi-trash"></i>
+                                                        </button>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        }
+                                    </tbody>
+                                </table>
+                            </div>
+                        }
+                    </div>
+                }
+            }
+            else
+            {
+                <div class="table-responsive">
+                    <table class="table table-hover"><thead><tr>
+                            <th>
+                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Invoice.InvoiceNumber))">
+                                    Invoice #
+                                    @if (sortColumn == nameof(Invoice.InvoiceNumber))
+                                    {
+                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
+                                    }
+                                </button>
+                            </th>
+                            <th>
+                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick='() => SortBy("Property")'>
+                                    Property
+                                    @if (sortColumn == "Property")
+                                    {
+                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
+                                    }
+                                </button>
+                            </th>
+                            <th>
+                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick='() => SortBy("Tenant")'>
+                                    Tenant
+                                    @if (sortColumn == "Tenant")
+                                    {
+                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
+                                    }
+                                </button>
+                            </th>
+                            <th>
+                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Invoice.InvoicedOn))">
+                                    Invoice Date
+                                    @if (sortColumn == nameof(Invoice.InvoicedOn))
+                                    {
+                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
+                                    }
+                                </button>
+                            </th>
+                            <th>
+                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Invoice.DueOn))">
+                                    Due Date
+                                    @if (sortColumn == nameof(Invoice.DueOn))
+                                    {
+                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
+                                    }
+                                </button>
+                            </th>
+                            <th>
+                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Invoice.Amount))">
+                                    Amount
+                                    @if (sortColumn == nameof(Invoice.Amount))
+                                    {
+                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
+                                    }
+                                </button>
+                            </th>
+                            <th>Balance Due</th>
+                            <th>Status</th>
+                            <th>Actions</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var invoice in pagedInvoices)
+                        {
+                            <tr @onclick="() => ViewInvoice(invoice.Id)" style="cursor: pointer;">
+                                <td>
+                                    <strong>@invoice.InvoiceNumber</strong>
+                                    <br />
+                                    <small class="text-muted">@invoice.Description</small>
+                                </td>
+                                <td>@invoice.Lease?.Property?.Address</td>
+                                <td>@invoice.Lease?.Tenant?.FullName</td>
+                                <td>@invoice.InvoicedOn.ToString("MMM dd, yyyy")</td>
+                                <td>
+                                    @invoice.DueOn.ToString("MMM dd, yyyy")
+                                    @if (invoice.IsOverdue)
+                                    {
+                                        <br />
+                                        <small class="text-danger">@invoice.DaysOverdue days overdue</small>
+                                    }
+                                </td>
+                                <td>@invoice.Amount.ToString("C")</td>
+                                <td>
+                                    <strong class="@(invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
+                                        @invoice.BalanceDue.ToString("C")
+                                    </strong>
+                                </td>
+                                <td>
+                                    <span class="badge @GetStatusBadgeClass(invoice.Status)">
+                                        @invoice.Status
+                                    </span>
+                                </td>
+                                <td @onclick:stopPropagation="true">
+                                    <div class="btn-group" role="group">
+                                        <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewInvoice(invoice.Id)" title="View">
+                                            <i class="bi bi-eye"></i>
+                                        </button>
+                                        <button class="btn btn-sm btn-outline-secondary" @onclick="() => EditInvoice(invoice.Id)" title="Edit">
+                                            <i class="bi bi-pencil"></i>
+                                        </button>
+                                        <button class="btn btn-sm btn-outline-danger" @onclick="() => DeleteInvoice(invoice)" title="Delete">
+                                            <i class="bi bi-trash"></i>
+                                        </button>
+                                    </div>
+                                </td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            </div>
+            }
+
+            @if (totalPages > 1 && !groupByProperty)
+            {
+                <div class="d-flex justify-content-between align-items-center mt-3">
+                    <div>
+                        <select class="form-select form-select-sm" @bind="pageSize" @bind:after="UpdatePagination">
+                            <option value="10">10 per page</option>
+                            <option value="20">20 per page</option>
+                            <option value="50">50 per page</option>
+                            <option value="100">100 per page</option>
+                        </select>
+                    </div>
+                    <div class="text-muted">
+                        Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords invoices
+                    </div>
+                    <nav>
+                        <ul class="pagination pagination-sm mb-0">
+                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
+                                <button class="page-link" @onclick="FirstPage" disabled="@(currentPage == 1)">
+                                    <i class="bi bi-chevron-double-left"></i>
+                                </button>
+                            </li>
+                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
+                                <button class="page-link" @onclick="PreviousPage" disabled="@(currentPage == 1)">
+                                    <i class="bi bi-chevron-left"></i>
+                                </button>
+                            </li>
+                            @for (int i = Math.Max(1, currentPage - 2); i <= Math.Min(totalPages, currentPage + 2); i++)
+                            {
+                                var pageNum = i;
+                                <li class="page-item @(currentPage == pageNum ? "active" : "")">
+                                    <button class="page-link" @onclick="() => GoToPage(pageNum)">@pageNum</button>
+                                </li>
+                            }
+                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
+                                <button class="page-link" @onclick="NextPage" disabled="@(currentPage == totalPages)">
+                                    <i class="bi bi-chevron-right"></i>
+                                </button>
+                            </li>
+                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
+                                <button class="page-link" @onclick="LastPage" disabled="@(currentPage == totalPages)">
+                                    <i class="bi bi-chevron-double-right"></i>
+                                </button>
+                            </li>
+                        </ul>
+                    </nav>
+                </div>
+            }
+        </div>
+    </div>
+}
+
+@code {
+    private List<Invoice>? invoices;
+    private List<Invoice> filteredInvoices = new();
+    private List<Invoice> pagedInvoices = new();
+    private IEnumerable<IGrouping<Guid, Invoice>> groupedInvoices = Enumerable.Empty<IGrouping<Guid, Invoice>>();
+    private HashSet<int> expandedProperties = new();
+    private string searchTerm = string.Empty;
+    private string selectedStatus = string.Empty;
+    private string sortColumn = nameof(Invoice.DueOn);
+    private bool sortAscending = false;
+    private bool groupByProperty = true;
+    
+    private int pendingCount = 0;
+    private int paidCount = 0;
+    private int overdueCount = 0;
+    private decimal pendingAmount = 0;
+    private decimal paidAmount = 0;
+    private decimal overdueAmount = 0;
+    private decimal totalAmount = 0;
+    
+    private int currentPage = 1;
+    private int pageSize = 20;
+    private int totalPages = 1;
+    private int totalRecords = 0;
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public Guid? LeaseId { get; set; }
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadInvoices();
+    }
+
+    private async Task LoadInvoices()
+    {
+        var authState = await AuthenticationStateTask;
+        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+
+        if (!string.IsNullOrEmpty(userId))
+        {
+            invoices = await InvoiceService.GetAllAsync();
+            if (LeaseId.HasValue)
+            {
+                invoices = invoices.Where(i => i.LeaseId == LeaseId.Value).ToList();
+            }
+            FilterInvoices();
+            UpdateStatistics();
+        }
+    }
+
+    private void FilterInvoices()
+    {
+        if (invoices == null) return;
+
+        filteredInvoices = invoices.Where(i =>
+        {
+            bool matchesSearch = string.IsNullOrWhiteSpace(searchTerm) ||
+                i.InvoiceNumber.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
+                (i.Lease?.Property?.Address?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ?? false) ||
+                (i.Lease?.Tenant?.FullName?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ?? false) ||
+                i.Description.Contains(searchTerm, StringComparison.OrdinalIgnoreCase);
+
+            bool matchesStatus = string.IsNullOrWhiteSpace(selectedStatus) ||
+                i.Status.Equals(selectedStatus, StringComparison.OrdinalIgnoreCase);
+
+            return matchesSearch && matchesStatus;
+        }).ToList();
+
+        SortInvoices();
+        
+        if (groupByProperty)
+        {
+            groupedInvoices = filteredInvoices
+                .Where(i => i.Lease?.PropertyId != null)
+                .GroupBy(i => i.Lease!.PropertyId)
+                .OrderBy(g => g.First().Lease?.Property?.Address)
+                .ToList();
+        }
+        else
+        {
+            UpdatePagination();
+        }
+    }
+    
+    private void TogglePropertyGroup(Guid propertyId)
+    {
+        if (expandedProperties.Contains(propertyId.GetHashCode()))
+        {
+            expandedProperties.Remove(propertyId.GetHashCode());
+        }
+        else
+        {
+            expandedProperties.Add(propertyId.GetHashCode());
+        }
+    }
+
+    private void SortBy(string column)
+    {
+        if (sortColumn == column)
+        {
+            sortAscending = !sortAscending;
+        }
+        else
+        {
+            sortColumn = column;
+            sortAscending = true;
+        }
+        SortInvoices();
+        UpdatePagination();
+    }
+
+    private void SortInvoices()
+    {
+        filteredInvoices = sortColumn switch
+        {
+            nameof(Invoice.InvoiceNumber) => sortAscending
+                ? filteredInvoices.OrderBy(i => i.InvoiceNumber).ToList()
+                : filteredInvoices.OrderByDescending(i => i.InvoiceNumber).ToList(),
+            "Property" => sortAscending
+                ? filteredInvoices.OrderBy(i => i.Lease?.Property?.Address).ToList()
+                : filteredInvoices.OrderByDescending(i => i.Lease?.Property?.Address).ToList(),
+            "Tenant" => sortAscending
+                ? filteredInvoices.OrderBy(i => i.Lease?.Tenant?.FullName).ToList()
+                : filteredInvoices.OrderByDescending(i => i.Lease?.Tenant?.FullName).ToList(),
+            nameof(Invoice.InvoicedOn) => sortAscending
+                ? filteredInvoices.OrderBy(i => i.InvoicedOn).ToList()
+                : filteredInvoices.OrderByDescending(i => i.InvoicedOn).ToList(),
+            nameof(Invoice.DueOn) => sortAscending
+                ? filteredInvoices.OrderBy(i => i.DueOn).ToList()
+                : filteredInvoices.OrderByDescending(i => i.DueOn).ToList(),
+            nameof(Invoice.Amount) => sortAscending
+                ? filteredInvoices.OrderBy(i => i.Amount).ToList()
+                : filteredInvoices.OrderByDescending(i => i.Amount).ToList(),
+            _ => filteredInvoices.OrderByDescending(i => i.DueOn).ToList()
+        };
+    }
+
+    private void UpdateStatistics()
+    {
+        if (invoices == null) return;
+
+        pendingCount = invoices.Count(i => i.Status == "Pending");
+        paidCount = invoices.Count(i => i.Status == "Paid");
+        overdueCount = invoices.Count(i => i.IsOverdue && i.Status != "Paid");
+        
+        pendingAmount = invoices.Where(i => i.Status == "Pending").Sum(i => i.BalanceDue);
+        paidAmount = invoices.Where(i => i.Status == "Paid").Sum(i => i.Amount);
+        overdueAmount = invoices.Where(i => i.IsOverdue && i.Status != "Paid").Sum(i => i.BalanceDue);
+        totalAmount = invoices.Sum(i => i.Amount);
+    }
+
+    private void UpdatePagination()
+    {
+        totalRecords = filteredInvoices.Count;
+        totalPages = (int)Math.Ceiling(totalRecords / (double)pageSize);
+        currentPage = Math.Min(currentPage, Math.Max(1, totalPages));
+        
+        pagedInvoices = filteredInvoices
+            .Skip((currentPage - 1) * pageSize)
+            .Take(pageSize)
+            .ToList();
+    }
+
+    private void ClearFilters()
+    {
+        searchTerm = string.Empty;
+        selectedStatus = string.Empty;
+        groupByProperty = false;
+        FilterInvoices();
+    }
+
+    private void FirstPage() => GoToPage(1);
+    private void LastPage() => GoToPage(totalPages);
+    private void NextPage() => GoToPage(currentPage + 1);
+    private void PreviousPage() => GoToPage(currentPage - 1);
+    
+    private void GoToPage(int page)
+    {
+        currentPage = Math.Max(1, Math.Min(page, totalPages));
+        UpdatePagination();
+    }
+
+    private string GetStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            "Paid" => "bg-success",
+            "Pending" => "bg-warning",
+            "Overdue" => "bg-danger",
+            "Cancelled" => "bg-secondary",
+            _ => "bg-info"
+        };
+    }
+
+    private void CreateInvoice()
+    {
+        Navigation.NavigateTo("/propertymanagement/invoices/create");
+    }
+
+    private void ViewInvoice(Guid id)
+    {
+        Navigation.NavigateTo($"/propertymanagement/invoices/{id}");
+    }
+
+    private void EditInvoice(Guid id)
+    {
+        Navigation.NavigateTo($"/propertymanagement/invoices/{id}/edit");
+    }
+
+    private async Task DeleteInvoice(Invoice invoice)
+    {
+        if (await JSRuntime.InvokeAsync<bool>("confirm", $"Are you sure you want to delete invoice {invoice.InvoiceNumber}?"))
+        {
+            await InvoiceService.DeleteAsync(invoice.Id);
+            await LoadInvoices();
+        }
+    }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Invoices/ViewForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Invoices/ViewForm.razor
new file mode 100644
index 0000000..aec3b71
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Invoices/ViewForm.razor
@@ -0,0 +1,449 @@
+@using Aquiis.Core.Entities
+@using Aquiis.Application.Services
+@using Microsoft.AspNetCore.Components.Authorization
+@inject NavigationManager NavigationManager
+@inject InvoiceService InvoiceService
+@inject DocumentService DocumentService
+@inject IJSRuntime JSRuntime
+@rendermode InteractiveServer
+
+@if (invoice == null)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else
+{
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <h1><i class="bi bi-receipt"></i> Invoice Details</h1>
+        <div>
+            <button class="btn btn-outline-secondary" @onclick="BackToLease">
+                <i class="bi bi-arrow-left"></i> Back to Lease
+            </button>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-8">
+            <div class="card mb-3">
+                <div class="card-header d-flex justify-content-between align-items-center">
+                    <h5 class="mb-0">Invoice Information</h5>
+                    <span class="badge @GetStatusBadgeClass(invoice.Status) fs-6">@invoice.Status</span>
+                </div>
+                <div class="card-body">
+                    <div class="row mb-3">
+                        <div class="col-md-6">
+                            <div class="mb-3">
+                                <label class="text-muted small">Invoice Number</label>
+                                <div class="fw-bold fs-5">@invoice.InvoiceNumber</div>
+                            </div>
+                            <div class="mb-3">
+                                <label class="text-muted small">Invoice Date</label>
+                                <div>@invoice.InvoicedOn.ToString("MMMM dd, yyyy")</div>
+                            </div>
+                            <div class="mb-3">
+                                <label class="text-muted small">Description</label>
+                                <div>@invoice.Description</div>
+                            </div>
+                        </div>
+                        <div class="col-md-6">
+                            <div class="mb-3">
+                                <label class="text-muted small">Due Date</label>
+                                <div class="@(invoice.IsOverdue ? "text-danger fw-bold" : "")">
+                                    @invoice.DueOn.ToString("MMMM dd, yyyy")
+                                    @if (invoice.IsOverdue)
+                                    {
+                                        <br />
+                                        @if(invoice.DaysOverdue == 1)
+                                        {
+                                            <small>(1 day overdue)</small>
+                                        }
+                                        else
+                                        {
+                                            <small>(@invoice.DaysOverdue days overdue)</small>
+                                        }
+                                    }
+                                </div>
+                            </div>
+                            <div class="mb-3">
+                                <label class="text-muted small">Created Date</label>
+                                <div>@invoice.CreatedOn.ToString("MMMM dd, yyyy")</div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <hr />
+
+                    <div class="row">
+                        <div class="col-md-4">
+                            <div class="mb-3">
+                                <label class="text-muted small">Invoice Amount</label>
+                                <div class="fw-bold fs-4">@invoice.Amount.ToString("C")</div>
+                            </div>
+                        </div>
+                        <div class="col-md-4">
+                            <div class="mb-3">
+                                <label class="text-muted small">Paid Amount</label>
+                                <div class="fw-bold fs-4 text-success">@invoice.AmountPaid.ToString("C")</div>
+                            </div>
+                        </div>
+                        <div class="col-md-4">
+                            <div class="mb-3">
+                                <label class="text-muted small">Balance Due</label>
+                                <div class="fw-bold fs-4 @(invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
+                                    @invoice.BalanceDue.ToString("C")
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    @if (invoice.PaidOn.HasValue)
+                    {
+                        <div class="mb-3">
+                            <label class="text-muted small">Paid Date</label>
+                            <div>@invoice.PaidOn.Value.ToString("MMMM dd, yyyy")</div>
+                        </div>
+                    }
+
+                    @if (!string.IsNullOrWhiteSpace(invoice.Notes))
+                    {
+                        <hr />
+                        <div class="mb-3">
+                            <label class="text-muted small">Notes</label>
+                            <div class="border p-2 rounded bg-light">@invoice.Notes</div>
+                        </div>
+                    }
+                </div>
+            </div>
+
+            <div class="card mb-3">
+                <div class="card-header">
+                    <h5 class="mb-0">Lease Information</h5>
+                </div>
+                <div class="card-body">
+                    @if (invoice.Lease != null)
+                    {
+                        <div class="row">
+                            <div class="col-md-6">
+                                <div class="mb-3">
+                                    <label class="text-muted small">Property</label>
+                                    <div>
+                                        <a href="/propertymanagement/properties/@invoice.Lease.PropertyId" class="text-decoration-none">
+                                            @invoice.Lease.Property?.Address
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="text-muted small">Lease Period</label>
+                                    <div>
+                                        @invoice.Lease.StartDate.ToString("MMM dd, yyyy") - 
+                                        @invoice.Lease.EndDate.ToString("MMM dd, yyyy")
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="mb-3">
+                                    <label class="text-muted small">Tenant</label>
+                                    <div>
+                                        <a href="/propertymanagement/tenants/@invoice.Lease.TenantId" class="text-decoration-none">
+                                            @invoice.Lease.Tenant?.FullName
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="mb-3">
+                                    <label class="text-muted small">Monthly Rent</label>
+                                    <div>@invoice.Lease.MonthlyRent.ToString("C")</div>
+                                </div>
+                            </div>
+                        </div>
+                    }
+                </div>
+            </div>
+
+            @if (invoice.Payments != null && invoice.Payments.Any())
+            {
+                <div class="card">
+                    <div class="card-header">
+                        <h5 class="mb-0">Payment History</h5>
+                    </div>
+                    <div class="card-body">
+                        <div class="table-responsive">
+                            <table class="table table-sm">
+                                <thead>
+                                    <tr>
+                                        <th>Payment Number</th>
+                                        <th>Date</th>
+                                        <th>Amount</th>
+                                        <th>Method</th>
+                                        <th>Notes</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach (var payment in invoice.Payments.OrderByDescending(p => p.PaidOn))
+                                    {
+                                        <tr>
+                                            <td><a href="/propertymanagement/payments/@payment.Id" class="text-decoration-none">@payment.PaymentNumber</a></td>
+                                            <td>@payment.PaidOn.ToString("MMM dd, yyyy")</td>
+                                            <td>@payment.Amount.ToString("C")</td>
+                                            <td>@payment.PaymentMethod</td>
+                                            <td>@payment.Notes</td>
+                                        </tr>
+                                    }
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            }
+        </div>
+
+        <div class="col-md-4">
+            <div class="card mb-3">
+                <div class="card-header">
+                    <h5 class="mb-0">Quick Actions</h5>
+                </div>
+                <div class="card-body">
+                    <div class="d-grid gap-2">
+                        <button class="btn btn-outline-primary" @onclick="EditInvoice">
+                            <i class="bi bi-pencil"></i> Edit Invoice
+                        </button>
+                        @if (invoice.Status != "Paid" && invoice.BalanceDue > 0)
+                        {
+                            <button class="btn btn-outline-success" @onclick="RecordPayment">
+                                <i class="bi bi-cash"></i> Record Payment
+                            </button>
+                        }
+                        <button class="btn btn-outline-info" @onclick="ViewLease">
+                            <i class="bi bi-file-text"></i> View Lease
+                        </button>
+                        @if (invoice.DocumentId == null)
+                        {
+                            <button class="btn btn-outline-secondary" @onclick="GenerateInvoicePdf" disabled="@isGenerating">
+                                @if (isGenerating)
+                                {
+                                    <span class="spinner-border spinner-border-sm me-1" role="status"></span>
+                                }
+                                else
+                                {
+                                    <i class="bi bi-file-pdf"></i>
+                                }
+                                Generate PDF
+                            </button>
+                        }
+                        else
+                        {
+                            <button class="btn btn-primary" @onclick="ViewDocument">
+                                <i class="bi bi-eye"></i> View PDF
+                            </button>
+                            <button class="btn btn-outline-primary" @onclick="DownloadDocument">
+                                <i class="bi bi-download"></i> Download PDF
+                            </button>
+                        }
+                    </div>
+                </div>
+            </div>
+
+            <div class="card">
+                <div class="card-header">
+                    <h5 class="mb-0">Metadata</h5>
+                </div>
+                <div class="card-body">
+                    <div class="mb-2">
+                        <small class="text-muted">Created By:</small>
+                        <div>@(!string.IsNullOrEmpty(invoice.CreatedBy) ? invoice.CreatedBy : "System")</div>
+                    </div>
+                    @if (invoice.LastModifiedOn.HasValue)
+                    {
+                        <div class="mb-2">
+                            <small class="text-muted">Last Modified:</small>
+                            <div>@invoice.LastModifiedOn.Value.ToString("MMM dd, yyyy h:mm tt")</div>
+                        </div>
+                        <div class="mb-2">
+                            <small class="text-muted">Modified By:</small>
+                            <div>@(!string.IsNullOrEmpty(invoice.LastModifiedBy) ? invoice.LastModifiedBy : "System")</div>
+                        </div>
+                    }
+                </div>
+            </div>
+            <div class="card mt-3">
+                <div class="card-header">
+                    <h6 class="card-title mb-0">Status Guide</h6>
+                </div>
+                <div class="card-body">
+                    <small class="text-muted d-block mb-3">Invoice status definitions:</small>
+                    
+                    <div class="d-flex align-items-start mb-2">
+                        <span class="badge bg-warning me-2" style="min-width: 100px;">Pending</span>
+                        <span class="small">Invoice created, awaiting payment</span>
+                    </div>
+                    
+                    <div class="d-flex align-items-start mb-2">
+                        <span class="badge bg-info me-2" style="min-width: 100px;">Paid Partial</span>
+                        <span class="small">Partially paid, balance remaining</span>
+                    </div>
+                    
+                    <div class="d-flex align-items-start mb-2">
+                        <span class="badge bg-success me-2" style="min-width: 100px;">Paid</span>
+                        <span class="small">Fully paid, no balance due</span>
+                    </div>
+                    
+                    <div class="d-flex align-items-start mb-2">
+                        <span class="badge bg-danger me-2" style="min-width: 100px;">Overdue</span>
+                        <span class="small">Past due date, payment not received</span>
+                    </div>
+                    
+                    <div class="d-flex align-items-start mb-2">
+                        <span class="badge bg-secondary me-2" style="min-width: 100px;">Cancelled</span>
+                        <span class="small">Invoice cancelled, no longer valid</span>
+                    </div>
+                    
+                    <div class="d-flex align-items-start">
+                        <span class="badge bg-secondary me-2" style="min-width: 100px;">Voided</span>
+                        <span class="small">Created in error, voided before processing</span>
+                    </div>
+                </div>
+            </div>        </div>
+    </div>
+}
+
+@code {
+    [Parameter]
+    public Guid InvoiceId { get; set; }
+
+    private Invoice? invoice;
+    private bool isGenerating = false;
+    private Document? document = null;
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadInvoice();
+    }
+
+    private async Task LoadInvoice()
+    {
+        invoice = await InvoiceService.GetInvoiceWithRelationsAsync(InvoiceId);
+        
+        // Load the document if it exists
+        if (invoice?.DocumentId != null)
+        {
+            document = await DocumentService.GetByIdAsync(invoice.DocumentId.Value);
+        }
+    }
+
+    private string GetStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            "Paid" => "bg-success",
+            "Pending" => "bg-warning",
+            "Overdue" => "bg-danger",
+            "Cancelled" => "bg-secondary",
+            _ => "bg-info"
+        };
+    }
+
+    private void BackToLease()
+    {
+        if (invoice?.LeaseId != null)
+        {
+            NavigationManager.NavigateTo($"/propertymanagement/leases/{invoice.LeaseId}");
+        }
+    }
+
+    private void EditInvoice()
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/invoices/{InvoiceId}/edit");
+    }
+
+    private void RecordPayment()
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/payments/create?invoiceId={InvoiceId}");
+    }
+
+    private void ViewLease()
+    {
+        if (invoice?.LeaseId != null)
+        {
+            NavigationManager.NavigateTo($"/propertymanagement/leases/{invoice.LeaseId}");
+        }
+    }
+
+    private async Task ViewDocument()
+    {
+        if (document != null)
+        {
+            var base64Data = Convert.ToBase64String(document.FileData);
+            await JSRuntime.InvokeVoidAsync("viewFile", base64Data, document.FileType);
+        }
+    }
+
+    private async Task DownloadDocument()
+    {
+        if (document != null)
+        {
+            var fileName = document.FileName;
+            var fileData = document.FileData;
+            var mimeType = document.FileType;
+
+            await JSRuntime.InvokeVoidAsync("downloadFile", fileName, Convert.ToBase64String(fileData), mimeType);
+        }
+    }
+
+    private async Task GenerateInvoicePdf()
+    {
+        isGenerating = true;
+        StateHasChanged();
+
+        try
+        {
+            // Generate the PDF
+            byte[] pdfBytes = Aquiis.Application.Services.PdfGenerators.InvoicePdfGenerator.GenerateInvoicePdf(invoice!);
+
+            // Create the document entity
+            var document = new Document
+            {
+                FileName = $"Invoice_{invoice!.InvoiceNumber?.Replace(" ", "_")}_{DateTime.Now:yyyyMMdd}.pdf",
+                FileExtension = ".pdf",
+                FileData = pdfBytes,
+                FileSize = pdfBytes.Length,
+                FileType = "application/pdf",
+                ContentType = "application/pdf",
+                DocumentType = "Invoice",
+                Description = $"Invoice {invoice.InvoiceNumber}",
+                LeaseId = invoice.LeaseId,
+                PropertyId = invoice.Lease?.PropertyId,
+                TenantId = invoice.Lease?.TenantId,
+                IsDeleted = false
+            };
+
+            // Save to database
+            await DocumentService.CreateAsync(document);
+
+            // Update invoice with DocumentId
+            invoice.DocumentId = document.Id;
+            
+            await InvoiceService.UpdateAsync(invoice);
+
+            // Reload invoice and document
+            await LoadInvoice();
+            StateHasChanged();
+
+            await JSRuntime.InvokeVoidAsync("alert", "Invoice PDF generated successfully!");
+        }
+        catch (Exception ex)
+        {
+            await JSRuntime.InvokeVoidAsync("alert", $"Error generating invoice PDF: {ex.Message}");
+        }
+        finally
+        {
+            isGenerating = false;
+            StateHasChanged();
+        }
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Leases/CreateForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Leases/CreateForm.razor
new file mode 100644
index 0000000..e3c6763
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Leases/CreateForm.razor
@@ -0,0 +1,371 @@
+@using Aquiis.Core.Entities
+@using Aquiis.Core.Constants
+@using Aquiis.Core.Validation
+@using Aquiis.Application.Services
+@using Microsoft.AspNetCore.Components.Authorization
+@using System.ComponentModel.DataAnnotations
+@inject NavigationManager Navigation
+@inject OrganizationService OrganizationService
+@inject LeaseService LeaseService
+@inject PropertyService PropertyService
+@inject TenantService TenantService
+@rendermode InteractiveServer
+
+<div class="row">
+    <div class="col-md-8">
+        <div class="card">
+            <div class="card-header">
+                <h3 class="card-title mb-0">Create New Lease</h3>
+            </div>
+            <div class="card-body">
+                <Microsoft.AspNetCore.Components.Forms.EditForm Model="leaseModel" OnValidSubmit="HandleValidSubmit" FormName="create-lease">
+                    <DataAnnotationsValidator />
+                    <ValidationSummary class="text-danger mb-3" />
+                    
+                    @if (!string.IsNullOrEmpty(errorMessage))
+                    {
+                        <div class="alert alert-danger" role="alert">
+                            @errorMessage
+                        </div>
+                    }
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Property *</label>
+                            <InputSelect @bind-Value="leaseModel.PropertyId" class="form-select" @onchange="@(async () => await OnPropertyChanged())">
+                                <option value="">Select a property</option>
+                                @foreach (var property in availableProperties)
+                                {
+                                    <option value="@property.Id">@property.Address (@property.City)</option>
+                                }
+                            </InputSelect>
+                            <ValidationMessage For="() => leaseModel.PropertyId" class="text-danger" />
+                        </div>
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Tenant *</label>
+                            <InputSelect @bind-Value="leaseModel.TenantId" class="form-select">
+                                <option value="">Select a tenant</option>
+                                @foreach (var tenant in userTenants)
+                                {
+                                    <option value="@tenant.Id">@tenant.FullName (@tenant.Email)</option>
+                                }
+                            </InputSelect>
+                            <ValidationMessage For="() => leaseModel.TenantId" class="text-danger" />
+                        </div>
+                    </div>
+
+                    @if (selectedProperty != null)
+                    {
+                        <div class="alert alert-info">
+                            <strong>Selected Property:</strong> @selectedProperty.Address<br />
+                            <strong>Monthly Rent:</strong> @selectedProperty.MonthlyRent.ToString("C")
+                        </div>
+                    }
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Start Date *</label>
+                            <InputDate @bind-Value="leaseModel.StartDate" class="form-control" />
+                            <ValidationMessage For="() => leaseModel.StartDate" class="text-danger" />
+                        </div>
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">End Date *</label>
+                            <InputDate @bind-Value="leaseModel.EndDate" class="form-control" />
+                            <ValidationMessage For="() => leaseModel.EndDate" class="text-danger" />
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Monthly Rent *</label>
+                            <InputNumber @bind-Value="leaseModel.MonthlyRent" class="form-control" placeholder="0.00" />
+                            <ValidationMessage For="() => leaseModel.MonthlyRent" class="text-danger" />
+                        </div>
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Security Deposit</label>
+                            <InputNumber @bind-Value="leaseModel.SecurityDeposit" class="form-control" placeholder="0.00" />
+                            <ValidationMessage For="() => leaseModel.SecurityDeposit" class="text-danger" />
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Status</label>
+                            <InputSelect @bind-Value="leaseModel.Status" class="form-select">
+                                @foreach (var status in ApplicationConstants.LeaseStatuses.DefaultStatuses)
+                                {
+                                    <option value="@status">@status</option>
+                                }
+                            </InputSelect>
+                            <ValidationMessage For="() => leaseModel.Status" class="text-danger" />
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-12 mb-3">
+                            <label class="form-label">Lease Terms</label>
+                            <InputTextArea @bind-Value="leaseModel.Terms" class="form-control" rows="4" placeholder="Enter lease terms and conditions" />
+                            <ValidationMessage For="() => leaseModel.Terms" class="text-danger" />
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-12 mb-3">
+                            <label class="form-label">Notes</label>
+                            <InputTextArea @bind-Value="leaseModel.Notes" class="form-control" rows="3" placeholder="Additional notes" />
+                            <ValidationMessage For="() => leaseModel.Notes" class="text-danger" />
+                        </div>
+                    </div>
+
+                    <div class="d-flex gap-2">
+                        <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
+                            @if (isSubmitting)
+                            {
+                                <span class="spinner-border spinner-border-sm me-2" role="status"></span>
+                            }
+                            Create Lease
+                        </button>
+                        <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
+                    </div>
+                </Microsoft.AspNetCore.Components.Forms.EditForm>
+            </div>
+        </div>
+    </div>
+
+    <div class="col-md-4">
+        <div class="card">
+            <div class="card-header">
+                <h5 class="mb-0">Quick Actions</h5>
+            </div>
+            <div class="card-body">
+                <div class="d-grid gap-2">
+                    <button class="btn btn-outline-primary" @onclick="CreateTenant">
+                        <i class="bi bi-person-plus"></i> Add New Tenant
+                    </button>
+                </div>
+            </div>
+        </div>
+
+        @if (selectedProperty != null)
+        {
+            <div class="card mt-3">
+                <div class="card-header">
+                    <h5 class="mb-0">Property Details</h5>
+                </div>
+                <div class="card-body">
+                    <p><strong>Address:</strong> @selectedProperty.Address</p>
+                    <p><strong>Type:</strong> @selectedProperty.PropertyType</p>
+                    <p><strong>Bedrooms:</strong> @selectedProperty.Bedrooms</p>
+                    <p><strong>Bathrooms:</strong> @selectedProperty.Bathrooms</p>
+                    <p><strong>Square Feet:</strong> @selectedProperty.SquareFeet.ToString("N0")</p>
+                </div>
+            </div>
+        }
+    </div>
+</div>
+
+@code {
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public Guid? PropertyId { get; set; }
+
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public Guid? TenantId { get; set; }
+
+    private LeaseModel leaseModel = new();
+    private List<Property> availableProperties = new();
+    private List<Tenant> userTenants = new();
+    private Property? selectedProperty;
+    private bool isSubmitting = false;
+    private string errorMessage = string.Empty;
+
+        [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadData();
+        
+        // If PropertyId is provided in query string, pre-select it
+        if (PropertyId.HasValue)
+        {
+            leaseModel.PropertyId = PropertyId.Value;
+            await OnPropertyChanged();
+        }
+        
+        // If TenantId is provided in query string, pre-select it
+        if (TenantId.HasValue)
+        {
+            leaseModel.TenantId = TenantId.Value;
+        }
+    }
+
+    private async Task LoadData()
+    {
+        var authState = await AuthenticationStateTask;
+        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+
+        if (string.IsNullOrEmpty(userId))
+            return;
+
+        // Load available properties (only available ones)
+        List<Property>? allProperties = await PropertyService.GetAllAsync();
+
+        availableProperties = allProperties
+            .Where(p => p.IsAvailable)
+            .ToList() ?? new List<Property>();
+
+        // Load user's tenants
+        userTenants = await TenantService.GetAllAsync();
+        userTenants = userTenants
+            .Where(t => t.IsActive)
+            .ToList();
+
+        // Set default values
+        leaseModel.StartDate = DateTime.Today;
+        leaseModel.EndDate = DateTime.Today.AddYears(1);
+        leaseModel.Status = ApplicationConstants.LeaseStatuses.Active;
+    }
+
+    private async Task OnPropertyChanged()
+    {
+        if (leaseModel.PropertyId != Guid.Empty)
+        {
+            selectedProperty = availableProperties.FirstOrDefault(p => p.Id == leaseModel.PropertyId);
+            if (selectedProperty != null)
+            {
+                // Get organization settings for security deposit calculation
+                var settings = await OrganizationService.GetOrganizationSettingsAsync();
+                var depositMultiplier = settings?.AutoCalculateSecurityDeposit == true 
+                    ? settings.SecurityDepositMultiplier 
+                    : 1.0m;
+
+                leaseModel.PropertyAddress = selectedProperty.Address;
+                leaseModel.MonthlyRent = selectedProperty.MonthlyRent;
+                leaseModel.SecurityDeposit = selectedProperty.MonthlyRent * depositMultiplier;
+            }
+        }
+        else
+        {
+            selectedProperty = null;
+        }
+        StateHasChanged();
+    }
+
+    private async Task HandleValidSubmit()
+    {
+        try
+        {
+            isSubmitting = true;
+            errorMessage = string.Empty;
+
+            var authState = await AuthenticationStateTask;
+            var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+
+            if (string.IsNullOrEmpty(userId))
+            {
+                errorMessage = "User not authenticated.";
+                return;
+            }
+
+            // Verify property and tenant belong to user
+            var property = await PropertyService.GetByIdAsync(leaseModel.PropertyId);
+            var tenant = await TenantService.GetByIdAsync(leaseModel.TenantId);
+
+            if (property == null)
+            {
+                errorMessage = $"Property with ID {leaseModel.PropertyId} not found or access denied.";
+                return;
+            }
+
+            if (tenant == null)
+            {
+                errorMessage = $"Tenant with ID {leaseModel.TenantId} not found or access denied.";
+                return;
+            }
+
+            var lease = new Lease
+            {
+                
+                PropertyId = leaseModel.PropertyId,
+                TenantId = leaseModel.TenantId,
+                StartDate = leaseModel.StartDate,
+                EndDate = leaseModel.EndDate,
+                MonthlyRent = leaseModel.MonthlyRent,
+                SecurityDeposit = leaseModel.SecurityDeposit,
+                Status = leaseModel.Status,
+                Terms = leaseModel.Terms,
+                Notes = leaseModel.Notes
+            };
+
+            await LeaseService.CreateAsync(lease);
+
+            // Mark property as unavailable if lease is active
+            if (leaseModel.Status == ApplicationConstants.LeaseStatuses.Active)
+            {
+                property.IsAvailable = false;
+            }
+
+            await PropertyService.UpdateAsync(property);
+
+            Navigation.NavigateTo("/propertymanagement/properties/" + leaseModel.PropertyId);
+        }
+        catch (Exception ex)
+        {
+            errorMessage = $"Error creating lease: {ex.Message}";
+            if (ex.InnerException != null)
+            {
+                errorMessage += $" Inner Exception: {ex.InnerException.Message}";
+            }
+        }
+        finally
+        {
+            isSubmitting = false;
+        }
+    }
+
+    private void CreateTenant()
+    {
+        Navigation.NavigateTo("/propertymanagement/tenants/create/?PropertyId=" + leaseModel.PropertyId);
+    }
+
+    private void Cancel()
+    {
+        Navigation.NavigateTo("/propertymanagement/properties/" + leaseModel.PropertyId);
+    }
+
+    public class LeaseModel
+    {
+        [RequiredGuid(ErrorMessage = "Property is required")]
+        public Guid PropertyId { get; set; }
+
+        public string PropertyAddress { get; set; } = string.Empty;
+
+        [RequiredGuid(ErrorMessage = "Tenant is required")]
+        public Guid TenantId { get; set; }
+
+        [Required(ErrorMessage = "Start date is required")]
+        public DateTime StartDate { get; set; } = DateTime.Today;
+
+        [Required(ErrorMessage = "End date is required")]
+        public DateTime EndDate { get; set; } = DateTime.Today.AddYears(1);
+
+        [Required(ErrorMessage = "Monthly rent is required")]
+        [Range(0.01, double.MaxValue, ErrorMessage = "Monthly rent must be greater than 0")]
+        public decimal MonthlyRent { get; set; }
+
+        [Range(0, double.MaxValue, ErrorMessage = "Security deposit cannot be negative")]
+        public decimal SecurityDeposit { get; set; }
+
+        [Required(ErrorMessage = "Status is required")]
+        [StringLength(50)]
+        public string Status { get; set; } = ApplicationConstants.LeaseStatuses.Active;
+
+        [StringLength(1000, ErrorMessage = "Terms cannot exceed 1000 characters")]
+        public string Terms { get; set; } = string.Empty;
+
+        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
+        public string Notes { get; set; } = string.Empty;
+    }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Leases/EditForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Leases/EditForm.razor
new file mode 100644
index 0000000..aec1bd3
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Leases/EditForm.razor
@@ -0,0 +1,346 @@
+@using Aquiis.Core.Entities
+@using Aquiis.Application.Services
+@using Microsoft.AspNetCore.Components.Authorization
+@using System.ComponentModel.DataAnnotations
+@inject NavigationManager Navigation
+@inject LeaseService LeaseService
+@rendermode InteractiveServer
+
+
+@if (lease == null)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else if (!isAuthorized)
+{
+    <div class="alert alert-danger">
+        <h4>Access Denied</h4>
+        <p>You don't have permission to edit this lease.</p>
+        <a href="/leases" class="btn btn-primary">Back to Leases</a>
+    </div>
+}
+else
+{
+    <div class="row">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">
+                    <h3 class="card-title mb-0">Edit Lease</h3>
+                </div>
+                <div class="card-body">
+                    <Microsoft.AspNetCore.Components.Forms.EditForm Model="leaseModel" OnValidSubmit="UpdateLease" FormName="edit-lease">
+                        <DataAnnotationsValidator />
+                        
+                        @if (!string.IsNullOrEmpty(errorMessage))
+                        {
+                            <div class="alert alert-danger" role="alert">
+                                @errorMessage
+                            </div>
+                        }
+
+                        @if (!string.IsNullOrEmpty(successMessage))
+                        {
+                            <div class="alert alert-success" role="alert">
+                                @successMessage
+                            </div>
+                        }
+
+                        <div class="row">
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">Property</label>
+                                <input type="text" class="form-control" value="@lease.Property?.Address" readonly />
+                                <small class="text-muted">Property cannot be changed for existing lease</small>
+                            </div>
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">Tenant</label>
+                                <input type="text" class="form-control" value="@lease.Tenant?.FullName" readonly />
+                                <small class="text-muted">Tenant cannot be changed for existing lease</small>
+                            </div>
+                        </div>
+
+                        <div class="row">
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">Start Date *</label>
+                                <InputDate @bind-Value="leaseModel.StartDate" class="form-control" />
+                                <ValidationMessage For="() => leaseModel.StartDate" class="text-danger" />
+                            </div>
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">End Date *</label>
+                                <InputDate @bind-Value="leaseModel.EndDate" class="form-control" />
+                                <ValidationMessage For="() => leaseModel.EndDate" class="text-danger" />
+                            </div>
+                        </div>
+
+                        <div class="row">
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">Monthly Rent *</label>
+                                <InputNumber @bind-Value="leaseModel.MonthlyRent" class="form-control" placeholder="0.00" />
+                                <ValidationMessage For="() => leaseModel.MonthlyRent" class="text-danger" />
+                            </div>
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">Security Deposit</label>
+                                <InputNumber @bind-Value="leaseModel.SecurityDeposit" class="form-control" placeholder="0.00" />
+                                <ValidationMessage For="() => leaseModel.SecurityDeposit" class="text-danger" />
+                            </div>
+                        </div>
+
+                        <div class="row">
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">Status *</label>
+                                <InputSelect @bind-Value="leaseModel.Status" class="form-select" @onchange="OnStatusChanged">
+                                    <option value="Active">Active</option>
+                                    <option value="Pending">Pending</option>
+                                    <option value="Expired">Expired</option>
+                                    <option value="Terminated">Terminated</option>
+                                </InputSelect>
+                                <ValidationMessage For="() => leaseModel.Status" class="text-danger" />
+                            </div>
+                        </div>
+
+                        <div class="row">
+                            <div class="col-md-12 mb-3">
+                                <label class="form-label">Lease Terms</label>
+                                <InputTextArea @bind-Value="leaseModel.Terms" class="form-control" rows="4" placeholder="Enter lease terms and conditions" />
+                                <ValidationMessage For="() => leaseModel.Terms" class="text-danger" />
+                            </div>
+                        </div>
+
+                        @* NotesTimeline removed - product-specific component *@
+
+                        <div class="d-flex gap-2">
+                            <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
+                                @if (isSubmitting)
+                                {
+                                    <span class="spinner-border spinner-border-sm me-2" role="status"></span>
+                                }
+                                Update Lease
+                            </button>
+                            <button type="button" class="btn btn-secondary" @onclick="ViewLease">View Lease</button>
+                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
+                        </div>
+                    </Microsoft.AspNetCore.Components.Forms.EditForm>
+                </div>
+            </div>
+        </div>
+
+        <div class="col-md-4">
+            <div class="card">
+                <div class="card-header">
+                    <h5 class="mb-0">Lease Actions</h5>
+                </div>
+                <div class="card-body">
+                    <div class="d-grid gap-2">
+                        <button class="btn btn-outline-primary" @onclick="ViewLease">
+                            <i class="bi bi-eye"></i> View Lease
+                        </button>
+                        <button class="btn btn-outline-success" @onclick="CreateInvoice">
+                            <i class="bi bi-receipt"></i> Create Invoice
+                        </button>
+                        <button class="btn btn-outline-danger" @onclick="DeleteLease">
+                            <i class="bi bi-trash"></i> Delete Lease
+                        </button>
+                    </div>
+                </div>
+            </div>
+
+            <div class="card mt-3">
+                <div class="card-header">
+                    <h5 class="mb-0">Lease Information</h5>
+                </div>
+                <div class="card-body">
+                    <small class="text-muted">
+                        <strong>Created:</strong> @lease.CreatedOn.ToString("MMMM dd, yyyy")
+                        <br />
+                        @if (lease.LastModifiedOn.HasValue)
+                        {
+                            <strong>Last Modified:</strong> @lease.LastModifiedOn.Value.ToString("MMMM dd, yyyy")
+                        }
+                    </small>
+                </div>
+            </div>
+
+            @if (statusChangeWarning)
+            {
+                <div class="card mt-3">
+                    <div class="card-body">
+                        <div class="alert alert-warning">
+                            <i class="bi bi-exclamation-triangle"></i>
+                            <strong>Note:</strong> Changing the lease status may affect property availability.
+                        </div>
+                    </div>
+                </div>
+            }
+        </div>
+    </div>
+}
+
+@code {
+    [Parameter] public Guid LeaseId { get; set; }
+    
+    private Lease? lease;
+    private LeaseModel leaseModel = new();
+    private bool isSubmitting = false;
+    private bool isAuthorized = true;
+    private bool statusChangeWarning = false;
+    private string errorMessage = string.Empty;
+    private string successMessage = string.Empty;
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadLease();
+    }
+
+    private async Task LoadLease()
+    {
+        lease = await LeaseService.GetByIdAsync(LeaseId);
+
+        if (lease == null)
+        {
+            isAuthorized = false;
+            return;
+        }
+
+        // Map lease to model
+        leaseModel = new LeaseModel
+        {
+            StartDate = lease.StartDate,
+            EndDate = lease.EndDate,
+            MonthlyRent = lease.MonthlyRent,
+            SecurityDeposit = lease.SecurityDeposit,
+            Status = lease.Status,
+            Terms = lease.Terms,
+        };
+    }
+
+    private async Task UpdateLease()
+    {
+        try
+        {
+            isSubmitting = true;
+            errorMessage = string.Empty;
+            successMessage = string.Empty;
+
+            var oldStatus = lease!.Status;
+
+            // Update lease with form data
+            lease.StartDate = leaseModel.StartDate;
+            lease.EndDate = leaseModel.EndDate;
+            lease.MonthlyRent = leaseModel.MonthlyRent;
+            lease.SecurityDeposit = leaseModel.SecurityDeposit;
+            lease.Status = leaseModel.Status;
+            lease.Terms = leaseModel.Terms;
+            
+            // Update property availability based on lease status change
+            if (lease.Property != null && oldStatus != leaseModel.Status)
+            {
+                if (leaseModel.Status == "Active")
+                {
+                    lease.Property.IsAvailable = false;
+                }
+                else if (oldStatus == "Active" && leaseModel.Status != "Active")
+                {
+                    // Check if there are other active leases for this property
+                    var activeLeases = await LeaseService.GetActiveLeasesByPropertyIdAsync(lease.PropertyId);
+                    var otherActiveLeases = activeLeases.Any(l => l.PropertyId == lease.PropertyId && l.Id != LeaseId && l.Status == "Active");
+                    
+                    if (!otherActiveLeases)
+                    {
+                        lease.Property.IsAvailable = true;
+                    }
+                }
+            }
+
+            await LeaseService.UpdateAsync(lease);
+            successMessage = "Lease updated successfully!";
+            statusChangeWarning = false;
+        }
+        catch (Exception ex)
+        {
+            errorMessage = $"Error updating lease: {ex.Message}";
+        }
+        finally
+        {
+            isSubmitting = false;
+        }
+    }
+
+    private void OnStatusChanged()
+    {
+        statusChangeWarning = true;
+        StateHasChanged();
+    }
+
+    private void ViewLease()
+    {
+        Navigation.NavigateTo($"/propertymanagement/leases/{LeaseId}");
+    }
+
+    private void CreateInvoice()
+    {
+        Navigation.NavigateTo($"/propertymanagement/invoices/create?leaseId={LeaseId}");
+    }
+
+    private void Cancel()
+    {
+        Navigation.NavigateTo("/propertymanagement/leases");
+    }
+
+    private async Task DeleteLease()
+    {
+        if (lease != null)
+        {
+            try
+            {
+                // If deleting an active lease, make property available
+                if (lease.Status == "Active" && lease.Property != null)
+                {
+                    var otherActiveLeases = await LeaseService.GetActiveLeasesByPropertyIdAsync(lease.PropertyId);
+                    var otherActiveLeasesExist = otherActiveLeases.Any(l => l.Id != LeaseId && l.Status == "Active");
+
+                    if (!otherActiveLeasesExist)
+                    {
+                        lease.Property.IsAvailable = true;
+                    }
+                }
+    
+                await LeaseService.DeleteAsync(lease.Id);
+                Navigation.NavigateTo("/propertymanagement/leases");
+            }
+            catch (Exception ex)
+            {
+                errorMessage = $"Error deleting lease: {ex.Message}";
+            }
+        }
+    }
+
+    public class LeaseModel
+    {
+        [Required(ErrorMessage = "Start date is required")]
+        public DateTime StartDate { get; set; } = DateTime.Today;
+
+        [Required(ErrorMessage = "End date is required")]
+        public DateTime EndDate { get; set; } = DateTime.Today.AddYears(1);
+
+        [Required(ErrorMessage = "Monthly rent is required")]
+        [Range(0.01, double.MaxValue, ErrorMessage = "Monthly rent must be greater than 0")]
+        public decimal MonthlyRent { get; set; }
+
+        [Range(0.00, double.MaxValue, ErrorMessage = "Security deposit cannot be negative")]
+        public decimal SecurityDeposit { get; set; }
+
+        [Required(ErrorMessage = "Status is required")]
+        [StringLength(50)]
+        public string Status { get; set; } = "Active";
+
+        [StringLength(5000, ErrorMessage = "Terms cannot exceed 2000 characters")]
+        public string Terms { get; set; } = string.Empty;
+
+    }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Leases/ListForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Leases/ListForm.razor
new file mode 100644
index 0000000..bf70533
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Leases/ListForm.razor
@@ -0,0 +1,536 @@
+@using Microsoft.AspNetCore.Components.Authorization
+@using Aquiis.Core.Entities
+@using Aquiis.Application.Services
+@using Aquiis.UI.Shared.Components.Entities.Leases
+@inject NavigationManager NavigationManager
+@inject LeaseService LeaseService
+@inject TenantService TenantService
+@inject PropertyService PropertyService
+@inject IJSRuntime JSRuntime
+@rendermode InteractiveServer
+
+<div class="d-flex justify-content-between align-items-center mb-4">
+    <div>
+        <h1><span class="bi bi-file-earmark-text-fill" aria-hidden="true"></span> Leases</h1>
+        @if (filterTenant != null)
+        {
+            <p class="text-muted mb-0">
+                Showing leases for tenant: <strong>@filterTenant.FullName</strong>
+                <button class="btn btn-sm btn-outline-secondary ms-2" @onclick="ClearFilter">
+                    <i class="bi bi-x"></i> Clear Filter
+                </button>
+            </p>
+        }
+        else if (filterProperty != null)
+        {
+            <p class="text-muted mb-0">
+                Showing leases for property: <strong>@filterProperty.Address</strong>
+                <button class="btn btn-sm btn-outline-secondary ms-2" @onclick="ClearFilter">
+                    <i class="bi bi-x"></i> Clear Filter
+                </button>
+            </p>
+        }
+    </div>
+    <div class="btn-group">
+        <button class="btn btn-outline-info" @onclick="ViewLeaseOffers">
+            <i class="bi bi-file-earmark-check"></i> View Lease Offers
+        </button>
+        <button class="btn btn-primary" @onclick="CreateLease">
+            <i class="bi bi-plus-lg"></i> Add Lease
+        </button>
+        @if (filterTenant != null)
+        {
+            <button class="btn btn-outline-success" @onclick="CreateLeaseForTenant">
+                <i class="bi bi-plus-lg"></i> Add Lease for @filterTenant.FullName
+            </button>
+        }
+        else if (filterProperty != null)
+        {
+            <button class="btn btn-outline-success" @onclick="CreateLeaseForProperty">
+                <i class="bi bi-plus-lg"></i> Add Lease for This Property
+            </button>
+        }
+    </div>
+</div>
+
+@if (leases == null)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else if (!leases.Any())
+{
+    <div class="alert alert-info">
+        @if (filterTenant != null)
+        {
+            <h4>No Leases Found for @filterTenant.FullName</h4>
+            <p>This tenant doesn't have any lease agreements yet.</p>
+            <button class="btn btn-primary" @onclick="CreateLeaseForTenant">Create First Lease for @filterTenant.FullName</button>
+            <button class="btn btn-outline-secondary ms-2" @onclick="ClearFilter">View All Leases</button>
+        }
+        else if (filterProperty != null)
+        {
+            <h4>No Leases Found for @filterProperty.Address</h4>
+            <p>This property doesn't have any lease agreements yet.</p>
+            <button class="btn btn-primary" @onclick="CreateLeaseForProperty">Create First Lease for This Property</button>
+            <button class="btn btn-outline-secondary ms-2" @onclick="ClearFilter">View All Leases</button>
+        }
+        else
+        {
+            <h4>No Leases Found</h4>
+            <p>Get started by converting a lease offer to your first lease agreement.</p>
+            <button class="btn btn-primary" @onclick="CreateLease">Create First Lease</button>
+        }
+    </div>
+}
+else
+{
+    <LeaseListView 
+        Leases="@(groupByProperty ? filteredLeases : pagedLeases)"
+        GroupedLeases="@groupedLeases"
+        AvailableTenants="@(availableTenants ?? new())"
+        ExpandedProperties="@expandedProperties"
+        GroupByProperty="@groupByProperty"
+        ShowMetrics="true"
+        ShowActions="true"
+        ShowEditDelete="true"
+        SearchTerm="@searchTerm"
+        StatusFilter="@selectedLeaseStatus"
+        TenantFilter="@(selectedTenantId?.ToString() ?? string.Empty)"
+        SortColumn="@sortColumn"
+        SortAscending="@sortAscending"
+        ActiveCount="@activeCount"
+        ExpiringSoonCount="@expiringSoonCount"
+        TotalMonthlyRent="@totalMonthlyRent"
+        OnSearchChanged="@HandleSearchChanged"
+        OnStatusFilterChanged="@HandleStatusFilterChanged"
+        OnTenantFilterChanged="@HandleTenantFilterChanged"
+        OnGroupByPropertyChanged="@HandleGroupByPropertyChanged"
+        OnSort="@HandleSort"
+        OnTogglePropertyGroup="@HandleTogglePropertyGroup"
+        OnView="@HandleView"
+        OnEdit="@HandleEdit"
+        OnDelete="@HandleDelete" />
+    
+    @if (totalPages > 1 && !groupByProperty)
+    {
+        <div class="card-footer">
+            <nav aria-label="Leases pagination">
+                <div class="d-flex justify-content-between align-items-center">
+                    <div>
+                        Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords leases
+                    </div>
+                    <div class="d-flex align-items-center">
+                        <label class="me-2">Page size:</label>
+                        <select class="form-select form-select-sm me-3" style="width: auto;" @bind="pageSize" @bind:after="() => { currentPage = 1; FilterLeases(); }">
+                            <option value="5">5</option>
+                            <option value="10">10</option>
+                            <option value="25">25</option>
+                            <option value="50">50</option>
+                        </select>
+                        <ul class="pagination pagination-sm mb-0">
+                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
+                                <button class="page-link" @onclick="() => GoToPage(1)" disabled="@(currentPage == 1)">First</button>
+                            </li>
+                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
+                                <button class="page-link" @onclick="() => GoToPage(currentPage - 1)" disabled="@(currentPage == 1)">Previous</button>
+                            </li>
+                            @for (int pageNum = Math.Max(1, currentPage - 2); pageNum <= Math.Min(totalPages, currentPage + 2); pageNum++)
+                            {
+                                var pageNumber = pageNum;
+                                <li class="page-item @(currentPage == pageNumber ? "active" : "")">
+                                    <button class="page-link" @onclick="() => GoToPage(pageNumber)">@pageNumber</button>
+                                </li>
+                            }
+                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
+                                <button class="page-link" @onclick="() => GoToPage(currentPage + 1)" disabled="@(currentPage == totalPages)">Next</button>
+                            </li>
+                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
+                                <button class="page-link" @onclick="() => GoToPage(totalPages)" disabled="@(currentPage == totalPages)">Last</button>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </nav>
+        </div>
+    }
+}
+
+@code {
+    private List<Lease>? leases;
+    private List<Lease> filteredLeases = new();
+    private List<Lease> pagedLeases = new();
+    private IEnumerable<IGrouping<Guid, Lease>> groupedLeases = Enumerable.Empty<IGrouping<Guid, Lease>>();
+    private HashSet<int> expandedProperties = new();
+    private string searchTerm = string.Empty;
+    private string selectedLeaseStatus = string.Empty;
+    private Guid? selectedTenantId;
+    private List<Tenant>? availableTenants;
+    private int activeCount = 0;
+    private int expiringSoonCount = 0;
+    private decimal totalMonthlyRent = 0;
+    private Tenant? filterTenant;
+    private Property? filterProperty;
+    private bool groupByProperty = true;
+    
+    // Paging variables
+    private int currentPage = 1;
+    private int pageSize = 10;
+    private int totalPages = 1;
+    private int totalRecords = 0;
+    
+    // Sorting variables
+    private string sortColumn = "StartDate";
+    private bool sortAscending = false;
+
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public Guid? TenantId { get; set; }
+
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public Guid? PropertyId { get; set; }
+
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public int? LeaseId { get; set; }
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadFilterEntities();
+        await LoadLeases();
+        LoadFilterOptions();
+        FilterLeases();
+        CalculateMetrics();
+    }
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender && LeaseId.HasValue)
+        {
+            await JSRuntime.InvokeVoidAsync("scrollToElement", $"lease-{LeaseId.Value}");
+        }
+    }
+
+    protected override async Task OnParametersSetAsync()
+    {
+        await LoadFilterEntities();
+        await LoadLeases();
+        LoadFilterOptions();
+        FilterLeases();
+        CalculateMetrics();
+        StateHasChanged();
+    }
+
+    private async Task LoadFilterEntities()
+    {
+        var authState = await AuthenticationStateTask;
+        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+        
+        if (string.IsNullOrEmpty(userId)) return;
+
+        if (TenantId.HasValue)
+        {
+            filterTenant = await TenantService.GetByIdAsync(TenantId.Value);
+        }
+
+        if (PropertyId.HasValue)
+        {
+            filterProperty = await PropertyService.GetByIdAsync(PropertyId.Value);
+        }
+    }
+
+    private async Task LoadLeases()
+    {
+        var authState = await AuthenticationStateTask;
+        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+        
+        if (string.IsNullOrEmpty(userId))
+        {
+            leases = new List<Lease>();
+            return;
+        }
+
+        var     allLeases = await LeaseService.GetAllAsync();
+        leases = allLeases
+            .Where(l => 
+                   (!TenantId.HasValue || l.TenantId == TenantId.Value) &&
+                   (!PropertyId.HasValue || l.PropertyId == PropertyId.Value))
+            .OrderByDescending(l => l.StartDate)
+            .ToList();
+    }
+
+    private void LoadFilterOptions()
+    {
+        if (leases != null)
+        {
+            // Load available tenants from leases
+            availableTenants = leases
+                .Where(l => l.Tenant != null)
+                .Select(l => l.Tenant!)
+                .DistinctBy(t => t.Id)
+                .OrderBy(t => t.FirstName)
+                .ThenBy(t => t.LastName)
+                .ToList();
+        }
+    }
+
+    private void FilterLeases()
+    {
+        if (leases == null)
+        {
+            filteredLeases = new();
+            pagedLeases = new();
+            CalculateMetrics();
+            return;
+        }
+
+        filteredLeases = leases.Where(l =>
+            (string.IsNullOrEmpty(searchTerm) ||
+             l.Property?.Address.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) == true ||
+             (l.Tenant != null && l.Tenant.FullName.Contains(searchTerm, StringComparison.OrdinalIgnoreCase)) ||
+             l.Notes.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
+             l.Terms.Contains(searchTerm, StringComparison.OrdinalIgnoreCase)) &&
+            (string.IsNullOrEmpty(selectedLeaseStatus) || l.Status == selectedLeaseStatus) &&
+            (!selectedTenantId.HasValue || l.TenantId == selectedTenantId.Value)
+        ).ToList();
+        
+        // Apply sorting
+        ApplySorting();
+        
+        if (groupByProperty)
+        {
+            groupedLeases = filteredLeases
+                .Where(l => l.PropertyId != Guid.Empty)
+                .GroupBy(l => l.PropertyId)
+                .OrderBy(g => g.First().Property?.Address)
+                .ToList();
+        }
+        else
+        {
+            // Apply paging
+            totalRecords = filteredLeases.Count;
+            totalPages = (int)Math.Ceiling((double)totalRecords / pageSize);
+            if (currentPage > totalPages) currentPage = Math.Max(1, totalPages);
+            
+            pagedLeases = filteredLeases
+                .Skip((currentPage - 1) * pageSize)
+                .Take(pageSize)
+                .ToList();
+        }
+        
+        CalculateMetrics();
+    }
+    
+    // Event handlers for LeaseListView component
+    private async Task HandleSearchChanged(string value)
+    {
+        searchTerm = value;
+        FilterLeases();
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleStatusFilterChanged(string value)
+    {
+        selectedLeaseStatus = value;
+        FilterLeases();
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleTenantFilterChanged(string value)
+    {
+        selectedTenantId = string.IsNullOrEmpty(value) ? null : Guid.Parse(value);
+        FilterLeases();
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleGroupByPropertyChanged(bool value)
+    {
+        groupByProperty = value;
+        FilterLeases();
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleSort((string Column, bool Ascending) sort)
+    {
+        sortColumn = sort.Column;
+        sortAscending = sort.Ascending;
+        currentPage = 1;
+        FilterLeases();
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleTogglePropertyGroup(Guid propertyId)
+    {
+        TogglePropertyGroup(propertyId);
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleView(Guid leaseId)
+    {
+        ViewLease(leaseId);
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleEdit(Guid leaseId)
+    {
+        EditLease(leaseId);
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleDelete(Guid leaseId)
+    {
+        await DeleteLease(leaseId);
+    }
+    
+    private void TogglePropertyGroup(Guid propertyId)
+    {
+        if (expandedProperties.Contains(propertyId.GetHashCode()))
+        {
+            expandedProperties.Remove(propertyId.GetHashCode());
+        }
+        else
+        {
+            expandedProperties.Add(propertyId.GetHashCode());
+        }
+    }
+    
+    private void ApplySorting()
+    {
+        filteredLeases = sortColumn switch
+        {
+            "Property" => sortAscending
+                ? filteredLeases.OrderBy(l => l.Property?.Address).ToList()
+                : filteredLeases.OrderByDescending(l => l.Property?.Address).ToList(),
+            "Tenant" => sortAscending
+                ? filteredLeases.OrderBy(l => l.Tenant?.FullName).ToList()
+                : filteredLeases.OrderByDescending(l => l.Tenant?.FullName).ToList(),
+            _ => filteredLeases
+        };
+    }
+    
+    private void GoToPage(int page)
+    {
+        if (page >= 1 && page <= totalPages)
+        {
+            currentPage = page;
+            FilterLeases();
+        }
+    }
+
+    private void CalculateMetrics()
+    {
+        if (filteredLeases != null && filteredLeases.Any())
+        {
+            activeCount = filteredLeases.Count(l => l.Status == "Active");
+            
+            // Expiring within 30 days
+            var thirtyDaysFromNow = DateTime.Now.AddDays(30);
+            expiringSoonCount = filteredLeases.Count(l => 
+                l.Status == "Active" && l.EndDate <= thirtyDaysFromNow);
+            
+            totalMonthlyRent = filteredLeases
+                .Where(l => l.Status == "Active")
+                .Sum(l => l.MonthlyRent);
+        }
+        else
+        {
+            activeCount = 0;
+            expiringSoonCount = 0;
+            totalMonthlyRent = 0;
+        }
+    }
+
+    private string GetStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            "Active" => "bg-success",
+            "Pending" => "bg-info",
+            "Expired" => "bg-warning",
+            "Terminated" => "bg-danger",
+            _ => "bg-secondary"
+        };
+    }
+
+    private void ViewLeaseOffers()
+    {
+        NavigationManager.NavigateTo("/propertymanagement/leaseoffers");
+    }
+
+    private void CreateLease()
+    {
+        NavigationManager.NavigateTo("/propertymanagement/leaseoffers");
+    }
+
+    private void CreateLeaseForTenant()
+    {
+        @* if (TenantId.HasValue)
+        {
+            NavigationManager.NavigateTo($"/propertymanagement/leases/create?tenantId={TenantId.Value}");
+        }
+        else
+        {
+            NavigationManager.NavigateTo("/propertymanagement/leases/create");
+        } *@
+        NavigationManager.NavigateTo("/propertymanagement/leaseoffers");
+    }
+
+    private void CreateLeaseForProperty()
+    {
+        @* if (PropertyId.HasValue)
+        {
+            NavigationManager.NavigateTo($"/propertymanagement/leases/create?propertyId={PropertyId.Value}");
+        }
+        else
+        {
+            NavigationManager.NavigateTo("/propertymanagement/leases/create");
+        } *@
+        NavigationManager.NavigateTo("/propertymanagement/leaseoffers");
+    }
+
+    private void ClearFilter()
+    {
+        TenantId = null;
+        PropertyId = null;
+        filterTenant = null;
+        filterProperty = null;
+        selectedLeaseStatus = string.Empty;
+        selectedTenantId = null;
+        searchTerm = string.Empty;
+        NavigationManager.NavigateTo("/propertymanagement/leases", forceLoad: true);
+    }
+
+    private void ViewLease(Guid id)
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/leases/{id}");
+    }
+
+    private void EditLease(Guid id)
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/leases/{id}/edit");
+    }
+
+    private async Task DeleteLease(Guid id)
+    {
+        var authState = await AuthenticationStateTask;
+        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+        
+        if (string.IsNullOrEmpty(userId))
+            return;
+
+        // Add confirmation dialog in a real application
+        var confirmed = await JSRuntime.InvokeAsync<bool>("confirm", $"Are you sure you want to delete lease {id}?");
+        if (!confirmed)
+            return;
+
+        await LeaseService.DeleteAsync(id);
+        await LoadLeases();
+    }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Leases/ViewForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Leases/ViewForm.razor
new file mode 100644
index 0000000..9728429
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Leases/ViewForm.razor
@@ -0,0 +1,1255 @@
+@using Aquiis.Core.Entities
+@using Aquiis.Core.Validation
+@using Aquiis.Application.Services
+@using Aquiis.Application.Services.Workflows
+@using Aquiis.Application.Services.PdfGenerators
+@using Aquiis.UI.Shared.Components.Entities.Leases
+@using Microsoft.AspNetCore.Components.Authorization
+@using System.ComponentModel.DataAnnotations
+@inject NavigationManager Navigation
+@inject LeaseService LeaseService
+@inject InvoiceService InvoiceService
+@inject DocumentService DocumentService
+@inject LeaseWorkflowService LeaseWorkflowService
+@inject LeaseRenewalPdfGenerator RenewalPdfGenerator
+@inject OrganizationService OrganizationService
+@inject IJSRuntime JSRuntime
+@rendermode InteractiveServer
+
+@if (lease == null)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else if (!isAuthorized)
+{
+    <div class="alert alert-danger">
+        <h4>Access Denied</h4>
+        <p>You don't have permission to view this lease.</p>
+        <a href="/propertymanagement/leases" class="btn btn-primary">Back to Leases</a>
+    </div>
+}
+else
+{
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <h1>Lease Details</h1>
+        <div class="btn-group">
+            <button class="btn btn-primary" @onclick="EditLease">
+                <i class="bi bi-pencil"></i> Edit
+            </button>
+            <button class="btn btn-secondary" @onclick="BackToProperty">
+                <i class="bi bi-arrow-left"></i> Back to Property
+            </button>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header d-flex justify-content-between align-items-center">
+                    <h5 class="mb-0">Lease Information</h5>
+                    <span class="badge @GetStatusBadgeClass(lease.Status)">
+                        @lease.Status
+                    </span>
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <strong>Property:</strong>
+                            <p>@lease.Property?.Address</p>
+                            <small class="text-muted">@lease.Property?.City, @lease.Property?.State</small>
+                        </div>
+                        <div class="col-md-6 mb-3">
+                            <strong>Tenant:</strong>
+                            @if (lease.Tenant != null)
+                            {
+                                <p>@lease.Tenant.FullName</p>
+                                <small class="text-muted">@lease.Tenant.Email</small>
+                            }
+                            else
+                            {
+                                <p class="text-warning"><i class="bi bi-hourglass-split"></i> Lease Offer - Awaiting Acceptance</p>
+                                <small class="text-muted">Tenant will be assigned upon acceptance</small>
+                            }
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <strong>Start Date:</strong>
+                            <p>@lease.StartDate.ToString("MMMM dd, yyyy")</p>
+                        </div>
+                        <div class="col-md-6 mb-3">
+                            <strong>End Date:</strong>
+                            <p>@lease.EndDate.ToString("MMMM dd, yyyy")</p>
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <strong>Monthly Rent:</strong>
+                            <p class="text-success fw-bold">@lease.MonthlyRent.ToString("C")</p>
+                        </div>
+                        <div class="col-md-6 mb-3">
+                            <strong>Security Deposit:</strong>
+                            <p>@lease.SecurityDeposit.ToString("C")</p>
+                        </div>
+                    </div>
+
+                    @if (!string.IsNullOrEmpty(lease.Terms))
+                    {
+                        <div class="row">
+                            <div class="col-md-12 mb-3">
+                                <strong>Lease Terms:</strong>
+                                <p>@lease.Terms</p>
+                            </div>
+                        </div>
+                    }
+
+                    @if (!string.IsNullOrEmpty(lease.Notes))
+                    {
+                        <div class="row">
+                            <div class="col-md-12 mb-3">
+                                <strong>Notes:</strong>
+                                <p>@lease.Notes</p>
+                            </div>
+                        </div>
+                    }
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <strong>Created:</strong>
+                            <p>@lease.CreatedOn.ToString("MMMM dd, yyyy")</p>
+                        </div>
+                        @if (lease.LastModifiedOn.HasValue)
+                        {
+                            <div class="col-md-6 mb-3">
+                                <strong>Last Modified:</strong>
+                                <p>@lease.LastModifiedOn.Value.ToString("MMMM dd, yyyy")</p>
+                            </div>
+                        }
+                    </div>
+
+                    @if (lease.IsActive)
+                    {
+                        <div class="row">
+                            <div class="col-md-12">
+                                <div class="alert alert-info">
+                                    <i class="bi bi-info-circle"></i>
+                                    <strong>Active Lease:</strong> This lease is currently active with @lease.DaysRemaining days remaining.
+                                </div>
+                            </div>
+                        </div>
+                    }
+                </div>
+            </div>
+        </div>
+
+        <div class="col-md-4">
+            @if (lease.IsExpiringSoon)
+            {
+                <div class="card border-warning mb-3">
+                    <div class="card-header bg-warning text-dark">
+                        <h5 class="mb-0">
+                            <i class="bi bi-exclamation-triangle-fill"></i> Renewal Alert
+                        </h5>
+                    </div>
+                    <div class="card-body">
+                        <p class="mb-2">
+                            <strong>Expires in:</strong> 
+                            <span class="text-danger fw-bold">@lease.DaysRemaining days</span>
+                        </p>
+                        <p class="mb-2">
+                            <strong>End Date:</strong> @lease.EndDate.ToString("MMM dd, yyyy")
+                        </p>
+                        
+                        @if (!string.IsNullOrEmpty(lease.RenewalStatus))
+                        {
+                            <p class="mb-2">
+                                <strong>Status:</strong> 
+                                <span class="badge bg-@GetRenewalStatusBadgeClass(lease.RenewalStatus)">
+                                    @lease.RenewalStatus
+                                </span>
+                            </p>
+                        }
+
+                        @if (lease.ProposedRenewalRent.HasValue)
+                        {
+                            <p class="mb-2">
+                                <strong>Proposed Rent:</strong> @lease.ProposedRenewalRent.Value.ToString("C")
+                                @if (lease.ProposedRenewalRent != lease.MonthlyRent)
+                                {
+                                    var increase = lease.ProposedRenewalRent.Value - lease.MonthlyRent;
+                                    var percentage = (increase / lease.MonthlyRent) * 100;
+                                    <small class="text-muted">
+                                        (@(increase > 0 ? "+" : "")@increase.ToString("C"), @percentage.ToString("F1")%)
+                                    </small>
+                                }
+                            </p>
+                        }
+
+                        @if (lease.RenewalNotificationSentOn.HasValue)
+                        {
+                            <small class="text-muted d-block mb-2">
+                                Notification sent: @lease.RenewalNotificationSentOn.Value.ToString("MMM dd, yyyy")
+                            </small>
+                        }
+
+                        @if (!string.IsNullOrEmpty(lease.RenewalNotes))
+                        {
+                            <hr/>
+                            <small>
+                                <strong>Notes:</strong><br/>
+                                @lease.RenewalNotes
+                            </small>
+                        }
+
+                        <div class="d-grid gap-2 mt-3">
+                            @if (lease.RenewalStatus == "Pending" || string.IsNullOrEmpty(lease.RenewalStatus))
+                            {
+                                <button class="btn btn-success btn-sm" @onclick="() => ShowRenewalOfferModal()">
+                                    <i class="bi bi-envelope-check"></i> Send Renewal Offer
+                                </button>
+                                <button class="btn btn-outline-primary btn-sm" @onclick="GenerateRenewalOfferPdf" disabled="@isGeneratingPdf">
+                                    @if (isGeneratingPdf)
+                                    {
+                                        <span class="spinner-border spinner-border-sm me-1"></span>
+                                    }
+                                    else
+                                    {
+                                        <i class="bi bi-file-pdf"></i>
+                                    }
+                                    Generate Offer Letter
+                                </button>
+                            }
+                            @if (lease.RenewalStatus == "Offered")
+                            {
+                                <button class="btn btn-outline-success btn-sm" @onclick="() => MarkRenewalAccepted()">
+                                    <i class="bi bi-check-circle"></i> Mark as Accepted
+                                </button>
+                                <button class="btn btn-outline-danger btn-sm" @onclick="() => MarkRenewalDeclined()">
+                                    <i class="bi bi-x-circle"></i> Mark as Declined
+                                </button>
+                                <button class="btn btn-outline-primary btn-sm" @onclick="GenerateRenewalOfferPdf" disabled="@isGeneratingPdf">
+                                    @if (isGeneratingPdf)
+                                    {
+                                        <span class="spinner-border spinner-border-sm me-1"></span>
+                                    }
+                                    else
+                                    {
+                                        <i class="bi bi-file-pdf"></i>
+                                    }
+                                    Generate Offer Letter
+                                </button>
+                            }
+                        </div>
+                    </div>
+                </div>
+            }
+            
+            <div class="card">
+                <div class="card-header">
+                    <h5 class="mb-0">Quick Actions</h5>
+                </div>
+                <div class="card-body">
+                    <div class="d-grid gap-2">
+                        <button class="btn btn-outline-primary" @onclick="EditLease">
+                            <i class="bi bi-pencil"></i> Edit Lease
+                        </button>
+                        <button class="btn btn-outline-success" @onclick="CreateInvoice">
+                            <i class="bi bi-receipt"></i> Create Invoice
+                        </button>
+                        <button class="btn btn-outline-info" @onclick="ViewInvoices">
+                            <i class="bi bi-list-check"></i> View Invoices
+                        </button>
+                        <button class="btn btn-outline-secondary" @onclick="ViewDocuments">
+                            <i class="bi bi-folder"></i> View Documents
+                        </button>
+                        @if (lease.DocumentId == null)
+                        {
+                            <button class="btn btn-outline-warning" @onclick="GenerateLeaseDocument" disabled="@isGenerating">
+                                @if (isGenerating)
+                                {
+                                    <span class="spinner-border spinner-border-sm me-2" role="status"></span>
+                                    <span>Generating...</span>
+                                }
+                                else
+                                {
+                                    <i class="bi bi-file-pdf"></i>
+                                    <span> Generate PDF</span>
+                                }
+                            </button>
+                        }
+                        else
+                        {
+                            <button class="btn btn-primary" @onclick="ViewDocument">
+                                <i class="bi bi-eye"></i> View PDF
+                            </button>
+                            <button class="btn btn-outline-primary" @onclick="DownloadDocument">
+                                <i class="bi bi-download"></i> Download PDF
+                            </button>
+                        }
+                    </div>
+                </div>
+            </div>
+
+            <div class="card mt-3">
+                <div class="card-header">
+                    <h5 class="mb-0">Lease Summary</h5>
+                </div>
+                <div class="card-body">
+                    <p><strong>Duration:</strong> @((lease.EndDate - lease.StartDate).Days) days</p>
+                    <p><strong>Total Rent:</strong> @((lease.MonthlyRent * 12).ToString("C"))/year</p>
+                    @if (lease.IsActive)
+                    {
+                        <p><strong>Days Remaining:</strong> @lease.DaysRemaining</p>
+                    }
+                    @if (recentInvoices.Any())
+                    {
+                        <hr />
+                        <small class="text-muted">
+                            <strong>Recent Invoices:</strong><br />
+                            @foreach (var invoice in recentInvoices.Take(3))
+                            {
+                                <span class="badge @(invoice.Status == "Paid" ? "bg-success" : "bg-warning") me-1">
+                                    @invoice.InvoiceNumber
+                                </span>
+                            }
+                        </small>
+                    }
+                </div>
+            </div>
+
+            @* Lease Lifecycle Management Card *@
+            @if (lease.Status == "Active" || lease.Status == "MonthToMonth" || lease.Status == "NoticeGiven")
+            {
+                <div class="card mt-3 border-warning">
+                    <div class="card-header bg-warning text-dark">
+                        <h5 class="mb-0"><i class="bi bi-exclamation-triangle"></i> Lease Management</h5>
+                    </div>
+                    <div class="card-body">
+                        <div class="d-grid gap-2">
+                            @if (lease.Status == "Active" || lease.Status == "MonthToMonth")
+                            {
+                                <button class="btn btn-outline-warning" @onclick="() => showTerminationNoticeModal = true">
+                                    <i class="bi bi-calendar-x"></i> Record Termination Notice
+                                </button>
+                                <button class="btn btn-outline-danger" @onclick="() => showEarlyTerminationModal = true">
+                                    <i class="bi bi-x-octagon"></i> Early Termination
+                                </button>
+                                <button class="btn btn-outline-secondary" @onclick="() => showConvertMTMModal = true">
+                                    <i class="bi bi-arrow-repeat"></i> Convert to Month-to-Month
+                                </button>
+                            }
+                            @if (lease.Status == "NoticeGiven")
+                            {
+                                <div class="alert alert-info mb-2">
+                                    <small>
+                                        <strong>Notice Given:</strong> @lease.TerminationNoticedOn?.ToString("MMM dd, yyyy")<br/>
+                                        <strong>Expected Move-Out:</strong> @lease.ExpectedMoveOutDate?.ToString("MMM dd, yyyy")
+                                    </small>
+                                </div>
+                                <button class="btn btn-primary" @onclick="() => showMoveOutModal = true">
+                                    <i class="bi bi-box-seam"></i> Complete Move-Out
+                                </button>
+                                <button class="btn btn-outline-danger" @onclick="() => showEarlyTerminationModal = true">
+                                    <i class="bi bi-x-octagon"></i> Early Termination
+                                </button>
+                            }
+                        </div>
+                    </div>
+                </div>
+            }
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-8 mt-4">
+            <div class="card">
+                <div class="card-header d-flex justify-content-between align-items-center">
+                    <h5 class="mb-0">Notes</h5>
+                </div>
+                <div class="card-body">
+                    @* NotesTimeline removed - product-specific component *@
+                    <p class="text-muted">Notes feature is product-specific and will be rendered by the product wrapper.</p>
+                </div>
+            </div>
+        </div>
+    </div>
+    @* Renewal Offer Modal *@
+    @if (showRenewalModal && lease != null)
+    {
+        <div class="modal fade show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">Send Renewal Offer</h5>
+                        <button type="button" class="btn-close" @onclick="() => showRenewalModal = false"></button>
+                    </div>
+                    <div class="modal-body">
+                        <div class="mb-3">
+                            <label class="form-label">Current Rent</label>
+                            <input type="text" class="form-control" value="@lease.MonthlyRent.ToString("C")" disabled />
+                        </div>
+                        <div class="mb-3">
+                            <label class="form-label">Proposed Renewal Rent</label>
+                            <div class="input-group">
+                                <span class="input-group-text">$</span>
+                                <input type="number" class="form-control" @bind="proposedRent" step="0.01" />
+                            </div>
+                            @if (proposedRent != lease.MonthlyRent)
+                            {
+                                var increase = proposedRent - lease.MonthlyRent;
+                                var percentage = (increase / lease.MonthlyRent) * 100;
+                                <small class="text-muted">
+                                    Change: @(increase > 0 ? "+" : "")@increase.ToString("C") (@percentage.ToString("F1")%)
+                                </small>
+                            }
+                        </div>
+                        <div class="mb-3">
+                            <label class="form-label">Notes (Optional)</label>
+                            <textarea class="form-control" rows="3" @bind="renewalNotes" 
+                                      placeholder="Add any notes about the renewal offer..."></textarea>
+                        </div>
+                        <div class="alert alert-info">
+                            <i class="bi bi-info-circle"></i>
+                            <small>
+                                This will mark the lease as "Offered" and record the proposed rent. 
+                                An email notification will be sent to the tenant (when email service is configured).
+                            </small>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" @onclick="() => showRenewalModal = false">
+                            Cancel
+                        </button>
+                        <button type="button" class="btn btn-primary" @onclick="SendRenewalOffer">
+                            Send Offer
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+
+    @* Termination Notice Modal *@
+    @if (showTerminationNoticeModal && lease != null)
+    {
+        <div class="modal fade show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header bg-warning text-dark">
+                        <h5 class="modal-title"><i class="bi bi-calendar-x"></i> Record Termination Notice</h5>
+                        <button type="button" class="btn-close" @onclick="() => showTerminationNoticeModal = false"></button>
+                    </div>
+                    <div class="modal-body">
+                        <div class="mb-3">
+                            <label class="form-label">Notice Type <span class="text-danger">*</span></label>
+                            <select class="form-select" @bind="terminationNoticeType">
+                                <option value="">Select type...</option>
+                                <option value="Tenant">Tenant Notice (Tenant initiated)</option>
+                                <option value="Landlord">Landlord Notice (Property manager initiated)</option>
+                                <option value="Mutual">Mutual Agreement</option>
+                            </select>
+                        </div>
+                        <div class="mb-3">
+                            <label class="form-label">Notice Date <span class="text-danger">*</span></label>
+                            <input type="date" class="form-control" @bind="terminationNoticeDate" />
+                        </div>
+                        <div class="mb-3">
+                            <label class="form-label">Expected Move-Out Date <span class="text-danger">*</span></label>
+                            <input type="date" class="form-control" @bind="terminationExpectedMoveOutDate" />
+                            <small class="text-muted">Must be in the future</small>
+                        </div>
+                        <div class="mb-3">
+                            <label class="form-label">Reason <span class="text-danger">*</span></label>
+                            <textarea class="form-control" rows="3" @bind="terminationReason"
+                                      placeholder="Provide the reason for termination..."></textarea>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" @onclick="() => showTerminationNoticeModal = false">
+                            Cancel
+                        </button>
+                        <button type="button" class="btn btn-warning" @onclick="RecordTerminationNotice" 
+                                disabled="@(string.IsNullOrWhiteSpace(terminationNoticeType) || string.IsNullOrWhiteSpace(terminationReason) || isSubmitting)">
+                            @if (isSubmitting)
+                            {
+                                <span class="spinner-border spinner-border-sm me-1"></span>
+                            }
+                            Record Notice
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+
+    @* Early Termination Modal *@
+    @if (showEarlyTerminationModal && lease != null)
+    {
+        <div class="modal fade show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header bg-danger text-white">
+                        <h5 class="modal-title"><i class="bi bi-x-octagon"></i> Early Termination</h5>
+                        <button type="button" class="btn-close btn-close-white" @onclick="() => showEarlyTerminationModal = false"></button>
+                    </div>
+                    <div class="modal-body">
+                        <div class="alert alert-danger">
+                            <strong>Warning:</strong> This action will immediately terminate the lease and cannot be undone.
+                        </div>
+                        <div class="mb-3">
+                            <label class="form-label">Termination Type <span class="text-danger">*</span></label>
+                            <select class="form-select" @bind="earlyTerminationType">
+                                <option value="">Select type...</option>
+                                <option value="Eviction">Eviction</option>
+                                <option value="Breach">Lease Breach</option>
+                                <option value="Mutual">Mutual Agreement</option>
+                                <option value="Emergency">Emergency</option>
+                            </select>
+                        </div>
+                        <div class="mb-3">
+                            <label class="form-label">Effective Date <span class="text-danger">*</span></label>
+                            <input type="date" class="form-control" @bind="earlyTerminationDate" />
+                        </div>
+                        <div class="mb-3">
+                            <label class="form-label">Reason <span class="text-danger">*</span></label>
+                            <textarea class="form-control" rows="3" @bind="earlyTerminationReason"
+                                      placeholder="Provide detailed reason for early termination..."></textarea>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" @onclick="() => showEarlyTerminationModal = false">
+                            Cancel
+                        </button>
+                        <button type="button" class="btn btn-danger" @onclick="EarlyTerminateLease"
+                                disabled="@(string.IsNullOrWhiteSpace(earlyTerminationType) || string.IsNullOrWhiteSpace(earlyTerminationReason) || isSubmitting)">
+                            @if (isSubmitting)
+                            {
+                                <span class="spinner-border spinner-border-sm me-1"></span>
+                            }
+                            Terminate Lease
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+
+    @* Move-Out Completion Modal *@
+    @if (showMoveOutModal && lease != null)
+    {
+        <div class="modal fade show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header bg-primary text-white">
+                        <h5 class="modal-title"><i class="bi bi-box-seam"></i> Complete Move-Out</h5>
+                        <button type="button" class="btn-close btn-close-white" @onclick="() => showMoveOutModal = false"></button>
+                    </div>
+                    <div class="modal-body">
+                        <div class="mb-3">
+                            <label class="form-label">Actual Move-Out Date <span class="text-danger">*</span></label>
+                            <input type="date" class="form-control" @bind="actualMoveOutDate" />
+                        </div>
+                        <div class="mb-3">
+                            <div class="form-check">
+                                <input class="form-check-input" type="checkbox" @bind="moveOutFinalInspection" id="finalInspection" />
+                                <label class="form-check-label" for="finalInspection">
+                                    Final inspection completed
+                                </label>
+                            </div>
+                        </div>
+                        <div class="mb-3">
+                            <div class="form-check">
+                                <input class="form-check-input" type="checkbox" @bind="moveOutKeysReturned" id="keysReturned" />
+                                <label class="form-check-label" for="keysReturned">
+                                    Keys returned
+                                </label>
+                            </div>
+                        </div>
+                        <div class="mb-3">
+                            <label class="form-label">Notes (Optional)</label>
+                            <textarea class="form-control" rows="3" @bind="moveOutNotes"
+                                      placeholder="Any notes about the move-out condition..."></textarea>
+                        </div>
+                        <div class="alert alert-info">
+                            <small>
+                                <i class="bi bi-info-circle"></i> This will:
+                                <ul class="mb-0 mt-1">
+                                    <li>Mark the lease as Terminated</li>
+                                    <li>Update property status to Available</li>
+                                    <li>Update tenant active status</li>
+                                </ul>
+                            </small>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" @onclick="() => showMoveOutModal = false">
+                            Cancel
+                        </button>
+                        <button type="button" class="btn btn-primary" @onclick="CompleteMoveOut" disabled="@isSubmitting">
+                            @if (isSubmitting)
+                            {
+                                <span class="spinner-border spinner-border-sm me-1"></span>
+                            }
+                            Complete Move-Out
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+
+    @* Convert to Month-to-Month Modal *@
+    @if (showConvertMTMModal && lease != null)
+    {
+        <div class="modal fade show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title"><i class="bi bi-arrow-repeat"></i> Convert to Month-to-Month</h5>
+                        <button type="button" class="btn-close" @onclick="() => showConvertMTMModal = false"></button>
+                    </div>
+                    <div class="modal-body">
+                        <p>This will convert the lease to a month-to-month arrangement.</p>
+                        <div class="mb-3">
+                            <label class="form-label">Current Monthly Rent</label>
+                            <input type="text" class="form-control" value="@lease.MonthlyRent.ToString("C")" disabled />
+                        </div>
+                        <div class="mb-3">
+                            <label class="form-label">New Monthly Rent (Optional)</label>
+                            <div class="input-group">
+                                <span class="input-group-text">$</span>
+                                <input type="number" class="form-control" @bind="mtmNewRent" step="0.01" placeholder="Leave empty to keep current rent" />
+                            </div>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" @onclick="() => showConvertMTMModal = false">
+                            Cancel
+                        </button>
+                        <button type="button" class="btn btn-primary" @onclick="ConvertToMonthToMonth" disabled="@isSubmitting">
+                            @if (isSubmitting)
+                            {
+                                <span class="spinner-border spinner-border-sm me-1"></span>
+                            }
+                            Convert
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+}
+
+@code {
+    [Parameter] public Guid LeaseId { get; set; }
+
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public Guid? PropertyId { get; set; }
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public Guid? TenantId { get; set; }
+
+    private Lease? lease;
+    private List<Invoice> recentInvoices = new();
+    private bool isAuthorized = true;
+    private bool isGenerating = false;
+    private bool isGeneratingPdf = false;
+    private bool isSubmitting = false;
+    private bool showRenewalModal = false;
+    private decimal proposedRent = 0;
+    private string renewalNotes = "";
+    private Document? document = null;
+
+    // Termination Notice state
+    private bool showTerminationNoticeModal = false;
+    private string terminationNoticeType = "";
+    private DateTime terminationNoticeDate = DateTime.Today;
+    private DateTime terminationExpectedMoveOutDate = DateTime.Today.AddDays(30);
+    private string terminationReason = "";
+
+    // Early Termination state
+    private bool showEarlyTerminationModal = false;
+    private string earlyTerminationType = "";
+    private DateTime earlyTerminationDate = DateTime.Today;
+    private string earlyTerminationReason = "";
+
+    // Move-Out state
+    private bool showMoveOutModal = false;
+    private DateTime actualMoveOutDate = DateTime.Today;
+    private bool moveOutFinalInspection = false;
+    private bool moveOutKeysReturned = false;
+    private string moveOutNotes = "";
+
+    // Month-to-Month conversion state
+    private bool showConvertMTMModal = false;
+    private decimal? mtmNewRent = null;
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    private LeaseModel leaseModel = new();
+    private Property? selectedProperty;
+    private List<Property> availableProperties = new();
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadLease();
+
+         // If PropertyId is provided in query string, pre-select it
+        if (PropertyId.HasValue)
+        {
+            leaseModel.PropertyId = PropertyId.Value;
+            await OnPropertyChanged();
+        }
+        
+        // If TenantId is provided in query string, pre-select it
+        if (TenantId.HasValue)
+        {
+            leaseModel.TenantId = TenantId.Value;
+        }
+    }
+
+    private async Task LoadLease()
+    {
+        var authState = await AuthenticationStateTask;
+        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+
+        if (string.IsNullOrEmpty(userId))
+        {
+            isAuthorized = false;
+            return;
+        }
+
+        lease = await LeaseService.GetByIdAsync(LeaseId);
+
+        if (lease == null)
+        {
+            isAuthorized = false;
+            return;
+        }
+
+        var invoices = await InvoiceService.GetInvoicesByLeaseIdAsync(LeaseId);
+        recentInvoices = invoices
+            .OrderByDescending(i => i.DueOn)
+            .Take(5)
+            .ToList();
+
+        // Load the document if it exists
+        if (lease.DocumentId != null)
+        {
+            document = await DocumentService.GetByIdAsync(lease.DocumentId.Value);
+        }
+    }
+
+    private string GetStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            "Active" => "bg-success",
+            "Pending" => "bg-warning",
+            "Expired" => "bg-secondary",
+            "Terminated" => "bg-danger",
+            _ => "bg-secondary"
+        };
+    }
+
+    private string GetRenewalStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            "Pending" => "secondary",
+            "Offered" => "info",
+            "Accepted" => "success",
+            "Declined" => "danger",
+            "Expired" => "dark",
+            _ => "secondary"
+        };
+    }
+
+    private void ShowRenewalOfferModal()
+    {
+        proposedRent = lease?.MonthlyRent ?? 0;
+        renewalNotes = "";
+        showRenewalModal = true;
+    }
+
+    private async Task SendRenewalOffer()
+    {
+        if (lease == null) return;
+
+        try
+        {
+            // Update lease with renewal offer details
+            lease.RenewalStatus = "Offered";
+            lease.ProposedRenewalRent = proposedRent;
+            lease.RenewalOfferedOn = DateTime.UtcNow;
+            lease.RenewalNotes = renewalNotes;
+
+            await LeaseService.UpdateAsync(lease);
+            
+            // TODO: Send email notification to tenant
+            
+            showRenewalModal = false;
+            await LoadLease();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            // Error handling: Could be logged or passed to parent component
+            throw ex;
+        }
+    }
+
+    private async Task GenerateRenewalOfferPdf()
+    {
+        if (lease == null) return;
+
+        try
+        {
+            isGeneratingPdf = true;
+            StateHasChanged();
+
+            // Ensure proposed rent is set
+            if (!lease.ProposedRenewalRent.HasValue)
+            {
+                lease.ProposedRenewalRent = lease.MonthlyRent;
+            }
+
+            // Generate renewal offer PDF
+            var pdfBytes = RenewalPdfGenerator.GenerateRenewalOfferLetter(lease, lease.Property, lease.Tenant!);
+            var fileName = $"Lease_Renewal_Offer_{lease.Property?.Address?.Replace(" ", "_")}_{DateTime.Now:yyyyMMdd_HHmmss}.pdf";
+
+            // Save PDF to Documents table
+            var document = new Document
+            {
+                PropertyId = lease.PropertyId,
+                TenantId = lease.TenantId,
+                LeaseId = lease.Id,
+                FileName = fileName,
+                FileType = "application/pdf",
+                FileSize = pdfBytes.Length,
+                FileData = pdfBytes,
+                FileExtension = ".pdf",
+                ContentType = "application/pdf",
+                DocumentType = "Lease Renewal Offer",
+                Description = $"Renewal offer letter for {lease.Property?.Address}. Proposed rent: {lease.ProposedRenewalRent:C}"
+            };
+
+            await DocumentService.CreateAsync(document);
+            
+            // PDF generated successfully
+        }
+        catch (Exception ex)
+        {
+            // Error handling: Could be logged or passed to parent component
+            throw ex;
+        }
+        finally
+        {
+            isGeneratingPdf = false;
+            StateHasChanged();
+        }
+    }
+
+    private async Task MarkRenewalAccepted()
+    {
+        if (lease == null) return;
+
+        try
+        {
+            // Create renewal model with proposed terms
+            var renewalModel = new LeaseRenewalModel
+            {
+                NewStartDate = DateTime.Today,
+                NewEndDate = DateTime.Today.AddYears(1),
+                NewMonthlyRent = lease.ProposedRenewalRent ?? lease.MonthlyRent,
+                UpdatedSecurityDeposit = lease.SecurityDeposit,
+                NewTerms = lease.Terms
+            };
+
+            var result = await LeaseWorkflowService.RenewLeaseAsync(LeaseId, renewalModel);
+
+            if (result.Success && result.Data != null)
+            {
+                await LoadLease();
+                StateHasChanged();
+
+                // Renewal accepted successfully
+            }
+            else
+            {
+                // Validation errors: Could be displayed in UI
+            }
+        }
+        catch (Exception ex)
+        {
+            // Error handling: Could be logged or passed to parent component
+            throw ex;
+        }
+    }
+
+    private async Task MarkRenewalDeclined()
+    {
+        if (lease == null) return;
+
+        try
+        {
+            lease.RenewalStatus = "Declined";
+            lease.RenewalResponseOn = DateTime.UtcNow;
+            await LeaseService.UpdateAsync(lease);
+            await LoadLease();
+            StateHasChanged();
+
+            // Renewal offer marked as declined
+        }
+        catch (Exception ex)
+        {
+            // Error handling: Could be logged or passed to parent component
+            throw ex;
+        }
+    }
+
+    #region Lease Workflow Methods
+
+    private async Task RecordTerminationNotice()
+    {
+        if (lease == null || string.IsNullOrWhiteSpace(terminationNoticeType) || string.IsNullOrWhiteSpace(terminationReason)) 
+            return;
+
+        isSubmitting = true;
+        StateHasChanged();
+
+        try
+        {
+            var result = await LeaseWorkflowService.RecordTerminationNoticeAsync(
+                LeaseId,
+                terminationNoticeDate,
+                terminationExpectedMoveOutDate,
+                terminationNoticeType,
+                terminationReason);
+
+            if (result.Success)
+            {
+                showTerminationNoticeModal = false;
+                ResetTerminationNoticeForm();
+                await LoadLease();
+            }
+            else
+            {
+                // Validation errors: Could be displayed in UI
+            }
+        }
+        catch (Exception ex)
+        {
+            // Error handling: Could be logged or passed to parent component
+            throw ex;
+        }
+        finally
+        {
+            isSubmitting = false;
+            StateHasChanged();
+        }
+    }
+
+    private async Task EarlyTerminateLease()
+    {
+        if (lease == null || string.IsNullOrWhiteSpace(earlyTerminationType) || string.IsNullOrWhiteSpace(earlyTerminationReason))
+            return;
+
+        isSubmitting = true;
+        StateHasChanged();
+
+        try
+        {
+            var result = await LeaseWorkflowService.EarlyTerminateAsync(
+                LeaseId,
+                earlyTerminationType,
+                earlyTerminationReason,
+                earlyTerminationDate);
+
+            if (result.Success)
+            {
+                showEarlyTerminationModal = false;
+                ResetEarlyTerminationForm();
+                await LoadLease();
+            }
+            else
+            {
+                // Validation errors: Could be displayed in UI
+            }
+        }
+        catch (Exception ex)
+        {
+            // Error handling: Could be logged or passed to parent component
+            throw ex;
+        }
+        finally
+        {
+            isSubmitting = false;
+            StateHasChanged();
+        }
+    }
+
+    private async Task CompleteMoveOut()
+    {
+        if (lease == null) return;
+
+        isSubmitting = true;
+        StateHasChanged();
+
+        try
+        {
+            var moveOutModel = new MoveOutModel
+            {
+                FinalInspectionCompleted = moveOutFinalInspection,
+                KeysReturned = moveOutKeysReturned,
+                Notes = moveOutNotes
+            };
+
+            var result = await LeaseWorkflowService.CompleteMoveOutAsync(
+                LeaseId,
+                actualMoveOutDate,
+                moveOutModel);
+
+            if (result.Success)
+            {
+                showMoveOutModal = false;
+                ResetMoveOutForm();
+                await LoadLease();
+            }
+            else
+            {
+                // Validation errors: Could be displayed in UI
+            }
+        }
+        catch (Exception ex)
+        {
+            // Error handling: Could be logged or passed to parent component
+            throw ex;
+        }
+        finally
+        {
+            isSubmitting = false;
+            StateHasChanged();
+        }
+    }
+
+    private async Task ConvertToMonthToMonth()
+    {
+        if (lease == null) return;
+
+        isSubmitting = true;
+        StateHasChanged();
+
+        try
+        {
+            var result = await LeaseWorkflowService.ConvertToMonthToMonthAsync(
+                LeaseId,
+                mtmNewRent);
+
+            if (result.Success)
+            {
+                showConvertMTMModal = false;
+                mtmNewRent = null;
+                await LoadLease();
+            }
+            else
+            {
+                // Validation errors: Could be displayed in UI
+            }
+        }
+        catch (Exception ex)
+        {
+            // Error handling: Could be logged or passed to parent component
+            throw ex;
+        }
+        finally
+        {
+            isSubmitting = false;
+            StateHasChanged();
+        }
+    }
+
+    private void ResetTerminationNoticeForm()
+    {
+        terminationNoticeType = "";
+        terminationNoticeDate = DateTime.Today;
+        terminationExpectedMoveOutDate = DateTime.Today.AddDays(30);
+        terminationReason = "";
+    }
+
+    private void ResetEarlyTerminationForm()
+    {
+        earlyTerminationType = "";
+        earlyTerminationDate = DateTime.Today;
+        earlyTerminationReason = "";
+    }
+
+    private void ResetMoveOutForm()
+    {
+        actualMoveOutDate = DateTime.Today;
+        moveOutFinalInspection = false;
+        moveOutKeysReturned = false;
+        moveOutNotes = "";
+    }
+
+    #endregion
+
+    private async Task OnPropertyChanged()
+    {
+        if (leaseModel.PropertyId != Guid.Empty)
+        {
+            selectedProperty = availableProperties.FirstOrDefault(p => p.Id == leaseModel.PropertyId);
+            if (selectedProperty != null)
+            {
+                // Get organization settings for security deposit calculation
+                var settings = await OrganizationService.GetOrganizationSettingsAsync();
+                var depositMultiplier = settings?.AutoCalculateSecurityDeposit == true 
+                    ? settings.SecurityDepositMultiplier 
+                    : 1.0m;
+
+                leaseModel.MonthlyRent = selectedProperty.MonthlyRent;
+                leaseModel.SecurityDeposit = selectedProperty.MonthlyRent * depositMultiplier;
+            }
+        }
+        else
+        {
+            selectedProperty = null;
+        }
+        StateHasChanged();
+    }
+
+    private void EditLease()
+    {
+        Navigation.NavigateTo($"/propertymanagement/leases/{LeaseId}/edit");
+    }
+
+    private void BackToProperty()
+    {
+        Navigation.NavigateTo($"/propertymanagement/properties/{lease?.PropertyId}");
+    }
+
+    private void CreateInvoice()
+    {
+        Navigation.NavigateTo($"/propertymanagement/invoices/create?leaseId={LeaseId}");
+    }
+
+    private void ViewInvoices()
+    {
+        Navigation.NavigateTo($"/propertymanagement/invoices?leaseId={LeaseId}");
+    }
+
+    private void ViewDocuments()
+    {
+        Navigation.NavigateTo($"/propertymanagement/leases/{LeaseId}/documents");
+    }
+
+    private async Task ViewDocument()
+    {
+        if (document != null)
+        {
+            var base64Data = Convert.ToBase64String(document.FileData);
+            await JSRuntime.InvokeVoidAsync("viewFile", base64Data, document.FileType);
+        }
+    }
+
+    private async Task DownloadDocument()
+    {
+        if (document != null)
+        {
+            var fileName = document.FileName;
+            var fileData = document.FileData;
+            var mimeType = document.FileType;
+
+            await JSRuntime.InvokeVoidAsync("downloadFile", fileName, Convert.ToBase64String(fileData), mimeType);
+        }
+    }
+
+    private async Task GenerateLeaseDocument()
+    {
+        isGenerating = true;
+        StateHasChanged();
+
+        try
+        {
+            // Generate the PDF
+            byte[] pdfBytes = await LeasePdfGenerator.GenerateLeasePdf(lease!);
+
+            // Create the document entity
+            var document = new Document
+            {
+                FileName = $"Lease_{lease!.Property?.Address?.Replace(" ", "_")}_{DateTime.Now:yyyyMMdd}.pdf",
+                FileExtension = ".pdf",
+                FileData = pdfBytes,
+                FileSize = pdfBytes.Length,
+                FileType = "application/pdf",
+                DocumentType = "Lease Agreement",
+                Description = "Auto-generated lease agreement",
+                LeaseId = lease.Id,
+                PropertyId = lease.PropertyId,
+                TenantId = lease.TenantId,
+            };
+
+            // Save to database
+            await DocumentService.CreateAsync(document);
+
+            // Update lease with DocumentId
+            lease.DocumentId = document.Id;
+            
+            await LeaseService.UpdateAsync(lease);
+
+            // Reload lease and document
+            await LoadLease();
+            StateHasChanged();
+
+            await JSRuntime.InvokeVoidAsync("alert", "Lease document generated successfully!");
+        }
+        catch (Exception ex)
+        {
+            await JSRuntime.InvokeVoidAsync("alert", $"Error generating lease document: {ex.Message}");
+        }
+        finally
+        {
+            isGenerating = false;
+            StateHasChanged();
+        }
+    }
+
+    public class LeaseModel
+    {
+        [RequiredGuid(ErrorMessage = "Property is required")]
+        public Guid PropertyId { get; set; }
+
+        [RequiredGuid(ErrorMessage = "Tenant is required")]
+        public Guid TenantId { get; set; }
+
+        [Required(ErrorMessage = "Start date is required")]
+        public DateTime StartDate { get; set; } = DateTime.Today;
+
+        [Required(ErrorMessage = "End date is required")]
+        public DateTime EndDate { get; set; } = DateTime.Today.AddYears(1);
+
+        [Required(ErrorMessage = "Monthly rent is required")]
+        [Range(0.01, double.MaxValue, ErrorMessage = "Monthly rent must be greater than 0")]
+        public decimal MonthlyRent { get; set; }
+
+        [Range(0, double.MaxValue, ErrorMessage = "Security deposit cannot be negative")]
+        public decimal SecurityDeposit { get; set; }
+
+        [Required(ErrorMessage = "Status is required")]
+        [StringLength(50)]
+        public string Status { get; set; } = "Active";
+
+        [StringLength(1000, ErrorMessage = "Terms cannot exceed 1000 characters")]
+        public string Terms { get; set; } = string.Empty;
+
+        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
+        public string Notes { get; set; } = string.Empty;
+    }
+}
\ No newline at end of file
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/MaintenanceRequests/MaintenanceCreateForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/MaintenanceRequests/MaintenanceCreateForm.razor
new file mode 100644
index 0000000..44eda0f
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/MaintenanceRequests/MaintenanceCreateForm.razor
@@ -0,0 +1,344 @@
+@using System.ComponentModel.DataAnnotations
+@inject MaintenanceService MaintenanceService
+@inject PropertyService PropertyService
+@inject LeaseService LeaseService
+@inject NavigationManager NavigationManager
+
+<div class="container-fluid">
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <h1><i class="bi bi-tools"></i> Create Maintenance Request</h1>
+        <button class="btn btn-outline-secondary" @onclick="Cancel">
+            <i class="bi bi-x-circle"></i> Cancel
+        </button>
+    </div>
+
+    @if (isLoading)
+    {
+        <div class="text-center">
+            <div class="spinner-border" role="status">
+                <span class="visually-hidden">Loading...</span>
+            </div>
+        </div>
+    }
+    else
+    {
+        <div class="row">
+            <div class="col-md-8">
+                <div class="card">
+                    <div class="card-body">
+                        <Microsoft.AspNetCore.Components.Forms.EditForm Model="maintenanceRequest" OnValidSubmit="HandleValidSubmit">
+                            <DataAnnotationsValidator />
+                            <ValidationSummary class="text-danger" />
+
+                            <div class="row mb-3">
+                                <div class="col-md-6">
+                                    <label class="form-label">Property *</label>
+                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.PropertyId" @bind-Value:after="OnPropertyChangedAsync">
+                                        <option value="0">-- Select Property --</option>
+                                        @foreach (var property in properties)
+                                        {
+                                            <option value="@property.Id">@property.Address</option>
+                                        }
+                                    </InputSelect>
+                                    <ValidationMessage For="@(() => maintenanceRequest.PropertyId)" />
+                                </div>
+                                <div class="col-md-6">
+                                    <label class="form-label">Active Lease</label>
+                                    <div class="form-control bg-light">
+                                        @if (currentLease != null)
+                                        {
+                                            <text>@currentLease.Tenant?.FullName - @currentLease.Status</text>
+                                        }
+                                        else
+                                        {
+                                            <em>No active leases</em>
+                                        }
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="mb-3">
+                                <label class="form-label">Title *</label>
+                                <InputText class="form-control" @bind-Value="maintenanceRequest.Title" placeholder="Brief description of the issue" />
+                                <ValidationMessage For="@(() => maintenanceRequest.Title)" />
+                            </div>
+
+                            <div class="mb-3">
+                                <label class="form-label">Description *</label>
+                                <InputTextArea class="form-control" @bind-Value="maintenanceRequest.Description" rows="4" placeholder="Detailed description of the maintenance issue" />
+                                <ValidationMessage For="@(() => maintenanceRequest.Description)" />
+                            </div>
+
+                            <div class="row mb-3">
+                                <div class="col-md-6">
+                                    <label class="form-label">Request Type *</label>
+                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.RequestType">
+                                        <option value="">-- Select Type --</option>
+                                        @foreach (var type in ApplicationConstants.MaintenanceRequestTypes.AllMaintenanceRequestTypes)
+                                        {
+                                            <option value="@type">@type</option>
+                                        }
+                                    </InputSelect>
+                                    <ValidationMessage For="@(() => maintenanceRequest.RequestType)" />
+                                </div>
+                                <div class="col-md-6">
+                                    <label class="form-label">Priority *</label>
+                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.Priority">
+                                        @foreach (var priority in ApplicationConstants.MaintenanceRequestPriorities.AllMaintenanceRequestPriorities)
+                                        {
+                                            <option value="@priority">@priority</option>
+                                        }
+                                    </InputSelect>
+                                    <ValidationMessage For="@(() => maintenanceRequest.Priority)" />
+                                </div>
+                            </div>
+
+                            <div class="mb-3">
+                                <label class="form-label">Requested By</label>
+                                <InputText class="form-control" @bind-Value="maintenanceRequest.RequestedBy" placeholder="Name of person requesting" />
+                            </div>
+
+                            <div class="row mb-3">
+                                <div class="col-md-6">
+                                    <label class="form-label">Email</label>
+                                    <InputText type="email" class="form-control" @bind-Value="maintenanceRequest.RequestedByEmail" placeholder="email@example.com" />
+                                </div>
+                                <div class="col-md-6">
+                                    <label class="form-label">Phone</label>
+                                    <InputText class="form-control" @bind-Value="maintenanceRequest.RequestedByPhone" placeholder="(555) 123-4567" />
+                                </div>
+                            </div>
+
+                            <div class="row mb-3">
+                                <div class="col-md-6">
+                                    <label class="form-label">Requested Date *</label>
+                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.RequestedOn" />
+                                    <ValidationMessage For="@(() => maintenanceRequest.RequestedOn)" />
+                                </div>
+                                <div class="col-md-6">
+                                    <label class="form-label">Scheduled Date</label>
+                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.ScheduledOn" />
+                                </div>
+                            </div>
+
+                            <div class="row mb-3">
+                                <div class="col-md-6">
+                                    <label class="form-label">Estimated Cost</label>
+                                    <InputNumber class="form-control" @bind-Value="maintenanceRequest.EstimatedCost" />
+                                </div>
+                                <div class="col-md-6">
+                                    <label class="form-label">Assigned To</label>
+                                    <InputText class="form-control" @bind-Value="maintenanceRequest.AssignedTo" placeholder="Contractor or maintenance person" />
+                                </div>
+                            </div>
+
+                            <div class="d-flex justify-content-end gap-2">
+                                <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
+                                <button type="submit" class="btn btn-primary" disabled="@isSaving">
+                                    @if (isSaving)
+                                    {
+                                        <span class="spinner-border spinner-border-sm me-2" role="status" aria-hidden="true"></span>
+                                        <span>Creating...</span>
+                                    }
+                                    else
+                                    {
+                                        <i class="bi bi-check-circle me-2"></i>
+                                        <span>Create Request</span>
+                                    }
+                                </button>
+                            </div>
+                        </Microsoft.AspNetCore.Components.Forms.EditForm>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-md-4">
+                <div class="card">
+                    <div class="card-header">
+                        <h5 class="mb-0"><i class="bi bi-info-circle"></i> Information</h5>
+                    </div>
+                    <div class="card-body">
+                        <h6>Priority Levels</h6>
+                        <ul class="list-unstyled">
+                            <li class="mb-2">
+                                <span class="badge bg-danger">Urgent</span> - Immediate attention required
+                            </li>
+                            <li class="mb-2">
+                                <span class="badge bg-warning">High</span> - Should be addressed soon
+                            </li>
+                            <li class="mb-2">
+                                <span class="badge bg-info">Medium</span> - Normal priority
+                            </li>
+                            <li class="mb-2">
+                                <span class="badge bg-secondary">Low</span> - Can wait
+                            </li>
+                        </ul>
+
+                        <hr />
+
+                        <h6>Request Types</h6>
+                        <ul class="small">
+                            <li>Plumbing</li>
+                            <li>Electrical</li>
+                            <li>Heating/Cooling</li>
+                            <li>Appliance</li>
+                            <li>Structural</li>
+                            <li>Landscaping</li>
+                            <li>Pest Control</li>
+                            <li>Other</li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+</div>
+
+@code {
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public Guid? PropertyId { get; set; }
+
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public Guid? LeaseId { get; set; }
+    private MaintenanceRequestModel maintenanceRequest = new();
+    private List<Property> properties = new();
+    private Lease? currentLease = null;
+    private bool isLoading = true;
+    private bool isSaving = false;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadData();
+    }
+
+    protected override async Task OnParametersSetAsync()
+    {
+        if (PropertyId.HasValue && PropertyId.Value != Guid.Empty && maintenanceRequest.PropertyId != PropertyId.Value)
+        {
+            maintenanceRequest.PropertyId = PropertyId.Value;
+            if (properties.Any())
+            {
+                await LoadLeaseForProperty(PropertyId.Value);
+            }
+        }
+        if (LeaseId.HasValue && LeaseId.Value != Guid.Empty && maintenanceRequest.LeaseId != LeaseId.Value)
+        {
+            maintenanceRequest.LeaseId = LeaseId.Value;
+        }
+    }
+
+    private async Task LoadData()
+    {
+        isLoading = true;
+        try
+        {
+            properties = await PropertyService.GetAllAsync();
+            
+            if (PropertyId.HasValue && PropertyId.Value != Guid.Empty)
+            {
+                maintenanceRequest.PropertyId = PropertyId.Value;
+                await LoadLeaseForProperty(PropertyId.Value);
+            }
+            if (LeaseId.HasValue && LeaseId.Value != Guid.Empty)
+            {
+                maintenanceRequest.LeaseId = LeaseId.Value;
+            }
+        }
+        finally
+        {
+            isLoading = false;
+        }
+    }
+
+    private async Task OnPropertyChangedAsync()
+    {
+        if (maintenanceRequest.PropertyId != Guid.Empty)
+        {
+            await LoadLeaseForProperty(maintenanceRequest.PropertyId);
+        }
+        else
+        {
+            currentLease = null;
+            maintenanceRequest.LeaseId = null;
+        }
+    }
+
+    private async Task LoadLeaseForProperty(Guid propertyId)
+    {
+        var leases = await LeaseService.GetCurrentAndUpcomingLeasesByPropertyIdAsync(propertyId);
+        currentLease = leases.FirstOrDefault();
+        maintenanceRequest.LeaseId = currentLease?.Id;
+    }
+
+    private async Task HandleValidSubmit()
+    {
+        isSaving = true;
+        try
+        {
+            var request = new MaintenanceRequest
+            {
+                PropertyId = maintenanceRequest.PropertyId,
+                LeaseId = maintenanceRequest.LeaseId,
+                Title = maintenanceRequest.Title,
+                Description = maintenanceRequest.Description,
+                RequestType = maintenanceRequest.RequestType,
+                Priority = maintenanceRequest.Priority,
+                RequestedBy = maintenanceRequest.RequestedBy,
+                RequestedByEmail = maintenanceRequest.RequestedByEmail,
+                RequestedByPhone = maintenanceRequest.RequestedByPhone,
+                RequestedOn = maintenanceRequest.RequestedOn,
+                ScheduledOn = maintenanceRequest.ScheduledOn,
+                EstimatedCost = maintenanceRequest.EstimatedCost,
+                AssignedTo = maintenanceRequest.AssignedTo
+            };
+
+            await MaintenanceService.CreateAsync(request);
+            NavigationManager.NavigateTo("/propertymanagement/maintenance");
+        }
+        finally
+        {
+            isSaving = false;
+        }
+    }
+
+    private void Cancel()
+    {
+        NavigationManager.NavigateTo("/propertymanagement/maintenance");
+    }
+
+    public class MaintenanceRequestModel
+    {
+        [Required(ErrorMessage = "Property is required")]
+        public Guid PropertyId { get; set; }
+
+        public Guid? LeaseId { get; set; }
+
+        [Required(ErrorMessage = "Title is required")]
+        [StringLength(100, ErrorMessage = "Title cannot exceed 100 characters")]
+        public string Title { get; set; } = string.Empty;
+
+        [Required(ErrorMessage = "Description is required")]
+        [StringLength(2000, ErrorMessage = "Description cannot exceed 2000 characters")]
+        public string Description { get; set; } = string.Empty;
+
+        [Required(ErrorMessage = "Request type is required")]
+        public string RequestType { get; set; } = string.Empty;
+
+        [Required(ErrorMessage = "Priority is required")]
+        public string Priority { get; set; } = "Medium";
+
+        public string RequestedBy { get; set; } = string.Empty;
+        public string RequestedByEmail { get; set; } = string.Empty;
+        public string RequestedByPhone { get; set; } = string.Empty;
+
+        [Required]
+        public DateTime RequestedOn { get; set; } = DateTime.Today;
+
+        public DateTime? ScheduledOn { get; set; }
+
+        public decimal EstimatedCost { get; set; }
+        public string AssignedTo { get; set; } = string.Empty;
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/MaintenanceRequests/MaintenanceEditForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/MaintenanceRequests/MaintenanceEditForm.razor
new file mode 100644
index 0000000..1fb83ce
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/MaintenanceRequests/MaintenanceEditForm.razor
@@ -0,0 +1,301 @@
+@inject MaintenanceService MaintenanceService
+@inject PropertyService PropertyService
+@inject LeaseService LeaseService
+@inject NavigationManager NavigationManager
+@inject IJSRuntime JSRuntime
+
+<div class="container-fluid">
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <h1><i class="bi bi-pencil"></i> Edit Maintenance Request #@MaintenanceRequestId</h1>
+        <button class="btn btn-outline-secondary" @onclick="Cancel">
+            <i class="bi bi-x-circle"></i> Cancel
+        </button>
+    </div>
+
+    @if (isLoading)
+    {
+        <div class="text-center">
+            <div class="spinner-border" role="status">
+                <span class="visually-hidden">Loading...</span>
+            </div>
+        </div>
+    }
+    else if (maintenanceRequest == null)
+    {
+        <div class="alert alert-warning">
+            <i class="bi bi-exclamation-triangle"></i> Maintenance request not found.
+        </div>
+    }
+    else
+    {
+        <div class="row">
+            <div class="col-md-8">
+                <div class="card">
+                    <div class="card-body">
+                        <Microsoft.AspNetCore.Components.Forms.EditForm Model="maintenanceRequest" OnValidSubmit="HandleValidSubmit">
+                            <DataAnnotationsValidator />
+                            <ValidationSummary class="text-danger" />
+
+                            <div class="row mb-3">
+                                <div class="col-md-6">
+                                    <label class="form-label">Property *</label>
+                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.PropertyId" @onchange="OnPropertyChanged">
+                                        <option value="0">-- Select Property --</option>
+                                        @foreach (var property in properties)
+                                        {
+                                            <option value="@property.Id">@property.Address</option>
+                                        }
+                                    </InputSelect>
+                                    <ValidationMessage For="@(() => maintenanceRequest.PropertyId)" />
+                                </div>
+                                <div class="col-md-6">
+                                    <label class="form-label">Lease (Optional)</label>
+                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.LeaseId">
+                                        <option value="">-- No Lease --</option>
+                                        @foreach (var lease in availableLeases)
+                                        {
+                                            <option value="@lease.Id">Lease #@lease.Id - @lease.Tenant?.FullName</option>
+                                        }
+                                    </InputSelect>
+                                </div>
+                            </div>
+
+                            <div class="mb-3">
+                                <label class="form-label">Title *</label>
+                                <InputText class="form-control" @bind-Value="maintenanceRequest.Title" placeholder="Brief description of the issue" />
+                                <ValidationMessage For="@(() => maintenanceRequest.Title)" />
+                            </div>
+
+                            <div class="mb-3">
+                                <label class="form-label">Description *</label>
+                                <InputTextArea class="form-control" @bind-Value="maintenanceRequest.Description" rows="4" placeholder="Detailed description of the maintenance issue" />
+                                <ValidationMessage For="@(() => maintenanceRequest.Description)" />
+                            </div>
+
+                            <div class="row mb-3">
+                                <div class="col-md-4">
+                                    <label class="form-label">Request Type *</label>
+                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.RequestType">
+                                        <option value="">-- Select Type --</option>
+                                        @foreach (var type in ApplicationConstants.MaintenanceRequestTypes.AllMaintenanceRequestTypes)
+                                        {
+                                            <option value="@type">@type</option>
+                                        }
+                                    </InputSelect>
+                                    <ValidationMessage For="@(() => maintenanceRequest.RequestType)" />
+                                </div>
+                                <div class="col-md-4">
+                                    <label class="form-label">Priority *</label>
+                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.Priority">
+                                        @foreach (var priority in ApplicationConstants.MaintenanceRequestPriorities.AllMaintenanceRequestPriorities)
+                                        {
+                                            <option value="@priority">@priority</option>
+                                        }
+                                    </InputSelect>
+                                    <ValidationMessage For="@(() => maintenanceRequest.Priority)" />
+                                </div>
+                                <div class="col-md-4">
+                                    <label class="form-label">Status *</label>
+                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.Status">
+                                        @foreach (var status in ApplicationConstants.MaintenanceRequestStatuses.AllMaintenanceRequestStatuses)
+                                        {
+                                            <option value="@status">@status</option>
+                                        }
+                                    </InputSelect>
+                                    <ValidationMessage For="@(() => maintenanceRequest.Status)" />
+                                </div>
+                            </div>
+
+                            <div class="mb-3">
+                                <label class="form-label">Requested By</label>
+                                <InputText class="form-control" @bind-Value="maintenanceRequest.RequestedBy" placeholder="Name of person requesting" />
+                            </div>
+
+                            <div class="row mb-3">
+                                <div class="col-md-6">
+                                    <label class="form-label">Email</label>
+                                    <InputText type="email" class="form-control" @bind-Value="maintenanceRequest.RequestedByEmail" placeholder="email@example.com" />
+                                </div>
+                                <div class="col-md-6">
+                                    <label class="form-label">Phone</label>
+                                    <InputText class="form-control" @bind-Value="maintenanceRequest.RequestedByPhone" placeholder="(555) 123-4567" />
+                                </div>
+                            </div>
+
+                            <div class="row mb-3">
+                                <div class="col-md-4">
+                                    <label class="form-label">Requested Date *</label>
+                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.RequestedOn" />
+                                    <ValidationMessage For="@(() => maintenanceRequest.RequestedOn)" />
+                                </div>
+                                <div class="col-md-4">
+                                    <label class="form-label">Scheduled Date</label>
+                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.ScheduledOn" />
+                                </div>
+                                <div class="col-md-4">
+                                    <label class="form-label">Completed Date</label>
+                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.CompletedOn" />
+                                </div>
+                            </div>
+
+                            <div class="row mb-3">
+                                <div class="col-md-4">
+                                    <label class="form-label">Estimated Cost</label>
+                                    <InputNumber class="form-control" @bind-Value="maintenanceRequest.EstimatedCost" />
+                                </div>
+                                <div class="col-md-4">
+                                    <label class="form-label">Actual Cost</label>
+                                    <InputNumber class="form-control" @bind-Value="maintenanceRequest.ActualCost" />
+                                </div>
+                                <div class="col-md-4">
+                                    <label class="form-label">Assigned To</label>
+                                    <InputText class="form-control" @bind-Value="maintenanceRequest.AssignedTo" placeholder="Contractor or maintenance person" />
+                                </div>
+                            </div>
+
+                            <div class="mb-3">
+                                <label class="form-label">Resolution Notes</label>
+                                <InputTextArea class="form-control" @bind-Value="maintenanceRequest.ResolutionNotes" rows="3" placeholder="Notes about how the issue was resolved" />
+                            </div>
+
+                            <div class="d-flex justify-content-between">
+                                <button type="button" class="btn btn-outline-danger" @onclick="DeleteRequest">
+                                    <i class="bi bi-trash"></i> Delete
+                                </button>
+                                <div class="d-flex gap-2">
+                                    <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
+                                    <button type="submit" class="btn btn-primary" disabled="@isSaving">
+                                        @if (isSaving)
+                                        {
+                                            <span class="spinner-border spinner-border-sm me-2" role="status" aria-hidden="true"></span>
+                                            <span>Saving...</span>
+                                        }
+                                        else
+                                        {
+                                            <i class="bi bi-check-circle me-2"></i>
+                                            <span>Save Changes</span>
+                                        }
+                                    </button>
+                                </div>
+                            </div>
+                        </Microsoft.AspNetCore.Components.Forms.EditForm>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-md-4">
+                <div class="card">
+                    <div class="card-header">
+                        <h5 class="mb-0"><i class="bi bi-info-circle"></i> Status Information</h5>
+                    </div>
+                    <div class="card-body">
+                        <div class="mb-3">
+                            <label class="text-muted small">Current Priority</label>
+                            <p><span class="badge @maintenanceRequest.PriorityBadgeClass">@maintenanceRequest.Priority</span></p>
+                        </div>
+                        <div class="mb-3">
+                            <label class="text-muted small">Current Status</label>
+                            <p><span class="badge @maintenanceRequest.StatusBadgeClass">@maintenanceRequest.Status</span></p>
+                        </div>
+                        <div class="mb-3">
+                            <label class="text-muted small">Days Open</label>
+                            <p class="mb-0"><span class="badge bg-info">@maintenanceRequest.DaysOpen days</span></p>
+                        </div>
+                        @if (maintenanceRequest.IsOverdue)
+                        {
+                            <div class="alert alert-danger">
+                                <i class="bi bi-exclamation-triangle-fill"></i> <strong>Overdue</strong>
+                            </div>
+                        }
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+</div>
+
+@code {
+    [Parameter]
+    public Guid MaintenanceRequestId { get; set; }
+
+    private MaintenanceRequest? maintenanceRequest;
+    private List<Property> properties = new();
+    private List<Lease> availableLeases = new();
+    private bool isLoading = true;
+    private bool isSaving = false;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadData();
+    }
+
+    private async Task LoadData()
+    {
+        isLoading = true;
+        try
+        {
+            maintenanceRequest = await MaintenanceService.GetByIdAsync(MaintenanceRequestId);
+            properties = await PropertyService.GetAllAsync();
+            
+            if (maintenanceRequest?.PropertyId != null)
+            {
+                await LoadLeasesForProperty(maintenanceRequest.PropertyId);
+            }
+        }
+        finally
+        {
+            isLoading = false;
+        }
+    }
+
+    private async Task OnPropertyChanged(ChangeEventArgs e)
+    {
+        if (Guid.TryParse(e.Value?.ToString(), out Guid propertyId) && propertyId != Guid.Empty)
+        {
+            await LoadLeasesForProperty(propertyId);
+        }
+        else
+        {
+            availableLeases.Clear();
+        }
+    }
+
+    private async Task LoadLeasesForProperty(Guid propertyId)
+    {
+        var allLeases = await LeaseService.GetLeasesByPropertyIdAsync(propertyId);
+        availableLeases = allLeases.Where(l => l.Status == "Active" || l.Status == "Pending").ToList();
+    }
+
+    private async Task HandleValidSubmit()
+    {
+        if (maintenanceRequest == null) return;
+
+        isSaving = true;
+        try
+        {
+            await MaintenanceService.UpdateAsync(maintenanceRequest);
+            NavigationManager.NavigateTo($"/propertymanagement/maintenance/{MaintenanceRequestId}");
+        }
+        finally
+        {
+            isSaving = false;
+        }
+    }
+
+    private async Task DeleteRequest()
+    {
+        if (maintenanceRequest == null) return;
+
+        var confirmed = await JSRuntime.InvokeAsync<bool>("confirm", "Are you sure you want to delete this maintenance request?");
+        if (confirmed)
+        {
+            await MaintenanceService.DeleteAsync(MaintenanceRequestId);
+            NavigationManager.NavigateTo("/propertymanagement/maintenance");
+        }
+    }
+
+    private void Cancel()
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/maintenance/{MaintenanceRequestId}");
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/MaintenanceRequests/MaintenanceListForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/MaintenanceRequests/MaintenanceListForm.razor
new file mode 100644
index 0000000..883b7ff
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/MaintenanceRequests/MaintenanceListForm.razor
@@ -0,0 +1,345 @@
+@inject MaintenanceService MaintenanceService
+@inject NavigationManager NavigationManager
+
+<div class="d-flex justify-content-between align-items-center mb-4">
+    <h1><i class="bi bi-tools"></i> Maintenance Requests</h1>
+    <button class="btn btn-primary" @onclick="CreateNew">
+        <i class="bi bi-plus-circle"></i> New Request
+    </button>
+</div>
+
+@if (isLoading)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else
+{
+    <!-- Summary Cards -->
+    <div class="row mb-4">
+        <div class="col-md-3">
+            <div class="card text-white bg-danger">
+                <div class="card-body">
+                    <h6>Urgent</h6>
+                    <h3>@urgentRequests.Count</h3>
+                    <small>High priority requests</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white bg-warning">
+                <div class="card-body">
+                    <h6>In Progress</h6>
+                    <h3>@inProgressRequests.Count</h3>
+                    <small>Currently being worked on</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white bg-primary">
+                <div class="card-body">
+                    <h6>Submitted</h6>
+                    <h3>@submittedRequests.Count</h3>
+                    <small>Awaiting assignment</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white bg-success">
+                <div class="card-body">
+                    <h6>Completed</h6>
+                    <h3>@completedRequests.Count</h3>
+                    <small>This month</small>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Filters -->
+    <div class="card mb-3">
+        <div class="card-body">
+            <div class="row g-3">
+                <div class="col-md-3">
+                    <label class="form-label small">Status</label>
+                    <select class="form-select" @onchange="OnStatusFilterChanged">
+                        <option value="">All Statuses</option>
+                        @foreach (var status in ApplicationConstants.MaintenanceRequestStatuses.AllMaintenanceRequestStatuses)
+                        {
+                            <option value="@status">@status</option>
+                        }
+                    </select>
+                </div>
+                <div class="col-md-3">
+                    <label class="form-label small">Priority</label>
+                    <select class="form-select" @onchange="OnPriorityFilterChanged">
+                        <option value="">All Priorities</option>
+                        @foreach (var priority in ApplicationConstants.MaintenanceRequestPriorities.AllMaintenanceRequestPriorities)
+                        {
+                            <option value="@priority">@priority</option>
+                        }
+                    </select>
+                </div>
+                <div class="col-md-3">
+                    <label class="form-label small">Request Type</label>
+                    <select class="form-select" @onchange="OnTypeFilterChanged">
+                        <option value="">All Types</option>
+                        @foreach (var type in ApplicationConstants.MaintenanceRequestTypes.AllMaintenanceRequestTypes)
+                        {
+                            <option value="@type">@type</option>
+                        }
+                    </select>
+                </div>
+                <div class="col-md-3 d-flex align-items-end">
+                    <button class="btn btn-outline-secondary w-100" @onclick="ClearFilters">
+                        <i class="bi bi-x-circle"></i> Clear Filters
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Overdue Requests -->
+    @if (overdueRequests.Any())
+    {
+        <div class="card mb-3">
+            <div class="card-header bg-danger text-white">
+                <h5 class="mb-0"><i class="bi bi-exclamation-triangle-fill"></i> Overdue Requests</h5>
+            </div>
+            <div class="card-body p-0">
+                <div class="table-responsive">
+                    <table class="table table-hover mb-0">
+                        <thead>
+                            <tr>
+                                <th>ID</th>
+                                <th>Property</th>
+                                <th>Title</th>
+                                <th>Type</th>
+                                <th>Priority</th>
+                                <th>Scheduled</th>
+                                <th>Days Open</th>
+                                <th>Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach (var request in overdueRequests)
+                            {
+                                <tr>
+                                    <td>@request.Id</td>
+                                    <td>
+                                        <small>@request.Property?.Address</small>
+                                    </td>
+                                    <td>@request.Title</td>
+                                    <td><small>@request.RequestType</small></td>
+                                    <td><span class="badge @request.PriorityBadgeClass">@request.Priority</span></td>
+                                    <td><small>@request.ScheduledOn?.ToString("MMM dd")</small></td>
+                                    <td><span class="badge bg-danger">@request.DaysOpen days</span></td>
+                                    <td>
+                                        <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewRequest(request.Id)">
+                                            <i class="bi bi-eye"></i>
+                                        </button>
+                                    </td>
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    }
+
+    <!-- All Requests -->
+    <div class="card">
+        <div class="card-header">
+            <h5 class="mb-0">
+                <i class="bi bi-list-ul"></i> 
+                @if (!string.IsNullOrEmpty(currentStatusFilter))
+                {
+                    <span>@currentStatusFilter Requests</span>
+                }
+                else
+                {
+                    <span>All Requests</span>
+                }
+                <small class="text-muted">(@filteredRequests.Count)</small>
+            </h5>
+        </div>
+        <div class="card-body p-0">
+            @if (filteredRequests.Any())
+            {
+                <div class="table-responsive">
+                    <table class="table table-hover mb-0">
+                        <thead>
+                            <tr>
+                                <th>ID</th>
+                                <th>Property</th>
+                                <th>Title</th>
+                                <th>Type</th>
+                                <th>Priority</th>
+                                <th>Status</th>
+                                <th>Requested</th>
+                                <th>Assigned To</th>
+                                <th>Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach (var request in filteredRequests)
+                            {
+                                <tr>
+                                    <td>@request.Id</td>
+                                    <td>
+                                        <small>@request.Property?.Address</small>
+                                    </td>
+                                    <td>
+                                        @request.Title
+                                        @if (request.IsOverdue)
+                                        {
+                                            <i class="bi bi-exclamation-triangle-fill text-danger" title="Overdue"></i>
+                                        }
+                                    </td>
+                                    <td><small>@request.RequestType</small></td>
+                                    <td><span class="badge @request.PriorityBadgeClass">@request.Priority</span></td>
+                                    <td><span class="badge @request.StatusBadgeClass">@request.Status</span></td>
+                                    <td><small>@request.RequestedOn.ToString("MMM dd, yyyy")</small></td>
+                                    <td><small>@(string.IsNullOrEmpty(request.AssignedTo) ? "Unassigned" : request.AssignedTo)</small></td>
+                                    <td>
+                                        <div class="btn-group btn-group-sm">
+                                            <button class="btn btn-outline-primary" @onclick="() => ViewRequest(request.Id)" title="View">
+                                                <i class="bi bi-eye"></i>
+                                            </button>
+                                            <button class="btn btn-outline-secondary" @onclick="() => ViewProperty(request.PropertyId)" title="View Property">
+                                                <i class="bi bi-house"></i>
+                                            </button>
+                                        </div>
+                                    </td>
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                </div>
+            }
+            else
+            {
+                <div class="text-center py-5">
+                    <i class="bi bi-inbox" style="font-size: 3rem; color: #ccc;"></i>
+                    <p class="text-muted mt-3">No maintenance requests found</p>
+                </div>
+            }
+        </div>
+    </div>
+}
+
+@code {
+    private List<MaintenanceRequest> allRequests = new();
+    private List<MaintenanceRequest> filteredRequests = new();
+    private List<MaintenanceRequest> urgentRequests = new();
+    private List<MaintenanceRequest> inProgressRequests = new();
+    private List<MaintenanceRequest> submittedRequests = new();
+    private List<MaintenanceRequest> completedRequests = new();
+    private List<MaintenanceRequest> overdueRequests = new();
+    
+    private string currentStatusFilter = "";
+    private string currentPriorityFilter = "";
+    private string currentTypeFilter = "";
+    
+    private bool isLoading = true;
+
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public Guid? PropertyId { get; set; }
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadData();
+    }
+
+    private async Task LoadData()
+    {
+        isLoading = true;
+        try
+        {
+            allRequests = await MaintenanceService.GetAllAsync();
+            
+            if (PropertyId.HasValue)
+            {
+                allRequests = allRequests.Where(r => r.PropertyId == PropertyId.Value).ToList();
+            }
+            
+            // Summary cards
+            urgentRequests = allRequests.Where(r => r.Priority == "Urgent" && r.Status != "Completed" && r.Status != "Cancelled").ToList();
+            inProgressRequests = allRequests.Where(r => r.Status == "In Progress").ToList();
+            submittedRequests = allRequests.Where(r => r.Status == "Submitted").ToList();
+            completedRequests = allRequests.Where(r => r.Status == "Completed" && r.CompletedOn?.Month == DateTime.Today.Month).ToList();
+            overdueRequests = await MaintenanceService.GetOverdueMaintenanceRequestsAsync();
+            
+            ApplyFilters();
+        }
+        finally
+        {
+            isLoading = false;
+        }
+    }
+
+    private void ApplyFilters()
+    {
+        filteredRequests = allRequests;
+
+        if (!string.IsNullOrEmpty(currentStatusFilter))
+        {
+            filteredRequests = filteredRequests.Where(r => r.Status == currentStatusFilter).ToList();
+        }
+
+        if (!string.IsNullOrEmpty(currentPriorityFilter))
+        {
+            filteredRequests = filteredRequests.Where(r => r.Priority == currentPriorityFilter).ToList();
+        }
+
+        if (!string.IsNullOrEmpty(currentTypeFilter))
+        {
+            filteredRequests = filteredRequests.Where(r => r.RequestType == currentTypeFilter).ToList();
+        }
+    }
+
+    private void OnStatusFilterChanged(ChangeEventArgs e)
+    {
+        currentStatusFilter = e.Value?.ToString() ?? "";
+        ApplyFilters();
+    }
+
+    private void OnPriorityFilterChanged(ChangeEventArgs e)
+    {
+        currentPriorityFilter = e.Value?.ToString() ?? "";
+        ApplyFilters();
+    }
+
+    private void OnTypeFilterChanged(ChangeEventArgs e)
+    {
+        currentTypeFilter = e.Value?.ToString() ?? "";
+        ApplyFilters();
+    }
+
+    private void ClearFilters()
+    {
+        currentStatusFilter = "";
+        currentPriorityFilter = "";
+        currentTypeFilter = "";
+        ApplyFilters();
+    }
+
+    private void CreateNew()
+    {
+        NavigationManager.NavigateTo("/propertymanagement/maintenance/create");
+    }
+
+    private void ViewRequest(Guid requestId)
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/maintenance/{requestId}");
+    }
+
+    private void ViewProperty(Guid propertyId)
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/properties/{propertyId}");
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/MaintenanceRequests/MaintenanceViewForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/MaintenanceRequests/MaintenanceViewForm.razor
new file mode 100644
index 0000000..fdc81b2
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/MaintenanceRequests/MaintenanceViewForm.razor
@@ -0,0 +1,297 @@
+@inject MaintenanceService MaintenanceService
+@inject NavigationManager NavigationManager
+
+@if (isLoading)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else if (maintenanceRequest == null)
+{
+    <div class="alert alert-warning">
+        <i class="bi bi-exclamation-triangle"></i> Maintenance request not found.
+    </div>
+}
+else
+{
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <h1><i class="bi bi-tools"></i> Maintenance Request #@maintenanceRequest.Id</h1>
+        <div class="btn-group">
+            <button class="btn btn-outline-primary" @onclick="Edit">
+                <i class="bi bi-pencil"></i> Edit
+            </button>
+            <button class="btn btn-outline-secondary" @onclick="GoBack">
+                <i class="bi bi-arrow-left"></i> Back to List
+            </button>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-8">
+            <!-- Request Details Card -->
+            <div class="card mb-3">
+                <div class="card-header d-flex justify-content-between align-items-center">
+                    <h5 class="mb-0">Request Details</h5>
+                    <div>
+                        <span class="badge @maintenanceRequest.PriorityBadgeClass me-2">@maintenanceRequest.Priority</span>
+                        <span class="badge @maintenanceRequest.StatusBadgeClass">@maintenanceRequest.Status</span>
+                    </div>
+                </div>
+                <div class="card-body">
+                    <div class="row mb-3">
+                        <div class="col-md-6">
+                            <label class="text-muted small">Property</label>
+                            <p class="mb-0">
+                                <strong>@maintenanceRequest.Property?.Address</strong><br />
+                                <small class="text-muted">@maintenanceRequest.Property?.City, @maintenanceRequest.Property?.State @maintenanceRequest.Property?.ZipCode</small>
+                            </p>
+                        </div>
+                        <div class="col-md-6">
+                            <label class="text-muted small">Request Type</label>
+                            <p class="mb-0"><strong>@maintenanceRequest.RequestType</strong></p>
+                        </div>
+                    </div>
+
+                    <div class="mb-3">
+                        <label class="text-muted small">Title</label>
+                        <p class="mb-0"><strong>@maintenanceRequest.Title</strong></p>
+                    </div>
+
+                    <div class="mb-3">
+                        <label class="text-muted small">Description</label>
+                        <p class="mb-0" style="white-space: pre-wrap;">@maintenanceRequest.Description</p>
+                    </div>
+
+                    @if (maintenanceRequest.LeaseId.HasValue && maintenanceRequest.Lease != null)
+                    {
+                        <div class="mb-3">
+                            <label class="text-muted small">Associated Lease</label>
+                            <p class="mb-0">
+                                Lease #@maintenanceRequest.LeaseId - @maintenanceRequest.Lease.Tenant?.FullName
+                            </p>
+                        </div>
+                    }
+                </div>
+            </div>
+
+            <!-- Contact Information Card -->
+            <div class="card mb-3">
+                <div class="card-header">
+                    <h5 class="mb-0">Contact Information</h5>
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-md-4">
+                            <label class="text-muted small">Requested By</label>
+                            <p class="mb-0">@(string.IsNullOrEmpty(maintenanceRequest.RequestedBy) ? "N/A" : maintenanceRequest.RequestedBy)</p>
+                        </div>
+                        <div class="col-md-4">
+                            <label class="text-muted small">Email</label>
+                            <p class="mb-0">@(string.IsNullOrEmpty(maintenanceRequest.RequestedByEmail) ? "N/A" : maintenanceRequest.RequestedByEmail)</p>
+                        </div>
+                        <div class="col-md-4">
+                            <label class="text-muted small">Phone</label>
+                            <p class="mb-0">@(string.IsNullOrEmpty(maintenanceRequest.RequestedByPhone) ? "N/A" : maintenanceRequest.RequestedByPhone)</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Timeline Card -->
+            <div class="card mb-3">
+                <div class="card-header">
+                    <h5 class="mb-0">Timeline</h5>
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-md-4">
+                            <label class="text-muted small">Requested Date</label>
+                            <p class="mb-0">@maintenanceRequest.RequestedOn.ToString("MMM dd, yyyy")</p>
+                        </div>
+                        <div class="col-md-4">
+                            <label class="text-muted small">Scheduled Date</label>
+                            <p class="mb-0">@(maintenanceRequest.ScheduledOn?.ToString("MMM dd, yyyy") ?? "Not scheduled")</p>
+                        </div>
+                        <div class="col-md-4">
+                            <label class="text-muted small">Completed Date</label>
+                            <p class="mb-0">@(maintenanceRequest.CompletedOn?.ToString("MMM dd, yyyy") ?? "Not completed")</p>
+                        </div>
+                    </div>
+
+                    @if (maintenanceRequest.Status != "Completed" && maintenanceRequest.Status != "Cancelled")
+                    {
+                        <div class="mt-3">
+                            <label class="text-muted small">Days Open</label>
+                            <p class="mb-0">
+                                <span class="badge bg-info">@maintenanceRequest.DaysOpen days</span>
+                            </p>
+                        </div>
+                    }
+
+                    @if (maintenanceRequest.IsOverdue)
+                    {
+                        <div class="alert alert-danger mt-3 mb-0">
+                            <i class="bi bi-exclamation-triangle-fill"></i> <strong>Overdue</strong> - Scheduled date has passed
+                        </div>
+                    }
+                </div>
+            </div>
+
+            <!-- Assignment & Cost Card -->
+            <div class="card mb-3">
+                <div class="card-header">
+                    <h5 class="mb-0">Assignment & Cost</h5>
+                </div>
+                <div class="card-body">
+                    <div class="row mb-3">
+                        <div class="col-md-6">
+                            <label class="text-muted small">Assigned To</label>
+                            <p class="mb-0">@(string.IsNullOrEmpty(maintenanceRequest.AssignedTo) ? "Unassigned" : maintenanceRequest.AssignedTo)</p>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-6">
+                            <label class="text-muted small">Estimated Cost</label>
+                            <p class="mb-0">@maintenanceRequest.EstimatedCost.ToString("C")</p>
+                        </div>
+                        <div class="col-md-6">
+                            <label class="text-muted small">Actual Cost</label>
+                            <p class="mb-0">@maintenanceRequest.ActualCost.ToString("C")</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Resolution Notes Card -->
+            @if (!string.IsNullOrEmpty(maintenanceRequest.ResolutionNotes) || maintenanceRequest.Status == "Completed")
+            {
+                <div class="card mb-3">
+                    <div class="card-header">
+                        <h5 class="mb-0">Resolution Notes</h5>
+                    </div>
+                    <div class="card-body">
+                        <p class="mb-0" style="white-space: pre-wrap;">@(string.IsNullOrEmpty(maintenanceRequest.ResolutionNotes) ? "No notes provided" : maintenanceRequest.ResolutionNotes)</p>
+                    </div>
+                </div>
+            }
+        </div>
+
+        <div class="col-md-4">
+            <!-- Quick Actions Card -->
+            <div class="card mb-3">
+                <div class="card-header">
+                    <h5 class="mb-0">Quick Actions</h5>
+                </div>
+                <div class="card-body">
+                    @if (maintenanceRequest.Status != "Completed" && maintenanceRequest.Status != "Cancelled")
+                    {
+                        <div class="d-grid gap-2">
+                            @if (maintenanceRequest.Status == "Submitted")
+                            {
+                                <button class="btn btn-warning" @onclick='() => UpdateStatus("In Progress")'>
+                                    <i class="bi bi-play-circle"></i> Start Work
+                                </button>
+                            }
+                            @if (maintenanceRequest.Status == "In Progress")
+                            {
+                                <button class="btn btn-success" @onclick='() => UpdateStatus("Completed")'>
+                                    <i class="bi bi-check-circle"></i> Mark Complete
+                                </button>
+                            }
+                            <button class="btn btn-outline-danger" @onclick='() => UpdateStatus("Cancelled")'>
+                                <i class="bi bi-x-circle"></i> Cancel Request
+                            </button>
+                        </div>
+                    }
+                    else
+                    {
+                        <div class="alert alert-info mb-0">
+                            <i class="bi bi-info-circle"></i> Request is @maintenanceRequest.Status.ToLower()
+                        </div>
+                    }
+                </div>
+            </div>
+
+            <!-- Property Info Card -->
+            @if (maintenanceRequest.Property != null)
+            {
+                <div class="card">
+                    <div class="card-header">
+                        <h5 class="mb-0">Property Info</h5>
+                    </div>
+                    <div class="card-body">
+                        <p class="mb-2"><strong>@maintenanceRequest.Property.Address</strong></p>
+                        <p class="mb-2">
+                            <small class="text-muted">
+                                @maintenanceRequest.Property.City, @maintenanceRequest.Property.State @maintenanceRequest.Property.ZipCode
+                            </small>
+                        </p>
+                        <p class="mb-2">
+                            <small>Type: @maintenanceRequest.Property.PropertyType</small>
+                        </p>
+                        <button class="btn btn-sm btn-outline-primary w-100 mt-2" @onclick="ViewProperty">
+                            <i class="bi bi-house"></i> View Property
+                        </button>
+                    </div>
+                </div>
+            }
+        </div>
+    </div>
+}
+
+@code {
+    [Parameter]
+    public Guid MaintenanceRequestId { get; set; }
+
+    private MaintenanceRequest? maintenanceRequest;
+    private bool isLoading = true;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadMaintenanceRequest();
+    }
+
+    private async Task LoadMaintenanceRequest()
+    {
+        isLoading = true;
+        try
+        {
+            maintenanceRequest = await MaintenanceService.GetByIdAsync(MaintenanceRequestId);
+        }
+        finally
+        {
+            isLoading = false;
+        }
+    }
+
+    private async Task UpdateStatus(string newStatus)
+    {
+        if (maintenanceRequest != null)
+        {
+            await MaintenanceService.UpdateMaintenanceRequestStatusAsync(maintenanceRequest.Id, newStatus);
+            // TODO: Add toast notification for status update
+            await LoadMaintenanceRequest();
+        }
+    }
+
+    private void Edit()
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/maintenance/{MaintenanceRequestId}/edit");
+    }
+
+    private void ViewProperty()
+    {
+        if (maintenanceRequest?.PropertyId != null)
+        {
+            NavigationManager.NavigateTo($"/propertymanagement/properties/{maintenanceRequest.PropertyId}");
+        }
+    }
+
+    private void GoBack()
+    {
+        NavigationManager.NavigateTo("/propertymanagement/maintenance");
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Payments/CreateForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Payments/CreateForm.razor
new file mode 100644
index 0000000..cee2403
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Payments/CreateForm.razor
@@ -0,0 +1,277 @@
+@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Forms
+@using System.ComponentModel.DataAnnotations
+@inject NavigationManager Navigation
+@inject PaymentService PaymentService
+@inject InvoiceService InvoiceService
+
+<div class="row">
+    <div class="col-lg-8">
+        <div class="d-flex justify-content-between align-items-center mb-4">
+            <h1><span class="bi bi-cash-coin" aria-hidden="true"></span> Record Payment</h1>
+            <button class="btn btn-outline-secondary" @onclick="Cancel">
+                <i class="bi bi-x-lg"></i> Cancel
+            </button>
+        </div>
+
+        @if (invoices == null || !invoices.Any())
+        {
+            <div class="alert alert-warning">
+                <h4>No Unpaid Invoices</h4>
+                <p>There are no outstanding invoices to record payments for.</p>
+                <a href="/propertymanagement/invoices" class="btn btn-primary">Go to Invoices</a>
+            </div>
+        }
+        else
+        {
+            <div class="card">
+                <div class="card-body">
+                    <Microsoft.AspNetCore.Components.Forms.EditForm Model="paymentModel" OnValidSubmit="HandleCreatePayment" FormName="CreatePayment">
+                        <DataAnnotationsValidator />
+                        <ValidationSummary class="text-danger" />
+
+                        <div class="mb-3">
+                            <label for="invoice" class="form-label">Invoice *</label>
+                            <InputSelect id="invoice" class="form-select" @bind-Value="paymentModel.InvoiceId" @bind-Value:after="OnInvoiceSelected">
+                                <option value="0">-- Select Invoice --</option>
+                                @foreach (var invoice in invoices)
+                                {
+                                    var displayText = $"{invoice.InvoiceNumber} - {invoice.Lease?.Property?.Address} - {invoice.Lease?.Tenant?.FullName} - Balance: {invoice.BalanceDue:C}";
+                                    <option value="@invoice.Id">@displayText</option>
+                                }
+                            </InputSelect>
+                            <ValidationMessage For="() => paymentModel.InvoiceId" />
+                        </div>
+
+                        <div class="mb-3">
+                            <label for="paymentDate" class="form-label">Payment Date *</label>
+                            <InputDate id="paymentDate" class="form-control" @bind-Value="paymentModel.PaidOn" />
+                            <ValidationMessage For="() => paymentModel.PaidOn" />
+                        </div>
+
+                        <div class="mb-3">
+                            <label for="amount" class="form-label">Amount *</label>
+                            <InputNumber id="amount" class="form-control" @bind-Value="paymentModel.Amount" />
+                            <ValidationMessage For="() => paymentModel.Amount" />
+                            @if (selectedInvoice != null)
+                            {
+                                <small class="text-muted">Invoice balance due: @selectedInvoice.BalanceDue.ToString("C")</small>
+                            }
+                        </div>
+
+                        <div class="mb-3">
+                            <label for="paymentMethod" class="form-label">Payment Method *</label>
+                            <InputSelect id="paymentMethod" class="form-select" @bind-Value="paymentModel.PaymentMethod">
+                                <option value="">-- Select Payment Method --</option>
+                                <option value="Cash">Cash</option>
+                                <option value="Check">Check</option>
+                                <option value="Credit Card">Credit Card</option>
+                                <option value="Debit Card">Debit Card</option>
+                                <option value="Bank Transfer">Bank Transfer</option>
+                                <option value="Online Payment">Online Payment</option>
+                                <option value="Other">Other</option>
+                            </InputSelect>
+                            <ValidationMessage For="() => paymentModel.PaymentMethod" />
+                        </div>
+
+                        <div class="mb-3">
+                            <label for="notes" class="form-label">Notes</label>
+                            <InputTextArea id="notes" class="form-control" rows="3" @bind-Value="paymentModel.Notes" />
+                            <ValidationMessage For="() => paymentModel.Notes" />
+                        </div>
+
+                        <div class="d-flex justify-content-between">
+                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
+                            <button type="submit" class="btn btn-primary">
+                                <i class="bi bi-check-lg"></i> Record Payment
+                            </button>
+                        </div>
+                    </Microsoft.AspNetCore.Components.Forms.EditForm>
+                </div>
+            </div>
+        }
+    </div>
+
+    <div class="col-lg-4">
+        @if (selectedInvoice != null)
+        {
+            <div class="card mb-3">
+                <div class="card-header">
+                    <h6 class="card-title mb-0">Invoice Summary</h6>
+                </div>
+                <div class="card-body">
+                    <div class="mb-3">
+                        <label class="text-muted small">Invoice Number</label>
+                        <p class="fw-bold">@selectedInvoice.InvoiceNumber</p>
+                    </div>
+                    <div class="mb-3">
+                        <label class="text-muted small">Property</label>
+                        <p>@selectedInvoice.Lease?.Property?.Address</p>
+                    </div>
+                    <div class="mb-3">
+                        <label class="text-muted small">Tenant</label>
+                        <p>@selectedInvoice.Lease?.Tenant?.FullName</p>
+                    </div>
+                    <hr />
+                    <div class="mb-2">
+                        <div class="d-flex justify-content-between">
+                            <span class="text-muted">Invoice Amount:</span>
+                            <span class="fw-bold">@selectedInvoice.Amount.ToString("C")</span>
+                        </div>
+                    </div>
+                    <div class="mb-2">
+                        <div class="d-flex justify-content-between">
+                            <span class="text-muted">Already Paid:</span>
+                            <span class="text-success">@selectedInvoice.AmountPaid.ToString("C")</span>
+                        </div>
+                    </div>
+                    <div class="mb-3">
+                        <div class="d-flex justify-content-between">
+                            <span class="text-muted">Balance Due:</span>
+                            <span class="fw-bold text-danger">@selectedInvoice.BalanceDue.ToString("C")</span>
+                        </div>
+                    </div>
+                    @if (paymentModel.Amount > 0)
+                    {
+                        <hr />
+                        <div class="mb-2">
+                            <div class="d-flex justify-content-between">
+                                <span class="text-muted">This Payment:</span>
+                                <span class="fw-bold text-success">@paymentModel.Amount.ToString("C")</span>
+                            </div>
+                        </div>
+                        <div>
+                            <div class="d-flex justify-content-between">
+                                <span class="text-muted">Remaining Balance:</span>
+                                <span class="fw-bold @(remainingBalance <= 0 ? "text-success" : "text-warning")">
+                                    @remainingBalance.ToString("C")
+                                </span>
+                            </div>
+                        </div>
+                        @if (remainingBalance < 0)
+                        {
+                            <div class="alert alert-warning mt-2 mb-0">
+                                <small>Warning: Payment amount exceeds balance due.</small>
+                            </div>
+                        }
+                        else if (remainingBalance == 0)
+                        {
+                            <div class="alert alert-success mt-2 mb-0">
+                                <small>This payment will mark the invoice as Paid.</small>
+                            </div>
+                        }
+                        else
+                        {
+                            <div class="alert alert-info mt-2 mb-0">
+                                <small>This will be a partial payment.</small>
+                            </div>
+                        }
+                    }
+                </div>
+            </div>
+        }
+        else
+        {
+            <div class="card">
+                <div class="card-body text-center text-muted">
+                    <i class="bi bi-info-circle fs-1"></i>
+                    <p class="mt-2">Select an invoice to see details</p>
+                </div>
+            </div>
+        }
+    </div>
+</div>
+
+@code {
+    private List<Invoice>? invoices;
+    private Invoice? selectedInvoice;
+    private PaymentModel paymentModel = new();
+    private decimal remainingBalance => selectedInvoice != null ? selectedInvoice.BalanceDue - paymentModel.Amount : 0;
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public Guid? InvoiceId { get; set; }
+
+    protected override async Task OnInitializedAsync()
+    {
+        var authState = await AuthenticationStateTask;
+        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+
+        
+            // Get all invoices and filter to those with outstanding balance
+            List<Invoice>? allInvoices = await InvoiceService.GetAllAsync();
+            invoices = allInvoices
+                .Where(i => i.BalanceDue > 0 && i.Status != "Cancelled")
+                .OrderByDescending(i => i.DueOn)
+                .ToList();
+            
+            paymentModel.PaidOn = DateTime.Now;
+            if (InvoiceId.HasValue)
+            {
+                paymentModel.InvoiceId = InvoiceId.Value;
+                await OnInvoiceSelected();
+            }
+    }
+
+    private async Task OnInvoiceSelected()
+    {
+        if (paymentModel.InvoiceId != Guid.Empty)
+        {
+            selectedInvoice = invoices?.FirstOrDefault(i => i.Id == paymentModel.InvoiceId);
+            if (selectedInvoice != null)
+            {
+                // Default payment amount to the balance due
+                paymentModel.Amount = selectedInvoice.BalanceDue;
+            }
+        }
+        else
+        {
+            selectedInvoice = null;
+            paymentModel.Amount = 0;
+        }
+
+        await InvokeAsync(StateHasChanged);
+    }
+
+    private async Task HandleCreatePayment()
+    {
+        Payment payment = new Payment
+        {
+            InvoiceId = paymentModel.InvoiceId,
+            PaidOn = paymentModel.PaidOn,
+            Amount = paymentModel.Amount,
+            PaymentMethod = paymentModel.PaymentMethod,
+            Notes = paymentModel.Notes!
+        };
+        await PaymentService.CreateAsync(payment);
+        
+        Navigation.NavigateTo($"/propertymanagement/invoices/{paymentModel.InvoiceId}");
+    }
+
+    private void Cancel()
+    {
+        Navigation.NavigateTo($"/propertymanagement/invoices/{paymentModel.InvoiceId}");
+    }
+
+    public class PaymentModel
+    {
+        [Required(ErrorMessage = "Please select an invoice.")]
+        public Guid InvoiceId { get; set; }
+
+        [Required(ErrorMessage = "Payment date is required.")]
+        public DateTime PaidOn { get; set; } = DateTime.Now;
+
+        [Required(ErrorMessage = "Amount is required.")]
+        [Range(0.01, double.MaxValue, ErrorMessage = "Amount must be greater than zero.")]
+        public decimal Amount { get; set; }
+
+        [Required(ErrorMessage = "Payment method is required.")]
+        public string PaymentMethod { get; set; } = string.Empty;
+
+        [MaxLength(1000)]
+        public string? Notes { get; set; } = string.Empty;
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Payments/EditForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Payments/EditForm.razor
new file mode 100644
index 0000000..93914cb
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Payments/EditForm.razor
@@ -0,0 +1,272 @@
+@using Aquiis.Application.Services
+@using Aquiis.Core.Entities
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Forms
+@using System.ComponentModel.DataAnnotations
+@inject NavigationManager Navigation
+@inject PaymentService PaymentService
+
+@if (payment == null || paymentModel == null)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else
+{
+    <div class="row">
+        <div class="col-lg-8">
+            <div class="d-flex justify-content-between align-items-center mb-4">
+                <h1><span class="bi bi-pencil" aria-hidden="true"></span> Edit Payment</h1>
+                <button class="btn btn-outline-secondary" @onclick="Cancel">
+                    <i class="bi bi-x-lg"></i> Cancel
+                </button>
+            </div>
+
+            <div class="card">
+                <div class="card-body">
+                    <Microsoft.AspNetCore.Components.Forms.EditForm Model="paymentModel" OnValidSubmit="HandleUpdatePayment" FormName="EditPayment">
+                        <DataAnnotationsValidator />
+                        <ValidationSummary class="text-danger" />
+
+                        <div class="mb-3">
+                            <label for="invoice" class="form-label">Invoice</label>
+                            <input type="text" id="invoice" class="form-control" value="@payment.Invoice?.InvoiceNumber" disabled />
+                            <small class="text-muted">Invoice cannot be changed after payment is created.</small>
+                        </div>
+
+                        <div class="mb-3">
+                            <label for="paymentDate" class="form-label">Payment Date *</label>
+                            <InputDate id="paymentDate" class="form-control" @bind-Value="paymentModel.PaidOn" />
+                            <ValidationMessage For="() => paymentModel.PaidOn" />
+                        </div>
+
+                        <div class="mb-3">
+                            <label for="amount" class="form-label">Amount *</label>
+                            <InputNumber id="amount" class="form-control" @bind-Value="paymentModel.Amount" />
+                            <ValidationMessage For="() => paymentModel.Amount" />
+                            @if (payment.Invoice != null)
+                            {
+                                <small class="text-muted">
+                                    Current invoice balance (before this edit): @currentInvoiceBalance.ToString("C")
+                                </small>
+                            }
+                        </div>
+
+                        <div class="mb-3">
+                            <label for="paymentMethod" class="form-label">Payment Method *</label>
+                            <InputSelect id="paymentMethod" class="form-select" @bind-Value="paymentModel.PaymentMethod">
+                                <option value="">-- Select Payment Method --</option>
+                                <option value="Cash">Cash</option>
+                                <option value="Check">Check</option>
+                                <option value="Credit Card">Credit Card</option>
+                                <option value="Debit Card">Debit Card</option>
+                                <option value="Bank Transfer">Bank Transfer</option>
+                                <option value="Online Payment">Online Payment</option>
+                                <option value="Other">Other</option>
+                            </InputSelect>
+                            <ValidationMessage For="() => paymentModel.PaymentMethod" />
+                        </div>
+
+                        <div class="mb-3">
+                            <label for="notes" class="form-label">Notes</label>
+                            <InputTextArea id="notes" class="form-control" rows="3" @bind-Value="paymentModel.Notes" />
+                            <ValidationMessage For="() => paymentModel.Notes" />
+                        </div>
+
+                        <div class="d-flex justify-content-between">
+                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
+                            <button type="submit" class="btn btn-primary">
+                                <i class="bi bi-check-lg"></i> Save Changes
+                            </button>
+                        </div>
+                    </Microsoft.AspNetCore.Components.Forms.EditForm>
+                </div>
+            </div>
+        </div>
+
+        <div class="col-lg-4">
+            @if (payment.Invoice != null)
+            {
+                <div class="card mb-3">
+                    <div class="card-header">
+                        <h6 class="card-title mb-0">Invoice Information</h6>
+                    </div>
+                    <div class="card-body">
+                        <div class="mb-3">
+                            <label class="text-muted small">Invoice Number</label>
+                            <p class="fw-bold">
+                                <a href="/propertymanagement/invoices/view/@payment.Invoice.Id">
+                                    @payment.Invoice.InvoiceNumber
+                                </a>
+                            </p>
+                        </div>
+                        <div class="mb-3">
+                            <label class="text-muted small">Property</label>
+                            <p>@payment.Invoice.Lease?.Property?.Address</p>
+                        </div>
+                        <div class="mb-3">
+                            <label class="text-muted small">Tenant</label>
+                            <p>@payment.Invoice.Lease?.Tenant?.FullName</p>
+                        </div>
+                        <hr />
+                        <div class="mb-2">
+                            <div class="d-flex justify-content-between">
+                                <span class="text-muted">Invoice Amount:</span>
+                                <span class="fw-bold">@payment.Invoice.Amount.ToString("C")</span>
+                            </div>
+                        </div>
+                        <div class="mb-2">
+                            <div class="d-flex justify-content-between">
+                                <span class="text-muted">Total Paid:</span>
+                                <span class="text-success">@payment.Invoice.AmountPaid.ToString("C")</span>
+                            </div>
+                        </div>
+                        <div class="mb-3">
+                            <div class="d-flex justify-content-between">
+                                <span class="text-muted">Balance Due:</span>
+                                <span class="fw-bold @(payment.Invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
+                                    @payment.Invoice.BalanceDue.ToString("C")
+                                </span>
+                            </div>
+                        </div>
+                        <div class="mb-2">
+                            <div class="d-flex justify-content-between">
+                                <span class="text-muted">Status:</span>
+                                <span>
+                                    @if (payment.Invoice.Status == "Paid")
+                                    {
+                                        <span class="badge bg-success">@payment.Invoice.Status</span>
+                                    }
+                                    else if (payment.Invoice.Status == "Partial")
+                                    {
+                                        <span class="badge bg-warning">Partially Paid</span>
+                                    }
+                                    else if (payment.Invoice.Status == "Overdue")
+                                    {
+                                        <span class="badge bg-danger">@payment.Invoice.Status</span>
+                                    }
+                                    else
+                                    {
+                                        <span class="badge bg-secondary">@payment.Invoice.Status</span>
+                                    }
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="card">
+                    <div class="card-header">
+                        <h6 class="card-title mb-0">Current Payment</h6>
+                    </div>
+                    <div class="card-body">
+                        <div class="mb-3">
+                            <label class="text-muted small">Original Amount</label>
+                            <p class="fw-bold">@payment.Amount.ToString("C")</p>
+                        </div>
+                        @if (paymentModel.Amount != payment.Amount)
+                        {
+                            <div class="mb-3">
+                                <label class="text-muted small">New Amount</label>
+                                <p class="fw-bold text-primary">@paymentModel.Amount.ToString("C")</p>
+                            </div>
+                            <div class="mb-3">
+                                <label class="text-muted small">Change</label>
+                                <p class="fw-bold @(amountDifference >= 0 ? "text-success" : "text-danger")">
+                                    @(amountDifference >= 0 ? "+" : "")@amountDifference.ToString("C")
+                                </p>
+                            </div>
+                            <hr />
+                            <div>
+                                <label class="text-muted small">New Invoice Balance</label>
+                                <p class="fw-bold @(newInvoiceBalance > 0 ? "text-danger" : "text-success")">
+                                    @newInvoiceBalance.ToString("C")
+                                </p>
+                            </div>
+                            @if (newInvoiceBalance < 0)
+                            {
+                                <div class="alert alert-warning mt-2 mb-0">
+                                    <small>Warning: Total payments exceed invoice amount.</small>
+                                </div>
+                            }
+                            else if (newInvoiceBalance == 0)
+                            {
+                                <div class="alert alert-success mt-2 mb-0">
+                                    <small>Invoice will be marked as Paid.</small>
+                                </div>
+                            }
+                        }
+                    </div>
+                </div>
+            }
+        </div>
+    </div>
+}
+
+@code {
+    [Parameter]
+    public Guid PaymentId { get; set; }
+
+    private Payment? payment;
+    private PaymentModel? paymentModel;
+
+    private decimal currentInvoiceBalance => payment?.Invoice != null ? payment.Invoice.BalanceDue + payment.Amount : 0;
+    private decimal amountDifference => paymentModel != null && payment != null ? paymentModel.Amount - payment.Amount : 0;
+    private decimal newInvoiceBalance => currentInvoiceBalance - (paymentModel?.Amount ?? 0) + (payment?.Amount ?? 0);
+
+    protected override async Task OnInitializedAsync()
+    {
+        payment = await PaymentService.GetByIdAsync(PaymentId);
+
+        if (payment == null)
+        {
+            Navigation.NavigateTo("/propertymanagement/payments");
+            return;
+        }
+
+        paymentModel = new PaymentModel
+        {
+            PaidOn = payment.PaidOn,
+            Amount = payment.Amount,
+            PaymentMethod = payment.PaymentMethod,
+            Notes = payment.Notes
+        };
+    }
+
+    private async Task HandleUpdatePayment()
+    {
+        if (payment == null || paymentModel == null) return;
+
+        payment.PaidOn = paymentModel.PaidOn;
+        payment.Amount = paymentModel.Amount;
+        payment.PaymentMethod = paymentModel.PaymentMethod;
+        payment.Notes = paymentModel.Notes!;
+
+        await PaymentService.UpdateAsync(payment);
+        Navigation.NavigateTo("/propertymanagement/payments");
+    }
+
+    private void Cancel()
+    {
+        Navigation.NavigateTo("/propertymanagement/payments");
+    }
+
+    public class PaymentModel
+    {
+        [Required(ErrorMessage = "Payment date is required.")]
+        public DateTime PaidOn { get; set; }
+
+        [Required(ErrorMessage = "Amount is required.")]
+        [Range(0.01, double.MaxValue, ErrorMessage = "Amount must be greater than zero.")]
+        public decimal Amount { get; set; }
+
+        [Required(ErrorMessage = "Payment method is required.")]
+        public string PaymentMethod { get; set; } = string.Empty;
+
+        [MaxLength(1000)]
+        public string? Notes { get; set; }
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Payments/ListForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Payments/ListForm.razor
new file mode 100644
index 0000000..7cb8196
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Payments/ListForm.razor
@@ -0,0 +1,484 @@
+@using Aquiis.Core.Entities
+@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Forms
+@inject NavigationManager Navigation
+@inject PaymentService PaymentService
+@inject IJSRuntime JSRuntime
+
+<div class="d-flex justify-content-between align-items-center mb-4">
+    <h1><span class="bi bi-cash-coin" aria-hidden="true"></span> Payments</h1>
+    <button class="btn btn-primary" @onclick="CreatePayment">
+        <i class="bi bi-plus-lg"></i> Record Payment
+    </button>
+</div>
+
+@if (payments == null)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else if (!payments.Any())
+{
+    <div class="alert alert-info">
+        <h4>No Payments Found</h4>
+        <p>Get started by recording your first payment.</p>
+        <button class="btn btn-primary" @onclick="CreatePayment">Record First Payment</button>
+    </div>
+}
+else
+{
+    <div class="row mb-3">
+        <div class="col-md-3">
+            <div class="input-group">
+                <span class="input-group-text"><i class="bi bi-search"></i></span>
+                <input type="text" class="form-control" placeholder="Search payments..." @bind="searchTerm" @onkeyup="FilterPayments" />
+            </div>
+        </div>
+        <div class="col-md-3">
+            <select class="form-select" @bind="selectedMethod" @bind:after="FilterPayments">
+                <option value="">All Payment Methods</option>
+                <option value="Cash">Cash</option>
+                <option value="Check">Check</option>
+                <option value="Credit Card">Credit Card</option>
+                <option value="Debit Card">Debit Card</option>
+                <option value="Bank Transfer">Bank Transfer</option>
+                <option value="Online Payment">Online Payment</option>
+                <option value="Other">Other</option>
+            </select>
+        </div>
+        <div class="col-md-3">
+            <div class="form-check form-switch pt-2">
+                <input class="form-check-input" type="checkbox" id="groupByInvoice" @bind="groupByInvoice" @bind:after="FilterPayments">
+                <label class="form-check-label" for="groupByInvoice">
+                    Group by Invoice
+                </label>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <button class="btn btn-outline-secondary" @onclick="ClearFilters">
+                <i class="bi bi-x-circle"></i> Clear Filters
+            </button>
+        </div>
+    </div>
+
+    <div class="row mb-3">
+        <div class="col-md-3">
+            <div class="card text-white bg-success">
+                <div class="card-body">
+                    <h6>Total Payments</h6>
+                    <h4>@paymentsCount</h4>
+                    <small>@totalAmount.ToString("C")</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white bg-primary">
+                <div class="card-body">
+                    <h6>This Month</h6>
+                    <h4>@thisMonthCount</h4>
+                    <small>@thisMonthAmount.ToString("C")</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white bg-info">
+                <div class="card-body">
+                    <h6>This Year</h6>
+                    <h4>@thisYearCount</h4>
+                    <small>@thisYearAmount.ToString("C")</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white bg-warning">
+                <div class="card-body">
+                    <h6>Average Payment</h6>
+                    <h4>@averageAmount.ToString("C")</h4>
+                    <small>Per transaction</small>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="card">
+        <div class="card-body">
+            @if (groupByInvoice)
+            {
+                @foreach (var invoiceGroup in groupedPayments)
+                {
+                    var invoice = invoiceGroup.First().Invoice;
+                    var invoiceTotal = invoiceGroup.Sum(p => p.Amount);
+                    var isExpanded = expandedInvoices.Contains(invoiceGroup.Key);
+                    
+                    <div class="card mb-3">
+                        <div class="card-header" style="cursor: pointer;" @onclick="() => ToggleInvoiceGroup(invoiceGroup.Key)">
+                            <div class="d-flex justify-content-between align-items-center">
+                                <div>
+                                    <i class="bi @(isExpanded ? "bi-chevron-down" : "bi-chevron-right")"></i>
+                                    <strong>Invoice: @invoice?.InvoiceNumber</strong>
+                                    <span class="ms-3 text-muted">@invoice?.Lease?.Property?.Address</span>
+                                    <span class="ms-2 text-muted">• @invoice?.Lease?.Tenant?.FullName</span>
+                                </div>
+                                <div>
+                                    <span class="badge bg-secondary me-2">@invoiceGroup.Count() payment(s)</span>
+                                    <strong class="text-success">@invoiceTotal.ToString("C")</strong>
+                                </div>
+                            </div>
+                        </div>
+                        @if (isExpanded)
+                        {
+                            <div class="card-body p-0">
+                                <table class="table table-hover mb-0">
+                                    <thead class="table">
+                                        <tr>
+                                            <th>Payment Date</th>
+                                            <th>Amount</th>
+                                            <th>Payment Method</th>
+                                            <th>Notes</th>
+                                            <th>Actions</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach (var payment in invoiceGroup)
+                                        {
+                                            <tr @onclick="() => ViewPayment(payment.Id)" style="cursor: pointer;">
+                                                <td>@payment.PaidOn.ToString("MMM dd, yyyy")</td>
+                                                <td><strong class="text-success">@payment.Amount.ToString("C")</strong></td>
+                                                <td><span class="badge bg-secondary">@payment.PaymentMethod</span></td>
+                                                <td>@(string.IsNullOrEmpty(payment.Notes) ? "-" : payment.Notes)</td>
+                                                <td @onclick:stopPropagation="true">
+                                                    <div class="btn-group" role="group">
+                                                        <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewPayment(payment.Id)" title="View">
+                                                            <i class="bi bi-eye"></i>
+                                                        </button>
+                                                        <button class="btn btn-sm btn-outline-secondary" @onclick="() => EditPayment(payment.Id)" title="Edit">
+                                                            <i class="bi bi-pencil"></i>
+                                                        </button>
+                                                        <button class="btn btn-sm btn-outline-danger" @onclick="() => DeletePayment(payment)" title="Delete">
+                                                            <i class="bi bi-trash"></i>
+                                                        </button>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        }
+                                    </tbody>
+                                </table>
+                            </div>
+                        }
+                    </div>
+                }
+            }
+            else
+            {
+                <div class="table-responsive">
+                    <table class="table table-hover">
+                        <thead>
+                            <tr>
+                                <th>
+                                    <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Payment.PaidOn))">
+                                        Payment Date
+                                        @if (sortColumn == nameof(Payment.PaidOn))
+                                        {
+                                            <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
+                                        }
+                                    </button>
+                                </th>
+                                <th>Invoice #</th>
+                                <th>Property</th>
+                                <th>Tenant</th>
+                                <th>
+                                    <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Payment.Amount))">
+                                        Amount
+                                        @if (sortColumn == nameof(Payment.Amount))
+                                        {
+                                            <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
+                                        }
+                                    </button>
+                                </th>
+                                <th>Payment Method</th>
+                                <th>Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach (var payment in pagedPayments)
+                            {
+                                <tr @onclick="() => ViewPayment(payment.Id)" style="cursor: pointer;">
+                                    <td>@payment.PaidOn.ToString("MMM dd, yyyy")</td>
+                                    <td>
+                                        <a href="/propertymanagement/invoices/view/@payment.InvoiceId" @onclick:stopPropagation="true">
+                                            @payment.Invoice?.InvoiceNumber
+                                        </a>
+                                    </td>
+                                    <td>@payment.Invoice?.Lease?.Property?.Address</td>
+                                    <td>@payment.Invoice?.Lease?.Tenant?.FullName</td>
+                                    <td><strong class="text-success">@payment.Amount.ToString("C")</strong></td>
+                                    <td>
+                                        <span class="badge bg-secondary">@payment.PaymentMethod</span>
+                                    </td>
+                                    <td @onclick:stopPropagation="true">
+                                        <div class="btn-group" role="group">
+                                            <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewPayment(payment.Id)" title="View">
+                                                <i class="bi bi-eye"></i>
+                                            </button>
+                                            <button class="btn btn-sm btn-outline-secondary" @onclick="() => EditPayment(payment.Id)" title="Edit">
+                                                <i class="bi bi-pencil"></i>
+                                            </button>
+                                            <button class="btn btn-sm btn-outline-danger" @onclick="() => DeletePayment(payment)" title="Delete">
+                                                <i class="bi bi-trash"></i>
+                                            </button>
+                                        </div>
+                                    </td>
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                </div>
+            }
+
+            @if (totalPages > 1 && !groupByInvoice)
+            {
+                <div class="d-flex justify-content-between align-items-center mt-3">
+                    <div>
+                        <select class="form-select form-select-sm" @bind="pageSize" @bind:after="UpdatePagination">
+                            <option value="10">10 per page</option>
+                            <option value="20">20 per page</option>
+                            <option value="50">50 per page</option>
+                            <option value="100">100 per page</option>
+                        </select>
+                    </div>
+                    <div class="text-muted">
+                        Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords payments
+                    </div>
+                    <nav>
+                        <ul class="pagination pagination-sm mb-0">
+                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
+                                <button class="page-link" @onclick="FirstPage" disabled="@(currentPage == 1)">
+                                    <i class="bi bi-chevron-double-left"></i>
+                                </button>
+                            </li>
+                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
+                                <button class="page-link" @onclick="PreviousPage" disabled="@(currentPage == 1)">
+                                    <i class="bi bi-chevron-left"></i>
+                                </button>
+                            </li>
+                            @for (int i = Math.Max(1, currentPage - 2); i <= Math.Min(totalPages, currentPage + 2); i++)
+                            {
+                                var pageNum = i;
+                                <li class="page-item @(currentPage == pageNum ? "active" : "")">
+                                    <button class="page-link" @onclick="() => GoToPage(pageNum)">@pageNum</button>
+                                </li>
+                            }
+                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
+                                <button class="page-link" @onclick="NextPage" disabled="@(currentPage == totalPages)">
+                                    <i class="bi bi-chevron-right"></i>
+                                </button>
+                            </li>
+                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
+                                <button class="page-link" @onclick="LastPage" disabled="@(currentPage == totalPages)">
+                                    <i class="bi bi-chevron-double-right"></i>
+                                </button>
+                            </li>
+                        </ul>
+                    </nav>
+                </div>
+            }
+        </div>
+    </div>
+}
+
+@code {
+    private List<Payment>? payments;
+    private List<Payment> filteredPayments = new();
+    private List<Payment> pagedPayments = new();
+    private IEnumerable<IGrouping<Guid, Payment>> groupedPayments = Enumerable.Empty<IGrouping<Guid, Payment>>();
+    private HashSet<Guid> expandedInvoices = new();
+    private string searchTerm = string.Empty;
+    private string selectedMethod = string.Empty;
+    private string sortColumn = nameof(Payment.PaidOn);
+    private bool sortAscending = false;
+    private bool groupByInvoice = true;
+    
+    private int paymentsCount = 0;
+    private int thisMonthCount = 0;
+    private int thisYearCount = 0;
+    private decimal totalAmount = 0;
+    private decimal thisMonthAmount = 0;
+    private decimal thisYearAmount = 0;
+    private decimal averageAmount = 0;
+    
+    private int currentPage = 1;
+    private int pageSize = 20;
+    private int totalPages = 1;
+    private int totalRecords = 0;
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadPayments();
+    }
+
+    private async Task LoadPayments()
+    {
+        var authState = await AuthenticationStateTask;
+        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+
+        if (!string.IsNullOrEmpty(userId))
+        {
+            payments = await PaymentService.GetPaymentsWithRelationsAsync();
+            FilterPayments();
+            UpdateStatistics();
+        }
+    }
+
+    private void FilterPayments()
+    {
+        if (payments == null) return;
+
+        filteredPayments = payments.Where(p =>
+        {
+            bool matchesSearch = string.IsNullOrWhiteSpace(searchTerm) ||
+                (p.Invoice?.InvoiceNumber?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ?? false) ||
+                (p.Invoice?.Lease?.Property?.Address?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ?? false) ||
+                (p.Invoice?.Lease?.Tenant?.FullName?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ?? false) ||
+                p.PaymentMethod.Contains(searchTerm, StringComparison.OrdinalIgnoreCase);
+
+            bool matchesMethod = string.IsNullOrWhiteSpace(selectedMethod) ||
+                p.PaymentMethod.Equals(selectedMethod, StringComparison.OrdinalIgnoreCase);
+
+            return matchesSearch && matchesMethod;
+        }).ToList();
+
+        SortPayments();
+        
+        if (groupByInvoice)
+        {
+            groupedPayments = filteredPayments
+                .GroupBy(p => p.InvoiceId)
+                .OrderByDescending(g => g.Max(p => p.PaidOn))
+                .ToList();
+        }
+        else
+        {
+            UpdatePagination();
+        }
+    }
+
+    private void ToggleInvoiceGroup(Guid invoiceId)
+    {
+        if (expandedInvoices.Contains(invoiceId))
+        {
+            expandedInvoices.Remove(invoiceId);
+        }
+        else
+        {
+            expandedInvoices.Add(invoiceId);
+        }
+    }
+
+    private void SortBy(string column)
+    {
+        if (sortColumn == column)
+        {
+            sortAscending = !sortAscending;
+        }
+        else
+        {
+            sortColumn = column;
+            sortAscending = true;
+        }
+        SortPayments();
+        UpdatePagination();
+    }
+
+    private void SortPayments()
+    {
+        filteredPayments = sortColumn switch
+        {
+            nameof(Payment.PaidOn) => sortAscending
+                ? filteredPayments.OrderBy(p => p.PaidOn).ToList()
+                : filteredPayments.OrderByDescending(p => p.PaidOn).ToList(),
+            nameof(Payment.Amount) => sortAscending
+                ? filteredPayments.OrderBy(p => p.Amount).ToList()
+                : filteredPayments.OrderByDescending(p => p.Amount).ToList(),
+            _ => filteredPayments.OrderByDescending(p => p.PaidOn).ToList()
+        };
+    }
+
+    private void UpdateStatistics()
+    {
+        if (payments == null) return;
+
+        var now = DateTime.Now;
+        var firstDayOfMonth = new DateTime(now.Year, now.Month, 1);
+        var firstDayOfYear = new DateTime(now.Year, 1, 1);
+
+        paymentsCount = payments.Count;
+        thisMonthCount = payments.Count(p => p.PaidOn >= firstDayOfMonth);
+        thisYearCount = payments.Count(p => p.PaidOn >= firstDayOfYear);
+        
+        totalAmount = payments.Sum(p => p.Amount);
+        thisMonthAmount = payments.Where(p => p.PaidOn >= firstDayOfMonth).Sum(p => p.Amount);
+        thisYearAmount = payments.Where(p => p.PaidOn >= firstDayOfYear).Sum(p => p.Amount);
+        averageAmount = paymentsCount > 0 ? totalAmount / paymentsCount : 0;
+    }
+
+    private void UpdatePagination()
+    {
+        totalRecords = filteredPayments.Count;
+        totalPages = (int)Math.Ceiling(totalRecords / (double)pageSize);
+        currentPage = Math.Min(currentPage, Math.Max(1, totalPages));
+        
+        pagedPayments = filteredPayments
+            .Skip((currentPage - 1) * pageSize)
+            .Take(pageSize)
+            .ToList();
+    }
+
+    private void ClearFilters()
+    {
+        searchTerm = string.Empty;
+        selectedMethod = string.Empty;
+        groupByInvoice = false;
+        FilterPayments();
+    }
+
+    private void FirstPage() => GoToPage(1);
+    private void LastPage() => GoToPage(totalPages);
+    private void NextPage() => GoToPage(currentPage + 1);
+    private void PreviousPage() => GoToPage(currentPage - 1);
+    
+    private void GoToPage(int page)
+    {
+        currentPage = Math.Max(1, Math.Min(page, totalPages));
+        UpdatePagination();
+    }
+
+    private void CreatePayment()
+    {
+        Navigation.NavigateTo("/propertymanagement/payments/create");
+    }
+
+    private void ViewPayment(Guid id)
+    {
+        Navigation.NavigateTo($"/propertymanagement/payments/{id}");
+    }
+
+    private void EditPayment(Guid id)
+    {
+        Navigation.NavigateTo($"/propertymanagement/payments/{id}/edit");
+    }
+
+    private async Task DeletePayment(Payment payment)
+    {
+        if (await JSRuntime.InvokeAsync<bool>("confirm", $"Are you sure you want to delete this payment of {payment.Amount:C}?"))
+        {
+            await PaymentService.DeleteAsync(payment.Id);
+            await LoadPayments();
+        }
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Payments/ViewForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Payments/ViewForm.razor
new file mode 100644
index 0000000..d3fae63
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Payments/ViewForm.razor
@@ -0,0 +1,441 @@
+@using Aquiis.Core.Entities
+@using Microsoft.AspNetCore.Components.Authorization
+@inject NavigationManager Navigation
+@inject PaymentService PaymentService
+@inject Application.Services.DocumentService DocumentService
+@inject IJSRuntime JSRuntime
+
+@if (payment == null)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else
+{
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <div>
+            <h1><span class="bi bi-cash-coin" aria-hidden="true"></span> Payment Details</h1>
+            <p class="text-muted">Payment Date: @payment.PaidOn.ToString("MMMM dd, yyyy")</p>
+        </div>
+        <div>
+            <button class="btn btn-outline-secondary me-2" @onclick="GoBack">
+                <i class="bi bi-arrow-left"></i> Back to Payments
+            </button>
+            <button class="btn btn-primary" @onclick="EditPayment">
+                <i class="bi bi-pencil"></i> Edit
+            </button>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-lg-8">
+            <div class="card mb-3">
+                <div class="card-header">
+                    <h5 class="card-title mb-0">Payment Information</h5>
+                </div>
+                <div class="card-body">
+                    <div class="row mb-3">
+                        <div class="col-md-6">
+                            <label class="text-muted small">Payment Date</label>
+                            <p class="fw-bold">@payment.PaidOn.ToString("MMMM dd, yyyy")</p>
+                        </div>
+                        <div class="col-md-6">
+                            <label class="text-muted small">Amount</label>
+                            <p class="fw-bold text-success fs-4">@payment.Amount.ToString("C")</p>
+                        </div>
+                    </div>
+                    <div class="row mb-3">
+                        <div class="col-md-6">
+                            <label class="text-muted small">Payment Method</label>
+                            <p class="fw-bold">
+                                <span class="badge bg-secondary">@payment.PaymentMethod</span>
+                            </p>
+                        </div>
+                    </div>
+                    @if (!string.IsNullOrWhiteSpace(payment.Notes))
+                    {
+                        <div class="row">
+                            <div class="col-12">
+                                <label class="text-muted small">Notes</label>
+                                <p>@payment.Notes</p>
+                            </div>
+                        </div>
+                    }
+                </div>
+            </div>
+
+            <div class="card mb-3">
+                <div class="card-header">
+                    <h5 class="card-title mb-0">Invoice Information</h5>
+                </div>
+                <div class="card-body">
+                    @if (payment.Invoice != null)
+                    {
+                        <div class="row mb-3">
+                            <div class="col-md-6">
+                                <label class="text-muted small">Invoice Number</label>
+                                <p class="fw-bold">
+                                    <a href="/propertymanagement/invoices/@payment.Invoice.Id">
+                                        @payment.Invoice.InvoiceNumber
+                                    </a>
+                                </p>
+                            </div>
+                            <div class="col-md-6">
+                                <label class="text-muted small">Invoice Status</label>
+                                <p>
+                                    @if (payment.Invoice.Status == "Paid")
+                                    {
+                                        <span class="badge bg-success">@payment.Invoice.Status</span>
+                                    }
+                                    else if (payment.Invoice.Status == "Partial")
+                                    {
+                                        <span class="badge bg-warning">Partially Paid</span>
+                                    }
+                                    else if (payment.Invoice.Status == "Overdue")
+                                    {
+                                        <span class="badge bg-danger">@payment.Invoice.Status</span>
+                                    }
+                                    else
+                                    {
+                                        <span class="badge bg-secondary">@payment.Invoice.Status</span>
+                                    }
+                                </p>
+                            </div>
+                        </div>
+                        <div class="row mb-3">
+                            <div class="col-md-4">
+                                <label class="text-muted small">Invoice Amount</label>
+                                <p class="fw-bold">@payment.Invoice.Amount.ToString("C")</p>
+                            </div>
+                            <div class="col-md-4">
+                                <label class="text-muted small">Total Paid</label>
+                                <p class="fw-bold text-success">@payment.Invoice.AmountPaid.ToString("C")</p>
+                            </div>
+                            <div class="col-md-4">
+                                <label class="text-muted small">Balance Due</label>
+                                <p class="fw-bold @(payment.Invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
+                                    @payment.Invoice.BalanceDue.ToString("C")
+                                </p>
+                            </div>
+                        </div>
+                        <div class="row mb-3">
+                            <div class="col-md-6">
+                                <label class="text-muted small">Invoice Date</label>
+                                <p>@payment.Invoice.InvoicedOn.ToString("MMM dd, yyyy")</p>
+                            </div>
+                            <div class="col-md-6">
+                                <label class="text-muted small">Due Date</label>
+                                <p class="@(payment.Invoice.IsOverdue ? "text-danger fw-bold" : "")">
+                                    @payment.Invoice.DueOn.ToString("MMM dd, yyyy")
+                                    @if (payment.Invoice.IsOverdue)
+                                    {
+                                        <span class="badge bg-danger ms-2">@payment.Invoice.DaysOverdue days overdue</span>
+                                    }
+                                </p>
+                            </div>
+                        </div>
+                        @if (!string.IsNullOrWhiteSpace(payment.Invoice.Description))
+                        {
+                            <div class="row">
+                                <div class="col-12">
+                                    <label class="text-muted small">Description</label>
+                                    <p>@payment.Invoice.Description</p>
+                                </div>
+                            </div>
+                        }
+                    }
+                </div>
+            </div>
+
+            @if (payment.Invoice?.Lease != null)
+            {
+                <div class="card mb-3">
+                    <div class="card-header">
+                        <h5 class="card-title mb-0">Lease & Property Information</h5>
+                    </div>
+                    <div class="card-body">
+                        <div class="row mb-3">
+                            <div class="col-md-6">
+                                <label class="text-muted small">Property Address</label>
+                                <p class="fw-bold">
+                                    <a href="/propertymanagement/properties/@payment.Invoice.Lease.PropertyId">
+                                        @payment.Invoice.Lease.Property?.Address
+                                    </a>
+                                </p>
+                            </div>
+                            <div class="col-md-6">
+                                <label class="text-muted small">Tenant</label>
+                                <p class="fw-bold">
+                                    <a href="/propertymanagement/tenants/@payment.Invoice.Lease.TenantId">
+                                        @payment.Invoice.Lease.Tenant?.FullName
+                                    </a>
+                                </p>
+                            </div>
+                        </div>
+                        <div class="row mb-3">
+                            <div class="col-md-6">
+                                <label class="text-muted small">Monthly Rent</label>
+                                <p class="fw-bold">@payment.Invoice.Lease.MonthlyRent.ToString("C")</p>
+                            </div>
+                            <div class="col-md-6">
+                                <label class="text-muted small">Lease Status</label>
+                                <p>
+                                    @if (payment.Invoice.Lease.Status == "Active")
+                                    {
+                                        <span class="badge bg-success">@payment.Invoice.Lease.Status</span>
+                                    }
+                                    else if (payment.Invoice.Lease.Status == "Expired")
+                                    {
+                                        <span class="badge bg-danger">@payment.Invoice.Lease.Status</span>
+                                    }
+                                    else
+                                    {
+                                        <span class="badge bg-secondary">@payment.Invoice.Lease.Status</span>
+                                    }
+                                </p>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-6">
+                                <label class="text-muted small">Lease Start</label>
+                                <p>@payment.Invoice.Lease.StartDate.ToString("MMM dd, yyyy")</p>
+                            </div>
+                            <div class="col-md-6">
+                                <label class="text-muted small">Lease End</label>
+                                <p>@payment.Invoice.Lease.EndDate.ToString("MMM dd, yyyy")</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            }
+        </div>
+
+        <div class="col-lg-4">
+            <div class="card mb-3">
+                <div class="card-header">
+                    <h6 class="card-title mb-0">Quick Actions</h6>
+                </div>
+                <div class="card-body">
+                    <div class="d-grid gap-2">
+                        <button class="btn btn-primary" @onclick="EditPayment">
+                            <i class="bi bi-pencil"></i> Edit Payment
+                        </button>
+                        @if (payment.DocumentId == null)
+                        {
+                            <button class="btn btn-outline-success" @onclick="GeneratePaymentReceipt" disabled="@isGenerating">
+                                @if (isGenerating)
+                                {
+                                    <span class="spinner-border spinner-border-sm me-1" role="status"></span>
+                                }
+                                else
+                                {
+                                    <i class="bi bi-file-pdf"></i>
+                                }
+                                Generate Receipt
+                            </button>
+                        }
+                        else
+                        {
+                            <button class="btn btn-success" @onclick="ViewDocument">
+                                <i class="bi bi-eye"></i> View Receipt
+                            </button>
+                            <button class="btn btn-outline-success" @onclick="DownloadDocument">
+                                <i class="bi bi-download"></i> Download Receipt
+                            </button>
+                        }
+                        <a href="/propertymanagement/invoices/@payment.InvoiceId" class="btn btn-outline-primary">
+                            <i class="bi bi-receipt"></i> View Invoice
+                        </a>
+                        @if (payment.Invoice?.Lease != null)
+                        {
+                            <a href="/propertymanagement/leases/@payment.Invoice.LeaseId" class="btn btn-outline-secondary">
+                                <i class="bi bi-file-text"></i> View Lease
+                            </a>
+                            <a href="/propertymanagement/properties/@payment.Invoice.Lease.PropertyId" class="btn btn-outline-secondary">
+                                <i class="bi bi-house"></i> View Property
+                            </a>
+                            <a href="/propertymanagement/tenants/@payment.Invoice.Lease.TenantId" class="btn btn-outline-secondary">
+                                <i class="bi bi-person"></i> View Tenant
+                            </a>
+                        }
+                    </div>
+                </div>
+            </div>
+
+            <div class="card">
+                <div class="card-header">
+                    <h6 class="card-title mb-0">Metadata</h6>
+                </div>
+                <div class="card-body">
+                    <div class="mb-3">
+                        <label class="text-muted small">Created</label>
+                        <p class="mb-0">@payment.CreatedOn.ToString("g")</p>
+                        @if (!string.IsNullOrEmpty(payment.CreatedBy))
+                        {
+                            <small class="text-muted">by @payment.CreatedBy</small>
+                        }
+                    </div>
+                    @if (payment.LastModifiedOn.HasValue)
+                    {
+                        <div>
+                            <label class="text-muted small">Last Modified</label>
+                            <p class="mb-0">@payment.LastModifiedOn.Value.ToString("g")</p>
+                            @if (!string.IsNullOrEmpty(payment.LastModifiedBy))
+                            {
+                                <small class="text-muted">by @payment.LastModifiedBy</small>
+                            }
+                        </div>
+                    }
+                </div>
+            </div>
+
+            <div class="card mt-3">
+                <div class="card-header">
+                    <h6 class="card-title mb-0">Status Guide</h6>
+                </div>
+                <div class="card-body">
+                    <small class="text-muted d-block mb-3">Payment status definitions:</small>
+                    
+                    <div class="d-flex align-items-start mb-2">
+                        <span class="badge bg-success me-2" style="min-width: 100px;">Completed</span>
+                        <span class="small">Payment successfully processed</span>
+                    </div>
+                    
+                    <div class="d-flex align-items-start mb-2">
+                        <span class="badge bg-warning me-2" style="min-width: 100px;">Pending</span>
+                        <span class="small">Payment submitted, awaiting clearance</span>
+                    </div>
+                    
+                    <div class="d-flex align-items-start mb-2">
+                        <span class="badge bg-danger me-2" style="min-width: 100px;">Failed</span>
+                        <span class="small">Payment attempt failed (bounced check, declined card)</span>
+                    </div>
+                    
+                    <div class="d-flex align-items-start mb-2">
+                        <span class="badge bg-info me-2" style="min-width: 100px;">Refunded</span>
+                        <span class="small">Payment returned to payer</span>
+                    </div>
+                    
+                    <div class="d-flex align-items-start">
+                        <span class="badge bg-secondary me-2" style="min-width: 100px;">Voided</span>
+                        <span class="small">Created in error, cancelled before processing</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+}
+
+@code {
+    [Parameter]
+    public Guid PaymentId { get; set; }
+
+    private Payment? payment;
+    private bool isGenerating = false;
+    private Document? document = null;
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    protected override async Task OnInitializedAsync()
+    {
+        payment = await PaymentService.GetByIdAsync(PaymentId);
+        
+        if (payment == null)
+        {
+            Navigation.NavigateTo("/propertymanagement/payments");
+        }
+        else if (payment.DocumentId != null)
+        {
+            // Load the document if it exists
+            document = await DocumentService.GetByIdAsync(payment.DocumentId.Value);
+        }
+    }
+
+    private void EditPayment()
+    {
+        Navigation.NavigateTo($"/propertymanagement/payments/{PaymentId}/edit");
+    }
+
+    private void GoBack()
+    {
+        Navigation.NavigateTo("/propertymanagement/payments");
+    }
+
+    private async Task ViewDocument()
+    {
+        if (document != null)
+        {
+            var base64Data = Convert.ToBase64String(document.FileData);
+            await JSRuntime.InvokeVoidAsync("viewFile", base64Data, document.FileType);
+        }
+    }
+
+    private async Task DownloadDocument()
+    {
+        if (document != null)
+        {
+            var fileName = document.FileName;
+            var fileData = document.FileData;
+            var mimeType = document.FileType;
+
+            await JSRuntime.InvokeVoidAsync("downloadFile", fileName, Convert.ToBase64String(fileData), mimeType);
+        }
+    }
+
+    private async Task GeneratePaymentReceipt()
+    {
+        isGenerating = true;
+        StateHasChanged();
+
+        try
+        {
+            // Generate the PDF receipt
+            byte[] pdfBytes = Aquiis.Application.Services.PdfGenerators.PaymentPdfGenerator.GeneratePaymentReceipt(payment!);
+
+            // Create the document entity
+            var document = new Document
+            {
+                FileName = $"Receipt_{payment!.PaidOn:yyyyMMdd}_{DateTime.Now:HHmmss}.pdf",
+                FileExtension = ".pdf",
+                FileData = pdfBytes,
+                FileSize = pdfBytes.Length,
+                FileType = "application/pdf",
+                ContentType = "application/pdf",
+                DocumentType = "Payment Receipt",
+                Description = $"Payment receipt for {payment.Amount:C} on {payment.PaidOn:MMM dd, yyyy}",
+                LeaseId = payment.Invoice?.LeaseId,
+                PropertyId = payment.Invoice?.Lease?.PropertyId,
+                TenantId = payment.Invoice?.Lease?.TenantId,
+                InvoiceId = payment.InvoiceId,
+                IsDeleted = false
+            };
+
+            // Save to database
+            await DocumentService.CreateAsync(document);
+
+            // Update payment with DocumentId
+            payment.DocumentId = document.Id;
+           
+            await PaymentService.UpdateAsync(payment);
+
+            // Reload payment and document
+            this.document = document;
+            StateHasChanged();
+
+            await JSRuntime.InvokeVoidAsync("alert", "Payment receipt generated successfully!");
+        }
+        catch (Exception ex)
+        {
+            await JSRuntime.InvokeVoidAsync("alert", $"Error generating payment receipt: {ex.Message}");
+        }
+        finally
+        {
+            isGenerating = false;
+            StateHasChanged();
+        }
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Properties/PropertyCreateForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Properties/PropertyCreateForm.razor
new file mode 100644
index 0000000..dd507ea
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Properties/PropertyCreateForm.razor
@@ -0,0 +1,64 @@
+@using Aquiis.Core.Constants
+@using Aquiis.Core.Entities
+@using Aquiis.UI.Shared.Components.Entities.Properties
+@inject NavigationManager Navigation
+@inject PropertyService PropertyService
+@namespace Aquiis.UI.Shared.Features.PropertyManagement.Properties
+
+<div class="row">
+    <div class="col-md-8">
+        <div class="card">
+            <div class="card-header">
+                <h3 class="card-title mb-0">Add New Property</h3>
+            </div>
+            <div class="card-body">
+                <PropertyForm 
+                    Model="@propertyModel" 
+                    FormName="create-property"
+                    SubmitButtonText="Create Property"
+                    IsSubmitting="@isSubmitting"
+                    ErrorMessage="@errorMessage"
+                    OnValidSubmit="@SaveProperty"
+                    OnCancel="@Cancel" />
+            </div>
+        </div>
+    </div>
+</div>
+
+@code {
+    private PropertyFormModel propertyModel = new();
+    private bool isSubmitting = false;
+    private string errorMessage = string.Empty;
+
+    private async Task SaveProperty(PropertyFormModel model)
+    {
+        isSubmitting = true;
+        errorMessage = string.Empty;
+
+        var property = new Property
+        {
+            Address = model.Address,
+            UnitNumber = model.UnitNumber,
+            City = model.City,
+            State = model.State,
+            ZipCode = model.ZipCode,
+            PropertyType = model.PropertyType,
+            MonthlyRent = model.MonthlyRent,
+            Bedrooms = model.Bedrooms,
+            Bathrooms = model.Bathrooms,
+            SquareFeet = model.SquareFeet,
+            Description = model.Description,
+            Status = model.Status,
+            IsAvailable = model.IsAvailable,
+        };
+
+        await PropertyService.CreateAsync(property);
+        isSubmitting = false;
+        Navigation.NavigateTo("/propertymanagement/properties");
+    }
+
+    private void Cancel()
+    {
+        Navigation.NavigateTo("/propertymanagement/properties");
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Properties/PropertyEditForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Properties/PropertyEditForm.razor
new file mode 100644
index 0000000..e0f4c29
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Properties/PropertyEditForm.razor
@@ -0,0 +1,183 @@
+@using Aquiis.Core.Entities
+@using Aquiis.Core.Constants
+@using Aquiis.UI.Shared.Components.Entities.Properties
+@using Microsoft.AspNetCore.Components.Authorization
+@inject PropertyService PropertyService
+@inject NavigationManager NavigationManager
+@namespace Aquiis.UI.Shared.Features.PropertyManagement.Properties
+
+@if (property == null)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else if (!isAuthorized)
+{
+    <div class="alert alert-danger">
+        <h4>Access Denied</h4>
+        <p>You don't have permission to edit this property.</p>
+        <a href="/propertymanagement/properties" class="btn btn-primary">Back to Properties</a>
+    </div>
+}
+else
+{
+    <div class="row">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">
+                    <h3 class="card-title mb-0">Edit Property</h3>
+                </div>
+                <div class="card-body">
+                    <PropertyForm 
+                        Model="@propertyModel" 
+                        FormName="edit-property"
+                        SubmitButtonText="Update Property"
+                        IsSubmitting="@isSubmitting"
+                        ErrorMessage="@errorMessage"
+                        OnValidSubmit="UpdatePropertyAsync"
+                        OnCancel="Cancel" />
+                </div>
+            </div>
+        </div>
+
+        <div class="col-md-4">
+            <div class="card">
+                <div class="card-header">
+                    <h5 class="mb-0">Property Actions</h5>
+                </div>
+                <div class="card-body">
+                    <div class="d-grid gap-2">
+                        <button class="btn btn-outline-primary" @onclick="ViewProperty">
+                            <i class="bi bi-eye"></i> View Property
+                        </button>
+                        <button class="btn btn-outline-danger" @onclick="DeleteProperty">
+                            <i class="bi bi-trash"></i> Delete Property
+                        </button>
+                    </div>
+                </div>
+            </div>
+
+            <PropertyDetails Property="@property" ShowDates="true" />
+        </div>
+    </div>
+}
+
+@code {
+    [Parameter]
+    public Guid PropertyId { get; set; }
+
+    private string errorMessage = string.Empty;
+    private Property? property;
+    private PropertyFormModel propertyModel = new();
+    private bool isSubmitting = false;
+    private bool isAuthorized = true;
+    private string successMessage = string.Empty;
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadPropertyAsync();
+    }
+
+    private async Task LoadPropertyAsync()
+    {
+        var authState = await AuthenticationStateTask;
+        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+
+        if (string.IsNullOrEmpty(userId))
+        {
+            isAuthorized = false;
+            return;
+        }
+
+        property = await PropertyService.GetByIdAsync(PropertyId);
+
+        if (property == null)
+        {
+            isAuthorized = false;
+            return;
+        }
+
+        propertyModel = new PropertyFormModel
+        {
+            Address = property.Address,
+            UnitNumber = property.UnitNumber,
+            City = property.City,
+            State = property.State,
+            ZipCode = property.ZipCode,
+            PropertyType = property.PropertyType,
+            MonthlyRent = property.MonthlyRent,
+            Bedrooms = property.Bedrooms,
+            Bathrooms = property.Bathrooms,
+            SquareFeet = property.SquareFeet,
+            Description = property.Description,
+            Status = property.Status,
+            IsAvailable = property.IsAvailable
+        };
+    }
+
+    private async Task DeleteProperty()
+    {
+        if (property != null)
+        {
+            await PropertyService.DeleteAsync(property.Id);
+            NavigationManager.NavigateTo("/propertymanagement/properties");
+        }
+    }
+
+    private void ViewProperty()
+    {
+        if (property != null)
+        {
+            NavigationManager.NavigateTo($"/propertymanagement/properties/{property.Id}");
+        }
+    }
+
+    private async Task UpdatePropertyAsync(PropertyFormModel model)
+    {
+        if (property != null)
+        {
+            try
+            {
+                isSubmitting = true;
+                errorMessage = string.Empty;
+                successMessage = string.Empty;
+
+                property.Address = model.Address;
+                property.UnitNumber = model.UnitNumber;
+                property.City = model.City;
+                property.State = model.State;
+                property.ZipCode = model.ZipCode;
+                property.PropertyType = model.PropertyType;
+                property.MonthlyRent = model.MonthlyRent;
+                property.Bedrooms = model.Bedrooms;
+                property.Bathrooms = model.Bathrooms;
+                property.SquareFeet = model.SquareFeet;
+                property.Description = model.Description;
+                property.Status = model.Status;
+                property.IsAvailable = model.IsAvailable;
+
+                await PropertyService.UpdateAsync(property);
+                NavigationManager.NavigateTo("/propertymanagement/properties");
+            }
+            catch (Exception ex)
+            {
+                errorMessage = $"An error occurred while updating the property: {ex.Message}";
+            }
+            finally
+            {
+                isSubmitting = false;
+            }
+        }
+    }
+
+    private void Cancel()
+    {
+        NavigationManager.NavigateTo("/propertymanagement/properties");
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Properties/PropertyListForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Properties/PropertyListForm.razor
new file mode 100644
index 0000000..a33aac1
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Properties/PropertyListForm.razor
@@ -0,0 +1,343 @@
+@using Aquiis.Core.Constants
+@using Aquiis.Core.Entities
+@using Aquiis.UI.Shared.Components.Entities.Properties
+@using Microsoft.AspNetCore.Components.Authorization
+@using System.Security.Claims
+@inject NavigationManager Navigation
+@inject PropertyService PropertyService
+@inject IJSRuntime JSRuntime
+@namespace Aquiis.UI.Shared.Features.PropertyManagement.Properties
+
+<div class="d-flex justify-content-between align-items-center mb-4">
+    <h1><span class="bi bi-house-fill" aria-hidden="true"></span> Properties</h1>
+    <div class="btn-group">
+        <div class="btn-group me-2" role="group">
+            <button class="btn btn-outline-secondary @(viewMode == PropertyListViewMode.Grid ? "active" : "")" 
+                    @onclick="() => SetViewMode(PropertyListViewMode.Grid)" title="Grid View">
+                <i class="bi bi-grid-3x3-gap"></i>
+            </button>
+            <button class="btn btn-outline-secondary @(viewMode == PropertyListViewMode.Table ? "active" : "")" 
+                    @onclick="() => SetViewMode(PropertyListViewMode.Table)" title="List View">
+                <i class="bi bi-list-ul"></i>
+            </button>
+        </div>
+        @if (!isReadOnlyUser)
+        {
+            <button class="btn btn-primary" @onclick="CreateProperty">
+                <i class="bi bi-plus-lg"></i> Add Property
+            </button>
+        }
+    </div>
+</div>
+
+@if (properties == null)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else if (!filteredProperties.Any())
+{
+    <div class="alert alert-info">
+        <h4>No Properties Found</h4>
+        <p>@(properties.Any() ? "No properties match your search criteria." : "Get started by adding your first property to the system.")</p>
+        @if (!properties.Any())
+        {
+            <button class="btn btn-primary" @onclick="CreateProperty">Add First Property</button>
+        }
+    </div>
+}
+else
+{
+    <PropertyListView 
+        Properties="@pagedProperties"
+        ViewMode="@viewMode"
+        ShowEditDelete="@(!isReadOnlyUser)"
+        SearchTerm="@searchTerm"
+        StatusFilter="@selectedPropertyStatus"
+        SortColumn="@sortColumn"
+        SortAscending="@sortAscending"
+        TotalCount="@totalCount"
+        AvailableCount="@availableCount"
+        PendingCount="@pendingCount"
+        OccupiedCount="@occupiedCount"
+        TotalMonthlyRent="@totalMonthlyRent"
+        OnSearchChanged="HandleSearchChanged"
+        OnStatusFilterChanged="HandleStatusFilterChanged"
+        OnClearFilters="HandleClearFilters"
+        OnSort="HandleSort"
+        OnView="ViewProperty"
+        OnEdit="EditProperty"
+        OnDelete="DeleteProperty" />
+        
+    @if (totalPages > 1)
+    {
+        <div class="card mt-3">
+            <div class="card-footer">
+                <div class="d-flex justify-content-between align-items-center">
+                    <div>
+                        <span class="text-muted">Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords properties</span>
+                    </div>
+                    <nav>
+                        <ul class="pagination mb-0">
+                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
+                                <button class="page-link" @onclick="FirstPage" disabled="@(currentPage == 1)">
+                                    <i class="bi bi-chevron-double-left"></i>
+                                </button>
+                            </li>
+                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
+                                <button class="page-link" @onclick="PreviousPage" disabled="@(currentPage == 1)">
+                                    <i class="bi bi-chevron-left"></i>
+                                </button>
+                            </li>
+                            @for (int i = Math.Max(1, currentPage - 2); i <= Math.Min(totalPages, currentPage + 2); i++)
+                            {
+                                var pageNumber = i;
+                                <li class="page-item @(currentPage == pageNumber ? "active" : "")">
+                                    <button class="page-link" @onclick="() => GoToPage(pageNumber)">@pageNumber</button>
+                                </li>
+                            }
+                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
+                                <button class="page-link" @onclick="NextPage" disabled="@(currentPage == totalPages)">
+                                    <i class="bi bi-chevron-right"></i>
+                                </button>
+                            </li>
+                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
+                                <button class="page-link" @onclick="LastPage" disabled="@(currentPage == totalPages)">
+                                    <i class="bi bi-chevron-double-right"></i>
+                                </button>
+                            </li>
+                        </ul>
+                    </nav>
+                    <div>
+                        <select class="form-select form-select-sm" style="width: auto;" @bind="pageSize" @bind:after="UpdatePagination">
+                            <option value="10">10 per page</option>
+                            <option value="25">25 per page</option>
+                            <option value="50">50 per page</option>
+                            <option value="100">100 per page</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+}
+
+@code {
+    private List<Property> properties = new();
+    private List<Property> filteredProperties = new();
+    private List<Property> sortedProperties = new();
+    private List<Property> pagedProperties = new();
+    private string searchTerm = string.Empty;
+    private string selectedPropertyStatus = string.Empty;
+
+    private int totalCount = 0;
+    private int availableCount = 0;
+    private int pendingCount = 0;
+    private int occupiedCount = 0;
+    private decimal totalMonthlyRent = 0;
+    private PropertyListViewMode viewMode = PropertyListViewMode.Table;
+    
+    // Sorting
+    private string sortColumn = nameof(Property.Address);
+    private bool sortAscending = true;
+    
+    // Pagination
+    private int currentPage = 1;
+    private int pageSize = 25;
+    private int totalPages = 1;
+    private int totalRecords = 0;
+
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public int? PropertyId { get; set; }
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    private string? currentUserRole;
+    private bool isReadOnlyUser => currentUserRole == ApplicationConstants.OrganizationRoles.User;
+
+    protected override async Task OnInitializedAsync()
+    {
+        var authState = await AuthenticationStateTask;
+        var roleClaim = authState.User.FindFirst(ClaimTypes.Role);
+        currentUserRole = roleClaim?.Value;
+        
+        await LoadProperties();
+        FilterProperties();
+    }
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender && PropertyId.HasValue)
+        {
+            await JSRuntime.InvokeVoidAsync("scrollToElement", $"property-{PropertyId.Value}");
+        }
+    }
+
+    private async Task LoadProperties()
+    {
+        var authState = await AuthenticationStateTask;
+        var userId = authState.User?.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+        if(string.IsNullOrEmpty(userId)){
+            properties = new List<Property>();
+            return;
+        }
+
+        var allProperties = await PropertyService.GetAllAsync();
+        properties = allProperties.Where(p=>p.IsDeleted==false).ToList();
+    }
+
+    private void FilterProperties()
+    {
+        if (properties == null)
+        {
+            filteredProperties = new();
+            return;
+        }
+
+        filteredProperties = properties.Where(p =>
+            (string.IsNullOrEmpty(searchTerm) ||
+             p.Address.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
+             p.City.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
+             p.State.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
+             p.ZipCode.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
+             p.Description.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
+             p.PropertyType.Contains(searchTerm, StringComparison.OrdinalIgnoreCase)) &&
+            (string.IsNullOrEmpty(selectedPropertyStatus) || p.Status.ToString() == selectedPropertyStatus)
+        ).ToList();
+        
+        CalculateMetrics();
+        SortAndPaginateProperties();
+    }
+
+    private void CalculateMetrics(){
+        if (filteredProperties != null)
+        {
+            totalCount = filteredProperties.Count;
+            availableCount = filteredProperties.Count(p => p.Status == ApplicationConstants.PropertyStatuses.Available);
+            pendingCount = filteredProperties.Count(p => p.Status == ApplicationConstants.PropertyStatuses.ApplicationPending || p.Status == ApplicationConstants.PropertyStatuses.LeasePending);
+            occupiedCount = filteredProperties.Count(p => p.Status == ApplicationConstants.PropertyStatuses.Occupied);
+            totalMonthlyRent = filteredProperties.Sum(p => p.MonthlyRent);
+        }
+    }
+
+    private void CreateProperty(){
+        Navigation.NavigateTo("/propertymanagement/properties/create");
+    }
+
+    private void ViewProperty(Guid propertyId)
+    {
+        Navigation.NavigateTo($"/propertymanagement/properties/{propertyId}");
+    }
+
+   private void EditProperty(Guid propertyId)
+   {
+       Navigation.NavigateTo($"/propertymanagement/properties/{propertyId}/edit");
+   }
+
+   private async Task DeleteProperty(Guid propertyId)
+   {
+       var authState = await AuthenticationStateTask;
+        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+        
+        if (string.IsNullOrEmpty(userId))
+            return;
+
+        await PropertyService.DeleteAsync(propertyId);
+        await LoadProperties();
+        FilterProperties();
+        CalculateMetrics();
+   }
+
+    private void ClearFilters()
+    {
+        searchTerm = string.Empty;
+        selectedPropertyStatus = string.Empty;
+        FilterProperties();
+    }
+
+    private void SetViewMode(PropertyListViewMode mode)
+    {
+        viewMode = mode;
+    }
+
+    private void HandleSearchChanged(string search)
+    {
+        searchTerm = search;
+        FilterProperties();
+    }
+
+    private void HandleStatusFilterChanged(string status)
+    {
+        selectedPropertyStatus = status;
+        FilterProperties();
+    }
+
+    private void HandleClearFilters()
+    {
+        ClearFilters();
+    }
+
+    private void HandleSort((string Column, bool Ascending) sortInfo)
+    {
+        sortColumn = sortInfo.Column;
+        sortAscending = sortInfo.Ascending;
+        SortAndPaginateProperties();
+    }
+
+    private void SortAndPaginateProperties()
+    {
+        sortedProperties = sortColumn switch
+        {
+            nameof(Property.Address) => sortAscending
+                ? filteredProperties.OrderBy(p => p.Address).ToList()
+                : filteredProperties.OrderByDescending(p => p.Address).ToList(),
+            nameof(Property.City) => sortAscending
+                ? filteredProperties.OrderBy(p => p.City).ToList()
+                : filteredProperties.OrderByDescending(p => p.City).ToList(),
+            nameof(Property.PropertyType) => sortAscending
+                ? filteredProperties.OrderBy(p => p.PropertyType).ToList()
+                : filteredProperties.OrderByDescending(p => p.PropertyType).ToList(),
+            nameof(Property.SquareFeet) => sortAscending
+                ? filteredProperties.OrderBy(p => p.SquareFeet).ToList()
+                : filteredProperties.OrderByDescending(p => p.SquareFeet).ToList(),
+            nameof(Property.Status) => sortAscending
+                ? filteredProperties.OrderBy(p => p.Status).ToList()
+                : filteredProperties.OrderByDescending(p => p.Status).ToList(),
+            nameof(Property.MonthlyRent) => sortAscending
+                ? filteredProperties.OrderBy(p => p.MonthlyRent).ToList()
+                : filteredProperties.OrderByDescending(p => p.MonthlyRent).ToList(),
+            _ => filteredProperties.OrderBy(p => p.Address).ToList()
+        };
+
+        totalRecords = sortedProperties.Count;
+        totalPages = (int)Math.Ceiling(totalRecords / (double)pageSize);
+        currentPage = Math.Max(1, Math.Min(currentPage, totalPages));
+        
+        pagedProperties = sortedProperties
+            .Skip((currentPage - 1) * pageSize)
+            .Take(pageSize)
+            .ToList();
+    }
+
+    private void UpdatePagination()
+    {
+        currentPage = 1;
+        SortAndPaginateProperties();
+    }
+
+    private void FirstPage() => GoToPage(1);
+    private void LastPage() => GoToPage(totalPages);
+    private void NextPage() => GoToPage(currentPage + 1);
+    private void PreviousPage() => GoToPage(currentPage - 1);
+    
+    private void GoToPage(int page)
+    {
+        currentPage = Math.Max(1, Math.Min(page, totalPages));
+        SortAndPaginateProperties();
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Properties/PropertyViewForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Properties/PropertyViewForm.razor
new file mode 100644
index 0000000..0584da6
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Properties/PropertyViewForm.razor
@@ -0,0 +1,573 @@
+@using Aquiis.Core.Constants
+@using Aquiis.Core.Entities
+@using Microsoft.AspNetCore.Components.Authorization
+@inject PropertyService PropertyService
+@inject LeaseService LeaseService
+@inject MaintenanceService MaintenanceService
+@inject InspectionService InspectionService
+@inject Application.Services.DocumentService DocumentService
+@inject ChecklistService ChecklistService
+@inject NavigationManager NavigationManager
+@inject IJSRuntime JSRuntime
+@namespace Aquiis.UI.Shared.Features.PropertyManagement.Properties
+
+@if (property == null)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else if (!isAuthorized)
+{
+    <div class="alert alert-danger">
+        <h4>Access Denied</h4>
+        <p>You don't have permission to view this property.</p>
+        <a href="/propertymanagement/properties" class="btn btn-primary">Back to Properties</a>
+    </div>
+}
+else
+{
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <h1>Property Details</h1>
+        <div class="btn-group">
+            <button class="btn btn-primary" @onclick="EditProperty">
+                <i class="bi bi-pencil"></i> Edit
+            </button>
+            <button class="btn btn-secondary" @onclick="BackToList">
+                <i class="bi bi-arrow-left"></i> Back to List
+            </button>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header d-flex justify-content-between align-items-center">
+                    <h5 class="mb-0">Property Information</h5>
+                    <span class="badge @(property.IsAvailable ? "bg-success" : "bg-warning")">
+                        @(property.IsAvailable ? "Available" : "Occupied")
+                    </span>
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-md-12 mb-3">
+                            <strong>Address:</strong>
+                            <p class="mb-1">@property.Address @(!string.IsNullOrWhiteSpace(property.UnitNumber) ? $", {property.UnitNumber}" : "")</p>
+                            <small class="text-muted">@property.City, @property.State @property.ZipCode</small>
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <strong>Property Type:</strong>
+                            <p>@property.PropertyType</p>
+                        </div>
+                        <div class="col-md-6 mb-3">
+                            <strong>Monthly Rent:</strong>
+                            <p class="text-success fw-bold">@property.MonthlyRent.ToString("C")</p>
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-4 mb-3">
+                            <strong>Bedrooms:</strong>
+                            <p>@property.Bedrooms</p>
+                        </div>
+                        <div class="col-md-4 mb-3">
+                            <strong>Bathrooms:</strong>
+                            <p>@property.Bathrooms</p>
+                        </div>
+                        <div class="col-md-4 mb-3">
+                            <strong>Square Feet:</strong>
+                            <p>@property.SquareFeet.ToString("N0")</p>
+                        </div>
+                    </div>
+
+                    @if (!string.IsNullOrEmpty(property.Description))
+                    {
+                        <div class="row">
+                            <div class="col-md-12 mb-3">
+                                <strong>Description:</strong>
+                                <p>@property.Description</p>
+                            </div>
+                        </div>
+                    }
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <strong>Created:</strong>
+                            <p>@property.CreatedOn.ToString("MMMM dd, yyyy")</p>
+                        </div>
+                        @if (property.LastModifiedOn.HasValue)
+                        {
+                            <div class="col-md-6 mb-3">
+                                <strong>Last Modified:</strong>
+                                <p>@property.LastModifiedOn.Value.ToString("MMMM dd, yyyy")</p>
+                            </div>
+                        }
+                    </div>
+                </div>
+            </div>
+
+            <!-- Maintenance Requests Section -->
+            @if(ShowMaintenanceRequests)
+            {
+                <div class="card mt-3">
+                    <div class="card-header d-flex justify-content-between align-items-center">
+                        <h5 class="mb-0">Maintenance Requests</h5>
+                        <button class="btn btn-sm btn-primary" @onclick="CreateMaintenanceRequest">
+                            <i class="bi bi-plus-circle"></i> New Request
+                        </button>
+                    </div>
+                    <div class="card-body">
+                        @if (maintenanceRequests.Any())
+                        {
+                            <div class="list-group">
+                                @foreach (var request in maintenanceRequests.OrderByDescending(r => r.RequestedOn).Take(5))
+                                {
+                                    <div class="list-group-item">
+                                        <div class="d-flex justify-content-between align-items-start">
+                                            <div class="flex-grow-1">
+                                                <div class="d-flex align-items-center mb-1">
+                                                    <strong class="me-2">@request.Title</strong>
+                                                    <span class="badge @request.PriorityBadgeClass me-1">@request.Priority</span>
+                                                    <span class="badge @request.StatusBadgeClass">@request.Status</span>
+                                                    @if (request.IsOverdue)
+                                                    {
+                                                        <i class="bi bi-exclamation-triangle-fill text-danger ms-2" title="Overdue"></i>
+                                                    }
+                                                </div>
+                                                <small class="text-muted d-block mb-1">@request.RequestType</small>
+                                                <small class="text-muted">
+                                                    Requested: @request.RequestedOn.ToString("MMM dd, yyyy")
+                                                    @if (request.ScheduledOn.HasValue)
+                                                    {
+                                                        <span> | Scheduled: @request.ScheduledOn.Value.ToString("MMM dd, yyyy")</span>
+                                                    }
+                                                </small>
+                                            </div>
+                                            <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewMaintenanceRequest(request.Id)">
+                                                <i class="bi bi-eye"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                }
+                            </div>
+                            @if (maintenanceRequests.Count > 5)
+                            {
+                                <div class="mt-2">
+                                    <small class="text-muted">Showing 5 of @maintenanceRequests.Count requests</small>
+                                </div>
+                            }
+                            <div class="mt-2">
+                                <button class="btn btn-sm btn-outline-secondary w-100" @onclick="ViewAllMaintenanceRequests">
+                                    <i class="bi bi-list-ul"></i> View All Maintenance Requests
+                                </button>
+                            </div>
+                        }
+                        else
+                        {
+                            <div class="text-center text-muted py-3">
+                                <i class="bi bi-tools" style="font-size: 2rem;"></i>
+                                <p class="mb-0 mt-2">No maintenance requests for this property</p>
+                                <button class="btn btn-sm btn-primary mt-2" @onclick="CreateMaintenanceRequest">
+                                    <i class="bi bi-plus-circle"></i> Create First Request
+                                </button>
+                            </div>
+                        }
+                    </div>
+                </div>
+            }
+
+            <!-- Documents Section -->
+            @if (ShowDocuments && propertyDocuments.Any())
+            {
+                <div class="card mt-3">
+                    <div class="card-header d-flex justify-content-between align-items-center">
+                        <h5 class="mb-0">Documents</h5>
+                        <span class="badge bg-secondary">@propertyDocuments.Count</span>
+                    </div>
+                    <div class="card-body">
+                        <div class="list-group">
+                            @foreach (var doc in propertyDocuments.OrderByDescending(d => d.CreatedOn))
+                            {
+                                <div class="list-group-item">
+                                    <div class="d-flex justify-content-between align-items-start">
+                                        <div class="flex-grow-1">
+                                            <div class="d-flex align-items-center mb-1">
+                                                <i class="bi @GetFileIcon(doc.FileExtension) me-2"></i>
+                                                <strong>@doc.FileName</strong>
+                                            </div>
+                                            @if (!string.IsNullOrEmpty(doc.Description))
+                                            {
+                                                <small class="text-muted d-block">@doc.Description</small>
+                                            }
+                                            <small class="text-muted">
+                                                <span class="badge @GetDocumentTypeBadge(doc.DocumentType)">@doc.DocumentType</span>
+                                                @doc.FileSizeFormatted | @doc.CreatedOn.ToString("MMM dd, yyyy")
+                                            </small>
+                                        </div>
+                                        <div class="btn-group btn-group-sm">
+                                            <button class="btn btn-outline-info" @onclick="() => ViewDocument(doc)" title="View">
+                                                <i class="bi bi-eye"></i>
+                                            </button>
+                                            <button class="btn btn-outline-primary" @onclick="() => DownloadDocument(doc)" title="Download">
+                                                <i class="bi bi-download"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
+                            }
+                        </div>
+                        <div class="mt-2">
+                            <button class="btn btn-sm btn-outline-secondary w-100" @onclick="ViewDocuments">
+                                <i class="bi bi-folder"></i> View All Documents
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            }
+        </div>
+
+        <div class="col-md-4">
+            <div class="card">
+                <div class="card-header">
+                    <h5 class="mb-0">Quick Actions</h5>
+                </div>
+                <div class="card-body">
+                    <div class="d-grid gap-2">
+                        <button class="btn btn-outline-primary" @onclick="EditProperty">
+                            <i class="bi bi-pencil"></i> Edit Property
+                        </button>
+                        @if (property.IsAvailable)
+                        {
+                            <button class="btn btn-outline-success" @onclick="CreateLease">
+                                <i class="bi bi-file-plus"></i> New Lease
+                            </button>
+                        }
+                        else
+                        {
+                            <button class="btn btn-outline-info" @onclick="ViewLease">
+                                <i class="bi bi-file-text"></i> View Lease
+                            </button>
+                        }
+                        <button class="btn btn-outline-warning" @onclick="CreateInspection">
+                            <i class="bi bi-clipboard-check"></i> Complete Inspection
+                        </button>
+                        <button class="btn btn-outline-secondary" @onclick="ViewDocuments">
+                            <i class="bi bi-folder"></i> View Documents
+                        </button>
+                    </div>
+                </div>
+            </div>
+
+            <!-- Routine Inspection Status Card -->
+            @if(ShowInspections)
+            {
+                <div class="card mt-3">
+                    <div class="card-header">
+                        <h5 class="mb-0"><i class="bi bi-clipboard-check"></i> Routine Inspection</h5>
+                    </div>
+                    <div class="card-body">
+                        @if (property.LastRoutineInspectionDate.HasValue)
+                        {
+                            <div class="mb-3">
+                                <strong>Last Routine Inspection:</strong>
+                                <p class="mb-0">@property.LastRoutineInspectionDate.Value.ToString("MMM dd, yyyy")</p>
+                                @if (propertyInspections.Any())
+                                {
+                                    var lastInspection = propertyInspections.Where(i => i.CompletedOn == property.LastRoutineInspectionDate.Value && i.InspectionType == "Routine").FirstOrDefault();
+                                    if (lastInspection != null)
+                                    {
+                                        <small>
+                                            <a href="/propertymanagement/inspections/@lastInspection.Id" class="text-decoration-none">
+                                                <i class="bi bi-eye"></i> View Last Routine Inspection
+                                            </a>
+                                        </small>
+                                    }
+                                }
+                            </div>
+                        }
+                        
+                        @if (property.NextRoutineInspectionDueDate.HasValue)
+                        {
+                            <div class="mb-3">
+                                <strong>Next Routine Inspection Due:</strong>
+                                <p class="mb-0">@property.NextRoutineInspectionDueDate.Value.ToString("MMM dd, yyyy")</p>
+                            </div>
+                            
+                            <div class="mb-3">
+                                <strong>Status:</strong>
+                                <p class="mb-0">
+                                    <span class="badge @GetInspectionStatusBadge(property.InspectionStatus)">
+                                        @property.InspectionStatus
+                                    </span>
+                                </p>
+                            </div>
+
+                            @if (property.IsInspectionOverdue)
+                            {
+                                <div class="alert alert-danger py-2 mb-2">
+                                    <small>
+                                        <i class="bi bi-exclamation-triangle-fill"></i>
+                                        <strong>Overdue by @property.DaysOverdue days</strong>
+                                    </small>
+                                </div>
+                            }
+                            else if (property.DaysUntilInspectionDue <= 30)
+                            {
+                                <div class="alert alert-warning py-2 mb-2">
+                                    <small>
+                                        <i class="bi bi-exclamation-circle-fill"></i>
+                                        <strong>Due in @property.DaysUntilInspectionDue days</strong>
+                                    </small>
+                                </div>
+                            }
+                        }
+                        else
+                        {
+                            <div class="alert alert-info py-2 mb-2">
+                                <small><i class="bi bi-info-circle"></i> No inspection scheduled</small>
+                            </div>
+                        }
+
+                        <div class="d-grid">
+                            <button class="btn btn-sm btn-outline-warning" @onclick="CreateInspection">
+                                <i class="bi bi-clipboard-check"></i> Complete Routine Inspection
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            }
+
+            <!-- Active Leases Section -->
+            @if (activeLeases.Any())
+            {
+                <div class="card mt-3">
+                    <div class="card-header">
+                        <h5 class="mb-0">Active Leases</h5>
+                    </div>
+                    <div class="card-body">
+                        @foreach (var lease in activeLeases)
+                        {
+                            <div class="border-bottom pb-2 mb-2">
+                                <strong>@lease.Tenant?.FullName</strong>
+                                <br />
+                                <small class="text-muted">
+                                    @lease.StartDate.ToString("MMM dd, yyyy") - @lease.EndDate.ToString("MMM dd, yyyy")
+                                </small>
+                                <br />
+                                <small class="text-success">@lease.MonthlyRent.ToString("C")/month</small>
+                            </div>
+                        }
+                    </div>
+                </div>
+            }
+
+            <!-- Completed Checklists Section -->
+            @if(ShowCheckLists)
+            {
+                <div class="card mt-3">
+                    <div class="card-header d-flex justify-content-between align-items-center">
+                        <h5 class="mb-0">Completed Checklists</h5>
+                        <button class="btn btn-sm btn-primary" @onclick="CreateChecklist">
+                            <i class="bi bi-plus-circle"></i> New Checklist
+                        </button>
+                    </div>
+                    <div class="card-body">
+                        @if (propertyChecklists.Any())
+                        {
+                            <div class="list-group">
+                                @foreach (var checklist in propertyChecklists.OrderByDescending(c => c.CompletedOn ?? c.CreatedOn).Take(5))
+                                {
+                                    <div class="list-group-item">
+                                        <div class="d-flex justify-content-between align-items-start">
+                                            <div class="flex-grow-1">
+                                                <div class="d-flex align-items-center mb-1">
+                                                    <strong class="me-2">@checklist.Name</strong>
+                                                    <span class="badge @GetChecklistStatusBadge(checklist.Status)">@checklist.Status</span>
+                                                </div>
+                                                <small class="text-muted d-block mb-1">@checklist.ChecklistType</small>
+                                                <small class="text-muted">
+                                                    @if (checklist.CompletedOn.HasValue)
+                                                    {
+                                                        <span>Completed: @checklist.CompletedOn.Value.ToString("MMM dd, yyyy")</span>
+                                                    }
+                                                    else
+                                                    {
+                                                        <span>Created: @checklist.CreatedOn.ToString("MMM dd, yyyy")</span>
+                                                    }
+                                                </small>
+                                            </div>
+                                            <div class="btn-group btn-group-sm">
+                                                <button class="btn btn-outline-primary" @onclick="() => ViewChecklist(checklist.Id)">
+                                                    <i class="bi bi-eye"></i>
+                                                </button>
+                                                @if (checklist.Status != ApplicationConstants.ChecklistStatuses.Completed)
+                                                {
+                                                    <button class="btn btn-outline-success" @onclick="() => CompleteChecklist(checklist.Id)">
+                                                        <i class="bi bi-check-circle"></i>
+                                                    </button>
+                                                }
+                                            </div>
+                                        </div>
+                                    </div>
+                                }
+                            </div>
+                            @if (propertyChecklists.Count > 5)
+                            {
+                                <div class="mt-2">
+                                    <small class="text-muted">Showing 5 of @propertyChecklists.Count checklists</small>
+                                </div>
+                            }
+                        }
+                        else
+                        {
+                            <div class="text-center text-muted py-3">
+                                <i class="bi bi-list-check" style="font-size: 2rem;"></i>
+                                <p class="mb-0 mt-2">No checklists for this property</p>
+                                <button class="btn btn-sm btn-primary mt-2" @onclick="CreateChecklist">
+                                    <i class="bi bi-plus-circle"></i> Create First Checklist
+                                </button>
+                            </div>
+                        }
+                    </div>
+                </div>
+            }
+        </div>
+    </div>
+}
+
+@code {
+    [Parameter]
+    public Guid PropertyId { get; set; }
+
+    [Parameter]
+    public bool ShowCheckLists { get; set; } = true;
+
+    [Parameter]
+    public bool ShowDocuments { get; set; } = true;
+
+    [Parameter]
+    public bool ShowMaintenanceRequests { get; set; } = true;
+
+    [Parameter]
+    public bool ShowInspections { get; set; } = true;
+
+    private Guid LeaseId { get; set; }
+    private List<Lease> activeLeases = new();
+    private List<Document> propertyDocuments = new();
+    private List<MaintenanceRequest> maintenanceRequests = new();
+    private List<Inspection> propertyInspections = new();
+    private List<Checklist> propertyChecklists = new();
+    private bool isAuthorized = true;
+    private Property? property;
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadProperty();
+    }
+
+    private async Task LoadProperty()
+    {
+        var authState = await AuthenticationStateTask;
+        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+
+        if (string.IsNullOrEmpty(userId))
+        {
+            isAuthorized = false;
+            return;
+        }
+
+        property = await PropertyService.GetByIdAsync(PropertyId);
+        if (property == null)
+        {
+            isAuthorized = false;
+            return;
+        }
+
+        activeLeases = await LeaseService.GetActiveLeasesByPropertyIdAsync(PropertyId);
+        Lease? lease = activeLeases.FirstOrDefault();
+        if (lease != null)
+        {
+            LeaseId = lease.Id;
+        }
+        
+        propertyDocuments = await DocumentService.GetDocumentsByPropertyIdAsync(PropertyId);
+        propertyDocuments = propertyDocuments.Where(d => !d.IsDeleted).ToList();
+        
+        maintenanceRequests = await MaintenanceService.GetMaintenanceRequestsByPropertyAsync(PropertyId);
+        propertyInspections = await InspectionService.GetByPropertyIdAsync(PropertyId);
+        
+        var allChecklists = await ChecklistService.GetChecklistsAsync(includeArchived: false);
+        propertyChecklists = allChecklists
+            .Where(c => c.PropertyId == PropertyId)
+            .OrderByDescending(c => c.CompletedOn ?? c.CreatedOn)
+            .ToList();
+    }
+
+    private void EditProperty() => NavigationManager.NavigateTo($"/propertymanagement/properties/{PropertyId}/edit");
+    private void CreateLease() => NavigationManager.NavigateTo($"/propertymanagement/leases/create/?PropertyId={PropertyId}");
+    private void ViewLease() => NavigationManager.NavigateTo($"/propertymanagement/leases/{LeaseId}");
+    private void ViewDocuments() => NavigationManager.NavigateTo($"/propertymanagement/documents/?PropertyId={PropertyId}");
+    private void CreateInspection() => NavigationManager.NavigateTo($"/propertymanagement/inspections/create/{PropertyId}");
+    private void CreateMaintenanceRequest() => NavigationManager.NavigateTo($"/propertymanagement/maintenance/create?PropertyId={PropertyId}");
+    private void ViewMaintenanceRequest(Guid requestId) => NavigationManager.NavigateTo($"/propertymanagement/maintenance/{requestId}");
+    private void ViewAllMaintenanceRequests() => NavigationManager.NavigateTo($"/propertymanagement/maintenance?propertyId={PropertyId}");
+    private void BackToList() => NavigationManager.NavigateTo("/propertymanagement/properties");
+    private void CreateChecklist() => NavigationManager.NavigateTo("/propertymanagement/checklists");
+    private void ViewChecklist(Guid checklistId) => NavigationManager.NavigateTo($"/propertymanagement/checklists/{checklistId}");
+    private void CompleteChecklist(Guid checklistId) => NavigationManager.NavigateTo($"/propertymanagement/checklists/complete/{checklistId}");
+
+    private async Task ViewDocument(Document doc)
+    {
+        var base64Data = Convert.ToBase64String(doc.FileData);
+        await JSRuntime.InvokeVoidAsync("viewFile", base64Data, doc.FileType);
+    }
+
+    private async Task DownloadDocument(Document doc)
+    {
+        await JSRuntime.InvokeVoidAsync("downloadFile", doc.FileName, Convert.ToBase64String(doc.FileData), doc.FileType);
+    }
+
+    private string GetFileIcon(string extension) => extension.ToLower() switch
+    {
+        ".pdf" => "bi-file-pdf text-danger",
+        ".doc" or ".docx" => "bi-file-word text-primary",
+        ".jpg" or ".jpeg" or ".png" => "bi-file-image text-success",
+        ".txt" => "bi-file-text",
+        _ => "bi-file-earmark"
+    };
+
+    private string GetDocumentTypeBadge(string documentType) => documentType switch
+    {
+        "Lease Agreement" => "bg-primary",
+        "Invoice" => "bg-warning",
+        "Payment Receipt" => "bg-success",
+        "Inspection Report" => "bg-info",
+        "Addendum" => "bg-secondary",
+        _ => "bg-secondary"
+    };
+
+    private string GetInspectionStatusBadge(string status) => status switch
+    {
+        "Overdue" => "bg-danger",
+        "Due Soon" => "bg-warning",
+        "Scheduled" => "bg-success",
+        "Not Scheduled" => "bg-secondary",
+        _ => "bg-secondary"
+    };
+
+    private string GetChecklistStatusBadge(string status) => status switch
+    {
+        "Completed" => "bg-success",
+        "In Progress" => "bg-warning",
+        "Draft" => "bg-secondary",
+        _ => "bg-secondary"
+    };
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Tenants/CreateForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Tenants/CreateForm.razor
new file mode 100644
index 0000000..d7bb008
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Tenants/CreateForm.razor
@@ -0,0 +1,224 @@
+@using Aquiis.Core.Entities
+@using Aquiis.Application.Services
+@using System.ComponentModel.DataAnnotations
+@using Microsoft.AspNetCore.Components.Authorization
+@inject TenantService TenantService
+@inject NavigationManager NavigationManager
+@rendermode InteractiveServer
+
+<h3>Create Tenant</h3>
+
+<div class="row">
+    <div class="col-md-8">
+        <div class="card">
+            <div class="card-header">
+                <h3 class="card-title mb-0">Add New Tenant</h3>
+            </div>
+            <div class="card-body">
+                <Microsoft.AspNetCore.Components.Forms.EditForm Model="tenantModel" OnValidSubmit="SaveTenant" FormName="create-tenant">
+                    <DataAnnotationsValidator />
+                    
+                    @if (!string.IsNullOrEmpty(errorMessage))
+                    {
+                        <div class="alert alert-danger" role="alert">
+                            @((MarkupString)errorMessage)
+                        </div>
+                    }
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">First Name *</label>
+                            <InputText @bind-Value="tenantModel.FirstName" class="form-control" placeholder="First name" />
+                            <ValidationMessage For="() => tenantModel.FirstName" class="text-danger" />
+                        </div>
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Last Name *</label>
+                            <InputText @bind-Value="tenantModel.LastName" class="form-control" placeholder="Last name" />
+                            <ValidationMessage For="() => tenantModel.LastName" class="text-danger" />
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Email *</label>
+                            <InputText @bind-Value="tenantModel.Email" class="form-control" type="email" placeholder="email@example.com" />
+                            <ValidationMessage For="() => tenantModel.Email" class="text-danger" />
+                        </div>
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Phone Number</label>
+                            <InputText @bind-Value="tenantModel.PhoneNumber" class="form-control" placeholder="(555) 123-4567" />
+                            <ValidationMessage For="() => tenantModel.PhoneNumber" class="text-danger" />
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Date of Birth</label>
+                            <InputDate @bind-Value="tenantModel.DateOfBirth" class="form-control" />
+                            <ValidationMessage For="() => tenantModel.DateOfBirth" class="text-danger" />
+                        </div>
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Identification Number</label>
+                            <InputText @bind-Value="tenantModel.IdentificationNumber" class="form-control" />
+                            <ValidationMessage For="() => tenantModel.IdentificationNumber" class="text-danger" />
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Emergency Contact Name</label>
+                            <InputText @bind-Value="tenantModel.EmergencyContactName" class="form-control" placeholder="Emergency contact name" />
+                            <ValidationMessage For="() => tenantModel.EmergencyContactName" class="text-danger" />
+                        </div>
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">Emergency Contact Phone</label>
+                            <InputText @bind-Value="tenantModel.EmergencyContactPhone" class="form-control" placeholder="(555) 123-4567" />
+                            <ValidationMessage For="() => tenantModel.EmergencyContactPhone" class="text-danger" />
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-12 mb-3">
+                            <label class="form-label">Notes</label>
+                            <InputTextArea @bind-Value="tenantModel.Notes" class="form-control" rows="3" placeholder="Additional notes about the tenant" />
+                            <ValidationMessage For="() => tenantModel.Notes" class="text-danger" />
+                        </div>
+                    </div>
+
+                    <div class="d-flex gap-2">
+                        <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
+                            @if (isSubmitting)
+                            {
+                                <span class="spinner-border spinner-border-sm me-2" role="status"></span>
+                            }
+                            Create Tenant
+                        </button>
+                        <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
+                    </div>
+                </Microsoft.AspNetCore.Components.Forms.EditForm>
+            </div>
+        </div>
+    </div>
+</div>
+
+@code {
+    [Parameter]
+    [SupplyParameterFromQuery(Name = "PropertyId")]
+    public Guid? PropertyId { get; set; }
+
+    private TenantModel tenantModel = new TenantModel();
+    private bool isSubmitting = false;
+    private string errorMessage = string.Empty;
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    protected override void OnInitialized()
+    {
+        // Manually parse PropertyId from query string for InteractiveServer rendermode
+        var uri = new Uri(NavigationManager.Uri);
+        var query = System.Web.HttpUtility.ParseQueryString(uri.Query);
+        var propertyIdString = query["PropertyId"];
+        
+        if (!string.IsNullOrEmpty(propertyIdString) && Guid.TryParse(propertyIdString, out var propertyId))
+        {
+            PropertyId = propertyId;
+        }
+    }
+
+    private async Task SaveTenant()
+    {
+        try
+        {
+            isSubmitting = true;
+            errorMessage = string.Empty;
+
+            var authState = await AuthenticationStateTask;
+            var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+
+            if (string.IsNullOrEmpty(userId))
+            {
+                errorMessage = "User not authenticated.";
+                return;
+            }
+
+            // Check for duplicate identification number
+            if (!string.IsNullOrWhiteSpace(tenantModel.IdentificationNumber))
+            {
+                var existingTenant = await TenantService.GetTenantByIdentificationNumberAsync(tenantModel.IdentificationNumber);
+                if (existingTenant != null)
+                {
+                    errorMessage = $"A tenant with identification number <strong>{tenantModel.IdentificationNumber}</strong> already exists. " +
+                                 $"<a href=\"/propertymanagement/tenants/{existingTenant.Id}\" class=\"alert-link\">View existing tenant: {existingTenant.FullName}</a>";
+                    return;
+                }
+            }
+
+            var tenant = new Tenant
+            {
+                FirstName = tenantModel.FirstName,
+                LastName = tenantModel.LastName,
+                Email = tenantModel.Email,
+                PhoneNumber = tenantModel.PhoneNumber,
+                DateOfBirth = tenantModel.DateOfBirth,
+                EmergencyContactName = tenantModel.EmergencyContactName,
+                EmergencyContactPhone = tenantModel.EmergencyContactPhone,
+                Notes = tenantModel.Notes,
+                IdentificationNumber = tenantModel.IdentificationNumber,
+                IsActive = true
+            };
+
+            var newTenant = await TenantService.CreateAsync(tenant);
+            NavigationManager.NavigateTo("/propertymanagement/leases/create/?PropertyId=" + (PropertyId.HasValue ? PropertyId.ToString() : "") + "&TenantId=" + newTenant.Id);
+        }
+        catch (Exception ex)
+        {
+            errorMessage = $"Error creating tenant: {ex.Message}";
+        }
+        finally
+        {
+            isSubmitting = false;
+        }
+    }
+
+    private void Cancel()
+    {
+        NavigationManager.NavigateTo("/propertymanagement/leases/create/?PropertyId=" + (PropertyId.HasValue ? PropertyId.ToString() : ""));
+    }
+
+    public class TenantModel
+    {
+        [Required(ErrorMessage = "First name is required")]
+        [StringLength(100, ErrorMessage = "First name cannot exceed 100 characters")]
+        public string FirstName { get; set; } = string.Empty;
+
+        [Required(ErrorMessage = "Last name is required")]
+        [StringLength(100, ErrorMessage = "Last name cannot exceed 100 characters")]
+        public string LastName { get; set; } = string.Empty;
+
+        [Required(ErrorMessage = "Email is required")]
+        [EmailAddress(ErrorMessage = "Please enter a valid email address")]
+        [StringLength(255, ErrorMessage = "Email cannot exceed 255 characters")]
+        public string Email { get; set; } = string.Empty;
+
+        [Phone(ErrorMessage = "Please enter a valid phone number")]
+        [StringLength(20, ErrorMessage = "Phone number cannot exceed 20 characters")]
+        public string PhoneNumber { get; set; } = string.Empty;
+
+        public DateTime? DateOfBirth { get; set; }
+
+        [Required(ErrorMessage = "Identification number is required")]
+        [StringLength(100, ErrorMessage = "Identification number cannot exceed 100 characters")]
+        public string IdentificationNumber { get; set; } = string.Empty;
+
+        [StringLength(200, ErrorMessage = "Emergency contact name cannot exceed 200 characters")]
+        public string EmergencyContactName { get; set; } = string.Empty;
+
+        [Phone(ErrorMessage = "Please enter a valid phone number")]
+        [StringLength(20, ErrorMessage = "Emergency contact phone cannot exceed 20 characters")]
+        public string EmergencyContactPhone { get; set; } = string.Empty;
+
+        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
+        public string Notes { get; set; } = string.Empty;
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Tenants/EditForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Tenants/EditForm.razor
new file mode 100644
index 0000000..0d46b63
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Tenants/EditForm.razor
@@ -0,0 +1,323 @@
+@using Aquiis.Core.Entities
+@using Aquiis.Application.Services
+@using System.ComponentModel.DataAnnotations
+@using Microsoft.AspNetCore.Components.Authorization
+@inject NavigationManager NavigationManager
+@inject TenantService TenantService
+@rendermode InteractiveServer
+
+@if (tenant == null)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else if (!isAuthorized)
+{
+    <div class="alert alert-danger">
+        <h4>Access Denied</h4>
+        <p>You don't have permission to edit this tenant.</p>
+        <a href="/propertymanagement/tenants" class="btn btn-primary">Back to Tenants</a>
+    </div>
+}
+else
+{
+    <div class="row">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">
+                    <h3 class="card-title mb-0">Edit Tenant</h3>
+                </div>
+                <div class="card-body">
+                    <Microsoft.AspNetCore.Components.Forms.EditForm Model="tenantModel" OnValidSubmit="UpdateTenant" FormName="edit-tenant">
+                        <DataAnnotationsValidator />
+                        
+                        @if (!string.IsNullOrEmpty(errorMessage))
+                        {
+                            <div class="alert alert-danger" role="alert">
+                                @errorMessage
+                            </div>
+                        }
+
+                        @if (!string.IsNullOrEmpty(successMessage))
+                        {
+                            <div class="alert alert-success" role="alert">
+                                @successMessage
+                            </div>
+                        }
+
+                        <div class="row">
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">First Name *</label>
+                                <InputText @bind-Value="tenantModel.FirstName" class="form-control" placeholder="First name" />
+                                <ValidationMessage For="() => tenantModel.FirstName" class="text-danger" />
+                            </div>
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">Last Name *</label>
+                                <InputText @bind-Value="tenantModel.LastName" class="form-control" placeholder="Last name" />
+                                <ValidationMessage For="() => tenantModel.LastName" class="text-danger" />
+                            </div>
+                        </div>
+
+                        <div class="row">
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">Email *</label>
+                                <InputText @bind-Value="tenantModel.Email" class="form-control" type="email" placeholder="email@example.com" />
+                                <ValidationMessage For="() => tenantModel.Email" class="text-danger" />
+                            </div>
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">Phone Number</label>
+                                <InputText @bind-Value="tenantModel.PhoneNumber" class="form-control" placeholder="(555) 123-4567" />
+                                <ValidationMessage For="() => tenantModel.PhoneNumber" class="text-danger" />
+                            </div>
+                        </div>
+
+                        <div class="row">
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">Date of Birth</label>
+                                <InputDate @bind-Value="tenantModel.DateOfBirth" class="form-control" />
+                                <ValidationMessage For="() => tenantModel.DateOfBirth" class="text-danger" />
+                            </div>
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">Identification Number</label>
+                                <InputText @bind-Value="tenantModel.IdentificationNumber" class="form-control" placeholder="Identification number" />
+                                <ValidationMessage For="() => tenantModel.IdentificationNumber" class="text-danger" />
+                            </div>
+                        </div>
+
+                        <div class="row">
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">Emergency Contact Name</label>
+                                <InputText @bind-Value="tenantModel.EmergencyContactName" class="form-control" placeholder="Emergency contact name" />
+                                <ValidationMessage For="() => tenantModel.EmergencyContactName" class="text-danger" />
+                            </div>
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">Emergency Contact Phone</label>
+                                <InputText @bind-Value="tenantModel.EmergencyContactPhone" class="form-control" placeholder="(555) 123-4567" />
+                                <ValidationMessage For="() => tenantModel.EmergencyContactPhone" class="text-danger" />
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-6 mb-3">
+                                <label class="form-label">Status: </label>
+                                <InputCheckbox @bind-Value="tenantModel.IsActive" class="form-check-input" /> Active
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-12 mb-3">
+                                <label class="form-label">Notes</label>
+                                <InputTextArea @bind-Value="tenantModel.Notes" class="form-control" rows="3" placeholder="Additional notes about the tenant" />
+                                <ValidationMessage For="() => tenantModel.Notes" class="text-danger" />
+                            </div>
+                        </div>
+
+                        <div class="d-flex gap-2">
+                            <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
+                                @if (isSubmitting)
+                                {
+                                    <span class="spinner-border spinner-border-sm me-2" role="status"></span>
+                                }
+                                Update Tenant
+                            </button>
+                            <button type="button" class="btn btn-secondary" @onclick="ViewTenant">View Tenant</button>
+                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
+                        </div>
+                    </Microsoft.AspNetCore.Components.Forms.EditForm>
+                </div>
+            </div>
+        </div>
+
+        <div class="col-md-4">
+            <div class="card">
+                <div class="card-header">
+                    <h5 class="mb-0">Tenant Actions</h5>
+                </div>
+                <div class="card-body">
+                    <div class="d-grid gap-2">
+                        <button class="btn btn-outline-primary" @onclick="ViewTenant">
+                            <i class="bi bi-eye"></i> View Tenant
+                        </button>
+                        <button class="btn btn-outline-success" @onclick="CreateLease">
+                            <i class="bi bi-file-plus"></i> Create Lease
+                        </button>
+                        <button class="btn btn-outline-danger" @onclick="DeleteTenant">
+                            <i class="bi bi-trash"></i> Delete Tenant
+                        </button>
+                    </div>
+                </div>
+            </div>
+
+            <div class="card mt-3">
+                <div class="card-header">
+                    <h5 class="mb-0">Tenant Information</h5>
+                </div>
+                <div class="card-body">
+                    <small class="text-muted">
+                        <strong>Added:</strong> @tenant.CreatedOn.ToString("MMMM dd, yyyy")
+                        <br />
+                        @if (tenant.LastModifiedOn.HasValue)
+                        {
+                            <strong>Last Modified:</strong> @tenant.LastModifiedOn.Value.ToString("MMMM dd, yyyy")
+                        }
+                    </small>
+                </div>
+            </div>
+        </div>
+    </div>
+}
+
+@code {
+    [Parameter] public Guid TenantId { get; set; }
+    
+    private Tenant? tenant;
+    private TenantModel tenantModel = new();
+    private bool isSubmitting = false;
+    private bool isAuthorized = true;
+    private string errorMessage = string.Empty;
+    private string successMessage = string.Empty;
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadTenant();
+    }
+
+    private async Task LoadTenant()
+    {
+        var authState = await AuthenticationStateTask;
+        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+
+        if (string.IsNullOrEmpty(userId))
+        {
+            isAuthorized = false;
+            return;
+        }
+
+        tenant = await TenantService.GetByIdAsync(TenantId);
+
+        if (tenant == null)
+        {
+            isAuthorized = false;
+            return;
+        }
+
+        tenantModel = new TenantModel
+        {
+            FirstName = tenant.FirstName,
+            LastName = tenant.LastName,
+            Email = tenant.Email,
+            PhoneNumber = tenant.PhoneNumber,
+            DateOfBirth = tenant.DateOfBirth,
+            IdentificationNumber = tenant.IdentificationNumber,
+            IsActive = tenant.IsActive,
+            EmergencyContactName = tenant.EmergencyContactName,
+            EmergencyContactPhone = tenant.EmergencyContactPhone!,
+            Notes = tenant.Notes
+        };
+    }
+
+    private async Task UpdateTenant()
+    {
+        try
+        {
+            isSubmitting = true;
+            errorMessage = string.Empty;
+            successMessage = string.Empty;
+
+            tenant!.FirstName = tenantModel.FirstName;
+            tenant.LastName = tenantModel.LastName;
+            tenant.Email = tenantModel.Email;
+            tenant.PhoneNumber = tenantModel.PhoneNumber;
+            tenant.DateOfBirth = tenantModel.DateOfBirth;
+            tenant.IdentificationNumber = tenantModel.IdentificationNumber;
+            tenant.IsActive = tenantModel.IsActive;
+            tenant.EmergencyContactName = tenantModel.EmergencyContactName;
+            tenant.EmergencyContactPhone = tenantModel.EmergencyContactPhone;
+            tenant.Notes = tenantModel.Notes;
+
+            await TenantService.UpdateAsync(tenant);
+            successMessage = "Tenant updated successfully!";
+        }
+        catch (Exception ex)
+        {
+            errorMessage = $"Error updating tenant: {ex.Message}";
+        }
+        finally
+        {
+            isSubmitting = false;
+        }
+    }
+
+    private void ViewTenant()
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/tenants/{TenantId}");
+    }
+
+    private void CreateLease()
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/leases/create?tenantId={TenantId}");
+    }
+
+    private void Cancel()
+    {
+        NavigationManager.NavigateTo("/propertymanagement/tenants");
+    }
+
+    private async Task DeleteTenant()
+    {
+        if (tenant != null)
+        {
+            try
+            {
+                await TenantService.DeleteAsync(tenant.Id);
+                NavigationManager.NavigateTo("/propertymanagement/tenants");
+            }
+            catch (Exception ex)
+            {
+                errorMessage = $"Error deleting tenant: {ex.Message}";
+            }
+        }
+    }
+
+    public class TenantModel
+    {
+        [Required(ErrorMessage = "First name is required")]
+        [StringLength(100, ErrorMessage = "First name cannot exceed 100 characters")]
+        public string FirstName { get; set; } = string.Empty;
+
+        [Required(ErrorMessage = "Last name is required")]
+        [StringLength(100, ErrorMessage = "Last name cannot exceed 100 characters")]
+        public string LastName { get; set; } = string.Empty;
+
+        [Required(ErrorMessage = "Email is required")]
+        [EmailAddress(ErrorMessage = "Please enter a valid email address")]
+        [StringLength(255, ErrorMessage = "Email cannot exceed 255 characters")]
+        public string Email { get; set; } = string.Empty;
+
+        [Phone(ErrorMessage = "Please enter a valid phone number")]
+        [StringLength(20, ErrorMessage = "Phone number cannot exceed 20 characters")]
+        public string PhoneNumber { get; set; } = string.Empty;
+
+        public DateTime? DateOfBirth { get; set; }
+
+        [Required(ErrorMessage = "Identification number is required")]
+        [StringLength(100, ErrorMessage = "Identification number cannot exceed 100 characters")]
+        public string IdentificationNumber { get; set; } = string.Empty;
+
+        public bool IsActive { get; set; }
+
+        [StringLength(200, ErrorMessage = "Emergency contact name cannot exceed 200 characters")]
+        public string EmergencyContactName { get; set; } = string.Empty;
+
+        [Phone(ErrorMessage = "Please enter a valid phone number")]
+        [StringLength(20, ErrorMessage = "Emergency contact phone cannot exceed 20 characters")]
+        public string EmergencyContactPhone { get; set; } = string.Empty;
+
+        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
+        public string Notes { get; set; } = string.Empty;
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Tenants/ListForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Tenants/ListForm.razor
new file mode 100644
index 0000000..17af8a9
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Tenants/ListForm.razor
@@ -0,0 +1,502 @@
+@using Aquiis.Core.Entities
+@using Aquiis.Application.Services
+@using System.Security.Claims
+@using Microsoft.AspNetCore.Components.Authorization
+@inject TenantService TenantService
+@inject NavigationManager Navigation
+@inject IJSRuntime JSRuntime
+@rendermode InteractiveServer
+
+<div class="d-flex justify-content-between align-items-center mb-4">
+    <h1><span class="bi bi-people-fill" aria-hidden="true"></span> Tenants</h1>
+    @if (!isReadOnlyUser)
+    {
+        <button class="btn btn-primary" @onclick="CreateTenant">
+            <i class="bi bi-plus-lg"></i> Add Tenant
+        </button>
+    }
+</div>
+
+@if (tenants == null)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else if (!tenants.Any())
+{
+    <div class="alert alert-info">
+        <h4>No Tenants Found</h4>
+        <p>Get started by converting a Prospective Tenant to your first tenant in the system.</p>
+        <button class="btn btn-primary" @onclick="CreateTenant">Add First Tenant</button>
+    </div>
+}
+else
+{
+    <div class="row mb-3">
+        <div class="col-md-3">
+            <div class="input-group">
+                <span class="input-group-text"><i class="bi bi-search"></i></span>
+                <input type="text" class="form-control" placeholder="Search tenants..." @bind="searchTerm" @onkeyup="FilterTenants" />
+            </div>
+        </div>
+        <div class="col-md-3">
+            <select class="form-select" @bind="selectedLeaseStatus" @bind:after="FilterTenants">
+                <option value="">All Lease Statuses</option>
+                <option value="Active">Active Lease</option>
+                <option value="Expired">Expired Lease</option>
+                <option value="Terminated">Terminated Lease</option>
+                <option value="Pending">Pending Lease</option>
+                <option value="No Lease">No Lease</option>
+            </select>
+        </div>
+        <div class="col-md-3">
+            <select class="form-select" @bind="selectedTenantStatus" @bind:after="FilterTenants">
+                <option value="1">Active Tenants</option>
+                <option value="0">Inactive Tenants</option>
+            </select>
+        </div>
+        <div class="col-md-3">
+            <button class="btn btn-outline-secondary" @onclick="ClearFilters">
+                <i class="bi bi-x-circle"></i> Clear Filters
+            </button>
+        </div>
+    </div>
+
+    <div class="row mb-3">
+        <div class="col-md-3">
+            <div class="card text-white bg-success">
+                <div class="card-body">
+                    <h6>Active Tenants</h6>
+                    <h4>@activeTenantsCount</h4>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white bg-warning">
+                <div class="card-body">
+                    <h6>Without Lease</h6>
+                    <h4>@tenantsWithoutLeaseCount</h4>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white bg-info">
+                <div class="card-body">
+                    <h6>Total Tenants</h6>
+                    <h4>@filteredTenants.Count</h4>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white bg-primary">
+                <div class="card-body">
+                    <h6>New This Month</h6>
+                    <h4>@newThisMonthCount</h4>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="card">
+        <div class="card-body">
+            <div class="table-responsive">
+                <table class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th>
+                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.FirstName))">
+                                    Name
+                                    @if (sortColumn == nameof(Tenant.FirstName))
+                                    {
+                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
+                                    }
+                                </button>
+                            </th>
+                            <th>
+                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.Email))">
+                                    Email
+                                    @if (sortColumn == nameof(Tenant.Email))
+                                    {
+                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
+                                    }
+                                </button>
+                            </th>
+                            <th>
+                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.PhoneNumber))">
+                                    Phone
+                                    @if (sortColumn == nameof(Tenant.PhoneNumber))
+                                    {
+                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
+                                    }
+                                </button>
+                            </th>
+                            <th>
+                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.DateOfBirth))">
+                                    Date of Birth
+                                    @if (sortColumn == nameof(Tenant.DateOfBirth))
+                                    {
+                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
+                                    }
+                                </button>
+                            </th>
+                            <th>
+                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.IsActive))">
+                                    Status
+                                    @if (sortColumn == nameof(Tenant.IsActive))
+                                    {
+                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
+                                    }
+                                </button>
+                            </th>
+                            <th>
+                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.CreatedOn))">
+                                    Created
+                                    @if (sortColumn == nameof(Tenant.CreatedOn))
+                                    {
+                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
+                                    }
+                                </button>
+                            </th>
+                            <th>Lease Status</th>
+                            <th>Actions</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var tenant in pagedTenants)
+                        {
+                            <tr>
+                                <td>
+                                    <div>
+                                        <strong>@tenant.FullName</strong>
+                                        @if (!string.IsNullOrEmpty(tenant.Notes))
+                                        {
+                                            <br />
+                                            <small class="text-muted">@tenant.Notes</small>
+                                        }
+                                    </div>
+                                </td>
+                                <td>@tenant.Email</td>
+                                <td>@tenant.PhoneNumber</td>
+                                <td>
+                                    @if (tenant.DateOfBirth.HasValue)
+                                    {
+                                        @tenant.DateOfBirth.Value.ToString("MMM dd, yyyy")
+                                    }
+                                    else
+                                    {
+                                        <span class="text-muted">Not provided</span>
+                                    }
+                                </td>
+                                <td>
+                                    @if (tenant.IsActive)
+                                    {
+                                        <span class="badge bg-success">Active</span>
+                                    }
+                                    else
+                                    {
+                                        <span class="badge bg-secondary">Inactive</span>
+                                    }
+                                </td>
+                                <td>@tenant.CreatedOn.ToString("MMM dd, yyyy")</td>
+                                <td>
+                                    @{
+                                        var activeLease = tenant.Leases?.FirstOrDefault(l => l.Status == "Active");
+                                        var latestLease = tenant.Leases?.OrderByDescending(l => l.StartDate).FirstOrDefault();
+                                    }
+                                    @if (activeLease != null)
+                                    {
+                                        <span class="badge bg-success">Active</span>
+                                    }
+                                    else if (latestLease != null)
+                                    {
+                                        <span class="badge bg-@(GetLeaseStatusClass(latestLease.Status))">@latestLease.Status</span>
+                                    }
+                                    else
+                                    {
+                                        <span class="badge bg-secondary">No Lease</span>
+                                    }
+                                </td>
+                                <td>
+                                    <div class="btn-group btn-group-sm">
+                                        <button class="btn btn-outline-primary" @onclick="() => ViewTenant(tenant.Id)" title="View">
+                                            <i class="bi bi-eye"></i>
+                                        </button>
+                                        @if (!isReadOnlyUser)
+                                        {
+                                            <button class="btn btn-outline-secondary" @onclick="() => EditTenant(tenant.Id)" title="Edit">
+                                                <i class="bi bi-pencil"></i>
+                                            </button>
+                                            <button class="btn btn-outline-danger" @onclick="() => DeleteTenant(tenant.Id)" title="Delete">
+                                                <i class="bi bi-trash"></i>
+                                            </button>
+                                        }
+                                    </div>
+                                </td>
+                            </tr>
+                        }
+                    </tbody>
+                </table>
+            </div>
+            
+            @if (totalPages > 1)
+            {
+                <div class="d-flex justify-content-between align-items-center mt-3">
+                    <div>
+                        <small class="text-muted">
+                            Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords tenants
+                        </small>
+                    </div>
+                    <nav aria-label="Tenants pagination">
+                        <ul class="pagination pagination-sm mb-0">
+                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
+                                <button class="page-link" @onclick="() => GoToPage(1)" disabled="@(currentPage == 1)">
+                                    <i class="bi bi-chevron-double-left"></i>
+                                </button>
+                            </li>
+                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
+                                <button class="page-link" @onclick="() => GoToPage(currentPage - 1)" disabled="@(currentPage == 1)">
+                                    <i class="bi bi-chevron-left"></i>
+                                </button>
+                            </li>
+                            
+                            @for (int page = Math.Max(1, currentPage - 2); page <= Math.Min(totalPages, currentPage + 2); page++)
+                            {
+                                var pageNumber = page;
+                                <li class="page-item @(currentPage == pageNumber ? "active" : "")">
+                                    <button class="page-link" @onclick="() => GoToPage(pageNumber)">
+                                        @pageNumber
+                                    </button>
+                                </li>
+                            }
+                            
+                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
+                                <button class="page-link" @onclick="() => GoToPage(currentPage + 1)" disabled="@(currentPage == totalPages)">
+                                    <i class="bi bi-chevron-right"></i>
+                                </button>
+                            </li>
+                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
+                                <button class="page-link" @onclick="() => GoToPage(totalPages)" disabled="@(currentPage == totalPages)">
+                                    <i class="bi bi-chevron-double-right"></i>
+                                </button>
+                            </li>
+                        </ul>
+                    </nav>
+                </div>
+            }
+        </div>
+    </div>
+}
+
+@code {
+    private List<Tenant>? tenants;
+    private List<Tenant> filteredTenants = new();
+    private List<Tenant> pagedTenants = new();
+    private string searchTerm = string.Empty;
+    private string selectedLeaseStatus = string.Empty;
+    private int selectedTenantStatus = 1;
+    private string sortColumn = nameof(Tenant.FirstName);
+    private bool sortAscending = true;
+    private int activeTenantsCount = 0;
+    private int tenantsWithoutLeaseCount = 0;
+    private int newThisMonthCount = 0;
+    private int currentPage = 1;
+    private int pageSize = 20;
+    private int totalPages = 1;
+    private int totalRecords = 0;
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    private string? currentUserRole;
+    private bool isReadOnlyUser => currentUserRole == "User";
+
+    protected override async Task OnInitializedAsync()
+    {
+        var authState = await AuthenticationStateTask;
+        currentUserRole = authState.User.FindFirst(ClaimTypes.Role)?.Value;
+        
+        await LoadTenants();
+        FilterTenants();
+        CalculateMetrics();
+    }
+
+    private async Task LoadTenants()
+    {
+        tenants = await TenantService.GetAllAsync();
+    }
+
+    private void CreateTenant()
+    {
+        Navigation.NavigateTo("/propertymanagement/prospectivetenants");
+    }
+
+    private void ViewTenant(Guid id)
+    {
+        Navigation.NavigateTo($"/propertymanagement/tenants/{id}");
+    }
+
+    private void EditTenant(Guid id)
+    {
+        Navigation.NavigateTo($"/propertymanagement/tenants/{id}/edit");
+    }
+
+    private async Task DeleteTenant(Guid id)
+    {
+        var tenant = await TenantService.GetByIdAsync(id);
+        if (tenant != null)
+        {
+            await TenantService.DeleteAsync(tenant.Id);
+            await LoadTenants();
+            FilterTenants();
+            CalculateMetrics();
+        }
+    }
+
+    private void FilterTenants()
+    {
+        if (tenants == null)
+        {
+            filteredTenants = new();
+            pagedTenants = new();
+            return;
+        }
+
+        filteredTenants = tenants.Where(t =>
+            (string.IsNullOrEmpty(searchTerm) ||
+             t.FullName.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
+             t.Email.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
+             t.PhoneNumber.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
+             t.Notes.Contains(searchTerm, StringComparison.OrdinalIgnoreCase)) &&
+            (string.IsNullOrEmpty(selectedLeaseStatus) || GetTenantLeaseStatus(t) == selectedLeaseStatus) &&
+            (selectedTenantStatus == 1 ? t.IsActive : !t.IsActive)
+        ).ToList();
+        
+        SortTenants();
+        UpdatePagination();
+        CalculateMetrics();
+    }
+
+    private string GetTenantLeaseStatus(Tenant tenant)
+    {
+        var activeLease = tenant.Leases?.FirstOrDefault(l => l.Status == "Active");
+        if (activeLease != null) return "Active";
+        
+        var latestLease = tenant.Leases?.OrderByDescending(l => l.StartDate).FirstOrDefault();
+        if (latestLease != null) return latestLease.Status;
+        
+        return "No Lease";
+    }
+
+    private void SortBy(string column)
+    {
+        if (sortColumn == column)
+        {
+            sortAscending = !sortAscending;
+        }
+        else
+        {
+            sortColumn = column;
+            sortAscending = true;
+        }
+        
+        SortTenants();
+    }
+
+    private void SortTenants()
+    {
+        if (filteredTenants == null) return;
+
+        filteredTenants = sortColumn switch
+        {
+            nameof(Tenant.FirstName) => sortAscending 
+                ? filteredTenants.OrderBy(t => t.FirstName).ThenBy(t => t.LastName).ToList()
+                : filteredTenants.OrderByDescending(t => t.FirstName).ThenByDescending(t => t.LastName).ToList(),
+            nameof(Tenant.Email) => sortAscending 
+                ? filteredTenants.OrderBy(t => t.Email).ToList()
+                : filteredTenants.OrderByDescending(t => t.Email).ToList(),
+            nameof(Tenant.PhoneNumber) => sortAscending 
+                ? filteredTenants.OrderBy(t => t.PhoneNumber).ToList()
+                : filteredTenants.OrderByDescending(t => t.PhoneNumber).ToList(),
+            nameof(Tenant.DateOfBirth) => sortAscending 
+                ? filteredTenants.OrderBy(t => t.DateOfBirth ?? DateTime.MinValue).ToList()
+                : filteredTenants.OrderByDescending(t => t.DateOfBirth ?? DateTime.MinValue).ToList(),
+            nameof(Tenant.IsActive) => sortAscending 
+                ? filteredTenants.OrderBy(t => t.IsActive).ToList()
+                : filteredTenants.OrderByDescending(t => t.IsActive).ToList(),
+            nameof(Tenant.CreatedOn) => sortAscending 
+                ? filteredTenants.OrderBy(t => t.CreatedOn).ToList()
+                : filteredTenants.OrderByDescending(t => t.CreatedOn).ToList(),
+            _ => filteredTenants
+        };
+        
+        UpdatePagination();
+    }
+
+    private void CalculateMetrics()
+    {
+        if (filteredTenants != null)
+        {
+            activeTenantsCount = filteredTenants.Count(t => 
+                t.Leases?.Any(l => l.Status == "Active") == true);
+            
+            tenantsWithoutLeaseCount = filteredTenants.Count(t => 
+                t.Leases?.Any() != true);
+            
+            var now = DateTime.Now;
+            newThisMonthCount = filteredTenants.Count(t => 
+                t.CreatedOn.Month == now.Month && t.CreatedOn.Year == now.Year);
+        }
+    }
+
+    private string GetLeaseStatusClass(string status)
+    {
+        return status switch
+        {
+            "Active" => "success",
+            "Expired" => "warning",
+            "Terminated" => "danger",
+            "Pending" => "info",
+            _ => "secondary"
+        };
+    }
+
+    private void ClearFilters()
+    {
+        searchTerm = string.Empty;
+        selectedLeaseStatus = string.Empty;
+        currentPage = 1;
+        FilterTenants();
+    }
+
+    private void UpdatePagination()
+    {
+        totalRecords = filteredTenants?.Count ?? 0;
+        totalPages = (int)Math.Ceiling((double)totalRecords / pageSize);
+        
+        if (currentPage > totalPages && totalPages > 0)
+        {
+            currentPage = totalPages;
+        }
+        else if (currentPage < 1)
+        {
+            currentPage = 1;
+        }
+        
+        pagedTenants = filteredTenants?
+            .Skip((currentPage - 1) * pageSize)
+            .Take(pageSize)
+            .ToList() ?? new List<Tenant>();
+    }
+
+    private void GoToPage(int page)
+    {
+        if (page >= 1 && page <= totalPages && page != currentPage)
+        {
+            currentPage = page;
+            UpdatePagination();
+        }
+    }
+}
diff --git a/3-Aquiis.UI.Shared/Features/PropertyManagement/Tenants/ViewForm.razor b/3-Aquiis.UI.Shared/Features/PropertyManagement/Tenants/ViewForm.razor
new file mode 100644
index 0000000..fe47176
--- /dev/null
+++ b/3-Aquiis.UI.Shared/Features/PropertyManagement/Tenants/ViewForm.razor
@@ -0,0 +1,238 @@
+@using Aquiis.Core.Entities
+@using Aquiis.Application.Services
+@using Microsoft.AspNetCore.Components.Authorization
+@inject NavigationManager NavigationManager
+@inject TenantService TenantService
+@inject LeaseService LeaseService
+@rendermode InteractiveServer
+
+@if (tenant == null)
+{
+    <div class="text-center">
+        <div class="spinner-border" role="status">
+            <span class="visually-hidden">Loading...</span>
+        </div>
+    </div>
+}
+else if (!isAuthorized)
+{
+    <div class="alert alert-danger">
+        <h4>Access Denied</h4>
+        <p>You don't have permission to view this tenant.</p>
+        <a href="/propertymanagement/tenants" class="btn btn-primary">Back to Tenants</a>
+    </div>
+}
+else
+{
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <h1>Tenant Details</h1>
+        <div class="btn-group">
+            <button class="btn btn-primary" @onclick="EditTenant">
+                <i class="bi bi-pencil"></i> Edit
+            </button>
+            <button class="btn btn-secondary" @onclick="BackToList">
+                <i class="bi bi-arrow-left"></i> Back to List
+            </button>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">
+                    <h5 class="mb-0">Personal Information</h5>
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <strong>Full Name:</strong>
+                            <p>@tenant.FullName</p>
+                        </div>
+                        <div class="col-md-6 mb-3">
+                            <strong>Email:</strong>
+                            <p><a href="mailto:@tenant.Email">@tenant.Email</a></p>
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <strong>Phone Number:</strong>
+                            <p>@(!string.IsNullOrEmpty(tenant.PhoneNumber) ? tenant.PhoneNumber : "Not provided")</p>
+                        </div>
+                        <div class="col-md-6 mb-3">
+                            <strong>Date of Birth:</strong>
+                            <p>@(tenant.DateOfBirth?.ToString("MMMM dd, yyyy") ?? "Not provided")</p>
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <strong>Identification Number:</strong>
+                            <p>@(!string.IsNullOrEmpty(tenant.IdentificationNumber) ? tenant.IdentificationNumber : "Not provided")</p>
+                        </div>
+                        <div class="col-md-6 mb-3">
+                            <strong>Status:</strong>
+                            <p>@(tenant.IsActive ? "Active" : "Inactive")</p>
+                        </div>
+                    </div>
+
+                    @if (!string.IsNullOrEmpty(tenant.EmergencyContactName) || !string.IsNullOrEmpty(tenant.EmergencyContactPhone))
+                    {
+                        <hr />
+                        <h6>Emergency Contact</h6>
+                        <div class="row">
+                            <div class="col-md-6 mb-3">
+                                <strong>Contact Name:</strong>
+                                <p>@(!string.IsNullOrEmpty(tenant.EmergencyContactName) ? tenant.EmergencyContactName : "Not provided")</p>
+                            </div>
+                            <div class="col-md-6 mb-3">
+                                <strong>Contact Phone:</strong>
+                                <p>@(!string.IsNullOrEmpty(tenant.EmergencyContactPhone) ? tenant.EmergencyContactPhone : "Not provided")</p>
+                            </div>
+                        </div>
+                    }
+
+                    @if (!string.IsNullOrEmpty(tenant.Notes))
+                    {
+                        <hr />
+                        <div class="row">
+                            <div class="col-md-12 mb-3">
+                                <strong>Notes:</strong>
+                                <p>@tenant.Notes</p>
+                            </div>
+                        </div>
+                    }
+
+                    <hr />
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <strong>Added to System:</strong>
+                            <p>@tenant.CreatedOn.ToString("MMMM dd, yyyy")</p>
+                        </div>
+                        @if (tenant.LastModifiedOn.HasValue)
+                        {
+                            <div class="col-md-6 mb-3">
+                                <strong>Last Modified:</strong>
+                                <p>@tenant.LastModifiedOn.Value.ToString("MMMM dd, yyyy")</p>
+                            </div>
+                        }
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="col-md-4">
+            <div class="card">
+                <div class="card-header">
+                    <h5 class="mb-0">Quick Actions</h5>
+                </div>
+                <div class="card-body">
+                    <div class="d-grid gap-2">
+                        <button class="btn btn-outline-primary" @onclick="EditTenant">
+                            <i class="bi bi-pencil"></i> Edit Tenant
+                        </button>
+                        <button class="btn btn-outline-success" @onclick="CreateLease">
+                            <i class="bi bi-file-plus"></i> Create Lease
+                        </button>
+                        <button class="btn btn-outline-info" @onclick="ViewLeases">
+                            <i class="bi bi-file-text"></i> View Leases
+                        </button>
+                        <button class="btn btn-outline-secondary" @onclick="ViewDocuments">
+                            <i class="bi bi-folder"></i> View Documents
+                        </button>
+                    </div>
+                </div>
+            </div>
+
+            @if (tenantLeases.Any())
+            {
+                <div class="card mt-3">
+                    <div class="card-header">
+                        <h5 class="mb-0">Lease History</h5>
+                    </div>
+                    <div class="card-body">
+                        @foreach (var lease in tenantLeases.OrderByDescending(l => l.StartDate))
+                        {
+                            <div class="border-bottom pb-2 mb-2">
+                                <strong>@lease.Property?.Address</strong>
+                                <br />
+                                <small class="text-muted">
+                                    @lease.StartDate.ToString("MMM dd, yyyy") - @lease.EndDate.ToString("MMM dd, yyyy")
+                                </small>
+                                <br />
+                                <span class="badge @(lease.Status == "Active" ? "bg-success" : "bg-secondary")">
+                                    @lease.Status
+                                </span>
+                                <small class="text-success ms-2">@lease.MonthlyRent.ToString("C")/month</small>
+                            </div>
+                        }
+                    </div>
+                </div>
+            }
+        </div>
+    </div>
+}
+
+@code {
+    [Parameter]
+    public Guid TenantId { get; set; }
+    
+    private Tenant? tenant;
+    private List<Lease> tenantLeases = new();
+    private bool isAuthorized = true;
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadTenant();
+    }
+
+    private async Task LoadTenant()
+    {
+        var authState = await AuthenticationStateTask;
+        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
+
+        if (string.IsNullOrEmpty(userId))
+        {
+            isAuthorized = false;
+            return;
+        }
+
+        tenant = await TenantService.GetByIdAsync(TenantId);
+
+        if (tenant == null)
+        {
+            isAuthorized = false;
+            return;
+        }
+
+        tenantLeases = await LeaseService.GetLeasesByTenantIdAsync(TenantId);
+    }
+
+    private void EditTenant()
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/tenants/{TenantId}/edit");
+    }
+
+    private void BackToList()
+    {
+        NavigationManager.NavigateTo("/propertymanagement/tenants");
+    }
+
+    private void CreateLease()
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/leases/create?tenantId={TenantId}");
+    }
+
+    private void ViewLeases()
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/leases?tenantId={TenantId}");
+    }
+
+    private void ViewDocuments()
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/documents?tenantId={TenantId}");
+    }
+}
diff --git a/3-Aquiis.UI.Shared/wwwroot/js/theme.js b/3-Aquiis.UI.Shared/wwwroot/js/theme.js
index 168c1bf..c82e64c 100644
--- a/3-Aquiis.UI.Shared/wwwroot/js/theme.js
+++ b/3-Aquiis.UI.Shared/wwwroot/js/theme.js
@@ -25,27 +25,92 @@ window.themeManager = {
   initTheme: function () {
     const savedTheme = this.getTheme();
     this.setTheme(savedTheme);
+    const savedBrandTheme = this.getBrandTheme();
+    this.setBrandTheme(savedBrandTheme);
     return savedTheme;
   },
+
+  setBrandTheme: function (brandTheme) {
+    console.log("setBrandTheme called with:", brandTheme);
+    document.documentElement.setAttribute("data-brand-theme", brandTheme);
+    localStorage.setItem("brandTheme", brandTheme);
+    console.log(
+      "Brand theme set. DOM attribute:",
+      document.documentElement.getAttribute("data-brand-theme"),
+    );
+    console.log("localStorage value:", localStorage.getItem("brandTheme"));
+
+    // Force browser to recalculate CSS custom properties
+    document.documentElement.style.display = "none";
+    void document.documentElement.offsetHeight; // Trigger reflow
+    document.documentElement.style.display = "";
+  },
+
+  getBrandTheme: function () {
+    const brandTheme = localStorage.getItem("brandTheme") || "bootstrap";
+    return brandTheme;
+  },
 };
 
 // Initialize theme IMMEDIATELY (before DOMContentLoaded) to prevent flash
 if (typeof localStorage !== "undefined") {
   const savedTheme = localStorage.getItem("theme") || "light";
-  console.log("Initial theme load:", savedTheme);
+  const savedBrandTheme = localStorage.getItem("brandTheme") || "bootstrap";
+  console.log("Initial theme load:", savedTheme, "Brand:", savedBrandTheme);
   document.documentElement.setAttribute("data-bs-theme", savedTheme);
+  document.documentElement.setAttribute("data-brand-theme", savedBrandTheme);
+
+  // Force multiple reflows to ensure CSS is applied
+  // Using requestAnimationFrame to ensure it happens after browser paint
+  document.documentElement.style.display = "none";
+  void document.documentElement.offsetHeight; // Trigger reflow
+  document.documentElement.style.display = "";
+
+  // Double-check on next frame
+  requestAnimationFrame(() => {
+    if (
+      document.documentElement.getAttribute("data-brand-theme") !==
+      savedBrandTheme
+    ) {
+      document.documentElement.setAttribute(
+        "data-brand-theme",
+        savedBrandTheme,
+      );
+    }
+    console.log(
+      "Initial theme applied with reflow, verified:",
+      document.documentElement.getAttribute("data-brand-theme"),
+    );
+  });
 
   // Watch for Blazor navigation and re-apply theme
   // This handles Interactive Server mode where components persist
   const observer = new MutationObserver(function (mutations) {
-    const currentTheme = document.documentElement.getAttribute("data-bs-theme");
-    if (currentTheme) {
-      // Re-trigger reflow to ensure CSS variables are applied
-      document.documentElement.style.display = "none";
-      void document.documentElement.offsetHeight;
-      document.documentElement.style.display = "";
-      //console.log("Theme re-applied after DOM mutation:", currentTheme);
+    let currentTheme = document.documentElement.getAttribute("data-bs-theme");
+    let currentBrandTheme =
+      document.documentElement.getAttribute("data-brand-theme");
+
+    // If attributes are missing, restore from localStorage
+    if (!currentTheme) {
+      currentTheme = localStorage.getItem("theme") || "light";
+      document.documentElement.setAttribute("data-bs-theme", currentTheme);
+      console.log("Restored theme attribute:", currentTheme);
+    }
+
+    if (!currentBrandTheme) {
+      currentBrandTheme = localStorage.getItem("brandTheme") || "bootstrap";
+      document.documentElement.setAttribute(
+        "data-brand-theme",
+        currentBrandTheme,
+      );
+      console.log("Restored brand theme attribute:", currentBrandTheme);
     }
+
+    // Re-trigger reflow to ensure CSS variables are applied
+    document.documentElement.style.display = "none";
+    void document.documentElement.offsetHeight;
+    document.documentElement.style.display = "";
+    //console.log("Theme re-applied after DOM mutation:", currentTheme, currentBrandTheme);
   });
 
   // Start observing after a short delay to let Blazor initialize
@@ -55,4 +120,35 @@ if (typeof localStorage !== "undefined") {
       subtree: true,
     });
   }, 1000);
+
+  // Also ensure theme is applied after DOM is fully loaded
+  if (document.readyState === "loading") {
+    document.addEventListener("DOMContentLoaded", () => {
+      const currentTheme =
+        document.documentElement.getAttribute("data-bs-theme") ||
+        localStorage.getItem("theme") ||
+        "light";
+      const currentBrandTheme =
+        document.documentElement.getAttribute("data-brand-theme") ||
+        localStorage.getItem("brandTheme") ||
+        "bootstrap";
+
+      document.documentElement.setAttribute("data-bs-theme", currentTheme);
+      document.documentElement.setAttribute(
+        "data-brand-theme",
+        currentBrandTheme,
+      );
+
+      // Force reflow
+      document.documentElement.style.display = "none";
+      void document.documentElement.offsetHeight;
+      document.documentElement.style.display = "";
+
+      console.log(
+        "DOMContentLoaded - Theme re-applied:",
+        currentTheme,
+        currentBrandTheme,
+      );
+    });
+  }
 }
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Application/Pages/InitializeSchemaVersion.razor b/4-Aquiis.SimpleStart/Features/Administration/Application/Pages/InitializeSchemaVersion.razor
index b68a944..bfa0c72 100644
--- a/4-Aquiis.SimpleStart/Features/Administration/Application/Pages/InitializeSchemaVersion.razor
+++ b/4-Aquiis.SimpleStart/Features/Administration/Application/Pages/InitializeSchemaVersion.razor
@@ -9,6 +9,8 @@
 @inject NavigationManager Navigation
 @rendermode InteractiveServer
 
+@namespace Aquiis.SimpleStart.Features.Administration.Application.Pages
+
 <h3>Initialize Schema Version</h3>
 
 <div class="container-fluid">
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Dashboard.razor b/4-Aquiis.SimpleStart/Features/Administration/Dashboard.razor
index de90337..f9e857b 100644
--- a/4-Aquiis.SimpleStart/Features/Administration/Dashboard.razor
+++ b/4-Aquiis.SimpleStart/Features/Administration/Dashboard.razor
@@ -25,82 +25,12 @@
             </div>
         </div>
     }
-    else
-    {
-        <div class="row mb-4">
-            <div class="col-md-3">
-                <div class="card text-white bg-primary">
-                    <div class="card-body">
-                        <div class="d-flex justify-content-between">
-                            <div>
-                                <h4>@totalAccounts</h4>
-                                <p class="card-text">Total Accounts</p>
-                            </div>
-                            <div class="align-self-center">
-                                <i class="bi bi-people-fill" style="font-size: 2rem;"></i>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-3">
-                <div class="card text-white bg-success">
-                    <div class="card-body">
-                        <div class="d-flex justify-content-between">
-                            <div>
-                                <h4>@activeAccounts</h4>
-                                <p class="card-text">Active Accounts</p>
-                            </div>
-                            <div class="align-self-center">
-                                <i class="bi bi-check-circle" style="font-size: 2rem;"></i>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-3">
-                <div class="card text-white bg-info">
-                    <div class="card-body">
-                        <div class="d-flex justify-content-between">
-                            <div>
-                                <h4>@usersOnline</h4>
-                                <p class="card-text">Users Online</p>
-                            </div>
-                            <div class="align-self-center">
-                                <i class="bi bi-person-circle" style="font-size: 2rem;"></i>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-3">
-                <div class="card text-white bg-warning">
-                    <div class="card-body">
-                        <div class="d-flex justify-content-between">
-                            <div>
-                                <h4>@lockedAccounts</h4>
-                                <p class="card-text">Locked Accounts</p>
-                            </div>
-                            <div class="align-self-center">
-                                <i class="bi bi-lock-fill" style="font-size: 2rem;"></i>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
 
     <div>
-    <button class="btn btn-outline-primary" @onclick="GoToOrganizationSettings">Organization Settings</button>
-    <button class="btn btn-primary" @onclick="GoToServiceSettings">Service Settings</button>
-    <button class="btn btn-secondary" @onclick="GoToLateFeeSettings">Late Fee Settings</button>
-    <button class="btn btn-info" @onclick="GoToDatabaseSettings">Manage Database</button>
-    <button class="btn btn-success" @onclick="GoToCalendarSettings">Calendar Settings</button>
-    <button class="btn btn-warning" @onclick="GoToUserManagement">User Management</button>
-    <button class="btn btn-warning" @onclick="GoToEmailSettings">Email Notification Settings</button>
-    <button class="btn btn-warning" @onclick="GoToSMSSettings">SMS Notification Settings</button>
-</div>
+        <button class="btn btn-outline-primary" @onclick="GoToApplicationSettings">Application Settings</button>
+        <button class="btn btn-info" @onclick="GoToDatabaseSettings">Manage Database</button>
+        <button class="btn btn-warning" @onclick="GoToUserManagement">User Management</button>
+    </div>
     </ChildContent>
     <NotAuthorized>
         @{
@@ -111,17 +41,7 @@
 
 @code {
     private bool isLoading = false;
-    //private int totalProperties = 0;
-    //private int availableProperties = 0;
-    //private int totalTenants = 0;
-    //private int activeLeases = 0;
-
-    private int lockedAccounts = 0;
-
-    private int totalAccounts = 0;
-    private int activeAccounts = 0;
-
-    private int usersOnline = 0;
+   
     
     [CascadingParameter]
     private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
@@ -146,39 +66,17 @@
 
     }
 
-    private void GoToEmailSettings()
-    {
-        // Logic to navigate to the email notification settings page
-        NavigationManager.NavigateTo("/administration/settings/email");
-    }
 
-    private void GoToSMSSettings()
-    {
-        // Logic to navigate to the SMS notification settings page
-        NavigationManager.NavigateTo("/administration/settings/sms");
-    }
-
-    private void GoToLateFeeSettings()
-    {
-        // Logic to view the daily system status report
-        NavigationManager.NavigateTo("/administration/settings/latefees");
-    }
-
-    private void GoToServiceSettings()
+    private void GoToApplicationSettings()
     {
         // Logic to navigate to the application settings page
-        NavigationManager.NavigateTo("/administration/settings/services");
+        NavigationManager.NavigateTo("/administration/settings/application");
     }
+    
     private void GoToDatabaseSettings()
     {
         // Logic to navigate to the database management page
-        NavigationManager.NavigateTo("/administration/application/database");
-    }
-
-    private void GoToCalendarSettings()
-    {
-        // Logic to navigate to the calendar settings page
-        NavigationManager.NavigateTo("/administration/settings/calendar");
+        NavigationManager.NavigateTo("/administration/settings/database");
     }
 
     private void GoToUserManagement()
@@ -186,9 +84,5 @@
         // Logic to navigate to the user management page
         NavigationManager.NavigateTo("/administration/users/manage");
     }
-    private void GoToOrganizationSettings()
-    {
-        // Logic to navigate to the organization settings page
-        NavigationManager.NavigateTo("/administration/settings/organization");
-    }
+
 }
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/EditOrganization.razor b/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/EditOrganization.razor
index e5f3d50..6ff0d32 100644
--- a/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/EditOrganization.razor
+++ b/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/EditOrganization.razor
@@ -1,4 +1,4 @@
-@page "/administration/organizations/edit/{Id:guid}"
+@page "/administration/organizations/{Id:guid}/edit"
 
 @using Aquiis.Core.Entities
 @using Aquiis.Application.Services
@@ -21,7 +21,7 @@
     <div class="d-flex justify-content-between align-items-center mb-4">
         <h1><i class="bi bi-building"></i> Edit Organization</h1>
         <button class="btn btn-outline-secondary" @onclick="Cancel">
-            <i class="bi bi-arrow-left"></i> Back to Organizations
+            <i class="bi bi-arrow-left"></i> Back to Organization
         </button>
     </div>
 
@@ -256,7 +256,7 @@
 
     private void Cancel()
     {
-        Navigation.NavigateTo("/administration/organizations");
+        Navigation.NavigateTo($"/administration/organizations/{Id}");
     }
 
     private List<(string Code, string Name)> GetUsStates()
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ManageUsers.razor b/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ManageUsers.razor
index 70ad1b3..164203c 100644
--- a/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ManageUsers.razor
+++ b/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ManageUsers.razor
@@ -5,11 +5,13 @@
 @using Aquiis.SimpleStart.Shared.Services
 @using Aquiis.SimpleStart.Shared.Components.Account
 @using Aquiis.Core.Constants
+@using Aquiis.Infrastructure.Data
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.EntityFrameworkCore
 
 @inject OrganizationService OrganizationService
+@inject ApplicationDbContext DbContext
 @inject UserContextService UserContext
 @inject UserManager<ApplicationUser> UserManager
 @inject NavigationManager Navigation
@@ -56,10 +58,19 @@
                 <div class="card">
                     <div class="card-header d-flex justify-content-between align-items-center">
                         <h5 class="mb-0">Users with Access</h5>
-                        <button class="btn btn-sm btn-primary" @onclick="ShowAddUserModal">
+                        <button class="btn btn-sm btn-primary" @onclick="ShowAddUserModal" disabled="@(!CanAddMoreUsers)">
                             <i class="bi bi-person-plus"></i> Add User
                         </button>
                     </div>
+                    @if (!CanAddMoreUsers)
+                    {
+                        <div class="alert alert-warning m-3 mb-0">
+                            <i class="bi bi-exclamation-triangle"></i>
+                            <strong>User Limit Reached</strong><br />
+                            SimpleStart allows 3 user accounts (1 system + 2 login users).<br />
+                            <small>Upgrade to <strong>Aquiis Professional</strong> for unlimited users and advanced features.</small>
+                        </div>
+                    }
                     <div class="card-body p-0">
                         @if (!organizationUsers.Any())
                         {
@@ -219,7 +230,7 @@
 
     private bool isLoading = true;
     private Organization? organization;
-    private List<UserOrganization> organizationUsers = new();
+    private List<OrganizationUser> organizationUsers = new();
     private Dictionary<string, string> userEmails = new();
     private bool showAddUserModal = false;
     private List<ApplicationUser> availableUsers = new();
@@ -227,6 +238,10 @@
     private string selectedRole = ApplicationConstants.OrganizationRoles.User;
     private string addUserError = string.Empty;
 
+    // SimpleStart: 3-user limit (excluding system account)
+    private bool CanAddMoreUsers => organizationUsers
+        .Count(ou => ou.UserId != ApplicationConstants.SystemUser.Id) < 3;
+
     protected override async Task OnInitializedAsync()
     {
         await LoadOrganization();
@@ -275,19 +290,21 @@
 
         organizationUsers = await OrganizationService.GetOrganizationUsersAsync(Id);
 
-        // Load user emails
-        foreach (var userOrg in organizationUsers)
-        {
-            var user = await UserManager.FindByIdAsync(userOrg.UserId);
-            if (user != null)
-            {
-                userEmails[userOrg.UserId] = user.Email ?? "Unknown";
-            }
+        // Load user emails from UserProfile (single query)
+        var userIds = organizationUsers
+            .SelectMany(ou => new[] { ou.UserId, ou.GrantedBy })
+            .Distinct()
+            .ToList();
+
+        var profiles = await DbContext.UserProfiles
+            .Where(up => userIds.Contains(up.UserId))
+            .ToDictionaryAsync(up => up.UserId, up => up.Email);
 
-            var grantedByUser = await UserManager.FindByIdAsync(userOrg.GrantedBy);
-            if (grantedByUser != null)
+        foreach (var userId in userIds)
+        {
+            if (profiles.TryGetValue(userId, out var email))
             {
-                userEmails[userOrg.GrantedBy] = grantedByUser.Email ?? "Unknown";
+                userEmails[userId] = email;
             }
         }
     }
@@ -297,11 +314,24 @@
         if (organization == null) return;
 
         // Get all users who are NOT already assigned to this organization
-        var allUsers = await UserManager.Users.ToListAsync();
-        var nonSystemUsers = allUsers.Where(u => u.Id != ApplicationConstants.SystemUser.Id).ToList();
+        // Using UserProfile instead of UserManager.Users
+        var allUserProfiles = await DbContext.UserProfiles
+            .Where(up => up.UserId != ApplicationConstants.SystemUser.Id)
+            .ToListAsync();
+        
         var assignedUserIds = organizationUsers.Select(u => u.UserId).ToHashSet();
         
-        availableUsers = nonSystemUsers.Where(u => !assignedUserIds.Contains(u.Id)).ToList();
+        // Map UserProfile to ApplicationUser for compatibility
+        availableUsers = allUserProfiles
+            .Where(up => !assignedUserIds.Contains(up.UserId))
+            .Select(up => new ApplicationUser
+            {
+                Id = up.UserId,
+                Email = up.Email,
+                FirstName = up.FirstName,
+                LastName = up.LastName
+            })
+            .ToList();
     }
 
     private string GetUserEmail(string userId)
@@ -321,7 +351,7 @@
         };
     }
 
-    private async Task ChangeUserRole(UserOrganization userOrg, string newRole)
+    private async Task ChangeUserRole(OrganizationUser userOrg, string newRole)
     {
         try
         {
@@ -352,7 +382,7 @@
         }
     }
 
-    private async Task RevokeUserAccess(UserOrganization userOrg)
+    private async Task RevokeUserAccess(OrganizationUser userOrg)
     {
         if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Are you sure you want to revoke {GetUserEmail(userOrg.UserId)}'s access to this organization?"))
         {
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/Organizations.razor b/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/Organizations.razor
index 061475c..f8adac0 100644
--- a/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/Organizations.razor
+++ b/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/Organizations.razor
@@ -23,11 +23,12 @@
             <h1><i class="bi bi-building"></i> Organizations</h1>
             <p class="text-muted mb-0">Manage your organizations and access</p>
         </div>
-        <OrganizationAuthorizeView Roles="Owner">
+        @* --- Only one organization allowed in SimpleStart --- *@
+        @* <OrganizationAuthorizeView Roles="Owner">
             <button class="btn btn-primary" @onclick="NavigateToCreate">
                 <i class="bi bi-plus-circle"></i> Create Organization
             </button>
-        </OrganizationAuthorizeView>
+        </OrganizationAuthorizeView> *@
     </div>
 
     @if (isLoading)
@@ -131,8 +132,8 @@
 
 @code {
     private bool isLoading = true;
-    private List<UserOrganization> organizations = new();
-    private List<UserOrganization> filteredOrganizations = new();
+    private List<OrganizationUser> organizations = new();
+    private List<OrganizationUser> filteredOrganizations = new();
     private string searchTerm = string.Empty;
 
     protected override async Task OnInitializedAsync()
@@ -199,12 +200,12 @@
 
     private void NavigateToView(Guid organizationId)
     {
-        Navigation.NavigateTo($"/administration/organizations/view/{organizationId}");
+        Navigation.NavigateTo($"/administration/organizations/{organizationId}");
     }
 
     private void NavigateToEdit(Guid organizationId)
     {
-        Navigation.NavigateTo($"/administration/organizations/edit/{organizationId}");
+        Navigation.NavigateTo($"/administration/organizations/{organizationId}/edit");
     }
 
     private void NavigateToManageUsers(Guid organizationId)
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ViewOrganization.razor b/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ViewOrganization.razor
index d06a445..5089f57 100644
--- a/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ViewOrganization.razor
+++ b/4-Aquiis.SimpleStart/Features/Administration/Organizations/Pages/ViewOrganization.razor
@@ -1,16 +1,19 @@
-@page "/administration/organizations/view/{Id:guid}"
+@page "/administration/organizations/{Id:guid}"
 
 @using Aquiis.Core.Entities
 @using Aquiis.Application.Services
+@using Aquiis.Infrastructure.Data
 @using Aquiis.SimpleStart.Shared.Services
 @using Aquiis.SimpleStart.Shared.Components.Account
 @using Aquiis.Core.Constants
+@using Aquiis.UI.Shared.Features.Organizations
+@using Aquiis.UI.Shared.Components.Entities.OrganizationUsers
 @using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Identity
+@using Microsoft.EntityFrameworkCore
 
 @inject OrganizationService OrganizationService
+@inject ApplicationDbContext DbContext
 @inject UserContextService UserContext
-@inject UserManager<ApplicationUser> UserManager
 @inject NavigationManager Navigation
 @inject ToastService ToastService
 
@@ -22,17 +25,6 @@
 <div class="container-fluid">
     <div class="d-flex justify-content-between align-items-center mb-4">
         <h1><i class="bi bi-building"></i> Organization Details</h1>
-        <div class="btn-group">
-            @if (isOwner)
-            {
-                <button class="btn btn-primary" @onclick="NavigateToEdit">
-                    <i class="bi bi-pencil"></i> Edit
-                </button>
-            }
-            <button class="btn btn-outline-secondary" @onclick="Cancel">
-                <i class="bi bi-arrow-left"></i> Back to Organizations
-            </button>
-        </div>
     </div>
 
     @if (isLoading)
@@ -51,175 +43,14 @@
     }
     else
     {
-        <div class="row">
-            <div class="col-md-8">
-                <!-- Organization Information Card -->
-                <div class="card mb-4">
-                    <div class="card-header">
-                        <h5 class="mb-0">Organization Information</h5>
-                    </div>
-                    <div class="card-body">
-                        <dl class="row">
-                            <dt class="col-sm-3">Organization Name:</dt>
-                            <dd class="col-sm-9"><strong>@organization.Name</strong></dd>
-
-                            <dt class="col-sm-3">Display Name:</dt>
-                            <dd class="col-sm-9">@(organization.DisplayName ?? "-")</dd>
-
-                            <dt class="col-sm-3">State:</dt>
-                            <dd class="col-sm-9">@(organization.State ?? "-")</dd>
-
-                            <dt class="col-sm-3">Status:</dt>
-                            <dd class="col-sm-9">
-                                @if (organization.IsActive)
-                                {
-                                    <span class="badge bg-success">Active</span>
-                                }
-                                else
-                                {
-                                    <span class="badge bg-secondary">Inactive</span>
-                                }
-                            </dd>
-
-                            <dt class="col-sm-3">Owner:</dt>
-                            <dd class="col-sm-9">@ownerEmail</dd>
-
-                            <dt class="col-sm-3">Created On:</dt>
-                            <dd class="col-sm-9">@organization.CreatedOn.ToString("MMMM dd, yyyy")</dd>
-
-                            @if (organization.LastModifiedOn.HasValue)
-                            {
-                                <dt class="col-sm-3">Last Modified:</dt>
-                                <dd class="col-sm-9">@organization.LastModifiedOn.Value.ToString("MMMM dd, yyyy")</dd>
-                            }
-                        </dl>
-                    </div>
-                </div>
-
-                <!-- Users with Access Card -->
-                <div class="card">
-                    <div class="card-header d-flex justify-content-between align-items-center">
-                        <h5 class="mb-0">Users with Access</h5>
-                        @if (isOwner || isAdministrator && isCurrentOrganization)
-                        {
-                            <button class="btn btn-sm btn-primary" @onclick="NavigateToManageUsers">
-                                <i class="bi bi-people"></i> Manage Users
-                            </button>
-                        }
-                    </div>
-                    <div class="card-body p-0">
-                        @if (!organizationUsers.Any())
-                        {
-                            <div class="p-3 text-center text-muted">
-                                No users assigned to this organization.
-                            </div>
-                        }
-                        else
-                        {
-                            <div class="table-responsive">
-                                <table class="table table-hover mb-0">
-                                    <thead>
-                                        <tr>
-                                            <th>User</th>
-                                            <th>Role</th>
-                                            <th>Granted By</th>
-                                            <th>Granted On</th>
-                                            <th>Status</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach (var userOrg in organizationUsers)
-                                        {
-                                            <tr>
-                                                <td>
-                                                    <div>
-                                                        <strong>@GetUserEmail(userOrg.UserId)</strong>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <span class="badge @GetRoleBadgeClass(userOrg.Role)">
-                                                        @userOrg.Role
-                                                    </span>
-                                                </td>
-                                                <td>@GetUserEmail(userOrg.GrantedBy)</td>
-                                                <td>@userOrg.GrantedOn.ToString("MMM dd, yyyy")</td>
-                                                <td>
-                                                    @if (userOrg.IsActive && userOrg.RevokedOn == null)
-                                                    {
-                                                        <span class="badge bg-success">Active</span>
-                                                    }
-                                                    else
-                                                    {
-                                                        <span class="badge bg-danger">Revoked</span>
-                                                    }
-                                                </td>
-                                            </tr>
-                                        }
-                                    </tbody>
-                                </table>
-                            </div>
-                        }
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-md-4">
-                <!-- Quick Stats Card -->
-                <div class="card mb-4">
-                    <div class="card-header">
-                        <h6 class="mb-0"><i class="bi bi-bar-chart"></i> Quick Stats</h6>
-                    </div>
-                    <div class="card-body">
-                        <dl class="row mb-0">
-                            <dt class="col-sm-7">Total Users:</dt>
-                            <dd class="col-sm-5 text-end"><strong>@organizationUsers.Count</strong></dd>
-
-                            <dt class="col-sm-7">Active Users:</dt>
-                            <dd class="col-sm-5 text-end"><strong>@organizationUsers.Count(u => u.IsActive)</strong></dd>
-
-                            <dt class="col-sm-7">Owners:</dt>
-                            <dd class="col-sm-5 text-end"><strong>@organizationUsers.Count(u => u.Role == ApplicationConstants.OrganizationRoles.Owner)</strong></dd>
-
-                            <dt class="col-sm-7">Administrators:</dt>
-                            <dd class="col-sm-5 text-end"><strong>@organizationUsers.Count(u => u.Role == ApplicationConstants.OrganizationRoles.Administrator)</strong></dd>
-
-                            <dt class="col-sm-7">Property Managers:</dt>
-                            <dd class="col-sm-5 text-end"><strong>@organizationUsers.Count(u => u.Role == ApplicationConstants.OrganizationRoles.PropertyManager)</strong></dd>
-                        </dl>
-                    </div>
-                </div>
-
-                <!-- Your Access Card -->
-                <div class="card">
-                    <div class="card-header">
-                        <h6 class="mb-0"><i class="bi bi-shield-check"></i> Your Access</h6>
-                    </div>
-                    <div class="card-body">
-                        <p><strong>Your Role:</strong></p>
-                        <p>
-                            <span class="badge @GetRoleBadgeClass(currentUserRole) fs-6">
-                                @currentUserRole
-                            </span>
-                        </p>
-                        <hr />
-                        <p class="small mb-0">
-                            @if (isOwner)
-                            {
-                                <span>You have full control over this organization as the Owner.</span>
-                            }
-                            else if (isAdministrator)
-                            {
-                                <span>You have administrative access to this organization.</span>
-                            }
-                            else
-                            {
-                                <span>You have limited access to this organization.</span>
-                            }
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
+        <OrganizationDetails 
+            OrganizationViewModel="@organizationViewModel"
+            CurrentUserRole="@currentUserRole"
+            CurrentUserViewModel="@currentUserViewModel"
+            IsOwner="@isOwner"
+            IsAdministrator="@isAdministrator"
+            IsCurrentOrganization="@isCurrentOrganization"
+            OnManageUsers="NavigateToManageUsers" OnEdit="NavigateToEdit" />
     }
 </div>
 
@@ -229,8 +60,7 @@
 
     private bool isLoading = true;
     private Organization? organization;
-    private List<UserOrganization> organizationUsers = new();
-    private Dictionary<string, string> userEmails = new();
+    public List<OrganizationUser> organizationUsers = new();
     private string ownerEmail = string.Empty;
     private string currentUserRole = string.Empty;
     private bool isOwner = false;
@@ -238,11 +68,17 @@
 
     private bool isCurrentOrganization = false;
 
+    public OrganizationViewModel organizationViewModel = new();
+
+    public OrganizationUserViewModel currentUserViewModel = new();
+
+
     protected override async Task OnInitializedAsync()
     {
         await LoadOrganization();
     }
 
+
     private async Task LoadOrganization()
     {
         isLoading = true;
@@ -270,34 +106,59 @@
             organization = await OrganizationService.GetOrganizationByIdAsync(Id);
             if (organization != null)
             {
-                // Get owner email
-                var owner = await UserManager.FindByIdAsync(organization.OwnerId);
-                ownerEmail = owner?.Email ?? "Unknown";
-
-                // Get users with access to this organization
-                organizationUsers = await OrganizationService.GetOrganizationUsersAsync(Id);
-
-                // Load user emails
-                foreach (var userOrg in organizationUsers)
-                {
-                    var user = await UserManager.FindByIdAsync(userOrg.UserId);
-                    if (user != null)
+                // Single-context query using UserProfile - no cross-context joins needed!
+                organizationViewModel.OrganizationUsers = await (
+                    from ou in DbContext.OrganizationUsers
+                    join profile in DbContext.UserProfiles on ou.UserId equals profile.UserId
+                    join grantedByProfile in DbContext.UserProfiles on ou.GrantedBy equals grantedByProfile.UserId into grantedByJoin
+                    from grantedByProfile in grantedByJoin.DefaultIfEmpty()
+                    where ou.OrganizationId == Id && ou.IsActive && !ou.IsDeleted
+                    select new OrganizationUserViewModel
                     {
-                        userEmails[userOrg.UserId] = user.Email ?? "Unknown";
+                        Id = ou.Id,
+                        OrganizationId = ou.OrganizationId,
+                        UserId = ou.UserId,
+                        Role = ou.Role,
+                        IsActive = ou.IsActive,
+                        GrantedOn = ou.GrantedOn,
+                        GrantedBy = ou.GrantedBy,
+                        GrantedByEmail = grantedByProfile != null ? grantedByProfile.Email : "System",
+                        Email = profile.Email,
+                        FirstName = profile.FirstName,
+                        LastName = profile.LastName,
+                        PhoneNumber = profile.PhoneNumber
                     }
+                ).ToListAsync();
 
-                    var grantedByUser = await UserManager.FindByIdAsync(userOrg.GrantedBy);
-                    if (grantedByUser != null)
-                    {
-                        userEmails[userOrg.GrantedBy] = grantedByUser.Email ?? "Unknown";
-                    }
-                }
+                // Find owner from the list
+                var owner = organizationViewModel.OrganizationUsers
+                    .FirstOrDefault(u => u.Role == ApplicationConstants.OrganizationRoles.Owner);
 
                 // Get current user's role
-                var currentUserOrg = organizationUsers.FirstOrDefault(u => u.UserId == userId);
+                var currentUserOrg = organizationViewModel.OrganizationUsers.FirstOrDefault(u => u.UserId == userId);
                 currentUserRole = currentUserOrg?.Role ?? "Unknown";
                 isOwner = currentUserRole == ApplicationConstants.OrganizationRoles.Owner;
                 isAdministrator = currentUserRole == ApplicationConstants.OrganizationRoles.Administrator;
+
+                organizationViewModel.Organization = organization;
+                organizationViewModel.OrganizationOwner = owner;
+                
+                // Get current user's profile from UserProfile table
+                var currentUserProfile = await DbContext.UserProfiles
+                    .FirstOrDefaultAsync(up => up.UserId == userId);
+                
+                if (currentUserProfile != null)
+                {
+                    currentUserViewModel = new OrganizationUserViewModel
+                    {
+                        Email = currentUserProfile.Email,
+                        UserId = userId,
+                        Role = currentUserRole, // Add the role from currentUserOrg
+                        FirstName = currentUserProfile.FirstName,
+                        LastName = currentUserProfile.LastName,
+                        PhoneNumber = currentUserProfile.PhoneNumber
+                    };
+                }
             }
         }
         catch (Exception ex)
@@ -310,11 +171,6 @@
         }
     }
 
-    private string GetUserEmail(string userId)
-    {
-        return userEmails.ContainsKey(userId) ? userEmails[userId] : "Unknown";
-    }
-
     private string GetRoleBadgeClass(string role)
     {
         return role switch
@@ -329,7 +185,7 @@
 
     private void NavigateToEdit()
     {
-        Navigation.NavigateTo($"/administration/organizations/edit/{Id}");
+        Navigation.NavigateTo($"/administration/organizations/{Id}/edit");
     }
 
     private void NavigateToManageUsers()
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/OrganizationSettings.razor b/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/ApplicationSettings.razor
similarity index 52%
rename from 4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/OrganizationSettings.razor
rename to 4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/ApplicationSettings.razor
index 4058714..3b4d7cf 100644
--- a/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/OrganizationSettings.razor
+++ b/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/ApplicationSettings.razor
@@ -1,11 +1,16 @@
-@page "/administration/settings/organization"
+@page "/administration/settings/application"
 
 @using Aquiis.Core.Entities
 @using OrganizationSettingsEntity = Aquiis.Core.Entities.OrganizationSettings
+@using CalendarSettingsEntity = Aquiis.Core.Entities.CalendarSettings
 @using Aquiis.SimpleStart.Features.PropertyManagement
 @using Aquiis.Application.Services
 @using Aquiis.SimpleStart.Shared.Services
 @using Aquiis.Application.Services.PdfGenerators
+@using Aquiis.Infrastructure.Data
+@using Aquiis.Core.Constants
+@using Aquiis.Core.Utilities
+@using Microsoft.EntityFrameworkCore
 @using Microsoft.AspNetCore.Authorization
 @using System.ComponentModel.DataAnnotations
 
@@ -13,50 +18,38 @@
 @inject UserContextService UserContext
 @inject ToastService ToastService
 @inject NavigationManager Navigation
+@inject ApplicationDbContext DbContext
+@inject CalendarSettingsService CalendarSettingsService
+@inject ILogger<ApplicationSettings> Logger
 
 @attribute [OrganizationAuthorize("Owner", "Administrator")]
 @rendermode InteractiveServer
 
-<PageTitle>Organization Settings</PageTitle>
+@namespace Aquiis.SimpleStart.Features.Administration.Settings.Pages
 
-<div class="container-fluid">
-    @* <div class="row mb-4">
-        <div class="col-12">
-            <nav aria-label="breadcrumb">
-                <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="/administration">Administration</a></li>
-                    <li class="breadcrumb-item"><a href="/administration/settings">Settings</a></li>
-                    <li class="breadcrumb-item active">Organization Settings</li>
-                </ol>
-            </nav>
-        </div>
-    </div> *@
+<PageTitle>Application Settings</PageTitle>
 
+<div class="container-fluid">
     <div class="row mb-4">
         <div class="col-12">
             <div class="d-flex justify-content-between align-items-center">
                 <div>
-                    <h1><i class="bi bi-building me-2"></i>Organization Settings</h1>
-                    @if (!string.IsNullOrEmpty(organizationName))
-                    {
-                        <p class="text-muted mb-0">
-                            Settings for <strong>@organizationName</strong>
-                            @if (!string.IsNullOrEmpty(userRole))
-                            {
-                                <span class="badge @GetRoleBadgeClass() ms-2">@userRole</span>
-                            }
-                        </p>
-                    }
+                    <div class="d-flex align-items-center gap-3 mb-2">
+                        <h1 class="mb-0"><i class="bi bi-gear me-2"></i>Application Settings</h1>
+                        <div class="text-muted">
+                            <i class="bi bi-shield-check"></i> Admin Only
+                        </div>
+                    </div>
+                    <p class="text-muted mb-0">Configure settings for your application</p>
+                </div>
+                <div class="btn-group" role="group">
+                    <button class="btn btn-outline-secondary" @onclick="GoToDatabaseSettings">
+                        <i class="bi bi-database"></i> Manage Database
+                    </button>
+                    <button class="btn btn-outline-secondary" @onclick="GoToUserManagement">
+                        <i class="bi bi-people"></i> User Management
+                    </button>
                 </div>
-                @if (canManageOrganizations)
-                {
-                    <a href="/administration/organizations" class="btn btn-outline-primary">
-                        <i class="bi bi-building me-2"></i>Manage Organizations
-                    </a>
-                }
-                 <button class="btn btn-secondary" @onclick="BackToDashboard">
-                    <i class="bi bi-arrow-left"></i> Back to Dashboard
-                </button>
             </div>
         </div>
     </div>
@@ -103,59 +96,6 @@
 
             <div class="row">
                 <div class="col-lg-8">
-                    <!-- General Settings -->
-                    <div class="card mb-4">
-                        <div class="card-header bg-primary text-white">
-                            <h5 class="card-title mb-0"><i class="bi bi-gear me-2"></i>General Settings</h5>
-                        </div>
-                        <div class="card-body">
-                            <div class="mb-3">
-                                <label class="form-label">Organization Name</label>
-                                <InputText @bind-Value="settingsModel.Name" class="form-control" placeholder="My Property Management Company" />
-                                <small class="text-muted">This name appears on documents and reports</small>
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- Application Fee Settings -->
-                    <div class="card mb-4">
-                        <div class="card-header bg-info text-white">
-                            <h5 class="card-title mb-0"><i class="bi bi-file-earmark-text me-2"></i>Application Fee Settings</h5>
-                        </div>
-                        <div class="card-body">
-                            <div class="form-check form-switch mb-3">
-                                <InputCheckbox @bind-Value="settingsModel.ApplicationFeeEnabled" class="form-check-input" id="applicationFeeEnabled" />
-                                <label class="form-check-label" for="applicationFeeEnabled">
-                                    <strong>Enable Application Fees</strong>
-                                </label>
-                            </div>
-
-                            @if (settingsModel.ApplicationFeeEnabled)
-                            {
-                                <div class="row g-3">
-                                    <div class="col-md-6">
-                                        <label class="form-label">Default Application Fee *</label>
-                                        <div class="input-group">
-                                            <span class="input-group-text">$</span>
-                                            <InputNumber @bind-Value="settingsModel.DefaultApplicationFee" class="form-control" step="0.01" />
-                                        </div>
-                                        <ValidationMessage For="() => settingsModel.DefaultApplicationFee" class="text-danger small" />
-                                        <small class="text-muted">Standard fee charged per application (non-refundable)</small>
-                                    </div>
-                                    <div class="col-md-6">
-                                        <label class="form-label">Application Expiration Period *</label>
-                                        <div class="input-group">
-                                            <InputNumber @bind-Value="settingsModel.ApplicationExpirationDays" class="form-control" />
-                                            <span class="input-group-text">days</span>
-                                        </div>
-                                        <ValidationMessage For="() => settingsModel.ApplicationExpirationDays" class="text-danger small" />
-                                        <small class="text-muted">Applications expire if not processed within this period</small>
-                                    </div>
-                                </div>
-                            }
-                        </div>
-                    </div>
-
                     <!-- Late Fee Settings -->
                     <div class="card mb-4">
                         <div class="card-header bg-warning text-dark">
@@ -222,57 +162,122 @@
                         </div>
                     </div>
 
-                    <!-- Payment Reminder Settings -->
+                    <!-- Background Tasks -->
                     <div class="card mb-4">
                         <div class="card-header bg-success text-white">
-                            <h5 class="card-title mb-0"><i class="bi bi-bell me-2"></i>Payment Reminder Settings</h5>
+                            <h5 class="card-title mb-0"><i class="bi bi-clock-history me-2"></i>Background Tasks</h5>
                         </div>
                         <div class="card-body">
-                            <div class="form-check form-switch mb-3">
-                                <InputCheckbox @bind-Value="settingsModel.PaymentReminderEnabled" class="form-check-input" id="paymentReminderEnabled" />
-                                <label class="form-check-label" for="paymentReminderEnabled">
-                                    <strong>Enable Payment Reminders</strong>
-                                </label>
+                            <div class="alert alert-info">
+                                <i class="bi bi-info-circle"></i>
+                                <strong>How it works:</strong> These tasks normally run automatically daily at 2:00 AM. Use these buttons to run them immediately for testing or administrative purposes.
                             </div>
 
-                            @if (settingsModel.PaymentReminderEnabled)
-                            {
-                                <div class="mb-3">
-                                    <label class="form-label">Send Reminder Before Due Date *</label>
-                                    <div class="input-group">
-                                        <InputNumber @bind-Value="settingsModel.PaymentReminderDaysBefore" class="form-control" />
-                                        <span class="input-group-text">days</span>
+                            <div class="list-group">
+                                <div class="list-group-item">
+                                    <div class="d-flex justify-content-between align-items-center">
+                                        <div>
+                                            <h6 class="mb-1">Apply Late Fees</h6>
+                                            <small class="text-muted">Process overdue invoices and apply late fees</small>
+                                        </div>
+                                        <button class="btn btn-sm btn-primary" @onclick="() => RunTask(TaskType.ApplyLateFees)" disabled="@isRunningTask">
+                                            @if (runningTask == TaskType.ApplyLateFees)
+                                            {
+                                                <span class="spinner-border spinner-border-sm me-2"></span>
+                                            }
+                                            <i class="bi bi-play-fill"></i> Run Now
+                                        </button>
                                     </div>
-                                    <ValidationMessage For="() => settingsModel.PaymentReminderDaysBefore" class="text-danger small" />
-                                    <small class="text-muted">Tenants receive reminder this many days before rent is due</small>
+                                    @if (taskResults.ContainsKey(TaskType.ApplyLateFees))
+                                    {
+                                        <div class="alert alert-success mt-2 mb-0">
+                                            <small>@taskResults[TaskType.ApplyLateFees]</small>
+                                        </div>
+                                    }
                                 </div>
-                            }
+
+                                <div class="list-group-item">
+                                    <div class="d-flex justify-content-between align-items-center">
+                                        <div>
+                                            <h6 class="mb-1">Update Invoice Statuses</h6>
+                                            <small class="text-muted">Mark pending invoices as overdue</small>
+                                        </div>
+                                        <button class="btn btn-sm btn-primary" @onclick="() => RunTask(TaskType.UpdateInvoiceStatuses)" disabled="@isRunningTask">
+                                            @if (runningTask == TaskType.UpdateInvoiceStatuses)
+                                            {
+                                                <span class="spinner-border spinner-border-sm me-2"></span>
+                                            }
+                                            <i class="bi bi-play-fill"></i> Run Now
+                                        </button>
+                                    </div>
+                                    @if (taskResults.ContainsKey(TaskType.UpdateInvoiceStatuses))
+                                    {
+                                        <div class="alert alert-success mt-2 mb-0">
+                                            <small>@taskResults[TaskType.UpdateInvoiceStatuses]</small>
+                                        </div>
+                                    }
+                                </div>
+                            </div>
+
+                            <div class="mt-3">
+                                <small class="text-muted">
+                                    <strong>Next scheduled run:</strong> @GetNextRunTime()
+                                </small>
+                            </div>
                         </div>
                     </div>
 
-                    <!-- Tour Settings -->
+                    <!-- Calendar Settings -->
                     <div class="card mb-4">
-                        <div class="card-header bg-secondary text-white">
-                            <h5 class="card-title mb-0"><i class="bi bi-calendar-check me-2"></i>Tour Settings</h5>
+                        <div class="card-header bg-info text-white">
+                            <h5 class="card-title mb-0"><i class="bi bi-calendar-check me-2"></i>Calendar Settings</h5>
                         </div>
                         <div class="card-body">
-                            <div class="mb-3">
-                                <label class="form-label">No-Show Grace Period *</label>
-                                <div class="input-group">
-                                    <InputNumber @bind-Value="settingsModel.TourNoShowGracePeriodHours" class="form-control" />
-                                    <span class="input-group-text">hours</span>
-                                </div>
-                                <ValidationMessage For="() => settingsModel.TourNoShowGracePeriodHours" class="text-danger small" />
-                                <small class="text-muted">Time after scheduled tour before marking as no-show</small>
+                            <div class="alert alert-info">
+                                <i class="bi bi-info-circle"></i>
+                                <strong>How it works:</strong> Control which event types are visible on your calendar. Users can manually add custom events for any category.
                             </div>
+
+                            @if (calendarSettings.Any())
+                            {
+                                <div class="list-group">
+                                    @foreach (var setting in calendarSettings)
+                                    {
+                                        <div class="list-group-item">
+                                            <div class="d-flex align-items-center justify-content-between">
+                                                <div class="d-flex align-items-center">
+                                                    <i class="bi @(setting.DefaultIcon ?? "bi-calendar-event") me-3" 
+                                                       style="font-size: 1.25rem; color: @(setting.DefaultColor ?? "#6c757d");"></i>
+                                                    <span>@CalendarEventTypes.GetDisplayName(setting.EntityType)</span>
+                                                </div>
+                                                <div class="form-check form-switch">
+                                                    <input type="checkbox" 
+                                                           class="form-check-input" 
+                                                           id="@($"show-{setting.Id}")"
+                                                           checked="@setting.ShowOnCalendar"
+                                                           disabled="@(!canEdit)"
+                                                           @onchange="@(e => ToggleShowOnCalendar(setting, (bool)e.Value!))" />
+                                                    <label class="form-check-label" for="@($"show-{setting.Id}")">
+                                                        @if (setting.ShowOnCalendar)
+                                                        {
+                                                            <span class="badge bg-primary">Show</span>
+                                                        }
+                                                        else
+                                                        {
+                                                            <span class="badge bg-secondary">Hide</span>
+                                                        }
+                                                    </label>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    }
+                                </div>
+                            }
                         </div>
                     </div>
 
                     <!-- Action Buttons -->
                     <div class="d-flex justify-content-between mb-4">
-                        <button type="button" class="btn btn-secondary" @onclick="Cancel">
-                            <i class="bi bi-x-circle me-2"></i>Cancel
-                        </button>
                         <div>
                             <button type="submit" class="btn btn-primary btn-lg" disabled="@(isSubmitting || !canEdit)">
                                 @if (isSubmitting)
@@ -303,16 +308,6 @@
                             <h5 class="card-title mb-0">Settings Summary</h5>
                         </div>
                         <div class="card-body">
-                            <h6 class="border-bottom pb-2">Application Fees</h6>
-                            <ul class="list-unstyled mb-3">
-                                <li><strong>Status:</strong> @(settingsModel.ApplicationFeeEnabled ? "✅ Enabled" : "❌ Disabled")</li>
-                                @if (settingsModel.ApplicationFeeEnabled)
-                                {
-                                    <li><strong>Fee:</strong> $@settingsModel.DefaultApplicationFee.ToString("F2")</li>
-                                    <li><strong>Expires:</strong> @settingsModel.ApplicationExpirationDays days</li>
-                                }
-                            </ul>
-
                             <h6 class="border-bottom pb-2">Late Fees</h6>
                             <ul class="list-unstyled mb-3">
                                 <li><strong>Status:</strong> @(settingsModel.LateFeeEnabled ? "✅ Enabled" : "❌ Disabled")</li>
@@ -324,41 +319,43 @@
                                     <li><strong>Auto-Apply:</strong> @(settingsModel.LateFeeAutoApply ? "Yes" : "No")</li>
                                 }
                             </ul>
-
-                            <h6 class="border-bottom pb-2">Payment Reminders</h6>
-                            <ul class="list-unstyled mb-3">
-                                <li><strong>Status:</strong> @(settingsModel.PaymentReminderEnabled ? "✅ Enabled" : "❌ Disabled")</li>
-                                @if (settingsModel.PaymentReminderEnabled)
-                                {
-                                    <li><strong>Reminder:</strong> @settingsModel.PaymentReminderDaysBefore days before due</li>
-                                }
-                            </ul>
-
-                            <h6 class="border-bottom pb-2">Tour Settings</h6>
-                            <ul class="list-unstyled mb-0">
-                                <li><strong>No-Show Grace:</strong> @settingsModel.TourNoShowGracePeriodHours hours</li>
-                            </ul>
                         </div>
                     </div>
 
                     <!-- Help Card -->
-                    <div class="card">
+                    <div class="card mb-3">
                         <div class="card-header">
                             <h5 class="card-title mb-0">About Settings</h5>
                         </div>
                         <div class="card-body">
+                            <h6>Late Fees</h6>
                             <p class="small mb-2">
-                                <strong>Organization Settings</strong> apply to all properties and tenants within your organization.
+                                Settings apply to all properties and tenants. Changes take effect immediately but do not retroactively affect existing invoices.
                             </p>
+                            
+                            <h6 class="mt-3">Background Tasks</h6>
                             <p class="small mb-2">
-                                Changes take effect immediately but do not retroactively affect existing invoices or applications.
+                                Tasks run automatically daily at 2:00 AM. Use manual execution for testing or immediate processing.
                             </p>
+                            
+                            <h6 class="mt-3">Calendar</h6>
                             <p class="small mb-0">
-                                <i class="bi bi-info-circle me-1"></i>
-                                <strong>Tip:</strong> Review settings periodically to ensure they align with your current policies.
+                                Control which event types appear on your calendar. You can always add custom events manually for any category.
                             </p>
                         </div>
                     </div>
+                    
+                    <div class="card">
+                        <div class="card-header">
+                            <h5 class="card-title mb-0"><i class="bi bi-lightbulb"></i> Tips</h5>
+                        </div>
+                        <div class="card-body">
+                            <div class="alert alert-info small">
+                                <i class="bi bi-info-circle"></i>
+                                <strong>SimpleStart Focus:</strong> These settings provide essential property management functionality.
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </div>
         </EditForm>
@@ -373,10 +370,21 @@
     private string errorMessage = string.Empty;
     private string successMessage = string.Empty;
     private Guid organizationId = Guid.Empty;
-    private string organizationName = string.Empty;
-    private string userRole = string.Empty;
     private bool canEdit = true;
-    private bool canManageOrganizations = false;
+    
+    // Background tasks
+    private bool isRunningTask = false;
+    private TaskType? runningTask = null;
+    private Dictionary<TaskType, string> taskResults = new();
+    
+    // Calendar settings
+    private List<CalendarSettingsEntity> calendarSettings = new();
+    
+    private enum TaskType
+    {
+        ApplyLateFees,
+        UpdateInvoiceStatuses
+    }
 
     protected override async Task OnInitializedAsync()
     {
@@ -384,6 +392,7 @@
         {
             organizationId = await UserContext.GetActiveOrganizationIdAsync() ?? Guid.Empty;
             await LoadSettings();
+            await LoadCalendarSettings();
         }
         catch (Exception ex)
         {
@@ -404,18 +413,11 @@
             // Map to model
             settingsModel = new OrganizationSettingsModel
             {
-                Name = settings.Name,
-                ApplicationFeeEnabled = settings.ApplicationFeeEnabled,
-                DefaultApplicationFee = settings.DefaultApplicationFee,
-                ApplicationExpirationDays = settings.ApplicationExpirationDays,
                 LateFeeEnabled = settings.LateFeeEnabled,
                 LateFeeAutoApply = settings.LateFeeAutoApply,
                 LateFeeGracePeriodDays = settings.LateFeeGracePeriodDays,
                 LateFeePercentage = settings.LateFeePercentage,
-                MaxLateFeeAmount = settings.MaxLateFeeAmount,
-                PaymentReminderEnabled = settings.PaymentReminderEnabled,
-                PaymentReminderDaysBefore = settings.PaymentReminderDaysBefore,
-                TourNoShowGracePeriodHours = settings.TourNoShowGracePeriodHours
+                MaxLateFeeAmount = settings.MaxLateFeeAmount
             };
         }
     }
@@ -431,18 +433,11 @@
             {
                 Id = Guid.NewGuid(),
                 OrganizationId = organizationId,
-                Name = "My Organization",
-                ApplicationFeeEnabled = true,
-                DefaultApplicationFee = 50.00m,
-                ApplicationExpirationDays = 30,
                 LateFeeEnabled = true,
                 LateFeeAutoApply = true,
                 LateFeeGracePeriodDays = 3,
                 LateFeePercentage = 0.05m,
                 MaxLateFeeAmount = 50.00m,
-                PaymentReminderEnabled = true,
-                PaymentReminderDaysBefore = 3,
-                TourNoShowGracePeriodHours = 24,
                 CreatedOn = DateTime.UtcNow,
                 CreatedBy = "System"
             };
@@ -472,22 +467,21 @@
         try
         {
             // Update settings from model
-            settings.Name = settingsModel.Name;
-            settings.ApplicationFeeEnabled = settingsModel.ApplicationFeeEnabled;
-            settings.DefaultApplicationFee = settingsModel.DefaultApplicationFee;
-            settings.ApplicationExpirationDays = settingsModel.ApplicationExpirationDays;
             settings.LateFeeEnabled = settingsModel.LateFeeEnabled;
             settings.LateFeeAutoApply = settingsModel.LateFeeAutoApply;
             settings.LateFeeGracePeriodDays = settingsModel.LateFeeGracePeriodDays;
             settings.LateFeePercentage = settingsModel.LateFeePercentage;
             settings.MaxLateFeeAmount = settingsModel.MaxLateFeeAmount;
-            settings.PaymentReminderEnabled = settingsModel.PaymentReminderEnabled;
-            settings.PaymentReminderDaysBefore = settingsModel.PaymentReminderDaysBefore;
-            settings.TourNoShowGracePeriodHours = settingsModel.TourNoShowGracePeriodHours;
             settings.LastModifiedOn = DateTime.UtcNow;
 
             await OrganizationService.UpdateOrganizationSettingsAsync(settings);
             
+            // Save calendar settings
+            if (calendarSettings.Any())
+            {
+                await CalendarSettingsService.UpdateMultipleSettingsAsync(calendarSettings);
+            }
+            
             successMessage = "Settings saved successfully!";
             ToastService.ShowSuccess("Organization settings updated successfully.");
         }
@@ -501,42 +495,153 @@
         }
     }
 
-    private void BackToDashboard(){
-        Navigation.NavigateTo("/administration/dashboard");
+    private void GoToDatabaseSettings()
+    {
+        Navigation.NavigateTo("/administration/settings/database");
     }
-
-    private void Cancel()
+    
+    private void GoToUserManagement()
     {
-        Navigation.NavigateTo("/administration/dashboard");
+        Navigation.NavigateTo("/administration/users/manage");
     }
 
-    private string GetRoleBadgeClass()
+    private async Task LoadCalendarSettings()
     {
-        return userRole switch
+        try
         {
-            "Owner" => "bg-primary",
-            "Administrator" => "bg-success",
-            "PropertyManager" => "bg-info",
-            "User" => "bg-secondary",
-            _ => "bg-secondary"
-        };
+            if (organizationId != Guid.Empty)
+            {
+                calendarSettings = await CalendarSettingsService.GetSettingsAsync(organizationId);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Error loading calendar settings");
+        }
+    }
+    
+    private void ToggleShowOnCalendar(CalendarSettingsEntity setting, bool show)
+    {
+        setting.ShowOnCalendar = show;
     }
+    
+    private async Task RunTask(TaskType taskType)
+    {
+        try
+        {
+            isRunningTask = true;
+            runningTask = taskType;
+            taskResults.Remove(taskType);
 
-    public class OrganizationSettingsModel
+            switch (taskType)
+            {
+                case TaskType.ApplyLateFees:
+                    await ApplyLateFees();
+                    break;
+                case TaskType.UpdateInvoiceStatuses:
+                    await UpdateInvoiceStatuses();
+                    break;
+            }
+
+            ToastService.ShowSuccess("Task completed successfully");
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Error running task {TaskType}", taskType);
+            ToastService.ShowError($"Error running task: {ex.Message}");
+        }
+        finally
+        {
+            isRunningTask = false;
+            runningTask = null;
+        }
+    }
+    
+    private async Task ApplyLateFees()
     {
-        [StringLength(200)]
-        public string? Name { get; set; }
+        if (settings == null || !settings.LateFeeEnabled || !settings.LateFeeAutoApply)
+        {
+            var reason = settings == null ? "Settings not found" 
+                : !settings.LateFeeEnabled ? "Late fees disabled" 
+                : "Auto-apply disabled";
+            taskResults[TaskType.ApplyLateFees] = $"No late fees applied: {reason}";
+            return;
+        }
 
-        public bool ApplicationFeeEnabled { get; set; } = true;
+        var today = DateTime.Today;
+        var overdueInvoices = await DbContext.Invoices
+            .Include(i => i.Lease)
+            .Where(i => !i.IsDeleted &&
+                       i.OrganizationId == organizationId &&
+                       i.Status == "Pending" &&
+                       i.DueOn < today.AddDays(-settings.LateFeeGracePeriodDays) &&
+                       (i.LateFeeApplied == null || !i.LateFeeApplied.Value))
+            .ToListAsync();
+
+        foreach (var invoice in overdueInvoices)
+        {
+            var lateFee = Math.Min(invoice.Amount * settings.LateFeePercentage, settings.MaxLateFeeAmount);
+            invoice.LateFeeAmount = lateFee;
+            invoice.LateFeeApplied = true;
+            invoice.LateFeeAppliedOn = DateTime.UtcNow;
+            invoice.Amount += lateFee;
+            invoice.Status = "Overdue";
+            invoice.LastModifiedOn = DateTime.UtcNow;
+            invoice.LastModifiedBy = ApplicationConstants.SystemUser.Id;
+            invoice.Notes = string.IsNullOrEmpty(invoice.Notes)
+                ? $"Late fee of {lateFee:C} applied on {DateTime.Now:MMM dd, yyyy}"
+                : $"{invoice.Notes}\nLate fee of {lateFee:C} applied on {DateTime.Now:MMM dd, yyyy}";
+        }
 
-        [Required]
-        [Range(0, 1000, ErrorMessage = "Application fee must be between $0 and $1,000")]
-        public decimal DefaultApplicationFee { get; set; } = 50.00m;
+        if (overdueInvoices.Any())
+        {
+            await DbContext.SaveChangesAsync();
+        }
 
-        [Required]
-        [Range(1, 90, ErrorMessage = "Expiration period must be between 1 and 90 days")]
-        public int ApplicationExpirationDays { get; set; } = 30;
+        taskResults[TaskType.ApplyLateFees] = $"Applied late fees to {overdueInvoices.Count} invoice(s)";
+    }
+    
+    private async Task UpdateInvoiceStatuses()
+    {
+        var today = DateTime.Today;
+        var newlyOverdueInvoices = await DbContext.Invoices
+            .Where(i => !i.IsDeleted &&
+                       i.OrganizationId == organizationId &&
+                       i.Status == "Pending" &&
+                       i.DueOn < today &&
+                       (i.LateFeeApplied == null || !i.LateFeeApplied.Value))
+            .ToListAsync();
+
+        foreach (var invoice in newlyOverdueInvoices)
+        {
+            invoice.Status = "Overdue";
+            invoice.LastModifiedOn = DateTime.UtcNow;
+            invoice.LastModifiedBy = ApplicationConstants.SystemUser.Id;
+        }
 
+        if (newlyOverdueInvoices.Any())
+        {
+            await DbContext.SaveChangesAsync();
+        }
+
+        taskResults[TaskType.UpdateInvoiceStatuses] = $"Updated {newlyOverdueInvoices.Count} invoice(s) to Overdue status";
+    }
+    
+    private string GetNextRunTime()
+    {
+        var now = DateTime.Now;
+        var next2AM = DateTime.Today.AddDays(1).AddHours(2);
+        
+        if (now.Hour < 2)
+        {
+            next2AM = DateTime.Today.AddHours(2);
+        }
+
+        return next2AM.ToString("MMM dd, yyyy h:mm tt");
+    }
+
+    public class OrganizationSettingsModel
+    {
         public bool LateFeeEnabled { get; set; } = true;
 
         public bool LateFeeAutoApply { get; set; } = true;
@@ -552,15 +657,5 @@
         [Required]
         [Range(0, 10000, ErrorMessage = "Maximum late fee must be between $0 and $10,000")]
         public decimal MaxLateFeeAmount { get; set; } = 50.00m;
-
-        public bool PaymentReminderEnabled { get; set; } = true;
-
-        [Required]
-        [Range(1, 30, ErrorMessage = "Reminder period must be between 1 and 30 days")]
-        public int PaymentReminderDaysBefore { get; set; } = 3;
-
-        [Required]
-        [Range(1, 168, ErrorMessage = "Grace period must be between 1 and 168 hours (1 week)")]
-        public int TourNoShowGracePeriodHours { get; set; } = 24;
     }
 }
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/CalendarSettings.razor b/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/CalendarSettings.razor
deleted file mode 100644
index 0edf1f2..0000000
--- a/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/CalendarSettings.razor
+++ /dev/null
@@ -1,378 +0,0 @@
-@page "/administration/settings/calendar"
-@using Aquiis.Core.Entities
-@using CalendarSettingsEntity = Aquiis.Core.Entities.CalendarSettings
-@using Aquiis.Application.Services
-@using Aquiis.SimpleStart.Shared.Services
-@using Aquiis.Application.Services.PdfGenerators
-@using Aquiis.Core.Utilities
-@using Microsoft.AspNetCore.Authorization
-
-@inject CalendarSettingsService SettingsService
-@inject UserContextService UserContext
-@inject ToastService ToastService
-@inject NavigationManager Navigation
-@rendermode InteractiveServer
-
-@attribute [OrganizationAuthorize("Owner", "Administrator")]
-
-<PageTitle>Calendar Settings</PageTitle>
-
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <div>
-        <h1><i class="bi bi-calendar-check-fill"></i> Calendar Settings</h1>
-        @if (!string.IsNullOrEmpty(organizationName))
-        {
-            <p class="text-muted mb-1">
-                Settings for <strong>@organizationName</strong>
-                @if (!string.IsNullOrEmpty(userRole))
-                {
-                    <span class="badge @GetRoleBadgeClass() ms-2">@userRole</span>
-                }
-            </p>
-        }
-        <p class="text-muted mb-0">Configure which events are automatically added to the calendar</p>
-    </div>
-    <button class="btn btn-secondary" @onclick="BackToDashboard">
-        <i class="bi bi-arrow-left"></i> Back to Dashboard
-    </button>
-</div>
-
-@if (loading)
-{
-    <div class="text-center p-5">
-        <div class="spinner-border text-primary" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else
-{
-    <div class="row">
-        <div class="col-lg-8">
-            <div class="card mb-4">
-                <div class="card-header bg-primary text-white">
-                    <h5 class="mb-0"><i class="bi bi-plus-circle"></i> Auto-Create Calendar Events</h5>
-                </div>
-                <div class="card-body">
-                    <div class="alert alert-info">
-                        <i class="bi bi-info-circle"></i>
-                        <strong>How it works:</strong> When enabled, events are automatically created on the calendar when you create tours, inspections, maintenance requests, etc. 
-                        Disable a type if you prefer to manage those events manually.
-                    </div>
-
-                    @if (settings.Any())
-                    {
-                        <div class="list-group">
-                            @foreach (var setting in settings)
-                            {
-                                <div class="list-group-item">
-                                    <div class="row align-items-center">
-                                        <div class="col-md-6">
-                                            <div class="d-flex align-items-center">
-                                                <i class="bi @(setting.DefaultIcon ?? "bi-calendar-event") me-3" 
-                                                   style="font-size: 1.5rem; color: @(setting.DefaultColor ?? "#6c757d");"></i>
-                                                <div>
-                                                    <h6 class="mb-0">@CalendarEventTypes.GetDisplayName(setting.EntityType)</h6>
-                                                    <small class="text-muted">@setting.EntityType events</small>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-4">
-                                            <div class="form-check form-switch">
-                                                <input type="checkbox" 
-                                                       class="form-check-input" 
-                                                       id="@($"auto-{setting.Id}")"
-                                                       checked="@setting.AutoCreateEvents"
-                                                       disabled="@(!canEdit)"
-                                                       @onchange="@(e => ToggleAutoCreate(setting, (bool)e.Value!))" />
-                                                <label class="form-check-label" for="@($"auto-{setting.Id}")">
-                                                    @if (setting.AutoCreateEvents)
-                                                    {
-                                                        <span class="badge bg-success">Enabled</span>
-                                                    }
-                                                    else
-                                                    {
-                                                        <span class="badge bg-secondary">Disabled</span>
-                                                    }
-                                                </label>
-                                            </div>
-                                        </div>
-                                        <div class="col-md-2 text-end">
-                                            <button class="btn btn-sm btn-outline-secondary" 
-                                                    disabled="@(!canEdit)"
-                                                    @onclick="() => ShowColorPicker(setting)">
-                                                <i class="bi bi-palette"></i>
-                                            </button>
-                                        </div>
-                                    </div>
-                                </div>
-                            }
-                        </div>
-
-                        <div class="mt-3">
-                            <button class="btn btn-primary" @onclick="SaveAllSettings" disabled="@(saving || !canEdit)">
-                                @if (saving)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2"></span>
-                                }
-                                <i class="bi bi-check-circle"></i> Save All Settings
-                            </button>
-                            @if (!canEdit)
-                            {
-                                <div class="text-muted mt-2">
-                                    <small><i class="bi bi-info-circle me-1"></i>You have read-only access to these settings.</small>
-                                </div>
-                            }
-                        </div>
-                    }
-                    else
-                    {
-                        <div class="alert alert-warning">
-                            <i class="bi bi-exclamation-triangle"></i>
-                            No schedulable entity types found. Make sure your entities implement ISchedulableEntity.
-                        </div>
-                    }
-                </div>
-            </div>
-
-            <div class="card">
-                <div class="card-header bg-secondary text-white">
-                    <h5 class="mb-0"><i class="bi bi-eye"></i> Default Calendar View Filters</h5>
-                </div>
-                <div class="card-body">
-                    <p class="text-muted">Select which event types should be visible by default when opening the calendar.</p>
-
-                    @if (settings.Any())
-                    {
-                        <div class="list-group">
-                            @foreach (var setting in settings)
-                            {
-                                <div class="list-group-item">
-                                    <div class="d-flex align-items-center justify-content-between">
-                                        <div class="d-flex align-items-center">
-                                            <i class="bi @(setting.DefaultIcon ?? "bi-calendar-event") me-3" 
-                                               style="font-size: 1.25rem; color: @(setting.DefaultColor ?? "#6c757d");"></i>
-                                            <span>@CalendarEventTypes.GetDisplayName(setting.EntityType)</span>
-                                        </div>
-                                        <div class="form-check form-switch">
-                                            <input type="checkbox" 
-                                                   class="form-check-input" 
-                                                   id="@($"show-{setting.Id}")"
-                                                   checked="@setting.ShowOnCalendar"
-                                                   @onchange="@(e => ToggleShowOnCalendar(setting, (bool)e.Value!))" />
-                                            <label class="form-check-label" for="@($"show-{setting.Id}")">
-                                                @if (setting.ShowOnCalendar)
-                                                {
-                                                    <span class="badge bg-primary">Show</span>
-                                                }
-                                                else
-                                                {
-                                                    <span class="badge bg-secondary">Hide</span>
-                                                }
-                                            </label>
-                                        </div>
-                                    </div>
-                                </div>
-                            }
-                        </div>
-
-                        <div class="mt-3">
-                            <button class="btn btn-primary" @onclick="SaveAllSettings" disabled="@saving">
-                                @if (saving)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2"></span>
-                                }
-                                <i class="bi bi-save"></i> Save Changes
-                            </button>
-                        </div>
-                    }
-                </div>
-            </div>
-        </div>
-
-        <div class="col-lg-4">
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0"><i class="bi bi-lightbulb"></i> Tips</h5>
-                </div>
-                <div class="card-body">
-                    <h6>Auto-Create Events</h6>
-                    <p class="small">When enabled, calendar events are automatically created when you create or update the source entity (tour, inspection, etc.).</p>
-                    
-                    <h6 class="mt-3">Default View Filters</h6>
-                    <p class="small">These settings control which event types are shown by default when opening the calendar. Users can still toggle filters on/off.</p>
-                    
-                    <h6 class="mt-3">Colors & Icons</h6>
-                    <p class="small">Click the palette icon to customize the color and icon for each event type.</p>
-                    
-                    <div class="alert alert-warning small mt-3">
-                        <i class="bi bi-exclamation-triangle"></i>
-                        <strong>Note:</strong> Disabling auto-create will prevent new events from being created, but won't delete existing calendar events.
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-}
-
-<!-- Color Picker Modal -->
-@if (selectedSetting != null)
-{
-    <div class="modal show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title">Customize @CalendarEventTypes.GetDisplayName(selectedSetting.EntityType)</h5>
-                    <button type="button" class="btn-close" @onclick="CloseColorPicker"></button>
-                </div>
-                <div class="modal-body">
-                    <div class="mb-3">
-                        <label class="form-label">Color</label>
-                        <input type="color" 
-                               class="form-control form-control-color" 
-                               @bind="selectedSetting.DefaultColor" />
-                        <small class="text-muted">Select a color for this event type</small>
-                    </div>
-                    
-                    <div class="mb-3">
-                        <label class="form-label">Icon (Bootstrap Icon class)</label>
-                        <input type="text" 
-                               class="form-control" 
-                               @bind="selectedSetting.DefaultIcon"
-                               placeholder="bi-calendar-event" />
-                        <small class="text-muted">Example: bi-house-door, bi-clipboard-check, bi-tools</small>
-                    </div>
-
-                    <div class="mb-3">
-                        <label class="form-label">Preview</label>
-                        <div class="p-3 border rounded">
-                            <div class="d-flex align-items-center">
-                                <i class="bi @(selectedSetting.DefaultIcon ?? "bi-calendar-event") me-2" 
-                                   style="font-size: 2rem; color: @(selectedSetting.DefaultColor ?? "#6c757d");"></i>
-                                <span>@CalendarEventTypes.GetDisplayName(selectedSetting.EntityType)</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" @onclick="CloseColorPicker">Cancel</button>
-                    <button type="button" class="btn btn-primary" @onclick="SaveColorSettings">Save</button>
-                </div>
-            </div>
-        </div>
-    </div>
-}
-
-@code {
-    private List<CalendarSettingsEntity> settings = new();
-    private CalendarSettingsEntity? selectedSetting;
-    private bool loading = true;
-    private bool saving = false;
-    private string organizationName = string.Empty;
-    private string userRole = string.Empty;
-    private bool canEdit = true;
-
-    protected override async Task OnInitializedAsync()
-    {
-        // Get organization and role context
-        var organization = await UserContext.GetActiveOrganizationAsync();
-        organizationName = organization?.Name ?? "Unknown Organization";
-        userRole = await UserContext.GetCurrentOrganizationRoleAsync() ?? "User";
-        canEdit = userRole != "User"; // User role is read-only
-        
-        await LoadSettings();
-    }
-
-    private async Task LoadSettings()
-    {
-        loading = true;
-        try
-        {
-            var organizationId = await UserContext.GetActiveOrganizationIdAsync();
-            if (organizationId.HasValue)
-            {
-                settings = await SettingsService.GetSettingsAsync(organizationId.Value);
-            }
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error loading settings: {ex.Message}");
-        }
-        finally
-        {
-            loading = false;
-        }
-    }
-
-    private void BackToDashboard()
-    {
-        Navigation.NavigateTo("/administration/dashboard");
-    }
-
-    private string GetRoleBadgeClass()
-    {
-        return userRole switch
-        {
-            "Owner" => "bg-primary",
-            "Administrator" => "bg-success",
-            "PropertyManager" => "bg-info",
-            "User" => "bg-secondary",
-            _ => "bg-secondary"
-        };
-    }
-
-    private void ToggleAutoCreate(CalendarSettingsEntity setting, bool enabled)
-    {
-        setting.AutoCreateEvents = enabled;
-    }
-
-    private void ToggleShowOnCalendar(CalendarSettingsEntity setting, bool show)
-    {
-        setting.ShowOnCalendar = show;
-    }
-
-    private async Task SaveAllSettings()
-    {
-        saving = true;
-        try
-        {
-            await SettingsService.UpdateMultipleSettingsAsync(settings);
-            ToastService.ShowSuccess("Calendar settings saved successfully");
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error saving settings: {ex.Message}");
-        }
-        finally
-        {
-            saving = false;
-        }
-    }
-
-    private void ShowColorPicker(CalendarSettingsEntity setting)
-    {
-        selectedSetting = setting;
-    }
-
-    private void CloseColorPicker()
-    {
-        selectedSetting = null;
-    }
-
-    private async Task SaveColorSettings()
-    {
-        if (selectedSetting != null)
-        {
-            try
-            {
-                await SettingsService.UpdateSettingAsync(selectedSetting);
-                ToastService.ShowSuccess("Color and icon updated");
-                CloseColorPicker();
-            }
-            catch (Exception ex)
-            {
-                ToastService.ShowError($"Error updating settings: {ex.Message}");
-            }
-        }
-    }
-}
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Application/Pages/ManageDatabase.razor b/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/DatabaseSettings.razor
similarity index 93%
rename from 4-Aquiis.SimpleStart/Features/Administration/Application/Pages/ManageDatabase.razor
rename to 4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/DatabaseSettings.razor
index 1852039..905581c 100644
--- a/4-Aquiis.SimpleStart/Features/Administration/Application/Pages/ManageDatabase.razor
+++ b/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/DatabaseSettings.razor
@@ -1,4 +1,4 @@
-@page "/administration/application/database"
+@page "/administration/settings/database"
 @using Aquiis.Application.Services
 @using Aquiis.SimpleStart.Shared.Services
 @using Aquiis.Application.Services.PdfGenerators
@@ -17,18 +17,24 @@
 @attribute [OrganizationAuthorize("Owner", "Administrator")]
 @rendermode InteractiveServer
 
-<PageTitle>Database Backup & Recovery</PageTitle>
+@namespace Aquiis.SimpleStart.Features.Administration.Settings.Pages
+
+<PageTitle>Database Settings</PageTitle>
 
 <div class="container-fluid">
     <div class="row mb-4">
         <div class="col">
-            <h1>
-                <i class="bi bi-database-fill-gear"></i> Database Backup & Recovery</h1>
-            <p class="text-muted">Manage database backups and recover from corruption</p>
+            <div class="d-flex align-items-center gap-3 mb-2">
+                <h1 class="mb-0"><i class="bi bi-database-fill-gear"></i> Database Settings</h1>
+                <div class="text-muted">
+                    <i class="bi bi-shield-check"></i> Admin Only
+                </div>
+            </div>
+            <p class="text-muted mb-0">Manage database backups and recover from corruption</p>
         </div>
         <div class="col-auto">
-            <button class="btn btn-secondary" @onclick="BackToDashboard">
-                <i class="bi bi-arrow-left"></i> Back to Dashboard
+            <button class="btn btn-outline-secondary" @onclick="BackToDashboard">
+                <i class="bi bi-arrow-left"></i> Back to Application Settings
             </button>
         </div>
     </div>
@@ -258,28 +264,6 @@
             </div>
         </div>
     </div>
-        <div class="row">
-            <div class="col-12">
-                <h3>Initialize Schema Version</h3>
-                <p>This page will manually insert the initial schema version record into the database.</p>
-                
-                @if (!string.IsNullOrEmpty(message))
-                {
-                    <div class="alert @(isSuccess ? "alert-success" : "alert-danger")">
-                        @message
-                    </div>
-                }
-                
-                <div class="card">
-                    <div class="card-body">
-                        <p><strong>Application Schema Version:</strong> @AppSettings.Value.SchemaVersion</p>
-                        <button class="btn btn-primary" @onclick="InitializeSchema">
-                            Initialize Schema Version
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
         <!-- Info Box -->
         <div class="row mt-4">
             <div class="col">
@@ -314,31 +298,6 @@
     private (bool IsHealthy, string Message)? healthCheckResult;
     private DateTime? lastHealthCheck;
 
-     private string message = "";
-    private bool isSuccess = false;
-
-    private async Task InitializeSchema()
-    {
-        try
-        {
-            await SchemaService.UpdateSchemaVersionAsync(
-                AppSettings.Value.SchemaVersion, 
-                "Manual initialization via admin page");
-            
-            message = $"Schema version {AppSettings.Value.SchemaVersion} has been initialized successfully!";
-            isSuccess = true;
-            
-            // Reload page after 2 seconds
-            await Task.Delay(2000);
-            Navigation.NavigateTo("/", true);
-        }
-        catch (Exception ex)
-        {
-            message = $"Error: {ex.Message}";
-            isSuccess = false;
-        }
-    }
-    
     private async Task ResetDatabase()
     {
         // Show confirmation dialog
@@ -476,7 +435,7 @@
 
     private void BackToDashboard()
     {
-        Navigation.NavigateTo("/administration/dashboard");
+        Navigation.NavigateTo("/administration/settings/application");
     }
 
     private async Task CreateManualBackup()
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/EmailSettings.razor b/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/EmailSettings.razor
deleted file mode 100644
index 0bc0866..0000000
--- a/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/EmailSettings.razor
+++ /dev/null
@@ -1,454 +0,0 @@
-@page "/administration/settings/email"
-@using Aquiis.Application.Services
-@using Aquiis.SimpleStart.Shared.Components.Account.Pages.Manage
-@using SocketIOClient.Messages
-@using System.ComponentModel.DataAnnotations
-@inject EmailSettingsService EmailSettingsService
-@inject EmailService EmailService
-@inject ToastService ToastService
-@inject IJSRuntime JSRuntime
-
-@inject NavigationManager Navigation
-
-@inject UserContextService _userContext
-
-@rendermode InteractiveServer
-
-<PageTitle>Email Settings - Aquiis</PageTitle>
-
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <div>
-            <h1>
-                <i class="bi bi-inbox-fill"></i> Email Configuration
-            </h1>
-            <p class="text-muted">
-                Configure SendGrid integration for automated email notifications
-            </p>
-        </div>
-        <button class="btn btn-secondary" @onclick="BackToDashboard">
-            <i class="bi bi-arrow-left"></i> Back to Dashboard
-        </button>
-    </div>
-
-    @if (settings == null)
-    {
-        <div class="text-center py-5">
-            <div class="spinner-border text-primary" role="status">
-                <span class="visually-hidden">Loading...</span>
-            </div>
-        </div>
-    }
-    else if (!settings.IsEmailEnabled)
-    {
-        <div class="row mt-4">
-            <div class="col-lg-8">
-                <div class="alert alert-info">
-                    <h4><i class="bi bi-info-circle"></i> Email Integration Not Configured</h4>
-                    <p>Enable automated email notifications by connecting your SendGrid account.</p>
-
-                    <h5 class="mt-4">Why Use SendGrid?</h5>
-                    <ul>
-                        <li><strong>Free tier:</strong> 100 emails per day forever (perfect for getting started)</li>
-                        <li><strong>Reliable delivery:</strong> Industry-leading email infrastructure</li>
-                        <li><strong>Analytics:</strong> Track opens, clicks, and bounces</li>
-                        <li><strong>Your account:</strong> You manage billing and usage directly</li>
-                    </ul>
-
-                    <h5 class="mt-4">Setup Steps:</h5>
-                    <ol class="mb-4">
-                        <li>
-                            <a href="https://signup.sendgrid.com/" target="_blank" rel="noopener" class="alert-link">
-                                Create a free SendGrid account <i class="bi bi-box-arrow-up-right"></i>
-                            </a>
-                        </li>
-                        <li>Generate an API key with <strong>"Mail Send"</strong> permissions</li>
-                        <li>Click the button below to configure your API key</li>
-                    </ol>
-
-                    <button class="btn btn-primary btn-lg" @onclick="() => showConfigModal = true">
-                        <i class="bi bi-envelope-plus"></i> Configure SendGrid
-                    </button>
-                </div>
-            </div>
-            <div class="col-lg-4">
-                <div class="card">
-                    <div class="card-header bg-light">
-                        <h5 class="mb-0"><i class="bi bi-question-circle"></i> Need Help?</h5>
-                    </div>
-                    <div class="card-body">
-                        <h6>Common Questions</h6>
-                        <p class="small mb-2">
-                            <strong>Do I need a paid account?</strong><br>
-                            No! The free tier (100 emails/day) is usually sufficient.
-                        </p>
-                        <p class="small mb-2">
-                            <strong>What happens without email?</strong><br>
-                            The app works fine. Notifications appear in-app only.
-                        </p>
-                        <p class="small mb-2">
-                            <strong>Is my API key secure?</strong><br>
-                            Yes, it's encrypted and never shared.
-                        </p>
-                        <hr>
-                        <a href="https://docs.sendgrid.com/ui/account-and-settings/api-keys"
-                           target="_blank"
-                           class="btn btn-sm btn-outline-secondary">
-                            <i class="bi bi-book"></i> API Key Guide
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-    else
-    {
-        <div class="row mt-4">
-            <div class="col-lg-8">
-                <div class="card mb-4">
-                    <div class="card-header bg-success text-white">
-                        <i class="bi bi-check-circle"></i> Email Integration Active
-                    </div>
-                    <div class="card-body">
-                        <div class="row mb-4">
-                            <div class="col-md-6">
-                                <h6>Configuration</h6>
-                                <p class="mb-1">
-                                    <strong>From Email:</strong><br>
-                                    <code>@settings.FromEmail</code>
-                                </p>
-                                <p class="mb-1">
-                                    <strong>From Name:</strong><br>
-                                    @settings.FromName
-                                </p>
-                                <p class="mb-1 text-muted small">
-                                    <i class="bi bi-check-circle-fill text-success"></i>
-                                    Verified @settings.LastVerifiedOn?.ToString("g")
-                                </p>
-                            </div>
-                            <div class="col-md-6">
-                                @if (stats != null && stats.IsConfigured)
-                                {
-                                    <h6>Usage Statistics</h6>
-                                    <div class="mb-3">
-                                        <div class="d-flex justify-content-between mb-1">
-                                            <span><strong>Today:</strong></span>
-                                            <span>@stats.EmailsSentToday / @stats.DailyLimit</span>
-                                        </div>
-                                        <div class="progress" style="height: 20px;">
-                                            <div class="progress-bar @GetProgressBarClass(stats.DailyPercentUsed)"
-                                                 role="progressbar"
-                                                 style="width: @(stats.DailyPercentUsed)%">
-                                                @(stats.DailyPercentUsed)%
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="mb-3">
-                                        <div class="d-flex justify-content-between mb-1">
-                                            <span><strong>This Month:</strong></span>
-                                            <span>@stats.EmailsSentThisMonth / @stats.MonthlyLimit</span>
-                                        </div>
-                                        <div class="progress" style="height: 20px;">
-                                            <div class="progress-bar @GetProgressBarClass(stats.MonthlyPercentUsed)"
-                                                 role="progressbar"
-                                                 style="width: @(stats.MonthlyPercentUsed)%">
-                                                @(stats.MonthlyPercentUsed)%
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <p class="mb-0 text-muted small">
-                                        <i class="bi bi-calendar-check"></i>
-                                        Plan: <strong>@stats.PlanType</strong>
-                                        @if (stats.LastEmailSentOn.HasValue)
-                                        {
-                                            <br><i class="bi bi-clock-history"></i> <text>Last sent:</text> @stats.LastEmailSentOn?.ToString("g")
-                                        }
-                                    </p>
-                                }
-                            </div>
-                        </div>
-
-                        @if (!string.IsNullOrEmpty(settings.LastError))
-                        {
-                            <div class="alert alert-warning mb-3">
-                                <i class="bi bi-exclamation-triangle"></i>
-                                <strong>Recent Error:</strong> @settings.LastError
-                                <br>
-                                <small class="text-muted">Try updating your API key or contact SendGrid support</small>
-                            </div>
-                        }
-
-                        <div class="btn-group" role="group">
-                            <button class="btn btn-primary" @onclick="() => showConfigModal = true">
-                                <i class="bi bi-key"></i> Update API Key
-                            </button>
-                            <button class="btn btn-info" @onclick="SendTestEmail">
-                                <i class="bi bi-envelope-check"></i> Send Test Email
-                            </button>
-                            <button class="btn btn-secondary" @onclick="RefreshStats" disabled="@isRefreshing">
-                                <i class="bi bi-arrow-clockwise @(isRefreshing ? "spin" : "")"></i>
-                                Refresh Stats
-                            </button>
-                            <button class="btn btn-warning" @onclick="DisableEmail">
-                                <i class="bi bi-x-circle"></i> Disable Email
-                            </button>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="card">
-                    <div class="card-header">
-                        <i class="bi bi-graph-up"></i> Email Activity
-                    </div>
-                    <div class="card-body">
-                        <p class="text-muted">
-                            View detailed email statistics in your
-                            <a href="https://app.sendgrid.com/statistics" target="_blank" rel="noopener">
-                                SendGrid Dashboard <i class="bi bi-box-arrow-up-right"></i>
-                            </a>
-                        </p>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-lg-4">
-                <div class="card">
-                    <div class="card-header bg-light">
-                        <h5 class="mb-0"><i class="bi bi-lightbulb"></i> Tips</h5>
-                    </div>
-                    <div class="card-body">
-                        <h6>Optimize Email Usage</h6>
-                        <ul class="small mb-3">
-                            <li>Enable daily/weekly digest mode to batch notifications</li>
-                            <li>Let users configure their notification preferences</li>
-                            <li>Monitor your usage to avoid hitting limits</li>
-                            <li>Consider upgrading if you consistently hit daily limits</li>
-                        </ul>
-
-                        <h6>SendGrid Features</h6>
-                        <ul class="small mb-0">
-                            <li><strong>Templates:</strong> Create branded email templates</li>
-                            <li><strong>Analytics:</strong> Track opens and clicks</li>
-                            <li><strong>Webhooks:</strong> Get delivery notifications</li>
-                            <li><strong>Lists:</strong> Manage recipient groups</li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-
-@* Configuration Modal *@
-@if (showConfigModal)
-{
-    <div class="modal show d-block" tabindex="-1" style="background: rgba(0,0,0,0.5);">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title">
-                        <i class="bi bi-envelope-gear"></i> Configure SendGrid
-                    </h5>
-                    <button type="button" class="btn-close" @onclick="CloseModal"></button>
-                </div>
-                <EditForm Model="configModel" OnValidSubmit="SaveConfiguration">
-                    <DataAnnotationsValidator />
-                    <div class="modal-body">
-                        <div class="alert alert-info">
-                            <i class="bi bi-info-circle"></i>
-                            <strong>Security Note:</strong> Your API key is encrypted and securely stored.
-                            It's never transmitted or visible after saving.
-                        </div>
-
-                        <div class="mb-3">
-                            <label class="form-label">
-                                SendGrid API Key *
-                                <a href="https://app.sendgrid.com/settings/api_keys"
-                                   target="_blank"
-                                   rel="noopener"
-                                   class="small ms-2">
-                                    <i class="bi bi-box-arrow-up-right"></i> Get API Key
-                                </a>
-                            </label>
-                            <InputText @bind-Value="configModel.ApiKey"
-                                       class="form-control"
-                                       type="password"
-                                       placeholder="SG.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" />
-                            <ValidationMessage For="@(() => configModel.ApiKey)" />
-                            <small class="form-text text-muted">
-                                Create a new API key with <strong>Mail Send</strong> permissions
-                            </small>
-                        </div>
-
-                        <div class="mb-3">
-                            <label class="form-label">From Email Address *</label>
-                            <InputText @bind-Value="configModel.FromEmail"
-                                       class="form-control"
-                                       placeholder="noreply@yourdomain.com" />
-                            <ValidationMessage For="@(() => configModel.FromEmail)" />
-                            <small class="form-text text-muted">
-                                Use an email address from a domain you own. Verify sender in SendGrid first.
-                            </small>
-                        </div>
-
-                        <div class="mb-3">
-                            <label class="form-label">From Name *</label>
-                            <InputText @bind-Value="configModel.FromName"
-                                       class="form-control"
-                                       placeholder="Your Property Management Company" />
-                            <ValidationMessage For="@(() => configModel.FromName)" />
-                            <small class="form-text text-muted">
-                                This name appears in recipients' inboxes
-                            </small>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" @onclick="CloseModal">
-                            Cancel
-                        </button>
-                        <button type="submit" class="btn btn-primary" disabled="@isSaving">
-                            @if (isSaving)
-                            {
-                                <span class="spinner-border spinner-border-sm me-2"></span>
-                            }
-                            <i class="bi bi-save"></i> Save Configuration
-                        </button>
-                    </div>
-                </EditForm>
-            </div>
-        </div>
-    </div>
-}
-
-@code {
-    private OrganizationEmailSettings? settings;
-    private EmailStats? stats;
-    private bool showConfigModal;
-    private bool isSaving;
-    private bool isRefreshing;
-    private ConfigurationModel configModel = new();
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadSettings();
-    }
-
-    private async Task LoadSettings()
-    {
-        settings = await EmailSettingsService.GetOrCreateSettingsAsync();
-        // TODO Phase 2.5: Uncomment when GetEmailStatsAsync is implemented
-         if (settings.IsEmailEnabled)
-         {
-             stats = await EmailService.GetEmailStatsAsync();
-         }
-    }
-
-    private async Task SaveConfiguration()
-    {
-        isSaving = true;
-
-        var result = await EmailSettingsService.UpdateSendGridConfigAsync(
-            configModel.ApiKey!,
-            configModel.FromEmail!,
-            configModel.FromName!);
-
-        if (result.Success)
-        {
-            ToastService.ShowSuccess(result.Message);
-            showConfigModal = false;
-            configModel = new(); // Clear sensitive data
-            await LoadSettings();
-        }
-        else
-        {
-            ToastService.ShowError(result.Message);
-        }
-
-        isSaving = false;
-    }
-
-    private async Task SendTestEmail()
-    {
-        var userEmail = await _userContext.GetUserEmailAsync();
-        var testEmail = await JSRuntime.InvokeAsync<string?>("prompt",
-            "Enter email address to send test email:",
-            userEmail ?? settings?.FromEmail ?? "");
-
-        if (!string.IsNullOrEmpty(testEmail))
-        {
-            var result = await EmailSettingsService.TestEmailConfigurationAsync(testEmail);
-            if (result.Success)
-                ToastService.ShowSuccess(result.Message);
-            else
-                ToastService.ShowError(result.Message);
-        }
-    }
-
-    private async Task DisableEmail()
-    {
-        var confirmed = await JSRuntime.InvokeAsync<bool>("confirm",
-            "Are you sure you want to disable email notifications?\n\n" +
-            "Notifications will only appear in-app until you re-enable email.");
-
-        if (confirmed)
-        {
-            var result = await EmailSettingsService.DisableEmailAsync();
-            ToastService.ShowInfo(result.Message);
-            await LoadSettings();
-        }
-    }
-
-    private async Task RefreshStats()
-    {
-        isRefreshing = true;
-        await LoadSettings();
-        isRefreshing = false;
-        ToastService.ShowSuccess("Statistics refreshed");
-    }
-
-    private void CloseModal()
-    {
-        showConfigModal = false;
-        configModel = new(); // Clear sensitive data
-    }
-
-    private string GetProgressBarClass(int percent)
-    {
-        return percent switch
-        {
-            ( < 50) => "bg-success",
-            ( < 75) => "bg-info",
-            ( < 90) => "bg-warning",
-            _ => "bg-danger"
-        };
-    }
-
-    private void BackToDashboard()
-    {
-        Navigation.NavigateTo("/administration/dashboard");
-    }
-
-    public class ConfigurationModel
-    {
-        [Required(ErrorMessage = "SendGrid API key is required")]
-        [StringLength(100, MinimumLength = 32, ErrorMessage = "API key must be at least 32 characters")]
-        public string? ApiKey { get; set; }
-
-        [Required(ErrorMessage = "From email address is required")]
-        [EmailAddress(ErrorMessage = "Invalid email address")]
-        public string? FromEmail { get; set; }
-
-        [Required(ErrorMessage = "From name is required")]
-        [StringLength(200, MinimumLength = 2, ErrorMessage = "From name must be 2-200 characters")]
-        public string? FromName { get; set; }
-    }
-}
-
-<style>
-    .spin {
-        animation: spin 1s linear infinite;
-    }
-
-    @@keyframes spin {
-        from { transform: rotate(0deg); }
-        to { transform: rotate(360deg); }
-    }
-</style>
\ No newline at end of file
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/InitializeSchemaVersion.razor b/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/InitializeSchemaVersion.razor
new file mode 100644
index 0000000..087540b
--- /dev/null
+++ b/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/InitializeSchemaVersion.razor
@@ -0,0 +1,65 @@
+@page "/administration/settings/initialize-schema"
+@using Aquiis.Application.Services
+@using Aquiis.SimpleStart.Shared.Services
+@using Aquiis.Application.Services.PdfGenerators
+@using Aquiis.Core.Constants
+@using Microsoft.Extensions.Options
+@using ApplicationSettingsType = Aquiis.Core.Constants.ApplicationSettings
+@inject SchemaValidationService SchemaService
+@inject IOptions<ApplicationSettingsType> AppSettings
+@inject NavigationManager Navigation
+@rendermode InteractiveServer
+
+<h3>Initialize Schema Version</h3>
+
+<div class="container-fluid">
+    <div class="row">
+        <div class="col-12">
+            <h3>Initialize Schema Version</h3>
+            <p>This page will manually insert the initial schema version record into the database.</p>
+            
+            @if (!string.IsNullOrEmpty(message))
+            {
+                <div class="alert @(isSuccess ? "alert-success" : "alert-danger")">
+                    @message
+                </div>
+            }
+            
+            <div class="card">
+                <div class="card-body">
+                    <p><strong>Application Schema Version:</strong> @AppSettings.Value.SchemaVersion</p>
+                    <button class="btn btn-primary" @onclick="InitializeSchema">
+                        Initialize Schema Version
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+@code {
+    private string message = "";
+    private bool isSuccess = false;
+
+    private async Task InitializeSchema()
+    {
+        try
+        {
+            await SchemaService.UpdateSchemaVersionAsync(
+                AppSettings.Value.SchemaVersion, 
+                "Manual initialization via admin page");
+            
+            message = $"Schema version {AppSettings.Value.SchemaVersion} has been initialized successfully!";
+            isSuccess = true;
+            
+            // Reload page after 2 seconds
+            await Task.Delay(2000);
+            Navigation.NavigateTo("/", true);
+        }
+        catch (Exception ex)
+        {
+            message = $"Error: {ex.Message}";
+            isSuccess = false;
+        }
+    }
+}
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/LateFeeSettings.razor b/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/LateFeeSettings.razor
deleted file mode 100644
index f9dd31b..0000000
--- a/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/LateFeeSettings.razor
+++ /dev/null
@@ -1,439 +0,0 @@
-@page "/administration/settings/latefees"
-@using Aquiis.Core.Constants
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using Aquiis.Core.Entities
-@using Aquiis.Application.Services
-@using Aquiis.SimpleStart.Shared.Services
-@using Aquiis.Application.Services.PdfGenerators
-@using Microsoft.AspNetCore.Authorization
-@using System.ComponentModel.DataAnnotations
-
-@inject OrganizationService OrganizationService
-@inject UserContextService UserContext
-@inject ToastService ToastService
-@inject NavigationManager Navigation
-@rendermode InteractiveServer
-
-@attribute [OrganizationAuthorize("Owner", "Administrator")]
-
-<PageTitle>Late Fee Settings</PageTitle>
-
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <div>
-        <h1><i class="bi bi-gear-fill"></i> Late Fee Settings</h1>
-        @if (!string.IsNullOrEmpty(organizationName))
-        {
-            <p class="text-muted mb-0">
-                Settings for <strong>@organizationName</strong>
-                @if (!string.IsNullOrEmpty(userRole))
-                {
-                    <span class="badge @GetRoleBadgeClass() ms-2">@userRole</span>
-                }
-            </p>
-        }
-    </div>
-    <button class="btn btn-secondary" @onclick="BackToDashboard">
-        <i class="bi bi-arrow-left"></i> Back to Dashboard
-    </button>
-</div>
-
-<div class="row">
-    <div class="col-md-8">
-        <div class="card">
-            <div class="card-header">
-                <h5 class="mb-0">Automated Late Fee Configuration</h5>
-            </div>
-            <div class="card-body">
-                <div class="alert alert-info">
-                    <i class="bi bi-info-circle"></i>
-                    <strong>How it works:</strong> The system automatically checks for overdue invoices daily at 2 AM. 
-                    After the grace period expires, a late fee will be automatically applied to unpaid invoices.
-                </div>
-
-                <EditForm Model="viewModel" OnValidSubmit="SaveSettings" FormName="late-fee-settings">
-                    <DataAnnotationsValidator />
-
-                    <div class="mb-4">
-                        <label class="form-label fw-bold">Organization Name</label>
-                        <InputText @bind-Value="viewModel.Name" class="form-control" placeholder="Enter organization name" />
-                        <small class="text-muted">Your organization's name for reports and documents</small>
-                        <ValidationMessage For="() => viewModel.Name" class="text-danger" />
-                    </div>
-
-                    <hr class="my-4"/>
-
-                    <h6 class="mb-3">Late Fee Configuration</h6>
-
-                    <div class="mb-3">
-                        <div class="form-check form-switch">
-                            <InputCheckbox @bind-Value="viewModel.LateFeeEnabled" class="form-check-input" id="lateFeeEnabled" />
-                            <label class="form-check-label" for="lateFeeEnabled">
-                                <strong>Enable Late Fees</strong>
-                            </label>
-                            <small class="d-block text-muted">Master switch for the entire late fee feature</small>
-                        </div>
-                    </div>
-
-                    <div class="mb-3">
-                        <div class="form-check form-switch">
-                            <InputCheckbox @bind-Value="viewModel.LateFeeAutoApply" class="form-check-input" id="autoApply" disabled="@(!viewModel.LateFeeEnabled)" />
-                            <label class="form-check-label" for="autoApply">
-                                <strong>Auto-Apply Late Fees</strong>
-                            </label>
-                            <small class="d-block text-muted">Automatically apply late fees to overdue invoices (if disabled, invoices will only be marked as overdue)</small>
-                        </div>
-                    </div>
-
-                    <hr/>
-
-                    <div class="mb-3">
-                        <label class="form-label">Grace Period (Days)</label>
-                        <InputNumber @bind-Value="viewModel.LateFeeGracePeriodDays" class="form-control" disabled="@(!viewModel.LateFeeEnabled)" />
-                        <small class="text-muted">Number of days after due date before late fees apply</small>
-                        <ValidationMessage For="() => viewModel.LateFeeGracePeriodDays" class="text-danger" />
-                    </div>
-
-                    <div class="mb-3">
-                        <label class="form-label">Late Fee Percentage</label>
-                        <div class="input-group">
-                            <InputNumber @bind-Value="viewModel.LateFeePercentage" class="form-control" step="0.01" disabled="@(!viewModel.LateFeeEnabled)" />
-                            <span class="input-group-text">%</span>
-                        </div>
-                        <small class="text-muted">Percentage of invoice amount to charge as late fee</small>
-                        <ValidationMessage For="() => viewModel.LateFeePercentage" class="text-danger" />
-                    </div>
-
-                    <div class="mb-3">
-                        <label class="form-label">Maximum Late Fee Amount</label>
-                        <div class="input-group">
-                            <span class="input-group-text">$</span>
-                            <InputNumber @bind-Value="viewModel.MaxLateFeeAmount" class="form-control" step="0.01" disabled="@(!viewModel.LateFeeEnabled)" />
-                        </div>
-                        <small class="text-muted">Cap on the maximum late fee that can be charged</small>
-                        <ValidationMessage For="() => viewModel.MaxLateFeeAmount" class="text-danger" />
-                    </div>
-
-                    <hr/>
-
-                    <div class="mb-3">
-                        <div class="form-check form-switch">
-                            <InputCheckbox @bind-Value="viewModel.PaymentReminderEnabled" class="form-check-input" id="reminderEnabled" />
-                            <label class="form-check-label" for="reminderEnabled">
-                                <strong>Enable Payment Reminders</strong>
-                            </label>
-                            <small class="d-block text-muted">Send payment reminders before invoices are due</small>
-                        </div>
-                    </div>
-
-                    <div class="mb-3">
-                        <label class="form-label">Payment Reminder Days</label>
-                        <InputNumber @bind-Value="viewModel.PaymentReminderDaysBefore" class="form-control" disabled="@(!viewModel.PaymentReminderEnabled)" />
-                        <small class="text-muted">Send payment reminder this many days before due date</small>
-                        <ValidationMessage For="() => viewModel.PaymentReminderDaysBefore" class="text-danger" />
-                    </div>
-
-                    <hr class="my-4"/>
-
-                    <h6 class="mb-3">Tour Settings</h6>
-
-                    <div class="mb-3">
-                        <label class="form-label">Tour No-Show Grace Period (Hours)</label>
-                        <InputNumber @bind-Value="viewModel.TourNoShowGracePeriodHours" class="form-control" />
-                        <small class="text-muted">Hours after scheduled time before tour is automatically marked as "No Show"</small>
-                        <ValidationMessage For="() => viewModel.TourNoShowGracePeriodHours" class="text-danger" />
-                    </div>
-
-                    <div class="alert alert-info">
-                        <i class="bi bi-info-circle"></i>
-                        <strong>How it works:</strong> If a tour remains in "Scheduled" status @viewModel.TourNoShowGracePeriodHours hours after its scheduled time, 
-                        it will automatically be marked as "No Show". This gives property managers time to complete documentation while ensuring accurate tracking.
-                    </div>
-
-                    <div class="alert alert-warning">
-                        <strong>Example:</strong><br/>
-                        Tour Scheduled: Today at 2:00 PM<br/>
-                        Grace Period: @viewModel.TourNoShowGracePeriodHours hours<br/>
-                        Auto Mark as No-Show After: @DateTime.Now.Date.AddHours(14 + viewModel.TourNoShowGracePeriodHours).ToString("MMM dd, yyyy h:mm tt")
-                    </div>
-
-                    <div class="alert alert-warning">
-                        <strong>Example Calculation:</strong><br/>
-                        Invoice Amount: $1,000<br/>
-                        Grace Period: @viewModel.LateFeeGracePeriodDays days<br/>
-                        Late Fee: @viewModel.LateFeePercentage% = $@((1000 * (viewModel.LateFeePercentage / 100)).ToString("F2"))<br/>
-                        Capped at: $@viewModel.MaxLateFeeAmount<br/>
-                        @{
-                            var calculatedFee = 1000 * (viewModel.LateFeePercentage / 100);
-                            var actualFee = Math.Min(calculatedFee, viewModel.MaxLateFeeAmount);
-                        }
-                        <strong>Actual Late Fee: $@actualFee.ToString("F2")</strong>
-                    </div>
-
-                    <div class="d-flex gap-2">
-                        <button type="submit" class="btn btn-primary" disabled="@(isSaving || !canEdit)">
-                            @if (isSaving)
-                            {
-                                <span class="spinner-border spinner-border-sm me-2"></span>
-                            }
-                            <i class="bi bi-save"></i> Save Settings
-                        </button>
-                        <button type="button" class="btn btn-secondary" @onclick="ResetToDefaults" disabled="@(!canEdit)">
-                            <i class="bi bi-arrow-clockwise"></i> Reset to Defaults
-                        </button>
-                        @if (!canEdit)
-                        {
-                            <div class="text-muted mt-2 w-100">
-                                <small><i class="bi bi-info-circle me-1"></i>You have read-only access to these settings.</small>
-                            </div>
-                        }
-                    </div>
-                </EditForm>
-            </div>
-        </div>
-    </div>
-
-    <div class="col-md-4">
-        <div class="card">
-            <div class="card-header">
-                <h5 class="mb-0">Current Configuration</h5>
-            </div>
-            <div class="card-body">
-                <dl>
-                    <dt>Late Fees</dt>
-                    <dd>
-                        @if (viewModel.LateFeeEnabled)
-                        {
-                            <span class="badge bg-success">Enabled</span>
-                        }
-                        else
-                        {
-                            <span class="badge bg-secondary">Disabled</span>
-                        }
-                    </dd>
-
-                    <dt>Auto-Apply</dt>
-                    <dd>
-                        @if (viewModel.LateFeeAutoApply && viewModel.LateFeeEnabled)
-                        {
-                            <span class="badge bg-success">Enabled</span>
-                        }
-                        else
-                        {
-                            <span class="badge bg-secondary">Disabled</span>
-                        }
-                    </dd>
-
-                    <dt>Grace Period</dt>
-                    <dd>@viewModel.LateFeeGracePeriodDays days</dd>
-
-                    <dt>Late Fee Rate</dt>
-                    <dd>@viewModel.LateFeePercentage%</dd>
-
-                    <dt>Maximum Late Fee</dt>
-                    <dd>$@viewModel.MaxLateFeeAmount</dd>
-
-                    <dt>Payment Reminders</dt>
-                    <dd>
-                        @if (viewModel.PaymentReminderEnabled)
-                        {
-                            <span class="badge bg-success">Enabled</span>
-                        }
-                        else
-                        {
-                            <span class="badge bg-secondary">Disabled</span>
-                        }
-                    </dd>
-
-                    <dt>Reminder Timing</dt>
-                    <dd>@viewModel.PaymentReminderDaysBefore days before due</dd>
-
-                    <dt class="mt-3">Tour No-Show Grace Period</dt>
-                    <dd>@viewModel.TourNoShowGracePeriodHours hours</dd>
-                </dl>
-            </div>
-        </div>
-
-        <div class="card mt-3">
-            <div class="card-header">
-                <h5 class="mb-0">Information</h5>
-            </div>
-            <div class="card-body">
-                <p><strong>Scheduled Task:</strong> Daily at 2:00 AM</p>
-                <p><strong>Next Run:</strong> @GetNextRunTime()</p>
-                <hr/>
-                <small class="text-muted">
-                    Late fees are automatically applied by the system background service. 
-                    Changes to these settings will take effect on the next scheduled run.
-                </small>
-            </div>
-        </div>
-    </div>
-</div>
-
-@code {
-    private LateFeeSettingsViewModel viewModel = new();
-    private bool isSaving = false;
-    private string organizationName = string.Empty;
-    private string userRole = string.Empty;
-    private bool canEdit = true;
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            // Get organization and role context
-            var org = await UserContext.GetActiveOrganizationAsync();
-            organizationName = org?.Name ?? "Unknown Organization";
-            userRole = await UserContext.GetCurrentOrganizationRoleAsync() ?? "User";
-            canEdit = userRole != "User"; // User role is read-only
-            
-            var settings = await OrganizationService.GetOrganizationSettingsAsync();
-            
-            if (settings != null)
-            {
-                // Map entity to view model
-                viewModel = new LateFeeSettingsViewModel
-                {
-                    Name = settings.Name,
-                    LateFeeEnabled = settings.LateFeeEnabled,
-                    LateFeeAutoApply = settings.LateFeeAutoApply,
-                    LateFeeGracePeriodDays = settings.LateFeeGracePeriodDays,
-                    LateFeePercentage = settings.LateFeePercentage * 100, // Convert to percentage display
-                    MaxLateFeeAmount = settings.MaxLateFeeAmount,
-                    PaymentReminderEnabled = settings.PaymentReminderEnabled,
-                    PaymentReminderDaysBefore = settings.PaymentReminderDaysBefore,
-                    TourNoShowGracePeriodHours = settings.TourNoShowGracePeriodHours
-                };
-            }
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Failed to load settings: {ex.Message}");
-        }
-    }
-
-    private void BackToDashboard()
-    {
-        Navigation.NavigateTo("/administration/dashboard");
-    }
-
-    private string GetRoleBadgeClass()
-    {
-        return userRole switch
-        {
-            "Owner" => "bg-primary",
-            "Administrator" => "bg-success",
-            "PropertyManager" => "bg-info",
-            "User" => "bg-secondary",
-            _ => "bg-secondary"
-        };
-    }
-
-    private async Task SaveSettings()
-    {
-        try
-        {
-            isSaving = true;
-
-            // Get the existing entity
-            var settings = await OrganizationService.GetOrganizationSettingsAsync();
-            
-            if (settings == null)
-            {
-                ToastService.ShowError("Failed to load organization settings");
-                return;
-            }
-
-            // Map view model back to entity
-            settings.Name = viewModel.Name;
-            settings.LateFeeEnabled = viewModel.LateFeeEnabled;
-            settings.LateFeeAutoApply = viewModel.LateFeeAutoApply;
-            settings.LateFeeGracePeriodDays = viewModel.LateFeeGracePeriodDays;
-            settings.LateFeePercentage = viewModel.LateFeePercentage / 100; // Convert from percentage display
-            settings.MaxLateFeeAmount = viewModel.MaxLateFeeAmount;
-            settings.PaymentReminderEnabled = viewModel.PaymentReminderEnabled;
-            settings.PaymentReminderDaysBefore = viewModel.PaymentReminderDaysBefore;
-            settings.TourNoShowGracePeriodHours = viewModel.TourNoShowGracePeriodHours;
-
-            await OrganizationService.UpdateOrganizationSettingsAsync(settings);
-
-            ToastService.ShowSuccess("Late fee settings saved successfully!");
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Failed to save settings: {ex.Message}");
-        }
-        finally
-        {
-            isSaving = false;
-        }
-    }
-
-    private void ResetToDefaults()
-    {
-        viewModel.LateFeeEnabled = true;
-        viewModel.LateFeeAutoApply = true;
-        viewModel.LateFeeGracePeriodDays = 3;
-        viewModel.LateFeePercentage = 5.0m;
-        viewModel.MaxLateFeeAmount = 50.00m;
-        viewModel.PaymentReminderEnabled = true;
-        viewModel.PaymentReminderDaysBefore = 3;
-        viewModel.TourNoShowGracePeriodHours = 24;
-
-        ToastService.ShowInfo("Settings reset to defaults");
-    }
-
-    private string GetNextRunTime()
-    {
-        var now = DateTime.Now;
-        var next2AM = DateTime.Today.AddDays(1).AddHours(2);
-        
-        if (now.Hour < 2)
-        {
-            next2AM = DateTime.Today.AddHours(2);
-        }
-
-        return next2AM.ToString("MMM dd, yyyy h:mm tt");
-    }
-
-    public class LateFeeSettingsViewModel
-    {
-        [MaxLength(200)]
-        [Display(Name = "Organization Name")]
-        public string? Name { get; set; }
-
-        [Display(Name = "Enable Late Fees")]
-        public bool LateFeeEnabled { get; set; } = true;
-
-        [Display(Name = "Auto-Apply Late Fees")]
-        public bool LateFeeAutoApply { get; set; } = true;
-
-        [Required]
-        [Range(0, 30, ErrorMessage = "Grace period must be between 0 and 30 days")]
-        [Display(Name = "Grace Period (Days)")]
-        public int LateFeeGracePeriodDays { get; set; } = 3;
-
-        [Required]
-        [Range(0.0, 100.0, ErrorMessage = "Late fee percentage must be between 0% and 100%")]
-        [Display(Name = "Late Fee Percentage")]
-        public decimal LateFeePercentage { get; set; } = 5.0m;
-
-        [Required]
-        [Range(0.0, 10000.0, ErrorMessage = "Maximum late fee must be between $0 and $10,000")]
-        [Display(Name = "Maximum Late Fee Amount")]
-        public decimal MaxLateFeeAmount { get; set; } = 50.00m;
-
-        [Display(Name = "Enable Payment Reminders")]
-        public bool PaymentReminderEnabled { get; set; } = true;
-
-        [Required]
-        [Range(1, 30, ErrorMessage = "Reminder days must be between 1 and 30")]
-        [Display(Name = "Send Reminder (Days Before Due)")]
-        public int PaymentReminderDaysBefore { get; set; } = 3;
-
-        [Required]
-        [Range(1, 168, ErrorMessage = "Grace period must be between 1 and 168 hours")]
-        [Display(Name = "Tour No-Show Grace Period (Hours)")]
-        public int TourNoShowGracePeriodHours { get; set; } = 24;
-    }
-}
\ No newline at end of file
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/SMSSettings.razor b/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/SMSSettings.razor
deleted file mode 100644
index bc1ada1..0000000
--- a/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/SMSSettings.razor
+++ /dev/null
@@ -1,417 +0,0 @@
-@page "/administration/settings/sms"
-@using Aquiis.Application.Services
-@using SocketIOClient.Messages
-@using System.ComponentModel.DataAnnotations
-@inject SMSSettingsService SMSSettingsService
-@inject SMSService SMSService
-
-@inject ToastService ToastService
-@inject IJSRuntime JSRuntime
-
-@inject UserContextService _userContext
-
-@inject NavigationManager Navigation
-
-@rendermode InteractiveServer
-
-<PageTitle>SMS Settings - Aquiis</PageTitle>
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <div>
-            <h1>
-                <i class="bi bi-phone-vibrate-fill"></i> SMS Configuration
-            </h1>
-            <p class="text-muted">
-                Configure Twilio integration for automated SMS notifications
-            </p>
-        </div>
-        <button class="btn btn-secondary" @onclick="BackToDashboard">
-            <i class="bi bi-arrow-left"></i> Back to Dashboard
-        </button>
-    </div>
-
-    @if (settings == null)
-    {
-        <div class="text-center py-5">
-            <div class="spinner-border text-primary" role="status">
-                <span class="visually-hidden">Loading...</span>
-            </div>
-        </div>
-    }
-    else if (!settings.IsSMSEnabled)
-    {
-        <div class="row mt-4">
-            <div class="col-lg-8">
-                <div class="alert alert-info">
-                    <h4><i class="bi bi-info-circle"></i> SMS Integration Not Configured</h4>
-                    <p>Enable automated SMS notifications by connecting your Twilio account.</p>
-
-                    <h5 class="mt-4">Why Use Twilio?</h5>
-                    <ul>
-                        <li><strong>Free trial:</strong> $15 credit for testing (perfect for getting started)</li>
-                        <li><strong>Reliable delivery:</strong> Industry-leading SMS infrastructure</li>
-                        <li><strong>Analytics:</strong> Track message delivery and status</li>
-                        <li><strong>Your account:</strong> You manage billing and usage directly</li>
-                    </ul>
-
-                    <h5 class="mt-4">Setup Steps:</h5>
-                    <ol class="mb-4">
-                        <li>
-                            <a href="https://www.twilio.com/try-twilio" target="_blank" rel="noopener" class="alert-link">
-                                Create a free Twilio account <i class="bi bi-box-arrow-up-right"></i>
-                            </a>
-                        </li>
-                        <li>Generate an API key with <strong>"Messaging"</strong> permissions</li>
-                        <li>Click the button below to configure your API key</li>
-                    </ol>
-
-                    <button class="btn btn-primary btn-lg" @onclick="() => showConfigModal = true">
-                        <i class="bi bi-phone-fill"></i> Configure Twilio
-                    </button>
-                </div>
-            </div>
-            <div class="col-lg-4">
-                <div class="card">
-                    <div class="card-header bg-light">
-                        <h5 class="mb-0"><i class="bi bi-question-circle"></i> Need Help?</h5>
-                    </div>
-                    <div class="card-body">
-                        <h6>Common Questions</h6>
-                        <p class="small mb-2">
-                            <strong>Do I need a paid account?</strong><br>
-                            You get $15 free trial credit. Pay-as-you-go after that.
-                        </p>
-                        <p class="small mb-2">
-                            <strong>What happens without SMS?</strong><br>
-                            The app works fine. Notifications appear in-app only.
-                        </p>
-                        <p class="small mb-2">
-                            <strong>Is my API key secure?</strong><br>
-                            Yes, it's encrypted and never shared.
-                        </p>
-                        <hr>
-                        <a href="https://www.twilio.com/docs/usage/api"
-                           target="_blank"
-                           class="btn btn-sm btn-outline-secondary">
-                            <i class="bi bi-book"></i> API Key Guide
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-    else
-    {
-        <div class="row mt-4">
-            <div class="col-lg-8">
-                <div class="card mb-4">
-                    <div class="card-header bg-success text-white">
-                        <i class="bi bi-check-circle"></i> SMS Integration Active
-                    </div>
-                    <div class="card-body">
-                        <div class="row mb-4">
-                            <div class="col-md-6">
-                                <h6>Configuration</h6>
-                                <p class="mb-1">
-                                    <strong>Twilio Phone Number:</strong><br>
-                                    <code>@settings.TwilioPhoneNumber</code>
-                                </p>
-                                <p class="mb-1 text-muted small">
-                                    <i class="bi bi-check-circle-fill text-success"></i>
-                                    Verified @settings.LastVerifiedOn?.ToString("g")
-                                </p>
-                            </div>
-                            <div class="col-md-6">
-                                @* TODO Phase 2.5: Implement SMS usage statistics display *@
-                                <h6>Usage Statistics</h6>
-                                <p class="text-muted">
-                                    <i class="bi bi-info-circle"></i>
-                                    SMS usage statistics will be available after Twilio integration (Phase 2.5)
-                                </p>
-                            </div>
-                        </div>
-
-                        @if (!string.IsNullOrEmpty(settings.LastError))
-                        {
-                            <div class="alert alert-warning mb-3">
-                                <i class="bi bi-exclamation-triangle"></i>
-                                <strong>Recent Error:</strong> @settings.LastError
-                                <br>
-                                <small class="text-muted">Try updating your API key or contact Twilio support</small>
-                            </div>
-                        }
-
-                        <div class="btn-group" role="group">
-                            <button class="btn btn-primary" @onclick="() => showConfigModal = true">
-                                <i class="bi bi-key"></i> Update API Key
-                            </button>
-                            <button class="btn btn-info" @onclick="SendTestSMS">
-                                <i class="bi bi-phone-check"></i> Send Test SMS
-                            </button>
-                            <button class="btn btn-secondary" @onclick="RefreshStats" disabled="@isRefreshing">
-                                <i class="bi bi-arrow-clockwise @(isRefreshing ? "spin" : "")"></i>
-                                Refresh Stats
-                            </button>
-                            <button class="btn btn-warning" @onclick="DisableSMS">
-                                <i class="bi bi-x-circle"></i> Disable SMS
-                            </button>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="card">
-                    <div class="card-header">
-                        <i class="bi bi-graph-up"></i> SMS Activity
-                    </div>
-                    <div class="card-body">
-                        <p class="text-muted">
-                            View detailed SMS statistics in your
-                            <a href="https://www.twilio.com/console/sms/dashboard" target="_blank" rel="noopener">
-                                Twilio Dashboard <i class="bi bi-box-arrow-up-right"></i>
-                            </a>
-                        </p>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-lg-4">
-                <div class="card">
-                    <div class="card-header bg-light">
-                        <h5 class="mb-0"><i class="bi bi-lightbulb"></i> Tips</h5>
-                    </div>
-                    <div class="card-body">
-                        <h6>Optimize SMS Usage</h6>
-                        <ul class="small mb-3">
-                            <li>Enable daily/weekly digest mode to batch notifications</li>
-                            <li>Let users configure their notification preferences</li>
-                            <li>Monitor your usage to avoid hitting limits</li>
-                            <li>Consider upgrading if you consistently hit daily limits</li>
-                        </ul>
-
-                        <h6>Twilio Features</h6>
-                        <ul class="small mb-0">
-                            <li><strong>Templates:</strong> Use message templates and variables</li>
-                            <li><strong>Analytics:</strong> Track delivery and status</li>
-                            <li><strong>Webhooks:</strong> Get delivery notifications</li>
-                            <li><strong>Phone Numbers:</strong> Purchase dedicated numbers</li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-
-@* Configuration Modal *@
-@if (showConfigModal)
-{
-    <div class="modal show d-block" tabindex="-1" style="background: rgba(0,0,0,0.5);">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title">
-                        <i class="bi bi-phone-vibrate"></i> Configure Twilio
-                    </h5>
-                    <button type="button" class="btn-close" @onclick="CloseModal"></button>
-                </div>
-                <EditForm Model="configModel" OnValidSubmit="SaveConfiguration">
-                    <DataAnnotationsValidator />
-                    <div class="modal-body">
-                        <div class="alert alert-info">
-                            <i class="bi bi-info-circle"></i>
-                            <strong>Security Note:</strong> Your API key is encrypted and securely stored.
-                            It's never transmitted or visible after saving.
-                        </div>
-
-                        <div class="mb-3">
-                            <label class="form-label">
-                                Twilio Account SID *
-                                <a href="https://www.twilio.com/console"
-                                   target="_blank"
-                                   rel="noopener"
-                                   class="small ms-2">
-                                    <i class="bi bi-box-arrow-up-right"></i> Get Credentials
-                                </a>
-                            </label>
-                            <InputText @bind-Value="configModel.AccountSid"
-                                       class="form-control"
-                                       type="password"
-                                       placeholder="ACxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" />
-                            <ValidationMessage For="@(() => configModel.AccountSid)" />
-                            <small class="form-text text-muted">
-                                Found in your Twilio Console dashboard
-                            </small>
-                        </div>
-
-                        <div class="mb-3">
-                            <label class="form-label">Twilio Auth Token *</label>
-                            <InputText @bind-Value="configModel.AuthToken"
-                                       class="form-control"
-                                       type="password"
-                                       placeholder="Auth Token from Twilio Console" />
-                            <ValidationMessage For="@(() => configModel.AuthToken)" />
-                            <small class="form-text text-muted">
-                                Your Auth Token (keep this secret!)
-                            </small>
-                        </div>
-
-                        <div class="mb-3">
-                            <label class="form-label">Twilio Phone Number *</label>
-                            <InputText @bind-Value="configModel.PhoneNumber"
-                                       class="form-control"
-                                       placeholder="+1234567890" />
-                            <ValidationMessage For="@(() => configModel.PhoneNumber)" />
-                            <small class="form-text text-muted">
-                                Use a verified Twilio phone number. Must be in E.164 format (+1234567890).
-                            </small>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" @onclick="CloseModal">
-                            Cancel
-                        </button>
-                        <button type="submit" class="btn btn-primary" disabled="@isSaving">
-                            @if (isSaving)
-                            {
-                                <span class="spinner-border spinner-border-sm me-2"></span>
-                            }
-                            <i class="bi bi-save"></i> Save Configuration
-                        </button>
-                    </div>
-                </EditForm>
-            </div>
-        </div>
-    </div>
-}
-
-@code {
-    private OrganizationSMSSettings? settings;
-    private SMSStats? stats;
-    private bool showConfigModal;
-    private bool isSaving;
-    private bool isRefreshing;
-    private ConfigurationModel configModel = new();
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadSettings();
-    }
-
-    private async Task LoadSettings()
-    {
-        settings = await SMSSettingsService.GetOrCreateSettingsAsync();
-        // TODO Phase 2.5: Uncomment when GetSMSStatsAsync is implemented
-         if (settings.IsSMSEnabled)
-         {
-             stats = await SMSService.GetSMSStatsAsync();
-         }
-    }
-
-    private async Task SaveConfiguration()
-    {
-        isSaving = true;
-
-        var result = await SMSSettingsService.UpdateTwilioConfigAsync(
-            configModel.AccountSid!,
-            configModel.AuthToken!,
-            configModel.PhoneNumber!);
-
-        if (result.Success)
-        {
-            ToastService.ShowSuccess(result.Message);
-            showConfigModal = false;
-            configModel = new(); // Clear sensitive data
-            await LoadSettings();
-        }
-        else
-        {
-            ToastService.ShowError(result.Message);
-        }
-
-        isSaving = false;
-    }
-
-    private async Task SendTestSMS()
-    {
-        var testPhone = await JSRuntime.InvokeAsync<string?>("prompt",
-            "Enter phone number to send test SMS (E.164 format, e.g., +1234567890):",
-            "");
-
-        if (!string.IsNullOrEmpty(testPhone))
-        {
-            var result = await SMSSettingsService.TestSMSConfigurationAsync(testPhone);
-            if (result.Success)
-                ToastService.ShowSuccess(result.Message);
-            else
-                ToastService.ShowError(result.Message);
-        }
-    }
-
-    private async Task DisableSMS()
-    {
-        var confirmed = await JSRuntime.InvokeAsync<bool>("confirm",
-            "Are you sure you want to disable SMS notifications?\n\n" +
-            "Notifications will only appear in-app until you re-enable SMS.");
-
-        if (confirmed)
-        {
-            var result = await SMSSettingsService.DisableSMSAsync();
-            ToastService.ShowInfo(result.Message);
-            await LoadSettings();
-        }
-    }
-
-    private async Task RefreshStats()
-    {
-        isRefreshing = true;
-        await LoadSettings();
-        isRefreshing = false;
-        ToastService.ShowSuccess("Statistics refreshed");
-    }
-
-    private void CloseModal()
-    {
-        showConfigModal = false;
-        configModel = new(); // Clear sensitive data
-    }
-
-    private string GetProgressBarClass(int percent)
-    {
-        return percent switch
-        {
-            ( < 50) => "bg-success",
-            ( < 75) => "bg-info",
-            ( < 90) => "bg-warning",
-            _ => "bg-danger"
-        };
-    }
-
-    private void BackToDashboard()
-    {
-        Navigation.NavigateTo("/administration/dashboard");
-    }
-
-    public class ConfigurationModel
-    {
-        [Required(ErrorMessage = "Twilio Account SID is required")]
-        [StringLength(100, MinimumLength = 34, ErrorMessage = "Account SID must be at least 34 characters")]
-        public string? AccountSid { get; set; }
-
-        [Required(ErrorMessage = "Twilio Auth Token is required")]
-        [StringLength(100, MinimumLength = 32, ErrorMessage = "Auth Token must be at least 32 characters")]
-        public string? AuthToken { get; set; }
-
-        [Required(ErrorMessage = "Twilio phone number is required")]
-        [Phone(ErrorMessage = "Invalid phone number format")]
-        public string? PhoneNumber { get; set; }
-    }
-}
-
-<style>
-    .spin {
-        animation: spin 1s linear infinite;
-    }
-
-    @@keyframes spin {
-        from { transform: rotate(0deg); }
-        to { transform: rotate(360deg); }
-    }
-</style>
\ No newline at end of file
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/ServiceSettings.razor b/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/ServiceSettings.razor
deleted file mode 100644
index 93ecea1..0000000
--- a/4-Aquiis.SimpleStart/Features/Administration/Settings/Pages/ServiceSettings.razor
+++ /dev/null
@@ -1,464 +0,0 @@
-@page "/administration/settings/services"
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using Aquiis.Infrastructure.Data
-@using Aquiis.Application.Services
-@using Aquiis.SimpleStart.Shared.Services
-@using Aquiis.Application.Services.PdfGenerators
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.EntityFrameworkCore
-
-@inject ApplicationDbContext DbContext
-@inject PropertyManagementService PropertyService
-@inject UserContextService UserContext
-@inject ToastService ToastService
-@inject ILogger<ServiceSettings> Logger
-@inject NavigationManager Navigation
-
-@rendermode InteractiveServer
-
-@attribute [OrganizationAuthorize("Owner", "Administrator")]
-
-<PageTitle>Service Settings</PageTitle>
-
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <h1><i class="bi bi-gear-fill"></i> Background Service Settings</h1>
-    <button class="btn btn-secondary" @onclick="BackToDashboard">
-        <i class="bi bi-arrow-left"></i> Back to Dashboard
-    </button>
-</div>
-
-<div class="row">
-    <div class="col-md-8">
-        <div class="card">
-            <div class="card-header">
-                <h5 class="mb-0">Run Scheduled Tasks Manually</h5>
-            </div>
-            <div class="card-body">
-                <div class="alert alert-info">
-                    <i class="bi bi-info-circle"></i>
-                    <strong>Note:</strong> These tasks normally run automatically on a schedule. Use these buttons to run them immediately for testing or administrative purposes.
-                </div>
-
-                <div class="list-group">
-                    <div class="list-group-item">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <div>
-                                <h6 class="mb-1">Apply Late Fees</h6>
-                                <small class="text-muted">Process overdue invoices and apply late fees based on organization settings</small>
-                            </div>
-                            <button class="btn btn-primary" @onclick="() => RunTask(TaskType.ApplyLateFees)" disabled="@isRunning">
-                                @if (runningTask == TaskType.ApplyLateFees)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2"></span>
-                                }
-                                <i class="bi bi-play-fill"></i> Run Now
-                            </button>
-                        </div>
-                        @if (taskResults.ContainsKey(TaskType.ApplyLateFees))
-                        {
-                            <div class="alert alert-success mt-2 mb-0">
-                                <small>@taskResults[TaskType.ApplyLateFees]</small>
-                            </div>
-                        }
-                    </div>
-
-                    <div class="list-group-item">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <div>
-                                <h6 class="mb-1">Update Invoice Statuses</h6>
-                                <small class="text-muted">Mark pending invoices as overdue based on due dates</small>
-                            </div>
-                            <button class="btn btn-primary" @onclick="() => RunTask(TaskType.UpdateInvoiceStatuses)" disabled="@isRunning">
-                                @if (runningTask == TaskType.UpdateInvoiceStatuses)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2"></span>
-                                }
-                                <i class="bi bi-play-fill"></i> Run Now
-                            </button>
-                        </div>
-                        @if (taskResults.ContainsKey(TaskType.UpdateInvoiceStatuses))
-                        {
-                            <div class="alert alert-success mt-2 mb-0">
-                                <small>@taskResults[TaskType.UpdateInvoiceStatuses]</small>
-                            </div>
-                        }
-                    </div>
-
-                    <div class="list-group-item">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <div>
-                                <h6 class="mb-1">Send Payment Reminders</h6>
-                                <small class="text-muted">Mark invoices for payment reminders based on reminder settings</small>
-                            </div>
-                            <button class="btn btn-primary" @onclick="() => RunTask(TaskType.SendPaymentReminders)" disabled="@isRunning">
-                                @if (runningTask == TaskType.SendPaymentReminders)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2"></span>
-                                }
-                                <i class="bi bi-play-fill"></i> Run Now
-                            </button>
-                        </div>
-                        @if (taskResults.ContainsKey(TaskType.SendPaymentReminders))
-                        {
-                            <div class="alert alert-success mt-2 mb-0">
-                                <small>@taskResults[TaskType.SendPaymentReminders]</small>
-                            </div>
-                        }
-                    </div>
-
-                    <div class="list-group-item">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <div>
-                                <h6 class="mb-1">Check Lease Renewals</h6>
-                                <small class="text-muted">Process lease expiration notifications and update expired leases</small>
-                            </div>
-                            <button class="btn btn-primary" @onclick="() => RunTask(TaskType.CheckLeaseRenewals)" disabled="@isRunning">
-                                @if (runningTask == TaskType.CheckLeaseRenewals)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2"></span>
-                                }
-                                <i class="bi bi-play-fill"></i> Run Now
-                            </button>
-                        </div>
-                        @if (taskResults.ContainsKey(TaskType.CheckLeaseRenewals))
-                        {
-                            <div class="alert alert-success mt-2 mb-0">
-                                <small>@taskResults[TaskType.CheckLeaseRenewals]</small>
-                            </div>
-                        }
-                    </div>
-                </div>
-
-                <div class="mt-4">
-                    <button class="btn btn-success" @onclick="RunAllTasks" disabled="@isRunning">
-                        @if (runningTask == TaskType.All)
-                        {
-                            <span class="spinner-border spinner-border-sm me-2"></span>
-                        }
-                        <i class="bi bi-play-circle-fill"></i> Run All Tasks
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="col-md-4">
-        <div class="card">
-            <div class="card-header">
-                <h5 class="mb-0">Schedule Information</h5>
-            </div>
-            <div class="card-body">
-                <dl>
-                    <dt>Scheduled Run Time</dt>
-                    <dd>Daily at 2:00 AM</dd>
-
-                    <dt>Next Scheduled Run</dt>
-                    <dd>@GetNextRunTime()</dd>
-
-                    <dt>Last Manual Run</dt>
-                    <dd>@(lastRunTime?.ToString("MMM dd, yyyy h:mm tt") ?? "Never")</dd>
-                </dl>
-            </div>
-        </div>
-
-        <div class="card mt-3">
-            <div class="card-header">
-                <h5 class="mb-0">Task Details</h5>
-            </div>
-            <div class="card-body">
-                <small class="text-muted">
-                    <p><strong>Apply Late Fees:</strong> Applies late fees to invoices that are past the grace period based on organization-specific settings.</p>
-                    <p><strong>Update Invoice Statuses:</strong> Changes invoice status from "Pending" to "Overdue" for invoices past their due date.</p>
-                    <p><strong>Send Payment Reminders:</strong> Marks invoices for payment reminders when they're approaching their due date.</p>
-                    <p><strong>Check Lease Renewals:</strong> Processes lease expiration notifications at 90, 60, and 30 days, and marks expired leases.</p>
-                </small>
-            </div>
-        </div>
-    </div>
-</div>
-
-@code {
-    private bool isRunning = false;
-    private TaskType? runningTask = null;
-    private Dictionary<TaskType, string> taskResults = new();
-    private DateTime? lastRunTime = null;
-
-    private enum TaskType
-    {
-        ApplyLateFees,
-        UpdateInvoiceStatuses,
-        SendPaymentReminders,
-        CheckLeaseRenewals,
-        All
-    }
-
-    private void BackToDashboard()
-    {
-        Navigation.NavigateTo("/administration/dashboard");
-    }
-
-    private async Task RunTask(TaskType taskType)
-    {
-        try
-        {
-            isRunning = true;
-            runningTask = taskType;
-            taskResults.Clear();
-
-            Guid? organizationId = await GetActiveOrganizationIdAsync();
-            if (!organizationId.HasValue)
-            {
-                ToastService.ShowError("Could not determine organization ID");
-                return;
-            }
-
-            switch (taskType)
-            {
-                case TaskType.ApplyLateFees:
-                    await ApplyLateFees(organizationId.Value);
-                    break;
-                case TaskType.UpdateInvoiceStatuses:
-                    await UpdateInvoiceStatuses(organizationId.Value);
-                    break;
-                case TaskType.SendPaymentReminders:
-                    await SendPaymentReminders(organizationId.Value);
-                    break;
-                case TaskType.CheckLeaseRenewals:
-                    await CheckLeaseRenewals(organizationId.Value);
-                    break;
-            }
-
-            lastRunTime = DateTime.Now;
-            ToastService.ShowSuccess("Task completed successfully");
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError(ex, "Error running task {TaskType}", taskType);
-            ToastService.ShowError($"Error running task: {ex.Message}");
-        }
-        finally
-        {
-            isRunning = false;
-            runningTask = null;
-        }
-    }
-
-    private async Task RunAllTasks()
-    {
-        try
-        {
-            isRunning = true;
-            runningTask = TaskType.All;
-            taskResults.Clear();
-
-            var organizationId = await GetActiveOrganizationIdAsync();
-            if (organizationId == null)
-            {
-                ToastService.ShowError("Could not determine organization ID");
-                return;
-            }
-
-            await ApplyLateFees(organizationId.Value);
-            await UpdateInvoiceStatuses(organizationId.Value);
-            await SendPaymentReminders(organizationId.Value);
-            await CheckLeaseRenewals(organizationId.Value);
-
-            lastRunTime = DateTime.Now;
-            ToastService.ShowSuccess("All tasks completed successfully");
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError(ex, "Error running all tasks");
-            ToastService.ShowError($"Error running tasks: {ex.Message}");
-        }
-        finally
-        {
-            isRunning = false;
-            runningTask = null;
-        }
-    }
-
-    private async Task<Guid?> GetActiveOrganizationIdAsync()
-    {
-        // Get organization ID from UserContext
-        return await UserContext.GetActiveOrganizationIdAsync();
-    }
-
-    private async Task ApplyLateFees(Guid organizationId)
-    {
-        var settings = await PropertyService.GetOrganizationSettingsByOrgIdAsync(organizationId);
-        
-        if (settings == null || !settings.LateFeeEnabled || !settings.LateFeeAutoApply)
-        {
-            var reason = settings == null ? "Settings not found" 
-                : !settings.LateFeeEnabled ? "Late fees disabled" 
-                : "Auto-apply disabled";
-            taskResults[TaskType.ApplyLateFees] = $"No late fees applied: {reason} (OrgId: {organizationId})";
-            return;
-        }
-
-        var today = DateTime.Today;
-        var overdueInvoices = await DbContext.Invoices
-            .Include(i => i.Lease)
-            .Where(i => !i.IsDeleted &&
-                       i.OrganizationId == organizationId &&
-                       i.Status == "Pending" &&
-                       i.DueOn < today.AddDays(-settings.LateFeeGracePeriodDays) &&
-                       (i.LateFeeApplied == null || !i.LateFeeApplied.Value))
-            .ToListAsync();
-
-        foreach (var invoice in overdueInvoices)
-        {
-            var lateFee = Math.Min(invoice.Amount * settings.LateFeePercentage, settings.MaxLateFeeAmount);
-            invoice.LateFeeAmount = lateFee;
-            invoice.LateFeeApplied = true;
-            invoice.LateFeeAppliedOn = DateTime.UtcNow;
-            invoice.Amount += lateFee;
-            invoice.Status = "Overdue";
-            invoice.LastModifiedOn = DateTime.UtcNow;
-            invoice.LastModifiedBy = ApplicationConstants.SystemUser.Id;
-            invoice.Notes = string.IsNullOrEmpty(invoice.Notes)
-                ? $"Late fee of {lateFee:C} applied on {DateTime.Now:MMM dd, yyyy}"
-                : $"{invoice.Notes}\nLate fee of {lateFee:C} applied on {DateTime.Now:MMM dd, yyyy}";
-        }
-
-        if (overdueInvoices.Any())
-        {
-            await DbContext.SaveChangesAsync();
-        }
-
-        taskResults[TaskType.ApplyLateFees] = $"Applied late fees to {overdueInvoices.Count} invoice(s)";
-    }
-
-    private async Task UpdateInvoiceStatuses(Guid organizationId)
-    {
-        var today = DateTime.Today;
-        var newlyOverdueInvoices = await DbContext.Invoices
-            .Where(i => !i.IsDeleted &&
-                       i.OrganizationId == organizationId &&
-                       i.Status == "Pending" &&
-                       i.DueOn < today &&
-                       (i.LateFeeApplied == null || !i.LateFeeApplied.Value))
-            .ToListAsync();
-
-        foreach (var invoice in newlyOverdueInvoices)
-        {
-            invoice.Status = "Overdue";
-            invoice.LastModifiedOn = DateTime.UtcNow;
-            invoice.LastModifiedBy = ApplicationConstants.SystemUser.Id;
-        }
-
-        if (newlyOverdueInvoices.Any())
-        {
-            await DbContext.SaveChangesAsync();
-        }
-
-        taskResults[TaskType.UpdateInvoiceStatuses] = $"Updated {newlyOverdueInvoices.Count} invoice(s) to Overdue status";
-    }
-
-    private async Task SendPaymentReminders(Guid organizationId)
-    {
-        var settings = await PropertyService.GetOrganizationSettingsByOrgIdAsync(organizationId);
-        if (settings == null || !settings.PaymentReminderEnabled)
-        {
-            var reason = settings == null ? "Settings not found" : "Payment reminders disabled";
-            taskResults[TaskType.SendPaymentReminders] = $"No reminders sent: {reason}";
-            return;
-        }
-
-        var today = DateTime.Today;
-        var upcomingInvoices = await DbContext.Invoices
-            .Include(i => i.Lease)
-                .ThenInclude(l => l.Tenant)
-            .Include(i => i.Lease)
-                .ThenInclude(l => l.Property)
-            .Where(i => !i.IsDeleted &&
-                       i.OrganizationId == organizationId &&
-                       i.Status == "Pending" &&
-                       i.DueOn >= today &&
-                       i.DueOn <= today.AddDays(settings.PaymentReminderDaysBefore) &&
-                       (i.ReminderSent == null || !i.ReminderSent.Value))
-            .ToListAsync();
-
-        foreach (var invoice in upcomingInvoices)
-        {
-            invoice.ReminderSent = true;
-            invoice.ReminderSentOn = DateTime.UtcNow;
-            invoice.LastModifiedOn = DateTime.UtcNow;
-            invoice.LastModifiedBy = ApplicationConstants.SystemUser.Id;
-        }
-
-        if (upcomingInvoices.Any())
-        {
-            await DbContext.SaveChangesAsync();
-        }
-
-        taskResults[TaskType.SendPaymentReminders] = $"Marked {upcomingInvoices.Count} invoice(s) for payment reminders";
-    }
-
-    private async Task CheckLeaseRenewals(Guid organizationId)
-    {
-        var today = DateTime.Today;
-        int totalProcessed = 0;
-
-        // 90-day notifications
-        var leasesExpiring90Days = await DbContext.Leases
-            .Include(l => l.Tenant)
-            .Include(l => l.Property)
-            .Where(l => !l.IsDeleted &&
-                       l.OrganizationId == organizationId &&
-                       l.Status == "Active" &&
-                       l.EndDate >= today.AddDays(85) &&
-                       l.EndDate <= today.AddDays(95) &&
-                       (l.RenewalNotificationSent == null || !l.RenewalNotificationSent.Value))
-            .ToListAsync();
-
-        foreach (var lease in leasesExpiring90Days)
-        {
-            lease.RenewalNotificationSent = true;
-            lease.RenewalNotificationSentOn = DateTime.UtcNow;
-            lease.RenewalStatus = "Pending";
-            lease.LastModifiedOn = DateTime.UtcNow;
-            lease.LastModifiedBy = ApplicationConstants.SystemUser.Id;
-            totalProcessed++;
-        }
-
-        // Expired leases
-        var expiredLeases = await DbContext.Leases
-            .Where(l => !l.IsDeleted &&
-                       l.OrganizationId == organizationId &&
-                       l.Status == "Active" &&
-                       l.EndDate < today &&
-                       (l.RenewalStatus == null || l.RenewalStatus == "Pending"))
-            .ToListAsync();
-
-        foreach (var lease in expiredLeases)
-        {
-            lease.Status = "Expired";
-            lease.RenewalStatus = "Expired";
-            lease.LastModifiedOn = DateTime.UtcNow;
-            lease.LastModifiedBy = ApplicationConstants.SystemUser.Id;
-            totalProcessed++;
-        }
-
-        if (totalProcessed > 0)
-        {
-            await DbContext.SaveChangesAsync();
-        }
-
-        taskResults[TaskType.CheckLeaseRenewals] = $"Processed {totalProcessed} lease renewal(s)";
-    }
-
-    private string GetNextRunTime()
-    {
-        var now = DateTime.Now;
-        var next2AM = DateTime.Today.AddDays(1).AddHours(2);
-        
-        if (now.Hour < 2)
-        {
-            next2AM = DateTime.Today.AddHours(2);
-        }
-
-        return next2AM.ToString("MMM dd, yyyy h:mm tt");
-    }
-}
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Users/Manage.razor b/4-Aquiis.SimpleStart/Features/Administration/Users/Manage.razor
index 699877a..cf18dd5 100644
--- a/4-Aquiis.SimpleStart/Features/Administration/Users/Manage.razor
+++ b/4-Aquiis.SimpleStart/Features/Administration/Users/Manage.razor
@@ -11,8 +11,10 @@
 @using Microsoft.AspNetCore.Components.Forms
 @using Aquiis.SimpleStart.Shared.Components.Account
 @using Aquiis.SimpleStart.Shared.Authorization
+@using Aquiis.Infrastructure.Data
 
 @inject UserManager<ApplicationUser> UserManager
+@inject ApplicationDbContext AppDbContext
 @inject UserContextService UserContext
 @inject RoleManager<IdentityRole> RoleManager
 @inject OrganizationService OrganizationService
@@ -25,11 +27,14 @@
         <div class="d-flex justify-content-between align-items-center mb-4">
             <h1><i class="bi bi-people-fill"></i> User Management</h1>
             <div class="btn-group">
-                <a href="/administration/users/create" class="btn btn-primary">
-                    <i class="bi bi-person-plus-fill"></i> Add User
-                </a>
-                <button class="btn btn-secondary" @onclick="BackToDashboard">
-                    <i class="bi bi-arrow-left"></i> Back to Dashboard
+                @* Max users for SimpleStart is 2. *@
+                @if(@totalUsers < 2){
+                    <a href="/administration/users/create" class="btn btn-primary">
+                        <i class="bi bi-person-plus-fill"></i> Add User
+                    </a>
+                }
+                <button class="btn btn-outline-secondary" @onclick="Cancel">
+                    <i class="bi bi-arrow-left"></i> Back to Application Settings
                 </button>
             </div>
         </div>
@@ -166,7 +171,7 @@ else
             {
                 <div class="table-responsive">
                     <table class="table table-hover mb-0">
-                        <thead class="table-light">
+                        <thead class="table">
                             <tr>
                                 <th>User</th>
                                 <th>Email</th>
@@ -405,13 +410,20 @@ else
     {
         try
         {
-            // Load all users with their roles
-            List<ApplicationUser>? users = await UserManager.Users.Where(u => u.ActiveOrganizationId == organizationId).ToListAsync();
+            // Load all users with their roles using UserProfile
+            var userProfiles = await AppDbContext.UserProfiles
+                .Where(up => up.ActiveOrganizationId == organizationId)
+                .ToListAsync();
+            
             allUsers.Clear();
             
-            foreach (var user in users)
+            foreach (var profile in userProfiles)
             {
-                // Get user's organization role from UserOrganizations table
+                // Get ApplicationUser from Identity for auth operations
+                var user = await UserManager.FindByIdAsync(profile.UserId);
+                if (user == null) continue;
+                
+                // Get user's organization role from OrganizationUsers table
                 var userOrgRole = await OrganizationService.GetUserRoleForOrganizationAsync(user.Id, organizationId);
                 var roles = userOrgRole != null ? new List<string> { userOrgRole } : new List<string>();
                 
@@ -419,7 +431,7 @@ else
                 
                 allUsers.Add(new UserInfo
                 {
-                    User = (ApplicationUser)user,
+                    User = user,
                     Roles = roles,
                     IsLockedOut = isLockedOut
                 });
@@ -609,4 +621,9 @@ else
     {
         public string SelectedRole { get; set; } = string.Empty;
     }
+
+    private void Cancel()
+    {
+        Navigation.NavigateTo("/administration/settings/application");
+    }
 }
\ No newline at end of file
diff --git a/4-Aquiis.SimpleStart/Features/Administration/Users/Pages/Create.razor b/4-Aquiis.SimpleStart/Features/Administration/Users/Pages/Create.razor
index 2c40516..40a810c 100644
--- a/4-Aquiis.SimpleStart/Features/Administration/Users/Pages/Create.razor
+++ b/4-Aquiis.SimpleStart/Features/Administration/Users/Pages/Create.razor
@@ -249,6 +249,22 @@
                 return;
             }
 
+            var newUserProfile = new UserProfile
+            {
+                Id = Guid.NewGuid(),
+                UserId = newUser.Id,
+                FirstName = newUser.FirstName,
+                LastName = newUser.LastName,
+                Email = newUser.Email,
+                PhoneNumber = newUser.PhoneNumber,
+                ActiveOrganizationId = currentOrganizationId.Value,
+                OrganizationId = currentOrganizationId.Value,
+                CreatedBy = currentUserId,
+                CreatedOn = DateTime.UtcNow
+            };
+
+            await UserContext.CreateUserProfile(newUserProfile);
+
             successMessage = $"User account created successfully! Username: {userModel.Email}, Role: {userModel.SelectedRole}";
             
             // Reset form
diff --git a/4-Aquiis.SimpleStart/Features/Calendar/Calendar.razor b/4-Aquiis.SimpleStart/Features/Calendar/Calendar.razor
index 154c546..8ef89a0 100644
--- a/4-Aquiis.SimpleStart/Features/Calendar/Calendar.razor
+++ b/4-Aquiis.SimpleStart/Features/Calendar/Calendar.razor
@@ -9,6 +9,7 @@
 
 
 @using Microsoft.AspNetCore.Authorization
+@using System.ComponentModel.DataAnnotations
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @inject CalendarEventService CalendarEventService
 @inject CalendarSettingsService CalendarSettingsService
@@ -131,7 +132,7 @@
         @if (viewMode == "day")
         {
             <div class="card">
-                <div class="card-header bg-primary text-white">
+                <div class="card-header">
                     <h5 class="mb-0">@currentDate.ToString("dddd, MMMM dd, yyyy")</h5>
                 </div>
                 <div class="card-body">
@@ -502,43 +503,43 @@
                     <h5 class="modal-title"><i class="bi bi-plus-circle"></i> Add Custom Event</h5>
                     <button type="button" class="btn-close" @onclick="CloseAddEventModal"></button>
                 </div>
-                <EditForm Model="newEvent" OnValidSubmit="SaveCustomEvent">
+                <EditForm Model="newEventViewModel" OnValidSubmit="SaveCustomEvent">
                     <DataAnnotationsValidator />
                     <ValidationSummary class="alert alert-danger" />
                     <div class="modal-body">
                         <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Title <span class="text-danger">*</span></label>
-                                <InputText @bind-Value="newEvent.Title" class="form-control" placeholder="Event title" />
-                                <ValidationMessage For="@(() => newEvent.Title)" />
+                                <InputText @bind-Value="newEventViewModel.Title" class="form-control" placeholder="Event title" />
+                                <ValidationMessage For="@(() => newEventViewModel.Title)" />
                             </div>
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Event Type <span class="text-danger">*</span></label>
-                                <InputSelect @bind-Value="newEvent.EventType" class="form-select">
+                                <InputSelect @bind-Value="newEventViewModel.EventType" @bind-Value:after="OnEventTypeChanged" class="form-select">
                                     <option value="">Select type...</option>
                                     @foreach (var type in CalendarEventTypes.GetAllTypes())
                                     {
                                         <option value="@type">@CalendarEventTypes.GetDisplayName(type)</option>
                                     }
                                 </InputSelect>
-                                <ValidationMessage For="@(() => newEvent.EventType)" />
+                                <ValidationMessage For="@(() => newEventViewModel.EventType)" />
                             </div>
                         </div>
                         <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Start Date & Time <span class="text-danger">*</span></label>
-                                <InputDate Type="InputDateType.DateTimeLocal" @bind-Value="newEvent.StartOn" class="form-control" />
-                                <ValidationMessage For="@(() => newEvent.StartOn)" />
+                                <InputDate Type="InputDateType.DateTimeLocal" @bind-Value="newEventViewModel.StartOn" class="form-control" />
+                                <ValidationMessage For="@(() => newEventViewModel.StartOn)" />
                             </div>
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">End Date & Time</label>
-                                <InputDate Type="InputDateType.DateTimeLocal" @bind-Value="newEvent.EndOn" class="form-control" />
+                                <InputDate Type="InputDateType.DateTimeLocal" @bind-Value="newEventViewModel.EndOn" class="form-control" />
                             </div>
                         </div>
                         <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Status</label>
-                                <InputSelect @bind-Value="newEvent.Status" class="form-select">
+                                <InputSelect @bind-Value="newEventViewModel.Status" class="form-select">
                                     <option value="Scheduled">Scheduled</option>
                                     <option value="Confirmed">Confirmed</option>
                                     <option value="Completed">Completed</option>
@@ -548,7 +549,7 @@
                             </div>
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Location</label>
-                                <InputText @bind-Value="newEvent.Location" class="form-control" placeholder="Event location" />
+                                <InputText @bind-Value="newEventViewModel.Location" class="form-control" placeholder="Event location" />
                             </div>
                         </div>
                         <div class="mb-3">
@@ -560,14 +561,14 @@
                                        @oninput="OnPropertySearchInput"
                                        placeholder="Search by address..."
                                        autocomplete="off" />
-                                @if (newEvent.PropertyId.HasValue && selectedPropertyForEvent != null)
+                                @if (newEventViewModel.PropertyId.HasValue && selectedPropertyForEvent != null)
                                 {
                                     <button type="button" class="btn btn-outline-secondary" @onclick="ClearPropertySelection">
                                         <i class="bi bi-x"></i>
                                     </button>
                                 }
                             </div>
-                            @if (newEvent.PropertyId.HasValue && selectedPropertyForEvent != null)
+                            @if (newEventViewModel.PropertyId.HasValue && selectedPropertyForEvent != null)
                             {
                                 <div class="alert alert-info mt-2 mb-0">
                                     <i class="bi bi-house"></i> <strong>@selectedPropertyForEvent.Address</strong>, @selectedPropertyForEvent.City, @selectedPropertyForEvent.State @selectedPropertyForEvent.ZipCode
@@ -589,17 +590,22 @@
                         </div>
                         <div class="mb-3">
                             <label class="form-label">Description</label>
-                            <InputTextArea @bind-Value="newEvent.Description" class="form-control" rows="3" placeholder="Event description" />
+                            <InputTextArea @bind-Value="newEventViewModel.Description" class="form-control" rows="3" placeholder="Event description" />
                         </div>
                         <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Color</label>
-                                <InputText type="color" @bind-Value="newEvent.Color" class="form-control form-control-color" />
+                                <InputText type="color" @bind-Value="newEventViewModel.Color" class="form-control form-control-color" />
                             </div>
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Icon</label>
-                                <InputSelect @bind-Value="newEvent.Icon" class="form-select">
-                                    <option value="bi-calendar-event">📅 Calendar Event</option>
+                                <InputSelect @bind-Value="newEventViewModel.Icon" class="form-select">
+                                    <option value="bi-calendar-event">📅 Calendar Event (Custom)</option>
+                                    <option value="bi-calendar-check">✅ Tour</option>
+                                    <option value="bi-clipboard-check">📋 Inspection</option>
+                                    <option value="bi-tools">🔧 Maintenance</option>
+                                    <option value="bi-calendar-x">❌ Lease Expiry</option>
+                                    <option value="bi-cash-coin">💰 Rent Due</option>
                                     <option value="bi-bell">🔔 Bell</option>
                                     <option value="bi-clock">🕐 Clock</option>
                                     <option value="bi-flag">🚩 Flag</option>
@@ -607,7 +613,6 @@
                                     <option value="bi-geo-alt">📍 Location Pin</option>
                                     <option value="bi-people">👥 People</option>
                                     <option value="bi-briefcase">💼 Briefcase</option>
-                                    <option value="bi-calendar-check">✅ Calendar Check</option>
                                 </InputSelect>
                                 <small class="text-muted">Choose an icon for this event</small>
                             </div>
@@ -632,12 +637,12 @@
     private Inspection? selectedInspection;
     private MaintenanceRequest? selectedMaintenanceRequest;
     private bool loading = true;
-    private string viewMode = "week"; // day, week, month
+    private string viewMode = "month"; // day, week, month
     private DateTime currentDate = DateTime.Today;
     private List<string> selectedEventTypes = new();
     private bool showFilters = false;
     private bool showAddEventModal = false;
-    private CalendarEvent newEvent = new();
+    private CalendarEventViewModel newEventViewModel = new();
     private string propertySearchTerm = string.Empty;
     private List<Property> propertySearchResults = new();
     private bool showPropertySearchResults = false;
@@ -735,19 +740,12 @@
 
     private async Task ShowAddEventModal()
     {
-        var organizationId = await UserContext.GetActiveOrganizationIdAsync();
-        var userId = await UserContext.GetUserIdAsync();
-        
-        newEvent = new CalendarEvent
+        // Create fresh ViewModel instance - service will set tracking fields
+        newEventViewModel = new CalendarEventViewModel
         {
             StartOn = currentDate.Date.AddHours(9), // Default to 9 AM on current date
-            Color = "#6c757d",
-            Icon = "bi-calendar-event",
-            EventType = CalendarEventTypes.Custom,
             Status = "Scheduled",
-            OrganizationId = organizationId.HasValue ? organizationId.Value : Guid.Empty,
-            CreatedBy = !string.IsNullOrEmpty(userId) ? userId : string.Empty,
-            CreatedOn = DateTime.UtcNow
+            EventType = string.Empty
         };
         showAddEventModal = true;
     }
@@ -755,7 +753,7 @@
     private void CloseAddEventModal()
     {
         showAddEventModal = false;
-        newEvent = new();
+        newEventViewModel = new();
         propertySearchTerm = string.Empty;
         propertySearchResults.Clear();
         showPropertySearchResults = false;
@@ -787,7 +785,7 @@
     private void SelectProperty(Property property)
     {
         selectedPropertyForEvent = property;
-        newEvent.PropertyId = property.Id;
+        newEventViewModel.PropertyId = property.Id;
         propertySearchTerm = $"{property.Address}, {property.City}, {property.State} {property.ZipCode}";
         showPropertySearchResults = false;
         propertySearchResults.Clear();
@@ -796,23 +794,49 @@
     private void ClearPropertySelection()
     {
         selectedPropertyForEvent = null;
-        newEvent.PropertyId = null;
+        newEventViewModel.PropertyId = null;
         propertySearchTerm = string.Empty;
         propertySearchResults.Clear();
         showPropertySearchResults = false;
     }
 
+    private void OnEventTypeChanged()
+    {
+        if (!string.IsNullOrEmpty(newEventViewModel.EventType))
+        {
+            // Auto-update color and icon based on event type
+            newEventViewModel.Color = CalendarEventTypes.GetColor(newEventViewModel.EventType);
+            newEventViewModel.Icon = CalendarEventTypes.GetIcon(newEventViewModel.EventType);
+        }
+    }
+
     private async Task SaveCustomEvent()
     {
         try
         {
             // Calculate duration if end time is set
-            if (newEvent.EndOn.HasValue)
+            if (newEventViewModel.EndOn.HasValue)
             {
-                newEvent.DurationMinutes = (int)(newEvent.EndOn.Value - newEvent.StartOn).TotalMinutes;
+                newEventViewModel.DurationMinutes = (int)(newEventViewModel.EndOn.Value - newEventViewModel.StartOn).TotalMinutes;
             }
 
-            await CalendarEventService.CreateCustomEventAsync(newEvent);
+            // Convert ViewModel to Entity for service
+            var calendarEvent = new CalendarEvent
+            {
+                Title = newEventViewModel.Title,
+                StartOn = newEventViewModel.StartOn,
+                EndOn = newEventViewModel.EndOn,
+                DurationMinutes = newEventViewModel.DurationMinutes,
+                EventType = newEventViewModel.EventType,
+                Status = newEventViewModel.Status,
+                Description = newEventViewModel.Description,
+                PropertyId = newEventViewModel.PropertyId,
+                Location = newEventViewModel.Location,
+                Color = newEventViewModel.Color,
+                Icon = newEventViewModel.Icon
+            };
+
+            await CalendarEventService.CreateCustomEventAsync(calendarEvent);
             
             ToastService.ShowSuccess("Event created successfully");
             CloseAddEventModal();
@@ -951,8 +975,9 @@
                 
                 builder.OpenElement(70, "div");
                 builder.OpenElement(71, "span");
-                builder.AddAttribute(72, "class", $"badge bg-secondary");
-                builder.AddContent(73, CalendarEventTypes.GetDisplayName(evt.EventType));
+                builder.AddAttribute(72, "class", "badge");
+                builder.AddAttribute(73, "style", $"background-color: {CalendarEventTypes.GetColor(evt.EventType)}; color: white;");
+                builder.AddContent(74, CalendarEventTypes.GetDisplayName(evt.EventType));
                 builder.CloseElement();
                 if (!string.IsNullOrEmpty(evt.Status))
                 {
@@ -1059,8 +1084,8 @@
                     builder.OpenElement(index + 40, "small");
                     builder.AddAttribute(index + 41, "class", "d-block text-truncate text-muted");
                     builder.OpenElement(index + 42, "span");
-                    builder.AddAttribute(index + 43, "class", "badge bg-secondary" );
-                    builder.AddAttribute(index + 44, "style", "font-size: 0.65rem;");
+                    builder.AddAttribute(index + 43, "class", "badge");
+                    builder.AddAttribute(index + 44, "style", $"font-size: 0.65rem; background-color: {CalendarEventTypes.GetColor(evt.EventType)}; color: white;");
                     builder.AddContent(index + 45, CalendarEventTypes.GetDisplayName(evt.EventType));
                     builder.CloseElement();
                     if (!string.IsNullOrEmpty(evt.Status))
@@ -1144,7 +1169,7 @@
 
                 var cellIndex = 200 + (week * 10) + day;
                 builder.OpenElement(cellIndex, "td");
-                builder.AddAttribute(cellIndex + 1, "class", isCurrentMonth ? "align-top" : "align-top bg-light text-muted");
+                builder.AddAttribute(cellIndex + 1, "class", isCurrentMonth ? "align-top" : "align-top bg-body-tertiary text-muted");
                 builder.AddAttribute(cellIndex + 2, "style", "min-height: 100px; width: 14.28%;");
                 
                 builder.OpenElement(cellIndex + 10, "div");
@@ -1308,7 +1333,7 @@
         {
             if (selectedTour.ChecklistId.HasValue)
             {
-                Navigation.NavigateTo($"/PropertyManagement/Checklists/View/{selectedTour.ChecklistId.Value}");
+                Navigation.NavigateTo($"/PropertyManagement/Checklists/{selectedTour.ChecklistId.Value}");
             }
             else
             {
@@ -1353,7 +1378,7 @@
                     CloseModal();
                     if (tour.ChecklistId.HasValue)
                     {
-                        Navigation.NavigateTo($"/PropertyManagement/Checklists/View/{tour.ChecklistId.Value}");
+                        Navigation.NavigateTo($"/PropertyManagement/Checklists/{tour.ChecklistId.Value}");
                     }
                     else
                     {
@@ -1667,4 +1692,54 @@
         
         return "bg-secondary";
     }
+
+    /// <summary>
+    /// View model for creating/editing calendar events from the UI.
+    /// Excludes tracking fields (OrganizationId, CreatedBy, etc.) which are set by the service.
+    /// </summary>
+    public class CalendarEventViewModel
+    {
+        [Required]
+        [StringLength(200)]
+        [Display(Name = "Title")]
+        public string Title { get; set; } = string.Empty;
+
+        [Required]
+        [Display(Name = "Start Date & Time")]
+        public DateTime StartOn { get; set; } = DateTime.Now;
+
+        [Display(Name = "End Date & Time")]
+        public DateTime? EndOn { get; set; }
+
+        [Display(Name = "Duration (Minutes)")]
+        public int DurationMinutes { get; set; }
+
+        [Required]
+        [StringLength(50)]
+        [Display(Name = "Event Type")]
+        public string EventType { get; set; } = string.Empty;
+
+        [StringLength(50)]
+        [Display(Name = "Status")]
+        public string Status { get; set; } = "Scheduled";
+
+        [StringLength(2000)]
+        [Display(Name = "Description")]
+        public string? Description { get; set; }
+
+        [Display(Name = "Property")]
+        public Guid? PropertyId { get; set; }
+
+        [StringLength(500)]
+        [Display(Name = "Location")]
+        public string? Location { get; set; }
+
+        [StringLength(20)]
+        [Display(Name = "Color")]
+        public string Color { get; set; } = "#6c757d";
+
+        [StringLength(50)]
+        [Display(Name = "Icon")]
+        public string Icon { get; set; } = "bi-calendar-event";
+    }
 }
diff --git a/4-Aquiis.SimpleStart/Features/Calendar/CalendarListView.razor b/4-Aquiis.SimpleStart/Features/Calendar/CalendarListView.razor
index a7d0038..7d03818 100644
--- a/4-Aquiis.SimpleStart/Features/Calendar/CalendarListView.razor
+++ b/4-Aquiis.SimpleStart/Features/Calendar/CalendarListView.razor
@@ -113,7 +113,7 @@
                                         </td>
                                         <td>
                                             <i class="bi @evt.Icon" style="color: @evt.Color;"></i>
-                                            <span class="badge bg-secondary ms-1">@CalendarEventTypes.GetDisplayName(evt.EventType)</span>
+                                            <span class="badge ms-1" style="background-color: @CalendarEventTypes.GetColor(evt.EventType); color: white;">@CalendarEventTypes.GetDisplayName(evt.EventType)</span>
                                         </td>
                                         <td>@evt.Title</td>
                                         <td>
diff --git a/4-Aquiis.SimpleStart/Features/Notifications/Pages/Index.razor b/4-Aquiis.SimpleStart/Features/Notifications/Pages/Index.razor
index a0be3d9..acaa8c4 100644
--- a/4-Aquiis.SimpleStart/Features/Notifications/Pages/Index.razor
+++ b/4-Aquiis.SimpleStart/Features/Notifications/Pages/Index.razor
@@ -5,4 +5,4 @@
 
 <PageTitle>Notification Center</PageTitle>
 
-<Aquiis.UI.Shared.Features.Notifications.NotificationCenter GetEntityRoute="@EntityRouteHelper.GetEntityRoute" />
+<Aquiis.UI.Shared.Components.Notifications.NotificationCenter GetEntityRoute="@EntityRouteHelper.GetEntityRoute" />
diff --git a/4-Aquiis.SimpleStart/Features/Notifications/Pages/Preferences.razor b/4-Aquiis.SimpleStart/Features/Notifications/Pages/Preferences.razor
index 9c78fda..4a14397 100644
--- a/4-Aquiis.SimpleStart/Features/Notifications/Pages/Preferences.razor
+++ b/4-Aquiis.SimpleStart/Features/Notifications/Pages/Preferences.razor
@@ -6,4 +6,4 @@
 
 <PageTitle>Notification Preferences - Aquiis</PageTitle>
 
-<Aquiis.UI.Shared.Features.Notifications.NotificationPreferences ToastService="@ToastService" />
+<Aquiis.UI.Shared.Components.Notifications.NotificationPreferences ToastService="@ToastService" />
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/Edit.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/Edit.razor
index 0cf17db..9711419 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/Edit.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Inspections/Pages/Edit.razor
@@ -1 +1 @@
-@page "/propertymanagement/inspections/{InspectionId:guid}/"
\ No newline at end of file
+@page "/propertymanagement/inspections/{InspectionId:guid}/edit"
\ No newline at end of file
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Create.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Create.razor
index b022f89..7472452 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Create.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Create.razor
@@ -1,317 +1,5 @@
 @page "/propertymanagement/invoices/create"
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using Aquiis.Core.Entities
-@using Aquiis.Core.Validation
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Forms
-@using System.ComponentModel.DataAnnotations
-@inject NavigationManager NavigationManager
-@inject InvoiceService InvoiceService
-@inject LeaseService LeaseService
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Create Invoice - Property Management</PageTitle>
-
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <h1><i class="bi bi-receipt"></i> Create Invoice</h1>
-    <button class="btn btn-outline-secondary" @onclick="Cancel">
-        <i class="bi bi-x-lg"></i> Cancel
-    </button>
-</div>
-
-@if (errorMessage != null)
-{
-    <div class="alert alert-danger alert-dismissible fade show" role="alert">
-        @errorMessage
-        <button type="button" class="btn-close" @onclick="() => errorMessage = null"></button>
-    </div>
-}
-
-@if (successMessage != null)
-{
-    <div class="alert alert-success alert-dismissible fade show" role="alert">
-        @successMessage
-        <button type="button" class="btn-close" @onclick="() => successMessage = null"></button>
-    </div>
-}
-
-<div class="row">
-    <div class="col-md-8">
-        <div class="card">
-            <div class="card-header">
-                <h5 class="mb-0">Invoice Information</h5>
-            </div>
-            <div class="card-body">
-                <EditForm Model="invoiceModel" OnValidSubmit="HandleCreateInvoice">
-                    <DataAnnotationsValidator />
-                    <ValidationSummary class="text-danger" />
-
-                    <div class="mb-3">
-                        <label class="form-label">Invoice Number</label>
-                        <InputText @bind-Value="invoiceModel.InvoiceNumber" class="form-control" readonly />
-                        <ValidationMessage For="() => invoiceModel.InvoiceNumber" class="text-danger" />
-                    </div>
-
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <label class="form-label">Invoice Date <span class="text-danger">*</span></label>
-                            <InputDate @bind-Value="invoiceModel.InvoicedOn" class="form-control" />
-                            <ValidationMessage For="() => invoiceModel.InvoicedOn" class="text-danger" />
-                        </div>
-                        <div class="col-md-6">
-                            <label class="form-label">Due Date <span class="text-danger">*</span></label>
-                            <InputDate @bind-Value="invoiceModel.DueOn" class="form-control" />
-                            <ValidationMessage For="() => invoiceModel.DueOn" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="mb-3">
-                        <label class="form-label">Lease <span class="text-danger">*</span></label>
-                        <InputSelect @bind-Value="invoiceModel.LeaseId" @bind-Value:after="OnLeaseSelected" class="form-select">
-                            <option value="0">-- Select Lease --</option>
-                            @if (leases != null)
-                            {
-                                @foreach (var lease in leases)
-                                {
-                                    <option value="@lease.Id">
-                                        @lease.Property?.Address - @lease.Tenant?.FullName (@lease.MonthlyRent.ToString("C")/month)
-                                    </option>
-                                }
-                            }
-                        </InputSelect>
-                        <ValidationMessage For="() => invoiceModel.LeaseId" class="text-danger" />
-                    </div>
-
-                    <div class="mb-3">
-                        <label class="form-label">Description <span class="text-danger">*</span></label>
-                        <InputText @bind-Value="invoiceModel.Description" class="form-control" placeholder="e.g., Monthly Rent - January 2025" />
-                        <ValidationMessage For="() => invoiceModel.Description" class="text-danger" />
-                    </div>
-
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <label class="form-label">Amount <span class="text-danger">*</span></label>
-                            <div class="input-group">
-                                <span class="input-group-text">$</span>
-                                <InputNumber @bind-Value="invoiceModel.Amount" class="form-control" step="0.01" />
-                            </div>
-                            <ValidationMessage For="() => invoiceModel.Amount" class="text-danger" />
-                        </div>
-                        <div class="col-md-6">
-                            <label class="form-label">Status</label>
-                            <InputSelect @bind-Value="invoiceModel.Status" class="form-select">
-                                <option value="Pending">Pending</option>
-                                <option value="Paid">Paid</option>
-                                <option value="Cancelled">Cancelled</option>
-                            </InputSelect>
-                            <ValidationMessage For="() => invoiceModel.Status" class="text-danger" />
-                        </div>
-                    </div>
-
-                    @if (invoiceModel.Status == "Paid")
-                    {
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="form-label">Paid Amount</label>
-                                <div class="input-group">
-                                    <span class="input-group-text">$</span>
-                                    <InputNumber @bind-Value="invoiceModel.AmountPaid" class="form-control" step="0.01" />
-                                </div>
-                                <ValidationMessage For="() => invoiceModel.AmountPaid" class="text-danger" />
-                            </div>
-                            <div class="col-md-6">
-                                <label class="form-label">Paid On</label>
-                                <InputDate @bind-Value="invoiceModel.PaidOn" class="form-control" />
-                                <ValidationMessage For="() => invoiceModel.PaidOn" class="text-danger" />
-                            </div>
-                        </div>
-                    }
-
-                    <div class="mb-3">
-                        <label class="form-label">Notes</label>
-                        <InputTextArea @bind-Value="invoiceModel.Notes" class="form-control" rows="3" placeholder="Additional notes or comments..." />
-                        <ValidationMessage For="() => invoiceModel.Notes" class="text-danger" />
-                    </div>
-
-                    <div class="d-flex gap-2">
-                        <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                            }
-                            <i class="bi bi-check-lg"></i> Create Invoice
-                        </button>
-                        <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                    </div>
-                </EditForm>
-            </div>
-        </div>
-    </div>
-
-    <div class="col-md-4">
-        <div class="card">
-            <div class="card-header">
-                <h5 class="mb-0">Tips</h5>
-            </div>
-            <div class="card-body">
-                <ul class="list-unstyled">
-                    <li class="mb-2">
-                        <i class="bi bi-info-circle text-primary"></i>
-                        Invoice numbers are automatically generated
-                    </li>
-                    <li class="mb-2">
-                        <i class="bi bi-info-circle text-primary"></i>
-                        Select an active lease to create an invoice
-                    </li>
-                    <li class="mb-2">
-                        <i class="bi bi-info-circle text-primary"></i>
-                        The amount defaults to the lease's monthly rent
-                    </li>
-                    <li class="mb-2">
-                        <i class="bi bi-info-circle text-primary"></i>
-                        Use clear descriptions to identify the invoice purpose
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
-
-@code {
-    private InvoiceModel invoiceModel = new InvoiceModel();
-    private List<Lease>? leases;
-    private string? errorMessage;
-    private string? successMessage;
-    private bool isSubmitting = false;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? LeaseId { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadLeases();
-        invoiceModel.InvoiceNumber = await InvoiceService.GenerateInvoiceNumberAsync();
-        invoiceModel.InvoicedOn = DateTime.Now;
-        invoiceModel.DueOn = DateTime.Now.AddDays(30);
-        if (LeaseId.HasValue)
-        {
-            invoiceModel.LeaseId = LeaseId.Value;
-            OnLeaseSelected();
-        }
-    }
-
-    private async Task LoadLeases()
-    {
-        var allLeases = await LeaseService.GetAllAsync();
-        leases = allLeases.Where(l => l.Status == "Active").ToList();
-    }
-
-    private void OnLeaseSelected()
-    {
-        if (invoiceModel.LeaseId != Guid.Empty)
-        {
-            var selectedLease = leases?.FirstOrDefault(l => l.Id == invoiceModel.LeaseId);
-            if (selectedLease != null)
-            {
-                invoiceModel.Amount = selectedLease.MonthlyRent;
-                
-                // Generate description based on current month/year
-                var currentMonth = DateTime.Now.ToString("MMMM yyyy");
-                invoiceModel.Description = $"Monthly Rent - {currentMonth}";
-            }
-        }
-    }
-
-    private async Task HandleCreateInvoice()
-    {
-        try
-        {
-            isSubmitting = true;
-            errorMessage = null;
-            successMessage = null;
-
-            var authState = await AuthenticationStateTask;
-            var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-            if (string.IsNullOrEmpty(userId))
-            {
-                errorMessage = "User not authenticated.";
-                return;
-            }
-
-            var invoice = new Invoice
-            {
-                LeaseId = invoiceModel.LeaseId,
-                InvoiceNumber = invoiceModel.InvoiceNumber,
-                InvoicedOn = invoiceModel.InvoicedOn,
-                DueOn = invoiceModel.DueOn,
-                Amount = invoiceModel.Amount,
-                Description = invoiceModel.Description,
-                Status = invoiceModel.Status,
-                AmountPaid = invoiceModel.Status == "Paid" ? invoiceModel.AmountPaid : 0,
-                PaidOn = invoiceModel.Status == "Paid" ? invoiceModel.PaidOn : null,
-                Notes = invoiceModel.Notes ?? string.Empty
-            };
-
-            await InvoiceService.CreateAsync(invoice);
-
-            NavigationManager.NavigateTo("/propertymanagement/invoices");
-        }
-        catch (Exception ex)
-        {
-            errorMessage = $"Error creating invoice: {ex.Message}";
-        }
-        finally
-        {
-            isSubmitting = false;
-        }
-    }
-
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/invoices");
-    }
-
-    public class InvoiceModel
-    {
-        [RequiredGuid(ErrorMessage = "Lease is required")]
-        public Guid LeaseId { get; set; }
-
-        [Required(ErrorMessage = "Invoice number is required")]
-        [StringLength(50, ErrorMessage = "Invoice number cannot exceed 50 characters")]
-        public string InvoiceNumber { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Invoice date is required")]
-        public DateTime InvoicedOn { get; set; } = DateTime.Now;
-
-        [Required(ErrorMessage = "Due date is required")]
-        public DateTime DueOn { get; set; } = DateTime.Now.AddDays(30);
-
-        [Required(ErrorMessage = "Amount is required")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Amount must be greater than 0")]
-        public decimal Amount { get; set; }
-
-        [Required(ErrorMessage = "Description is required")]
-        [StringLength(100, ErrorMessage = "Description cannot exceed 100 characters")]
-        public string Description { get; set; } = string.Empty;
-
-        [Required]
-        [StringLength(50)]
-        public string Status { get; set; } = "Pending";
-
-        [Range(0, double.MaxValue, ErrorMessage = "Amount paid cannot be negative")]
-        public decimal AmountPaid { get; set; }
-
-        public DateTime? PaidOn { get; set; }
-
-        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
-        public string? Notes { get; set; }
-    }
-}
+<Aquiis.UI.Shared.Features.PropertyManagement.Invoices.CreateForm />
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Edit.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Edit.razor
index 0dc81cd..e7bd6c8 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Edit.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Edit.razor
@@ -1,396 +1,9 @@
-@page "/propertymanagement/invoices/edit/{Id:guid}"
-
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using Aquiis.Core.Entities
-@using Aquiis.Core.Validation
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Forms
-@using System.ComponentModel.DataAnnotations
-@inject NavigationManager NavigationManager
-@inject InvoiceService InvoiceService
-@inject LeaseService LeaseService
-
+@page "/propertymanagement/invoices/{Id:guid}/edit"
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Edit Invoice - Property Management</PageTitle>
-
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <h1><i class="bi bi-receipt"></i> Edit Invoice</h1>
-    <button class="btn btn-outline-secondary" @onclick="Cancel">
-        <i class="bi bi-x-lg"></i> Cancel
-    </button>
-</div>
-
-@if (errorMessage != null)
-{
-    <div class="alert alert-danger alert-dismissible fade show" role="alert">
-        @errorMessage
-        <button type="button" class="btn-close" @onclick="() => errorMessage = null"></button>
-    </div>
-}
-
-@if (successMessage != null)
-{
-    <div class="alert alert-success alert-dismissible fade show" role="alert">
-        @successMessage
-        <button type="button" class="btn-close" @onclick="() => successMessage = null"></button>
-    </div>
-}
-
-@if (invoice == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else
-{
-    <div class="row">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Invoice Information</h5>
-                </div>
-                <div class="card-body">
-                    <EditForm Model="invoiceModel" OnValidSubmit="UpdateInvoice">
-                        <DataAnnotationsValidator />
-                        <ValidationSummary class="text-danger" />
-
-                        <div class="mb-3">
-                            <label class="form-label">Invoice Number</label>
-                            <InputText @bind-Value="invoiceModel.InvoiceNumber" class="form-control" readonly />
-                            <ValidationMessage For="() => invoiceModel.InvoiceNumber" class="text-danger" />
-                        </div>
-
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="form-label">Invoice Date <span class="text-danger">*</span></label>
-                                <InputDate @bind-Value="invoiceModel.InvoicedOn" class="form-control" />
-                                <ValidationMessage For="() => invoiceModel.InvoicedOn" class="text-danger" />
-                            </div>
-                            <div class="col-md-6">
-                                <label class="form-label">Due Date <span class="text-danger">*</span></label>
-                                <InputDate @bind-Value="invoiceModel.DueOn" class="form-control" />
-                                <ValidationMessage For="() => invoiceModel.DueOn" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="mb-3">
-                            <label class="form-label">Lease</label>
-                            <InputSelect @bind-Value="invoiceModel.LeaseId" class="form-select" disabled>
-                                @if (leases != null)
-                                {
-                                    @foreach (var lease in leases)
-                                    {
-                                        <option value="@lease.Id">
-                                            @lease.Property?.Address - @lease.Tenant?.FullName (@lease.MonthlyRent.ToString("C")/month)
-                                        </option>
-                                    }
-                                }
-                            </InputSelect>
-                            <small class="text-muted">Lease cannot be changed after invoice creation</small>
-                        </div>
-
-                        <div class="mb-3">
-                            <label class="form-label">Description <span class="text-danger">*</span></label>
-                            <InputText @bind-Value="invoiceModel.Description" class="form-control" />
-                            <ValidationMessage For="() => invoiceModel.Description" class="text-danger" />
-                        </div>
-
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="form-label">Amount <span class="text-danger">*</span></label>
-                                <div class="input-group">
-                                    <span class="input-group-text">$</span>
-                                    <InputNumber @bind-Value="invoiceModel.Amount" class="form-control" step="0.01" />
-                                </div>
-                                <ValidationMessage For="() => invoiceModel.Amount" class="text-danger" />
-                            </div>
-                            <div class="col-md-6">
-                                <label class="form-label">Status</label>
-                                <InputSelect @bind-Value="invoiceModel.Status" class="form-select">
-                                    <option value="Pending">Pending</option>
-                                    <option value="Paid">Paid</option>
-                                    <option value="Overdue">Overdue</option>
-                                    <option value="Cancelled">Cancelled</option>
-                                </InputSelect>
-                                <ValidationMessage For="() => invoiceModel.Status" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="form-label">Paid Amount</label>
-                                <div class="input-group">
-                                    <span class="input-group-text">$</span>
-                                    <InputNumber @bind-Value="invoiceModel.AmountPaid" class="form-control" step="0.01" />
-                                </div>
-                                <ValidationMessage For="() => invoiceModel.AmountPaid" class="text-danger" />
-                                <small class="text-muted">Balance Due: @((invoiceModel.Amount - invoiceModel.AmountPaid).ToString("C"))</small>
-                            </div>
-                            <div class="col-md-6">
-                                <label class="form-label">Paid Date</label>
-                                <InputDate @bind-Value="invoiceModel.PaidOn" class="form-control" />
-                                <ValidationMessage For="() => invoiceModel.PaidOn" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="mb-3">
-                            <label class="form-label">Notes</label>
-                            <InputTextArea @bind-Value="invoiceModel.Notes" class="form-control" rows="3" />
-                            <ValidationMessage For="() => invoiceModel.Notes" class="text-danger" />
-                        </div>
-
-                        <div class="d-flex gap-2">
-                            <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                                @if (isSubmitting)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                                }
-                                <i class="bi bi-check-lg"></i> Save Changes
-                            </button>
-                            <button type="button" class="btn btn-outline-primary" @onclick="ViewInvoice">View Invoice</button>
-                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                        </div>
-                    </EditForm>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-md-4">
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Invoice Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="ViewInvoice">
-                            <i class="bi bi-eye"></i> View Invoice
-                        </button>
-                        @if (invoice.Status != "Paid" && invoice.BalanceDue > 0)
-                        {
-                            <button class="btn btn-outline-success" @onclick="RecordPayment">
-                                <i class="bi bi-cash"></i> Record Payment
-                            </button>
-                        }
-                        <button class="btn btn-outline-info" @onclick="ViewLease">
-                            <i class="bi bi-file-text"></i> View Lease
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Invoice Summary</h5>
-                </div>
-                <div class="card-body">
-                    <div class="mb-2">
-                        <small class="text-muted">Status</small>
-                        <div>
-                            <span class="badge @GetStatusBadgeClass(invoice.Status)">@invoice.Status</span>
-                        </div>
-                    </div>
-                    <div class="mb-2">
-                        <small class="text-muted">Invoice Amount</small>
-                        <div class="fw-bold">@invoice.Amount.ToString("C")</div>
-                    </div>
-                    <div class="mb-2">
-                        <small class="text-muted">Paid Amount</small>
-                        <div class="text-success">@invoice.AmountPaid.ToString("C")</div>
-                    </div>
-                    <div class="mb-2">
-                        <small class="text-muted">Balance Due</small>
-                        <div class="fw-bold @(invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
-                            @invoice.BalanceDue.ToString("C")
-                        </div>
-                    </div>
-                    @if (invoice.IsOverdue)
-                    {
-                        <div class="alert alert-danger mb-0 mt-2">
-                            <small>
-                                <i class="bi bi-exclamation-triangle"></i>
-                                @invoice.DaysOverdue days overdue
-                            </small>
-                        </div>
-                    }
-                </div>
-            </div>
-        </div>
-    </div>
-}
+<Aquiis.UI.Shared.Features.PropertyManagement.Invoices.EditForm InvoiceId="@Id" />
 
 @code {
-    [Parameter]
-    public Guid Id { get; set; }
-
-    private Invoice? invoice;
-    private InvoiceModel invoiceModel = new InvoiceModel();
-    private List<Lease>? leases;
-    private string? errorMessage;
-    private string? successMessage;
-    private bool isSubmitting = false;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadInvoice();
-        await LoadLeases();
-    }
-
-    private async Task LoadInvoice()
-    {
-        invoice = await InvoiceService.GetByIdAsync(Id);
-        
-        if (invoice != null)
-        {
-            invoiceModel = new InvoiceModel
-            {
-                LeaseId = invoice.LeaseId,
-                InvoiceNumber = invoice.InvoiceNumber,
-                InvoicedOn = invoice.InvoicedOn,
-                DueOn = invoice.DueOn,
-                Amount = invoice.Amount,
-                Description = invoice.Description,
-                Status = invoice.Status,
-                AmountPaid = invoice.AmountPaid,
-                PaidOn = invoice.PaidOn,
-                Notes = invoice.Notes
-            };
-        }
-    }
-
-    private async Task LoadLeases()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (!string.IsNullOrEmpty(userId))
-        {
-            leases = await LeaseService.GetAllAsync();
-        }
-    }
-
-    private async Task UpdateInvoice()
-    {
-        try
-        {
-            isSubmitting = true;
-            errorMessage = null;
-            successMessage = null;
-
-            var authState = await AuthenticationStateTask;
-            var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-            if (string.IsNullOrEmpty(userId))
-            {
-                errorMessage = "User not authenticated.";
-                return;
-            }
-
-            if (invoice == null)
-            {
-                errorMessage = "Invoice not found.";
-                return;
-            }
-
-            invoice.InvoicedOn = invoiceModel.InvoicedOn;
-            invoice.DueOn = invoiceModel.DueOn;
-            invoice.Amount = invoiceModel.Amount;
-            invoice.Description = invoiceModel.Description;
-            invoice.Status = invoiceModel.Status;
-            invoice.AmountPaid = invoiceModel.AmountPaid;
-            invoice.PaidOn = invoiceModel.PaidOn;
-            invoice.Notes = invoiceModel.Notes ?? string.Empty;
-
-            await InvoiceService.UpdateAsync(invoice);
-
-            successMessage = "Invoice updated successfully!";
-        }
-        catch (Exception ex)
-        {
-            errorMessage = $"Error updating invoice: {ex.Message}";
-        }
-        finally
-        {
-            isSubmitting = false;
-        }
-    }
-
-    private string GetStatusBadgeClass(string status)
-    {
-        return status switch
-        {
-            "Paid" => "bg-success",
-            "Pending" => "bg-warning",
-            "Overdue" => "bg-danger",
-            "Cancelled" => "bg-secondary",
-            _ => "bg-info"
-        };
-    }
-
-    private void ViewInvoice()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/invoices/{Id}");
-    }
-
-    private void ViewLease()
-    {
-        if (invoice?.LeaseId != null)
-        {
-            NavigationManager.NavigateTo($"/propertymanagement/leases/{invoice.LeaseId}");
-        }
-    }
-
-    private void RecordPayment()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/payments/create?invoiceId={Id}");
-    }
-
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/invoices");
-    }
-
-    public class InvoiceModel
-    {
-        [RequiredGuid(ErrorMessage = "Lease is required")]
-        public Guid LeaseId { get; set; }
-
-        [Required(ErrorMessage = "Invoice number is required")]
-        [StringLength(50, ErrorMessage = "Invoice number cannot exceed 50 characters")]
-        public string InvoiceNumber { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Invoice date is required")]
-        public DateTime InvoicedOn { get; set; }
-
-        [Required(ErrorMessage = "Due date is required")]
-        public DateTime DueOn { get; set; }
-
-        [Required(ErrorMessage = "Amount is required")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Amount must be greater than 0")]
-        public decimal Amount { get; set; }
-
-        [Required(ErrorMessage = "Description is required")]
-        [StringLength(100, ErrorMessage = "Description cannot exceed 100 characters")]
-        public string Description { get; set; } = string.Empty;
-
-        [Required]
-        [StringLength(50)]
-        public string Status { get; set; } = "Pending";
-
-        [Range(0, double.MaxValue, ErrorMessage = "Paid amount cannot be negative")]
-        public decimal AmountPaid { get; set; }
-
-        public DateTime? PaidOn { get; set; }
-
-        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
-        public string? Notes { get; set; }
-    }
+    [Parameter] public Guid Id { get; set; }
 }
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Index.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Index.razor
index 7f12872..e28d304 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Index.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/Index.razor
@@ -1,592 +1,5 @@
 @page "/propertymanagement/invoices"
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Forms
-@inject NavigationManager Navigation
-@inject InvoiceService InvoiceService
-@inject IJSRuntime JSRuntime
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Invoices - Property Management</PageTitle>
-
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <h1><span class="bi bi-receipt" aria-hidden="true"></span> Invoices</h1>
-    <button class="btn btn-primary" @onclick="CreateInvoice">
-        <i class="bi bi-plus-lg"></i> Create Invoice
-    </button>
-</div>
-
-@if (invoices == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!invoices.Any())
-{
-    <div class="alert alert-info">
-        <h4>No Invoices Found</h4>
-        <p>Get started by creating your first invoice.</p>
-        <button class="btn btn-primary" @onclick="CreateInvoice">Create First Invoice</button>
-    </div>
-}
-else
-{
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="input-group">
-                <span class="input-group-text"><i class="bi bi-search"></i></span>
-                <input type="text" class="form-control" placeholder="Search invoices..." @bind="searchTerm" @onkeyup="FilterInvoices" />
-            </div>
-        </div>
-        <div class="col-md-3">
-            <select class="form-select" @bind="selectedStatus" @bind:after="FilterInvoices">
-                <option value="">All Statuses</option>
-                <option value="Pending">Pending</option>
-                <option value="Paid">Paid</option>
-                <option value="Overdue">Overdue</option>
-                <option value="Cancelled">Cancelled</option>
-            </select>
-        </div>
-        <div class="col-md-3">
-            <div class="form-check form-switch pt-2">
-                <input class="form-check-input" type="checkbox" id="groupByProperty" @bind="groupByProperty" @bind:after="FilterInvoices">
-                <label class="form-check-label" for="groupByProperty">
-                    Group by Property
-                </label>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <button class="btn btn-outline-secondary" @onclick="ClearFilters">
-                <i class="bi bi-x-circle"></i> Clear Filters
-            </button>
-        </div>
-    </div>
-
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="card text-white bg-warning">
-                <div class="card-body">
-                    <h6>Pending</h6>
-                    <h4>@pendingCount</h4>
-                    <small>@pendingAmount.ToString("C")</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-success">
-                <div class="card-body">
-                    <h6>Paid</h6>
-                    <h4>@paidCount</h4>
-                    <small>@paidAmount.ToString("C")</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-danger">
-                <div class="card-body">
-                    <h6>Overdue</h6>
-                    <h4>@overdueCount</h4>
-                    <small>@overdueAmount.ToString("C")</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-info">
-                <div class="card-body">
-                    <h6>Total</h6>
-                    <h4>@filteredInvoices.Count</h4>
-                    <small>@totalAmount.ToString("C")</small>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="card">
-        <div class="card-body">
-            @if (groupByProperty)
-            {
-                @foreach (var propertyGroup in groupedInvoices)
-                {
-                    var property = propertyGroup.First().Lease?.Property;
-                    var propertyInvoiceCount = propertyGroup.Count();
-                    var propertyTotal = propertyGroup.Sum(i => i.Amount);
-                    var propertyBalance = propertyGroup.Sum(i => i.BalanceDue);
-                    var isExpanded = expandedProperties.Contains(propertyGroup.Key.GetHashCode());
-                    
-                    <div class="card mb-3">
-                        <div class="card-header" style="cursor: pointer;" @onclick="() => TogglePropertyGroup(propertyGroup.Key)">
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div>
-                                    <i class="bi @(isExpanded ? "bi-chevron-down" : "bi-chevron-right")"></i>
-                                    <strong>@property?.Address</strong>
-                                    <span class="ms-3 text-muted">@property?.City, @property?.State @property?.ZipCode</span>
-                                </div>
-                                <div>
-                                    <span class="badge bg-secondary me-2">@propertyInvoiceCount invoice(s)</span>
-                                    <span class="me-2">Total: <strong>@propertyTotal.ToString("C")</strong></span>
-                                    <span>Balance: <strong class="@(propertyBalance > 0 ? "text-danger" : "text-success")">@propertyBalance.ToString("C")</strong></span>
-                                </div>
-                            </div>
-                        </div>
-                        @if (isExpanded)
-                        {
-                            <div class="card-body p-0">
-                                <table class="table table-hover mb-0">
-                                    <thead class="table-light">
-                                        <tr>
-                                            <th>Invoice #</th>
-                                            <th>Tenant</th>
-                                            <th>Invoice Date</th>
-                                            <th>Due Date</th>
-                                            <th>Amount</th>
-                                            <th>Balance Due</th>
-                                            <th>Status</th>
-                                            <th>Actions</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach (var invoice in propertyGroup)
-                                        {
-                                            <tr @onclick="() => ViewInvoice(invoice.Id)" style="cursor: pointer;">
-                                                <td>
-                                                    <strong>@invoice.InvoiceNumber</strong>
-                                                    <br />
-                                                    <small class="text-muted">@invoice.Description</small>
-                                                </td>
-                                                <td>@invoice.Lease?.Tenant?.FullName</td>
-                                                <td>@invoice.InvoicedOn.ToString("MMM dd, yyyy")</td>
-                                                <td>
-                                                    @invoice.DueOn.ToString("MMM dd, yyyy")
-                                                    @if (invoice.IsOverdue)
-                                                    {
-                                                        <br />
-                                                        <small class="text-danger">@invoice.DaysOverdue days overdue</small>
-                                                    }
-                                                </td>
-                                                <td>@invoice.Amount.ToString("C")</td>
-                                                <td>
-                                                    <strong class="@(invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
-                                                        @invoice.BalanceDue.ToString("C")
-                                                    </strong>
-                                                </td>
-                                                <td>
-                                                    <span class="badge @GetStatusBadgeClass(invoice.Status)">
-                                                        @invoice.Status
-                                                    </span>
-                                                </td>
-                                                <td @onclick:stopPropagation="true">
-                                                    <div class="btn-group" role="group">
-                                                        <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewInvoice(invoice.Id)" title="View">
-                                                            <i class="bi bi-eye"></i>
-                                                        </button>
-                                                        <button class="btn btn-sm btn-outline-secondary" @onclick="() => EditInvoice(invoice.Id)" title="Edit">
-                                                            <i class="bi bi-pencil"></i>
-                                                        </button>
-                                                        <button class="btn btn-sm btn-outline-danger" @onclick="() => DeleteInvoice(invoice)" title="Delete">
-                                                            <i class="bi bi-trash"></i>
-                                                        </button>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                        }
-                                    </tbody>
-                                </table>
-                            </div>
-                        }
-                    </div>
-                }
-            }
-            else
-            {
-                <div class="table-responsive">
-                    <table class="table table-hover"><thead><tr>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Invoice.InvoiceNumber))">
-                                    Invoice #
-                                    @if (sortColumn == nameof(Invoice.InvoiceNumber))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick='() => SortBy("Property")'>
-                                    Property
-                                    @if (sortColumn == "Property")
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick='() => SortBy("Tenant")'>
-                                    Tenant
-                                    @if (sortColumn == "Tenant")
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Invoice.InvoicedOn))">
-                                    Invoice Date
-                                    @if (sortColumn == nameof(Invoice.InvoicedOn))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Invoice.DueOn))">
-                                    Due Date
-                                    @if (sortColumn == nameof(Invoice.DueOn))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Invoice.Amount))">
-                                    Amount
-                                    @if (sortColumn == nameof(Invoice.Amount))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>Balance Due</th>
-                            <th>Status</th>
-                            <th>Actions</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (var invoice in pagedInvoices)
-                        {
-                            <tr @onclick="() => ViewInvoice(invoice.Id)" style="cursor: pointer;">
-                                <td>
-                                    <strong>@invoice.InvoiceNumber</strong>
-                                    <br />
-                                    <small class="text-muted">@invoice.Description</small>
-                                </td>
-                                <td>@invoice.Lease?.Property?.Address</td>
-                                <td>@invoice.Lease?.Tenant?.FullName</td>
-                                <td>@invoice.InvoicedOn.ToString("MMM dd, yyyy")</td>
-                                <td>
-                                    @invoice.DueOn.ToString("MMM dd, yyyy")
-                                    @if (invoice.IsOverdue)
-                                    {
-                                        <br />
-                                        <small class="text-danger">@invoice.DaysOverdue days overdue</small>
-                                    }
-                                </td>
-                                <td>@invoice.Amount.ToString("C")</td>
-                                <td>
-                                    <strong class="@(invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
-                                        @invoice.BalanceDue.ToString("C")
-                                    </strong>
-                                </td>
-                                <td>
-                                    <span class="badge @GetStatusBadgeClass(invoice.Status)">
-                                        @invoice.Status
-                                    </span>
-                                </td>
-                                <td @onclick:stopPropagation="true">
-                                    <div class="btn-group" role="group">
-                                        <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewInvoice(invoice.Id)" title="View">
-                                            <i class="bi bi-eye"></i>
-                                        </button>
-                                        <button class="btn btn-sm btn-outline-secondary" @onclick="() => EditInvoice(invoice.Id)" title="Edit">
-                                            <i class="bi bi-pencil"></i>
-                                        </button>
-                                        <button class="btn btn-sm btn-outline-danger" @onclick="() => DeleteInvoice(invoice)" title="Delete">
-                                            <i class="bi bi-trash"></i>
-                                        </button>
-                                    </div>
-                                </td>
-                            </tr>
-                        }
-                    </tbody>
-                </table>
-            </div>
-            }
-
-            @if (totalPages > 1 && !groupByProperty)
-            {
-                <div class="d-flex justify-content-between align-items-center mt-3">
-                    <div>
-                        <select class="form-select form-select-sm" @bind="pageSize" @bind:after="UpdatePagination">
-                            <option value="10">10 per page</option>
-                            <option value="20">20 per page</option>
-                            <option value="50">50 per page</option>
-                            <option value="100">100 per page</option>
-                        </select>
-                    </div>
-                    <div class="text-muted">
-                        Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords invoices
-                    </div>
-                    <nav>
-                        <ul class="pagination pagination-sm mb-0">
-                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                <button class="page-link" @onclick="FirstPage" disabled="@(currentPage == 1)">
-                                    <i class="bi bi-chevron-double-left"></i>
-                                </button>
-                            </li>
-                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                <button class="page-link" @onclick="PreviousPage" disabled="@(currentPage == 1)">
-                                    <i class="bi bi-chevron-left"></i>
-                                </button>
-                            </li>
-                            @for (int i = Math.Max(1, currentPage - 2); i <= Math.Min(totalPages, currentPage + 2); i++)
-                            {
-                                var pageNum = i;
-                                <li class="page-item @(currentPage == pageNum ? "active" : "")">
-                                    <button class="page-link" @onclick="() => GoToPage(pageNum)">@pageNum</button>
-                                </li>
-                            }
-                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                <button class="page-link" @onclick="NextPage" disabled="@(currentPage == totalPages)">
-                                    <i class="bi bi-chevron-right"></i>
-                                </button>
-                            </li>
-                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                <button class="page-link" @onclick="LastPage" disabled="@(currentPage == totalPages)">
-                                    <i class="bi bi-chevron-double-right"></i>
-                                </button>
-                            </li>
-                        </ul>
-                    </nav>
-                </div>
-            }
-        </div>
-    </div>
-}
-
-@code {
-    private List<Invoice>? invoices;
-    private List<Invoice> filteredInvoices = new();
-    private List<Invoice> pagedInvoices = new();
-    private IEnumerable<IGrouping<Guid, Invoice>> groupedInvoices = Enumerable.Empty<IGrouping<Guid, Invoice>>();
-    private HashSet<int> expandedProperties = new();
-    private string searchTerm = string.Empty;
-    private string selectedStatus = string.Empty;
-    private string sortColumn = nameof(Invoice.DueOn);
-    private bool sortAscending = false;
-    private bool groupByProperty = true;
-    
-    private int pendingCount = 0;
-    private int paidCount = 0;
-    private int overdueCount = 0;
-    private decimal pendingAmount = 0;
-    private decimal paidAmount = 0;
-    private decimal overdueAmount = 0;
-    private decimal totalAmount = 0;
-    
-    private int currentPage = 1;
-    private int pageSize = 20;
-    private int totalPages = 1;
-    private int totalRecords = 0;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? LeaseId { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadInvoices();
-    }
-
-    private async Task LoadInvoices()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (!string.IsNullOrEmpty(userId))
-        {
-            invoices = await InvoiceService.GetAllAsync();
-            if (LeaseId.HasValue)
-            {
-                invoices = invoices.Where(i => i.LeaseId == LeaseId.Value).ToList();
-            }
-            FilterInvoices();
-            UpdateStatistics();
-        }
-    }
-
-    private void FilterInvoices()
-    {
-        if (invoices == null) return;
-
-        filteredInvoices = invoices.Where(i =>
-        {
-            bool matchesSearch = string.IsNullOrWhiteSpace(searchTerm) ||
-                i.InvoiceNumber.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-                (i.Lease?.Property?.Address?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ?? false) ||
-                (i.Lease?.Tenant?.FullName?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ?? false) ||
-                i.Description.Contains(searchTerm, StringComparison.OrdinalIgnoreCase);
-
-            bool matchesStatus = string.IsNullOrWhiteSpace(selectedStatus) ||
-                i.Status.Equals(selectedStatus, StringComparison.OrdinalIgnoreCase);
-
-            return matchesSearch && matchesStatus;
-        }).ToList();
-
-        SortInvoices();
-        
-        if (groupByProperty)
-        {
-            groupedInvoices = filteredInvoices
-                .Where(i => i.Lease?.PropertyId != null)
-                .GroupBy(i => i.Lease!.PropertyId)
-                .OrderBy(g => g.First().Lease?.Property?.Address)
-                .ToList();
-        }
-        else
-        {
-            UpdatePagination();
-        }
-    }
-    
-    private void TogglePropertyGroup(Guid propertyId)
-    {
-        if (expandedProperties.Contains(propertyId.GetHashCode()))
-        {
-            expandedProperties.Remove(propertyId.GetHashCode());
-        }
-        else
-        {
-            expandedProperties.Add(propertyId.GetHashCode());
-        }
-    }
-
-    private void SortBy(string column)
-    {
-        if (sortColumn == column)
-        {
-            sortAscending = !sortAscending;
-        }
-        else
-        {
-            sortColumn = column;
-            sortAscending = true;
-        }
-        SortInvoices();
-        UpdatePagination();
-    }
-
-    private void SortInvoices()
-    {
-        filteredInvoices = sortColumn switch
-        {
-            nameof(Invoice.InvoiceNumber) => sortAscending
-                ? filteredInvoices.OrderBy(i => i.InvoiceNumber).ToList()
-                : filteredInvoices.OrderByDescending(i => i.InvoiceNumber).ToList(),
-            "Property" => sortAscending
-                ? filteredInvoices.OrderBy(i => i.Lease?.Property?.Address).ToList()
-                : filteredInvoices.OrderByDescending(i => i.Lease?.Property?.Address).ToList(),
-            "Tenant" => sortAscending
-                ? filteredInvoices.OrderBy(i => i.Lease?.Tenant?.FullName).ToList()
-                : filteredInvoices.OrderByDescending(i => i.Lease?.Tenant?.FullName).ToList(),
-            nameof(Invoice.InvoicedOn) => sortAscending
-                ? filteredInvoices.OrderBy(i => i.InvoicedOn).ToList()
-                : filteredInvoices.OrderByDescending(i => i.InvoicedOn).ToList(),
-            nameof(Invoice.DueOn) => sortAscending
-                ? filteredInvoices.OrderBy(i => i.DueOn).ToList()
-                : filteredInvoices.OrderByDescending(i => i.DueOn).ToList(),
-            nameof(Invoice.Amount) => sortAscending
-                ? filteredInvoices.OrderBy(i => i.Amount).ToList()
-                : filteredInvoices.OrderByDescending(i => i.Amount).ToList(),
-            _ => filteredInvoices.OrderByDescending(i => i.DueOn).ToList()
-        };
-    }
-
-    private void UpdateStatistics()
-    {
-        if (invoices == null) return;
-
-        pendingCount = invoices.Count(i => i.Status == "Pending");
-        paidCount = invoices.Count(i => i.Status == "Paid");
-        overdueCount = invoices.Count(i => i.IsOverdue && i.Status != "Paid");
-        
-        pendingAmount = invoices.Where(i => i.Status == "Pending").Sum(i => i.BalanceDue);
-        paidAmount = invoices.Where(i => i.Status == "Paid").Sum(i => i.Amount);
-        overdueAmount = invoices.Where(i => i.IsOverdue && i.Status != "Paid").Sum(i => i.BalanceDue);
-        totalAmount = invoices.Sum(i => i.Amount);
-    }
-
-    private void UpdatePagination()
-    {
-        totalRecords = filteredInvoices.Count;
-        totalPages = (int)Math.Ceiling(totalRecords / (double)pageSize);
-        currentPage = Math.Min(currentPage, Math.Max(1, totalPages));
-        
-        pagedInvoices = filteredInvoices
-            .Skip((currentPage - 1) * pageSize)
-            .Take(pageSize)
-            .ToList();
-    }
-
-    private void ClearFilters()
-    {
-        searchTerm = string.Empty;
-        selectedStatus = string.Empty;
-        groupByProperty = false;
-        FilterInvoices();
-    }
-
-    private void FirstPage() => GoToPage(1);
-    private void LastPage() => GoToPage(totalPages);
-    private void NextPage() => GoToPage(currentPage + 1);
-    private void PreviousPage() => GoToPage(currentPage - 1);
-    
-    private void GoToPage(int page)
-    {
-        currentPage = Math.Max(1, Math.Min(page, totalPages));
-        UpdatePagination();
-    }
-
-    private string GetStatusBadgeClass(string status)
-    {
-        return status switch
-        {
-            "Paid" => "bg-success",
-            "Pending" => "bg-warning",
-            "Overdue" => "bg-danger",
-            "Cancelled" => "bg-secondary",
-            _ => "bg-info"
-        };
-    }
-
-    private void CreateInvoice()
-    {
-        Navigation.NavigateTo("/propertymanagement/invoices/create");
-    }
-
-    private void ViewInvoice(Guid id)
-    {
-        Navigation.NavigateTo($"/propertymanagement/invoices/{id}");
-    }
-
-    private void EditInvoice(Guid id)
-    {
-        Navigation.NavigateTo($"/propertymanagement/invoices/{id}/edit");
-    }
-
-    private async Task DeleteInvoice(Invoice invoice)
-    {
-        if (await JSRuntime.InvokeAsync<bool>("confirm", $"Are you sure you want to delete invoice {invoice.InvoiceNumber}?"))
-        {
-            await InvoiceService.DeleteAsync(invoice.Id);
-            await LoadInvoices();
-        }
-    }
-}
\ No newline at end of file
+<Aquiis.UI.Shared.Features.PropertyManagement.Invoices.ListForm />
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/View.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/View.razor
index bb72d9b..f9b3fc8 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/View.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Invoices/Pages/View.razor
@@ -1,408 +1,9 @@
-@page "/propertymanagement/invoices/view/{Id:guid}"
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@inject NavigationManager NavigationManager
-@inject InvoiceService InvoiceService
-@inject Application.Services.DocumentService DocumentService
-@inject UserContextService UserContextService
-@inject IJSRuntime JSRuntime
-
+@page "/propertymanagement/invoices/{Id:guid}"
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>View Invoice - Property Management</PageTitle>
-
-@if (invoice == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else
-{
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <h1><i class="bi bi-receipt"></i> Invoice Details</h1>
-        <div>
-            <button class="btn btn-outline-secondary" @onclick="BackToList">
-                <i class="bi bi-arrow-left"></i> Back to List
-            </button>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-md-8">
-            <div class="card mb-3">
-                <div class="card-header d-flex justify-content-between align-items-center">
-                    <h5 class="mb-0">Invoice Information</h5>
-                    <span class="badge @GetStatusBadgeClass(invoice.Status) fs-6">@invoice.Status</span>
-                </div>
-                <div class="card-body">
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <div class="mb-3">
-                                <label class="text-muted small">Invoice Number</label>
-                                <div class="fw-bold fs-5">@invoice.InvoiceNumber</div>
-                            </div>
-                            <div class="mb-3">
-                                <label class="text-muted small">Invoice Date</label>
-                                <div>@invoice.InvoicedOn.ToString("MMMM dd, yyyy")</div>
-                            </div>
-                            <div class="mb-3">
-                                <label class="text-muted small">Description</label>
-                                <div>@invoice.Description</div>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <div class="mb-3">
-                                <label class="text-muted small">Due Date</label>
-                                <div class="@(invoice.IsOverdue ? "text-danger fw-bold" : "")">
-                                    @invoice.DueOn.ToString("MMMM dd, yyyy")
-                                    @if (invoice.IsOverdue)
-                                    {
-                                        <br />
-                                        <small>(@invoice.DaysOverdue days overdue)</small>
-                                    }
-                                </div>
-                            </div>
-                            <div class="mb-3">
-                                <label class="text-muted small">Created Date</label>
-                                <div>@invoice.CreatedOn.ToString("MMMM dd, yyyy")</div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <hr />
-
-                    <div class="row">
-                        <div class="col-md-4">
-                            <div class="mb-3">
-                                <label class="text-muted small">Invoice Amount</label>
-                                <div class="fw-bold fs-4">@invoice.Amount.ToString("C")</div>
-                            </div>
-                        </div>
-                        <div class="col-md-4">
-                            <div class="mb-3">
-                                <label class="text-muted small">Paid Amount</label>
-                                <div class="fw-bold fs-4 text-success">@invoice.AmountPaid.ToString("C")</div>
-                            </div>
-                        </div>
-                        <div class="col-md-4">
-                            <div class="mb-3">
-                                <label class="text-muted small">Balance Due</label>
-                                <div class="fw-bold fs-4 @(invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
-                                    @invoice.BalanceDue.ToString("C")
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    @if (invoice.PaidOn.HasValue)
-                    {
-                        <div class="mb-3">
-                            <label class="text-muted small">Paid Date</label>
-                            <div>@invoice.PaidOn.Value.ToString("MMMM dd, yyyy")</div>
-                        </div>
-                    }
-
-                    @if (!string.IsNullOrWhiteSpace(invoice.Notes))
-                    {
-                        <hr />
-                        <div class="mb-3">
-                            <label class="text-muted small">Notes</label>
-                            <div class="border p-2 rounded bg-light">@invoice.Notes</div>
-                        </div>
-                    }
-                </div>
-            </div>
-
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Lease Information</h5>
-                </div>
-                <div class="card-body">
-                    @if (invoice.Lease != null)
-                    {
-                        <div class="row">
-                            <div class="col-md-6">
-                                <div class="mb-3">
-                                    <label class="text-muted small">Property</label>
-                                    <div>
-                                        <a href="/propertymanagement/properties/@invoice.Lease.PropertyId" class="text-decoration-none">
-                                            @invoice.Lease.Property?.Address
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="mb-3">
-                                    <label class="text-muted small">Lease Period</label>
-                                    <div>
-                                        @invoice.Lease.StartDate.ToString("MMM dd, yyyy") - 
-                                        @invoice.Lease.EndDate.ToString("MMM dd, yyyy")
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-6">
-                                <div class="mb-3">
-                                    <label class="text-muted small">Tenant</label>
-                                    <div>
-                                        <a href="/propertymanagement/tenants/@invoice.Lease.TenantId" class="text-decoration-none">
-                                            @invoice.Lease.Tenant?.FullName
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="mb-3">
-                                    <label class="text-muted small">Monthly Rent</label>
-                                    <div>@invoice.Lease.MonthlyRent.ToString("C")</div>
-                                </div>
-                            </div>
-                        </div>
-                    }
-                </div>
-            </div>
-
-            @if (invoice.Payments != null && invoice.Payments.Any())
-            {
-                <div class="card">
-                    <div class="card-header">
-                        <h5 class="mb-0">Payment History</h5>
-                    </div>
-                    <div class="card-body">
-                        <div class="table-responsive">
-                            <table class="table table-sm">
-                                <thead>
-                                    <tr>
-                                        <th>Date</th>
-                                        <th>Amount</th>
-                                        <th>Method</th>
-                                        <th>Notes</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    @foreach (var payment in invoice.Payments.OrderByDescending(p => p.PaidOn))
-                                    {
-                                        <tr>
-                                            <td>@payment.PaidOn.ToString("MMM dd, yyyy")</td>
-                                            <td>@payment.Amount.ToString("C")</td>
-                                            <td>@payment.PaymentMethod</td>
-                                            <td>@payment.Notes</td>
-                                        </tr>
-                                    }
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            }
-        </div>
-
-        <div class="col-md-4">
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Quick Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="EditInvoice">
-                            <i class="bi bi-pencil"></i> Edit Invoice
-                        </button>
-                        @if (invoice.Status != "Paid" && invoice.BalanceDue > 0)
-                        {
-                            <button class="btn btn-outline-success" @onclick="RecordPayment">
-                                <i class="bi bi-cash"></i> Record Payment
-                            </button>
-                        }
-                        <button class="btn btn-outline-info" @onclick="ViewLease">
-                            <i class="bi bi-file-text"></i> View Lease
-                        </button>
-                        @if (invoice.DocumentId == null)
-                        {
-                            <button class="btn btn-outline-secondary" @onclick="GenerateInvoicePdf" disabled="@isGenerating">
-                                @if (isGenerating)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-1" role="status"></span>
-                                }
-                                else
-                                {
-                                    <i class="bi bi-file-pdf"></i>
-                                }
-                                Generate PDF
-                            </button>
-                        }
-                        else
-                        {
-                            <button class="btn btn-primary" @onclick="ViewDocument">
-                                <i class="bi bi-eye"></i> View PDF
-                            </button>
-                            <button class="btn btn-outline-primary" @onclick="DownloadDocument">
-                                <i class="bi bi-download"></i> Download PDF
-                            </button>
-                        }
-                    </div>
-                </div>
-            </div>
-
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Metadata</h5>
-                </div>
-                <div class="card-body">
-                    <div class="mb-2">
-                        <small class="text-muted">Created By:</small>
-                        <div>@(!string.IsNullOrEmpty(invoice.CreatedBy) ? invoice.CreatedBy : "System")</div>
-                    </div>
-                    @if (invoice.LastModifiedOn.HasValue)
-                    {
-                        <div class="mb-2">
-                            <small class="text-muted">Last Modified:</small>
-                            <div>@invoice.LastModifiedOn.Value.ToString("MMM dd, yyyy h:mm tt")</div>
-                        </div>
-                        <div class="mb-2">
-                            <small class="text-muted">Modified By:</small>
-                            <div>@(!string.IsNullOrEmpty(invoice.LastModifiedBy) ? invoice.LastModifiedBy : "System")</div>
-                        </div>
-                    }
-                </div>
-            </div>
-        </div>
-    </div>
-}
+<Aquiis.UI.Shared.Features.PropertyManagement.Invoices.ViewForm InvoiceId="@Id" />
 
 @code {
-    [Parameter]
-    public Guid Id { get; set; }
-
-    private Invoice? invoice;
-    private bool isGenerating = false;
-    private Document? document = null;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadInvoice();
-    }
-
-    private async Task LoadInvoice()
-    {
-        invoice = await InvoiceService.GetByIdAsync(Id);
-        
-        // Load the document if it exists
-        if (invoice?.DocumentId != null)
-        {
-            document = await DocumentService.GetByIdAsync(invoice.DocumentId.Value);
-        }
-    }
-
-    private string GetStatusBadgeClass(string status)
-    {
-        return status switch
-        {
-            "Paid" => "bg-success",
-            "Pending" => "bg-warning",
-            "Overdue" => "bg-danger",
-            "Cancelled" => "bg-secondary",
-            _ => "bg-info"
-        };
-    }
-
-    private void BackToList()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/invoices");
-    }
-
-    private void EditInvoice()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/invoices/{Id}/edit");
-    }
-
-    private void RecordPayment()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/payments/create?invoiceId={Id}");
-    }
-
-    private void ViewLease()
-    {
-        if (invoice?.LeaseId != null)
-        {
-            NavigationManager.NavigateTo($"/propertymanagement/leases/{invoice.LeaseId}");
-        }
-    }
-
-    private async Task ViewDocument()
-    {
-        if (document != null)
-        {
-            var base64Data = Convert.ToBase64String(document.FileData);
-            await JSRuntime.InvokeVoidAsync("viewFile", base64Data, document.FileType);
-        }
-    }
-
-    private async Task DownloadDocument()
-    {
-        if (document != null)
-        {
-            var fileName = document.FileName;
-            var fileData = document.FileData;
-            var mimeType = document.FileType;
-
-            await JSRuntime.InvokeVoidAsync("downloadFile", fileName, Convert.ToBase64String(fileData), mimeType);
-        }
-    }
-
-    private async Task GenerateInvoicePdf()
-    {
-        isGenerating = true;
-        StateHasChanged();
-
-        try
-        {
-            // Generate the PDF
-            byte[] pdfBytes = Aquiis.Application.Services.PdfGenerators.InvoicePdfGenerator.GenerateInvoicePdf(invoice!);
-
-            // Create the document entity
-            var document = new Document
-            {
-                FileName = $"Invoice_{invoice!.InvoiceNumber?.Replace(" ", "_")}_{DateTime.Now:yyyyMMdd}.pdf",
-                FileExtension = ".pdf",
-                FileData = pdfBytes,
-                FileSize = pdfBytes.Length,
-                FileType = "application/pdf",
-                ContentType = "application/pdf",
-                DocumentType = "Invoice",
-                Description = $"Invoice {invoice.InvoiceNumber}",
-                LeaseId = invoice.LeaseId,
-                PropertyId = invoice.Lease?.PropertyId,
-                TenantId = invoice.Lease?.TenantId,
-                IsDeleted = false
-            };
-
-            // Save to database
-            await DocumentService.CreateAsync(document);
-
-            // Update invoice with DocumentId
-            invoice.DocumentId = document.Id;
-            
-            await InvoiceService.UpdateAsync(invoice);
-
-            // Reload invoice and document
-            await LoadInvoice();
-            StateHasChanged();
-
-            await JSRuntime.InvokeVoidAsync("alert", "Invoice PDF generated successfully!");
-        }
-        catch (Exception ex)
-        {
-            await JSRuntime.InvokeVoidAsync("alert", $"Error generating invoice PDF: {ex.Message}");
-        }
-        finally
-        {
-            isGenerating = false;
-            StateHasChanged();
-        }
-    }
+    [Parameter] public Guid Id { get; set; }
 }
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Create.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Create.razor
index 3e6b16b..bc6dbce 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Create.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Create.razor
@@ -1,383 +1,5 @@
 @page "/propertymanagement/leases/create"
-
-@using Aquiis.Core.Entities
-@using Aquiis.Core.Constants
-@using Aquiis.Core.Validation
-@using Microsoft.AspNetCore.Components
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Authorization
-@using System.ComponentModel.DataAnnotations
-
-@inject NavigationManager Navigation
-@inject OrganizationService OrganizationService
-@inject LeaseService LeaseService
-@inject PropertyService PropertyService
-@inject TenantService TenantService
-
-@inject AuthenticationStateProvider AuthenticationStateProvider
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Create Lease</PageTitle>
-
-<div class="row">
-    <div class="col-md-8">
-        <div class="card">
-            <div class="card-header">
-                <h3 class="card-title mb-0">Create New Lease</h3>
-            </div>
-            <div class="card-body">
-                <EditForm Model="leaseModel" OnValidSubmit="HandleValidSubmit" FormName="create-lease">
-                    <DataAnnotationsValidator />
-                    <ValidationSummary class="text-danger mb-3" />
-                    
-                    @if (!string.IsNullOrEmpty(errorMessage))
-                    {
-                        <div class="alert alert-danger" role="alert">
-                            @errorMessage
-                        </div>
-                    }
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Property *</label>
-                            <InputSelect @bind-Value="leaseModel.PropertyId" class="form-select" @onchange="@(async () => await OnPropertyChanged())">
-                                <option value="">Select a property</option>
-                                @foreach (var property in availableProperties)
-                                {
-                                    <option value="@property.Id">@property.Address (@property.City)</option>
-                                }
-                            </InputSelect>
-                            <ValidationMessage For="() => leaseModel.PropertyId" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Tenant *</label>
-                            <InputSelect @bind-Value="leaseModel.TenantId" class="form-select">
-                                <option value="">Select a tenant</option>
-                                @foreach (var tenant in userTenants)
-                                {
-                                    <option value="@tenant.Id">@tenant.FullName (@tenant.Email)</option>
-                                }
-                            </InputSelect>
-                            <ValidationMessage For="() => leaseModel.TenantId" class="text-danger" />
-                        </div>
-                    </div>
-
-                    @if (selectedProperty != null)
-                    {
-                        <div class="alert alert-info">
-                            <strong>Selected Property:</strong> @selectedProperty.Address<br />
-                            <strong>Monthly Rent:</strong> @selectedProperty.MonthlyRent.ToString("C")
-                        </div>
-                    }
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Start Date *</label>
-                            <InputDate @bind-Value="leaseModel.StartDate" class="form-control" />
-                            <ValidationMessage For="() => leaseModel.StartDate" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">End Date *</label>
-                            <InputDate @bind-Value="leaseModel.EndDate" class="form-control" />
-                            <ValidationMessage For="() => leaseModel.EndDate" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Monthly Rent *</label>
-                            <InputNumber @bind-Value="leaseModel.MonthlyRent" class="form-control" placeholder="0.00" />
-                            <ValidationMessage For="() => leaseModel.MonthlyRent" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Security Deposit</label>
-                            <InputNumber @bind-Value="leaseModel.SecurityDeposit" class="form-control" placeholder="0.00" />
-                            <ValidationMessage For="() => leaseModel.SecurityDeposit" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Status</label>
-                            <InputSelect @bind-Value="leaseModel.Status" class="form-select">
-                                @foreach (var status in ApplicationConstants.LeaseStatuses.AllLeaseStatuses)
-                                {
-                                    <option value="@status">@status</option>
-                                }
-                            </InputSelect>
-                            <ValidationMessage For="() => leaseModel.Status" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-12 mb-3">
-                            <label class="form-label">Lease Terms</label>
-                            <InputTextArea @bind-Value="leaseModel.Terms" class="form-control" rows="4" placeholder="Enter lease terms and conditions" />
-                            <ValidationMessage For="() => leaseModel.Terms" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-12 mb-3">
-                            <label class="form-label">Notes</label>
-                            <InputTextArea @bind-Value="leaseModel.Notes" class="form-control" rows="3" placeholder="Additional notes" />
-                            <ValidationMessage For="() => leaseModel.Notes" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="d-flex gap-2">
-                        <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                            }
-                            Create Lease
-                        </button>
-                        <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
-                    </div>
-                </EditForm>
-            </div>
-        </div>
-    </div>
-
-    <div class="col-md-4">
-        <div class="card">
-            <div class="card-header">
-                <h5 class="mb-0">Quick Actions</h5>
-            </div>
-            <div class="card-body">
-                <div class="d-grid gap-2">
-                    <button class="btn btn-outline-primary" @onclick="CreateTenant">
-                        <i class="bi bi-person-plus"></i> Add New Tenant
-                    </button>
-                </div>
-            </div>
-        </div>
-
-        @if (selectedProperty != null)
-        {
-            <div class="card mt-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Property Details</h5>
-                </div>
-                <div class="card-body">
-                    <p><strong>Address:</strong> @selectedProperty.Address</p>
-                    <p><strong>Type:</strong> @selectedProperty.PropertyType</p>
-                    <p><strong>Bedrooms:</strong> @selectedProperty.Bedrooms</p>
-                    <p><strong>Bathrooms:</strong> @selectedProperty.Bathrooms</p>
-                    <p><strong>Square Feet:</strong> @selectedProperty.SquareFeet.ToString("N0")</p>
-                </div>
-            </div>
-        }
-    </div>
-</div>
-
-@code {
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? PropertyId { get; set; }
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? TenantId { get; set; }
-
-    private LeaseModel leaseModel = new();
-    private List<Property> availableProperties = new();
-    private List<Tenant> userTenants = new();
-    private Property? selectedProperty;
-    private bool isSubmitting = false;
-    private string errorMessage = string.Empty;
-
-        [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadData();
-        
-        // If PropertyId is provided in query string, pre-select it
-        if (PropertyId.HasValue)
-        {
-            leaseModel.PropertyId = PropertyId.Value;
-            await OnPropertyChanged();
-        }
-        
-        // If TenantId is provided in query string, pre-select it
-        if (TenantId.HasValue)
-        {
-            leaseModel.TenantId = TenantId.Value;
-        }
-    }
-
-    private async Task LoadData()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (string.IsNullOrEmpty(userId))
-            return;
-
-        // Load available properties (only available ones)
-        List<Property>? allProperties = await PropertyService.GetAllAsync();
-
-        availableProperties = allProperties
-            .Where(p => p.IsAvailable)
-            .ToList() ?? new List<Property>();
-
-        // Load user's tenants
-        userTenants = await TenantService.GetAllAsync();
-        userTenants = userTenants
-            .Where(t => t.IsActive)
-            .ToList();
-
-        // Set default values
-        leaseModel.StartDate = DateTime.Today;
-        leaseModel.EndDate = DateTime.Today.AddYears(1);
-        leaseModel.Status = ApplicationConstants.LeaseStatuses.Active;
-    }
-
-    private async Task OnPropertyChanged()
-    {
-        if (leaseModel.PropertyId != Guid.Empty)
-        {
-            selectedProperty = availableProperties.FirstOrDefault(p => p.Id == leaseModel.PropertyId);
-            if (selectedProperty != null)
-            {
-                // Get organization settings for security deposit calculation
-                var settings = await OrganizationService.GetOrganizationSettingsAsync();
-                var depositMultiplier = settings?.AutoCalculateSecurityDeposit == true 
-                    ? settings.SecurityDepositMultiplier 
-                    : 1.0m;
-
-                leaseModel.PropertyAddress = selectedProperty.Address;
-                leaseModel.MonthlyRent = selectedProperty.MonthlyRent;
-                leaseModel.SecurityDeposit = selectedProperty.MonthlyRent * depositMultiplier;
-            }
-        }
-        else
-        {
-            selectedProperty = null;
-        }
-        StateHasChanged();
-    }
-
-    private async Task HandleValidSubmit()
-    {
-        try
-        {
-            isSubmitting = true;
-            errorMessage = string.Empty;
-
-            var authState = await AuthenticationStateTask;
-            var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-            if (string.IsNullOrEmpty(userId))
-            {
-                errorMessage = "User not authenticated.";
-                return;
-            }
-
-            // Verify property and tenant belong to user
-            var property = await PropertyService.GetByIdAsync(leaseModel.PropertyId);
-            var tenant = await TenantService.GetByIdAsync(leaseModel.TenantId);
-
-            if (property == null)
-            {
-                errorMessage = $"Property with ID {leaseModel.PropertyId} not found or access denied.";
-                return;
-            }
-
-            if (tenant == null)
-            {
-                errorMessage = $"Tenant with ID {leaseModel.TenantId} not found or access denied.";
-                return;
-            }
-
-            var lease = new Lease
-            {
-                
-                PropertyId = leaseModel.PropertyId,
-                TenantId = leaseModel.TenantId,
-                StartDate = leaseModel.StartDate,
-                EndDate = leaseModel.EndDate,
-                MonthlyRent = leaseModel.MonthlyRent,
-                SecurityDeposit = leaseModel.SecurityDeposit,
-                Status = leaseModel.Status,
-                Terms = leaseModel.Terms,
-                Notes = leaseModel.Notes
-            };
-
-            await LeaseService.CreateAsync(lease);
-
-            // Mark property as unavailable if lease is active
-            if (leaseModel.Status == ApplicationConstants.LeaseStatuses.Active)
-            {
-                property.IsAvailable = false;
-            }
-
-            await PropertyService.UpdateAsync(property);
-
-            Navigation.NavigateTo("/propertymanagement/leases");
-        }
-        catch (Exception ex)
-        {
-            errorMessage = $"Error creating lease: {ex.Message}";
-            if (ex.InnerException != null)
-            {
-                errorMessage += $" Inner Exception: {ex.InnerException.Message}";
-            }
-        }
-        finally
-        {
-            isSubmitting = false;
-        }
-    }
-
-    private void CreateTenant()
-    {
-        Navigation.NavigateTo("/propertymanagement/tenants/create");
-    }
-
-    private void Cancel()
-    {
-        Navigation.NavigateTo("/propertymanagement/leases");
-    }
-
-    public class LeaseModel
-    {
-        [RequiredGuid(ErrorMessage = "Property is required")]
-        public Guid PropertyId { get; set; }
-
-        public string PropertyAddress { get; set; } = string.Empty;
-
-        [RequiredGuid(ErrorMessage = "Tenant is required")]
-        public Guid TenantId { get; set; }
-
-        [Required(ErrorMessage = "Start date is required")]
-        public DateTime StartDate { get; set; } = DateTime.Today;
-
-        [Required(ErrorMessage = "End date is required")]
-        public DateTime EndDate { get; set; } = DateTime.Today.AddYears(1);
-
-        [Required(ErrorMessage = "Monthly rent is required")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Monthly rent must be greater than 0")]
-        public decimal MonthlyRent { get; set; }
-
-        [Range(0, double.MaxValue, ErrorMessage = "Security deposit cannot be negative")]
-        public decimal SecurityDeposit { get; set; }
-
-        [Required(ErrorMessage = "Status is required")]
-        [StringLength(50)]
-        public string Status { get; set; } = ApplicationConstants.LeaseStatuses.Active;
-
-        [StringLength(1000, ErrorMessage = "Terms cannot exceed 1000 characters")]
-        public string Terms { get; set; } = string.Empty;
-
-        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
-        public string Notes { get; set; } = string.Empty;
-    }
-}
\ No newline at end of file
+<Aquiis.UI.Shared.Features.PropertyManagement.Leases.CreateForm />
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Edit.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Edit.razor
index fd234a1..869e570 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Edit.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Edit.razor
@@ -1,357 +1,9 @@
-@page "/propertymanagement/leases/edit/{Id:guid}"
-
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components
-@using Microsoft.AspNetCore.Components.Web
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using System.ComponentModel.DataAnnotations
-
-@inject NavigationManager Navigation
-@inject LeaseService LeaseService
-@inject UserContextService UserContextService
-
+@page "/propertymanagement/leases/{Id:guid}/edit"
+@attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-
-@if (lease == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!isAuthorized)
-{
-    <div class="alert alert-danger">
-        <h4>Access Denied</h4>
-        <p>You don't have permission to edit this lease.</p>
-        <a href="/leases" class="btn btn-primary">Back to Leases</a>
-    </div>
-}
-else
-{
-    <div class="row">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">
-                    <h3 class="card-title mb-0">Edit Lease</h3>
-                </div>
-                <div class="card-body">
-                    <EditForm Model="leaseModel" OnValidSubmit="UpdateLease" FormName="edit-lease">
-                        <DataAnnotationsValidator />
-                        
-                        @if (!string.IsNullOrEmpty(errorMessage))
-                        {
-                            <div class="alert alert-danger" role="alert">
-                                @errorMessage
-                            </div>
-                        }
-
-                        @if (!string.IsNullOrEmpty(successMessage))
-                        {
-                            <div class="alert alert-success" role="alert">
-                                @successMessage
-                            </div>
-                        }
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Property</label>
-                                <input type="text" class="form-control" value="@lease.Property?.Address" readonly />
-                                <small class="text-muted">Property cannot be changed for existing lease</small>
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Tenant</label>
-                                <input type="text" class="form-control" value="@lease.Tenant?.FullName" readonly />
-                                <small class="text-muted">Tenant cannot be changed for existing lease</small>
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Start Date *</label>
-                                <InputDate @bind-Value="leaseModel.StartDate" class="form-control" />
-                                <ValidationMessage For="() => leaseModel.StartDate" class="text-danger" />
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">End Date *</label>
-                                <InputDate @bind-Value="leaseModel.EndDate" class="form-control" />
-                                <ValidationMessage For="() => leaseModel.EndDate" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Monthly Rent *</label>
-                                <InputNumber @bind-Value="leaseModel.MonthlyRent" class="form-control" placeholder="0.00" />
-                                <ValidationMessage For="() => leaseModel.MonthlyRent" class="text-danger" />
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Security Deposit</label>
-                                <InputNumber @bind-Value="leaseModel.SecurityDeposit" class="form-control" placeholder="0.00" />
-                                <ValidationMessage For="() => leaseModel.SecurityDeposit" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Status *</label>
-                                <InputSelect @bind-Value="leaseModel.Status" class="form-select" @onchange="OnStatusChanged">
-                                    <option value="Active">Active</option>
-                                    <option value="Pending">Pending</option>
-                                    <option value="Expired">Expired</option>
-                                    <option value="Terminated">Terminated</option>
-                                </InputSelect>
-                                <ValidationMessage For="() => leaseModel.Status" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <label class="form-label">Lease Terms</label>
-                                <InputTextArea @bind-Value="leaseModel.Terms" class="form-control" rows="4" placeholder="Enter lease terms and conditions" />
-                                <ValidationMessage For="() => leaseModel.Terms" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <NotesTimeline EntityType="Lease" EntityId="@lease.Id" />
-                            </div>
-                        </div>
-
-                        <div class="d-flex gap-2">
-                            <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                                @if (isSubmitting)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                                }
-                                Update Lease
-                            </button>
-                            <button type="button" class="btn btn-secondary" @onclick="ViewLease">View Lease</button>
-                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                        </div>
-                    </EditForm>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-md-4">
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Lease Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="ViewLease">
-                            <i class="bi bi-eye"></i> View Lease
-                        </button>
-                        <button class="btn btn-outline-success" @onclick="CreateInvoice">
-                            <i class="bi bi-receipt"></i> Create Invoice
-                        </button>
-                        <button class="btn btn-outline-danger" @onclick="DeleteLease">
-                            <i class="bi bi-trash"></i> Delete Lease
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="card mt-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Lease Information</h5>
-                </div>
-                <div class="card-body">
-                    <small class="text-muted">
-                        <strong>Created:</strong> @lease.CreatedOn.ToString("MMMM dd, yyyy")
-                        <br />
-                        @if (lease.LastModifiedOn.HasValue)
-                        {
-                            <strong>Last Modified:</strong> @lease.LastModifiedOn.Value.ToString("MMMM dd, yyyy")
-                        }
-                    </small>
-                </div>
-            </div>
-
-            @if (statusChangeWarning)
-            {
-                <div class="card mt-3">
-                    <div class="card-body">
-                        <div class="alert alert-warning">
-                            <i class="bi bi-exclamation-triangle"></i>
-                            <strong>Note:</strong> Changing the lease status may affect property availability.
-                        </div>
-                    </div>
-                </div>
-            }
-        </div>
-    </div>
-}
+<Aquiis.UI.Shared.Features.PropertyManagement.Leases.EditForm LeaseId="@Id" />
 
 @code {
     [Parameter] public Guid Id { get; set; }
-    
-    private Lease? lease;
-    private LeaseModel leaseModel = new();
-    private bool isSubmitting = false;
-    private bool isAuthorized = true;
-    private bool statusChangeWarning = false;
-    private string errorMessage = string.Empty;
-    private string successMessage = string.Empty;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadLease();
-    }
-
-    private async Task LoadLease()
-    {
-        lease = await LeaseService.GetByIdAsync(Id);
-
-        if (lease == null)
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        // Map lease to model
-        leaseModel = new LeaseModel
-        {
-            StartDate = lease.StartDate,
-            EndDate = lease.EndDate,
-            MonthlyRent = lease.MonthlyRent,
-            SecurityDeposit = lease.SecurityDeposit,
-            Status = lease.Status,
-            Terms = lease.Terms,
-        };
-    }
-
-    private async Task UpdateLease()
-    {
-        try
-        {
-            isSubmitting = true;
-            errorMessage = string.Empty;
-            successMessage = string.Empty;
-
-            var oldStatus = lease!.Status;
-
-            // Update lease with form data
-            lease.StartDate = leaseModel.StartDate;
-            lease.EndDate = leaseModel.EndDate;
-            lease.MonthlyRent = leaseModel.MonthlyRent;
-            lease.SecurityDeposit = leaseModel.SecurityDeposit;
-            lease.Status = leaseModel.Status;
-            lease.Terms = leaseModel.Terms;
-            
-            // Update property availability based on lease status change
-            if (lease.Property != null && oldStatus != leaseModel.Status)
-            {
-                if (leaseModel.Status == "Active")
-                {
-                    lease.Property.IsAvailable = false;
-                }
-                else if (oldStatus == "Active" && leaseModel.Status != "Active")
-                {
-                    // Check if there are other active leases for this property
-                    var activeLeases = await LeaseService.GetActiveLeasesByPropertyIdAsync(lease.PropertyId);
-                    var otherActiveLeases = activeLeases.Any(l => l.PropertyId == lease.PropertyId && l.Id != Id && l.Status == "Active");
-                    
-                    if (!otherActiveLeases)
-                    {
-                        lease.Property.IsAvailable = true;
-                    }
-                }
-            }
-
-            await LeaseService.UpdateAsync(lease);
-            successMessage = "Lease updated successfully!";
-            statusChangeWarning = false;
-        }
-        catch (Exception ex)
-        {
-            errorMessage = $"Error updating lease: {ex.Message}";
-        }
-        finally
-        {
-            isSubmitting = false;
-        }
-    }
-
-    private void OnStatusChanged()
-    {
-        statusChangeWarning = true;
-        StateHasChanged();
-    }
-
-    private void ViewLease()
-    {
-        Navigation.NavigateTo($"/propertymanagement/leases/{Id}");
-    }
-
-    private void CreateInvoice()
-    {
-        Navigation.NavigateTo($"/propertymanagement/invoices/create?leaseId={Id}");
-    }
-
-    private void Cancel()
-    {
-        Navigation.NavigateTo("/propertymanagement/leases");
-    }
-
-    private async Task DeleteLease()
-    {
-        if (lease != null)
-        {
-            try
-            {
-                // If deleting an active lease, make property available
-                if (lease.Status == "Active" && lease.Property != null)
-                {
-                    var otherActiveLeases = await LeaseService.GetActiveLeasesByPropertyIdAsync(lease.PropertyId);
-                    var otherActiveLeasesExist = otherActiveLeases.Any(l => l.Id != Id && l.Status == "Active");
-
-                    if (!otherActiveLeasesExist)
-                    {
-                        lease.Property.IsAvailable = true;
-                    }
-                }
-    
-                await LeaseService.DeleteAsync(lease.Id);
-                Navigation.NavigateTo("/propertymanagement/leases");
-            }
-            catch (Exception ex)
-            {
-                errorMessage = $"Error deleting lease: {ex.Message}";
-            }
-        }
-    }
-
-    public class LeaseModel
-    {
-        [Required(ErrorMessage = "Start date is required")]
-        public DateTime StartDate { get; set; } = DateTime.Today;
-
-        [Required(ErrorMessage = "End date is required")]
-        public DateTime EndDate { get; set; } = DateTime.Today.AddYears(1);
-
-        [Required(ErrorMessage = "Monthly rent is required")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Monthly rent must be greater than 0")]
-        public decimal MonthlyRent { get; set; }
-
-        [Range(0.00, double.MaxValue, ErrorMessage = "Security deposit cannot be negative")]
-        public decimal SecurityDeposit { get; set; }
-
-        [Required(ErrorMessage = "Status is required")]
-        [StringLength(50)]
-        public string Status { get; set; } = "Active";
-
-        [StringLength(5000, ErrorMessage = "Terms cannot exceed 2000 characters")]
-        public string Terms { get; set; } = string.Empty;
-
-    }
-}
\ No newline at end of file
+}
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Index.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Index.razor
index 4639e55..d484f35 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Index.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/Index.razor
@@ -1,13 +1,9 @@
 @page "/propertymanagement/leases"
 
-@using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.EntityFrameworkCore
-@using Aquiis.Infrastructure.Data
 @using Aquiis.Core.Entities
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using Aquiis.SimpleStart.Shared.Components.Account
-
+@using Aquiis.Application.Services
+@using Aquiis.UI.Shared.Components.Entities.Leases
 @inject NavigationManager NavigationManager
 @inject LeaseService LeaseService
 @inject TenantService TenantService
@@ -17,8 +13,6 @@
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Leases - Property Management</PageTitle>
-
 <div class="d-flex justify-content-between align-items-center mb-4">
     <div>
         <h1><span class="bi bi-file-earmark-text-fill" aria-hidden="true"></span> Leases</h1>
@@ -42,23 +36,24 @@
         }
     </div>
     <div class="btn-group">
-        <button class="btn btn-outline-info" @onclick="ViewLeaseOffers">
+        @* Hidden features available in Professional *@
+        @* <button class="btn btn-outline-info" @onclick="ViewLeaseOffers">
             <i class="bi bi-file-earmark-check"></i> View Lease Offers
         </button>
         <button class="btn btn-primary" @onclick="CreateLease">
             <i class="bi bi-plus-lg"></i> Add Lease
-        </button>
+        </button> *@
         @if (filterTenant != null)
         {
-            <button class="btn btn-outline-success" @onclick="CreateLeaseForTenant">
+            @* <button class="btn btn-outline-success" @onclick="CreateLeaseForTenant">
                 <i class="bi bi-plus-lg"></i> Add Lease for @filterTenant.FullName
-            </button>
+            </button> *@
         }
         else if (filterProperty != null)
         {
-            <button class="btn btn-outline-success" @onclick="CreateLeaseForProperty">
+            @* <button class="btn btn-outline-success" @onclick="CreateLeaseForProperty">
                 <i class="bi bi-plus-lg"></i> Add Lease for This Property
-            </button>
+            </button> *@
         }
     </div>
 </div>
@@ -91,410 +86,100 @@ else if (!leases.Any())
         else
         {
             <h4>No Leases Found</h4>
-            <p>Get started by converting a lease offer to your first lease agreement.</p>
+            <p>Get started by completing your first lease agreement.</p>
             <button class="btn btn-primary" @onclick="CreateLease">Create First Lease</button>
         }
     </div>
 }
 else
 {
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="input-group">
-                <span class="input-group-text"><i class="bi bi-search"></i></span>
-                <input type="text" class="form-control" placeholder="Search leases..." @bind="searchTerm" @onkeyup="FilterLeases" />
-            </div>
-        </div>
-        <div class="col-md-3">
-            <select class="form-select" @bind="selectedLeaseStatus" @bind:after="FilterLeases">
-                <option value="">All Lease Statuses</option>
-                <option value="Active">Active</option>
-                <option value="Expired">Expired</option>
-                <option value="Terminated">Terminated</option>
-                <option value="Pending">Pending</option>
-            </select>
-        </div>
-        <div class="col-md-3">
-            <select class="form-select" @bind="selectedTenantId" @bind:after="FilterLeases">
-                <option value="">All Tenants</option>
-                @if (availableTenants != null)
-                {
-                    @foreach (var tenant in availableTenants)
-                    {
-                        <option value="@tenant.Id">@tenant.FullName</option>
-                    }
-                }
-            </select>
-        </div>
-        <div class="col-md-3">
-            <div class="form-check form-switch pt-2">
-                <input class="form-check-input" type="checkbox" id="groupByProperty" @bind="groupByProperty" @bind:after="FilterLeases">
-                <label class="form-check-label" for="groupByProperty">
-                    Group by Property
-                </label>
-            </div>
-        </div>
-    </div>
-
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="card text-white bg-success">
-                <div class="card-body">
-                    <h6>Active Leases</h6>
-                    <h4>@activeCount</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-warning">
-                <div class="card-body">
-                    <h6>Expiring Soon</h6>
-                    <h4>@expiringSoonCount</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-info">
-                <div class="card-body">
-                    <h6>Total Rent/Month</h6>
-                    <h4>@totalMonthlyRent.ToString("C")</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-primary">
-                <div class="card-body">
-                    <h6>Total Leases</h6>
-                    <h4>@filteredLeases.Count</h4>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="card">
-        <div class="card-body">
-            @if (groupByProperty)
-            {
-                @foreach (var propertyGroup in groupedLeases)
-                {
-                    var property = propertyGroup.First().Property;
-                    var propertyLeaseCount = propertyGroup.Count();
-                    var activeLeaseCount = propertyGroup.Count(l => l.Status == "Active");
-                    var isExpanded = expandedProperties.Contains(propertyGroup.Key.GetHashCode());
-                    
-                    <div class="card mb-3">
-                        <div class="card-header" style="cursor: pointer;" @onclick="() => TogglePropertyGroup(propertyGroup.Key)">
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div>
-                                    <i class="bi @(isExpanded ? "bi-chevron-down" : "bi-chevron-right")"></i>
-                                    <strong>@property?.Address</strong>
-                                    <span class="ms-3 text-muted">@property?.City, @property?.State @property?.ZipCode</span>
-                                </div>
-                                <div>
-                                    <span class="badge bg-success me-2">@activeLeaseCount active</span>
-                                    <span class="badge bg-secondary">@propertyLeaseCount total lease(s)</span>
-                                </div>
-                            </div>
-                        </div>
-                        @if (isExpanded)
-                        {
-                            <div class="card-body p-0">
-                                <table class="table table-hover mb-0">
-                                    <thead class="table-light">
-                                        <tr>
-                                            <th>Tenant</th>
-                                            <th>Start Date</th>
-                                            <th>End Date</th>
-                                            <th>Monthly Rent</th>
-                                            <th>Status</th>
-                                            <th>Actions</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach (var lease in propertyGroup)
-                                        {
-                                            <tr class="@(lease.IsActive ? "" : "table-warning")">
-                                                <td>
-                                                    @if (lease.Tenant != null)
-                                                    {
-                                                        <strong>@lease.Tenant.FullName</strong>
-                                                        <br />
-                                                        <small class="text-muted">@lease.Tenant.Email</small>
-                                                    }
-                                                    else
-                                                    {
-                                                        <span class="text-warning"><i class="bi bi-hourglass-split"></i> Pending Acceptance</span>
-                                                        <br />
-                                                        <small class="text-muted">Lease offer awaiting tenant</small>
-                                                    }
-                                                </td>
-                                                <td>@lease.StartDate.ToString("MMM dd, yyyy")</td>
-                                                <td>@lease.EndDate.ToString("MMM dd, yyyy")</td>
-                                                <td>@lease.MonthlyRent.ToString("C")</td>
-                                                <td>
-                                                    <span class="badge @GetStatusBadgeClass(lease.Status)">
-                                                        @lease.Status
-                                                    </span>
-                                                    @if (lease.IsActive && lease.DaysRemaining <= 30 && lease.DaysRemaining > 0)
-                                                    {
-                                                        <br />
-                                                        <small class="text-warning">@lease.DaysRemaining days remaining</small>
-                                                    }
-                                                </td>
-                                                <td>
-                                                    <div class="btn-group btn-group-sm">
-                                                        <button class="btn btn-outline-primary" @onclick="() => ViewLease(lease.Id)" title="View">
-                                                            <i class="bi bi-eye"></i>
-                                                        </button>
-                                                        <button class="btn btn-outline-secondary" @onclick="() => EditLease(lease.Id)" title="Edit">
-                                                            <i class="bi bi-pencil"></i>
-                                                        </button>
-                                                        <button class="btn btn-outline-danger" @onclick="() => DeleteLease(lease.Id)" title="Delete">
-                                                            <i class="bi bi-trash"></i>
-                                                        </button>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                        }
-                                    </tbody>
-                                </table>
-                            </div>
-                        }
+    <LeaseListView 
+        Leases="@(groupByProperty ? filteredLeases : pagedLeases)"
+        GroupedLeases="@groupedLeases"
+        AvailableTenants="@(availableTenants ?? new())"
+        ExpandedProperties="@expandedProperties"
+        GroupByProperty="@groupByProperty"
+        ShowMetrics="true"
+        ShowActions="true"
+        ShowEditDelete="true"
+        SearchTerm="@searchTerm"
+        StatusFilter="@selectedLeaseStatus"
+        TenantFilter="@(selectedTenantId?.ToString() ?? string.Empty)"
+        SortColumn="@sortColumn"
+        SortAscending="@sortAscending"
+        ActiveCount="@activeCount"
+        ExpiringSoonCount="@expiringSoonCount"
+        TotalMonthlyRent="@totalMonthlyRent"
+        OnSearchChanged="@HandleSearchChanged"
+        OnStatusFilterChanged="@HandleStatusFilterChanged"
+        OnTenantFilterChanged="@HandleTenantFilterChanged"
+        OnGroupByPropertyChanged="@HandleGroupByPropertyChanged"
+        OnSort="@HandleSort"
+        OnTogglePropertyGroup="@HandleTogglePropertyGroup"
+        OnView="@HandleView"
+        OnEdit="@HandleEdit"
+        OnDelete="@HandleDelete" />
+    
+    @if (totalPages > 1 && !groupByProperty)
+    {
+        <div class="card-footer">
+            <nav aria-label="Leases pagination">
+                <div class="d-flex justify-content-between align-items-center">
+                    <div>
+                        Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords leases
+                    </div>
+                    <div class="d-flex align-items-center">
+                        <label class="me-2">Page size:</label>
+                        <select class="form-select form-select-sm me-3" style="width: auto;" @bind="pageSize" @bind:after="() => { currentPage = 1; FilterLeases(); }">
+                            <option value="5">5</option>
+                            <option value="10">10</option>
+                            <option value="25">25</option>
+                            <option value="50">50</option>
+                        </select>
+                        <ul class="pagination pagination-sm mb-0">
+                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
+                                <button class="page-link" @onclick="() => GoToPage(1)" disabled="@(currentPage == 1)">First</button>
+                            </li>
+                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
+                                <button class="page-link" @onclick="() => GoToPage(currentPage - 1)" disabled="@(currentPage == 1)">Previous</button>
+                            </li>
+                            @for (int pageNum = Math.Max(1, currentPage - 2); pageNum <= Math.Min(totalPages, currentPage + 2); pageNum++)
+                            {
+                                var pageNumber = pageNum;
+                                <li class="page-item @(currentPage == pageNumber ? "active" : "")">
+                                    <button class="page-link" @onclick="() => GoToPage(pageNumber)">@pageNumber</button>
+                                </li>
+                            }
+                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
+                                <button class="page-link" @onclick="() => GoToPage(currentPage + 1)" disabled="@(currentPage == totalPages)">Next</button>
+                            </li>
+                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
+                                <button class="page-link" @onclick="() => GoToPage(totalPages)" disabled="@(currentPage == totalPages)">Last</button>
+                            </li>
+                        </ul>
                     </div>
-                }
-            }
-            else
-            {
-                <div class="table-responsive">
-                    <table class="table table-hover"><thead><tr>
-                            <th>
-                                <button class="btn btn-link text-decoration-none p-0 text-dark fw-bold" @onclick="@(() => SortBy("Property"))">
-                                    Property 
-                                    @if (sortColumn == "Property")
-                                    {
-                                        @if (sortAscending)
-                                        {
-                                            <i class="bi bi-arrow-up text-primary"></i>
-                                        }
-                                        else
-                                        {
-                                            <i class="bi bi-arrow-down text-primary"></i>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-arrow-down-up text-muted"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link text-decoration-none p-0 text-dark fw-bold" @onclick="@(() => SortBy("Tenant"))">
-                                    Tenant 
-                                    @if (sortColumn == "Tenant")
-                                    {
-                                        @if (sortAscending)
-                                        {
-                                            <i class="bi bi-arrow-up text-primary"></i>
-                                        }
-                                        else
-                                        {
-                                            <i class="bi bi-arrow-down text-primary"></i>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-arrow-down-up text-muted"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link text-decoration-none p-0 text-dark fw-bold" @onclick="@(() => SortBy("StartDate"))">
-                                    Start Date 
-                                    @if (sortColumn == "StartDate")
-                                    {
-                                        @if (sortAscending)
-                                        {
-                                            <i class="bi bi-arrow-up text-primary"></i>
-                                        }
-                                        else
-                                        {
-                                            <i class="bi bi-arrow-down text-primary"></i>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-arrow-down-up text-muted"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link text-decoration-none p-0 text-dark fw-bold" @onclick="@(() => SortBy("EndDate"))">
-                                    End Date 
-                                    @if (sortColumn == "EndDate")
-                                    {
-                                        @if (sortAscending)
-                                        {
-                                            <i class="bi bi-arrow-up text-primary"></i>
-                                        }
-                                        else
-                                        {
-                                            <i class="bi bi-arrow-down text-primary"></i>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-arrow-down-up text-muted"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link text-decoration-none p-0 text-dark fw-bold" @onclick="@(() => SortBy("MonthlyRent"))">
-                                    Monthly Rent 
-                                    @if (sortColumn == "MonthlyRent")
-                                    {
-                                        @if (sortAscending)
-                                        {
-                                            <i class="bi bi-arrow-up text-primary"></i>
-                                        }
-                                        else
-                                        {
-                                            <i class="bi bi-arrow-down text-primary"></i>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-arrow-down-up text-muted"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link text-decoration-none p-0 text-dark fw-bold" @onclick="@(() => SortBy("Status"))">
-                                    Status 
-                                    @if (sortColumn == "Status")
-                                    {
-                                        @if (sortAscending)
-                                        {
-                                            <i class="bi bi-arrow-up text-primary"></i>
-                                        }
-                                        else
-                                        {
-                                            <i class="bi bi-arrow-down text-primary"></i>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-arrow-down-up text-muted"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>Actions</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (var lease in pagedLeases)
-                        {
-                            <tr class="@(lease.IsActive ? "" : "table-warning")" id="lease-@lease.Id">
-                                <td>
-                                    <strong>@lease.Property?.Address</strong>
-                                    @if (lease.Property != null)
-                                    {
-                                        <br />
-                                        <small class="text-muted">@lease.Property.City, @lease.Property.State</small>
-                                    }
-                                </td>
-                                <td>
-                                    @if (lease.Tenant != null)
-                                    {
-                                        <strong>@lease.Tenant.FullName</strong>
-                                        <br />
-                                        <small class="text-muted">@lease.Tenant.Email</small>
-                                    }
-                                    else
-                                    {
-                                        <span class="text-warning"><i class="bi bi-hourglass-split"></i> Pending Acceptance</span>
-                                        <br />
-                                        <small class="text-muted">Lease offer awaiting tenant</small>
-                                    }
-                                </td>
-                                <td>@lease.StartDate.ToString("MMM dd, yyyy")</td>
-                                <td>@lease.EndDate.ToString("MMM dd, yyyy")</td>
-                                <td>@lease.MonthlyRent.ToString("C")</td>
-                                <td>
-                                    <span class="badge @GetStatusBadgeClass(lease.Status)">
-                                        @lease.Status
-                                    </span>
-                                    @if (lease.IsActive && lease.DaysRemaining <= 30 && lease.DaysRemaining > 0)
-                                    {
-                                        <br />
-                                        <small class="text-warning">@lease.DaysRemaining days remaining</small>
-                                    }
-                                </td>
-                                <td>
-                                    <div class="btn-group btn-group-sm">
-                                        <button class="btn btn-outline-primary" @onclick="() => ViewLease(lease.Id)" title="View">
-                                            <i class="bi bi-eye"></i>
-                                        </button>
-                                        <button class="btn btn-outline-secondary" @onclick="() => EditLease(lease.Id)" title="Edit">
-                                            <i class="bi bi-pencil"></i>
-                                        </button>
-                                        <button class="btn btn-outline-danger" @onclick="() => DeleteLease(lease.Id)" title="Delete">
-                                            <i class="bi bi-trash"></i>
-                                        </button>
-                                    </div>
-                                </td>
-                            </tr>
-                        }
-                    </tbody>
-                </table>
-            </div>
-            }
-            @if (totalPages > 1 && !groupByProperty)
-            {
-                <div class="card-footer">
-                    <nav aria-label="Leases pagination">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <div>
-                                Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords leases
-                            </div>
-                            <div class="d-flex align-items-center">
-                                <label class="me-2">Page size:</label>
-                                <select class="form-select form-select-sm me-3" style="width: auto;" @bind="pageSize" @bind:after="() => { currentPage = 1; FilterLeases(); }">
-                                    <option value="5">5</option>
-                                    <option value="10">10</option>
-                                    <option value="25">25</option>
-                                    <option value="50">50</option>
-                                </select>
-                                <ul class="pagination pagination-sm mb-0">
-                                    <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                        <button class="page-link" @onclick="() => GoToPage(1)" disabled="@(currentPage == 1)">First</button>
-                                    </li>
-                                    <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                        <button class="page-link" @onclick="() => GoToPage(currentPage - 1)" disabled="@(currentPage == 1)">Previous</button>
-                                    </li>
-                                    @for (int pageNum = Math.Max(1, currentPage - 2); pageNum <= Math.Min(totalPages, currentPage + 2); pageNum++)
-                                    {
-                                        var pageNumber = pageNum;
-                                        <li class="page-item @(currentPage == pageNumber ? "active" : "")">
-                                            <button class="page-link" @onclick="() => GoToPage(pageNumber)">@pageNumber</button>
-                                        </li>
-                                    }
-                                    <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                        <button class="page-link" @onclick="() => GoToPage(currentPage + 1)" disabled="@(currentPage == totalPages)">Next</button>
-                                    </li>
-                                    <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                        <button class="page-link" @onclick="() => GoToPage(totalPages)" disabled="@(currentPage == totalPages)">Last</button>
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
-                    </nav>
                 </div>
-            }
+            </nav>
         </div>
-    </div>
+    }
 }
 
 @code {
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public Guid? TenantId { get; set; }
+
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public Guid? PropertyId { get; set; }
+
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public int? LeaseId { get; set; }
+
+    [CascadingParameter]
+    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+
     private List<Lease>? leases;
     private List<Lease> filteredLeases = new();
     private List<Lease> pagedLeases = new();
@@ -521,21 +206,6 @@ else
     private string sortColumn = "StartDate";
     private bool sortAscending = false;
 
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? TenantId { get; set; }
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? PropertyId { get; set; }
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public int? LeaseId { get; set; }
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
     protected override async Task OnInitializedAsync()
     {
         await LoadFilterEntities();
@@ -592,12 +262,11 @@ else
             return;
         }
 
-        var     allLeases = await LeaseService.GetAllAsync();
+        var allLeases = await LeaseService.GetLeasesWithRelationsAsync();
         leases = allLeases
             .Where(l => 
                    (!TenantId.HasValue || l.TenantId == TenantId.Value) &&
                    (!PropertyId.HasValue || l.PropertyId == PropertyId.Value))
-            .OrderByDescending(l => l.StartDate)
             .ToList();
     }
 
@@ -663,6 +332,67 @@ else
         CalculateMetrics();
     }
     
+    // Event handlers for LeaseListView component
+    private async Task HandleSearchChanged(string value)
+    {
+        searchTerm = value;
+        FilterLeases();
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleStatusFilterChanged(string value)
+    {
+        selectedLeaseStatus = value;
+        FilterLeases();
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleTenantFilterChanged(string value)
+    {
+        selectedTenantId = string.IsNullOrEmpty(value) ? null : Guid.Parse(value);
+        FilterLeases();
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleGroupByPropertyChanged(bool value)
+    {
+        groupByProperty = value;
+        FilterLeases();
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleSort((string Column, bool Ascending) sort)
+    {
+        sortColumn = sort.Column;
+        sortAscending = sort.Ascending;
+        currentPage = 1;
+        FilterLeases();
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleTogglePropertyGroup(Guid propertyId)
+    {
+        TogglePropertyGroup(propertyId);
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleView(Guid leaseId)
+    {
+        ViewLease(leaseId);
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleEdit(Guid leaseId)
+    {
+        EditLease(leaseId);
+        await Task.CompletedTask;
+    }
+    
+    private async Task HandleDelete(Guid leaseId)
+    {
+        await DeleteLease(leaseId);
+    }
+    
     private void TogglePropertyGroup(Guid propertyId)
     {
         if (expandedProperties.Contains(propertyId.GetHashCode()))
@@ -701,21 +431,6 @@ else
         };
     }
     
-    private void SortBy(string column)
-    {
-        if (sortColumn == column)
-        {
-            sortAscending = !sortAscending;
-        }
-        else
-        {
-            sortColumn = column;
-            sortAscending = true;
-        }
-        currentPage = 1;
-        FilterLeases();
-    }
-    
     private void GoToPage(int page)
     {
         if (page >= 1 && page <= totalPages)
@@ -731,10 +446,10 @@ else
         {
             activeCount = filteredLeases.Count(l => l.Status == "Active");
             
-            // Expiring within 30 days
-            var thirtyDaysFromNow = DateTime.Now.AddDays(30);
+            // Expiring within 90 days
+            var ninetyDaysFromNow = DateTime.Now.AddDays(90);
             expiringSoonCount = filteredLeases.Count(l => 
-                l.Status == "Active" && l.EndDate <= thirtyDaysFromNow);
+                l.Status == "Active" && l.EndDate <= ninetyDaysFromNow);
             
             totalMonthlyRent = filteredLeases
                 .Where(l => l.Status == "Active")
@@ -748,18 +463,6 @@ else
         }
     }
 
-    private string GetStatusBadgeClass(string status)
-    {
-        return status switch
-        {
-            "Active" => "bg-success",
-            "Pending" => "bg-info",
-            "Expired" => "bg-warning",
-            "Terminated" => "bg-danger",
-            _ => "bg-secondary"
-        };
-    }
-
     private void ViewLeaseOffers()
     {
         NavigationManager.NavigateTo("/propertymanagement/leaseoffers");
@@ -772,27 +475,11 @@ else
 
     private void CreateLeaseForTenant()
     {
-        @* if (TenantId.HasValue)
-        {
-            NavigationManager.NavigateTo($"/propertymanagement/leases/create?tenantId={TenantId.Value}");
-        }
-        else
-        {
-            NavigationManager.NavigateTo("/propertymanagement/leases/create");
-        } *@
         NavigationManager.NavigateTo("/propertymanagement/leaseoffers");
     }
 
     private void CreateLeaseForProperty()
     {
-        @* if (PropertyId.HasValue)
-        {
-            NavigationManager.NavigateTo($"/propertymanagement/leases/create?propertyId={PropertyId.Value}");
-        }
-        else
-        {
-            NavigationManager.NavigateTo("/propertymanagement/leases/create");
-        } *@
         NavigationManager.NavigateTo("/propertymanagement/leaseoffers");
     }
 
@@ -826,7 +513,6 @@ else
         if (string.IsNullOrEmpty(userId))
             return;
 
-        // Add confirmation dialog in a real application
         var confirmed = await JSRuntime.InvokeAsync<bool>("confirm", $"Are you sure you want to delete lease {id}?");
         if (!confirmed)
             return;
@@ -834,4 +520,4 @@ else
         await LeaseService.DeleteAsync(id);
         await LoadLeases();
     }
-}
\ No newline at end of file
+}
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/View.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/View.razor
index dee2f21..12f1f5c 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/View.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Leases/Pages/View.razor
@@ -1,750 +1,118 @@
-@page "/propertymanagement/leases/{Id:guid}/view"
+@page "/propertymanagement/leases/{Id:guid}"
+@using Aquiis.SimpleStart.Features.PropertyManagement.Documents.Pages
+@using Aquiis.UI.Shared.Components.Entities.Leases
 
-@using Aquiis.Core.Entities
-@using Aquiis.Core.Validation
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components
-@using Microsoft.AspNetCore.Components.Web
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using System.ComponentModel.DataAnnotations
-@using Aquiis.Application.Services
-@using Aquiis.Application.Services.Workflows
-@using Aquiis.SimpleStart.Shared.Services
-@using Aquiis.Application.Services.PdfGenerators
-
-@inject NavigationManager Navigation
 @inject LeaseService LeaseService
+@inject DocumentService DocumentService
 @inject InvoiceService InvoiceService
-@inject Application.Services.DocumentService DocumentService
-@inject LeaseWorkflowService LeaseWorkflowService
-@inject UserContextService UserContextService
-@inject LeaseRenewalPdfGenerator RenewalPdfGenerator
-@inject ToastService ToastService
-@inject OrganizationService OrganizationService
 @inject IJSRuntime JSRuntime
-@attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
+@inject LeasePdfGenerator LeasePdfGenerator
+@inject NavigationManager Navigation
 
+@attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-@if (lease == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!isAuthorized)
-{
-    <div class="alert alert-danger">
-        <h4>Access Denied</h4>
-        <p>You don't have permission to view this lease.</p>
-        <a href="/propertymanagement/leases" class="btn btn-primary">Back to Leases</a>
-    </div>
-}
-else
-{
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <h1>Lease Details</h1>
-        <div class="btn-group">
-            <button class="btn btn-primary" @onclick="EditLease">
-                <i class="bi bi-pencil"></i> Edit
-            </button>
-            <button class="btn btn-secondary" @onclick="BackToList">
-                <i class="bi bi-arrow-left"></i> Back to List
-            </button>
-        </div>
+<div class="d-flex justify-content-between align-items-center mb-4">
+    <h1>Lease Details</h1>
+    <div class="btn-group">
+        <button class="btn btn-sm btn-primary" @onclick="EditLease">
+            <i class="bi bi-pencil"></i> Edit
+        </button>
+        <button class="btn btn-secondary" @onclick="BackToProperty">
+            <i class="bi bi-arrow-left"></i> Back to Property
+        </button>
     </div>
+</div>
 
     <div class="row">
         <div class="col-md-8">
-            <div class="card">
-                <div class="card-header d-flex justify-content-between align-items-center">
-                    <h5 class="mb-0">Lease Information</h5>
-                    <span class="badge @GetStatusBadgeClass(lease.Status)">
-                        @lease.Status
-                    </span>
-                </div>
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Property:</strong>
-                            <p>@lease.Property?.Address</p>
-                            <small class="text-muted">@lease.Property?.City, @lease.Property?.State</small>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <strong>Tenant:</strong>
-                            @if (lease.Tenant != null)
-                            {
-                                <p>@lease.Tenant.FullName</p>
-                                <small class="text-muted">@lease.Tenant.Email</small>
-                            }
-                            else
-                            {
-                                <p class="text-warning"><i class="bi bi-hourglass-split"></i> Lease Offer - Awaiting Acceptance</p>
-                                <small class="text-muted">Tenant will be assigned upon acceptance</small>
-                            }
-                        </div>
-                    </div>
+            <Aquiis.UI.Shared.Components.Entities.Leases.LeaseDetailsCard
+                Lease="lease" />
 
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Start Date:</strong>
-                            <p>@lease.StartDate.ToString("MMMM dd, yyyy")</p>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <strong>End Date:</strong>
-                            <p>@lease.EndDate.ToString("MMMM dd, yyyy")</p>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Monthly Rent:</strong>
-                            <p class="text-success fw-bold">@lease.MonthlyRent.ToString("C")</p>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <strong>Security Deposit:</strong>
-                            <p>@lease.SecurityDeposit.ToString("C")</p>
-                        </div>
-                    </div>
-
-                    @if (!string.IsNullOrEmpty(lease.Terms))
-                    {
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <strong>Lease Terms:</strong>
-                                <p>@lease.Terms</p>
-                            </div>
-                        </div>
-                    }
-
-                    @if (!string.IsNullOrEmpty(lease.Notes))
-                    {
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <strong>Notes:</strong>
-                                <p>@lease.Notes</p>
-                            </div>
-                        </div>
-                    }
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Created:</strong>
-                            <p>@lease.CreatedOn.ToString("MMMM dd, yyyy")</p>
-                        </div>
-                        @if (lease.LastModifiedOn.HasValue)
-                        {
-                            <div class="col-md-6 mb-3">
-                                <strong>Last Modified:</strong>
-                                <p>@lease.LastModifiedOn.Value.ToString("MMMM dd, yyyy")</p>
-                            </div>
-                        }
-                    </div>
-
-                    @if (lease.IsActive)
-                    {
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="alert alert-info">
-                                    <i class="bi bi-info-circle"></i>
-                                    <strong>Active Lease:</strong> This lease is currently active with @lease.DaysRemaining days remaining.
-                                </div>
-                            </div>
-                        </div>
-                    }
-                </div>
-            </div>
+            <LeaseTransactionsCard Lease="lease"
+                LeaseInvoices="recentInvoices"
+                OnViewInvoice="ViewInvoice"
+                OnMakePayment="CreatePayment" />
         </div>
-
         <div class="col-md-4">
-            @if (lease.IsExpiringSoon)
-            {
-                <div class="card border-warning mb-3">
-                    <div class="card-header bg-warning text-dark">
-                        <h5 class="mb-0">
-                            <i class="bi bi-exclamation-triangle-fill"></i> Renewal Alert
-                        </h5>
-                    </div>
-                    <div class="card-body">
-                        <p class="mb-2">
-                            <strong>Expires in:</strong> 
-                            <span class="text-danger fw-bold">@lease.DaysRemaining days</span>
-                        </p>
-                        <p class="mb-2">
-                            <strong>End Date:</strong> @lease.EndDate.ToString("MMM dd, yyyy")
-                        </p>
-                        
-                        @if (!string.IsNullOrEmpty(lease.RenewalStatus))
-                        {
-                            <p class="mb-2">
-                                <strong>Status:</strong> 
-                                <span class="badge bg-@GetRenewalStatusBadgeClass(lease.RenewalStatus)">
-                                    @lease.RenewalStatus
-                                </span>
-                            </p>
-                        }
+            <LeaseQuickActionsCard Lease="lease"
+                OnCreateInvoice="CreateInvoice"
+                OnGenerateLeaseDocument="GenerateLeaseDocument"
+                OnViewDocument="ViewDocument"
+                OnDownloadDocument="DownloadDocument"
+                OnViewDocuments="ViewDocuments"
+                OnViewInvoices="ViewInvoices"
+                OnEdit="EditLease"
+                IsGenerating="isGenerating" />
 
-                        @if (lease.ProposedRenewalRent.HasValue)
-                        {
-                            <p class="mb-2">
-                                <strong>Proposed Rent:</strong> @lease.ProposedRenewalRent.Value.ToString("C")
-                                @if (lease.ProposedRenewalRent != lease.MonthlyRent)
-                                {
-                                    var increase = lease.ProposedRenewalRent.Value - lease.MonthlyRent;
-                                    var percentage = (increase / lease.MonthlyRent) * 100;
-                                    <small class="text-muted">
-                                        (@(increase > 0 ? "+" : "")@increase.ToString("C"), @percentage.ToString("F1")%)
-                                    </small>
-                                }
-                            </p>
-                        }
+            <LeaseSummaryCard Lease="lease" RecentInvoices="@recentInvoices" OnViewInvoice="ViewInvoice" />
 
-                        @if (lease.RenewalNotificationSentOn.HasValue)
-                        {
-                            <small class="text-muted d-block mb-2">
-                                Notification sent: @lease.RenewalNotificationSentOn.Value.ToString("MMM dd, yyyy")
-                            </small>
-                        }
+            <LeaseLifeCycleCard Lease="lease" />
 
-                        @if (!string.IsNullOrEmpty(lease.RenewalNotes))
-                        {
-                            <hr/>
-                            <small>
-                                <strong>Notes:</strong><br/>
-                                @lease.RenewalNotes
-                            </small>
-                        }
-
-                        <div class="d-grid gap-2 mt-3">
-                            @if (lease.RenewalStatus == "Pending" || string.IsNullOrEmpty(lease.RenewalStatus))
-                            {
-                                <button class="btn btn-success btn-sm" @onclick="() => ShowRenewalOfferModal()">
-                                    <i class="bi bi-envelope-check"></i> Send Renewal Offer
-                                </button>
-                                <button class="btn btn-outline-primary btn-sm" @onclick="GenerateRenewalOfferPdf" disabled="@isGeneratingPdf">
-                                    @if (isGeneratingPdf)
-                                    {
-                                        <span class="spinner-border spinner-border-sm me-1"></span>
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-file-pdf"></i>
-                                    }
-                                    Generate Offer Letter
-                                </button>
-                            }
-                            @if (lease.RenewalStatus == "Offered")
-                            {
-                                <button class="btn btn-outline-success btn-sm" @onclick="() => MarkRenewalAccepted()">
-                                    <i class="bi bi-check-circle"></i> Mark as Accepted
-                                </button>
-                                <button class="btn btn-outline-danger btn-sm" @onclick="() => MarkRenewalDeclined()">
-                                    <i class="bi bi-x-circle"></i> Mark as Declined
-                                </button>
-                                <button class="btn btn-outline-primary btn-sm" @onclick="GenerateRenewalOfferPdf" disabled="@isGeneratingPdf">
-                                    @if (isGeneratingPdf)
-                                    {
-                                        <span class="spinner-border spinner-border-sm me-1"></span>
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-file-pdf"></i>
-                                    }
-                                    Generate Offer Letter
-                                </button>
-                            }
-                        </div>
-                    </div>
-                </div>
-            }
             
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Quick Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="EditLease">
-                            <i class="bi bi-pencil"></i> Edit Lease
-                        </button>
-                        <button class="btn btn-outline-success" @onclick="CreateInvoice">
-                            <i class="bi bi-receipt"></i> Create Invoice
-                        </button>
-                        <button class="btn btn-outline-info" @onclick="ViewInvoices">
-                            <i class="bi bi-list-check"></i> View Invoices
-                        </button>
-                        <button class="btn btn-outline-secondary" @onclick="ViewDocuments">
-                            <i class="bi bi-folder"></i> View Documents
-                        </button>
-                        @if (lease.DocumentId == null)
-                        {
-                            <button class="btn btn-outline-warning" @onclick="GenerateLeaseDocument" disabled="@isGenerating">
-                                @if (isGenerating)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                                    <span>Generating...</span>
-                                }
-                                else
-                                {
-                                    <i class="bi bi-file-pdf"></i>
-                                    <span> Generate PDF</span>
-                                }
-                            </button>
-                        }
-                        else
-                        {
-                            <button class="btn btn-primary" @onclick="ViewDocument">
-                                <i class="bi bi-eye"></i> View PDF
-                            </button>
-                            <button class="btn btn-outline-primary" @onclick="DownloadDocument">
-                                <i class="bi bi-download"></i> Download PDF
-                            </button>
-                        }
-                    </div>
-                </div>
-            </div>
-
-            <div class="card mt-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Lease Summary</h5>
-                </div>
-                <div class="card-body">
-                    <p><strong>Duration:</strong> @((lease.EndDate - lease.StartDate).Days) days</p>
-                    <p><strong>Total Rent:</strong> @((lease.MonthlyRent * 12).ToString("C"))/year</p>
-                    @if (lease.IsActive)
-                    {
-                        <p><strong>Days Remaining:</strong> @lease.DaysRemaining</p>
-                    }
-                    @if (recentInvoices.Any())
-                    {
-                        <hr />
-                        <small class="text-muted">
-                            <strong>Recent Invoices:</strong><br />
-                            @foreach (var invoice in recentInvoices.Take(3))
-                            {
-                                <span class="badge @(invoice.Status == "Paid" ? "bg-success" : "bg-warning") me-1">
-                                    @invoice.InvoiceNumber
-                                </span>
-                            }
-                        </small>
-                    }
-                </div>
-            </div>
-
-            @* Lease Lifecycle Management Card *@
-            @if (lease.Status == "Active" || lease.Status == "MonthToMonth" || lease.Status == "NoticeGiven")
-            {
-                <div class="card mt-3 border-warning">
-                    <div class="card-header bg-warning text-dark">
-                        <h5 class="mb-0"><i class="bi bi-exclamation-triangle"></i> Lease Management</h5>
-                    </div>
-                    <div class="card-body">
-                        <div class="d-grid gap-2">
-                            @if (lease.Status == "Active" || lease.Status == "MonthToMonth")
-                            {
-                                <button class="btn btn-outline-warning" @onclick="() => showTerminationNoticeModal = true">
-                                    <i class="bi bi-calendar-x"></i> Record Termination Notice
-                                </button>
-                                <button class="btn btn-outline-danger" @onclick="() => showEarlyTerminationModal = true">
-                                    <i class="bi bi-x-octagon"></i> Early Termination
-                                </button>
-                                <button class="btn btn-outline-secondary" @onclick="() => showConvertMTMModal = true">
-                                    <i class="bi bi-arrow-repeat"></i> Convert to Month-to-Month
-                                </button>
-                            }
-                            @if (lease.Status == "NoticeGiven")
-                            {
-                                <div class="alert alert-info mb-2">
-                                    <small>
-                                        <strong>Notice Given:</strong> @lease.TerminationNoticedOn?.ToString("MMM dd, yyyy")<br/>
-                                        <strong>Expected Move-Out:</strong> @lease.ExpectedMoveOutDate?.ToString("MMM dd, yyyy")
-                                    </small>
-                                </div>
-                                <button class="btn btn-primary" @onclick="() => showMoveOutModal = true">
-                                    <i class="bi bi-box-seam"></i> Complete Move-Out
-                                </button>
-                                <button class="btn btn-outline-danger" @onclick="() => showEarlyTerminationModal = true">
-                                    <i class="bi bi-x-octagon"></i> Early Termination
-                                </button>
-                            }
-                        </div>
-                    </div>
-                </div>
-            }
         </div>
     </div>
     <div class="row">
-        <div class="col-md-8 mt-4">
-            <div class="card">
-                <div class="card-header d-flex justify-content-between align-items-center">
-                    <h5 class="mb-0">Notes</h5>
-                </div>
-                <div class="card-body">
-                    <NotesTimeline EntityType="Lease" EntityId="@lease.Id" />
-                </div>
-            </div>
+        <div class="col-md-8"></div>
+        <div class="col-md-4">
         </div>
     </div>
-    @* Renewal Offer Modal *@
-    @if (showRenewalModal && lease != null)
-    {
-        <div class="modal fade show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title">Send Renewal Offer</h5>
-                        <button type="button" class="btn-close" @onclick="() => showRenewalModal = false"></button>
-                    </div>
-                    <div class="modal-body">
-                        <div class="mb-3">
-                            <label class="form-label">Current Rent</label>
-                            <input type="text" class="form-control" value="@lease.MonthlyRent.ToString("C")" disabled />
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Proposed Renewal Rent</label>
-                            <div class="input-group">
-                                <span class="input-group-text">$</span>
-                                <input type="number" class="form-control" @bind="proposedRent" step="0.01" />
-                            </div>
-                            @if (proposedRent != lease.MonthlyRent)
-                            {
-                                var increase = proposedRent - lease.MonthlyRent;
-                                var percentage = (increase / lease.MonthlyRent) * 100;
-                                <small class="text-muted">
-                                    Change: @(increase > 0 ? "+" : "")@increase.ToString("C") (@percentage.ToString("F1")%)
-                                </small>
-                            }
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Notes (Optional)</label>
-                            <textarea class="form-control" rows="3" @bind="renewalNotes" 
-                                      placeholder="Add any notes about the renewal offer..."></textarea>
-                        </div>
-                        <div class="alert alert-info">
-                            <i class="bi bi-info-circle"></i>
-                            <small>
-                                This will mark the lease as "Offered" and record the proposed rent. 
-                                An email notification will be sent to the tenant (when email service is configured).
-                            </small>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" @onclick="() => showRenewalModal = false">
-                            Cancel
-                        </button>
-                        <button type="button" class="btn btn-primary" @onclick="SendRenewalOffer">
-                            Send Offer
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-
-    @* Termination Notice Modal *@
-    @if (showTerminationNoticeModal && lease != null)
-    {
-        <div class="modal fade show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header bg-warning text-dark">
-                        <h5 class="modal-title"><i class="bi bi-calendar-x"></i> Record Termination Notice</h5>
-                        <button type="button" class="btn-close" @onclick="() => showTerminationNoticeModal = false"></button>
-                    </div>
-                    <div class="modal-body">
-                        <div class="mb-3">
-                            <label class="form-label">Notice Type <span class="text-danger">*</span></label>
-                            <select class="form-select" @bind="terminationNoticeType">
-                                <option value="">Select type...</option>
-                                <option value="Tenant">Tenant Notice (Tenant initiated)</option>
-                                <option value="Landlord">Landlord Notice (Property manager initiated)</option>
-                                <option value="Mutual">Mutual Agreement</option>
-                            </select>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Notice Date <span class="text-danger">*</span></label>
-                            <input type="date" class="form-control" @bind="terminationNoticeDate" />
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Expected Move-Out Date <span class="text-danger">*</span></label>
-                            <input type="date" class="form-control" @bind="terminationExpectedMoveOutDate" />
-                            <small class="text-muted">Must be in the future</small>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Reason <span class="text-danger">*</span></label>
-                            <textarea class="form-control" rows="3" @bind="terminationReason"
-                                      placeholder="Provide the reason for termination..."></textarea>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" @onclick="() => showTerminationNoticeModal = false">
-                            Cancel
-                        </button>
-                        <button type="button" class="btn btn-warning" @onclick="RecordTerminationNotice" 
-                                disabled="@(string.IsNullOrWhiteSpace(terminationNoticeType) || string.IsNullOrWhiteSpace(terminationReason) || isSubmitting)">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-1"></span>
-                            }
-                            Record Notice
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-
-    @* Early Termination Modal *@
-    @if (showEarlyTerminationModal && lease != null)
-    {
-        <div class="modal fade show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header bg-danger text-white">
-                        <h5 class="modal-title"><i class="bi bi-x-octagon"></i> Early Termination</h5>
-                        <button type="button" class="btn-close btn-close-white" @onclick="() => showEarlyTerminationModal = false"></button>
-                    </div>
-                    <div class="modal-body">
-                        <div class="alert alert-danger">
-                            <strong>Warning:</strong> This action will immediately terminate the lease and cannot be undone.
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Termination Type <span class="text-danger">*</span></label>
-                            <select class="form-select" @bind="earlyTerminationType">
-                                <option value="">Select type...</option>
-                                <option value="Eviction">Eviction</option>
-                                <option value="Breach">Lease Breach</option>
-                                <option value="Mutual">Mutual Agreement</option>
-                                <option value="Emergency">Emergency</option>
-                            </select>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Effective Date <span class="text-danger">*</span></label>
-                            <input type="date" class="form-control" @bind="earlyTerminationDate" />
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Reason <span class="text-danger">*</span></label>
-                            <textarea class="form-control" rows="3" @bind="earlyTerminationReason"
-                                      placeholder="Provide detailed reason for early termination..."></textarea>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" @onclick="() => showEarlyTerminationModal = false">
-                            Cancel
-                        </button>
-                        <button type="button" class="btn btn-danger" @onclick="EarlyTerminateLease"
-                                disabled="@(string.IsNullOrWhiteSpace(earlyTerminationType) || string.IsNullOrWhiteSpace(earlyTerminationReason) || isSubmitting)">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-1"></span>
-                            }
-                            Terminate Lease
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-
-    @* Move-Out Completion Modal *@
-    @if (showMoveOutModal && lease != null)
-    {
-        <div class="modal fade show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header bg-primary text-white">
-                        <h5 class="modal-title"><i class="bi bi-box-seam"></i> Complete Move-Out</h5>
-                        <button type="button" class="btn-close btn-close-white" @onclick="() => showMoveOutModal = false"></button>
-                    </div>
-                    <div class="modal-body">
-                        <div class="mb-3">
-                            <label class="form-label">Actual Move-Out Date <span class="text-danger">*</span></label>
-                            <input type="date" class="form-control" @bind="actualMoveOutDate" />
-                        </div>
-                        <div class="mb-3">
-                            <div class="form-check">
-                                <input class="form-check-input" type="checkbox" @bind="moveOutFinalInspection" id="finalInspection" />
-                                <label class="form-check-label" for="finalInspection">
-                                    Final inspection completed
-                                </label>
-                            </div>
-                        </div>
-                        <div class="mb-3">
-                            <div class="form-check">
-                                <input class="form-check-input" type="checkbox" @bind="moveOutKeysReturned" id="keysReturned" />
-                                <label class="form-check-label" for="keysReturned">
-                                    Keys returned
-                                </label>
-                            </div>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Notes (Optional)</label>
-                            <textarea class="form-control" rows="3" @bind="moveOutNotes"
-                                      placeholder="Any notes about the move-out condition..."></textarea>
-                        </div>
-                        <div class="alert alert-info">
-                            <small>
-                                <i class="bi bi-info-circle"></i> This will:
-                                <ul class="mb-0 mt-1">
-                                    <li>Mark the lease as Terminated</li>
-                                    <li>Update property status to Available</li>
-                                    <li>Update tenant active status</li>
-                                </ul>
-                            </small>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" @onclick="() => showMoveOutModal = false">
-                            Cancel
-                        </button>
-                        <button type="button" class="btn btn-primary" @onclick="CompleteMoveOut" disabled="@isSubmitting">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-1"></span>
-                            }
-                            Complete Move-Out
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
 
-    @* Convert to Month-to-Month Modal *@
-    @if (showConvertMTMModal && lease != null)
-    {
-        <div class="modal fade show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title"><i class="bi bi-arrow-repeat"></i> Convert to Month-to-Month</h5>
-                        <button type="button" class="btn-close" @onclick="() => showConvertMTMModal = false"></button>
-                    </div>
-                    <div class="modal-body">
-                        <p>This will convert the lease to a month-to-month arrangement.</p>
-                        <div class="mb-3">
-                            <label class="form-label">Current Monthly Rent</label>
-                            <input type="text" class="form-control" value="@lease.MonthlyRent.ToString("C")" disabled />
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">New Monthly Rent (Optional)</label>
-                            <div class="input-group">
-                                <span class="input-group-text">$</span>
-                                <input type="number" class="form-control" @bind="mtmNewRent" step="0.01" placeholder="Leave empty to keep current rent" />
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" @onclick="() => showConvertMTMModal = false">
-                            Cancel
-                        </button>
-                        <button type="button" class="btn btn-primary" @onclick="ConvertToMonthToMonth" disabled="@isSubmitting">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-1"></span>
-                            }
-                            Convert
-                        </button>
-                    </div>
-                </div>
-            </div>
+    <div class="row">
+        <div class="col-md-8"></div>
+        <div class="col-md-4">
         </div>
-    }
-}
+    </div>
 
 @code {
-    [Parameter] public Guid Id { get; set; }
-
     [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? PropertyId { get; set; }
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? TenantId { get; set; }
-
-    private Lease? lease;
-    private List<Invoice> recentInvoices = new();
-    private bool isAuthorized = true;
-    private bool isGenerating = false;
-    private bool isGeneratingPdf = false;
-    private bool isSubmitting = false;
-    private bool showRenewalModal = false;
-    private decimal proposedRent = 0;
-    private string renewalNotes = "";
-    private Document? document = null;
-
-    // Termination Notice state
-    private bool showTerminationNoticeModal = false;
-    private string terminationNoticeType = "";
-    private DateTime terminationNoticeDate = DateTime.Today;
-    private DateTime terminationExpectedMoveOutDate = DateTime.Today.AddDays(30);
-    private string terminationReason = "";
+    public Guid Id { get; set; }
 
-    // Early Termination state
-    private bool showEarlyTerminationModal = false;
-    private string earlyTerminationType = "";
-    private DateTime earlyTerminationDate = DateTime.Today;
-    private string earlyTerminationReason = "";
+    private Lease lease = new Lease();
 
-    // Move-Out state
-    private bool showMoveOutModal = false;
-    private DateTime actualMoveOutDate = DateTime.Today;
-    private bool moveOutFinalInspection = false;
-    private bool moveOutKeysReturned = false;
-    private string moveOutNotes = "";
+    private Document? document = null;
 
-    // Month-to-Month conversion state
-    private bool showConvertMTMModal = false;
-    private decimal? mtmNewRent = null;
+    private List<Invoice> recentInvoices = new List<Invoice>();
 
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+    private List<Document> LeaseDocuments = new List<Document>();
+    
+    private List<Payment> payments = new List<Payment>();
 
-    private LeaseModel leaseModel = new();
-    private Property? selectedProperty;
-    private List<Property> availableProperties = new();
+    private bool isGenerating = false; // flag to indicate if pdf document generation is in progress
 
     protected override async Task OnInitializedAsync()
     {
-        await LoadLease();
+        lease = await LeaseService.GetLeaseWithRelationsAsync(Id) ?? new Lease();
+        recentInvoices = lease.Invoices
+                .OrderByDescending(i => i.InvoicedOn)
+                .ToList();
+        LeaseDocuments = lease.Documents!
+                .OrderByDescending(d => d.CreatedOn)
+                .ToList();
 
-         // If PropertyId is provided in query string, pre-select it
-        if (PropertyId.HasValue)
-        {
-            leaseModel.PropertyId = PropertyId.Value;
-            await OnPropertyChanged();
-        }
-        
-        // If TenantId is provided in query string, pre-select it
-        if (TenantId.HasValue)
+        payments = lease.Invoices
+                .SelectMany(i => i.Payments)
+                .OrderBy(p => p.PaidOn)
+                .ToList();
+
+        // Load the document if it exists
+        if (lease.DocumentId != null)
         {
-            leaseModel.TenantId = TenantId.Value;
+            document = await DocumentService.GetByIdAsync(lease.DocumentId.Value);
         }
     }
 
     private async Task LoadLease()
     {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
 
-        if (string.IsNullOrEmpty(userId))
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        lease = await LeaseService.GetByIdAsync(Id);
+        lease = await LeaseService.GetByIdAsync(lease.Id) ?? new Lease();
 
         if (lease == null)
         {
-            isAuthorized = false;
             return;
         }
 
-        var invoices = await InvoiceService.GetInvoicesByLeaseIdAsync(Id);
+        var invoices = await InvoiceService.GetInvoicesByLeaseIdAsync(lease.Id);
         recentInvoices = invoices
             .OrderByDescending(i => i.DueOn)
             .Take(5)
@@ -757,405 +125,29 @@ else
         }
     }
 
-    private string GetStatusBadgeClass(string status)
-    {
-        return status switch
-        {
-            "Active" => "bg-success",
-            "Pending" => "bg-warning",
-            "Expired" => "bg-secondary",
-            "Terminated" => "bg-danger",
-            _ => "bg-secondary"
-        };
-    }
-
-    private string GetRenewalStatusBadgeClass(string status)
-    {
-        return status switch
-        {
-            "Pending" => "secondary",
-            "Offered" => "info",
-            "Accepted" => "success",
-            "Declined" => "danger",
-            "Expired" => "dark",
-            _ => "secondary"
-        };
-    }
-
-    private void ShowRenewalOfferModal()
-    {
-        proposedRent = lease?.MonthlyRent ?? 0;
-        renewalNotes = "";
-        showRenewalModal = true;
-    }
-
-    private async Task SendRenewalOffer()
-    {
-        if (lease == null) return;
-
-        try
-        {
-            // Update lease with renewal offer details
-            lease.RenewalStatus = "Offered";
-            lease.ProposedRenewalRent = proposedRent;
-            lease.RenewalOfferedOn = DateTime.UtcNow;
-            lease.RenewalNotes = renewalNotes;
-
-            await LeaseService.UpdateAsync(lease);
-            
-            // TODO: Send email notification to tenant
-            
-            showRenewalModal = false;
-            await LoadLease();
-            StateHasChanged();
-
-            ToastService.ShowSuccess("Renewal offer sent successfully! You can now generate the offer letter PDF.");
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error sending renewal offer: {ex.Message}");
-        }
-    }
-
-    private async Task GenerateRenewalOfferPdf()
-    {
-        if (lease == null) return;
-
-        try
-        {
-            isGeneratingPdf = true;
-            StateHasChanged();
-
-            // Ensure proposed rent is set
-            if (!lease.ProposedRenewalRent.HasValue)
-            {
-                lease.ProposedRenewalRent = lease.MonthlyRent;
-            }
-
-            // Generate renewal offer PDF
-            var pdfBytes = RenewalPdfGenerator.GenerateRenewalOfferLetter(lease, lease.Property, lease.Tenant!);
-            var fileName = $"Lease_Renewal_Offer_{lease.Property?.Address?.Replace(" ", "_")}_{DateTime.Now:yyyyMMdd_HHmmss}.pdf";
-
-            // Save PDF to Documents table
-            var document = new Document
-            {
-                PropertyId = lease.PropertyId,
-                TenantId = lease.TenantId,
-                LeaseId = lease.Id,
-                FileName = fileName,
-                FileType = "application/pdf",
-                FileSize = pdfBytes.Length,
-                FileData = pdfBytes,
-                FileExtension = ".pdf",
-                ContentType = "application/pdf",
-                DocumentType = "Lease Renewal Offer",
-                Description = $"Renewal offer letter for {lease.Property?.Address}. Proposed rent: {lease.ProposedRenewalRent:C}"
-            };
-
-            await DocumentService.CreateAsync(document);
-            
-            ToastService.ShowSuccess($"Renewal offer letter generated and saved to documents!");
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error generating PDF: {ex.Message}");
-        }
-        finally
-        {
-            isGeneratingPdf = false;
-            StateHasChanged();
-        }
-    }
-
-    private async Task MarkRenewalAccepted()
-    {
-        if (lease == null) return;
-
-        try
-        {
-            // Create renewal model with proposed terms
-            var renewalModel = new LeaseRenewalModel
-            {
-                NewStartDate = DateTime.Today,
-                NewEndDate = DateTime.Today.AddYears(1),
-                NewMonthlyRent = lease.ProposedRenewalRent ?? lease.MonthlyRent,
-                UpdatedSecurityDeposit = lease.SecurityDeposit,
-                NewTerms = lease.Terms
-            };
-
-            var result = await LeaseWorkflowService.RenewLeaseAsync(lease.Id, renewalModel);
-
-            if (result.Success && result.Data != null)
-            {
-                await LoadLease();
-                StateHasChanged();
-
-                ToastService.ShowSuccess($"Renewal accepted! New lease created from {result.Data.StartDate:MMM dd, yyyy} to {result.Data.EndDate:MMM dd, yyyy}.");
-            }
-            else
-            {
-                ToastService.ShowError($"Error accepting renewal: {string.Join(", ", result.Errors)}");
-            }
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error accepting renewal: {ex.Message}");
-        }
-    }
-
-    private async Task MarkRenewalDeclined()
-    {
-        if (lease == null) return;
-
-        try
-        {
-            lease.RenewalStatus = "Declined";
-            lease.RenewalResponseOn = DateTime.UtcNow;
-            await LeaseService.UpdateAsync(lease);
-            await LoadLease();
-            StateHasChanged();
-
-            ToastService.ShowWarning("Renewal offer marked as declined.");
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error updating renewal status: {ex.Message}");
-        }
-    }
-
-    #region Lease Workflow Methods
-
-    private async Task RecordTerminationNotice()
-    {
-        if (lease == null || string.IsNullOrWhiteSpace(terminationNoticeType) || string.IsNullOrWhiteSpace(terminationReason)) 
-            return;
-
-        isSubmitting = true;
-        StateHasChanged();
-
-        try
-        {
-            var result = await LeaseWorkflowService.RecordTerminationNoticeAsync(
-                lease.Id,
-                terminationNoticeDate,
-                terminationExpectedMoveOutDate,
-                terminationNoticeType,
-                terminationReason);
-
-            if (result.Success)
-            {
-                showTerminationNoticeModal = false;
-                ResetTerminationNoticeForm();
-                await LoadLease();
-                ToastService.ShowSuccess(result.Message);
-            }
-            else
-            {
-                ToastService.ShowError(string.Join(", ", result.Errors));
-            }
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error recording termination notice: {ex.Message}");
-        }
-        finally
-        {
-            isSubmitting = false;
-            StateHasChanged();
-        }
-    }
-
-    private async Task EarlyTerminateLease()
-    {
-        if (lease == null || string.IsNullOrWhiteSpace(earlyTerminationType) || string.IsNullOrWhiteSpace(earlyTerminationReason))
-            return;
-
-        isSubmitting = true;
-        StateHasChanged();
-
-        try
-        {
-            var result = await LeaseWorkflowService.EarlyTerminateAsync(
-                lease.Id,
-                earlyTerminationType,
-                earlyTerminationReason,
-                earlyTerminationDate);
-
-            if (result.Success)
-            {
-                showEarlyTerminationModal = false;
-                ResetEarlyTerminationForm();
-                await LoadLease();
-                ToastService.ShowSuccess(result.Message);
-            }
-            else
-            {
-                ToastService.ShowError(string.Join(", ", result.Errors));
-            }
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error terminating lease: {ex.Message}");
-        }
-        finally
-        {
-            isSubmitting = false;
-            StateHasChanged();
-        }
-    }
-
-    private async Task CompleteMoveOut()
-    {
-        if (lease == null) return;
-
-        isSubmitting = true;
-        StateHasChanged();
-
-        try
-        {
-            var moveOutModel = new MoveOutModel
-            {
-                FinalInspectionCompleted = moveOutFinalInspection,
-                KeysReturned = moveOutKeysReturned,
-                Notes = moveOutNotes
-            };
-
-            var result = await LeaseWorkflowService.CompleteMoveOutAsync(
-                lease.Id,
-                actualMoveOutDate,
-                moveOutModel);
-
-            if (result.Success)
-            {
-                showMoveOutModal = false;
-                ResetMoveOutForm();
-                await LoadLease();
-                ToastService.ShowSuccess(result.Message);
-            }
-            else
-            {
-                ToastService.ShowError(string.Join(", ", result.Errors));
-            }
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error completing move-out: {ex.Message}");
-        }
-        finally
-        {
-            isSubmitting = false;
-            StateHasChanged();
-        }
-    }
-
-    private async Task ConvertToMonthToMonth()
+    private void BackToProperty()
     {
-        if (lease == null) return;
-
-        isSubmitting = true;
-        StateHasChanged();
-
-        try
-        {
-            var result = await LeaseWorkflowService.ConvertToMonthToMonthAsync(
-                lease.Id,
-                mtmNewRent);
-
-            if (result.Success)
-            {
-                showConvertMTMModal = false;
-                mtmNewRent = null;
-                await LoadLease();
-                ToastService.ShowSuccess(result.Message);
-            }
-            else
-            {
-                ToastService.ShowError(string.Join(", ", result.Errors));
-            }
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error converting to month-to-month: {ex.Message}");
-        }
-        finally
-        {
-            isSubmitting = false;
-            StateHasChanged();
-        }
-    }
-
-    private void ResetTerminationNoticeForm()
-    {
-        terminationNoticeType = "";
-        terminationNoticeDate = DateTime.Today;
-        terminationExpectedMoveOutDate = DateTime.Today.AddDays(30);
-        terminationReason = "";
-    }
-
-    private void ResetEarlyTerminationForm()
-    {
-        earlyTerminationType = "";
-        earlyTerminationDate = DateTime.Today;
-        earlyTerminationReason = "";
-    }
-
-    private void ResetMoveOutForm()
-    {
-        actualMoveOutDate = DateTime.Today;
-        moveOutFinalInspection = false;
-        moveOutKeysReturned = false;
-        moveOutNotes = "";
-    }
-
-    #endregion
-
-    private async Task OnPropertyChanged()
-    {
-        if (leaseModel.PropertyId != Guid.Empty)
-        {
-            selectedProperty = availableProperties.FirstOrDefault(p => p.Id == leaseModel.PropertyId);
-            if (selectedProperty != null)
-            {
-                // Get organization settings for security deposit calculation
-                var settings = await OrganizationService.GetOrganizationSettingsAsync();
-                var depositMultiplier = settings?.AutoCalculateSecurityDeposit == true 
-                    ? settings.SecurityDepositMultiplier 
-                    : 1.0m;
-
-                leaseModel.MonthlyRent = selectedProperty.MonthlyRent;
-                leaseModel.SecurityDeposit = selectedProperty.MonthlyRent * depositMultiplier;
-            }
-        }
-        else
-        {
-            selectedProperty = null;
-        }
-        StateHasChanged();
+        Navigation.NavigateTo($"/propertymanagement/properties/{lease?.PropertyId}");
     }
 
     private void EditLease()
     {
-        Navigation.NavigateTo($"/propertymanagement/leases/{Id}/edit");
-    }
-
-    private void BackToList()
-    {
-        Navigation.NavigateTo("/propertymanagement/leases");
+        Navigation.NavigateTo($"/propertymanagement/leases/{lease?.Id}/edit");
     }
 
-    private void CreateInvoice()
+    private void CreateInvoice(Guid leaseId)
     {
-        Navigation.NavigateTo($"/propertymanagement/invoices/create?leaseId={Id}");
+        Navigation.NavigateTo($"/propertymanagement/invoices/create?LeaseId={leaseId}");
     }
 
-    private void ViewInvoices()
+    private void ViewInvoice(Guid invoiceId)
     {
-        Navigation.NavigateTo($"/propertymanagement/invoices?leaseId={Id}");
+        Navigation.NavigateTo($"/propertymanagement/invoices/{invoiceId}");
     }
 
-    private void ViewDocuments()
+    private void GenerateLeaseDocument(Guid leaseId)
     {
-        Navigation.NavigateTo($"/propertymanagement/leases/{Id}/documents");
+        // Implement document generation logic here
     }
 
     private async Task ViewDocument()
@@ -1167,18 +159,6 @@ else
         }
     }
 
-    private async Task DownloadDocument()
-    {
-        if (document != null)
-        {
-            var fileName = document.FileName;
-            var fileData = document.FileData;
-            var mimeType = document.FileType;
-
-            await JSRuntime.InvokeVoidAsync("downloadFile", fileName, Convert.ToBase64String(fileData), mimeType);
-        }
-    }
-
     private async Task GenerateLeaseDocument()
     {
         isGenerating = true;
@@ -1229,35 +209,30 @@ else
         }
     }
 
-    public class LeaseModel
+    private async Task DownloadDocument()
     {
-        [RequiredGuid(ErrorMessage = "Property is required")]
-        public Guid PropertyId { get; set; }
-
-        [RequiredGuid(ErrorMessage = "Tenant is required")]
-        public Guid TenantId { get; set; }
-
-        [Required(ErrorMessage = "Start date is required")]
-        public DateTime StartDate { get; set; } = DateTime.Today;
-
-        [Required(ErrorMessage = "End date is required")]
-        public DateTime EndDate { get; set; } = DateTime.Today.AddYears(1);
-
-        [Required(ErrorMessage = "Monthly rent is required")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Monthly rent must be greater than 0")]
-        public decimal MonthlyRent { get; set; }
+        if (document != null)
+        {
+            var fileName = document.FileName;
+            var fileData = document.FileData;
+            var mimeType = document.FileType;
 
-        [Range(0, double.MaxValue, ErrorMessage = "Security deposit cannot be negative")]
-        public decimal SecurityDeposit { get; set; }
+            await JSRuntime.InvokeVoidAsync("downloadFile", fileName, Convert.ToBase64String(fileData), mimeType);
+        }
+    }
 
-        [Required(ErrorMessage = "Status is required")]
-        [StringLength(50)]
-        public string Status { get; set; } = "Active";
+    private void ViewDocuments(Guid leaseId)
+    {
+        Navigation.NavigateTo($"/propertymanagement/documents/?LeaseId={leaseId}");
+    }
 
-        [StringLength(1000, ErrorMessage = "Terms cannot exceed 1000 characters")]
-        public string Terms { get; set; } = string.Empty;
+    private void ViewInvoices(Guid leaseId)
+    {
+        Navigation.NavigateTo($"/propertymanagement/invoices/?LeaseId={leaseId}");
+    }
 
-        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
-        public string Notes { get; set; } = string.Empty;
+    private void CreatePayment(Guid invoiceId)
+    {
+        Navigation.NavigateTo($"/propertymanagement/payments/create?InvoiceId={invoiceId}");
     }
 }
\ No newline at end of file
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/Create.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/Create.razor
index f66997f..4b01c7d 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/Create.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/Create.razor
@@ -1,22 +1,19 @@
-@page "/propertymanagement/maintenance/create/{PropertyId:int?}"
-@using Aquiis.Application.Services
-@using Aquiis.SimpleStart.Shared.Services
-@using Aquiis.Application.Services.PdfGenerators
-@using Microsoft.Extensions.Configuration.UserSecrets
+@page "/propertymanagement/maintenance/create/{PropertyId:guid?}"
+
 @using System.ComponentModel.DataAnnotations
 @inject MaintenanceService MaintenanceService
 @inject PropertyService PropertyService
 @inject LeaseService LeaseService
+
+@inject UserContextService UserContextService
 @inject NavigationManager NavigationManager
 
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Create Maintenance Request</PageTitle>
-
 <div class="container-fluid">
     <div class="d-flex justify-content-between align-items-center mb-4">
-        <h1><i class="bi bi-tools"></i> Create Maintenance Request</h1>
+        <h1><i class="bi bi-tools"></i> Record Repair</h1>
         <button class="btn btn-outline-secondary" @onclick="Cancel">
             <i class="bi bi-x-circle"></i> Cancel
         </button>
@@ -36,7 +33,7 @@
             <div class="col-md-8">
                 <div class="card">
                     <div class="card-body">
-                        <EditForm Model="maintenanceRequest" OnValidSubmit="HandleValidSubmit">
+                        <Microsoft.AspNetCore.Components.Forms.EditForm Model="maintenanceRequest" OnValidSubmit="HandleValidSubmit">
                             <DataAnnotationsValidator />
                             <ValidationSummary class="text-danger" />
 
@@ -67,21 +64,15 @@
                                 </div>
                             </div>
 
-                            <div class="mb-3">
+                            <div class="row mb-3">
+                                
+                                <div class="col-md-8">
                                 <label class="form-label">Title *</label>
                                 <InputText class="form-control" @bind-Value="maintenanceRequest.Title" placeholder="Brief description of the issue" />
                                 <ValidationMessage For="@(() => maintenanceRequest.Title)" />
-                            </div>
-
-                            <div class="mb-3">
-                                <label class="form-label">Description *</label>
-                                <InputTextArea class="form-control" @bind-Value="maintenanceRequest.Description" rows="4" placeholder="Detailed description of the maintenance issue" />
-                                <ValidationMessage For="@(() => maintenanceRequest.Description)" />
-                            </div>
-
-                            <div class="row mb-3">
-                                <div class="col-md-6">
-                                    <label class="form-label">Request Type *</label>
+                                </div>
+                                <div class="col-md-4">
+                                    <label class="form-label">Repair Type *</label>
                                     <InputSelect class="form-select" @bind-Value="maintenanceRequest.RequestType">
                                         <option value="">-- Select Type --</option>
                                         @foreach (var type in ApplicationConstants.MaintenanceRequestTypes.AllMaintenanceRequestTypes)
@@ -91,53 +82,31 @@
                                     </InputSelect>
                                     <ValidationMessage For="@(() => maintenanceRequest.RequestType)" />
                                 </div>
-                                <div class="col-md-6">
-                                    <label class="form-label">Priority *</label>
-                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.Priority">
-                                        @foreach (var priority in ApplicationConstants.MaintenanceRequestPriorities.AllMaintenanceRequestPriorities)
-                                        {
-                                            <option value="@priority">@priority</option>
-                                        }
-                                    </InputSelect>
-                                    <ValidationMessage For="@(() => maintenanceRequest.Priority)" />
-                                </div>
-                            </div>
-
-                            <div class="mb-3">
-                                <label class="form-label">Requested By</label>
-                                <InputText class="form-control" @bind-Value="maintenanceRequest.RequestedBy" placeholder="Name of person requesting" />
                             </div>
 
                             <div class="row mb-3">
-                                <div class="col-md-6">
-                                    <label class="form-label">Email</label>
-                                    <InputText type="email" class="form-control" @bind-Value="maintenanceRequest.RequestedByEmail" placeholder="email@example.com" />
-                                </div>
-                                <div class="col-md-6">
-                                    <label class="form-label">Phone</label>
-                                    <InputText class="form-control" @bind-Value="maintenanceRequest.RequestedByPhone" placeholder="(555) 123-4567" />
+                                <div class="col-md-12">
+                                    <label class="form-label">Description *</label>
+                                    <InputTextArea class="form-control" @bind-Value="maintenanceRequest.Description" rows="4" placeholder="Detailed description of the maintenance issue" />
+                                    <ValidationMessage For="@(() => maintenanceRequest.Description)" />
                                 </div>
                             </div>
 
                             <div class="row mb-3">
                                 <div class="col-md-6">
-                                    <label class="form-label">Requested Date *</label>
-                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.RequestedOn" />
-                                    <ValidationMessage For="@(() => maintenanceRequest.RequestedOn)" />
+                                    <label class="form-label">Cost</label>
+                                    <InputNumber class="form-control" @bind-Value="maintenanceRequest.ActualCost" />
                                 </div>
                                 <div class="col-md-6">
-                                    <label class="form-label">Scheduled Date</label>
-                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.ScheduledOn" />
+                                    <label class="form-label">Completed On *</label>
+                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.CompletedOn" />
+                                    <ValidationMessage For="@(() => maintenanceRequest.CompletedOn)" />
                                 </div>
                             </div>
 
                             <div class="row mb-3">
                                 <div class="col-md-6">
-                                    <label class="form-label">Estimated Cost</label>
-                                    <InputNumber class="form-control" @bind-Value="maintenanceRequest.EstimatedCost" />
-                                </div>
-                                <div class="col-md-6">
-                                    <label class="form-label">Assigned To</label>
+                                    <label class="form-label">Completed By</label>
                                     <InputText class="form-control" @bind-Value="maintenanceRequest.AssignedTo" placeholder="Contractor or maintenance person" />
                                 </div>
                             </div>
@@ -153,11 +122,11 @@
                                     else
                                     {
                                         <i class="bi bi-check-circle me-2"></i>
-                                        <span>Create Request</span>
+                                        <span>Save</span>
                                     }
                                 </button>
                             </div>
-                        </EditForm>
+                        </Microsoft.AspNetCore.Components.Forms.EditForm>
                     </div>
                 </div>
             </div>
@@ -208,6 +177,7 @@
     [Parameter]
     [SupplyParameterFromQuery]
     public Guid? PropertyId { get; set; }
+    
 
     [Parameter]
     [SupplyParameterFromQuery]
@@ -218,9 +188,12 @@
     private bool isLoading = true;
     private bool isSaving = false;
 
+    private ApplicationUser currentUser = default!;
+
     protected override async Task OnInitializedAsync()
     {
         await LoadData();
+        currentUser = await UserContextService.GetCurrentUserAsync() ?? throw new InvalidOperationException("User context is required");
     }
 
     protected override async Task OnParametersSetAsync()
@@ -295,12 +268,13 @@
                 Description = maintenanceRequest.Description,
                 RequestType = maintenanceRequest.RequestType,
                 Priority = maintenanceRequest.Priority,
-                RequestedBy = maintenanceRequest.RequestedBy,
-                RequestedByEmail = maintenanceRequest.RequestedByEmail,
-                RequestedByPhone = maintenanceRequest.RequestedByPhone,
-                RequestedOn = maintenanceRequest.RequestedOn,
-                ScheduledOn = maintenanceRequest.ScheduledOn,
-                EstimatedCost = maintenanceRequest.EstimatedCost,
+                RequestedBy = currentUser.Id,
+                RequestedByEmail = currentUser.Email!,
+                RequestedByPhone = currentUser.PhoneNumber!,
+                RequestedOn = maintenanceRequest.CompletedOn,
+                ScheduledOn = maintenanceRequest.CompletedOn,
+                CompletedOn = maintenanceRequest.CompletedOn,
+                ActualCost = maintenanceRequest.ActualCost,
                 AssignedTo = maintenanceRequest.AssignedTo
             };
 
@@ -344,11 +318,12 @@
         public string RequestedByPhone { get; set; } = string.Empty;
 
         [Required]
-        public DateTime RequestedOn { get; set; } = DateTime.Today;
+        public DateTime CompletedOn { get; set; } = DateTime.Today;
 
         public DateTime? ScheduledOn { get; set; }
 
-        public decimal EstimatedCost { get; set; }
+        public decimal ActualCost { get; set; }
         public string AssignedTo { get; set; } = string.Empty;
     }
 }
+
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/Edit.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/Edit.razor
index 81a664a..de894b1 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/Edit.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/Edit.razor
@@ -1,306 +1,13 @@
-@page "/propertymanagement/maintenance/{Id:guid}/edit"
-@inject MaintenanceService MaintenanceService
-@inject PropertyService PropertyService
-@inject LeaseService LeaseService
-@inject NavigationManager NavigationManager
-@inject IJSRuntime JSRuntime
+@page "/propertymanagement/maintenance/{MaintenanceRequestId:guid}/edit"
+@using Aquiis.UI.Shared.Features.PropertyManagement.MaintenanceRequests
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
 <PageTitle>Edit Maintenance Request</PageTitle>
 
-<div class="container-fluid">
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <h1><i class="bi bi-pencil"></i> Edit Maintenance Request #@Id</h1>
-        <button class="btn btn-outline-secondary" @onclick="Cancel">
-            <i class="bi bi-x-circle"></i> Cancel
-        </button>
-    </div>
-
-    @if (isLoading)
-    {
-        <div class="text-center">
-            <div class="spinner-border" role="status">
-                <span class="visually-hidden">Loading...</span>
-            </div>
-        </div>
-    }
-    else if (maintenanceRequest == null)
-    {
-        <div class="alert alert-warning">
-            <i class="bi bi-exclamation-triangle"></i> Maintenance request not found.
-        </div>
-    }
-    else
-    {
-        <div class="row">
-            <div class="col-md-8">
-                <div class="card">
-                    <div class="card-body">
-                        <EditForm Model="maintenanceRequest" OnValidSubmit="HandleValidSubmit">
-                            <DataAnnotationsValidator />
-                            <ValidationSummary class="text-danger" />
-
-                            <div class="row mb-3">
-                                <div class="col-md-6">
-                                    <label class="form-label">Property *</label>
-                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.PropertyId" @onchange="OnPropertyChanged">
-                                        <option value="0">-- Select Property --</option>
-                                        @foreach (var property in properties)
-                                        {
-                                            <option value="@property.Id">@property.Address</option>
-                                        }
-                                    </InputSelect>
-                                    <ValidationMessage For="@(() => maintenanceRequest.PropertyId)" />
-                                </div>
-                                <div class="col-md-6">
-                                    <label class="form-label">Lease (Optional)</label>
-                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.LeaseId">
-                                        <option value="">-- No Lease --</option>
-                                        @foreach (var lease in availableLeases)
-                                        {
-                                            <option value="@lease.Id">Lease #@lease.Id - @lease.Tenant?.FullName</option>
-                                        }
-                                    </InputSelect>
-                                </div>
-                            </div>
-
-                            <div class="mb-3">
-                                <label class="form-label">Title *</label>
-                                <InputText class="form-control" @bind-Value="maintenanceRequest.Title" placeholder="Brief description of the issue" />
-                                <ValidationMessage For="@(() => maintenanceRequest.Title)" />
-                            </div>
-
-                            <div class="mb-3">
-                                <label class="form-label">Description *</label>
-                                <InputTextArea class="form-control" @bind-Value="maintenanceRequest.Description" rows="4" placeholder="Detailed description of the maintenance issue" />
-                                <ValidationMessage For="@(() => maintenanceRequest.Description)" />
-                            </div>
-
-                            <div class="row mb-3">
-                                <div class="col-md-4">
-                                    <label class="form-label">Request Type *</label>
-                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.RequestType">
-                                        <option value="">-- Select Type --</option>
-                                        @foreach (var type in ApplicationConstants.MaintenanceRequestTypes.AllMaintenanceRequestTypes)
-                                        {
-                                            <option value="@type">@type</option>
-                                        }
-                                    </InputSelect>
-                                    <ValidationMessage For="@(() => maintenanceRequest.RequestType)" />
-                                </div>
-                                <div class="col-md-4">
-                                    <label class="form-label">Priority *</label>
-                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.Priority">
-                                        @foreach (var priority in ApplicationConstants.MaintenanceRequestPriorities.AllMaintenanceRequestPriorities)
-                                        {
-                                            <option value="@priority">@priority</option>
-                                        }
-                                    </InputSelect>
-                                    <ValidationMessage For="@(() => maintenanceRequest.Priority)" />
-                                </div>
-                                <div class="col-md-4">
-                                    <label class="form-label">Status *</label>
-                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.Status">
-                                        @foreach (var status in ApplicationConstants.MaintenanceRequestStatuses.AllMaintenanceRequestStatuses)
-                                        {
-                                            <option value="@status">@status</option>
-                                        }
-                                    </InputSelect>
-                                    <ValidationMessage For="@(() => maintenanceRequest.Status)" />
-                                </div>
-                            </div>
-
-                            <div class="mb-3">
-                                <label class="form-label">Requested By</label>
-                                <InputText class="form-control" @bind-Value="maintenanceRequest.RequestedBy" placeholder="Name of person requesting" />
-                            </div>
-
-                            <div class="row mb-3">
-                                <div class="col-md-6">
-                                    <label class="form-label">Email</label>
-                                    <InputText type="email" class="form-control" @bind-Value="maintenanceRequest.RequestedByEmail" placeholder="email@example.com" />
-                                </div>
-                                <div class="col-md-6">
-                                    <label class="form-label">Phone</label>
-                                    <InputText class="form-control" @bind-Value="maintenanceRequest.RequestedByPhone" placeholder="(555) 123-4567" />
-                                </div>
-                            </div>
-
-                            <div class="row mb-3">
-                                <div class="col-md-4">
-                                    <label class="form-label">Requested Date *</label>
-                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.RequestedOn" />
-                                    <ValidationMessage For="@(() => maintenanceRequest.RequestedOn)" />
-                                </div>
-                                <div class="col-md-4">
-                                    <label class="form-label">Scheduled Date</label>
-                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.ScheduledOn" />
-                                </div>
-                                <div class="col-md-4">
-                                    <label class="form-label">Completed Date</label>
-                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.CompletedOn" />
-                                </div>
-                            </div>
-
-                            <div class="row mb-3">
-                                <div class="col-md-4">
-                                    <label class="form-label">Estimated Cost</label>
-                                    <InputNumber class="form-control" @bind-Value="maintenanceRequest.EstimatedCost" />
-                                </div>
-                                <div class="col-md-4">
-                                    <label class="form-label">Actual Cost</label>
-                                    <InputNumber class="form-control" @bind-Value="maintenanceRequest.ActualCost" />
-                                </div>
-                                <div class="col-md-4">
-                                    <label class="form-label">Assigned To</label>
-                                    <InputText class="form-control" @bind-Value="maintenanceRequest.AssignedTo" placeholder="Contractor or maintenance person" />
-                                </div>
-                            </div>
-
-                            <div class="mb-3">
-                                <label class="form-label">Resolution Notes</label>
-                                <InputTextArea class="form-control" @bind-Value="maintenanceRequest.ResolutionNotes" rows="3" placeholder="Notes about how the issue was resolved" />
-                            </div>
-
-                            <div class="d-flex justify-content-between">
-                                <button type="button" class="btn btn-outline-danger" @onclick="DeleteRequest">
-                                    <i class="bi bi-trash"></i> Delete
-                                </button>
-                                <div class="d-flex gap-2">
-                                    <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                                    <button type="submit" class="btn btn-primary" disabled="@isSaving">
-                                        @if (isSaving)
-                                        {
-                                            <span class="spinner-border spinner-border-sm me-2" role="status" aria-hidden="true"></span>
-                                            <span>Saving...</span>
-                                        }
-                                        else
-                                        {
-                                            <i class="bi bi-check-circle me-2"></i>
-                                            <span>Save Changes</span>
-                                        }
-                                    </button>
-                                </div>
-                            </div>
-                        </EditForm>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-md-4">
-                <div class="card">
-                    <div class="card-header">
-                        <h5 class="mb-0"><i class="bi bi-info-circle"></i> Status Information</h5>
-                    </div>
-                    <div class="card-body">
-                        <div class="mb-3">
-                            <label class="text-muted small">Current Priority</label>
-                            <p><span class="badge @maintenanceRequest.PriorityBadgeClass">@maintenanceRequest.Priority</span></p>
-                        </div>
-                        <div class="mb-3">
-                            <label class="text-muted small">Current Status</label>
-                            <p><span class="badge @maintenanceRequest.StatusBadgeClass">@maintenanceRequest.Status</span></p>
-                        </div>
-                        <div class="mb-3">
-                            <label class="text-muted small">Days Open</label>
-                            <p class="mb-0"><span class="badge bg-info">@maintenanceRequest.DaysOpen days</span></p>
-                        </div>
-                        @if (maintenanceRequest.IsOverdue)
-                        {
-                            <div class="alert alert-danger">
-                                <i class="bi bi-exclamation-triangle-fill"></i> <strong>Overdue</strong>
-                            </div>
-                        }
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-</div>
+<Aquiis.UI.Shared.Features.PropertyManagement.MaintenanceRequests.MaintenanceEditForm MaintenanceRequestId="@MaintenanceRequestId" />
 
 @code {
     [Parameter]
-    public Guid Id { get; set; }
-
-    private MaintenanceRequest? maintenanceRequest;
-    private List<Property> properties = new();
-    private List<Lease> availableLeases = new();
-    private bool isLoading = true;
-    private bool isSaving = false;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadData();
-    }
-
-    private async Task LoadData()
-    {
-        isLoading = true;
-        try
-        {
-            maintenanceRequest = await MaintenanceService.GetByIdAsync(Id);
-            properties = await PropertyService.GetAllAsync();
-            
-            if (maintenanceRequest?.PropertyId != null)
-            {
-                await LoadLeasesForProperty(maintenanceRequest.PropertyId);
-            }
-        }
-        finally
-        {
-            isLoading = false;
-        }
-    }
-
-    private async Task OnPropertyChanged(ChangeEventArgs e)
-    {
-        if (Guid.TryParse(e.Value?.ToString(), out Guid propertyId) && propertyId != Guid.Empty)
-        {
-            await LoadLeasesForProperty(propertyId);
-        }
-        else
-        {
-            availableLeases.Clear();
-        }
-    }
-
-    private async Task LoadLeasesForProperty(Guid propertyId)
-    {
-        var allLeases = await LeaseService.GetLeasesByPropertyIdAsync(propertyId);
-        availableLeases = allLeases.Where(l => l.Status == "Active" || l.Status == "Pending").ToList();
-    }
-
-    private async Task HandleValidSubmit()
-    {
-        if (maintenanceRequest == null) return;
-
-        isSaving = true;
-        try
-        {
-            await MaintenanceService.UpdateAsync(maintenanceRequest);
-            NavigationManager.NavigateTo($"/propertymanagement/maintenance/{Id}");
-        }
-        finally
-        {
-            isSaving = false;
-        }
-    }
-
-    private async Task DeleteRequest()
-    {
-        if (maintenanceRequest == null) return;
-
-        var confirmed = await JSRuntime.InvokeAsync<bool>("confirm", "Are you sure you want to delete this maintenance request?");
-        if (confirmed)
-        {
-            await MaintenanceService.DeleteAsync(Id);
-            NavigationManager.NavigateTo("/propertymanagement/maintenance");
-        }
-    }
-
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/maintenance/{Id}");
-    }
+    public Guid MaintenanceRequestId { get; set; }
 }
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/Index.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/Index.razor
index c0f61d9..8e16b70 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/Index.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/Index.razor
@@ -1,350 +1,6 @@
 @page "/propertymanagement/maintenance"
-@inject MaintenanceService MaintenanceService
-@inject NavigationManager NavigationManager
+@using Aquiis.UI.Shared.Features.PropertyManagement.MaintenanceRequests
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Maintenance Requests</PageTitle>
-
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <h1><i class="bi bi-tools"></i> Maintenance Requests</h1>
-    <button class="btn btn-primary" @onclick="CreateNew">
-        <i class="bi bi-plus-circle"></i> New Request
-    </button>
-</div>
-
-@if (isLoading)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else
-{
-    <!-- Summary Cards -->
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card text-white bg-danger">
-                <div class="card-body">
-                    <h6>Urgent</h6>
-                    <h3>@urgentRequests.Count</h3>
-                    <small>High priority requests</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-warning">
-                <div class="card-body">
-                    <h6>In Progress</h6>
-                    <h3>@inProgressRequests.Count</h3>
-                    <small>Currently being worked on</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-primary">
-                <div class="card-body">
-                    <h6>Submitted</h6>
-                    <h3>@submittedRequests.Count</h3>
-                    <small>Awaiting assignment</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-success">
-                <div class="card-body">
-                    <h6>Completed</h6>
-                    <h3>@completedRequests.Count</h3>
-                    <small>This month</small>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Filters -->
-    <div class="card mb-3">
-        <div class="card-body">
-            <div class="row g-3">
-                <div class="col-md-3">
-                    <label class="form-label small">Status</label>
-                    <select class="form-select" @onchange="OnStatusFilterChanged">
-                        <option value="">All Statuses</option>
-                        @foreach (var status in ApplicationConstants.MaintenanceRequestStatuses.AllMaintenanceRequestStatuses)
-                        {
-                            <option value="@status">@status</option>
-                        }
-                    </select>
-                </div>
-                <div class="col-md-3">
-                    <label class="form-label small">Priority</label>
-                    <select class="form-select" @onchange="OnPriorityFilterChanged">
-                        <option value="">All Priorities</option>
-                        @foreach (var priority in ApplicationConstants.MaintenanceRequestPriorities.AllMaintenanceRequestPriorities)
-                        {
-                            <option value="@priority">@priority</option>
-                        }
-                    </select>
-                </div>
-                <div class="col-md-3">
-                    <label class="form-label small">Request Type</label>
-                    <select class="form-select" @onchange="OnTypeFilterChanged">
-                        <option value="">All Types</option>
-                        @foreach (var type in ApplicationConstants.MaintenanceRequestTypes.AllMaintenanceRequestTypes)
-                        {
-                            <option value="@type">@type</option>
-                        }
-                    </select>
-                </div>
-                <div class="col-md-3 d-flex align-items-end">
-                    <button class="btn btn-outline-secondary w-100" @onclick="ClearFilters">
-                        <i class="bi bi-x-circle"></i> Clear Filters
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Overdue Requests -->
-    @if (overdueRequests.Any())
-    {
-        <div class="card mb-3">
-            <div class="card-header bg-danger text-white">
-                <h5 class="mb-0"><i class="bi bi-exclamation-triangle-fill"></i> Overdue Requests</h5>
-            </div>
-            <div class="card-body p-0">
-                <div class="table-responsive">
-                    <table class="table table-hover mb-0">
-                        <thead>
-                            <tr>
-                                <th>ID</th>
-                                <th>Property</th>
-                                <th>Title</th>
-                                <th>Type</th>
-                                <th>Priority</th>
-                                <th>Scheduled</th>
-                                <th>Days Open</th>
-                                <th>Actions</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            @foreach (var request in overdueRequests)
-                            {
-                                <tr>
-                                    <td>@request.Id</td>
-                                    <td>
-                                        <small>@request.Property?.Address</small>
-                                    </td>
-                                    <td>@request.Title</td>
-                                    <td><small>@request.RequestType</small></td>
-                                    <td><span class="badge @request.PriorityBadgeClass">@request.Priority</span></td>
-                                    <td><small>@request.ScheduledOn?.ToString("MMM dd")</small></td>
-                                    <td><span class="badge bg-danger">@request.DaysOpen days</span></td>
-                                    <td>
-                                        <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewRequest(request.Id)">
-                                            <i class="bi bi-eye"></i>
-                                        </button>
-                                    </td>
-                                </tr>
-                            }
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-    }
-
-    <!-- All Requests -->
-    <div class="card">
-        <div class="card-header">
-            <h5 class="mb-0">
-                <i class="bi bi-list-ul"></i> 
-                @if (!string.IsNullOrEmpty(currentStatusFilter))
-                {
-                    <span>@currentStatusFilter Requests</span>
-                }
-                else
-                {
-                    <span>All Requests</span>
-                }
-                <small class="text-muted">(@filteredRequests.Count)</small>
-            </h5>
-        </div>
-        <div class="card-body p-0">
-            @if (filteredRequests.Any())
-            {
-                <div class="table-responsive">
-                    <table class="table table-hover mb-0">
-                        <thead>
-                            <tr>
-                                <th>ID</th>
-                                <th>Property</th>
-                                <th>Title</th>
-                                <th>Type</th>
-                                <th>Priority</th>
-                                <th>Status</th>
-                                <th>Requested</th>
-                                <th>Assigned To</th>
-                                <th>Actions</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            @foreach (var request in filteredRequests)
-                            {
-                                <tr>
-                                    <td>@request.Id</td>
-                                    <td>
-                                        <small>@request.Property?.Address</small>
-                                    </td>
-                                    <td>
-                                        @request.Title
-                                        @if (request.IsOverdue)
-                                        {
-                                            <i class="bi bi-exclamation-triangle-fill text-danger" title="Overdue"></i>
-                                        }
-                                    </td>
-                                    <td><small>@request.RequestType</small></td>
-                                    <td><span class="badge @request.PriorityBadgeClass">@request.Priority</span></td>
-                                    <td><span class="badge @request.StatusBadgeClass">@request.Status</span></td>
-                                    <td><small>@request.RequestedOn.ToString("MMM dd, yyyy")</small></td>
-                                    <td><small>@(string.IsNullOrEmpty(request.AssignedTo) ? "Unassigned" : request.AssignedTo)</small></td>
-                                    <td>
-                                        <div class="btn-group btn-group-sm">
-                                            <button class="btn btn-outline-primary" @onclick="() => ViewRequest(request.Id)" title="View">
-                                                <i class="bi bi-eye"></i>
-                                            </button>
-                                            <button class="btn btn-outline-secondary" @onclick="() => ViewProperty(request.PropertyId)" title="View Property">
-                                                <i class="bi bi-house"></i>
-                                            </button>
-                                        </div>
-                                    </td>
-                                </tr>
-                            }
-                        </tbody>
-                    </table>
-                </div>
-            }
-            else
-            {
-                <div class="text-center py-5">
-                    <i class="bi bi-inbox" style="font-size: 3rem; color: #ccc;"></i>
-                    <p class="text-muted mt-3">No maintenance requests found</p>
-                </div>
-            }
-        </div>
-    </div>
-}
-
-@code {
-    private List<MaintenanceRequest> allRequests = new();
-    private List<MaintenanceRequest> filteredRequests = new();
-    private List<MaintenanceRequest> urgentRequests = new();
-    private List<MaintenanceRequest> inProgressRequests = new();
-    private List<MaintenanceRequest> submittedRequests = new();
-    private List<MaintenanceRequest> completedRequests = new();
-    private List<MaintenanceRequest> overdueRequests = new();
-    
-    private string currentStatusFilter = "";
-    private string currentPriorityFilter = "";
-    private string currentTypeFilter = "";
-    
-    private bool isLoading = true;
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? PropertyId { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadData();
-    }
-
-    private async Task LoadData()
-    {
-        isLoading = true;
-        try
-        {
-            allRequests = await MaintenanceService.GetAllAsync();
-            
-            if (PropertyId.HasValue)
-            {
-                allRequests = allRequests.Where(r => r.PropertyId == PropertyId.Value).ToList();
-            }
-            
-            // Summary cards
-            urgentRequests = allRequests.Where(r => r.Priority == "Urgent" && r.Status != "Completed" && r.Status != "Cancelled").ToList();
-            inProgressRequests = allRequests.Where(r => r.Status == "In Progress").ToList();
-            submittedRequests = allRequests.Where(r => r.Status == "Submitted").ToList();
-            completedRequests = allRequests.Where(r => r.Status == "Completed" && r.CompletedOn?.Month == DateTime.Today.Month).ToList();
-            overdueRequests = await MaintenanceService.GetOverdueMaintenanceRequestsAsync();
-            
-            ApplyFilters();
-        }
-        finally
-        {
-            isLoading = false;
-        }
-    }
-
-    private void ApplyFilters()
-    {
-        filteredRequests = allRequests;
-
-        if (!string.IsNullOrEmpty(currentStatusFilter))
-        {
-            filteredRequests = filteredRequests.Where(r => r.Status == currentStatusFilter).ToList();
-        }
-
-        if (!string.IsNullOrEmpty(currentPriorityFilter))
-        {
-            filteredRequests = filteredRequests.Where(r => r.Priority == currentPriorityFilter).ToList();
-        }
-
-        if (!string.IsNullOrEmpty(currentTypeFilter))
-        {
-            filteredRequests = filteredRequests.Where(r => r.RequestType == currentTypeFilter).ToList();
-        }
-    }
-
-    private void OnStatusFilterChanged(ChangeEventArgs e)
-    {
-        currentStatusFilter = e.Value?.ToString() ?? "";
-        ApplyFilters();
-    }
-
-    private void OnPriorityFilterChanged(ChangeEventArgs e)
-    {
-        currentPriorityFilter = e.Value?.ToString() ?? "";
-        ApplyFilters();
-    }
-
-    private void OnTypeFilterChanged(ChangeEventArgs e)
-    {
-        currentTypeFilter = e.Value?.ToString() ?? "";
-        ApplyFilters();
-    }
-
-    private void ClearFilters()
-    {
-        currentStatusFilter = "";
-        currentPriorityFilter = "";
-        currentTypeFilter = "";
-        ApplyFilters();
-    }
-
-    private void CreateNew()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/maintenance/create");
-    }
-
-    private void ViewRequest(Guid requestId)
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/maintenance/{requestId}");
-    }
-
-    private void ViewProperty(Guid propertyId)
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/properties/{propertyId}");
-    }
-}
+<MaintenanceListForm />
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/View.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/View.razor
index b6aa0f3..87a17e0 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/View.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/View.razor
@@ -1,309 +1,13 @@
-@page "/propertymanagement/maintenance/{Id:guid}"
-
-@using Aquiis.Application.Services
-@using Aquiis.SimpleStart.Shared.Services
-@using Aquiis.Application.Services.PdfGenerators
-
-@inject MaintenanceService MaintenanceService
-@inject NavigationManager NavigationManager
-@inject ToastService ToastService
-
+@page "/propertymanagement/maintenance/{MaintenanceRequestId:guid}"
+@using Aquiis.UI.Shared.Features.PropertyManagement.MaintenanceRequests
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
 <PageTitle>Maintenance Request Details</PageTitle>
 
-@if (isLoading)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (maintenanceRequest == null)
-{
-    <div class="alert alert-warning">
-        <i class="bi bi-exclamation-triangle"></i> Maintenance request not found.
-    </div>
-}
-else
-{
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <h1><i class="bi bi-tools"></i> Maintenance Request #@maintenanceRequest.Id</h1>
-        <div class="btn-group">
-            <button class="btn btn-outline-primary" @onclick="Edit">
-                <i class="bi bi-pencil"></i> Edit
-            </button>
-            <button class="btn btn-outline-secondary" @onclick="GoBack">
-                <i class="bi bi-arrow-left"></i> Back to List
-            </button>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-md-8">
-            <!-- Request Details Card -->
-            <div class="card mb-3">
-                <div class="card-header d-flex justify-content-between align-items-center">
-                    <h5 class="mb-0">Request Details</h5>
-                    <div>
-                        <span class="badge @maintenanceRequest.PriorityBadgeClass me-2">@maintenanceRequest.Priority</span>
-                        <span class="badge @maintenanceRequest.StatusBadgeClass">@maintenanceRequest.Status</span>
-                    </div>
-                </div>
-                <div class="card-body">
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <label class="text-muted small">Property</label>
-                            <p class="mb-0">
-                                <strong>@maintenanceRequest.Property?.Address</strong><br />
-                                <small class="text-muted">@maintenanceRequest.Property?.City, @maintenanceRequest.Property?.State @maintenanceRequest.Property?.ZipCode</small>
-                            </p>
-                        </div>
-                        <div class="col-md-6">
-                            <label class="text-muted small">Request Type</label>
-                            <p class="mb-0"><strong>@maintenanceRequest.RequestType</strong></p>
-                        </div>
-                    </div>
-
-                    <div class="mb-3">
-                        <label class="text-muted small">Title</label>
-                        <p class="mb-0"><strong>@maintenanceRequest.Title</strong></p>
-                    </div>
-
-                    <div class="mb-3">
-                        <label class="text-muted small">Description</label>
-                        <p class="mb-0" style="white-space: pre-wrap;">@maintenanceRequest.Description</p>
-                    </div>
-
-                    @if (maintenanceRequest.LeaseId.HasValue && maintenanceRequest.Lease != null)
-                    {
-                        <div class="mb-3">
-                            <label class="text-muted small">Associated Lease</label>
-                            <p class="mb-0">
-                                Lease #@maintenanceRequest.LeaseId - @maintenanceRequest.Lease.Tenant?.FullName
-                            </p>
-                        </div>
-                    }
-                </div>
-            </div>
-
-            <!-- Contact Information Card -->
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Contact Information</h5>
-                </div>
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-md-4">
-                            <label class="text-muted small">Requested By</label>
-                            <p class="mb-0">@(string.IsNullOrEmpty(maintenanceRequest.RequestedBy) ? "N/A" : maintenanceRequest.RequestedBy)</p>
-                        </div>
-                        <div class="col-md-4">
-                            <label class="text-muted small">Email</label>
-                            <p class="mb-0">@(string.IsNullOrEmpty(maintenanceRequest.RequestedByEmail) ? "N/A" : maintenanceRequest.RequestedByEmail)</p>
-                        </div>
-                        <div class="col-md-4">
-                            <label class="text-muted small">Phone</label>
-                            <p class="mb-0">@(string.IsNullOrEmpty(maintenanceRequest.RequestedByPhone) ? "N/A" : maintenanceRequest.RequestedByPhone)</p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Timeline Card -->
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Timeline</h5>
-                </div>
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-md-4">
-                            <label class="text-muted small">Requested Date</label>
-                            <p class="mb-0">@maintenanceRequest.RequestedOn.ToString("MMM dd, yyyy")</p>
-                        </div>
-                        <div class="col-md-4">
-                            <label class="text-muted small">Scheduled Date</label>
-                            <p class="mb-0">@(maintenanceRequest.ScheduledOn?.ToString("MMM dd, yyyy") ?? "Not scheduled")</p>
-                        </div>
-                        <div class="col-md-4">
-                            <label class="text-muted small">Completed Date</label>
-                            <p class="mb-0">@(maintenanceRequest.CompletedOn?.ToString("MMM dd, yyyy") ?? "Not completed")</p>
-                        </div>
-                    </div>
-
-                    @if (maintenanceRequest.Status != "Completed" && maintenanceRequest.Status != "Cancelled")
-                    {
-                        <div class="mt-3">
-                            <label class="text-muted small">Days Open</label>
-                            <p class="mb-0">
-                                <span class="badge bg-info">@maintenanceRequest.DaysOpen days</span>
-                            </p>
-                        </div>
-                    }
-
-                    @if (maintenanceRequest.IsOverdue)
-                    {
-                        <div class="alert alert-danger mt-3 mb-0">
-                            <i class="bi bi-exclamation-triangle-fill"></i> <strong>Overdue</strong> - Scheduled date has passed
-                        </div>
-                    }
-                </div>
-            </div>
-
-            <!-- Assignment & Cost Card -->
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Assignment & Cost</h5>
-                </div>
-                <div class="card-body">
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <label class="text-muted small">Assigned To</label>
-                            <p class="mb-0">@(string.IsNullOrEmpty(maintenanceRequest.AssignedTo) ? "Unassigned" : maintenanceRequest.AssignedTo)</p>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-6">
-                            <label class="text-muted small">Estimated Cost</label>
-                            <p class="mb-0">@maintenanceRequest.EstimatedCost.ToString("C")</p>
-                        </div>
-                        <div class="col-md-6">
-                            <label class="text-muted small">Actual Cost</label>
-                            <p class="mb-0">@maintenanceRequest.ActualCost.ToString("C")</p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Resolution Notes Card -->
-            @if (!string.IsNullOrEmpty(maintenanceRequest.ResolutionNotes) || maintenanceRequest.Status == "Completed")
-            {
-                <div class="card mb-3">
-                    <div class="card-header">
-                        <h5 class="mb-0">Resolution Notes</h5>
-                    </div>
-                    <div class="card-body">
-                        <p class="mb-0" style="white-space: pre-wrap;">@(string.IsNullOrEmpty(maintenanceRequest.ResolutionNotes) ? "No notes provided" : maintenanceRequest.ResolutionNotes)</p>
-                    </div>
-                </div>
-            }
-        </div>
-
-        <div class="col-md-4">
-            <!-- Quick Actions Card -->
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Quick Actions</h5>
-                </div>
-                <div class="card-body">
-                    @if (maintenanceRequest.Status != "Completed" && maintenanceRequest.Status != "Cancelled")
-                    {
-                        <div class="d-grid gap-2">
-                            @if (maintenanceRequest.Status == "Submitted")
-                            {
-                                <button class="btn btn-warning" @onclick='() => UpdateStatus("In Progress")'>
-                                    <i class="bi bi-play-circle"></i> Start Work
-                                </button>
-                            }
-                            @if (maintenanceRequest.Status == "In Progress")
-                            {
-                                <button class="btn btn-success" @onclick='() => UpdateStatus("Completed")'>
-                                    <i class="bi bi-check-circle"></i> Mark Complete
-                                </button>
-                            }
-                            <button class="btn btn-outline-danger" @onclick='() => UpdateStatus("Cancelled")'>
-                                <i class="bi bi-x-circle"></i> Cancel Request
-                            </button>
-                        </div>
-                    }
-                    else
-                    {
-                        <div class="alert alert-info mb-0">
-                            <i class="bi bi-info-circle"></i> Request is @maintenanceRequest.Status.ToLower()
-                        </div>
-                    }
-                </div>
-            </div>
-
-            <!-- Property Info Card -->
-            @if (maintenanceRequest.Property != null)
-            {
-                <div class="card">
-                    <div class="card-header">
-                        <h5 class="mb-0">Property Info</h5>
-                    </div>
-                    <div class="card-body">
-                        <p class="mb-2"><strong>@maintenanceRequest.Property.Address</strong></p>
-                        <p class="mb-2">
-                            <small class="text-muted">
-                                @maintenanceRequest.Property.City, @maintenanceRequest.Property.State @maintenanceRequest.Property.ZipCode
-                            </small>
-                        </p>
-                        <p class="mb-2">
-                            <small>Type: @maintenanceRequest.Property.PropertyType</small>
-                        </p>
-                        <button class="btn btn-sm btn-outline-primary w-100 mt-2" @onclick="ViewProperty">
-                            <i class="bi bi-house"></i> View Property
-                        </button>
-                    </div>
-                </div>
-            }
-        </div>
-    </div>
-}
+<MaintenanceViewForm MaintenanceRequestId="@MaintenanceRequestId" />
 
 @code {
     [Parameter]
-    public Guid Id { get; set; }
-
-    private MaintenanceRequest? maintenanceRequest;
-    private bool isLoading = true;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadMaintenanceRequest();
-    }
-
-    private async Task LoadMaintenanceRequest()
-    {
-        isLoading = true;
-        try
-        {
-            maintenanceRequest = await MaintenanceService.GetByIdAsync(Id);
-        }
-        finally
-        {
-            isLoading = false;
-        }
-    }
-
-    private async Task UpdateStatus(string newStatus)
-    {
-        if (maintenanceRequest != null)
-        {
-            await MaintenanceService.UpdateMaintenanceRequestStatusAsync(maintenanceRequest.Id, newStatus);
-            ToastService.ShowSuccess($"Maintenance request status updated to '{newStatus}'.");
-            await LoadMaintenanceRequest();
-        }
-    }
-
-    private void Edit()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/maintenance/{Id}/edit");
-    }
-
-    private void ViewProperty()
-    {
-        if (maintenanceRequest?.PropertyId != null)
-        {
-            NavigationManager.NavigateTo($"/propertymanagement/properties/{maintenanceRequest.PropertyId}");
-        }
-    }
-
-    private void GoBack()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/maintenance");
-    }
+    public Guid MaintenanceRequestId { get; set; }
 }
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/_Imports.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/_Imports.razor
deleted file mode 100644
index 538a4b3..0000000
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/MaintenanceRequests/Pages/_Imports.razor
+++ /dev/null
@@ -1,4 +0,0 @@
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using Aquiis.Core.Entities
-@using Aquiis.Core.Constants
-@using Microsoft.AspNetCore.Authorization
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Create.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Create.razor
index 0b9cd96..87052f9 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Create.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Create.razor
@@ -1,285 +1,6 @@
 @page "/propertymanagement/payments/create"
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Forms
-@using System.ComponentModel.DataAnnotations
-@using Microsoft.AspNetCore.Http.HttpResults
-@inject NavigationManager Navigation
-@inject PaymentService PaymentService
-@inject InvoiceService InvoiceService
-
+@using Aquiis.UI.Shared.Features.PropertyManagement.Payments
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Record Payment - Property Management</PageTitle>
-
-<div class="row">
-    <div class="col-lg-8">
-        <div class="d-flex justify-content-between align-items-center mb-4">
-            <h1><span class="bi bi-cash-coin" aria-hidden="true"></span> Record Payment</h1>
-            <button class="btn btn-outline-secondary" @onclick="Cancel">
-                <i class="bi bi-x-lg"></i> Cancel
-            </button>
-        </div>
-
-        @if (invoices == null || !invoices.Any())
-        {
-            <div class="alert alert-warning">
-                <h4>No Unpaid Invoices</h4>
-                <p>There are no outstanding invoices to record payments for.</p>
-                <a href="/propertymanagement/invoices" class="btn btn-primary">Go to Invoices</a>
-            </div>
-        }
-        else
-        {
-            <div class="card">
-                <div class="card-body">
-                    <EditForm Model="paymentModel" OnValidSubmit="HandleCreatePayment" FormName="CreatePayment">
-                        <DataAnnotationsValidator />
-                        <ValidationSummary class="text-danger" />
-
-                        <div class="mb-3">
-                            <label for="invoice" class="form-label">Invoice *</label>
-                            <InputSelect id="invoice" class="form-select" @bind-Value="paymentModel.InvoiceId" @bind-Value:after="OnInvoiceSelected">
-                                <option value="0">-- Select Invoice --</option>
-                                @foreach (var invoice in invoices)
-                                {
-                                    var displayText = $"{invoice.InvoiceNumber} - {invoice.Lease?.Property?.Address} - {invoice.Lease?.Tenant?.FullName} - Balance: {invoice.BalanceDue:C}";
-                                    <option value="@invoice.Id">@displayText</option>
-                                }
-                            </InputSelect>
-                            <ValidationMessage For="() => paymentModel.InvoiceId" />
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="paymentDate" class="form-label">Payment Date *</label>
-                            <InputDate id="paymentDate" class="form-control" @bind-Value="paymentModel.PaidOn" />
-                            <ValidationMessage For="() => paymentModel.PaidOn" />
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="amount" class="form-label">Amount *</label>
-                            <InputNumber id="amount" class="form-control" @bind-Value="paymentModel.Amount" />
-                            <ValidationMessage For="() => paymentModel.Amount" />
-                            @if (selectedInvoice != null)
-                            {
-                                <small class="text-muted">Invoice balance due: @selectedInvoice.BalanceDue.ToString("C")</small>
-                            }
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="paymentMethod" class="form-label">Payment Method *</label>
-                            <InputSelect id="paymentMethod" class="form-select" @bind-Value="paymentModel.PaymentMethod">
-                                <option value="">-- Select Payment Method --</option>
-                                <option value="Cash">Cash</option>
-                                <option value="Check">Check</option>
-                                <option value="Credit Card">Credit Card</option>
-                                <option value="Debit Card">Debit Card</option>
-                                <option value="Bank Transfer">Bank Transfer</option>
-                                <option value="Online Payment">Online Payment</option>
-                                <option value="Other">Other</option>
-                            </InputSelect>
-                            <ValidationMessage For="() => paymentModel.PaymentMethod" />
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="notes" class="form-label">Notes</label>
-                            <InputTextArea id="notes" class="form-control" rows="3" @bind-Value="paymentModel.Notes" />
-                            <ValidationMessage For="() => paymentModel.Notes" />
-                        </div>
-
-                        <div class="d-flex justify-content-between">
-                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                            <button type="submit" class="btn btn-primary">
-                                <i class="bi bi-check-lg"></i> Record Payment
-                            </button>
-                        </div>
-                    </EditForm>
-                </div>
-            </div>
-        }
-    </div>
-
-    <div class="col-lg-4">
-        @if (selectedInvoice != null)
-        {
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h6 class="card-title mb-0">Invoice Summary</h6>
-                </div>
-                <div class="card-body">
-                    <div class="mb-3">
-                        <label class="text-muted small">Invoice Number</label>
-                        <p class="fw-bold">@selectedInvoice.InvoiceNumber</p>
-                    </div>
-                    <div class="mb-3">
-                        <label class="text-muted small">Property</label>
-                        <p>@selectedInvoice.Lease?.Property?.Address</p>
-                    </div>
-                    <div class="mb-3">
-                        <label class="text-muted small">Tenant</label>
-                        <p>@selectedInvoice.Lease?.Tenant?.FullName</p>
-                    </div>
-                    <hr />
-                    <div class="mb-2">
-                        <div class="d-flex justify-content-between">
-                            <span class="text-muted">Invoice Amount:</span>
-                            <span class="fw-bold">@selectedInvoice.Amount.ToString("C")</span>
-                        </div>
-                    </div>
-                    <div class="mb-2">
-                        <div class="d-flex justify-content-between">
-                            <span class="text-muted">Already Paid:</span>
-                            <span class="text-success">@selectedInvoice.AmountPaid.ToString("C")</span>
-                        </div>
-                    </div>
-                    <div class="mb-3">
-                        <div class="d-flex justify-content-between">
-                            <span class="text-muted">Balance Due:</span>
-                            <span class="fw-bold text-danger">@selectedInvoice.BalanceDue.ToString("C")</span>
-                        </div>
-                    </div>
-                    @if (paymentModel.Amount > 0)
-                    {
-                        <hr />
-                        <div class="mb-2">
-                            <div class="d-flex justify-content-between">
-                                <span class="text-muted">This Payment:</span>
-                                <span class="fw-bold text-success">@paymentModel.Amount.ToString("C")</span>
-                            </div>
-                        </div>
-                        <div>
-                            <div class="d-flex justify-content-between">
-                                <span class="text-muted">Remaining Balance:</span>
-                                <span class="fw-bold @(remainingBalance <= 0 ? "text-success" : "text-warning")">
-                                    @remainingBalance.ToString("C")
-                                </span>
-                            </div>
-                        </div>
-                        @if (remainingBalance < 0)
-                        {
-                            <div class="alert alert-warning mt-2 mb-0">
-                                <small>Warning: Payment amount exceeds balance due.</small>
-                            </div>
-                        }
-                        else if (remainingBalance == 0)
-                        {
-                            <div class="alert alert-success mt-2 mb-0">
-                                <small>This payment will mark the invoice as Paid.</small>
-                            </div>
-                        }
-                        else
-                        {
-                            <div class="alert alert-info mt-2 mb-0">
-                                <small>This will be a partial payment.</small>
-                            </div>
-                        }
-                    }
-                </div>
-            </div>
-        }
-        else
-        {
-            <div class="card">
-                <div class="card-body text-center text-muted">
-                    <i class="bi bi-info-circle fs-1"></i>
-                    <p class="mt-2">Select an invoice to see details</p>
-                </div>
-            </div>
-        }
-    </div>
-</div>
-
-@code {
-    private List<Invoice>? invoices;
-    private Invoice? selectedInvoice;
-    private PaymentModel paymentModel = new();
-    private decimal remainingBalance => selectedInvoice != null ? selectedInvoice.BalanceDue - paymentModel.Amount : 0;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? InvoiceId { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        
-            // Get all invoices and filter to those with outstanding balance
-            List<Invoice>? allInvoices = await InvoiceService.GetAllAsync();
-            invoices = allInvoices
-                .Where(i => i.BalanceDue > 0 && i.Status != "Cancelled")
-                .OrderByDescending(i => i.DueOn)
-                .ToList();
-            
-            paymentModel.PaidOn = DateTime.Now;
-            if (InvoiceId.HasValue)
-            {
-                paymentModel.InvoiceId = InvoiceId.Value;
-                await OnInvoiceSelected();
-            }
-    }
-
-    private async Task OnInvoiceSelected()
-    {
-        if (paymentModel.InvoiceId != Guid.Empty)
-        {
-            selectedInvoice = invoices?.FirstOrDefault(i => i.Id == paymentModel.InvoiceId);
-            if (selectedInvoice != null)
-            {
-                // Default payment amount to the balance due
-                paymentModel.Amount = selectedInvoice.BalanceDue;
-            }
-        }
-        else
-        {
-            selectedInvoice = null;
-            paymentModel.Amount = 0;
-        }
-
-        await InvokeAsync(StateHasChanged);
-    }
-
-    private async Task HandleCreatePayment()
-    {
-        Payment payment = new Payment
-        {
-            InvoiceId = paymentModel.InvoiceId,
-            PaidOn = paymentModel.PaidOn,
-            Amount = paymentModel.Amount,
-            PaymentMethod = paymentModel.PaymentMethod,
-            Notes = paymentModel.Notes!
-        };
-        await PaymentService.CreateAsync(payment);
-        Navigation.NavigateTo("/propertymanagement/payments");
-    }
-
-    private void Cancel()
-    {
-        Navigation.NavigateTo("/propertymanagement/payments");
-    }
-
-    public class PaymentModel
-    {
-        [Required(ErrorMessage = "Please select an invoice.")]
-        public Guid InvoiceId { get; set; }
-
-        [Required(ErrorMessage = "Payment date is required.")]
-        public DateTime PaidOn { get; set; } = DateTime.Now;
-
-        [Required(ErrorMessage = "Amount is required.")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Amount must be greater than zero.")]
-        public decimal Amount { get; set; }
-
-        [Required(ErrorMessage = "Payment method is required.")]
-        public string PaymentMethod { get; set; } = string.Empty;
-
-        [MaxLength(1000)]
-        public string? Notes { get; set; } = string.Empty;
-    }
-}
+<CreateForm />
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Edit.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Edit.razor
index 10e6073..89d5b17 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Edit.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Edit.razor
@@ -1,278 +1,13 @@
 @page "/propertymanagement/payments/{PaymentId:guid}/edit"
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Forms
-@using System.ComponentModel.DataAnnotations
-@inject NavigationManager Navigation
-@inject PaymentService PaymentService
-
+@using Aquiis.UI.Shared.Features.PropertyManagement.Payments
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
 <PageTitle>Edit Payment - Property Management</PageTitle>
 
-@if (payment == null || paymentModel == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else
-{
-    <div class="row">
-        <div class="col-lg-8">
-            <div class="d-flex justify-content-between align-items-center mb-4">
-                <h1><span class="bi bi-pencil" aria-hidden="true"></span> Edit Payment</h1>
-                <button class="btn btn-outline-secondary" @onclick="Cancel">
-                    <i class="bi bi-x-lg"></i> Cancel
-                </button>
-            </div>
-
-            <div class="card">
-                <div class="card-body">
-                    <EditForm Model="paymentModel" OnValidSubmit="HandleUpdatePayment" FormName="EditPayment">
-                        <DataAnnotationsValidator />
-                        <ValidationSummary class="text-danger" />
-
-                        <div class="mb-3">
-                            <label for="invoice" class="form-label">Invoice</label>
-                            <input type="text" id="invoice" class="form-control" value="@payment.Invoice?.InvoiceNumber" disabled />
-                            <small class="text-muted">Invoice cannot be changed after payment is created.</small>
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="paymentDate" class="form-label">Payment Date *</label>
-                            <InputDate id="paymentDate" class="form-control" @bind-Value="paymentModel.PaidOn" />
-                            <ValidationMessage For="() => paymentModel.PaidOn" />
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="amount" class="form-label">Amount *</label>
-                            <InputNumber id="amount" class="form-control" @bind-Value="paymentModel.Amount" />
-                            <ValidationMessage For="() => paymentModel.Amount" />
-                            @if (payment.Invoice != null)
-                            {
-                                <small class="text-muted">
-                                    Current invoice balance (before this edit): @currentInvoiceBalance.ToString("C")
-                                </small>
-                            }
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="paymentMethod" class="form-label">Payment Method *</label>
-                            <InputSelect id="paymentMethod" class="form-select" @bind-Value="paymentModel.PaymentMethod">
-                                <option value="">-- Select Payment Method --</option>
-                                <option value="Cash">Cash</option>
-                                <option value="Check">Check</option>
-                                <option value="Credit Card">Credit Card</option>
-                                <option value="Debit Card">Debit Card</option>
-                                <option value="Bank Transfer">Bank Transfer</option>
-                                <option value="Online Payment">Online Payment</option>
-                                <option value="Other">Other</option>
-                            </InputSelect>
-                            <ValidationMessage For="() => paymentModel.PaymentMethod" />
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="notes" class="form-label">Notes</label>
-                            <InputTextArea id="notes" class="form-control" rows="3" @bind-Value="paymentModel.Notes" />
-                            <ValidationMessage For="() => paymentModel.Notes" />
-                        </div>
-
-                        <div class="d-flex justify-content-between">
-                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                            <button type="submit" class="btn btn-primary">
-                                <i class="bi bi-check-lg"></i> Save Changes
-                            </button>
-                        </div>
-                    </EditForm>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-lg-4">
-            @if (payment.Invoice != null)
-            {
-                <div class="card mb-3">
-                    <div class="card-header">
-                        <h6 class="card-title mb-0">Invoice Information</h6>
-                    </div>
-                    <div class="card-body">
-                        <div class="mb-3">
-                            <label class="text-muted small">Invoice Number</label>
-                            <p class="fw-bold">
-                                <a href="/propertymanagement/invoices/view/@payment.Invoice.Id">
-                                    @payment.Invoice.InvoiceNumber
-                                </a>
-                            </p>
-                        </div>
-                        <div class="mb-3">
-                            <label class="text-muted small">Property</label>
-                            <p>@payment.Invoice.Lease?.Property?.Address</p>
-                        </div>
-                        <div class="mb-3">
-                            <label class="text-muted small">Tenant</label>
-                            <p>@payment.Invoice.Lease?.Tenant?.FullName</p>
-                        </div>
-                        <hr />
-                        <div class="mb-2">
-                            <div class="d-flex justify-content-between">
-                                <span class="text-muted">Invoice Amount:</span>
-                                <span class="fw-bold">@payment.Invoice.Amount.ToString("C")</span>
-                            </div>
-                        </div>
-                        <div class="mb-2">
-                            <div class="d-flex justify-content-between">
-                                <span class="text-muted">Total Paid:</span>
-                                <span class="text-success">@payment.Invoice.AmountPaid.ToString("C")</span>
-                            </div>
-                        </div>
-                        <div class="mb-3">
-                            <div class="d-flex justify-content-between">
-                                <span class="text-muted">Balance Due:</span>
-                                <span class="fw-bold @(payment.Invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
-                                    @payment.Invoice.BalanceDue.ToString("C")
-                                </span>
-                            </div>
-                        </div>
-                        <div class="mb-2">
-                            <div class="d-flex justify-content-between">
-                                <span class="text-muted">Status:</span>
-                                <span>
-                                    @if (payment.Invoice.Status == "Paid")
-                                    {
-                                        <span class="badge bg-success">@payment.Invoice.Status</span>
-                                    }
-                                    else if (payment.Invoice.Status == "Partial")
-                                    {
-                                        <span class="badge bg-warning">Partially Paid</span>
-                                    }
-                                    else if (payment.Invoice.Status == "Overdue")
-                                    {
-                                        <span class="badge bg-danger">@payment.Invoice.Status</span>
-                                    }
-                                    else
-                                    {
-                                        <span class="badge bg-secondary">@payment.Invoice.Status</span>
-                                    }
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="card">
-                    <div class="card-header">
-                        <h6 class="card-title mb-0">Current Payment</h6>
-                    </div>
-                    <div class="card-body">
-                        <div class="mb-3">
-                            <label class="text-muted small">Original Amount</label>
-                            <p class="fw-bold">@payment.Amount.ToString("C")</p>
-                        </div>
-                        @if (paymentModel.Amount != payment.Amount)
-                        {
-                            <div class="mb-3">
-                                <label class="text-muted small">New Amount</label>
-                                <p class="fw-bold text-primary">@paymentModel.Amount.ToString("C")</p>
-                            </div>
-                            <div class="mb-3">
-                                <label class="text-muted small">Change</label>
-                                <p class="fw-bold @(amountDifference >= 0 ? "text-success" : "text-danger")">
-                                    @(amountDifference >= 0 ? "+" : "")@amountDifference.ToString("C")
-                                </p>
-                            </div>
-                            <hr />
-                            <div>
-                                <label class="text-muted small">New Invoice Balance</label>
-                                <p class="fw-bold @(newInvoiceBalance > 0 ? "text-danger" : "text-success")">
-                                    @newInvoiceBalance.ToString("C")
-                                </p>
-                            </div>
-                            @if (newInvoiceBalance < 0)
-                            {
-                                <div class="alert alert-warning mt-2 mb-0">
-                                    <small>Warning: Total payments exceed invoice amount.</small>
-                                </div>
-                            }
-                            else if (newInvoiceBalance == 0)
-                            {
-                                <div class="alert alert-success mt-2 mb-0">
-                                    <small>Invoice will be marked as Paid.</small>
-                                </div>
-                            }
-                        }
-                    </div>
-                </div>
-            }
-        </div>
-    </div>
-}
+<Aquiis.UI.Shared.Features.PropertyManagement.Payments.EditForm PaymentId="@PaymentId" />
 
 @code {
     [Parameter]
     public Guid PaymentId { get; set; }
-
-    private Payment? payment;
-    private PaymentModel? paymentModel;
-
-    private decimal currentInvoiceBalance => payment?.Invoice != null ? payment.Invoice.BalanceDue + payment.Amount : 0;
-    private decimal amountDifference => paymentModel != null && payment != null ? paymentModel.Amount - payment.Amount : 0;
-    private decimal newInvoiceBalance => currentInvoiceBalance - (paymentModel?.Amount ?? 0) + (payment?.Amount ?? 0);
-
-    protected override async Task OnInitializedAsync()
-    {
-        payment = await PaymentService.GetByIdAsync(PaymentId);
-
-        if (payment == null)
-        {
-            Navigation.NavigateTo("/propertymanagement/payments");
-            return;
-        }
-
-        paymentModel = new PaymentModel
-        {
-            PaidOn = payment.PaidOn,
-            Amount = payment.Amount,
-            PaymentMethod = payment.PaymentMethod,
-            Notes = payment.Notes
-        };
-    }
-
-    private async Task HandleUpdatePayment()
-    {
-        if (payment == null || paymentModel == null) return;
-
-        payment.PaidOn = paymentModel.PaidOn;
-        payment.Amount = paymentModel.Amount;
-        payment.PaymentMethod = paymentModel.PaymentMethod;
-        payment.Notes = paymentModel.Notes!;
-
-        await PaymentService.UpdateAsync(payment);
-        Navigation.NavigateTo("/propertymanagement/payments");
-    }
-
-    private void Cancel()
-    {
-        Navigation.NavigateTo("/propertymanagement/payments");
-    }
-
-    public class PaymentModel
-    {
-        [Required(ErrorMessage = "Payment date is required.")]
-        public DateTime PaidOn { get; set; }
-
-        [Required(ErrorMessage = "Amount is required.")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Amount must be greater than zero.")]
-        public decimal Amount { get; set; }
-
-        [Required(ErrorMessage = "Payment method is required.")]
-        public string PaymentMethod { get; set; } = string.Empty;
-
-        [MaxLength(1000)]
-        public string? Notes { get; set; }
-    }
 }
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Index.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Index.razor
index 2eb4402..beb63e4 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Index.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/Index.razor
@@ -1,492 +1,6 @@
 @page "/propertymanagement/payments"
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Forms
-@inject NavigationManager Navigation
-@inject PaymentService PaymentService
-@inject IJSRuntime JSRuntime
-
+@using Aquiis.UI.Shared.Features.PropertyManagement.Payments
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Payments - Property Management</PageTitle>
-
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <h1><span class="bi bi-cash-coin" aria-hidden="true"></span> Payments</h1>
-    <button class="btn btn-primary" @onclick="CreatePayment">
-        <i class="bi bi-plus-lg"></i> Record Payment
-    </button>
-</div>
-
-@if (payments == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!payments.Any())
-{
-    <div class="alert alert-info">
-        <h4>No Payments Found</h4>
-        <p>Get started by recording your first payment.</p>
-        <button class="btn btn-primary" @onclick="CreatePayment">Record First Payment</button>
-    </div>
-}
-else
-{
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="input-group">
-                <span class="input-group-text"><i class="bi bi-search"></i></span>
-                <input type="text" class="form-control" placeholder="Search payments..." @bind="searchTerm" @onkeyup="FilterPayments" />
-            </div>
-        </div>
-        <div class="col-md-3">
-            <select class="form-select" @bind="selectedMethod" @bind:after="FilterPayments">
-                <option value="">All Payment Methods</option>
-                <option value="Cash">Cash</option>
-                <option value="Check">Check</option>
-                <option value="Credit Card">Credit Card</option>
-                <option value="Debit Card">Debit Card</option>
-                <option value="Bank Transfer">Bank Transfer</option>
-                <option value="Online Payment">Online Payment</option>
-                <option value="Other">Other</option>
-            </select>
-        </div>
-        <div class="col-md-3">
-            <div class="form-check form-switch pt-2">
-                <input class="form-check-input" type="checkbox" id="groupByInvoice" @bind="groupByInvoice" @bind:after="FilterPayments">
-                <label class="form-check-label" for="groupByInvoice">
-                    Group by Invoice
-                </label>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <button class="btn btn-outline-secondary" @onclick="ClearFilters">
-                <i class="bi bi-x-circle"></i> Clear Filters
-            </button>
-        </div>
-    </div>
-
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="card text-white bg-success">
-                <div class="card-body">
-                    <h6>Total Payments</h6>
-                    <h4>@paymentsCount</h4>
-                    <small>@totalAmount.ToString("C")</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-primary">
-                <div class="card-body">
-                    <h6>This Month</h6>
-                    <h4>@thisMonthCount</h4>
-                    <small>@thisMonthAmount.ToString("C")</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-info">
-                <div class="card-body">
-                    <h6>This Year</h6>
-                    <h4>@thisYearCount</h4>
-                    <small>@thisYearAmount.ToString("C")</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-warning">
-                <div class="card-body">
-                    <h6>Average Payment</h6>
-                    <h4>@averageAmount.ToString("C")</h4>
-                    <small>Per transaction</small>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="card">
-        <div class="card-body">
-            @if (groupByInvoice)
-            {
-                @foreach (var invoiceGroup in groupedPayments)
-                {
-                    var invoice = invoiceGroup.First().Invoice;
-                    var invoiceTotal = invoiceGroup.Sum(p => p.Amount);
-                    var isExpanded = expandedInvoices.Contains(invoiceGroup.Key);
-                    
-                    <div class="card mb-3">
-                        <div class="card-header" style="cursor: pointer;" @onclick="() => ToggleInvoiceGroup(invoiceGroup.Key)">
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div>
-                                    <i class="bi @(isExpanded ? "bi-chevron-down" : "bi-chevron-right")"></i>
-                                    <strong>Invoice: @invoice?.InvoiceNumber</strong>
-                                    <span class="ms-3 text-muted">@invoice?.Lease?.Property?.Address</span>
-                                    <span class="ms-2 text-muted">• @invoice?.Lease?.Tenant?.FullName</span>
-                                </div>
-                                <div>
-                                    <span class="badge bg-secondary me-2">@invoiceGroup.Count() payment(s)</span>
-                                    <strong class="text-success">@invoiceTotal.ToString("C")</strong>
-                                </div>
-                            </div>
-                        </div>
-                        @if (isExpanded)
-                        {
-                            <div class="card-body p-0">
-                                <table class="table table-hover mb-0">
-                                    <thead class="table-light">
-                                        <tr>
-                                            <th>Payment Date</th>
-                                            <th>Amount</th>
-                                            <th>Payment Method</th>
-                                            <th>Notes</th>
-                                            <th>Actions</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach (var payment in invoiceGroup)
-                                        {
-                                            <tr @onclick="() => ViewPayment(payment.Id)" style="cursor: pointer;">
-                                                <td>@payment.PaidOn.ToString("MMM dd, yyyy")</td>
-                                                <td><strong class="text-success">@payment.Amount.ToString("C")</strong></td>
-                                                <td><span class="badge bg-secondary">@payment.PaymentMethod</span></td>
-                                                <td>@(string.IsNullOrEmpty(payment.Notes) ? "-" : payment.Notes)</td>
-                                                <td @onclick:stopPropagation="true">
-                                                    <div class="btn-group" role="group">
-                                                        <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewPayment(payment.Id)" title="View">
-                                                            <i class="bi bi-eye"></i>
-                                                        </button>
-                                                        <button class="btn btn-sm btn-outline-secondary" @onclick="() => EditPayment(payment.Id)" title="Edit">
-                                                            <i class="bi bi-pencil"></i>
-                                                        </button>
-                                                        <button class="btn btn-sm btn-outline-danger" @onclick="() => DeletePayment(payment)" title="Delete">
-                                                            <i class="bi bi-trash"></i>
-                                                        </button>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                        }
-                                    </tbody>
-                                </table>
-                            </div>
-                        }
-                    </div>
-                }
-            }
-            else
-            {
-                <div class="table-responsive">
-                    <table class="table table-hover">
-                        <thead>
-                            <tr>
-                                <th>
-                                    <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Payment.PaidOn))">
-                                        Payment Date
-                                        @if (sortColumn == nameof(Payment.PaidOn))
-                                        {
-                                            <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                        }
-                                    </button>
-                                </th>
-                                <th>Invoice #</th>
-                                <th>Property</th>
-                                <th>Tenant</th>
-                                <th>
-                                    <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Payment.Amount))">
-                                        Amount
-                                        @if (sortColumn == nameof(Payment.Amount))
-                                        {
-                                            <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                        }
-                                    </button>
-                                </th>
-                                <th>Payment Method</th>
-                                <th>Actions</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            @foreach (var payment in pagedPayments)
-                            {
-                                <tr @onclick="() => ViewPayment(payment.Id)" style="cursor: pointer;">
-                                    <td>@payment.PaidOn.ToString("MMM dd, yyyy")</td>
-                                    <td>
-                                        <a href="/propertymanagement/invoices/view/@payment.InvoiceId" @onclick:stopPropagation="true">
-                                            @payment.Invoice?.InvoiceNumber
-                                        </a>
-                                    </td>
-                                    <td>@payment.Invoice?.Lease?.Property?.Address</td>
-                                    <td>@payment.Invoice?.Lease?.Tenant?.FullName</td>
-                                    <td><strong class="text-success">@payment.Amount.ToString("C")</strong></td>
-                                    <td>
-                                        <span class="badge bg-secondary">@payment.PaymentMethod</span>
-                                    </td>
-                                    <td @onclick:stopPropagation="true">
-                                        <div class="btn-group" role="group">
-                                            <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewPayment(payment.Id)" title="View">
-                                                <i class="bi bi-eye"></i>
-                                            </button>
-                                            <button class="btn btn-sm btn-outline-secondary" @onclick="() => EditPayment(payment.Id)" title="Edit">
-                                                <i class="bi bi-pencil"></i>
-                                            </button>
-                                            <button class="btn btn-sm btn-outline-danger" @onclick="() => DeletePayment(payment)" title="Delete">
-                                                <i class="bi bi-trash"></i>
-                                            </button>
-                                        </div>
-                                    </td>
-                                </tr>
-                            }
-                        </tbody>
-                    </table>
-                </div>
-            }
-
-            @if (totalPages > 1 && !groupByInvoice)
-            {
-                <div class="d-flex justify-content-between align-items-center mt-3">
-                    <div>
-                        <select class="form-select form-select-sm" @bind="pageSize" @bind:after="UpdatePagination">
-                            <option value="10">10 per page</option>
-                            <option value="20">20 per page</option>
-                            <option value="50">50 per page</option>
-                            <option value="100">100 per page</option>
-                        </select>
-                    </div>
-                    <div class="text-muted">
-                        Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords payments
-                    </div>
-                    <nav>
-                        <ul class="pagination pagination-sm mb-0">
-                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                <button class="page-link" @onclick="FirstPage" disabled="@(currentPage == 1)">
-                                    <i class="bi bi-chevron-double-left"></i>
-                                </button>
-                            </li>
-                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                <button class="page-link" @onclick="PreviousPage" disabled="@(currentPage == 1)">
-                                    <i class="bi bi-chevron-left"></i>
-                                </button>
-                            </li>
-                            @for (int i = Math.Max(1, currentPage - 2); i <= Math.Min(totalPages, currentPage + 2); i++)
-                            {
-                                var pageNum = i;
-                                <li class="page-item @(currentPage == pageNum ? "active" : "")">
-                                    <button class="page-link" @onclick="() => GoToPage(pageNum)">@pageNum</button>
-                                </li>
-                            }
-                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                <button class="page-link" @onclick="NextPage" disabled="@(currentPage == totalPages)">
-                                    <i class="bi bi-chevron-right"></i>
-                                </button>
-                            </li>
-                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                <button class="page-link" @onclick="LastPage" disabled="@(currentPage == totalPages)">
-                                    <i class="bi bi-chevron-double-right"></i>
-                                </button>
-                            </li>
-                        </ul>
-                    </nav>
-                </div>
-            }
-        </div>
-    </div>
-}
-
-@code {
-    private List<Payment>? payments;
-    private List<Payment> filteredPayments = new();
-    private List<Payment> pagedPayments = new();
-    private IEnumerable<IGrouping<Guid, Payment>> groupedPayments = Enumerable.Empty<IGrouping<Guid, Payment>>();
-    private HashSet<Guid> expandedInvoices = new();
-    private string searchTerm = string.Empty;
-    private string selectedMethod = string.Empty;
-    private string sortColumn = nameof(Payment.PaidOn);
-    private bool sortAscending = false;
-    private bool groupByInvoice = true;
-    
-    private int paymentsCount = 0;
-    private int thisMonthCount = 0;
-    private int thisYearCount = 0;
-    private decimal totalAmount = 0;
-    private decimal thisMonthAmount = 0;
-    private decimal thisYearAmount = 0;
-    private decimal averageAmount = 0;
-    
-    private int currentPage = 1;
-    private int pageSize = 20;
-    private int totalPages = 1;
-    private int totalRecords = 0;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadPayments();
-    }
-
-    private async Task LoadPayments()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (!string.IsNullOrEmpty(userId))
-        {
-            payments = await PaymentService.GetAllAsync();
-            FilterPayments();
-            UpdateStatistics();
-        }
-    }
-
-    private void FilterPayments()
-    {
-        if (payments == null) return;
-
-        filteredPayments = payments.Where(p =>
-        {
-            bool matchesSearch = string.IsNullOrWhiteSpace(searchTerm) ||
-                (p.Invoice?.InvoiceNumber?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ?? false) ||
-                (p.Invoice?.Lease?.Property?.Address?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ?? false) ||
-                (p.Invoice?.Lease?.Tenant?.FullName?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ?? false) ||
-                p.PaymentMethod.Contains(searchTerm, StringComparison.OrdinalIgnoreCase);
-
-            bool matchesMethod = string.IsNullOrWhiteSpace(selectedMethod) ||
-                p.PaymentMethod.Equals(selectedMethod, StringComparison.OrdinalIgnoreCase);
-
-            return matchesSearch && matchesMethod;
-        }).ToList();
-
-        SortPayments();
-        
-        if (groupByInvoice)
-        {
-            groupedPayments = filteredPayments
-                .GroupBy(p => p.InvoiceId)
-                .OrderByDescending(g => g.Max(p => p.PaidOn))
-                .ToList();
-        }
-        else
-        {
-            UpdatePagination();
-        }
-    }
-
-    private void ToggleInvoiceGroup(Guid invoiceId)
-    {
-        if (expandedInvoices.Contains(invoiceId))
-        {
-            expandedInvoices.Remove(invoiceId);
-        }
-        else
-        {
-            expandedInvoices.Add(invoiceId);
-        }
-    }
-
-    private void SortBy(string column)
-    {
-        if (sortColumn == column)
-        {
-            sortAscending = !sortAscending;
-        }
-        else
-        {
-            sortColumn = column;
-            sortAscending = true;
-        }
-        SortPayments();
-        UpdatePagination();
-    }
-
-    private void SortPayments()
-    {
-        filteredPayments = sortColumn switch
-        {
-            nameof(Payment.PaidOn) => sortAscending
-                ? filteredPayments.OrderBy(p => p.PaidOn).ToList()
-                : filteredPayments.OrderByDescending(p => p.PaidOn).ToList(),
-            nameof(Payment.Amount) => sortAscending
-                ? filteredPayments.OrderBy(p => p.Amount).ToList()
-                : filteredPayments.OrderByDescending(p => p.Amount).ToList(),
-            _ => filteredPayments.OrderByDescending(p => p.PaidOn).ToList()
-        };
-    }
-
-    private void UpdateStatistics()
-    {
-        if (payments == null) return;
-
-        var now = DateTime.Now;
-        var firstDayOfMonth = new DateTime(now.Year, now.Month, 1);
-        var firstDayOfYear = new DateTime(now.Year, 1, 1);
-
-        paymentsCount = payments.Count;
-        thisMonthCount = payments.Count(p => p.PaidOn >= firstDayOfMonth);
-        thisYearCount = payments.Count(p => p.PaidOn >= firstDayOfYear);
-        
-        totalAmount = payments.Sum(p => p.Amount);
-        thisMonthAmount = payments.Where(p => p.PaidOn >= firstDayOfMonth).Sum(p => p.Amount);
-        thisYearAmount = payments.Where(p => p.PaidOn >= firstDayOfYear).Sum(p => p.Amount);
-        averageAmount = paymentsCount > 0 ? totalAmount / paymentsCount : 0;
-    }
-
-    private void UpdatePagination()
-    {
-        totalRecords = filteredPayments.Count;
-        totalPages = (int)Math.Ceiling(totalRecords / (double)pageSize);
-        currentPage = Math.Min(currentPage, Math.Max(1, totalPages));
-        
-        pagedPayments = filteredPayments
-            .Skip((currentPage - 1) * pageSize)
-            .Take(pageSize)
-            .ToList();
-    }
-
-    private void ClearFilters()
-    {
-        searchTerm = string.Empty;
-        selectedMethod = string.Empty;
-        groupByInvoice = false;
-        FilterPayments();
-    }
-
-    private void FirstPage() => GoToPage(1);
-    private void LastPage() => GoToPage(totalPages);
-    private void NextPage() => GoToPage(currentPage + 1);
-    private void PreviousPage() => GoToPage(currentPage - 1);
-    
-    private void GoToPage(int page)
-    {
-        currentPage = Math.Max(1, Math.Min(page, totalPages));
-        UpdatePagination();
-    }
-
-    private void CreatePayment()
-    {
-        Navigation.NavigateTo("/propertymanagement/payments/create");
-    }
-
-    private void ViewPayment(Guid id)
-    {
-        Navigation.NavigateTo($"/propertymanagement/payments/{id}");
-    }
-
-    private void EditPayment(Guid id)
-    {
-        Navigation.NavigateTo($"/propertymanagement/payments/{id}/edit");
-    }
-
-    private async Task DeletePayment(Payment payment)
-    {
-        if (await JSRuntime.InvokeAsync<bool>("confirm", $"Are you sure you want to delete this payment of {payment.Amount:C}?"))
-        {
-            await PaymentService.DeleteAsync(payment.Id);
-            await LoadPayments();
-        }
-    }
-}
+<ListForm />
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/View.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/View.razor
index cbe6ad0..fcffe53 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/View.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/View.razor
@@ -1,417 +1,13 @@
 @page "/propertymanagement/payments/{PaymentId:guid}"
-
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Authorization
-@inject NavigationManager Navigation
-@inject PaymentService PaymentService
-@inject Application.Services.DocumentService DocumentService
-@inject UserContextService UserContextService
-@inject IJSRuntime JSRuntime
-
+@using Aquiis.UI.Shared.Features.PropertyManagement.Payments
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
 <PageTitle>View Payment - Property Management</PageTitle>
 
-@if (payment == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else
-{
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <div>
-            <h1><span class="bi bi-cash-coin" aria-hidden="true"></span> Payment Details</h1>
-            <p class="text-muted">Payment Date: @payment.PaidOn.ToString("MMMM dd, yyyy")</p>
-        </div>
-        <div>
-            <button class="btn btn-outline-secondary me-2" @onclick="GoBack">
-                <i class="bi bi-arrow-left"></i> Back to Payments
-            </button>
-            <button class="btn btn-primary" @onclick="EditPayment">
-                <i class="bi bi-pencil"></i> Edit
-            </button>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-lg-8">
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="card-title mb-0">Payment Information</h5>
-                </div>
-                <div class="card-body">
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <label class="text-muted small">Payment Date</label>
-                            <p class="fw-bold">@payment.PaidOn.ToString("MMMM dd, yyyy")</p>
-                        </div>
-                        <div class="col-md-6">
-                            <label class="text-muted small">Amount</label>
-                            <p class="fw-bold text-success fs-4">@payment.Amount.ToString("C")</p>
-                        </div>
-                    </div>
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <label class="text-muted small">Payment Method</label>
-                            <p class="fw-bold">
-                                <span class="badge bg-secondary">@payment.PaymentMethod</span>
-                            </p>
-                        </div>
-                    </div>
-                    @if (!string.IsNullOrWhiteSpace(payment.Notes))
-                    {
-                        <div class="row">
-                            <div class="col-12">
-                                <label class="text-muted small">Notes</label>
-                                <p>@payment.Notes</p>
-                            </div>
-                        </div>
-                    }
-                </div>
-            </div>
-
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="card-title mb-0">Invoice Information</h5>
-                </div>
-                <div class="card-body">
-                    @if (payment.Invoice != null)
-                    {
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="text-muted small">Invoice Number</label>
-                                <p class="fw-bold">
-                                    <a href="/propertymanagement/invoices/view/@payment.Invoice.Id">
-                                        @payment.Invoice.InvoiceNumber
-                                    </a>
-                                </p>
-                            </div>
-                            <div class="col-md-6">
-                                <label class="text-muted small">Invoice Status</label>
-                                <p>
-                                    @if (payment.Invoice.Status == "Paid")
-                                    {
-                                        <span class="badge bg-success">@payment.Invoice.Status</span>
-                                    }
-                                    else if (payment.Invoice.Status == "Partial")
-                                    {
-                                        <span class="badge bg-warning">Partially Paid</span>
-                                    }
-                                    else if (payment.Invoice.Status == "Overdue")
-                                    {
-                                        <span class="badge bg-danger">@payment.Invoice.Status</span>
-                                    }
-                                    else
-                                    {
-                                        <span class="badge bg-secondary">@payment.Invoice.Status</span>
-                                    }
-                                </p>
-                            </div>
-                        </div>
-                        <div class="row mb-3">
-                            <div class="col-md-4">
-                                <label class="text-muted small">Invoice Amount</label>
-                                <p class="fw-bold">@payment.Invoice.Amount.ToString("C")</p>
-                            </div>
-                            <div class="col-md-4">
-                                <label class="text-muted small">Total Paid</label>
-                                <p class="fw-bold text-success">@payment.Invoice.AmountPaid.ToString("C")</p>
-                            </div>
-                            <div class="col-md-4">
-                                <label class="text-muted small">Balance Due</label>
-                                <p class="fw-bold @(payment.Invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
-                                    @payment.Invoice.BalanceDue.ToString("C")
-                                </p>
-                            </div>
-                        </div>
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="text-muted small">Invoice Date</label>
-                                <p>@payment.Invoice.InvoicedOn.ToString("MMM dd, yyyy")</p>
-                            </div>
-                            <div class="col-md-6">
-                                <label class="text-muted small">Due Date</label>
-                                <p class="@(payment.Invoice.IsOverdue ? "text-danger fw-bold" : "")">
-                                    @payment.Invoice.DueOn.ToString("MMM dd, yyyy")
-                                    @if (payment.Invoice.IsOverdue)
-                                    {
-                                        <span class="badge bg-danger ms-2">@payment.Invoice.DaysOverdue days overdue</span>
-                                    }
-                                </p>
-                            </div>
-                        </div>
-                        @if (!string.IsNullOrWhiteSpace(payment.Invoice.Description))
-                        {
-                            <div class="row">
-                                <div class="col-12">
-                                    <label class="text-muted small">Description</label>
-                                    <p>@payment.Invoice.Description</p>
-                                </div>
-                            </div>
-                        }
-                    }
-                </div>
-            </div>
-
-            @if (payment.Invoice?.Lease != null)
-            {
-                <div class="card mb-3">
-                    <div class="card-header">
-                        <h5 class="card-title mb-0">Lease & Property Information</h5>
-                    </div>
-                    <div class="card-body">
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="text-muted small">Property Address</label>
-                                <p class="fw-bold">
-                                    <a href="/propertymanagement/properties/view/@payment.Invoice.Lease.PropertyId">
-                                        @payment.Invoice.Lease.Property?.Address
-                                    </a>
-                                </p>
-                            </div>
-                            <div class="col-md-6">
-                                <label class="text-muted small">Tenant</label>
-                                <p class="fw-bold">
-                                    <a href="/propertymanagement/tenants/view/@payment.Invoice.Lease.TenantId">
-                                        @payment.Invoice.Lease.Tenant?.FullName
-                                    </a>
-                                </p>
-                            </div>
-                        </div>
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="text-muted small">Monthly Rent</label>
-                                <p class="fw-bold">@payment.Invoice.Lease.MonthlyRent.ToString("C")</p>
-                            </div>
-                            <div class="col-md-6">
-                                <label class="text-muted small">Lease Status</label>
-                                <p>
-                                    @if (payment.Invoice.Lease.Status == "Active")
-                                    {
-                                        <span class="badge bg-success">@payment.Invoice.Lease.Status</span>
-                                    }
-                                    else if (payment.Invoice.Lease.Status == "Expired")
-                                    {
-                                        <span class="badge bg-danger">@payment.Invoice.Lease.Status</span>
-                                    }
-                                    else
-                                    {
-                                        <span class="badge bg-secondary">@payment.Invoice.Lease.Status</span>
-                                    }
-                                </p>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-6">
-                                <label class="text-muted small">Lease Start</label>
-                                <p>@payment.Invoice.Lease.StartDate.ToString("MMM dd, yyyy")</p>
-                            </div>
-                            <div class="col-md-6">
-                                <label class="text-muted small">Lease End</label>
-                                <p>@payment.Invoice.Lease.EndDate.ToString("MMM dd, yyyy")</p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            }
-        </div>
-
-        <div class="col-lg-4">
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h6 class="card-title mb-0">Quick Actions</h6>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-primary" @onclick="EditPayment">
-                            <i class="bi bi-pencil"></i> Edit Payment
-                        </button>
-                        @if (payment.DocumentId == null)
-                        {
-                            <button class="btn btn-outline-success" @onclick="GeneratePaymentReceipt" disabled="@isGenerating">
-                                @if (isGenerating)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-1" role="status"></span>
-                                }
-                                else
-                                {
-                                    <i class="bi bi-file-pdf"></i>
-                                }
-                                Generate Receipt
-                            </button>
-                        }
-                        else
-                        {
-                            <button class="btn btn-success" @onclick="ViewDocument">
-                                <i class="bi bi-eye"></i> View Receipt
-                            </button>
-                            <button class="btn btn-outline-success" @onclick="DownloadDocument">
-                                <i class="bi bi-download"></i> Download Receipt
-                            </button>
-                        }
-                        <a href="/propertymanagement/invoices/view/@payment.InvoiceId" class="btn btn-outline-primary">
-                            <i class="bi bi-receipt"></i> View Invoice
-                        </a>
-                        @if (payment.Invoice?.Lease != null)
-                        {
-                            <a href="/propertymanagement/leases/view/@payment.Invoice.LeaseId" class="btn btn-outline-secondary">
-                                <i class="bi bi-file-text"></i> View Lease
-                            </a>
-                            <a href="/propertymanagement/properties/view/@payment.Invoice.Lease.PropertyId" class="btn btn-outline-secondary">
-                                <i class="bi bi-house"></i> View Property
-                            </a>
-                            <a href="/propertymanagement/tenants/view/@payment.Invoice.Lease.TenantId" class="btn btn-outline-secondary">
-                                <i class="bi bi-person"></i> View Tenant
-                            </a>
-                        }
-                    </div>
-                </div>
-            </div>
-
-            <div class="card">
-                <div class="card-header">
-                    <h6 class="card-title mb-0">Metadata</h6>
-                </div>
-                <div class="card-body">
-                    <div class="mb-3">
-                        <label class="text-muted small">Created</label>
-                        <p class="mb-0">@payment.CreatedOn.ToString("g")</p>
-                        @if (!string.IsNullOrEmpty(payment.CreatedBy))
-                        {
-                            <small class="text-muted">by @payment.CreatedBy</small>
-                        }
-                    </div>
-                    @if (payment.LastModifiedOn.HasValue)
-                    {
-                        <div>
-                            <label class="text-muted small">Last Modified</label>
-                            <p class="mb-0">@payment.LastModifiedOn.Value.ToString("g")</p>
-                            @if (!string.IsNullOrEmpty(payment.LastModifiedBy))
-                            {
-                                <small class="text-muted">by @payment.LastModifiedBy</small>
-                            }
-                        </div>
-                    }
-                </div>
-            </div>
-        </div>
-    </div>
-}
+<ViewForm PaymentId="@PaymentId" />
 
 @code {
     [Parameter]
     public Guid PaymentId { get; set; }
-
-    private Payment? payment;
-    private bool isGenerating = false;
-    private Document? document = null;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        payment = await PaymentService.GetByIdAsync(PaymentId);
-        
-        if (payment == null)
-        {
-            Navigation.NavigateTo("/propertymanagement/payments");
-        }
-        else if (payment.DocumentId != null)
-        {
-            // Load the document if it exists
-            document = await DocumentService.GetByIdAsync(payment.DocumentId.Value);
-        }
-    }
-
-    private void EditPayment()
-    {
-        Navigation.NavigateTo($"/propertymanagement/payments/{PaymentId}/edit");
-    }
-
-    private void GoBack()
-    {
-        Navigation.NavigateTo("/propertymanagement/payments");
-    }
-
-    private async Task ViewDocument()
-    {
-        if (document != null)
-        {
-            var base64Data = Convert.ToBase64String(document.FileData);
-            await JSRuntime.InvokeVoidAsync("viewFile", base64Data, document.FileType);
-        }
-    }
-
-    private async Task DownloadDocument()
-    {
-        if (document != null)
-        {
-            var fileName = document.FileName;
-            var fileData = document.FileData;
-            var mimeType = document.FileType;
-
-            await JSRuntime.InvokeVoidAsync("downloadFile", fileName, Convert.ToBase64String(fileData), mimeType);
-        }
-    }
-
-    private async Task GeneratePaymentReceipt()
-    {
-        isGenerating = true;
-        StateHasChanged();
-
-        try
-        {
-            // Generate the PDF receipt
-            byte[] pdfBytes = Aquiis.Application.Services.PdfGenerators.PaymentPdfGenerator.GeneratePaymentReceipt(payment!);
-
-            // Create the document entity
-            var document = new Document
-            {
-                FileName = $"Receipt_{payment!.PaidOn:yyyyMMdd}_{DateTime.Now:HHmmss}.pdf",
-                FileExtension = ".pdf",
-                FileData = pdfBytes,
-                FileSize = pdfBytes.Length,
-                FileType = "application/pdf",
-                ContentType = "application/pdf",
-                DocumentType = "Payment Receipt",
-                Description = $"Payment receipt for {payment.Amount:C} on {payment.PaidOn:MMM dd, yyyy}",
-                LeaseId = payment.Invoice?.LeaseId,
-                PropertyId = payment.Invoice?.Lease?.PropertyId,
-                TenantId = payment.Invoice?.Lease?.TenantId,
-                InvoiceId = payment.InvoiceId,
-                IsDeleted = false
-            };
-
-            // Save to database
-            await DocumentService.CreateAsync(document);
-
-            // Update payment with DocumentId
-            payment.DocumentId = document.Id;
-           
-            await PaymentService.UpdateAsync(payment);
-
-            // Reload payment and document
-            this.document = document;
-            StateHasChanged();
-
-            await JSRuntime.InvokeVoidAsync("alert", "Payment receipt generated successfully!");
-        }
-        catch (Exception ex)
-        {
-            await JSRuntime.InvokeVoidAsync("alert", $"Error generating payment receipt: {ex.Message}");
-        }
-        finally
-        {
-            isGenerating = false;
-            StateHasChanged();
-        }
-    }
 }
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/_Imports.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/_Imports.razor
deleted file mode 100644
index 74a1e88..0000000
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Payments/Pages/_Imports.razor
+++ /dev/null
@@ -1,12 +0,0 @@
-@using System.Net.Http
-@using System.Net.Http.Json
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using static Microsoft.AspNetCore.Components.Web.RenderMode
-@using Microsoft.AspNetCore.Components.Web.Virtualization
-@using Microsoft.JSInterop
-@using Aquiis.SimpleStart
-@using Aquiis.Infrastructure.Data
-@using Aquiis.Core.Entities
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Create.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Create.razor
index ad962d9..f0a7f13 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Create.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Create.razor
@@ -1,260 +1,5 @@
 @page "/propertymanagement/properties/create"
-@using Aquiis.Core.Constants
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components
-@using Microsoft.AspNetCore.Components.Forms
-@using System.ComponentModel.DataAnnotations
-@inject NavigationManager Navigation
-@inject PropertyService PropertyService
-
-@rendermode InteractiveServer
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
+@rendermode InteractiveServer
 
-<div class="row">
-    <div class="col-md-8">
-        <div class="card">
-            <div class="card-header">
-                <h3 class="card-title mb-0">Add New Property</h3>
-            </div>
-            <div class="card-body">
-                <EditForm Model="propertyModel" OnValidSubmit="SaveProperty" FormName="create-property">
-                    <DataAnnotationsValidator />
-                    
-                    @if (!string.IsNullOrEmpty(errorMessage))
-                    {
-                        <div class="alert alert-danger" role="alert">
-                            @errorMessage
-                        </div>
-                    }
-
-                    <div class="row">
-                        <div class="col-md-12 mb-3">
-                            <label class="form-label">Address *</label>
-                            <InputText @bind-Value="propertyModel.Address" class="form-control" placeholder="Enter property address" />
-                            <ValidationMessage For="() => propertyModel.Address" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-8 mb-3">
-                            <label class="form-label">Unit Number</label>
-                            <InputText @bind-Value="propertyModel.UnitNumber" class="form-control" placeholder="e.g., Apt 2B, Unit 101" />
-                            <ValidationMessage For="() => propertyModel.UnitNumber" class="text-danger" />
-                        </div>
-                        @* <div class="col-md-4 mb-3">
-                            <label class="form-label" for="@propertyModel.ZipCode">Postal Code</label>
-                            <InputText @bind-Value="propertyModel.ZipCode" class="form-control" placeholder="#####-####" />
-                            <ValidationMessage For="() => propertyModel.ZipCode" class="text-danger" />
-                        </div> *@
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-4 mb-3">
-                            <label class="form-label">City</label>
-                            <InputText @bind-Value="propertyModel.City" class="form-control" placeholder="City" />
-                            <ValidationMessage For="() => propertyModel.City" class="text-danger" />
-                        </div>
-                        <div class="col-md-4 mb-3">
-                            <label class="form-label">State</label>
-                            <InputSelect @bind-Value="propertyModel.State" class="form-select">
-                                <option value="">Select State</option>
-                                @foreach (var state in States.StatesArray())
-                                {
-                                    <option value="@state.Abbreviation">@state.Name</option>
-                                }
-                            </InputSelect>
-                            <ValidationMessage For="() => propertyModel.State" class="text-danger" />
-                        </div>
-                        <div class="col-md-4 mb-3">
-                            <label class="form-label" for="@propertyModel.ZipCode">Postal Code</label>
-                            <InputText @bind-Value="propertyModel.ZipCode" class="form-control" placeholder="#####-####" />
-                            <ValidationMessage For="() => propertyModel.ZipCode" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Property Type *</label>
-                            <InputSelect @bind-Value="propertyModel.PropertyType" class="form-select">
-                                <option value="">Select property type</option>
-                                <option value="House">House</option>
-                                <option value="Apartment">Apartment</option>
-                                <option value="Condo">Condo</option>
-                                <option value="Townhouse">Townhouse</option>
-                                <option value="Duplex">Duplex</option>
-                                <option value="Commercial">Commercial</option>
-                                <option value="Other">Other</option>
-                            </InputSelect>
-                            <ValidationMessage For="() => propertyModel.PropertyType" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Monthly Rent *</label>
-                            <InputNumber @bind-Value="propertyModel.MonthlyRent" class="form-control" placeholder="0.00" />
-                            <ValidationMessage For="() => propertyModel.MonthlyRent" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Status *</label>
-                            <InputSelect @bind-Value="propertyModel.Status" class="form-select">
-                                <option value="@ApplicationConstants.PropertyStatuses.Available">Available</option>
-                                <option value="@ApplicationConstants.PropertyStatuses.ApplicationPending">Application Pending</option>
-                                <option value="@ApplicationConstants.PropertyStatuses.LeasePending">Lease Pending</option>
-                                <option value="@ApplicationConstants.PropertyStatuses.Occupied">Occupied</option>
-                                <option value="@ApplicationConstants.PropertyStatuses.UnderRenovation">Under Renovation</option>
-                                <option value="@ApplicationConstants.PropertyStatuses.OffMarket">Off Market</option>
-                            </InputSelect>
-                            <ValidationMessage For="() => propertyModel.Status" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-4 mb-3">
-                            <label class="form-label">Bedrooms</label>
-                            <InputNumber @bind-Value="propertyModel.Bedrooms" class="form-control" />
-                            <ValidationMessage For="() => propertyModel.Bedrooms" class="text-danger" />
-                        </div>
-                        <div class="col-md-4 mb-3">
-                            <label class="form-label">Bathrooms</label>
-                            <InputNumber @bind-Value="propertyModel.Bathrooms" class="form-control" />
-                            <ValidationMessage For="() => propertyModel.Bathrooms" class="text-danger" />
-                        </div>
-                        <div class="col-md-4 mb-3">
-                            <label class="form-label">Square Feet</label>
-                            <InputNumber @bind-Value="propertyModel.SquareFeet" class="form-control" />
-                            <ValidationMessage For="() => propertyModel.SquareFeet" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-12 mb-3">
-                            <label class="form-label">Description</label>
-                            <InputTextArea @bind-Value="propertyModel.Description" class="form-control" rows="4" placeholder="Property description and features" />
-                            <ValidationMessage For="() => propertyModel.Description" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-12 mb-3">
-                            <div class="form-check">
-                                <InputCheckbox @bind-Value="propertyModel.IsAvailable" class="form-check-input" />
-                                <label class="form-check-label">
-                                    Property is available for rent
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="d-flex gap-2">
-                        <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                            }
-                            Create Property
-                        </button>
-                        <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
-                    </div>
-                </EditForm>
-            </div>
-        </div>
-    </div>
-</div>
-
-@code {
-    private PropertyModel propertyModel = new();
-     private bool isSubmitting = false;
-    private string errorMessage = string.Empty;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    private async Task SaveProperty()
-    {
-        isSubmitting = true;
-        errorMessage = string.Empty;
-
-        var property = new Property
-        {
-            Address = propertyModel.Address,
-            UnitNumber = propertyModel.UnitNumber,
-            City = propertyModel.City,
-            State = propertyModel.State,
-            ZipCode = propertyModel.ZipCode,
-            PropertyType = propertyModel.PropertyType,
-            MonthlyRent = propertyModel.MonthlyRent,
-            Bedrooms = propertyModel.Bedrooms,
-            Bathrooms = propertyModel.Bathrooms,
-            SquareFeet = propertyModel.SquareFeet,
-            Description = propertyModel.Description,
-            Status = propertyModel.Status,
-            IsAvailable = propertyModel.IsAvailable,
-        };
-
-        // Save the property using a service or API call
-        await PropertyService.CreateAsync(property);
-
-        isSubmitting = false;
-        // Redirect to the properties list page after successful addition
-        Navigation.NavigateTo("/propertymanagement/properties");
-    }
-
-    private void Cancel()
-    {
-        Navigation.NavigateTo("/propertymanagement/properties");
-    }
-
-
-    public class PropertyModel
-    {
-        [Required(ErrorMessage = "Address is required")]
-        [StringLength(200, ErrorMessage = "Address cannot exceed 200 characters")]
-        public string Address { get; set; } = string.Empty;
-
-        [StringLength(50, ErrorMessage = "Unit number cannot exceed 50 characters")]
-        public string? UnitNumber { get; set; }
-
-        [StringLength(100, ErrorMessage = "City cannot exceed 100 characters")]
-        public string City { get; set; } = string.Empty;
-
-        [StringLength(50, ErrorMessage = "State cannot exceed 50 characters")]
-        public string State { get; set; } = string.Empty;
-
-        [StringLength(10, ErrorMessage = "Zip Code cannot exceed 10 characters")]
-        [DataType(DataType.PostalCode)]
-        [RegularExpression(@"^\d{5}(-\d{4})?$", ErrorMessage = "Invalid Zip Code format.")]
-        [MaxLength(10, ErrorMessage = "Zip Code cannot exceed 10 characters.")]
-        [Display(Name = "Postal Code", Description = "Postal Code of the property",
-            Prompt = "e.g., 12345 or 12345-6789", ShortName = "ZIP")]
-        public string ZipCode { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Property type is required")]
-        [StringLength(50, ErrorMessage = "Property type cannot exceed 50 characters")]
-        public string PropertyType { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Monthly rent is required")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Monthly rent must be greater than 0")]
-        public decimal MonthlyRent { get; set; }
-
-        [Range(0, int.MaxValue, ErrorMessage = "Bedrooms cannot be negative")]
-        public int Bedrooms { get; set; }
-
-        [Range(0.0, double.MaxValue, ErrorMessage = "Bathrooms cannot be negative")]
-        public decimal Bathrooms { get; set; }
-
-        [Range(0, int.MaxValue, ErrorMessage = "Square feet cannot be negative")]
-        public int SquareFeet { get; set; }
-
-        [StringLength(1000, ErrorMessage = "Description cannot exceed 1000 characters")]
-        public string Description { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Status is required")]
-        [StringLength(50, ErrorMessage = "Status cannot exceed 50 characters")]
-        public string Status { get; set; } = ApplicationConstants.PropertyStatuses.Available;
-
-        public bool IsAvailable { get; set; } = true;
-    }
-}
\ No newline at end of file
+<Aquiis.UI.Shared.Features.PropertyManagement.Properties.PropertyCreateForm />
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Delete.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Delete.razor
new file mode 100644
index 0000000..413b7d6
--- /dev/null
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Delete.razor
@@ -0,0 +1,327 @@
+@page "/propertymanagement/properties/delete/{PropertyId:guid}"
+
+@inject PropertyService PropertyService
+@inject LeaseService LeaseService
+@inject InspectionService InspectionService
+@inject InvoiceService InvoiceService
+@inject NavigationManager Navigation
+
+@attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
+@rendermode InteractiveServer
+
+<PageTitle>Delete Property - Aquiis</PageTitle>
+
+<div class="container-fluid">
+    @if (isLoading)
+    {
+        <div class="text-center mt-5">
+            <div class="spinner-border text-primary" role="status">
+                <span class="visually-hidden">Loading...</span>
+            </div>
+        </div>
+    }
+    else if (property == null)
+    {
+        <div class="alert alert-danger mt-3">
+            <i class="bi bi-exclamation-triangle-fill"></i> Property not found.
+        </div>
+    }
+    else
+    {
+        <div class="row mt-3">
+            <div class="col-12">
+                <div class="d-flex align-items-center mb-3">
+                    <button class="btn btn-outline-secondary me-3" @onclick="Cancel">
+                        <i class="bi bi-arrow-left"></i> Back
+                    </button>
+                    <h2 class="mb-0">Delete Property</h2>
+                </div>
+
+                <div class="card">
+                    <div class="card-body">
+                        <h5 class="card-title">@property.Address</h5>
+                        <p class="text-muted">@property.City, @property.State @property.ZipCode</p>
+
+                        @if (hasBlockers)
+                        {
+                            <div class="alert alert-warning">
+                                <h5><i class="bi bi-exclamation-triangle-fill"></i> Cannot Delete Property</h5>
+                                <p>The following items must be resolved before this property can be deleted:</p>
+                            </div>
+
+                            @if (activeLeases.Any() || upcomingLeases.Any())
+                            {
+                                <div class="card mb-3">
+                                    <div class="card-header bg-warning bg-opacity-10">
+                                        <h6 class="mb-0"><i class="bi bi-file-earmark-text"></i> Active or Upcoming Leases (@(activeLeases.Count + upcomingLeases.Count))</h6>
+                                    </div>
+                                    <div class="card-body">
+                                        <p class="mb-2">Terminate or decline these leases before deleting the property:</p>
+                                        <ul class="list-group list-group-flush">
+                                            @foreach (var lease in activeLeases)
+                                            {
+                                                <li class="list-group-item">
+                                                    <div class="d-flex justify-content-between align-items-center">
+                                                        <div>
+                                                            <strong>@lease.Tenant?.FullName</strong>
+                                                            <br />
+                                                            <small class="text-muted">
+                                                                Status: <span class="badge bg-success">@lease.Status</span> | 
+                                                                @lease.StartDate.ToString("MM/dd/yyyy") - @lease.EndDate.ToString("MM/dd/yyyy")
+                                                            </small>
+                                                        </div>
+                                                        <a href="/propertymanagement/leases/@lease.Id" class="btn btn-sm btn-outline-primary">
+                                                            <i class="bi bi-eye"></i> View
+                                                        </a>
+                                                    </div>
+                                                </li>
+                                            }
+                                            @foreach (var lease in upcomingLeases)
+                                            {
+                                                <li class="list-group-item">
+                                                    <div class="d-flex justify-content-between align-items-center">
+                                                        <div>
+                                                            <strong>@lease.Tenant?.FullName</strong>
+                                                            <br />
+                                                            <small class="text-muted">
+                                                                Status: <span class="badge bg-info">@lease.Status</span> | 
+                                                                @lease.StartDate.ToString("MM/dd/yyyy") - @lease.EndDate.ToString("MM/dd/yyyy")
+                                                            </small>
+                                                        </div>
+                                                        <a href="/propertymanagement/leases/@lease.Id" class="btn btn-sm btn-outline-primary">
+                                                            <i class="bi bi-eye"></i> View
+                                                        </a>
+                                                    </div>
+                                                </li>
+                                            }
+                                        </ul>
+                                    </div>
+                                </div>
+                            }
+
+                            @if (outstandingInspections.Any())
+                            {
+                                <div class="card mb-3">
+                                    <div class="card-header bg-warning bg-opacity-10">
+                                        <h6 class="mb-0"><i class="bi bi-clipboard-check"></i> Inspections with Action Items (@outstandingInspections.Count)</h6>
+                                    </div>
+                                    <div class="card-body">
+                                        <p class="mb-2">Complete or resolve these action items:</p>
+                                        <ul class="list-group list-group-flush">
+                                            @foreach (var inspection in outstandingInspections)
+                                            {
+                                                <li class="list-group-item">
+                                                    <div class="d-flex justify-content-between align-items-start">
+                                                        <div>
+                                                            <strong>@inspection.InspectionType Inspection</strong>
+                                                            <br />
+                                                            <small class="text-muted">
+                                                                Completed: @inspection.CompletedOn.ToString("MM/dd/yyyy") | 
+                                                                Condition: <span class="badge bg-secondary">@inspection.OverallCondition</span>
+                                                            </small>
+                                                            @if (!string.IsNullOrWhiteSpace(inspection.ActionItemsRequired))
+                                                            {
+                                                                <div class="mt-2">
+                                                                    <strong class="text-danger">Action Items:</strong>
+                                                                    <p class="mb-0 small">@inspection.ActionItemsRequired</p>
+                                                                </div>
+                                                            }
+                                                        </div>
+                                                        <a href="/propertymanagement/inspections/@inspection.Id" class="btn btn-sm btn-outline-primary">
+                                                            <i class="bi bi-eye"></i> View
+                                                        </a>
+                                                    </div>
+                                                </li>
+                                            }
+                                        </ul>
+                                    </div>
+                                </div>
+                            }
+
+                            @if (unpaidInvoices.Any())
+                            {
+                                <div class="card mb-3">
+                                    <div class="card-header bg-warning bg-opacity-10">
+                                        <h6 class="mb-0"><i class="bi bi-receipt"></i> Unpaid Invoices (@unpaidInvoices.Count)</h6>
+                                    </div>
+                                    <div class="card-body">
+                                        <p class="mb-2">Collect payment, void, or cancel these invoices:</p>
+                                        <ul class="list-group list-group-flush">
+                                            @foreach (var invoice in unpaidInvoices)
+                                            {
+                                                <li class="list-group-item">
+                                                    <div class="d-flex justify-content-between align-items-center">
+                                                        <div>
+                                                            <strong>@invoice.InvoiceNumber</strong> - @invoice.Description
+                                                            <br />
+                                                            <small class="text-muted">
+                                                                Status: <span class="badge @GetInvoiceStatusBadgeClass(invoice.Status)">@invoice.Status</span> | 
+                                                                Amount: @invoice.Amount.ToString("C") | 
+                                                                Balance: @invoice.BalanceDue.ToString("C") | 
+                                                                Due: @invoice.DueOn.ToString("MM/dd/yyyy")
+                                                                @if (invoice.IsOverdue)
+                                                                {
+                                                                    <span class="text-danger">(@invoice.DaysOverdue days overdue)</span>
+                                                                }
+                                                            </small>
+                                                        </div>
+                                                        <a href="/propertymanagement/invoices/@invoice.Id" class="btn btn-sm btn-outline-primary">
+                                                            <i class="bi bi-eye"></i> View
+                                                        </a>
+                                                    </div>
+                                                </li>
+                                            }
+                                        </ul>
+                                    </div>
+                                </div>
+                            }
+
+                            <div class="mt-3">
+                                <button class="btn btn-secondary" @onclick="Cancel">
+                                    <i class="bi bi-arrow-left"></i> Go Back
+                                </button>
+                            </div>
+                        }
+                        else
+                        {
+                            <div class="alert alert-danger">
+                                <h5><i class="bi bi-exclamation-triangle-fill"></i> Confirm Deletion</h5>
+                                <p>Are you sure you want to delete this property? This action cannot be undone.</p>
+                                <ul class="mb-0">
+                                    <li>All property information will be permanently removed</li>
+                                    <li>Historical lease and inspection records will be preserved</li>
+                                    <li>This action is irreversible</li>
+                                </ul>
+                            </div>
+
+                            <div class="mt-3">
+                                <button class="btn btn-danger me-2" @onclick="ConfirmDelete" disabled="@isDeleting">
+                                    @if (isDeleting)
+                                    {
+                                        <span class="spinner-border spinner-border-sm me-2" role="status" aria-hidden="true"></span>
+                                    }
+                                    <i class="bi bi-trash"></i> Yes, Delete Property
+                                </button>
+                                <button class="btn btn-secondary" @onclick="Cancel" disabled="@isDeleting">
+                                    <i class="bi bi-x-circle"></i> Cancel
+                                </button>
+                            </div>
+                        }
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+</div>
+
+@code {
+    [Parameter]
+    public Guid PropertyId { get; set; }
+
+    private Property? property;
+    private List<Lease> activeLeases = new();
+    private List<Lease> upcomingLeases = new();
+    private List<Inspection> outstandingInspections = new();
+    private List<Invoice> unpaidInvoices = new();
+
+    private bool isLoading = true;
+    private bool isDeleting = false;
+    private bool hasBlockers = false;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadPropertyAndBlockers();
+    }
+
+    private async Task LoadPropertyAndBlockers()
+    {
+        isLoading = true;
+
+        try
+        {
+            property = await PropertyService.GetByIdAsync(PropertyId);
+
+            if (property != null)
+            {
+                // Check for active/upcoming leases
+                var allLeases = await LeaseService.GetAllAsync();
+                var propertyLeases = allLeases.Where(l => l.PropertyId == PropertyId).ToList();
+
+                activeLeases = propertyLeases
+                    .Where(l => l.Status == ApplicationConstants.LeaseStatuses.Active)
+                    .ToList();
+
+                upcomingLeases = propertyLeases
+                    .Where(l => l.StartDate > DateTime.Today &&
+                                l.Status != ApplicationConstants.LeaseStatuses.Terminated &&
+                                l.Status != ApplicationConstants.LeaseStatuses.Declined &&
+                                l.Status != ApplicationConstants.LeaseStatuses.Expired)
+                    .ToList();
+
+                // Check for inspections with action items
+                var allInspections = await InspectionService.GetAllAsync();
+                outstandingInspections = allInspections
+                    .Where(i => i.PropertyId == PropertyId &&
+                                !string.IsNullOrWhiteSpace(i.ActionItemsRequired))
+                    .ToList();
+
+                // Check for unpaid invoices (through leases)
+                var allInvoices = await InvoiceService.GetAllAsync();
+                var propertyLeaseIds = propertyLeases.Select(l => l.Id).ToHashSet();
+                unpaidInvoices = allInvoices
+                    .Where(inv => propertyLeaseIds.Contains(inv.LeaseId) &&
+                                  inv.Status != ApplicationConstants.InvoiceStatuses.Paid &&
+                                  inv.Status != ApplicationConstants.InvoiceStatuses.Cancelled &&
+                                  inv.Status != ApplicationConstants.InvoiceStatuses.Voided)
+                    .ToList();
+
+                hasBlockers = activeLeases.Any() || upcomingLeases.Any() || 
+                              outstandingInspections.Any() || unpaidInvoices.Any();
+            }
+        }
+        finally
+        {
+            isLoading = false;
+        }
+    }
+
+    private async Task ConfirmDelete()
+    {
+        if (hasBlockers)
+        {
+            return; // Should not happen due to UI hiding the button
+        }
+
+        isDeleting = true;
+
+        try
+        {
+            await PropertyService.DeleteAsync(PropertyId);
+            Navigation.NavigateTo("/propertymanagement/properties");
+        }
+        catch (Exception)
+        {
+            // Handle error (could add error message display)
+            isDeleting = false;
+        }
+    }
+
+    private void Cancel()
+    {
+        Navigation.NavigateTo("/propertymanagement/properties");
+    }
+
+    private string GetInvoiceStatusBadgeClass(string status)
+    {
+        return status switch
+        {
+            ApplicationConstants.InvoiceStatuses.Paid => "bg-success",
+            ApplicationConstants.InvoiceStatuses.Pending => "bg-warning",
+            ApplicationConstants.InvoiceStatuses.Overdue => "bg-danger",
+            ApplicationConstants.InvoiceStatuses.PaidPartial => "bg-info",
+            ApplicationConstants.InvoiceStatuses.Cancelled => "bg-secondary",
+            ApplicationConstants.InvoiceStatuses.Voided => "bg-secondary",
+            _ => "bg-secondary"
+        };
+    }
+}
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Edit.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Edit.razor
index 0556bda..32e746c 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Edit.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Edit.razor
@@ -1,399 +1,11 @@
 @page "/propertymanagement/properties/{PropertyId:guid}/edit"
-
-@using System.ComponentModel.DataAnnotations
-@using Aquiis.Core.Entities
-@using Aquiis.Core.Constants
-@using Microsoft.AspNetCore.Components.Authorization
-@using System.Security.Claims
-@using Microsoft.AspNetCore.Components
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Authorization
-
-@rendermode InteractiveServer
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
-@inject PropertyService PropertyService
-@inject NavigationManager NavigationManager
-
-@if (property == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!isAuthorized)
-{
-    <div class="alert alert-danger">
-        <h4>Access Denied</h4>
-        <p>You don't have permission to edit this property.</p>
-        <a href="/properties" class="btn btn-primary">Back to Properties</a>
-    </div>
-}
-else
-{
-    <div class="row">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">
-                    <h3 class="card-title mb-0">Edit Property</h3>
-                </div>
-                <div class="card-body">
-                    <EditForm Model="propertyModel" OnValidSubmit="UpdatePropertyAsync" FormName="edit-property">
-                        <DataAnnotationsValidator />
-                        
-                        @if (!string.IsNullOrEmpty(errorMessage))
-                        {
-                            <div class="alert alert-danger" role="alert">
-                                @errorMessage
-                            </div>
-                        }
-
-                        @if (!string.IsNullOrEmpty(successMessage))
-                        {
-                            <div class="alert alert-success" role="alert">
-                                @successMessage
-                            </div>
-                        }
-
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <label class="form-label">Address *</label>
-                                <InputText @bind-Value="propertyModel.Address" class="form-control" placeholder="Enter property address" />
-                                <ValidationMessage For="() => propertyModel.Address" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-8 mb-3">
-                                <label class="form-label">Unit Number</label>
-                                <InputText @bind-Value="propertyModel.UnitNumber" class="form-control" placeholder="e.g., Apt 2B, Unit 101" />
-                                <ValidationMessage For="() => propertyModel.UnitNumber" class="text-danger" />
-                            </div>
-                            <div class="col-md-4 mb-3">
-                                <label class="form-label">Zip Code</label>
-                                <InputText @bind-Value="propertyModel.ZipCode" class="form-control" placeholder="Zip Code" />
-                                <ValidationMessage For="() => propertyModel.ZipCode" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-4 mb-3">
-                                <label class="form-label">City</label>
-                                <InputText @bind-Value="propertyModel.City" class="form-control" placeholder="City" />
-                                <ValidationMessage For="() => propertyModel.City" class="text-danger" />
-                            </div>
-                            <div class="col-md-4 mb-3">
-                                <label class="form-label">State</label>
-                                <InputSelect @bind-Value="propertyModel.State" class="form-select">
-                                    <option value="">Select State</option>
-                                    @foreach (var state in States.StatesArray())
-                                    {
-                                        <option value="@state.Abbreviation">@state.Name</option>
-                                    }
-                                </InputSelect>
-                                <ValidationMessage For="() => propertyModel.State" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Property Type *</label>
-                                <InputSelect @bind-Value="propertyModel.PropertyType" class="form-select">
-                                    <option value="">Select property type</option>
-                                    <option value="House">House</option>
-                                    <option value="Apartment">Apartment</option>
-                                    <option value="Condo">Condo</option>
-                                    <option value="Townhouse">Townhouse</option>
-                                    <option value="Duplex">Duplex</option>
-                                    <option value="Commercial">Commercial</option>
-                                    <option value="Other">Other</option>
-                                </InputSelect>
-                                <ValidationMessage For="() => propertyModel.PropertyType" class="text-danger" />
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Monthly Rent *</label>
-                                <InputNumber @bind-Value="propertyModel.MonthlyRent" class="form-control" placeholder="0.00" />
-                                <ValidationMessage For="() => propertyModel.MonthlyRent" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Status *</label>
-                                <InputSelect @bind-Value="propertyModel.Status" class="form-select">
-                                    <option value="@ApplicationConstants.PropertyStatuses.Available">Available</option>
-                                    <option value="@ApplicationConstants.PropertyStatuses.ApplicationPending">Application Pending</option>
-                                    <option value="@ApplicationConstants.PropertyStatuses.LeasePending">Lease Pending</option>
-                                    <option value="@ApplicationConstants.PropertyStatuses.Occupied">Occupied</option>
-                                    <option value="@ApplicationConstants.PropertyStatuses.UnderRenovation">Under Renovation</option>
-                                    <option value="@ApplicationConstants.PropertyStatuses.OffMarket">Off Market</option>
-                                </InputSelect>
-                                <ValidationMessage For="() => propertyModel.Status" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-4 mb-3">
-                                <label class="form-label">Bedrooms</label>
-                                <InputNumber @bind-Value="propertyModel.Bedrooms" class="form-control" />
-                                <ValidationMessage For="() => propertyModel.Bedrooms" class="text-danger" />
-                            </div>
-                            <div class="col-md-4 mb-3">
-                                <label class="form-label">Bathrooms</label>
-                                <InputNumber @bind-Value="propertyModel.Bathrooms" class="form-control" />
-                                <ValidationMessage For="() => propertyModel.Bathrooms" class="text-danger" />
-                            </div>
-                            <div class="col-md-4 mb-3">
-                                <label class="form-label">Square Feet</label>
-                                <InputNumber @bind-Value="propertyModel.SquareFeet" class="form-control" />
-                                <ValidationMessage For="() => propertyModel.SquareFeet" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <label class="form-label">Description</label>
-                                <InputTextArea @bind-Value="propertyModel.Description" class="form-control" rows="4" placeholder="Property description and features" />
-                                <ValidationMessage For="() => propertyModel.Description" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <div class="form-check">
-                                    <InputCheckbox @bind-Value="propertyModel.IsAvailable" class="form-check-input" />
-                                    <label class="form-check-label">
-                                        Property is available for rent
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="d-flex gap-2">
-                            <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                                @if (isSubmitting)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                                }
-                                Update Property
-                            </button>
-                            <button type="button" class="btn btn-secondary" @onclick="ViewProperty">View Property</button>
-                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                        </div>
-                    </EditForm>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-md-4">
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Property Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="ViewProperty">
-                            <i class="bi bi-eye"></i> View Property
-                        </button>
-                        <button class="btn btn-outline-danger" @onclick="DeleteProperty">
-                            <i class="bi bi-trash"></i> Delete Property
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="card mt-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Property Information</h5>
-                </div>
-                <div class="card-body">
-                    <small class="text-muted">
-                        <strong>Created:</strong> @property.CreatedOn.ToString("MMMM dd, yyyy")
-                        <br />
-                        @if (property.LastModifiedOn.HasValue)
-                        {
-                            <strong>Last Modified:</strong> @property.LastModifiedOn.Value.ToString("MMMM dd, yyyy")
-                        }
-                    </small>
-                </div>
-            </div>
-        </div>
-    </div>
-}
+@rendermode InteractiveServer
+@using Aquiis.UI.Shared.Features.PropertyManagement.Properties
 
+<PropertyEditForm PropertyId="@PropertyId" />
 
 @code {
     [Parameter]
     public Guid PropertyId { get; set; }
-
-    private string currentUserId = string.Empty;
-    private string errorMessage = string.Empty;
-
-    private Property? property;
-        private PropertyModel propertyModel = new();
-    private bool isSubmitting = false;
-    private bool isAuthorized = true;
-    private string successMessage = string.Empty;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadPropertyAsync();
-    }
-
-    private async Task LoadPropertyAsync()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (string.IsNullOrEmpty(userId))
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        property = await PropertyService.GetByIdAsync(PropertyId);
-
-        if (property == null)
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        // Map property to model
-        propertyModel = new PropertyModel
-        {
-            Address = property.Address,
-            UnitNumber = property.UnitNumber,
-            City = property.City,
-            State = property.State,
-            ZipCode = property.ZipCode,
-            PropertyType = property.PropertyType,
-            MonthlyRent = property.MonthlyRent,
-            Bedrooms = property.Bedrooms,
-            Bathrooms = property.Bathrooms,
-            SquareFeet = property.SquareFeet,
-            Description = property.Description,
-            Status = property.Status,
-            IsAvailable = property.IsAvailable
-        };
-    }
-
-    private async Task SavePropertyAsync()
-    {
-        if (property != null)
-        {
-            await PropertyService.UpdateAsync(property);
-            NavigationManager.NavigateTo("/propertymanagement/properties");
-        }
-    }
-
-    private async Task DeleteProperty()
-    {
-        if (property != null)
-        {
-            await PropertyService.DeleteAsync(property.Id);
-            NavigationManager.NavigateTo("/propertymanagement/properties");
-        }
-    }
-
-    private void ViewProperty()
-    {
-        if (property != null)
-        {
-            NavigationManager.NavigateTo($"/propertymanagement/properties/{property.Id}");
-        }
-    }
-
-    private async Task UpdatePropertyAsync()
-    {
-        
-        if (property != null)
-        {
-            try {
-            isSubmitting = true;
-            errorMessage = string.Empty;
-            successMessage = string.Empty;
-
-            // Update property with form data
-            property!.Address = propertyModel.Address;
-            property.UnitNumber = propertyModel.UnitNumber;
-            property.City = propertyModel.City;
-            property.State = propertyModel.State;
-            property.ZipCode = propertyModel.ZipCode;
-            property.PropertyType = propertyModel.PropertyType;
-            property.MonthlyRent = propertyModel.MonthlyRent;
-            property.Bedrooms = propertyModel.Bedrooms;
-            property.Bathrooms = propertyModel.Bathrooms;
-            property.SquareFeet = propertyModel.SquareFeet;
-            property.Description = propertyModel.Description;
-            property.Status = propertyModel.Status;
-            property.IsAvailable = propertyModel.IsAvailable;
-
-            await PropertyService.UpdateAsync(property);
-            } catch (Exception ex)
-            {
-                errorMessage = $"An error occurred while updating the property: {ex.Message}";
-            }
-            finally
-            {
-                isSubmitting = false;
-            }
-            NavigationManager.NavigateTo("/propertymanagement/properties");
-        }
-    }
-
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/properties");
-    }
-
-    public class PropertyModel
-    {
-        [Required(ErrorMessage = "Address is required")]
-        [StringLength(200, ErrorMessage = "Address cannot exceed 200 characters")]
-        public string Address { get; set; } = string.Empty;
-
-        [StringLength(50, ErrorMessage = "Unit number cannot exceed 50 characters")]
-        public string? UnitNumber { get; set; }
-
-        [StringLength(100, ErrorMessage = "City cannot exceed 100 characters")]
-        public string City { get; set; } = string.Empty;
-
-        [StringLength(50, ErrorMessage = "State cannot exceed 50 characters")]
-        public string State { get; set; } = string.Empty;
-
-        [StringLength(20, ErrorMessage = "Zip Code cannot exceed 20 characters")]
-        public string ZipCode { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Property type is required")]
-        [StringLength(50, ErrorMessage = "Property type cannot exceed 50 characters")]
-        public string PropertyType { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Monthly rent is required")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Monthly rent must be greater than 0")]
-        public decimal MonthlyRent { get; set; }
-
-        [Range(0, int.MaxValue, ErrorMessage = "Bedrooms cannot be negative")]
-        public int Bedrooms { get; set; }
-
-        [Range(0.0, double.MaxValue, ErrorMessage = "Bathrooms cannot be negative")]
-        public decimal Bathrooms { get; set; }
-
-        [Range(0, int.MaxValue, ErrorMessage = "Square feet cannot be negative")]
-        public int SquareFeet { get; set; }
-
-        [StringLength(1000, ErrorMessage = "Description cannot exceed 1000 characters")]
-        public string Description { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Status is required")]
-        [StringLength(50, ErrorMessage = "Status cannot exceed 50 characters")]
-        public string Status { get; set; } = ApplicationConstants.PropertyStatuses.Available;
-
-        public bool IsAvailable { get; set; } = true;
-    }
-}
\ No newline at end of file
+}
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Index.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Index.razor
index d2ab887..5160bf0 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Index.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/Index.razor
@@ -1,28 +1,26 @@
 @page "/propertymanagement/properties"
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using Aquiis.Core.Constants
-@using Aquiis.UI.Shared.Features.PropertiesManagement.Properties
-@using Microsoft.AspNetCore.Authorization
-@inject NavigationManager Navigation
-@inject PropertyService PropertyService
-@inject IJSRuntime JSRuntime
-@inject UserContextService UserContext
+@using Aquiis.Core.Entities
 
+@inject PropertyService PropertyService
+@inject NavigationManager NavigationManager
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager", "User")]
 @rendermode InteractiveServer
 
+
 <div class="d-flex justify-content-between align-items-center mb-4">
-    <h1><span class="bi bi-house-fill" aria-hidden="true"></span>Properties</h1>
+    <h1><span class="bi bi-house-fill" aria-hidden="true"></span> Properties</h1>
     <div class="btn-group">
         <div class="btn-group me-2" role="group">
-            <button class="btn btn-outline-secondary @(isGridView ? "active" : "")" @onclick="() => SetViewMode(true)" title="Grid View">
+            <button class="btn btn-outline-secondary @(viewMode == PropertyListViewMode.Grid ? "active" : "")" 
+                    @onclick="() => SetViewMode(PropertyListViewMode.Grid)" title="Grid View">
                 <i class="bi bi-grid-3x3-gap"></i>
             </button>
-            <button class="btn btn-outline-secondary @(!isGridView ? "active" : "")" @onclick="() => SetViewMode(false)" title="List View">
+            <button class="btn btn-outline-secondary @(viewMode == PropertyListViewMode.Table ? "active" : "")" 
+                    @onclick="() => SetViewMode(PropertyListViewMode.Table)" title="List View">
                 <i class="bi bi-list-ul"></i>
             </button>
         </div>
-        @if (!isReadOnlyUser)
+        @if (Properties.Count < maxProperties)
         {
             <button class="btn btn-primary" @onclick="CreateProperty">
                 <i class="bi bi-plus-lg"></i> Add Property
@@ -30,530 +28,150 @@
         }
     </div>
 </div>
-
-@if (properties == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!properties.Any())
-{
-    <div class="alert alert-info">
-        <h4>No Properties Found</h4>
-        <p>Get started by adding your first property to the system.</p>
-        <button class="btn btn-primary" @onclick="CreateProperty">Add First Property</button>
-    </div>
-}
-else
-{
-    <div class="row mb-3">
-        <div class="col-md-4">
-            <div class="input-group">
-                <span class="input-group-text"><i class="bi bi-search"></i></span>
-                <input type="text" class="form-control" placeholder="Search properties..." @bind="searchTerm" @onkeyup="FilterProperties" />
-            </div>
-        </div>
-        <div class="col-md-4">
-            <select class="form-select" @bind="selectedPropertyStatus" @bind:after="FilterProperties">
-                <option value="">All Properties</option>
-                <option value="Available">Available</option>
-                <option value="Pending">Pending Lease</option>
-                <option value="Occupied">Occupied</option>
-            </select>
-        </div>
-        <div class="col-md-4">
-            <button class="btn btn-outline-secondary" @onclick="ClearFilters">
-                <i class="bi bi-x-circle"></i> Clear Filters
-            </button>
-        </div>
-    </div>
-
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="card text-white bg-success">
-                <div class="card-body">
-                    <h6>Available</h6>
-                    <h4>@availableCount</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-info">
-                <div class="card-body">
-                    <h6>Pending Lease</h6>
-                    <h4>@pendingCount</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-warning">
-                <div class="card-body">
-                    <h6>Occupied</h6>
-                    <h4>@occupiedCount</h4>
-                </div>
-            </div>
-        </div>
-        @* <div class="col-md-3">
-            <div class="card text-white bg-info">
-                <div class="card-body">
-                    <h6>Total Properties</h6>
-                    <h4>@filteredProperties.Count</h4>
-                </div>
-            </div>
-        </div> *@
-        <div class="col-md-3">
-            <div class="card text-white bg-primary">
-                <div class="card-body">
-                    <h6>Total Rent/Month</h6>
-                    <h4>@totalMonthlyRent.ToString("C")</h4>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    @if (isGridView)
-    {
-        <!-- Grid View -->
-        <div class="row">
-            @foreach (var property in filteredProperties)
-            {
-                <div class="col-md-6 col-lg-4 mb-4" id="property-@property.Id">
-                    <div class="card h-100">
-                        <div class="card-body">
-                            <div class="d-flex justify-content-between align-items-start mb-2">
-                                <h5 class="card-title">@property.Address @(!string.IsNullOrWhiteSpace(property.UnitNumber) ? $", {property.UnitNumber}" : "")</h5>
-                                <span class="badge @GetStatusBadgeClass(property.Status)">
-                                    @property.Status
-                                </span>
-                            </div>
-                            <p class="text-muted mb-2">@property.City, @property.State @property.ZipCode</p>
-                            <p class="card-text mb-2">@property.Description</p>
-                            <div class="row text-center mb-3">
-                                <div class="col-4">
-                                    <small class="text-muted">Bedrooms</small>
-                                    <div class="fw-bold">@property.Bedrooms</div>
-                                </div>
-                                <div class="col-4">
-                                    <small class="text-muted">Bathrooms</small>
-                                    <div class="fw-bold">@property.Bathrooms</div>
-                                </div>
-                                <div class="col-4">
-                                    <small class="text-muted">Sq Ft</small>
-                                    <div class="fw-bold">@property.SquareFeet.ToString("N0")</div>
-                                </div>
-                            </div>
-                            <div class="text-center mb-3">
-                                <span class="h4 text-primary">@property.MonthlyRent.ToString("C")</span>
-                                <small class="text-muted">/month</small>
-                            </div>
-                        </div>
-                        <div class="card-footer">
-                            <div class="btn-group w-100">
-                                <button class="btn btn-outline-primary" @onclick="() => ViewProperty(property.Id)">
-                                    <i class="bi bi-eye"></i> View
-                                </button>
-                                @if (!isReadOnlyUser)
-                                {
-                                    <button class="btn btn-outline-secondary" @onclick="() => EditProperty(property.Id)">
-                                        <i class="bi bi-pencil"></i> Edit
-                                    </button>
-                                    <button class="btn btn-outline-danger" @onclick="() => DeleteProperty(property.Id)">
-                                        <i class="bi bi-trash"></i> Delete
-                                    </button>
-                                }
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            }
-        </div>
-    }
-    else
-    {
-        <!-- Table View -->
-        <div class="card">
-            <div class="card-body p-0">
-                <div class="table-responsive">
-                    <table class="table table-hover mb-0">
-                        <thead>
-                            <tr>
-                                <th @onclick="() => SortTable(nameof(Property.Address))" style="cursor: pointer;">
-                                    Address
-                                    @if (sortColumn == nameof(Property.Address))
-                                    {
-                                        <i class="bi bi-@(sortAscending ? "arrow-up" : "arrow-down")"></i>
-                                    }
-                                </th>
-                                <th @onclick="() => SortTable(nameof(Property.City))" style="cursor: pointer;">
-                                    City
-                                    @if (sortColumn == nameof(Property.City))
-                                    {
-                                        <i class="bi bi-@(sortAscending ? "arrow-up" : "arrow-down")"></i>
-                                    }
-                                </th>
-                                <th @onclick="() => SortTable(nameof(Property.PropertyType))" style="cursor: pointer;">
-                                    Type
-                                    @if (sortColumn == nameof(Property.PropertyType))
-                                    {
-                                        <i class="bi bi-@(sortAscending ? "arrow-up" : "arrow-down")"></i>
-                                    }
-                                </th>
-                                <th class="text-center">Beds</th>
-                                <th class="text-center">Baths</th>
-                                <th class="text-end" @onclick="() => SortTable(nameof(Property.SquareFeet))" style="cursor: pointer;">
-                                    Sq Ft
-                                    @if (sortColumn == nameof(Property.SquareFeet))
-                                    {
-                                        <i class="bi bi-@(sortAscending ? "arrow-up" : "arrow-down")"></i>
-                                    }
-                                </th>
-                                <th @onclick="() => SortTable(nameof(Property.Status))" style="cursor: pointer;">
-                                    Status
-                                    @if (sortColumn == nameof(Property.Status))
-                                    {
-                                        <i class="bi bi-@(sortAscending ? "arrow-up" : "arrow-down")"></i>
-                                    }
-                                </th>
-                                <th class="text-end" @onclick="() => SortTable(nameof(Property.MonthlyRent))" style="cursor: pointer;">
-                                    Rent
-                                    @if (sortColumn == nameof(Property.MonthlyRent))
-                                    {
-                                        <i class="bi bi-@(sortAscending ? "arrow-up" : "arrow-down")"></i>
-                                    }
-                                </th>
-                                <th class="text-center">Actions</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            @foreach (var property in pagedProperties)
-                            {
-                                <tr id="property-@property.Id">
-                                    <td>
-                                        <strong>@property.Address @(!string.IsNullOrWhiteSpace(property.UnitNumber) ? $", {property.UnitNumber}" : "")</strong>
-                                        <br />
-                                        <small class="text-muted">@property.State @property.ZipCode</small>
-                                    </td>
-                                    <td>@property.City</td>
-                                    <td>@property.PropertyType</td>
-                                    <td class="text-center">@property.Bedrooms</td>
-                                    <td class="text-center">@property.Bathrooms</td>
-                                    <td class="text-end">@property.SquareFeet.ToString("N0")</td>
-                                    <td>
-                                        <span class="badge @GetStatusBadgeClass(property.Status)">
-                                            @FormatPropertyStatus(property.Status)
-                                        </span>
-                                    </td>
-                                    <td class="text-end">
-                                        <strong class="text-primary">@property.MonthlyRent.ToString("C")</strong>
-                                    </td>
-                                    <td class="text-center">
-                                        <div class="btn-group btn-group-sm">
-                                            <button class="btn btn-outline-primary" @onclick="() => ViewProperty(property.Id)" title="View">
-                                                <i class="bi bi-eye"></i>
-                                            </button>
-                                            @if (!isReadOnlyUser)
-                                            {
-                                                <button class="btn btn-outline-secondary" @onclick="() => EditProperty(property.Id)" title="Edit">
-                                                    <i class="bi bi-pencil"></i>
-                                                </button>
-                                                <button class="btn btn-outline-danger" @onclick="() => DeleteProperty(property.Id)" title="Delete">
-                                                    <i class="bi bi-trash"></i>
-                                                </button>
-                                            }
-                                        </div>
-                                    </td>
-                                </tr>
-                            }
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            @if (totalPages > 1)
-            {
-                <div class="card-footer">
-                    <div class="d-flex justify-content-between align-items-center">
-                        <div>
-                            <span class="text-muted">Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords properties</span>
-                        </div>
-                        <nav>
-                            <ul class="pagination mb-0">
-                                <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                    <button class="page-link" @onclick="FirstPage" disabled="@(currentPage == 1)">
-                                        <i class="bi bi-chevron-double-left"></i>
-                                    </button>
-                                </li>
-                                <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                    <button class="page-link" @onclick="PreviousPage" disabled="@(currentPage == 1)">
-                                        <i class="bi bi-chevron-left"></i>
-                                    </button>
-                                </li>
-                                @for (int i = Math.Max(1, currentPage - 2); i <= Math.Min(totalPages, currentPage + 2); i++)
-                                {
-                                    var pageNumber = i;
-                                    <li class="page-item @(currentPage == pageNumber ? "active" : "")">
-                                        <button class="page-link" @onclick="() => GoToPage(pageNumber)">@pageNumber</button>
-                                    </li>
-                                }
-                                <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                    <button class="page-link" @onclick="NextPage" disabled="@(currentPage == totalPages)">
-                                        <i class="bi bi-chevron-right"></i>
-                                    </button>
-                                </li>
-                                <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                    <button class="page-link" @onclick="LastPage" disabled="@(currentPage == totalPages)">
-                                        <i class="bi bi-chevron-double-right"></i>
-                                    </button>
-                                </li>
-                            </ul>
-                        </nav>
-                        <div>
-                            <select class="form-select form-select-sm" style="width: auto;" @bind="pageSize" @bind:after="UpdatePagination">
-                                <option value="10">10 per page</option>
-                                <option value="25">25 per page</option>
-                                <option value="50">50 per page</option>
-                                <option value="100">100 per page</option>
-                            </select>
-                        </div>
-                    </div>
-                </div>
-            }
-        </div>
-    }
-}
+<hr />
+<PropertyMetricsCard
+    AvailableCount="@availableProperties"
+    OccupiedCount="@occupiedProperties"
+    TotalMonthlyRent="@totalMonthlyRent"
+    ShowTotalProperties="false" ShowAvailableProperties="true" ShowOccupiedProperties="true" ShowTotalMonthlyRent="true" />
+<hr />
+<PropertyListView Properties="@filteredProperties"
+    ViewMode="@viewMode"
+    SortColumn="@sortColumn"
+    SortAscending="@sortAscending"
+    StatusFilter="@statusFilter"
+    AvailableCount="@availableProperties"
+    OccupiedCount="@occupiedProperties"
+    TotalMonthlyRent="@totalMonthlyRent"
+    OnSort="HandleSort"
+    OnEdit="EditProperty"
+    OnView="ViewPropertyDetails"
+    OnDelete="DeleteProperty"
+    OnStatusFilterChanged="StatusFilterChanged"
+    OnClearFilters="ClearFilters"
+    OnSearchChanged="SearchChanged"
+    SearchTerm="@searchTerm"
+    ShowMetrics="false" />
 
 @code {
-    private List<Property> properties = new();
-    private List<Property> filteredProperties = new();
-    private List<Property> sortedProperties = new();
-    private List<Property> pagedProperties = new();
-    private string searchTerm = string.Empty;
-    private string selectedPropertyStatus = string.Empty;
-    private int availableCount = 0;
-    private int pendingCount = 0;
-    private int occupiedCount = 0;
-    private decimal totalMonthlyRent = 0;
-    private bool isGridView = false;
-    
-    // Sorting
+    private List<Property> Properties = new List<Property>();
+    private List<Property> filteredProperties = new List<Property>();
+    private PropertyListViewMode viewMode = PropertyListViewMode.Table;
     private string sortColumn = nameof(Property.Address);
     private bool sortAscending = true;
-    
-    // Pagination
-    private int currentPage = 1;
-    private int pageSize = 25;
-    private int totalPages = 1;
-    private int totalRecords = 0;
+    private string statusFilter = string.Empty;
+
+    private string searchTerm = string.Empty;
 
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public int? PropertyId { get; set; }
+    private int availableProperties = 0;
 
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+    private int maxProperties = 9;
 
-    private string? currentUserRole;
-    private bool isReadOnlyUser => currentUserRole == ApplicationConstants.OrganizationRoles.User;
+    private int occupiedProperties = 0;
+
+    private decimal totalMonthlyRent = 0.00m;
 
     protected override async Task OnInitializedAsync()
     {
-        // Get current user's role
-        currentUserRole = await UserContext.GetCurrentOrganizationRoleAsync();
+        Properties = await PropertyService.GetAllAsync();
         
-        // Load properties from API or service
-        await LoadProperties();
-        FilterProperties();
-    }
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender && PropertyId.HasValue)
-        {
-            await JSRuntime.InvokeVoidAsync("scrollToElement", $"property-{PropertyId.Value}");
-        }
+        availableProperties = Properties.Where(p => p.IsAvailable).Count();
+        occupiedProperties = Properties.Where(p => !p.IsAvailable).Count();
+        totalMonthlyRent = Properties.Where(p => !p.IsAvailable).Sum(p => p.MonthlyRent);
+        
+        ApplySort();
     }
 
-    private async Task LoadProperties()
+    private void HandleSort((string Column, bool Ascending) sortInfo)
     {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User?.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-        if(string.IsNullOrEmpty(userId)){
-            properties = new List<Property>();
-            return;
-        }
-
-        var allProperties = await PropertyService.GetAllAsync();
-        properties = allProperties.Where(p=>p.IsDeleted==false).ToList();
+        sortColumn = sortInfo.Column;
+        sortAscending = sortInfo.Ascending;
+        ApplySort();
     }
 
-    private void FilterProperties()
+    private void ApplySort()
     {
-        if (properties == null)
-        {
-            filteredProperties = new();
-            return;
-        }
-
-        filteredProperties = properties.Where(p =>
-            (string.IsNullOrEmpty(searchTerm) ||
-             p.Address.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             p.City.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             p.State.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             p.ZipCode.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             p.Description.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             p.PropertyType.Contains(searchTerm, StringComparison.OrdinalIgnoreCase)) &&
-            (string.IsNullOrEmpty(selectedPropertyStatus) || p.Status.ToString() == selectedPropertyStatus)
-        ).ToList();
+        // Apply status filter first
+        var propertiesToSort = string.IsNullOrEmpty(statusFilter) 
+            ? Properties 
+            : Properties.Where(p => p.Status == statusFilter).ToList();
         
-        CalculateMetrics();
-        SortAndPaginateProperties();
-    }
-
-    private void CalculateMetrics(){
-        if (filteredProperties != null)
+        // Then apply sorting
+        filteredProperties = sortColumn switch
         {
-            availableCount = filteredProperties.Count(p => p.Status == ApplicationConstants.PropertyStatuses.Available);
-            pendingCount = filteredProperties.Count(p => p.Status == ApplicationConstants.PropertyStatuses.ApplicationPending || p.Status == ApplicationConstants.PropertyStatuses.LeasePending);
-            occupiedCount = filteredProperties.Count(p => p.Status == ApplicationConstants.PropertyStatuses.Occupied);
-            totalMonthlyRent = filteredProperties.Sum(p => p.MonthlyRent);
-        }
-    }
-
-    private void CreateProperty(){
-        Navigation.NavigateTo("/propertymanagement/properties/create");
+            nameof(Property.Address) => sortAscending 
+                ? propertiesToSort.OrderBy(p => p.Address).ToList()
+                : propertiesToSort.OrderByDescending(p => p.Address).ToList(),
+            nameof(Property.City) => sortAscending
+                ? propertiesToSort.OrderBy(p => p.City).ToList()
+                : propertiesToSort.OrderByDescending(p => p.City).ToList(),
+            nameof(Property.PropertyType) => sortAscending
+                ? propertiesToSort.OrderBy(p => p.PropertyType).ToList()
+                : propertiesToSort.OrderByDescending(p => p.PropertyType).ToList(),
+            nameof(Property.SquareFeet) => sortAscending
+                ? propertiesToSort.OrderBy(p => p.SquareFeet).ToList()
+                : propertiesToSort.OrderByDescending(p => p.SquareFeet).ToList(),
+            nameof(Property.Status) => sortAscending
+                ? propertiesToSort.OrderBy(p => p.Status).ToList()
+                : propertiesToSort.OrderByDescending(p => p.Status).ToList(),
+            nameof(Property.MonthlyRent) => sortAscending
+                ? propertiesToSort.OrderBy(p => p.MonthlyRent).ToList()
+                : propertiesToSort.OrderByDescending(p => p.MonthlyRent).ToList(),
+            _ => propertiesToSort.OrderBy(p => p.Address).ToList()
+        };
     }
 
-    private void ViewProperty(Guid propertyId)
+    private void SetViewMode(PropertyListViewMode mode)
     {
-        Navigation.NavigateTo($"/propertymanagement/properties/{propertyId}");
+        viewMode = mode;
     }
 
-   private void EditProperty(Guid propertyId)
-   {
-       Navigation.NavigateTo($"/propertymanagement/properties/{propertyId}/edit");
-   }
-
-   private async Task DeleteProperty(Guid propertyId)
-   {
-       var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-        
-        if (string.IsNullOrEmpty(userId))
-            return;
-
-        await PropertyService.DeleteAsync(propertyId);
-
-        // Add confirmation dialog in a real application
-        await LoadProperties();
-        FilterProperties();
-        CalculateMetrics();
-   }
-
-    private void ClearFilters()
+    private void StatusFilterChanged(string status)
     {
-        searchTerm = string.Empty;
-        selectedPropertyStatus = string.Empty;
-        FilterProperties();
+        statusFilter = status;
+        ApplySort();
     }
 
-    private void SetViewMode(bool gridView)
+    private void ClearFilters()
     {
-        isGridView = gridView;
+        StatusFilterChanged(string.Empty);
+        SearchChanged(string.Empty);
     }
 
-    private void SortTable(string column)
+    private void SearchChanged(string term)
     {
-        if (sortColumn == column)
+        searchTerm = term;
+        if (string.IsNullOrWhiteSpace(searchTerm))
         {
-            sortAscending = !sortAscending;
+            ApplySort();
         }
         else
         {
-            sortColumn = column;
-            sortAscending = true;
+            filteredProperties = filteredProperties
+                .Where(p => p.Address.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
+                            p.City.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
+                            p.PropertyType.Contains(searchTerm, StringComparison.OrdinalIgnoreCase))
+                .ToList();
         }
-        SortAndPaginateProperties();
-    }
-
-    private void SortAndPaginateProperties()
-    {
-        // Sort
-        sortedProperties = sortColumn switch
-        {
-            nameof(Property.Address) => sortAscending
-                ? filteredProperties.OrderBy(p => p.Address).ToList()
-                : filteredProperties.OrderByDescending(p => p.Address).ToList(),
-            nameof(Property.City) => sortAscending
-                ? filteredProperties.OrderBy(p => p.City).ToList()
-                : filteredProperties.OrderByDescending(p => p.City).ToList(),
-            nameof(Property.PropertyType) => sortAscending
-                ? filteredProperties.OrderBy(p => p.PropertyType).ToList()
-                : filteredProperties.OrderByDescending(p => p.PropertyType).ToList(),
-            nameof(Property.SquareFeet) => sortAscending
-                ? filteredProperties.OrderBy(p => p.SquareFeet).ToList()
-                : filteredProperties.OrderByDescending(p => p.SquareFeet).ToList(),
-            nameof(Property.Status) => sortAscending
-                ? filteredProperties.OrderBy(p => p.Status).ToList()
-                : filteredProperties.OrderByDescending(p => p.Status).ToList(),
-            nameof(Property.MonthlyRent) => sortAscending
-                ? filteredProperties.OrderBy(p => p.MonthlyRent).ToList()
-                : filteredProperties.OrderByDescending(p => p.MonthlyRent).ToList(),
-            _ => filteredProperties.OrderBy(p => p.Address).ToList()
-        };
-
-        // Paginate
-        totalRecords = sortedProperties.Count;
-        totalPages = (int)Math.Ceiling(totalRecords / (double)pageSize);
-        currentPage = Math.Max(1, Math.Min(currentPage, totalPages));
-        
-        pagedProperties = sortedProperties
-            .Skip((currentPage - 1) * pageSize)
-            .Take(pageSize)
-            .ToList();
     }
 
-    private void UpdatePagination()
+    private void CreateProperty()
     {
-        currentPage = 1;
-        SortAndPaginateProperties();
+        NavigationManager.NavigateTo("/propertymanagement/properties/create");
     }
 
-    private void FirstPage() => GoToPage(1);
-    private void LastPage() => GoToPage(totalPages);
-    private void NextPage() => GoToPage(currentPage + 1);
-    private void PreviousPage() => GoToPage(currentPage - 1);
-    
-    private void GoToPage(int page)
+    private void EditProperty(Guid propertyId)
     {
-        currentPage = Math.Max(1, Math.Min(page, totalPages));
-        SortAndPaginateProperties();
+        NavigationManager.NavigateTo($"/propertymanagement/properties/{propertyId}/edit");
     }
 
-    private string GetStatusBadgeClass(string status)
+    private void ViewPropertyDetails(Guid propertyId)
     {
-        return status switch
-        {
-            var s when s == ApplicationConstants.PropertyStatuses.Available => "bg-success",
-            var s when s == ApplicationConstants.PropertyStatuses.ApplicationPending => "bg-info",
-            var s when s == ApplicationConstants.PropertyStatuses.LeasePending => "bg-warning",
-            var s when s == ApplicationConstants.PropertyStatuses.Occupied => "bg-danger",
-            var s when s == ApplicationConstants.PropertyStatuses.UnderRenovation => "bg-secondary",
-            var s when s == ApplicationConstants.PropertyStatuses.OffMarket => "bg-dark",
-            _ => "bg-secondary"
-        };
+        NavigationManager.NavigateTo($"/propertymanagement/properties/{propertyId}");
     }
 
-    private string FormatPropertyStatus(string status)
+    private void DeleteProperty(Guid propertyId)
     {
-        return status switch
-        {
-            var s when s == ApplicationConstants.PropertyStatuses.ApplicationPending => "Application Pending",
-            var s when s == ApplicationConstants.PropertyStatuses.LeasePending => "Lease Pending",
-            var s when s == ApplicationConstants.PropertyStatuses.UnderRenovation => "Under Renovation",
-            var s when s == ApplicationConstants.PropertyStatuses.OffMarket => "Off Market",
-            _ => status
-        };
+        NavigationManager.NavigateTo($"/propertymanagement/properties/delete/{propertyId}");
     }
 }
\ No newline at end of file
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/View.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/View.razor
index 8f30a40..cf62e2e 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/View.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Properties/Pages/View.razor
@@ -1,38 +1,25 @@
 @page "/propertymanagement/properties/{PropertyId:guid}"
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using Aquiis.Core.Constants
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Authorization
+
+@using Aquiis.SimpleStart.Features.PropertyManagement.SecurityDeposits.Pages
+@using Aquiis.SimpleStart.Features.PropertyManagement.Inspections
+@using Aquiis.UI.Shared.Components.Common
+@using Aquiis.UI.Shared.Components.Entities.Documents
+@using Aquiis.UI.Shared.Components.Entities.Inspections
+@using Aquiis.UI.Shared.Components.Entities.Repairs
+@using Aquiis.UI.Shared.Features.PropertyManagement.Properties
+@using Aquiis.UI.Shared.Features.PropertyManagement.Leases
 
 @inject PropertyService PropertyService
-@inject LeaseService LeaseService
-@inject MaintenanceService MaintenanceService
 @inject InspectionService InspectionService
-@inject Application.Services.DocumentService DocumentService
-@inject ChecklistService ChecklistService
-@inject NavigationManager NavigationManager
+@inject LeaseService LeaseService
+@inject RepairService RepairService
+@inject NavigationManager Navigation
 @inject IJSRuntime JSRuntime
+
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-@if (property == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!isAuthorized)
-{
-    <div class="alert alert-danger">
-        <h4>Access Denied</h4>
-        <p>You don't have permission to view this property.</p>
-        <a href="/properties" class="btn btn-primary">Back to Properties</a>
-    </div>
-}
-else
-{
+
     <div class="d-flex justify-content-between align-items-center mb-4">
         <h1>Property Details</h1>
         <div class="btn-group">
@@ -44,583 +31,317 @@ else
             </button>
         </div>
     </div>
-
-    <div class="row">
+    <div class="row mb-4">
         <div class="col-md-8">
-            <div class="card">
-                <div class="card-header d-flex justify-content-between align-items-center">
-                    <h5 class="mb-0">Property Information</h5>
-                    <span class="badge @(property.IsAvailable ? "bg-success" : "bg-warning")">
-                        @(property.IsAvailable ? "Available" : "Occupied")
-                    </span>
-                </div>
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-md-12 mb-3">
-                            <strong>Address:</strong>
-                            <p class="mb-1">@property.Address @(!string.IsNullOrWhiteSpace(property.UnitNumber) ? $", {property.UnitNumber}" : "")</p>
-                            <small class="text-muted">@property.City, @property.State @property.ZipCode</small>
-                        </div>
-                    </div>
 
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Property Type:</strong>
-                            <p>@property.PropertyType</p>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <strong>Monthly Rent:</strong>
-                            <p class="text-success fw-bold">@property.MonthlyRent.ToString("C")</p>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-4 mb-3">
-                            <strong>Bedrooms:</strong>
-                            <p>@property.Bedrooms</p>
-                        </div>
-                        <div class="col-md-4 mb-3">
-                            <strong>Bathrooms:</strong>
-                            <p>@property.Bathrooms</p>
-                        </div>
-                        <div class="col-md-4 mb-3">
-                            <strong>Square Feet:</strong>
-                            <p>@property.SquareFeet.ToString("N0")</p>
-                        </div>
-                    </div>
-
-                    @if (!string.IsNullOrEmpty(property.Description))
-                    {
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <strong>Description:</strong>
-                                <p>@property.Description</p>
-                            </div>
-                        </div>
-                    }
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Created:</strong>
-                            <p>@property.CreatedOn.ToString("MMMM dd, yyyy")</p>
-                        </div>
-                        @if (property.LastModifiedOn.HasValue)
-                        {
-                            <div class="col-md-6 mb-3">
-                                <strong>Last Modified:</strong>
-                                <p>@property.LastModifiedOn.Value.ToString("MMMM dd, yyyy")</p>
-                            </div>
-                        }
-                    </div>
-                </div>
+            <PropertyDetails Property="@property" />
+            <div class="mt-4">
+                <RepairList
+                    Repairs="@property.Repairs.ToList()"
+                    OnViewRepair="ViewRepair"
+                    OnAddRepair="CreateRepair"
+                    OnViewAllRepairs="ViewAllRepairs" />
             </div>
-            <!-- Maintenance Requests Section -->
-            <div class="card mt-3">
-                <div class="card-header d-flex justify-content-between align-items-center">
-                    <h5 class="mb-0">Maintenance Requests</h5>
-                    <button class="btn btn-sm btn-primary" @onclick="CreateMaintenanceRequest">
-                        <i class="bi bi-plus-circle"></i> New Request
-                    </button>
-                </div>
-                <div class="card-body">
-                    @if (maintenanceRequests.Any())
-                    {
-                        <div class="list-group">
-                            @foreach (var request in maintenanceRequests.OrderByDescending(r => r.RequestedOn).Take(5))
-                            {
-                                <div class="list-group-item">
-                                    <div class="d-flex justify-content-between align-items-start">
-                                        <div class="flex-grow-1">
-                                            <div class="d-flex align-items-center mb-1">
-                                                <strong class="me-2">@request.Title</strong>
-                                                <span class="badge @request.PriorityBadgeClass me-1">@request.Priority</span>
-                                                <span class="badge @request.StatusBadgeClass">@request.Status</span>
-                                                @if (request.IsOverdue)
-                                                {
-                                                    <i class="bi bi-exclamation-triangle-fill text-danger ms-2" title="Overdue"></i>
-                                                }
-                                            </div>
-                                            <small class="text-muted d-block mb-1">@request.RequestType</small>
-                                            <small class="text-muted">
-                                                Requested: @request.RequestedOn.ToString("MMM dd, yyyy")
-                                                @if (request.ScheduledOn.HasValue)
-                                                {
-                                                    <span> | Scheduled: @request.ScheduledOn.Value.ToString("MMM dd, yyyy")</span>
-                                                }
-                                            </small>
-                                        </div>
-                                        <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewMaintenanceRequest(request.Id)">
-                                            <i class="bi bi-eye"></i>
-                                        </button>
-                                    </div>
-                                </div>
-                            }
-                        </div>
-                        @if (maintenanceRequests.Count > 5)
-                        {
-                            <div class="mt-2">
-                                <small class="text-muted">Showing 5 of @maintenanceRequests.Count requests</small>
-                            </div>
-                        }
-                        <div class="mt-2">
-                            <button class="btn btn-sm btn-outline-secondary w-100" @onclick="ViewAllMaintenanceRequests">
-                                <i class="bi bi-list-ul"></i> View All Maintenance Requests
-                            </button>
-                        </div>
-                    }
-                    else
-                    {
-                        <div class="text-center text-muted py-3">
-                            <i class="bi bi-tools" style="font-size: 2rem;"></i>
-                            <p class="mb-0 mt-2">No maintenance requests for this property</p>
-                            <button class="btn btn-sm btn-primary mt-2" @onclick="CreateMaintenanceRequest">
-                                <i class="bi bi-plus-circle"></i> Create First Request
-                            </button>
-                        </div>
-                    }
-                </div>
+            <div class="mt-4">
+                <DocumentListView 
+                    Documents="@property.Documents.ToList()" OnViewDocument="ViewDocument" />
             </div>
-            
-            <!-- Documents Section -->
-            @if (propertyDocuments.Any())
-            {
-                <div class="card mt-3">
-                    <div class="card-header d-flex justify-content-between align-items-center">
-                        <h5 class="mb-0">Documents</h5>
-                        <span class="badge bg-secondary">@propertyDocuments.Count</span>
+
+        </div>
+        <div class="col-md-4">
+                <!-- #region Quick Actions Card-->
+                <div class="card">
+                    <div class="card-header">
+                        <h5 class="mb-0">Quick Actions</h5>
                     </div>
                     <div class="card-body">
-                        <div class="list-group">
-                            @foreach (var doc in propertyDocuments.OrderByDescending(d => d.CreatedOn))
+                        <div class="d-grid gap-2">
+                            <button class="btn btn-outline-primary" @onclick="EditProperty">
+                                <i class="bi bi-pencil"></i> Edit Property
+                            </button>
+                            @if (property.IsAvailable)
                             {
-                                <div class="list-group-item">
-                                    <div class="d-flex justify-content-between align-items-start">
-                                        <div class="flex-grow-1">
-                                            <div class="d-flex align-items-center mb-1">
-                                                <i class="bi @GetFileIcon(doc.FileExtension) me-2"></i>
-                                                <strong>@doc.FileName</strong>
-                                            </div>
-                                            @if (!string.IsNullOrEmpty(doc.Description))
-                                            {
-                                                <small class="text-muted d-block">@doc.Description</small>
-                                            }
-                                            <small class="text-muted">
-                                                <span class="badge @GetDocumentTypeBadge(doc.DocumentType)">@doc.DocumentType</span>
-                                                @doc.FileSizeFormatted | @doc.CreatedOn.ToString("MMM dd, yyyy")
-                                            </small>
-                                        </div>
-                                        <div class="btn-group btn-group-sm">
-                                            <button class="btn btn-outline-info" @onclick="() => ViewDocument(doc)" title="View">
-                                                <i class="bi bi-eye"></i>
-                                            </button>
-                                            <button class="btn btn-outline-primary" @onclick="() => DownloadDocument(doc)" title="Download">
-                                                <i class="bi bi-download"></i>
-                                            </button>
-                                        </div>
-                                    </div>
-                                </div>
+                                <button class="btn btn-outline-success" @onclick="CreateLease">
+                                    <i class="bi bi-file-plus"></i> New Lease
+                                </button>
                             }
-                        </div>
-                        <div class="mt-2">
-                            <button class="btn btn-sm btn-outline-secondary w-100" @onclick="ViewDocuments">
-                                <i class="bi bi-folder"></i> View All Documents
+                            else
+                            {
+                                <button class="btn btn-outline-info" @onclick="ViewLease">
+                                    <i class="bi bi-file-text"></i> View Lease
+                                </button>
+                            }
+                            <button class="btn btn-outline-warning" @onclick="CompleteInspection">
+                                <i class="bi bi-clipboard-check"></i> Complete Inspection
+                            </button>
+                            <button class="btn btn-outline-secondary" @onclick="ViewDocuments">
+                                <i class="bi bi-folder"></i> View Documents
                             </button>
                         </div>
                     </div>
                 </div>
-            }
+                <!-- #endregion Quick Actions Card-->
+            <div class="mt-4">
+            <RoutineInspectionCard
+                LastInspection="lastInspection"
+                OnCompleteInspection="CompleteInspection"
+                OnViewInspection="ViewInspection"
+                ShowViewButton = "@showInspectionViewButton"
+                NextInspectionDate="@property.NextRoutineInspectionDueDate" />
+            </div>
         </div>
+    </div>
 
-        <div class="col-md-4">
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Quick Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="EditProperty">
-                            <i class="bi bi-pencil"></i> Edit Property
-                        </button>
-                        @if (property.IsAvailable)
-                        {
-                            <button class="btn btn-outline-success" @onclick="CreateLease">
-                                <i class="bi bi-file-plus"></i> New Lease
-                            </button>
-                        }
-                        else
-                        {
-                            <button class="btn btn-outline-info" @onclick="ViewLease">
-                                <i class="bi bi-file-text"></i> View Lease
-                            </button>
-                        }
-                        <button class="btn btn-outline-warning" @onclick="CreateInspection">
-                            <i class="bi bi-clipboard-check"></i> Complete Inspection
-                        </button>
-                        <button class="btn btn-outline-secondary" @onclick="ViewDocuments">
-                            <i class="bi bi-folder"></i> View Documents
-                        </button>
-                        
+<!-- Modals -->
+<Modal IsVisible="@showLeaseModal" 
+       Title="@($"Lease Details - {selectedLease?.Property?.Address ?? ""}")"
+       Size="ModalSize.Large"
+       OnClose="@CloseLeaseModal">
+    <ChildContent>
+        @if (selectedLease != null)
+        {
+            <div class="container-fluid">
+                <div class="row mb-3">
+                    <div class="col-md-6">
+                        <strong>Tenant:</strong> @selectedLease.Tenant?.FullName
+                    </div>
+                    <div class="col-md-6">
+                        <strong>Status:</strong> <span class="badge bg-success">@selectedLease.Status</span>
                     </div>
                 </div>
-            </div>
-
-            <!-- Routine Inspection Status Card -->
-            <div class="card mt-3">
-                <div class="card-header">
-                    <h5 class="mb-0"><i class="bi bi-clipboard-check"></i> Routine Inspection</h5>
+                <div class="row mb-3">
+                    <div class="col-md-6">
+                        <strong>Start Date:</strong> @selectedLease.StartDate.ToShortDateString()
+                    </div>
+                    <div class="col-md-6">
+                        <strong>End Date:</strong> @selectedLease.EndDate.ToShortDateString()
+                    </div>
                 </div>
-                <div class="card-body">
-                    @if (property.LastRoutineInspectionDate.HasValue)
-                    {
-                        <div class="mb-3">
-                            <strong>Last Routine Inspection:</strong>
-                            <p class="mb-0">@property.LastRoutineInspectionDate.Value.ToString("MMM dd, yyyy")</p>
-                            @if (propertyInspections.Any())
-                            {
-                                var lastInspection = propertyInspections.Where(i => i.CompletedOn == property.LastRoutineInspectionDate.Value && i.InspectionType == "Routine").FirstOrDefault();
-                                <small>
-                                    <a href="/propertymanagement/inspections/view/@lastInspection!.Id" class="text-decoration-none">
-                                        <i class="bi bi-eye"></i> View Last Routine Inspection
-                                    </a>
-                                </small>
-                            }
-                        </div>
-                    }
-                    
-                    @if (property.NextRoutineInspectionDueDate.HasValue)
-                    {
-                        <div class="mb-3">
-                            <strong>Next Routine Inspection Due:</strong>
-                            <p class="mb-0">@property.NextRoutineInspectionDueDate.Value.ToString("MMM dd, yyyy")</p>
-                        </div>
-                        
-                        <div class="mb-3">
-                            <strong>Status:</strong>
-                            <p class="mb-0">
-                                <span class="badge @GetInspectionStatusBadge(property.InspectionStatus)">
-                                    @property.InspectionStatus
-                                </span>
-                            </p>
-                        </div>
-
-                        @if (property.IsInspectionOverdue)
-                        {
-                            <div class="alert alert-danger py-2 mb-2">
-                                <small>
-                                    <i class="bi bi-exclamation-triangle-fill"></i>
-                                    <strong>Overdue by @property.DaysOverdue days</strong>
-                                </small>
-                            </div>
-                        }
-                        else if (property.DaysUntilInspectionDue <= 30)
-                        {
-                            <div class="alert alert-warning py-2 mb-2">
-                                <small>
-                                    <i class="bi bi-exclamation-circle-fill"></i>
-                                    <strong>Due in @property.DaysUntilInspectionDue days</strong>
-                                </small>
-                            </div>
-                        }
-                    }
-                    else
-                    {
-                        <div class="alert alert-info py-2 mb-2">
-                            <small><i class="bi bi-info-circle"></i> No inspection scheduled</small>
-                        </div>
-                    }
-
-                    <div class="d-grid">
-                        <button class="btn btn-sm btn-outline-warning" @onclick="CreateInspection">
-                            <i class="bi bi-clipboard-check"></i> Complete Routine Inspection
-                        </button>
+                <div class="row mb-3">
+                    <div class="col-md-6">
+                        <strong>Monthly Rent:</strong> @selectedLease.MonthlyRent.ToString("C")
+                    </div>
+                    <div class="col-md-6">
+                        <strong>Security Deposit:</strong> @selectedLease.SecurityDeposit.ToString("C")
                     </div>
                 </div>
             </div>
-
-            @if (activeLeases.Any())
-            {
-                <div class="card mt-3">
-                    <div class="card-header">
-                        <h5 class="mb-0">Active Leases</h5>
+        }
+    </ChildContent>
+    <FooterContent>
+        <button class="btn btn-outline-secondary" @onclick="@(() => ViewLeaseFullPage(selectedLease!.Id))">
+            <i class="bi bi-arrows-fullscreen"></i> View Full Page
+        </button>
+        <button class="btn btn-secondary" @onclick="@CloseLeaseModal">Close</button>
+    </FooterContent>
+</Modal>
+
+<Modal IsVisible="@showRepairModal" 
+       Title="@($"Repair Details - {selectedRepair?.Property?.Address ?? ""}")"
+       Size="ModalSize.Large"
+       OnClose="@CloseRepairModal">
+    <ChildContent>
+        @if (selectedRepair != null)
+        {
+            <div class="container-fluid">
+                <div class="row mb-3">
+                    <div class="col-md-6">
+                        <strong>Repair Type:</strong> @selectedRepair.RepairType
                     </div>
-                    <div class="card-body">
-                        @foreach (var lease in activeLeases)
-                        {
-                            <div class="border-bottom pb-2 mb-2">
-                                <strong>@lease.Tenant?.FullName</strong>
-                                <br />
-                                <small class="text-muted">
-                                    @lease.StartDate.ToString("MMM dd, yyyy") - @lease.EndDate.ToString("MMM dd, yyyy")
-                                </small>
-                                <br />
-                                <small class="text-success">@lease.MonthlyRent.ToString("C")/month</small>
-                            </div>
-                        }
+                    <div class="col-md-6">
+                        <strong>Contractor:</strong> @selectedRepair.ContractorName
                     </div>
                 </div>
-            }
-
-            <!-- Completed Checklists Section -->
-            <div class="card mt-3">
-                <div class="card-header d-flex justify-content-between align-items-center">
-                    <h5 class="mb-0">Completed Checklists</h5>
-                    <button class="btn btn-sm btn-primary" @onclick="CreateChecklist">
-                        <i class="bi bi-plus-circle"></i> New Checklist
-                    </button>
+                <div class="row mb-3">
+                    <div class="col-12">
+                        <strong>Description:</strong>
+                        <p class="mt-2">@selectedRepair.Description</p>
+                    </div>
                 </div>
-                <div class="card-body">
-                    @if (propertyChecklists.Any())
-                    {
-                        <div class="list-group">
-                            @foreach (var checklist in propertyChecklists.OrderByDescending(c => c.CompletedOn ?? c.CreatedOn).Take(5))
-                            {
-                                <div class="list-group-item">
-                                    <div class="d-flex justify-content-between align-items-start">
-                                        <div class="flex-grow-1">
-                                            <div class="d-flex align-items-center mb-1">
-                                                <strong class="me-2">@checklist.Name</strong>
-                                                <span class="badge @GetChecklistStatusBadge(checklist.Status)">@checklist.Status</span>
-                                            </div>
-                                            <small class="text-muted d-block mb-1">@checklist.ChecklistType</small>
-                                            <small class="text-muted">
-                                                @if (checklist.CompletedOn.HasValue)
-                                                {
-                                                    <span>Completed: @checklist.CompletedOn.Value.ToString("MMM dd, yyyy")</span>
-                                                }
-                                                else
-                                                {
-                                                    <span>Created: @checklist.CreatedOn.ToString("MMM dd, yyyy")</span>
-                                                }
-                                            </small>
-                                        </div>
-                                        <div class="btn-group btn-group-sm">
-                                            <button class="btn btn-outline-primary" @onclick="() => ViewChecklist(checklist.Id)">
-                                                <i class="bi bi-eye"></i>
-                                            </button>
-                                            @if (checklist.Status != ApplicationConstants.ChecklistStatuses.Completed)
-                                            {
-                                                <button class="btn btn-outline-success" @onclick="() => CompleteChecklist(checklist.Id)">
-                                                    <i class="bi bi-check-circle"></i>
-                                                </button>
-                                            }
-                                        </div>
-                                    </div>
-                                </div>
-                            }
+                <div class="row mb-3">
+                    <div class="col-md-6">
+                        <strong>Completed On:</strong> @(selectedRepair.CompletedOn?.ToShortDateString() ?? "In Progress")
+                    </div>
+                    <div class="col-md-6">
+                        <strong>Cost:</strong> @selectedRepair.Cost.ToString("C")
+                    </div>
+                </div>
+                @if (selectedRepair.DurationMinutes > 0)
+                {
+                    <div class="row mb-3">
+                        <div class="col-12">
+                            <strong>Duration:</strong> @selectedRepair.DurationMinutes minutes
                         </div>
-                        @if (propertyChecklists.Count > 5)
-                        {
-                            <div class="mt-2">
-                                <small class="text-muted">Showing 5 of @propertyChecklists.Count checklists</small>
-                            </div>
-                        }
-                    }
-                    else
-                    {
-                        <div class="text-center text-muted py-3">
-                            <i class="bi bi-list-check" style="font-size: 2rem;"></i>
-                            <p class="mb-0 mt-2">No checklists for this property</p>
-                            <button class="btn btn-sm btn-primary mt-2" @onclick="CreateChecklist">
-                                <i class="bi bi-plus-circle"></i> Create First Checklist
-                            </button>
+                    </div>
+                }
+                @if (!string.IsNullOrEmpty(selectedRepair.ContractorPhone))
+                {
+                    <div class="row mb-3">
+                        <div class="col-12">
+                            <strong>Contact:</strong> @selectedRepair.ContractorPhone
                         </div>
-                    }
-                </div>
+                    </div>
+                }
             </div>
+        }
+    </ChildContent>
+    <FooterContent>
+        <button class="btn btn-outline-secondary" @onclick="@(() => ViewRepairFullPage(selectedRepair!.Id))">
+            <i class="bi bi-arrows-fullscreen"></i> View Full Page
+        </button>
+        <button class="btn btn-secondary" @onclick="@CloseRepairModal">Close</button>
+    </FooterContent>
+</Modal>
+
+<Modal IsVisible="@showInspectionModal" 
+       Title="@($"Inspection Report - {selectedInspection?.Property?.Address ?? ""}")"
+       Size="ModalSize.ExtraLarge"
+       OnClose="@CloseInspectionModal">
+    <ChildContent>
+        @if (selectedInspection != null)
+        {
+            <InspectionModalView Inspection="@selectedInspection" />
+        }
+    </ChildContent>
+    <FooterContent>
+        <button class="btn btn-outline-secondary" @onclick="@(() => ViewInspectionFullPage(selectedInspection!.Id))">
+            <i class="bi bi-arrows-fullscreen"></i> View Full Page
+        </button>
+        <button class="btn btn-secondary" @onclick="@CloseInspectionModal">Close</button>
+    </FooterContent>
+</Modal>
 
-            
-
-           
-        </div>
-    </div>
-}
 @code {
     [Parameter]
     public Guid PropertyId { get; set; }
 
-    public Guid LeaseId { get; set; }
-
-    List<Lease> activeLeases = new();
-    List<Document> propertyDocuments = new();
-    List<MaintenanceRequest> maintenanceRequests = new();
-    List<Inspection> propertyInspections = new();
-    List<Checklist> propertyChecklists = new();
+    private Property property = new Property();
+    private Inspection lastInspection = new Inspection();
 
-    private bool isAuthorized = true; 
+    // Modal state
+    private bool showLeaseModal = false;
+    private bool showRepairModal = false;
+    private bool showInspectionModal = false;
+    private bool showInspectionViewButton => lastInspection != null && lastInspection.Id != Guid.Empty && property.LastRoutineInspectionDate.HasValue;
 
-    private Property? property;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
+    // Selected entities for modals
+    private Lease? selectedLease;
+    private Repair? selectedRepair;
+    private Inspection? selectedInspection;
 
     protected override async Task OnInitializedAsync()
     {
-        await LoadProperty();
-    }
-
-    private async Task LoadProperty()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (string.IsNullOrEmpty(userId))
-        {
-            isAuthorized = false;
-            return;
-        }
-        property = await PropertyService.GetByIdAsync(PropertyId);
-        if (property == null)
-        {
-            isAuthorized = false;
-            return;
-        }
-        activeLeases = await LeaseService.GetActiveLeasesByPropertyIdAsync(PropertyId);
-
-        Lease? lease = activeLeases.FirstOrDefault();
-        if (lease != null)
-        {
-            LeaseId = lease.Id;
-        }
-        
-        // Load documents for this property
-            propertyDocuments = await DocumentService.GetDocumentsByPropertyIdAsync(PropertyId);
-            propertyDocuments = propertyDocuments
-                .Where(d => !d.IsDeleted)
-            .ToList();
-        
-        // Load maintenance requests for this property
-            maintenanceRequests = await MaintenanceService.GetMaintenanceRequestsByPropertyAsync(PropertyId);
-        // Load inspections for this property
-        propertyInspections = await InspectionService.GetByPropertyIdAsync(PropertyId);
-        
-        // Load checklists for this property
-        var allChecklists = await ChecklistService.GetChecklistsAsync(includeArchived: false);
-        propertyChecklists = allChecklists
-            .Where(c => c.PropertyId == PropertyId)
-            .OrderByDescending(c => c.CompletedOn ?? c.CreatedOn)
-            .ToList();
+        property = await PropertyService.GetPropertyWithRelationsAsync(PropertyId) ?? new Property();
+        lastInspection = await InspectionService.GetLastRoutineInspectionAsync(PropertyId) ?? new Inspection();
     }
 
     private void EditProperty()
     {
-        NavigationManager.NavigateTo($"/propertymanagement/properties/{PropertyId}/edit");
+        Navigation.NavigateTo($"/propertymanagement/properties/{PropertyId}/edit");
     }
 
-    private void CreateLease()
+    private void CreateRepair()
     {
-        NavigationManager.NavigateTo($"/propertymanagement/leases/create/?propertyid={PropertyId}");
+        Navigation.NavigateTo($"/propertymanagement/repairs/create/{PropertyId}");
     }
 
-    private void ViewLease()
+    private async Task ViewRepair(Guid repairId)
     {
-        NavigationManager.NavigateTo($"/propertymanagement/leases/{LeaseId}");
+        selectedRepair = await RepairService.GetByIdAsync(repairId);
+        if (selectedRepair != null)
+        {
+            showRepairModal = true;
+        }
     }
 
-    private void ViewDocuments()
+    private void ViewAllRepairs()
     {
-        NavigationManager.NavigateTo($"/propertymanagement/documents/?propertyid={PropertyId}");
+        Navigation.NavigateTo($"/propertymanagement/repairs/?PropertyId={PropertyId}");
     }
 
-    private void CreateInspection()
+    private async Task ViewInspection(Guid inspectionId)
     {
-        NavigationManager.NavigateTo($"/propertymanagement/inspections/create/{PropertyId}");
+        selectedInspection = await InspectionService.GetByIdAsync(inspectionId);
+        if (selectedInspection != null)
+        {
+            showInspectionModal = true;
+        }
     }
 
-    private void CreateMaintenanceRequest()
+    private void CompleteInspection()
     {
-        NavigationManager.NavigateTo($"/propertymanagement/maintenance/create?PropertyId={PropertyId}");
+        Navigation.NavigateTo($"/propertymanagement/inspections/create/?PropertyId={PropertyId}");
     }
 
-    private void ViewMaintenanceRequest(Guid requestId)
+    private void CreateLease()
     {
-        NavigationManager.NavigateTo($"/propertymanagement/maintenance/{requestId}");
+        Navigation.NavigateTo($"/propertymanagement/leases/create/?PropertyId={PropertyId}");
     }
 
-    private void ViewAllMaintenanceRequests()
+    private async Task ViewLease()
     {
-        NavigationManager.NavigateTo($"/propertymanagement/maintenance?propertyId={PropertyId}");
+        var lease = property.Leases.FirstOrDefault(l => l.IsActive);
+        if (lease != null)
+        {
+            selectedLease = await LeaseService.GetLeaseWithRelationsAsync(lease.Id);
+            if (selectedLease != null)
+            {
+                showLeaseModal = true;
+            }
+        }
     }
 
-    private void BackToList()
+    private void ViewDocuments()
     {
-        NavigationManager.NavigateTo("/propertymanagement/properties");
+        Navigation.NavigateTo($"/propertymanagement/documents/?PropertyId={PropertyId}");
     }
 
-    private async Task ViewDocument(Document doc)
+    private async Task ViewDocument(Guid documentId)
     {
+        var doc = property.Documents.FirstOrDefault(d => d.Id == documentId);
+        if (doc == null) return;
         var base64Data = Convert.ToBase64String(doc.FileData);
         await JSRuntime.InvokeVoidAsync("viewFile", base64Data, doc.FileType);
+        @* Navigation.NavigateTo($"/propertymanagement/documents/{documentId}"); *@
     }
 
-    private async Task DownloadDocument(Document doc)
-    {
-        var fileName = doc.FileName;
-        var fileData = doc.FileData;
-        var mimeType = doc.FileType;
-
-        await JSRuntime.InvokeVoidAsync("downloadFile", fileName, Convert.ToBase64String(fileData), mimeType);
-    }
-
-    private string GetFileIcon(string extension)
+    private void BackToList()
     {
-        return extension.ToLower() switch
-        {
-            ".pdf" => "bi-file-pdf text-danger",
-            ".doc" or ".docx" => "bi-file-word text-primary",
-            ".jpg" or ".jpeg" or ".png" => "bi-file-image text-success",
-            ".txt" => "bi-file-text",
-            _ => "bi-file-earmark"
-        };
+        Navigation.NavigateTo("/propertymanagement/properties");
     }
 
-    private string GetDocumentTypeBadge(string documentType)
+    // Modal close methods
+    private void CloseLeaseModal()
     {
-        return documentType switch
-        {
-            "Lease Agreement" => "bg-primary",
-            "Invoice" => "bg-warning",
-            "Payment Receipt" => "bg-success",
-            "Inspection Report" => "bg-info",
-            "Addendum" => "bg-secondary",
-            _ => "bg-secondary"
-        };
+        showLeaseModal = false;
+        selectedLease = null;
     }
 
-    private string GetInspectionStatusBadge(string status)
+    private void CloseRepairModal()
     {
-        return status switch
-        {
-            "Overdue" => "bg-danger",
-            "Due Soon" => "bg-warning",
-            "Scheduled" => "bg-success",
-            "Not Scheduled" => "bg-secondary",
-            _ => "bg-secondary"
-        };
+        showRepairModal = false;
+        selectedRepair = null;
     }
 
-    private string GetChecklistStatusBadge(string status)
+    private void CloseInspectionModal()
     {
-        return status switch
-        {
-            "Completed" => "bg-success",
-            "In Progress" => "bg-warning",
-            "Draft" => "bg-secondary",
-            _ => "bg-secondary"
-        };
+        showInspectionModal = false;
+        selectedInspection = null;
     }
 
-    private void CreateChecklist()
+    // View Full Page methods
+    private void ViewLeaseFullPage(Guid leaseId)
     {
-        NavigationManager.NavigateTo("/propertymanagement/checklists");
+        Navigation.NavigateTo($"/propertymanagement/leases/{leaseId}");
     }
 
-    private void ViewChecklist(Guid checklistId)
+    private void ViewRepairFullPage(Guid repairId)
     {
-        NavigationManager.NavigateTo($"/propertymanagement/checklists/view/{checklistId}");
+        Navigation.NavigateTo($"/propertymanagement/repairs/{repairId}");
     }
 
-    private void CompleteChecklist(Guid checklistId)
+    private void ViewInspectionFullPage(Guid inspectionId)
     {
-        NavigationManager.NavigateTo($"/propertymanagement/checklists/complete/{checklistId}");
+        Navigation.NavigateTo($"/propertymanagement/inspections/{inspectionId}");
     }
-}
\ No newline at end of file
+}
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Repairs/Create.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Repairs/Create.razor
new file mode 100644
index 0000000..2becaec
--- /dev/null
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Repairs/Create.razor
@@ -0,0 +1,276 @@
+@page "/propertymanagement/repairs/create"
+@page "/propertymanagement/repairs/create/{PropertyId:guid}"
+
+
+@using Aquiis.Core.Entities
+@attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
+@inject RepairService RepairService
+@inject PropertyService PropertyService
+@inject NavigationManager Navigation
+@inject ToastService ToastService
+@rendermode InteractiveServer
+
+<PageTitle>New Repair - Aquiis</PageTitle>
+
+<div class="container-fluid">
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <h1 class="h3 mb-0">
+            <i class="bi bi-tools me-2"></i>New Repair
+        </h1>
+        <button class="btn btn-outline-secondary" @onclick="Cancel">
+            <i class="bi bi-x-lg me-1"></i>Cancel
+        </button>
+    </div>
+
+    <div class="row">
+        <div class="col-lg-8">
+            <div class="card">
+                <div class="card-header">
+                    <h5 class="card-title mb-0">Repair Information</h5>
+                </div>
+                <div class="card-body">
+                    <EditForm Model="@model" OnValidSubmit="HandleSubmit">
+                        <DataAnnotationsValidator />
+                        <ValidationSummary class="alert alert-danger" />
+
+                        <div class="row g-3">
+                            <div class="row mt-3">
+                                <!-- Property Selection -->
+                                <div class="col-md-6">
+                                    <label class="form-label">Property <span class="text-danger">*</span></label>
+                                    <InputSelect class="form-select" @bind-Value="model.PropertyId">
+                                        <option value="@Guid.Empty">-- Select Property --</option>
+                                        @foreach (var property in properties)
+                                        {
+                                            <option value="@property.Id">@property.Address</option>
+                                        }
+                                    </InputSelect>
+                                    <ValidationMessage For="@(() => model.PropertyId)" />
+                                </div>
+
+                                <!-- Repair Type -->
+                                <div class="col-md-6">
+                                    <label class="form-label">Repair Type <span class="text-danger">*</span></label>
+                                    <InputSelect class="form-select" @bind-Value="model.RepairType">
+                                        <option value="">-- Select Type --</option>
+                                        @foreach (var type in ApplicationConstants.RepairTypes.AllRepairTypes)
+                                        {
+                                            <option value="@type">@type</option>
+                                        }
+                                    </InputSelect>
+                                    <ValidationMessage For="@(() => model.RepairType)" />
+                                </div>
+                            </div>
+
+                            <div class="row mt-3">
+                                <!-- Description -->
+                                <div class="col-12">
+                                    <label class="form-label">Description <span class="text-danger">*</span></label>
+                                    <InputTextArea class="form-control" @bind-Value="model.Description" rows="3"
+                                                placeholder="Describe the repair work performed..." />
+                                    <ValidationMessage For="@(() => model.Description)" />
+                                </div>
+                            </div>
+
+                            <div class="row mt-3">
+                                <!-- Contractor/Company Name -->
+                                <div class="col-md-6">
+                                    <label class="form-label">Contractor/Company Name</label>
+                                    <InputText class="form-control" @bind-Value="model.ContractorName"
+                                            placeholder="Company or person name" />
+                                    <small class="form-text text-muted">e.g., "ABC Plumbing" or "John Doe"</small>
+                                </div>
+
+                                <!-- Contact Person -->
+                                <div class="col-md-6">
+                                    <label class="form-label">Contact Person</label>
+                                    <InputText class="form-control" @bind-Value="model.ContactPerson"
+                                            placeholder="Specific person (optional)" />
+                                    <small class="form-text text-muted">e.g., "Jane Smith" at company</small>
+                                </div>
+                            </div>
+
+                            <div class="row mt-3">
+                                <!-- Contractor Phone -->
+                                <div class="col-md-6">
+                                    <label class="form-label">Contractor Phone</label>
+                                    <InputText class="form-control" @bind-Value="model.ContractorPhone" 
+                                            placeholder="(555) 123-4567" />
+                                </div>
+                            </div>
+
+                            <div class="row mt-3">
+                                <!-- Completed On -->
+                                <div class="col-md-6">
+                                    <label class="form-label">Completed On</label>
+                                    <InputDate class="form-control" @bind-Value="model.CompletedOn" />
+                                    <small class="form-text text-muted">Leave blank if work is still in progress</small>
+                                </div>
+
+                                <!-- Duration -->
+                                <div class="col-md-6">
+                                    <label class="form-label">Duration (minutes)</label>
+                                    <InputNumber class="form-control" @bind-Value="model.DurationMinutes" />
+                                    <ValidationMessage For="@(() => model.DurationMinutes)" />
+                                </div>
+                            </div>
+
+                            <div class="row mt-3">
+                                <!-- Parts Replaced -->
+                                <div class="col-md-12">
+                                    <label class="form-label">Parts Replaced</label>
+                                    <InputTextArea class="form-control" @bind-Value="model.PartsReplaced" rows="2"
+                                                placeholder="List parts or materials used..." />
+                                </div>
+                            </div>
+
+                            <div class="row mt-3">
+                                 <!-- Cost -->
+                                <div class="col-md-6">
+                                    <label class="form-label">Cost</label>
+                                    <div class="input-group">
+                                        <span class="input-group-text">$</span>
+                                        <InputNumber class="form-control" @bind-Value="model.Cost" />
+                                    </div>
+                                    <ValidationMessage For="@(() => model.Cost)" />
+                                </div>
+
+                                <!-- Warranty Info -->
+                                <div class="col-md-3">
+                                    <div class="form-check">
+                                        <InputCheckbox class="form-check-input" @bind-Value="model.WarrantyApplies" id="warrantyCheck" />
+                                        <label class="form-check-label" for="warrantyCheck">
+                                            Warranty Applies
+                                        </label>
+                                    </div>
+                                </div>
+
+                                @if (model.WarrantyApplies)
+                                {
+                                    <div class="col-md-3">
+                                        <label class="form-label">Warranty Expires On</label>
+                                        <InputDate class="form-control" @bind-Value="model.WarrantyExpiresOn" />
+                                    </div>
+                                }
+                            </div>
+
+                            <div class="row mt-3">
+                                <!-- Notes -->
+                                <div class="col-12">
+                                    <label class="form-label">Additional Notes</label>
+                                    <InputTextArea class="form-control" @bind-Value="model.Notes" rows="3"
+                                                placeholder="Any additional information. Warranty details, special instructions, etc." />
+                                </div>
+                            </div>
+
+                            <!-- Submit Button -->
+                            <div class="row mt-4">
+                                <div class="col-12">
+                                    <hr />
+                                    <div class="d-flex justify-content-end gap-2">
+                                        <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">
+                                            Cancel
+                                        </button>
+                                        <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
+                                            @if (isSubmitting)
+                                            {
+                                                <span class="spinner-border spinner-border-sm me-1"></span>
+                                            }
+                                            <i class="bi bi-check-lg me-1"></i>Save Repair
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </EditForm>
+                </div>
+            </div>
+        </div>
+
+        <div class="col-lg-4">
+            <div class="card">
+                <div class="card-body">
+                    <h6 class="card-title"><i class="bi bi-info-circle me-2"></i>About Repairs</h6>
+                    <p class="card-text small">
+                        Use this form to log work performed on your properties. This is ideal for:
+                    </p>
+                    <ul class="small">
+                        <li>Quick repairs that don't need workflow tracking</li>
+                        <li>Historical work completed before using this system</li>
+                        <li>Work currently in progress (leave Completed On blank)</li>
+                        <li>Contractor work with warranty tracking</li>
+                    </ul>
+                    <hr />
+                    <p class="card-text small mb-0">
+                        <strong>Tip:</strong> Leave "Completed On" blank if the work is still in progress, or hasn't been started yet. 
+                        You can mark it complete later by editing the repair.
+                    </p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+@code {
+    [Parameter]
+    [SupplyParameterFromQuery]
+    public Guid? PropertyId { get; set; }
+    private RepairFormModel model = new();
+    private List<Property> properties = new();
+    private bool isSubmitting = false;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            properties = await PropertyService.GetAllAsync();
+        }
+        catch (Exception ex)
+        {
+            ToastService.ShowError($"Error loading properties: {ex.Message}");
+        }
+        if (PropertyId.HasValue && PropertyId != Guid.Empty)
+        {
+            model.PropertyId = PropertyId.Value;
+        }
+    }
+
+    private async Task HandleSubmit()
+    {
+        isSubmitting = true;
+        try
+        {
+            // Map form model to entity - service will set tracking fields
+            var repair = new Repair
+            {
+                PropertyId = model.PropertyId,
+                Description = model.Description,
+                RepairType = model.RepairType,
+                ContractorName = model.ContractorName,
+                ContactPerson = model.ContactPerson,
+                ContractorPhone = model.ContractorPhone,
+                CompletedOn = model.CompletedOn,
+                Cost = model.Cost,
+                DurationMinutes = model.DurationMinutes,
+                PartsReplaced = model.PartsReplaced,
+                Notes = model.Notes,
+                WarrantyApplies = model.WarrantyApplies,
+                WarrantyExpiresOn = model.WarrantyExpiresOn,
+                MaintenanceRequestId = model.MaintenanceRequestId,
+                LeaseId = model.LeaseId
+            };
+
+            await RepairService.CreateAsync(repair);
+            ToastService.ShowSuccess("Repair logged successfully.");
+            Navigation.NavigateTo("/propertymanagement/repairs");
+        }
+        catch (Exception ex)
+        {
+            ToastService.ShowError($"Error saving repair: {ex.Message}");
+            isSubmitting = false;
+        }
+    }
+
+    private void Cancel() => Navigation.NavigateTo("/propertymanagement/repairs");
+}
+
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Repairs/Edit.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Repairs/Edit.razor
new file mode 100644
index 0000000..5c80608
--- /dev/null
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Repairs/Edit.razor
@@ -0,0 +1,358 @@
+@page "/propertymanagement/repairs/{id:guid}/edit"
+@using Aquiis.Core.Entities
+@attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
+@inject RepairService RepairService
+@inject PropertyService PropertyService
+@inject NavigationManager Navigation
+@inject ToastService ToastService
+@rendermode InteractiveServer
+
+<PageTitle>Edit Repair - Aquiis</PageTitle>
+
+<div class="container-fluid">
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <h1 class="h3 mb-0">
+            <i class="bi bi-pencil me-2"></i>Edit Repair
+        </h1>
+        <button class="btn btn-outline-secondary" @onclick="Cancel">
+            <i class="bi bi-x-lg me-1"></i>Cancel
+        </button>
+    </div>
+
+    @if (isLoading)
+    {
+        <div class="text-center py-5">
+            <div class="spinner-border text-primary" role="status">
+                <span class="visually-hidden">Loading...</span>
+            </div>
+            <p class="mt-3 text-muted">Loading repair...</p>
+        </div>
+    }
+    else if (repair == null)
+    {
+        <div class="alert alert-danger">
+            <i class="bi bi-exclamation-triangle me-2"></i>
+            Repair not found.
+        </div>
+    }
+    else
+    {
+        <div class="row">
+            <div class="col-lg-8">
+                <div class="card">
+                    <div class="card-header">
+                        <h5 class="card-title mb-0">Repair Information</h5>
+                    </div>
+                    <div class="card-body">
+                        <EditForm Model="@model" OnValidSubmit="HandleSubmit">
+                            <DataAnnotationsValidator />
+                            <ValidationSummary class="alert alert-danger" />
+
+                            <div class="row g-3">
+                                <!-- Property Selection -->
+                                <div class="col-md-6">
+                                    <label class="form-label">Property <span class="text-danger">*</span></label>
+                                    <InputSelect class="form-select" @bind-Value="model.PropertyId">
+                                        <option value="@Guid.Empty">-- Select Property --</option>
+                                        @foreach (var property in properties)
+                                        {
+                                            <option value="@property.Id">@property.Address</option>
+                                        }
+                                    </InputSelect>
+                                    <ValidationMessage For="@(() => model.PropertyId)" />
+                                </div>
+
+                                <!-- Repair Type -->
+                                <div class="col-md-6">
+                                    <label class="form-label">Repair Type</label>
+                                    <InputSelect class="form-select" @bind-Value="model.RepairType">
+                                        <option value="">-- Select Type --</option>
+                                        @foreach (var type in ApplicationConstants.RepairTypes.AllRepairTypes)
+                                        {
+                                            <option value="@type">@type</option>
+                                        }
+                                    </InputSelect>
+                                    <ValidationMessage For="@(() => model.RepairType)" />
+                                </div>
+
+                                <!-- Description -->
+                                <div class="col-12">
+                                    <label class="form-label">Description <span class="text-danger">*</span></label>
+                                    <InputTextArea class="form-control" @bind-Value="model.Description" rows="3"
+                                                 placeholder="Describe the repair work performed..." />
+                                    <ValidationMessage For="@(() => model.Description)" />
+                                </div>
+
+                                 <!-- Contractor/Company Name -->
+                                <div class="col-md-6">
+                                    <label class="form-label">Contractor/Company Name</label>
+                                    <InputText class="form-control" @bind-Value="model.ContractorName" 
+                                             placeholder="Company or person name" />
+                                    <small class="form-text text-muted">e.g., "ABC Plumbing" or "John Doe"</small>
+                                </div>
+
+                                <!-- Contact Person -->
+                                <div class="col-md-6">
+                                    <label class="form-label">Contact Person</label>
+                                    <InputText class="form-control" @bind-Value="model.ContactPerson" 
+                                             placeholder="Specific person (optional)" />
+                                    <small class="form-text text-muted">e.g., "Jane Smith" at company</small>
+                                </div>
+
+                                <div class="row mt-3">
+                                    <!-- Contractor Phone -->
+                                    <div class="col-md-6">
+                                        <label class="form-label">Contractor Phone</label>
+                                        <InputText class="form-control" @bind-Value="model.ContractorPhone" 
+                                                placeholder="(555) 123-4567" />
+                                    </div>
+                                </div>
+
+                                <!-- Completed On -->
+                                <div class="col-md-6">
+                                    <label class="form-label">Completed On</label>
+                                    <InputDate class="form-control" @bind-Value="model.CompletedOn" />
+                                    <small class="form-text text-muted">Leave blank if work is still in progress</small>
+                                </div>
+
+                                  <!-- Duration -->
+                                <div class="col-md-6">
+                                    <label class="form-label">Duration (minutes)</label>
+                                    <InputNumber class="form-control" @bind-Value="model.DurationMinutes" />
+                                    <ValidationMessage For="@(() => model.DurationMinutes)" />
+                                </div>
+
+                                <!-- Parts Replaced -->
+                                <div class="col-12">
+                                    <label class="form-label">Parts Replaced</label>
+                                    <InputTextArea class="form-control" @bind-Value="model.PartsReplaced" rows="2"
+                                                 placeholder="List parts or materials used..." />
+                                </div>
+
+                                <!-- Cost -->
+                                <div class="col-md-6">
+                                    <label class="form-label">Cost</label>
+                                    <div class="input-group">
+                                        <span class="input-group-text">$</span>
+                                        <InputNumber class="form-control" @bind-Value="model.Cost" />
+                                    </div>
+                                    <ValidationMessage For="@(() => model.Cost)" />
+                                </div>
+
+                                <!-- Warranty Info -->
+                                <div class="col-md-3">
+                                    <div class="form-check">
+                                        <InputCheckbox class="form-check-input" @bind-Value="model.WarrantyApplies" id="warrantyCheck" />
+                                        <label class="form-check-label" for="warrantyCheck">
+                                            Warranty Applies
+                                        </label>
+                                    </div>
+                                </div>
+
+                                @if (model.WarrantyApplies)
+                                {
+                                    <div class="col-md-3">
+                                        <label class="form-label">Warranty Expires On</label>
+                                        <InputDate class="form-control" @bind-Value="model.WarrantyExpiresOn" />
+                                    </div>
+                                }
+
+                                <!-- Notes -->
+                                <div class="col-12">
+                                    <label class="form-label">Additional Notes</label>
+                                    <InputTextArea class="form-control" @bind-Value="model.Notes" rows="3"
+                                                 placeholder="Any additional information..." />
+                                </div>
+
+                                <!-- Submit Button -->
+                                <div class="col-12">
+                                    <hr />
+                                    <div class="d-flex justify-content-between">
+                                        <button type="button" class="btn btn-outline-danger" @onclick="DeleteRepair">
+                                            <i class="bi bi-trash me-1"></i>Delete
+                                        </button>
+                                        <div class="d-flex gap-2">
+                                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">
+                                                Cancel
+                                            </button>
+                                            <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
+                                                @if (isSubmitting)
+                                                {
+                                                    <span class="spinner-border spinner-border-sm me-1"></span>
+                                                }
+                                                <i class="bi bi-check-lg me-1"></i>Save Changes
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </EditForm>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-lg-4">
+                <div class="card">
+                    <div class="card-header">
+                        <h6 class="card-title mb-0">Audit Information</h6>
+                    </div>
+                    <div class="card-body">
+                        <dl class="row mb-0 small">
+                            <dt class="col-sm-5">Created:</dt>
+                            <dd class="col-sm-7">@repair.CreatedOn.ToShortDateString()</dd>
+
+                            <dt class="col-sm-5">Created By:</dt>
+                            <dd class="col-sm-7">@repair.CreatedBy</dd>
+
+                            @if (repair.LastModifiedOn.HasValue)
+                            {
+                                <dt class="col-sm-5">Last Modified:</dt>
+                                <dd class="col-sm-7">@repair.LastModifiedOn.Value.ToShortDateString()</dd>
+
+                                <dt class="col-sm-5">Modified By:</dt>
+                                <dd class="col-sm-7">@repair.LastModifiedBy</dd>
+                            }
+                        </dl>
+                    </div>
+                </div>
+
+                @if (!repair.IsCompleted)
+                {
+                    <div class="card mt-3">
+                        <div class="card-body">
+                            <h6 class="card-title">Quick Actions</h6>
+                            <button class="btn btn-success w-100" @onclick="MarkComplete">
+                                <i class="bi bi-check-circle me-1"></i>Mark as Completed
+                            </button>
+                            <small class="form-text text-muted d-block mt-2">
+                                This will set the completion date to today
+                            </small>
+                        </div>
+                    </div>
+                }
+            </div>
+        </div>
+    }
+</div>
+
+@code {
+    [Parameter] public Guid Id { get; set; }
+
+    private Repair? repair;
+    private RepairFormModel model = new();
+    private List<Property> properties = new();
+    private bool isLoading = true;
+    private bool isSubmitting = false;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadData();
+    }
+
+    private async Task LoadData()
+    {
+        isLoading = true;
+        try
+        {
+            repair = await RepairService.GetByIdAsync(Id);
+            if (repair != null)
+            {
+                // Map entity to form model
+                model = new RepairFormModel
+                {
+                    PropertyId = repair.PropertyId,
+                    Description = repair.Description,
+                    RepairType = repair.RepairType,
+                    ContractorName = repair.ContractorName,
+                    ContactPerson = repair.ContactPerson,
+                    ContractorPhone = repair.ContractorPhone,
+                    CompletedOn = repair.CompletedOn,
+                    Cost = repair.Cost,
+                    DurationMinutes = repair.DurationMinutes,
+                    PartsReplaced = repair.PartsReplaced,
+                    Notes = repair.Notes,
+                    WarrantyApplies = repair.WarrantyApplies,
+                    WarrantyExpiresOn = repair.WarrantyExpiresOn,
+                    MaintenanceRequestId = repair.MaintenanceRequestId,
+                    LeaseId = repair.LeaseId
+                };
+            }
+            properties = await PropertyService.GetAllAsync();
+        }
+        catch (Exception ex)
+        {
+            ToastService.ShowError($"Error loading repair: {ex.Message}");
+        }
+        finally
+        {
+            isLoading = false;
+        }
+    }
+
+    private async Task HandleSubmit()
+    {
+        if (repair == null) return;
+
+        isSubmitting = true;
+        try
+        {
+            // Map form model back to entity, preserving ID and tracking fields
+            repair.PropertyId = model.PropertyId;
+            repair.Description = model.Description;
+            repair.RepairType = model.RepairType;
+            repair.ContractorName = model.ContractorName;
+            repair.ContactPerson = model.ContactPerson;
+            repair.ContractorPhone = model.ContractorPhone;
+            repair.CompletedOn = model.CompletedOn;
+            repair.Cost = model.Cost;
+            repair.DurationMinutes = model.DurationMinutes;
+            repair.PartsReplaced = model.PartsReplaced;
+            repair.Notes = model.Notes;
+            repair.WarrantyApplies = model.WarrantyApplies;
+            repair.WarrantyExpiresOn = model.WarrantyExpiresOn;
+            repair.MaintenanceRequestId = model.MaintenanceRequestId;
+            repair.LeaseId = model.LeaseId;
+
+            await RepairService.UpdateAsync(repair);
+            ToastService.ShowSuccess("Repair updated successfully.");
+            Navigation.NavigateTo("/propertymanagement/repairs");
+        }
+        catch (Exception ex)
+        {
+            ToastService.ShowError($"Error updating repair: {ex.Message}");
+            isSubmitting = false;
+        }
+    }
+
+    private async Task MarkComplete()
+    {
+        if (repair == null) return;
+
+        try
+        {
+            await RepairService.CompleteRepairAsync(repair.Id);
+            ToastService.ShowSuccess("Repair marked as completed.");
+            await LoadData();
+        }
+        catch (Exception ex)
+        {
+            ToastService.ShowError($"Error completing repair: {ex.Message}");
+        }
+    }
+
+    private async Task DeleteRepair()
+    {
+        try
+        {
+            await RepairService.DeleteAsync(Id);
+            ToastService.ShowSuccess("Repair deleted successfully.");
+            Navigation.NavigateTo("/propertymanagement/repairs");
+        }
+        catch (Exception ex)
+        {
+            ToastService.ShowError($"Error deleting repair: {ex.Message}");
+        }
+    }
+
+    private void Cancel() => Navigation.NavigateTo("/propertymanagement/repairs");
+}
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Repairs/Index.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Repairs/Index.razor
new file mode 100644
index 0000000..28d3426
--- /dev/null
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Repairs/Index.razor
@@ -0,0 +1,288 @@
+@page "/propertymanagement/repairs"
+@using Aquiis.Core.Entities
+@attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
+
+@inject RepairService RepairService
+@inject PropertyService PropertyService
+@inject NavigationManager Navigation
+@inject ToastService ToastService
+@rendermode InteractiveServer
+
+<PageTitle>Repairs - Aquiis</PageTitle>
+
+<div class="container-fluid">
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <h1 class="h3 mb-0">
+            <i class="bi bi-tools me-2"></i>Repairs
+        </h1>
+        <button class="btn btn-primary" @onclick="NavigateToCreate">
+            <i class="bi bi-plus-lg me-1"></i>New Repair
+        </button>
+    </div>
+
+    @if (isLoading)
+    {
+        <div class="text-center py-5">
+            <div class="spinner-border text-primary" role="status">
+                <span class="visually-hidden">Loading...</span>
+            </div>
+            <p class="mt-3 text-muted">Loading repairs...</p>
+        </div>
+    }
+    else if (!repairs.Any())
+    {
+        <div class="alert alert-info">
+            <i class="bi bi-info-circle me-2"></i>
+            No repairs have been logged yet. Click "Log New Repair" to record work performed on your properties.
+        </div>
+    }
+    else
+    {
+        <div class="card">
+            <div class="card-header">
+                <div class="row g-3 align-items-center">
+                    <div class="col-md-4">
+                        <input type="text" class="form-control" placeholder="Search repairs..."
+                               @bind="searchTerm" @bind:event="oninput" />
+                    </div>
+                    <div class="col-md-3">
+                        <select class="form-select" @bind="selectedPropertyId">
+                            <option value="">All Properties</option>
+                            @foreach (var property in properties)
+                            {
+                                <option value="@property.Id">@property.Address</option>
+                            }
+                        </select>
+                    </div>
+                    <div class="col-md-3">
+                        <select class="form-select" @bind="selectedRepairType">
+                            <option value="">All Types</option>
+                            @foreach (var type in ApplicationConstants.RepairTypes.AllRepairTypes)
+                            {
+                                <option value="@type">@type</option>
+                            }
+                        </select>
+                    </div>
+                    <div class="col-md-2">
+                        <div class="form-check">
+                            <input class="form-check-input" type="checkbox" id="showInProgressOnly"
+                                   @bind="showInProgressOnly" />
+                            <label class="form-check-label" for="showInProgressOnly">
+                                In Progress Only
+                            </label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="card-body p-0">
+                <div class="table-responsive">
+                    <table class="table table-hover mb-0">
+                        <thead class="table">
+                            <tr>
+                                <th>Property</th>
+                                <th>Description</th>
+                                <th>Type</th>
+                                <th>Completed</th>
+                                <th>Cost</th>
+                                <th>Duration</th>
+                                <th>Status</th>
+                                <th class="text-end">Actions</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach (var repair in FilteredRepairs)
+                            {
+                                <tr>
+                                    <td>
+                                        <strong>@repair.Property?.Address</strong>
+                                        @if (repair.MaintenanceRequestId.HasValue)
+                                        {
+                                            <br /><small class="text-muted">
+                                                <i class="bi bi-link-45deg"></i>Part of Maintenance Request
+                                            </small>
+                                        }
+                                    </td>
+                                    <td>
+                                        @repair.Description
+                                        @if (!string.IsNullOrEmpty(repair.ContractorName))
+                                        {
+                                            <br /><small class="text-muted">By: @repair.ContractorName</small>
+                                        }
+                                    </td>
+                                    <td>
+                                        <span class="badge bg-secondary">@repair.RepairType</span>
+                                    </td>
+                                    <td>
+                                        @if (repair.CompletedOn.HasValue)
+                                        {
+                                            @repair.CompletedOn.Value.ToShortDateString()
+                                        }
+                                        else
+                                        {
+                                            <span class="text-muted">-</span>
+                                        }
+                                    </td>
+                                    <td>
+                                        @if (repair.Cost > 0)
+                                        {
+                                            @repair.Cost.ToString("C")
+                                        }
+                                        else
+                                        {
+                                            <span class="text-muted">-</span>
+                                        }
+                                    </td>
+                                    <td>
+                                        @if (repair.DurationMinutes > 0)
+                                        {
+                                            @repair.DurationDisplay
+                                        }
+                                        else
+                                        {
+                                            <span class="text-muted">-</span>
+                                        }
+                                    </td>
+                                    <td>
+                                        @if (repair.IsCompleted)
+                                        {
+                                            <span class="badge bg-success">
+                                                <i class="bi bi-check-circle me-1"></i>Completed
+                                            </span>
+                                        }
+                                        else
+                                        {
+                                            <span class="badge bg-warning text-dark">
+                                                <i class="bi bi-clock me-1"></i>In Progress
+                                            </span>
+                                        }
+                                        @if (repair.IsUnderWarranty)
+                                        {
+                                            <br />
+                                            <span class="badge bg-info mt-1">
+                                                <i class="bi bi-shield-check"></i> Under Warranty
+                                            </span>
+                                        }
+                                    </td>
+                                    <td class="text-end">
+                                        <div class="btn-group btn-group-sm">
+                                            <button class="btn btn-outline-primary" @onclick="() => NavigateToView(repair.Id)"
+                                                    title="View Details">
+                                                <i class="bi bi-eye"></i>
+                                            </button>
+                                            <button class="btn btn-outline-secondary" @onclick="() => NavigateToEdit(repair.Id)"
+                                                    title="Edit Repair">
+                                                <i class="bi bi-pencil"></i>
+                                            </button>
+                                            <button class="btn btn-outline-danger" @onclick="() => DeleteRepair(repair.Id)"
+                                                    title="Delete Repair">
+                                                <i class="bi bi-trash"></i>
+                                            </button>
+                                        </div>
+                                    </td>
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+
+            <div class="card-footer">
+                <div class="d-flex justify-content-between align-items-center">
+                    <span class="text-muted">
+                        Showing @FilteredRepairs.Count() of @repairs.Count repairs
+                    </span>
+                    <span class="text-muted">
+                        Total Cost: @repairs.Sum(r => r.Cost).ToString("C")
+                    </span>
+                </div>
+            </div>
+        </div>
+    }
+</div>
+
+@code {
+    private List<Repair> repairs = new();
+    private List<Property> properties = new();
+    private bool isLoading = true;
+
+    private string searchTerm = string.Empty;
+    private string selectedPropertyId = string.Empty;
+    private string selectedRepairType = string.Empty;
+    private bool showInProgressOnly = false;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadData();
+    }
+
+    private async Task LoadData()
+    {
+        isLoading = true;
+        try
+        {
+            repairs = await RepairService.GetAllAsync();
+            properties = await PropertyService.GetAllAsync();
+        }
+        catch (Exception ex)
+        {
+            ToastService.ShowError($"Error loading repairs: {ex.Message}");
+        }
+        finally
+        {
+            isLoading = false;
+        }
+    }
+
+    private IEnumerable<Repair> FilteredRepairs
+    {
+        get
+        {
+            var filtered = repairs.AsEnumerable();
+
+            if (!string.IsNullOrWhiteSpace(searchTerm))
+            {
+                filtered = filtered.Where(r =>
+                    r.Description.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
+                    r.ContractorName.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
+                    r.ContactPerson.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
+                    r.Property?.Address?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) == true);
+            }
+
+            if (!string.IsNullOrEmpty(selectedPropertyId) && Guid.TryParse(selectedPropertyId, out var propId))
+            {
+                filtered = filtered.Where(r => r.PropertyId == propId);
+            }
+
+            if (!string.IsNullOrEmpty(selectedRepairType))
+            {
+                filtered = filtered.Where(r => r.RepairType == selectedRepairType);
+            }
+
+            if (showInProgressOnly)
+            {
+                filtered = filtered.Where(r => !r.IsCompleted);
+            }
+
+            return filtered.OrderByDescending(r => r.CompletedOn ?? r.CreatedOn);
+        }
+    }
+
+    private void NavigateToCreate() => Navigation.NavigateTo("/propertymanagement/repairs/create");
+    private void NavigateToView(Guid id) => Navigation.NavigateTo($"/propertymanagement/repairs/{id}");
+    private void NavigateToEdit(Guid id) => Navigation.NavigateTo($"/propertymanagement/repairs/{id}/edit");
+
+    private async Task DeleteRepair(Guid id)
+    {
+        try
+        {
+            await RepairService.DeleteAsync(id);
+            ToastService.ShowSuccess("Repair deleted successfully.");
+            await LoadData();
+        }
+        catch (Exception ex)
+        {
+            ToastService.ShowError($"Error deleting repair: {ex.Message}");
+        }
+    }
+}
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Repairs/RepairFormModel.cs b/4-Aquiis.SimpleStart/Features/PropertyManagement/Repairs/RepairFormModel.cs
new file mode 100644
index 0000000..0d40976
--- /dev/null
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Repairs/RepairFormModel.cs
@@ -0,0 +1,52 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Aquiis.SimpleStart.Features.PropertyManagement.Repairs;
+
+/// <summary>
+/// Form model for repair create/edit operations.
+/// Contains only user-provided fields, not tracking fields.
+/// </summary>
+public class RepairFormModel
+{
+    [Required(ErrorMessage = "Property is required")]
+    public Guid PropertyId { get; set; }
+
+    [Required(ErrorMessage = "Description is required")]
+    [StringLength(1000, ErrorMessage = "Description cannot exceed 1000 characters")]
+    public string Description { get; set; } = string.Empty;
+
+    [Required(ErrorMessage = "Repair Type is required")]
+    [StringLength(50)]
+    public string RepairType { get; set; } = string.Empty;
+
+    [StringLength(200)]
+    public string ContractorName { get; set; } = string.Empty;
+
+    [StringLength(200)]
+    public string ContactPerson { get; set; } = string.Empty;
+
+    [StringLength(50)]
+    public string ContractorPhone { get; set; } = string.Empty;
+
+    public DateTime? CompletedOn { get; set; }
+
+    [Range(0, double.MaxValue, ErrorMessage = "Cost cannot be negative")]
+    public decimal Cost { get; set; } = 0;
+
+    [Range(0, int.MaxValue, ErrorMessage = "Duration cannot be negative")]
+    public int DurationMinutes { get; set; } = 0;
+
+    [StringLength(500)]
+    public string PartsReplaced { get; set; } = string.Empty;
+
+    [StringLength(2000)]
+    public string Notes { get; set; } = string.Empty;
+
+    public bool WarrantyApplies { get; set; } = false;
+
+    public DateTime? WarrantyExpiresOn { get; set; }
+
+    public Guid? MaintenanceRequestId { get; set; }
+
+    public Guid? LeaseId { get; set; }
+}
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Repairs/View.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Repairs/View.razor
new file mode 100644
index 0000000..a72da1f
--- /dev/null
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Repairs/View.razor
@@ -0,0 +1,356 @@
+@page "/propertymanagement/repairs/{id:guid}"
+@attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
+
+@inject RepairService RepairService
+@inject NavigationManager Navigation
+@inject ToastService ToastService
+@rendermode InteractiveServer
+
+<PageTitle>Repair Details - Aquiis</PageTitle>
+
+<div class="container-fluid">
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <h1 class="h3 mb-0">
+            <i class="bi bi-tools me-2"></i>Repair Details
+        </h1>
+        <div class="btn-group">
+            <button class="btn btn-outline-primary" @onclick="NavigateToEdit">
+                <i class="bi bi-pencil me-1"></i>Edit
+            </button>
+            <button class="btn btn-outline-secondary" @onclick="Back">
+                <i class="bi bi-arrow-left me-1"></i>Back to List
+            </button>
+        </div>
+    </div>
+
+    @if (isLoading)
+    {
+        <div class="text-center py-5">
+            <div class="spinner-border text-primary" role="status">
+                <span class="visually-hidden">Loading...</span>
+            </div>
+            <p class="mt-3 text-muted">Loading repair details...</p>
+        </div>
+    }
+    else if (repair == null)
+    {
+        <div class="alert alert-danger">
+            <i class="bi bi-exclamation-triangle me-2"></i>
+            Repair not found.
+        </div>
+    }
+    else
+    {
+        <div class="row">
+            <div class="col-lg-8">
+                <!-- Status Banner -->
+                @if (!repair.IsCompleted)
+                {
+                    <div class="alert alert-warning">
+                        <div class="d-flex justify-content-between align-items-center">
+                            <div>
+                                <i class="bi bi-clock me-2"></i>
+                                <strong>In Progress</strong> - This repair has not been marked as completed yet.
+                            </div>
+                            <button class="btn btn-sm btn-success" @onclick="MarkComplete">
+                                <i class="bi bi-check-circle me-1"></i>Mark Complete
+                            </button>
+                        </div>
+                    </div>
+                }
+                else if (repair.IsUnderWarranty)
+                {
+                    <div class="alert alert-info">
+                        <i class="bi bi-shield-check me-2"></i>
+                        <strong>Under Warranty</strong> - Expires @repair.WarrantyExpiresOn?.ToShortDateString()
+                    </div>
+                }
+
+                <!-- Basic Information -->
+                <div class="card mb-3">
+                    <div class="card-header">
+                        <h5 class="card-title mb-0">Basic Information</h5>
+                    </div>
+                    <div class="card-body">
+                        <dl class="row mb-0">
+                            <dt class="col-sm-3">Property:</dt>
+                            <dd class="col-sm-9">
+                                <strong>@repair.Property?.Address</strong>
+                                <br /><small class="text-muted">@repair.Property?.Address</small>
+                            </dd>
+
+                            <dt class="col-sm-3">Repair Type:</dt>
+                            <dd class="col-sm-9">
+                                <span class="badge bg-secondary">@repair.RepairType</span>
+                            </dd>
+
+                            <dt class="col-sm-3">Description:</dt>
+                            <dd class="col-sm-9">@repair.Description</dd>
+
+                            @if (repair.CompletedOn.HasValue)
+                            {
+                                <dt class="col-sm-3">Completed On:</dt>
+                                <dd class="col-sm-9">@repair.CompletedOn.Value.ToLongDateString()</dd>
+                            }
+
+                            @if (!string.IsNullOrEmpty(repair.ContractorName))
+                            {
+                                <dt class="col-sm-3">Contractor/Company:</dt>
+                                <dd class="col-sm-9">@repair.ContractorName</dd>
+                            }
+                        </dl>
+                    </div>
+                </div>
+
+                <!-- Cost and Time -->
+                <div class="card mb-3">
+                    <div class="card-header">
+                        <h5 class="card-title mb-0">Cost & Duration</h5>
+                    </div>
+                    <div class="card-body">
+                        <div class="row">
+                            <div class="col-md-6">
+                                <h6 class="text-muted small mb-1">Total Cost</h6>
+                                <p class="h4 text-primary mb-0">
+                                    @repair.Cost.ToString("C")
+                                </p>
+                            </div>
+                            <div class="col-md-6">
+                                <h6 class="text-muted small mb-1">Duration</h6>
+                                <p class="h4 text-secondary mb-0">
+                                    @if (repair.DurationMinutes > 0)
+                                    {
+                                        @repair.DurationDisplay
+                                    }
+                                    else
+                                    {
+                                        <span class="text-muted">Not specified</span>
+                                    }
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Contractor Information -->
+                @if (!string.IsNullOrEmpty(repair.ContractorName) || !string.IsNullOrEmpty(repair.ContactPerson) || !string.IsNullOrEmpty(repair.ContractorPhone))
+                {
+                    <div class="card mb-3">
+                        <div class="card-header">
+                            <h5 class="card-title mb-0">Contractor Information</h5>
+                        </div>
+                        <div class="card-body">
+                            <dl class="row mb-0">
+                                @if (!string.IsNullOrEmpty(repair.ContractorName))
+                                {
+                                    <dt class="col-sm-3">Company/Name:</dt>
+                                    <dd class="col-sm-9">@repair.ContractorName</dd>
+                                }
+
+                                @if (!string.IsNullOrEmpty(repair.ContactPerson))
+                                {
+                                    <dt class="col-sm-3">Contact Person:</dt>
+                                    <dd class="col-sm-9">@repair.ContactPerson</dd>
+                                }
+
+                                @if (!string.IsNullOrEmpty(repair.ContractorPhone))
+                                {
+                                    <dt class="col-sm-3">Phone:</dt>
+                                    <dd class="col-sm-9">
+                                        <a href="tel:@repair.ContractorPhone">@repair.ContractorPhone</a>
+                                    </dd>
+                                }
+                            </dl>
+                        </div>
+                    </div>
+                }
+
+                <!-- Parts and Materials -->
+                @if (!string.IsNullOrEmpty(repair.PartsReplaced))
+                {
+                    <div class="card mb-3">
+                        <div class="card-header bg-light">
+                            <h5 class="card-title mb-0">Parts & Materials</h5>
+                        </div>
+                        <div class="card-body">
+                            <p class="mb-0">@repair.PartsReplaced</p>
+                        </div>
+                    </div>
+                }
+
+                <!-- Warranty Information -->
+                @if (repair.WarrantyApplies)
+                {
+                    <div class="card mb-3">
+                        <div class="card-header">
+                            <h5 class="card-title mb-0">
+                                <i class="bi bi-shield-check me-2"></i>Warranty Information
+                            </h5>
+                        </div>
+                        <div class="card-body">
+                            <dl class="row mb-0">
+                                <dt class="col-sm-3">Status:</dt>
+                                <dd class="col-sm-9">
+                                    @if (repair.IsUnderWarranty)
+                                    {
+                                        <span class="badge bg-success">Active</span>
+                                    }
+                                    else
+                                    {
+                                        <span class="badge bg-secondary">Expired</span>
+                                    }
+                                </dd>
+
+                                @if (repair.WarrantyExpiresOn.HasValue)
+                                {
+                                    <dt class="col-sm-3">Expires On:</dt>
+                                    <dd class="col-sm-9">@repair.WarrantyExpiresOn.Value.ToLongDateString()</dd>
+                                }
+                            </dl>
+                        </div>
+                    </div>
+                }
+
+                <!-- Additional Notes -->
+                @if (!string.IsNullOrEmpty(repair.Notes))
+                {
+                    <div class="card mb-3">
+                        <div class="card-header">
+                            <h5 class="card-title mb-0">Additional Notes</h5>
+                        </div>
+                        <div class="card-body">
+                            <p class="mb-0 white-space-pre-wrap">@repair.Notes</p>
+                        </div>
+                    </div>
+                }
+
+                <!-- Related Maintenance Request -->
+                @if (repair.MaintenanceRequestId.HasValue)
+                {
+                    <div class="card mb-3 border-primary">
+                        <div class="card-body">
+                            <h6 class="card-title">
+                                <i class="bi bi-link-45deg me-2"></i>Part of Maintenance Request
+                            </h6>
+                            <p class="card-text small mb-0">
+                                This repair is associated with a maintenance request workflow.
+                            </p>
+                        </div>
+                    </div>
+                }
+            </div>
+
+            <div class="col-lg-4">
+                <!-- Audit Information -->
+                <div class="card mb-3">
+                    <div class="card-header">
+                        <h6 class="card-title mb-0">Audit Trail</h6>
+                    </div>
+                    <div class="card-body">
+                        <dl class="row mb-0 small">
+                            <dt class="col-sm-5">Created:</dt>
+                            <dd class="col-sm-7">@repair.CreatedOn.ToShortDateString()</dd>
+
+                            <dt class="col-sm-5">Created By:</dt>
+                            <dd class="col-sm-7">@repair.CreatedBy</dd>
+
+                            @if (repair.LastModifiedOn.HasValue)
+                            {
+                                <dt class="col-sm-5">Last Modified:</dt>
+                                <dd class="col-sm-7">@repair.LastModifiedOn.Value.ToShortDateString()</dd>
+
+                                <dt class="col-sm-5">Modified By:</dt>
+                                <dd class="col-sm-7">@repair.LastModifiedBy</dd>
+                            }
+                        </dl>
+                    </div>
+                </div>
+
+                <!-- Actions -->
+                <div class="card">
+                    <div class="card-header">
+                        <h6 class="card-title mb-0">Actions</h6>
+                    </div>
+                    <div class="card-body">
+                        <div class="d-grid gap-2">
+                            <button class="btn btn-primary" @onclick="NavigateToEdit">
+                                <i class="bi bi-pencil me-1"></i>Edit Repair
+                            </button>
+                            @if (!repair.IsCompleted)
+                            {
+                                <button class="btn btn-success" @onclick="MarkComplete">
+                                    <i class="bi bi-check-circle me-1"></i>Mark as Completed
+                                </button>
+                            }
+                            <button class="btn btn-outline-danger" @onclick="DeleteRepair">
+                                <i class="bi bi-trash me-1"></i>Delete Repair
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+</div>
+
+@code {
+    [Parameter] public Guid Id { get; set; }
+
+    private Repair? repair;
+    private bool isLoading = true;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadData();
+    }
+
+    private async Task LoadData()
+    {
+        isLoading = true;
+        try
+        {
+            repair = await RepairService.GetByIdAsync(Id);
+        }
+        catch (Exception ex)
+        {
+            ToastService.ShowError($"Error loading repair: {ex.Message}");
+        }
+        finally
+        {
+            isLoading = false;
+        }
+    }
+
+    private async Task MarkComplete()
+    {
+        if (repair == null) return;
+
+        try
+        {
+            await RepairService.CompleteRepairAsync(repair.Id);
+            ToastService.ShowSuccess("Repair marked as completed.");
+            await LoadData();
+        }
+        catch (Exception ex)
+        {
+            ToastService.ShowError($"Error completing repair: {ex.Message}");
+        }
+    }
+
+    private async Task DeleteRepair()
+    {
+        try
+        {
+            await RepairService.DeleteAsync(Id);
+            ToastService.ShowSuccess("Repair deleted successfully.");
+            Navigation.NavigateTo("/propertymanagement/repairs");
+        }
+        catch (Exception ex)
+        {
+            ToastService.ShowError($"Error deleting repair: {ex.Message}");
+        }
+    }
+
+    private void NavigateToEdit() => Navigation.NavigateTo($"/propertymanagement/repairs/{Id}/edit");
+    private void Back() => Navigation.NavigateTo("/propertymanagement/repairs");
+}
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/IncomeStatementReport.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/IncomeStatementReport.razor
index 85f4160..04f3a4b 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/IncomeStatementReport.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/IncomeStatementReport.razor
@@ -6,7 +6,7 @@
 @using Aquiis.Application.Services.PdfGenerators
 @using Microsoft.AspNetCore.Authorization
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
-@inject FinancialReportService FinancialReportService
+@inject SimpleStartFinancialReportService FinancialReportService
 @inject PropertyService PropertyService
 @inject FinancialReportPdfGenerator PdfGenerator
 @inject AuthenticationStateProvider AuthenticationStateProvider
@@ -64,7 +64,7 @@
     else if (statement != null)
     {
         <div class="card mb-4">
-            <div class="card-header bg-primary text-white d-flex justify-content-between align-items-center">
+            <div class="card-header d-flex justify-content-between align-items-center">
                 <h5 class="mb-0">
                     @if (statement.PropertyId.HasValue)
                     {
@@ -76,7 +76,7 @@
                     }
                     - Income Statement
                 </h5>
-                <button class="btn btn-light btn-sm" @onclick="ExportToPdf">
+                <button class="btn btn btn-sm" @onclick="ExportToPdf">
                     <i class="bi bi-file-pdf"></i> Export PDF
                 </button>
             </div>
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/PropertyPerformanceReport.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/PropertyPerformanceReport.razor
index 734a268..be0b56c 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/PropertyPerformanceReport.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/PropertyPerformanceReport.razor
@@ -5,7 +5,7 @@
 @using Aquiis.Application.Services.PdfGenerators
 @using Microsoft.AspNetCore.Authorization
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
-@inject FinancialReportService FinancialReportService
+@inject SimpleStartFinancialReportService FinancialReportService
 @inject FinancialReportPdfGenerator PdfGenerator
 @inject AuthenticationStateProvider AuthenticationStateProvider
 
@@ -53,16 +53,16 @@
     else if (performanceItems.Any())
     {
         <div class="card">
-            <div class="card-header bg-primary text-white d-flex justify-content-between align-items-center">
+            <div class="card-header d-flex justify-content-between align-items-center">
                 <h5 class="mb-0">Property Performance: @startDate.ToString("MMM dd, yyyy") - @endDate.ToString("MMM dd, yyyy")</h5>
-                <button class="btn btn-light btn-sm" @onclick="ExportToPdf">
+                <button class="btn btn btn-sm" @onclick="ExportToPdf">
                     <i class="bi bi-file-pdf"></i> Export PDF
                 </button>
             </div>
             <div class="card-body p-0">
                 <div class="table-responsive">
                     <table class="table table-striped table-hover mb-0">
-                        <thead class="table-light">
+                        <thead class="table">
                             <tr>
                                 <th>Property</th>
                                 <th>Address</th>
@@ -108,7 +108,7 @@
                                 </tr>
                             }
                         </tbody>
-                        <tfoot class="table-light">
+                        <tfoot class="table">
                             <tr>
                                 <th colspan="2">TOTALS</th>
                                 <th class="text-end">@performanceItems?.Sum(p => p.TotalIncome).ToString("C")</th>
@@ -140,7 +140,7 @@
         <div class="row mt-4">
             <div class="col-md-6">
                 <div class="card">
-                    <div class="card-header bg-success text-white">
+                    <div class="card-header">
                         <h6 class="mb-0">Top Performing Properties (by Net Income)</h6>
                     </div>
                     <div class="card-body">
@@ -162,7 +162,7 @@
             </div>
             <div class="col-md-6">
                 <div class="card">
-                    <div class="card-header bg-info text-white">
+                    <div class="card-header">
                         <h6 class="mb-0">Highest Occupancy</h6>
                     </div>
                     <div class="card-body">
@@ -187,10 +187,32 @@
 </div>
 
 @code {
-    private DateTime startDate = new DateTime(DateTime.Now.Year, 1, 1);
-    private DateTime endDate = DateTime.Now;
+    private DateTime startDate = GetFiscalYearStart();
+    private DateTime endDate = GetFiscalYearEnd();
     private List<PropertyPerformance> performanceItems = new();
     private bool isLoading = false;
+    
+    private static DateTime GetFiscalYearStart()
+    {
+        var today = DateTime.Now;
+        // Fiscal year runs April 1 - March 31
+        // If current month is April or later, fiscal year started April 1 of current year
+        // If current month is before April, fiscal year started April 1 of previous year
+        return today.Month >= 4 
+            ? new DateTime(today.Year, 4, 1) 
+            : new DateTime(today.Year - 1, 4, 1);
+    }
+    
+    private static DateTime GetFiscalYearEnd()
+    {
+        var today = DateTime.Now;
+        // Fiscal year ends March 31
+        // If current month is April or later, fiscal year ends March 31 of next year
+        // If current month is before April, fiscal year ends March 31 of current year
+        return today.Month >= 4 
+            ? new DateTime(today.Year + 1, 3, 31) 
+            : new DateTime(today.Year, 3, 31);
+    }
 
     [CascadingParameter]
     private Task<AuthenticationState>? AuthenticationStateTask { get; set; }
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/RentRollReport.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/RentRollReport.razor
index 803ae8a..07f6d24 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/RentRollReport.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/RentRollReport.razor
@@ -5,7 +5,7 @@
 @using Aquiis.Application.Services.PdfGenerators
 @using Microsoft.AspNetCore.Authorization
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
-@inject FinancialReportService FinancialReportService
+@inject SimpleStartFinancialReportService FinancialReportService
 @inject FinancialReportPdfGenerator PdfGenerator
 @inject AuthenticationStateProvider AuthenticationStateProvider
 
@@ -48,16 +48,16 @@
     else if (rentRollItems.Any())
     {
         <div class="card">
-            <div class="card-header bg-primary text-white d-flex justify-content-between align-items-center">
+            <div class="card-header d-flex justify-content-between align-items-center">
                 <h5 class="mb-0">Rent Roll as of @asOfDate.ToString("MMM dd, yyyy")</h5>
-                <button class="btn btn-light btn-sm" @onclick="ExportToPdf">
+                <button class="btn btn btn-sm" @onclick="ExportToPdf">
                     <i class="bi bi-file-pdf"></i> Export PDF
                 </button>
             </div>
             <div class="card-body p-0">
                 <div class="table-responsive">
                     <table class="table table-striped table-hover mb-0">
-                        <thead class="table-light">
+                        <thead class="table">
                             <tr>
                                 <th>Property</th>
                                 <th>Address</th>
@@ -111,7 +111,7 @@
                                 </tr>
                             }
                         </tbody>
-                        <tfoot class="table-light">
+                        <tfoot class="table">
                             <tr>
                                 <th colspan="5">TOTALS</th>
                                 <th class="text-end">@rentRollItems.Sum(r => r.MonthlyRent).ToString("C")</th>
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/Reports.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/Reports.razor
index 67c6d56..3821e7c 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/Reports.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/Reports.razor
@@ -187,7 +187,7 @@ else
     <div class="row mt-4">
         <div class="col">
             <div class="card">
-                <div class="card-header bg-light">
+                <div class="card-header">
                     <h5 class="mb-0"><i class="bi bi-info-circle"></i> Report Features</h5>
                 </div>
                 <div class="card-body">
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/TaxReport.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/TaxReport.razor
index 27e7b80..265eb69 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/TaxReport.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Reports/Pages/TaxReport.razor
@@ -6,7 +6,7 @@
 @using Aquiis.Application.Services.PdfGenerators
 @using Microsoft.AspNetCore.Authorization
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
-@inject FinancialReportService FinancialReportService
+@inject SimpleStartFinancialReportService FinancialReportService
 @inject PropertyService PropertyService
 @inject FinancialReportPdfGenerator PdfGenerator
 @inject AuthenticationStateProvider AuthenticationStateProvider
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Create.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Create.razor
index 9eff5e7..2a80f89 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Create.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Create.razor
@@ -1,217 +1,5 @@
 @page "/propertymanagement/tenants/create"
-
-@using Aquiis.Core.Entities
-@using Aquiis.Application.Services
-@using Aquiis.SimpleStart.Shared.Services
-@using Aquiis.Application.Services.PdfGenerators
-@using System.ComponentModel.DataAnnotations
-@using Microsoft.AspNetCore.Authorization
-@inject TenantService TenantService
-@inject NavigationManager NavigationManager
-@inject ToastService ToastService
-@rendermode InteractiveServer
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
-<h3>Create Tenant</h3>
-
-<div class="row">
-    <div class="col-md-8">
-        <div class="card">
-            <div class="card-header">
-                <h3 class="card-title mb-0">Add New Tenant</h3>
-            </div>
-            <div class="card-body">
-                <EditForm Model="tenantModel" OnValidSubmit="SaveTenant" FormName="create-tenant">
-                    <DataAnnotationsValidator />
-                    
-                    @if (!string.IsNullOrEmpty(errorMessage))
-                    {
-                        <div class="alert alert-danger" role="alert">
-                            @((MarkupString)errorMessage)
-                        </div>
-                    }
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">First Name *</label>
-                            <InputText @bind-Value="tenantModel.FirstName" class="form-control" placeholder="First name" />
-                            <ValidationMessage For="() => tenantModel.FirstName" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Last Name *</label>
-                            <InputText @bind-Value="tenantModel.LastName" class="form-control" placeholder="Last name" />
-                            <ValidationMessage For="() => tenantModel.LastName" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Email *</label>
-                            <InputText @bind-Value="tenantModel.Email" class="form-control" type="email" placeholder="email@example.com" />
-                            <ValidationMessage For="() => tenantModel.Email" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Phone Number</label>
-                            <InputText @bind-Value="tenantModel.PhoneNumber" class="form-control" placeholder="(555) 123-4567" />
-                            <ValidationMessage For="() => tenantModel.PhoneNumber" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Date of Birth</label>
-                            <InputDate @bind-Value="tenantModel.DateOfBirth" class="form-control" />
-                            <ValidationMessage For="() => tenantModel.DateOfBirth" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Identification Number</label>
-                            <InputText @bind-Value="tenantModel.IdentificationNumber" class="form-control" />
-                            <ValidationMessage For="() => tenantModel.IdentificationNumber" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Emergency Contact Name</label>
-                            <InputText @bind-Value="tenantModel.EmergencyContactName" class="form-control" placeholder="Emergency contact name" />
-                            <ValidationMessage For="() => tenantModel.EmergencyContactName" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Emergency Contact Phone</label>
-                            <InputText @bind-Value="tenantModel.EmergencyContactPhone" class="form-control" placeholder="(555) 123-4567" />
-                            <ValidationMessage For="() => tenantModel.EmergencyContactPhone" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-12 mb-3">
-                            <label class="form-label">Notes</label>
-                            <InputTextArea @bind-Value="tenantModel.Notes" class="form-control" rows="3" placeholder="Additional notes about the tenant" />
-                            <ValidationMessage For="() => tenantModel.Notes" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="d-flex gap-2">
-                        <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                            }
-                            Create Tenant
-                        </button>
-                        <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
-                    </div>
-                </EditForm>
-            </div>
-        </div>
-    </div>
-</div>
-
-@code {
-    private TenantModel tenantModel = new TenantModel();
-    private bool isSubmitting = false;
-    private string errorMessage = string.Empty;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-   private async Task SaveTenant()
-    {
-        try
-        {
-            isSubmitting = true;
-            errorMessage = string.Empty;
-
-            var authState = await AuthenticationStateTask;
-            var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-            if (string.IsNullOrEmpty(userId))
-            {
-                errorMessage = "User not authenticated.";
-                ToastService.ShowError("User not authenticated. Please log in again.");
-                return;
-            }
-
-            // Check for duplicate identification number
-            if (!string.IsNullOrWhiteSpace(tenantModel.IdentificationNumber))
-            {
-                var existingTenant = await TenantService.GetTenantByIdentificationNumberAsync(tenantModel.IdentificationNumber);
-                if (existingTenant != null)
-                {
-                    errorMessage = $"A tenant with identification number <strong>{tenantModel.IdentificationNumber}</strong> already exists. " +
-                                 $"<a href=\"/propertymanagement/tenants/view/{existingTenant.Id}\" class=\"alert-link\">View existing tenant: {existingTenant.FullName}</a>";
-                    ToastService.ShowWarning($"Duplicate identification number found for {existingTenant.FullName}");
-                    return;
-                }
-            }
-
-            var tenant = new Tenant
-            {
-                FirstName = tenantModel.FirstName,
-                LastName = tenantModel.LastName,
-                Email = tenantModel.Email,
-                PhoneNumber = tenantModel.PhoneNumber,
-                DateOfBirth = tenantModel.DateOfBirth,
-                EmergencyContactName = tenantModel.EmergencyContactName,
-                EmergencyContactPhone = tenantModel.EmergencyContactPhone,
-                Notes = tenantModel.Notes,
-                IdentificationNumber = tenantModel.IdentificationNumber,
-                IsActive = true
-            };
-
-            await TenantService.CreateAsync(tenant);
-
-            ToastService.ShowSuccess($"Tenant {tenant.FullName} created successfully!");
-            NavigationManager.NavigateTo("/propertymanagement/tenants");
-        }
-        catch (Exception ex)
-        {
-            errorMessage = $"Error creating tenant: {ex.Message}";
-            ToastService.ShowError($"Failed to create tenant: {ex.Message}");
-        }
-        finally
-        {
-            isSubmitting = false;
-        }
-    }
-
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/tenants");
-    }
-
-    public class TenantModel
-    {
-        [Required(ErrorMessage = "First name is required")]
-        [StringLength(100, ErrorMessage = "First name cannot exceed 100 characters")]
-        public string FirstName { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Last name is required")]
-        [StringLength(100, ErrorMessage = "Last name cannot exceed 100 characters")]
-        public string LastName { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Email is required")]
-        [EmailAddress(ErrorMessage = "Please enter a valid email address")]
-        [StringLength(255, ErrorMessage = "Email cannot exceed 255 characters")]
-        public string Email { get; set; } = string.Empty;
-
-        [Phone(ErrorMessage = "Please enter a valid phone number")]
-        [StringLength(20, ErrorMessage = "Phone number cannot exceed 20 characters")]
-        public string PhoneNumber { get; set; } = string.Empty;
-
-        public DateTime? DateOfBirth { get; set; }
-
-        [Required(ErrorMessage = "Identification number is required")]
-        [StringLength(100, ErrorMessage = "Identification number cannot exceed 100 characters")]
-        public string IdentificationNumber { get; set; } = string.Empty;
-
-        [StringLength(200, ErrorMessage = "Emergency contact name cannot exceed 200 characters")]
-        public string EmergencyContactName { get; set; } = string.Empty;
-
-        [Phone(ErrorMessage = "Please enter a valid phone number")]
-        [StringLength(20, ErrorMessage = "Emergency contact phone cannot exceed 20 characters")]
-        public string EmergencyContactPhone { get; set; } = string.Empty;
+@rendermode InteractiveServer
 
-        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
-        public string Notes { get; set; } = string.Empty;
-    }
-}
\ No newline at end of file
+<Aquiis.UI.Shared.Features.PropertyManagement.Tenants.CreateForm />
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Edit.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Edit.razor
index 2768da8..13dab08 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Edit.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Edit.razor
@@ -1,339 +1,9 @@
-@page "/propertymanagement/tenants/edit/{Id:guid}"
-@using Aquiis.Core.Entities
-@using System.ComponentModel.DataAnnotations
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Web
-
+@page "/propertymanagement/tenants/{Id:guid}/edit"
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
-@inject NavigationManager NavigationManager
-@inject TenantService TenantService
 @rendermode InteractiveServer
 
-@if (tenant == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!isAuthorized)
-{
-    <div class="alert alert-danger">
-        <h4>Access Denied</h4>
-        <p>You don't have permission to edit this tenant.</p>
-        <a href="/tenants" class="btn btn-primary">Back to Tenants</a>
-    </div>
-}
-else
-{
-    <div class="row">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">
-                    <h3 class="card-title mb-0">Edit Tenant</h3>
-                </div>
-                <div class="card-body">
-                    <EditForm Model="tenantModel" OnValidSubmit="UpdateTenant" FormName="edit-tenant">
-                        <DataAnnotationsValidator />
-                        
-                        @if (!string.IsNullOrEmpty(errorMessage))
-                        {
-                            <div class="alert alert-danger" role="alert">
-                                @errorMessage
-                            </div>
-                        }
-
-                        @if (!string.IsNullOrEmpty(successMessage))
-                        {
-                            <div class="alert alert-success" role="alert">
-                                @successMessage
-                            </div>
-                        }
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">First Name *</label>
-                                <InputText @bind-Value="tenantModel.FirstName" class="form-control" placeholder="First name" />
-                                <ValidationMessage For="() => tenantModel.FirstName" class="text-danger" />
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Last Name *</label>
-                                <InputText @bind-Value="tenantModel.LastName" class="form-control" placeholder="Last name" />
-                                <ValidationMessage For="() => tenantModel.LastName" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Email *</label>
-                                <InputText @bind-Value="tenantModel.Email" class="form-control" type="email" placeholder="email@example.com" />
-                                <ValidationMessage For="() => tenantModel.Email" class="text-danger" />
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Phone Number</label>
-                                <InputText @bind-Value="tenantModel.PhoneNumber" class="form-control" placeholder="(555) 123-4567" />
-                                <ValidationMessage For="() => tenantModel.PhoneNumber" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Date of Birth</label>
-                                <InputDate @bind-Value="tenantModel.DateOfBirth" class="form-control" />
-                                <ValidationMessage For="() => tenantModel.DateOfBirth" class="text-danger" />
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Identification Number</label>
-                                <InputText @bind-Value="tenantModel.IdentificationNumber" class="form-control" placeholder="Identification number" />
-                                <ValidationMessage For="() => tenantModel.IdentificationNumber" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Emergency Contact Name</label>
-                                <InputText @bind-Value="tenantModel.EmergencyContactName" class="form-control" placeholder="Emergency contact name" />
-                                <ValidationMessage For="() => tenantModel.EmergencyContactName" class="text-danger" />
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Emergency Contact Phone</label>
-                                <InputText @bind-Value="tenantModel.EmergencyContactPhone" class="form-control" placeholder="(555) 123-4567" />
-                                <ValidationMessage For="() => tenantModel.EmergencyContactPhone" class="text-danger" />
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Status: </label>
-                                <InputCheckbox @bind-Value="tenantModel.IsActive" class="form-check-input" /> Active
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <label class="form-label">Notes</label>
-                                <InputTextArea @bind-Value="tenantModel.Notes" class="form-control" rows="3" placeholder="Additional notes about the tenant" />
-                                <ValidationMessage For="() => tenantModel.Notes" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="d-flex gap-2">
-                            <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                                @if (isSubmitting)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                                }
-                                Update Tenant
-                            </button>
-                            <button type="button" class="btn btn-secondary" @onclick="ViewTenant">View Tenant</button>
-                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                        </div>
-                    </EditForm>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-md-4">
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Tenant Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="ViewTenant">
-                            <i class="bi bi-eye"></i> View Tenant
-                        </button>
-                        <button class="btn btn-outline-success" @onclick="CreateLease">
-                            <i class="bi bi-file-plus"></i> Create Lease
-                        </button>
-                        <button class="btn btn-outline-danger" @onclick="DeleteTenant">
-                            <i class="bi bi-trash"></i> Delete Tenant
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="card mt-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Tenant Information</h5>
-                </div>
-                <div class="card-body">
-                    <small class="text-muted">
-                        <strong>Added:</strong> @tenant.CreatedOn.ToString("MMMM dd, yyyy")
-                        <br />
-                        @if (tenant.LastModifiedOn.HasValue)
-                        {
-                            <strong>Last Modified:</strong> @tenant.LastModifiedOn.Value.ToString("MMMM dd, yyyy")
-                        }
-                    </small>
-                </div>
-            </div>
-        </div>
-    </div>
-}
+<Aquiis.UI.Shared.Features.PropertyManagement.Tenants.EditForm TenantId="@Id" />
 
 @code {
     [Parameter] public Guid Id { get; set; }
-    
-    private Tenant? tenant;
-    private TenantModel tenantModel = new();
-    private bool isSubmitting = false;
-    private bool isAuthorized = true;
-    private string errorMessage = string.Empty;
-    private string successMessage = string.Empty;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadTenant();
-    }
-
-    private async Task LoadTenant()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (string.IsNullOrEmpty(userId))
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        tenant = await TenantService.GetByIdAsync(Id);
-
-        if (tenant == null)
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        // Map tenant to model
-        tenantModel = new TenantModel
-        {
-            FirstName = tenant.FirstName,
-            LastName = tenant.LastName,
-            Email = tenant.Email,
-            PhoneNumber = tenant.PhoneNumber,
-            DateOfBirth = tenant.DateOfBirth,
-            IdentificationNumber = tenant.IdentificationNumber,
-            IsActive = tenant.IsActive,
-            EmergencyContactName = tenant.EmergencyContactName,
-            EmergencyContactPhone = tenant.EmergencyContactPhone!,
-            Notes = tenant.Notes
-        };
-    }
-
-    private async Task UpdateTenant()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (string.IsNullOrEmpty(userId))
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        try
-        {
-            isSubmitting = true;
-            errorMessage = string.Empty;
-            successMessage = string.Empty;
-
-            // Update tenant with form data
-            tenant!.FirstName = tenantModel.FirstName;
-            tenant.LastName = tenantModel.LastName;
-            tenant.Email = tenantModel.Email;
-            tenant.PhoneNumber = tenantModel.PhoneNumber;
-            tenant.DateOfBirth = tenantModel.DateOfBirth;
-            tenant.IdentificationNumber = tenantModel.IdentificationNumber;
-            tenant.IsActive = tenantModel.IsActive;
-            tenant.EmergencyContactName = tenantModel.EmergencyContactName;
-            tenant.EmergencyContactPhone = tenantModel.EmergencyContactPhone;
-            tenant.Notes = tenantModel.Notes;
-
-            await TenantService.UpdateAsync(tenant);
-            successMessage = "Tenant updated successfully!";
-        }
-        catch (Exception ex)
-        {
-            errorMessage = $"Error updating tenant: {ex.Message}";
-        }
-        finally
-        {
-            isSubmitting = false;
-        }
-    }
-
-    private void ViewTenant()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/tenants/{Id}");
-    }
-
-    private void CreateLease()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/leases/create?tenantId={Id}");
-    }
-
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/tenants");
-    }
-
-    private async Task DeleteTenant()
-    {
-        if (tenant != null)
-        {
-            try
-            {
-                await TenantService.DeleteAsync(tenant.Id);
-                NavigationManager.NavigateTo("/propertymanagement/tenants");
-            }
-            catch (Exception ex)
-            {
-                errorMessage = $"Error deleting tenant: {ex.Message}";
-            }
-        }
-    }
-
-    public class TenantModel
-    {
-        [Required(ErrorMessage = "First name is required")]
-        [StringLength(100, ErrorMessage = "First name cannot exceed 100 characters")]
-        public string FirstName { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Last name is required")]
-        [StringLength(100, ErrorMessage = "Last name cannot exceed 100 characters")]
-        public string LastName { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Email is required")]
-        [EmailAddress(ErrorMessage = "Please enter a valid email address")]
-        [StringLength(255, ErrorMessage = "Email cannot exceed 255 characters")]
-        public string Email { get; set; } = string.Empty;
-
-        [Phone(ErrorMessage = "Please enter a valid phone number")]
-        [StringLength(20, ErrorMessage = "Phone number cannot exceed 20 characters")]
-        public string PhoneNumber { get; set; } = string.Empty;
-
-        public DateTime? DateOfBirth { get; set; }
-
-        [Required(ErrorMessage = "Identification number is required")]
-        [StringLength(100, ErrorMessage = "Identification number cannot exceed 100 characters")]
-        public string IdentificationNumber { get; set; } = string.Empty;
-
-        public bool IsActive { get; set; }
-
-        [StringLength(200, ErrorMessage = "Emergency contact name cannot exceed 200 characters")]
-        public string EmergencyContactName { get; set; } = string.Empty;
-
-        [Phone(ErrorMessage = "Please enter a valid phone number")]
-        [StringLength(20, ErrorMessage = "Emergency contact phone cannot exceed 20 characters")]
-        public string EmergencyContactPhone { get; set; } = string.Empty;
-
-        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
-        public string Notes { get; set; } = string.Empty;
-    }
-}
\ No newline at end of file
+}
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Index.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Index.razor
index b5e4a7b..edf1763 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Index.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/Index.razor
@@ -1,528 +1,5 @@
 @page "/propertymanagement/tenants"
-@using Aquiis.SimpleStart.Features.PropertyManagement
-@using Microsoft.AspNetCore.Authorization
-@inject NavigationManager Navigation
-@inject TenantService TenantService
-@inject IJSRuntime JSRuntime
-@inject UserContextService UserContext
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager", "User")]
 @rendermode InteractiveServer
 
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <h1><span class="bi bi-people-fill" aria-hidden="true"></span> Tenants</h1>
-    @if (!isReadOnlyUser)
-    {
-        <button class="btn btn-primary" @onclick="CreateTenant">
-            <i class="bi bi-plus-lg"></i> Add Tenant
-        </button>
-    }
-</div>
-
-@if (tenants == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!tenants.Any())
-{
-    <div class="alert alert-info">
-        <h4>No Tenants Found</h4>
-        <p>Get started by converting a Prospective Tenant to your first tenant in the system.</p>
-        <button class="btn btn-primary" @onclick="CreateTenant">Add First Tenant</button>
-    </div>
-}
-else
-{
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="input-group">
-                <span class="input-group-text"><i class="bi bi-search"></i></span>
-                <input type="text" class="form-control" placeholder="Search tenants..." @bind="searchTerm" @onkeyup="FilterTenants" />
-            </div>
-        </div>
-        <div class="col-md-3">
-            <select class="form-select" @bind="selectedLeaseStatus" @bind:after="FilterTenants">
-                <option value="">All Lease Statuses</option>
-                <option value="Active">Active Lease</option>
-                <option value="Expired">Expired Lease</option>
-                <option value="Terminated">Terminated Lease</option>
-                <option value="Pending">Pending Lease</option>
-                <option value="No Lease">No Lease</option>
-            </select>
-        </div>
-        <div class="col-md-3">
-            <select class="form-select" @bind="selectedTenantStatus" @bind:after="FilterTenants">
-                <option value="1">Active Tenants</option>
-                <option value="0">Inactive Tenants</option>
-            </select>
-        </div>
-        <div class="col-md-3">
-            <button class="btn btn-outline-secondary" @onclick="ClearFilters">
-                <i class="bi bi-x-circle"></i> Clear Filters
-            </button>
-        </div>
-    </div>
-
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="card text-white bg-success">
-                <div class="card-body">
-                    <h6>Active Tenants</h6>
-                    <h4>@activeTenantsCount</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-warning">
-                <div class="card-body">
-                    <h6>Without Lease</h6>
-                    <h4>@tenantsWithoutLeaseCount</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-info">
-                <div class="card-body">
-                    <h6>Total Tenants</h6>
-                    <h4>@filteredTenants.Count</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-primary">
-                <div class="card-body">
-                    <h6>New This Month</h6>
-                    <h4>@newThisMonthCount</h4>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="card">
-        <div class="card-body">
-            <div class="table-responsive">
-                <table class="table table-hover">
-                    <thead>
-                        <tr>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.FirstName))">
-                                    Name
-                                    @if (sortColumn == nameof(Tenant.FirstName))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.Email))">
-                                    Email
-                                    @if (sortColumn == nameof(Tenant.Email))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.PhoneNumber))">
-                                    Phone
-                                    @if (sortColumn == nameof(Tenant.PhoneNumber))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.DateOfBirth))">
-                                    Date of Birth
-                                    @if (sortColumn == nameof(Tenant.DateOfBirth))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.IsActive))">
-                                    Status
-                                    @if (sortColumn == nameof(Tenant.IsActive))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.CreatedOn))">
-                                    Created
-                                    @if (sortColumn == nameof(Tenant.CreatedOn))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>Lease Status</th>
-                            <th>Actions</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (var tenant in pagedTenants)
-                        {
-                            <tr>
-                                <td>
-                                    <div>
-                                        <strong>@tenant.FullName</strong>
-                                        @if (!string.IsNullOrEmpty(tenant.Notes))
-                                        {
-                                            <br />
-                                            <small class="text-muted">@tenant.Notes</small>
-                                        }
-                                    </div>
-                                </td>
-                                <td>@tenant.Email</td>
-                                <td>@tenant.PhoneNumber</td>
-                                <td>
-                                    @if (tenant.DateOfBirth.HasValue)
-                                    {
-                                        @tenant.DateOfBirth.Value.ToString("MMM dd, yyyy")
-                                    }
-                                    else
-                                    {
-                                        <span class="text-muted">Not provided</span>
-                                    }
-                                </td>
-                                <td>
-                                    @if (tenant.IsActive)
-                                    {
-                                        <span class="badge bg-success">Active</span>
-                                    }
-                                    else
-                                    {
-                                        <span class="badge bg-secondary">Inactive</span>
-                                    }
-                                </td>
-                                <td>@tenant.CreatedOn.ToString("MMM dd, yyyy")</td>
-                                <td>
-                                    @{
-                                        var activeLease = tenant.Leases?.FirstOrDefault(l => l.Status == "Active");
-                                        var latestLease = tenant.Leases?.OrderByDescending(l => l.StartDate).FirstOrDefault();
-                                    }
-                                    @if (activeLease != null)
-                                    {
-                                        <span class="badge bg-success">Active</span>
-                                    }
-                                    else if (latestLease != null)
-                                    {
-                                        <span class="badge bg-@(GetLeaseStatusClass(latestLease.Status))">@latestLease.Status</span>
-                                    }
-                                    else
-                                    {
-                                        <span class="badge bg-secondary">No Lease</span>
-                                    }
-                                </td>
-                                <td>
-                                    <div class="btn-group btn-group-sm">
-                                        <button class="btn btn-outline-primary" @onclick="() => ViewTenant(tenant.Id)" title="View">
-                                            <i class="bi bi-eye"></i>
-                                        </button>
-                                        @if (!isReadOnlyUser)
-                                        {
-                                            <button class="btn btn-outline-secondary" @onclick="() => EditTenant(tenant.Id)" title="Edit">
-                                                <i class="bi bi-pencil"></i>
-                                            </button>
-                                            <button class="btn btn-outline-danger" @onclick="() => DeleteTenant(tenant.Id)" title="Delete">
-                                                <i class="bi bi-trash"></i>
-                                            </button>
-                                        }
-                                    </div>
-                                </td>
-                            </tr>
-                        }
-                    </tbody>
-                </table>
-            </div>
-            
-            @if (totalPages > 1)
-            {
-                <div class="d-flex justify-content-between align-items-center mt-3">
-                    <div>
-                        <small class="text-muted">
-                            Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords tenants
-                        </small>
-                    </div>
-                    <nav aria-label="Tenants pagination">
-                        <ul class="pagination pagination-sm mb-0">
-                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                <button class="page-link" @onclick="() => GoToPage(1)" disabled="@(currentPage == 1)">
-                                    <i class="bi bi-chevron-double-left"></i>
-                                </button>
-                            </li>
-                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                <button class="page-link" @onclick="() => GoToPage(currentPage - 1)" disabled="@(currentPage == 1)">
-                                    <i class="bi bi-chevron-left"></i>
-                                </button>
-                            </li>
-                            
-                            @for (int page = Math.Max(1, currentPage - 2); page <= Math.Min(totalPages, currentPage + 2); page++)
-                            {
-                                var pageNumber = page;
-                                <li class="page-item @(currentPage == pageNumber ? "active" : "")">
-                                    <button class="page-link" @onclick="() => GoToPage(pageNumber)">
-                                        @pageNumber
-                                    </button>
-                                </li>
-                            }
-                            
-                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                <button class="page-link" @onclick="() => GoToPage(currentPage + 1)" disabled="@(currentPage == totalPages)">
-                                    <i class="bi bi-chevron-right"></i>
-                                </button>
-                            </li>
-                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                <button class="page-link" @onclick="() => GoToPage(totalPages)" disabled="@(currentPage == totalPages)">
-                                    <i class="bi bi-chevron-double-right"></i>
-                                </button>
-                            </li>
-                        </ul>
-                    </nav>
-                </div>
-            }
-        </div>
-    </div>
-}
-
-@code {
-    private List<Tenant>? tenants;
-    private List<Tenant> filteredTenants = new();
-    private List<Tenant> pagedTenants = new();
-    private string searchTerm = string.Empty;
-    private string selectedLeaseStatus = string.Empty;
-
-    private int selectedTenantStatus = 1;
-
-    private string sortColumn = nameof(Tenant.FirstName);
-    private bool sortAscending = true;
-    private int activeTenantsCount = 0;
-    private int tenantsWithoutLeaseCount = 0;
-    private int newThisMonthCount = 0;
-    
-    // Pagination variables
-    private int currentPage = 1;
-    private int pageSize = 20;
-    private int totalPages = 1;
-    private int totalRecords = 0;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    private string? currentUserRole;
-    private bool isReadOnlyUser => currentUserRole == ApplicationConstants.OrganizationRoles.User;
-
-    protected override async Task OnInitializedAsync()
-    {
-        // Get current user's role
-        currentUserRole = await UserContext.GetCurrentOrganizationRoleAsync();
-        
-        await LoadTenants();
-        FilterTenants();
-        CalculateMetrics();
-    }
-
-    private async Task LoadTenants()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-        
-        if (string.IsNullOrEmpty(userId))
-        {
-            tenants = new List<Tenant>();
-            return;
-        }
-
-        tenants = await TenantService.GetAllAsync();
-    }
-
-    private void CreateTenant()
-    {
-        Navigation.NavigateTo("/propertymanagement/prospectivetenants");
-    }
-
-    private void ViewTenant(Guid id)
-    {
-        Navigation.NavigateTo($"/propertymanagement/tenants/{id}");
-    }
-
-    private void EditTenant(Guid id)
-    {
-        Navigation.NavigateTo($"/propertymanagement/tenants/{id}/edit");
-    }
-
-    private async Task DeleteTenant(Guid id)
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-        
-        if (string.IsNullOrEmpty(userId))
-            return;
-
-        
-        // Add confirmation dialog in a real application
-        var tenant = await TenantService.GetByIdAsync(id);
-        if (tenant != null)
-        {
-
-            await TenantService.DeleteAsync(tenant.Id);
-            await LoadTenants();
-            FilterTenants();
-            CalculateMetrics();
-        }
-    }
-
-    private void FilterTenants()
-    {
-        if (tenants == null)
-        {
-            filteredTenants = new();
-            pagedTenants = new();
-            return;
-        }
-
-        filteredTenants = tenants.Where(t =>
-            (string.IsNullOrEmpty(searchTerm) ||
-             t.FullName.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             t.Email.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             t.PhoneNumber.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             t.Notes.Contains(searchTerm, StringComparison.OrdinalIgnoreCase)) &&
-            (string.IsNullOrEmpty(selectedLeaseStatus) || GetTenantLeaseStatus(t) == selectedLeaseStatus) &&
-            (selectedTenantStatus == 1 ? t.IsActive : !t.IsActive)
-        ).ToList();
-        
-        SortTenants();
-        UpdatePagination();
-        CalculateMetrics();
-    }
-
-    private string GetTenantLeaseStatus(Tenant tenant)
-    {
-        var activeLease = tenant.Leases?.FirstOrDefault(l => l.Status == "Active");
-        if (activeLease != null) return "Active";
-        
-        var latestLease = tenant.Leases?.OrderByDescending(l => l.StartDate).FirstOrDefault();
-        if (latestLease != null) return latestLease.Status;
-        
-        return "No Lease";
-    }
-
-    private void SortBy(string column)
-    {
-        if (sortColumn == column)
-        {
-            sortAscending = !sortAscending;
-        }
-        else
-        {
-            sortColumn = column;
-            sortAscending = true;
-        }
-        
-        SortTenants();
-    }
-
-    private void SortTenants()
-    {
-        if (filteredTenants == null) return;
-
-        filteredTenants = sortColumn switch
-        {
-            nameof(Tenant.FirstName) => sortAscending 
-                ? filteredTenants.OrderBy(t => t.FirstName).ThenBy(t => t.LastName).ToList()
-                : filteredTenants.OrderByDescending(t => t.FirstName).ThenByDescending(t => t.LastName).ToList(),
-            nameof(Tenant.Email) => sortAscending 
-                ? filteredTenants.OrderBy(t => t.Email).ToList()
-                : filteredTenants.OrderByDescending(t => t.Email).ToList(),
-            nameof(Tenant.PhoneNumber) => sortAscending 
-                ? filteredTenants.OrderBy(t => t.PhoneNumber).ToList()
-                : filteredTenants.OrderByDescending(t => t.PhoneNumber).ToList(),
-            nameof(Tenant.DateOfBirth) => sortAscending 
-                ? filteredTenants.OrderBy(t => t.DateOfBirth ?? DateTime.MinValue).ToList()
-                : filteredTenants.OrderByDescending(t => t.DateOfBirth ?? DateTime.MinValue).ToList(),
-            nameof(Tenant.IsActive) => sortAscending 
-                ? filteredTenants.OrderBy(t => t.IsActive).ToList()
-                : filteredTenants.OrderByDescending(t => t.IsActive).ToList(),
-            nameof(Tenant.CreatedOn) => sortAscending 
-                ? filteredTenants.OrderBy(t => t.CreatedOn).ToList()
-                : filteredTenants.OrderByDescending(t => t.CreatedOn).ToList(),
-            _ => filteredTenants
-        };
-        
-        UpdatePagination();
-    }
-
-    private void CalculateMetrics()
-    {
-        if (filteredTenants != null)
-        {
-            activeTenantsCount = filteredTenants.Count(t => 
-                t.Leases?.Any(l => l.Status == "Active") == true);
-            
-            tenantsWithoutLeaseCount = filteredTenants.Count(t => 
-                t.Leases?.Any() != true);
-            
-            var now = DateTime.Now;
-            newThisMonthCount = filteredTenants.Count(t => 
-                t.CreatedOn.Month == now.Month && t.CreatedOn.Year == now.Year);
-        }
-    }
-
-    private string GetLeaseStatusClass(string status)
-    {
-        return status switch
-        {
-            "Active" => "success",
-            "Expired" => "warning",
-            "Terminated" => "danger",
-            "Pending" => "info",
-            _ => "secondary"
-        };
-    }
-
-    private void ClearFilters()
-    {
-        searchTerm = string.Empty;
-        selectedLeaseStatus = string.Empty;
-        currentPage = 1;
-        FilterTenants();
-    }
-
-    private void UpdatePagination()
-    {
-        totalRecords = filteredTenants?.Count ?? 0;
-        totalPages = (int)Math.Ceiling((double)totalRecords / pageSize);
-        
-        // Ensure current page is valid
-        if (currentPage > totalPages && totalPages > 0)
-        {
-            currentPage = totalPages;
-        }
-        else if (currentPage < 1)
-        {
-            currentPage = 1;
-        }
-        
-        // Get the current page of data
-        pagedTenants = filteredTenants?
-            .Skip((currentPage - 1) * pageSize)
-            .Take(pageSize)
-            .ToList() ?? new List<Tenant>();
-    }
-
-    private void GoToPage(int page)
-    {
-        if (page >= 1 && page <= totalPages && page != currentPage)
-        {
-            currentPage = page;
-            UpdatePagination();
-        }
-    }
-}
\ No newline at end of file
+<Aquiis.UI.Shared.Features.PropertyManagement.Tenants.ListForm />
diff --git a/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/View.razor b/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/View.razor
index 2e5021f..50ad8f6 100644
--- a/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/View.razor
+++ b/4-Aquiis.SimpleStart/Features/PropertyManagement/Tenants/Pages/View.razor
@@ -1,241 +1,9 @@
-@page "/propertymanagement/tenants/view/{Id:guid}"
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Authorization
-@inject NavigationManager NavigationManager
-@inject TenantService TenantService
-@inject LeaseService LeaseService
-
+@page "/propertymanagement/tenants/{Id:guid}"
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-@if (tenant == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!isAuthorized)
-{
-    <div class="alert alert-danger">
-        <h4>Access Denied</h4>
-        <p>You don't have permission to view this tenant.</p>
-        <a href="/tenants" class="btn btn-primary">Back to Tenants</a>
-    </div>
-}
-else
-{
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <h1>Tenant Details</h1>
-        <div class="btn-group">
-            <button class="btn btn-primary" @onclick="EditTenant">
-                <i class="bi bi-pencil"></i> Edit
-            </button>
-            <button class="btn btn-secondary" @onclick="BackToList">
-                <i class="bi bi-arrow-left"></i> Back to List
-            </button>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Personal Information</h5>
-                </div>
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Full Name:</strong>
-                            <p>@tenant.FullName</p>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <strong>Email:</strong>
-                            <p><a href="mailto:@tenant.Email">@tenant.Email</a></p>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Phone Number:</strong>
-                            <p>@(!string.IsNullOrEmpty(tenant.PhoneNumber) ? tenant.PhoneNumber : "Not provided")</p>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <strong>Date of Birth:</strong>
-                            <p>@(tenant.DateOfBirth?.ToString("MMMM dd, yyyy") ?? "Not provided")</p>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Identification Number:</strong>
-                            <p>@(!string.IsNullOrEmpty(tenant.IdentificationNumber) ? tenant.IdentificationNumber : "Not provided")</p>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <strong>Status:</strong>
-                            <p>@(tenant.IsActive ? "Active" : "Inactive")</p>
-                        </div>
-                    </div>
-
-                    @if (!string.IsNullOrEmpty(tenant.EmergencyContactName) || !string.IsNullOrEmpty(tenant.EmergencyContactPhone))
-                    {
-                        <hr />
-                        <h6>Emergency Contact</h6>
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <strong>Contact Name:</strong>
-                                <p>@(!string.IsNullOrEmpty(tenant.EmergencyContactName) ? tenant.EmergencyContactName : "Not provided")</p>
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <strong>Contact Phone:</strong>
-                                <p>@(!string.IsNullOrEmpty(tenant.EmergencyContactPhone) ? tenant.EmergencyContactPhone : "Not provided")</p>
-                            </div>
-                        </div>
-                    }
-
-                    @if (!string.IsNullOrEmpty(tenant.Notes))
-                    {
-                        <hr />
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <strong>Notes:</strong>
-                                <p>@tenant.Notes</p>
-                            </div>
-                        </div>
-                    }
-
-                    <hr />
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Added to System:</strong>
-                            <p>@tenant.CreatedOn.ToString("MMMM dd, yyyy")</p>
-                        </div>
-                        @if (tenant.LastModifiedOn.HasValue)
-                        {
-                            <div class="col-md-6 mb-3">
-                                <strong>Last Modified:</strong>
-                                <p>@tenant.LastModifiedOn.Value.ToString("MMMM dd, yyyy")</p>
-                            </div>
-                        }
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-md-4">
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Quick Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="EditTenant">
-                            <i class="bi bi-pencil"></i> Edit Tenant
-                        </button>
-                        <button class="btn btn-outline-success" @onclick="CreateLease">
-                            <i class="bi bi-file-plus"></i> Create Lease
-                        </button>
-                        <button class="btn btn-outline-info" @onclick="ViewLeases">
-                            <i class="bi bi-file-text"></i> View Leases
-                        </button>
-                        <button class="btn btn-outline-secondary" @onclick="ViewDocuments">
-                            <i class="bi bi-folder"></i> View Documents
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            @if (tenantLeases.Any())
-            {
-                <div class="card mt-3">
-                    <div class="card-header">
-                        <h5 class="mb-0">Lease History</h5>
-                    </div>
-                    <div class="card-body">
-                        @foreach (var lease in tenantLeases.OrderByDescending(l => l.StartDate))
-                        {
-                            <div class="border-bottom pb-2 mb-2">
-                                <strong>@lease.Property?.Address</strong>
-                                <br />
-                                <small class="text-muted">
-                                    @lease.StartDate.ToString("MMM dd, yyyy") - @lease.EndDate.ToString("MMM dd, yyyy")
-                                </small>
-                                <br />
-                                <span class="badge @(lease.Status == "Active" ? "bg-success" : "bg-secondary")">
-                                    @lease.Status
-                                </span>
-                                <small class="text-success ms-2">@lease.MonthlyRent.ToString("C")/month</small>
-                            </div>
-                        }
-                    </div>
-                </div>
-            }
-        </div>
-    </div>
-}
+<Aquiis.UI.Shared.Features.PropertyManagement.Tenants.ViewForm TenantId="@Id" />
 
 @code {
-    [Parameter]
-    public Guid Id { get; set; }
-    
-    private Tenant? tenant;
-    private List<Lease> tenantLeases = new();
-    private bool isAuthorized = true;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadTenant();
-    }
-
-    private async Task LoadTenant()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (string.IsNullOrEmpty(userId))
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        tenant = await TenantService.GetByIdAsync(Id);
-
-        if (tenant == null)
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        // Load leases for this tenant
-        tenantLeases = await LeaseService.GetLeasesByTenantIdAsync(Id);
-    }
-
-    private void EditTenant()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/tenants/{Id}/edit");
-    }
-
-    private void BackToList()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/tenants");
-    }
-
-    private void CreateLease()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/leases/create?tenantId={Id}");
-    }
-
-    private void ViewLeases()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/leases?tenantId={Id}");
-    }
-
-    private void ViewDocuments()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/documents?tenantId={Id}");
-    }
-}
\ No newline at end of file
+    [Parameter] public Guid Id { get; set; }
+}
diff --git a/4-Aquiis.SimpleStart/Features/_Imports.razor b/4-Aquiis.SimpleStart/Features/_Imports.razor
index cf019eb..d8ab796 100644
--- a/4-Aquiis.SimpleStart/Features/_Imports.razor
+++ b/4-Aquiis.SimpleStart/Features/_Imports.razor
@@ -19,3 +19,4 @@
 @using Aquiis.Core.Constants
 @using Aquiis.SimpleStart.Features.PropertyManagement
 @using Aquiis.SimpleStart.Features.Administration
+@using Aquiis.UI.Shared.Components.Entities.Properties
diff --git a/4-Aquiis.SimpleStart/Program.cs b/4-Aquiis.SimpleStart/Program.cs
index a6869e6..dcf6599 100644
--- a/4-Aquiis.SimpleStart/Program.cs
+++ b/4-Aquiis.SimpleStart/Program.cs
@@ -161,7 +161,8 @@
 builder.Services.AddSingleton<ToastService>();
 builder.Services.AddSingleton<ThemeService>();
 builder.Services.AddScoped<LeaseRenewalPdfGenerator>();
-builder.Services.AddScoped<FinancialReportService>();
+builder.Services.AddScoped<FinancialReportService>(); // Professional edition uses MaintenanceRequests
+builder.Services.AddScoped<SimpleStartFinancialReportService>(); // SimpleStart uses Repairs
 builder.Services.AddScoped<FinancialReportPdfGenerator>();
 builder.Services.AddScoped<ChecklistPdfGenerator>();
 builder.Services.AddScoped<DatabaseBackupService>();
@@ -543,7 +544,7 @@
         }
         
         // DO NOT assign to any organization - service account is org-agnostic
-        // DO NOT create UserOrganizations entries
+        // DO NOT create OrganizationUsers entries
         // DO NOT set ActiveOrganizationId
     }
 }
diff --git a/4-Aquiis.SimpleStart/Services/WebPathService.cs b/4-Aquiis.SimpleStart/Services/WebPathService.cs
index ae32fed..580688f 100644
--- a/4-Aquiis.SimpleStart/Services/WebPathService.cs
+++ b/4-Aquiis.SimpleStart/Services/WebPathService.cs
@@ -31,16 +31,25 @@ public async Task<string> GetConnectionStringAsync(object configuration)
     public async Task<string> GetDatabasePathAsync()
     {
         var connectionString = await GetConnectionStringAsync(_configuration);
-        // Extract Data Source from connection string
-        var dataSource = connectionString.Split(';')
-            .FirstOrDefault(s => s.Trim().StartsWith("Data Source=", StringComparison.OrdinalIgnoreCase));
+        // Extract Data Source from connection string (supports both "Data Source=" and "DataSource=")
+        var dbPath = connectionString
+            .Replace("Data Source=", "")
+            .Replace("DataSource=", "")
+            .Split(';')[0]
+            .Trim();
         
-        if (dataSource != null)
+        if (string.IsNullOrEmpty(dbPath))
         {
-            return dataSource.Split('=')[1].Trim();
+            dbPath = "aquiis.db"; // Default
         }
         
-        return "aquiis.db"; // Default
+        // Make absolute path if relative
+        if (!Path.IsPathRooted(dbPath))
+        {
+            dbPath = Path.Combine(Directory.GetCurrentDirectory(), dbPath);
+        }
+        
+        return dbPath;
     }
     
     public async Task<string> GetUserDataPathAsync()
diff --git a/4-Aquiis.SimpleStart/Shared/App.razor b/4-Aquiis.SimpleStart/Shared/App.razor
index dee388b..b26a79e 100644
--- a/4-Aquiis.SimpleStart/Shared/App.razor
+++ b/4-Aquiis.SimpleStart/Shared/App.razor
@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="_content/Aquiis.UI.Shared/css/organization-switcher.css" />
     <link rel="stylesheet" href="@Assets["Aquiis.SimpleStart.styles.css"]" />
     <ImportMap />
-    <link rel="icon" type="image/png" href="favicon.png" />
+    <link rel="icon" type="image/x-icon" href="favicon.ico" />
     <!-- Load theme immediately to prevent flash -->
     <script src="_content/Aquiis.UI.Shared/js/theme.js"></script>
     <HeadOutlet />
diff --git a/4-Aquiis.SimpleStart/Shared/Authorization/OrganizationRoleAuthorizationHandler copy.cs b/4-Aquiis.SimpleStart/Shared/Authorization/OrganizationRoleAuthorizationHandler copy.cs
index c6a4ec4..4389707 100644
--- a/4-Aquiis.SimpleStart/Shared/Authorization/OrganizationRoleAuthorizationHandler copy.cs	
+++ b/4-Aquiis.SimpleStart/Shared/Authorization/OrganizationRoleAuthorizationHandler copy.cs	
@@ -51,21 +51,21 @@ protected override async Task HandleRequirementAsync(
         }
 
         // Get user's role in the active organization
-        var userOrganization = await _dbContext.UserOrganizations
+        var OrganizationUser = await _dbContext.OrganizationUsers
             .Where(uo => uo.UserId == userId 
                       && uo.OrganizationId == user.ActiveOrganizationId 
                       && uo.IsActive 
                       && !uo.IsDeleted)
             .FirstOrDefaultAsync();
 
-        if (userOrganization == null)
+        if (OrganizationUser == null)
         {
             return;
         }
 
         // Check if user's role is in the allowed roles
         // If no roles specified (empty array), allow any authenticated org member
-        if (requirement.AllowedRoles.Length == 0 || requirement.AllowedRoles.Contains(userOrganization.Role))
+        if (requirement.AllowedRoles.Length == 0 || requirement.AllowedRoles.Contains(OrganizationUser.Role))
         {
             context.Succeed(requirement);
         }
diff --git a/4-Aquiis.SimpleStart/Shared/Components/Account/Pages/Manage/Email.razor b/4-Aquiis.SimpleStart/Shared/Components/Account/Pages/Manage/Email.razor
index e7e8001..2a9ca49 100644
--- a/4-Aquiis.SimpleStart/Shared/Components/Account/Pages/Manage/Email.razor
+++ b/4-Aquiis.SimpleStart/Shared/Components/Account/Pages/Manage/Email.razor
@@ -42,11 +42,11 @@
                 </div>
             }
             <div class="form-floating mb-3">
-                <InputText @bind-Value="Input.NewEmail" id="Input.NewEmail" class="form-control" autocomplete="email" aria-required="true" placeholder="Enter a new email" />
+                <InputText @bind-Value="Input.NewEmail" id="Input.NewEmail" class="form-control" disabled autocomplete="email" aria-required="true" placeholder="Enter a new email" />
                 <label for="Input.NewEmail" class="form-label">New email</label>
                 <ValidationMessage For="() => Input.NewEmail" class="text-danger" />
             </div>
-            <button type="submit" class="w-100 btn btn-lg btn-primary">Change email</button>
+            <button type="submit" class="w-100 btn btn-lg btn-primary" disabled title="Email cannot be changed.">Change email</button>
         </EditForm>
     </div>
 </div>
diff --git a/4-Aquiis.SimpleStart/Shared/Components/Account/Pages/Manage/Index.razor b/4-Aquiis.SimpleStart/Shared/Components/Account/Pages/Manage/Index.razor
index 0ae4a5c..5ed3d65 100644
--- a/4-Aquiis.SimpleStart/Shared/Components/Account/Pages/Manage/Index.razor
+++ b/4-Aquiis.SimpleStart/Shared/Components/Account/Pages/Manage/Index.razor
@@ -4,6 +4,7 @@
 @using Microsoft.AspNetCore.Identity
 
 @inject UserManager<ApplicationUser> UserManager
+@inject UserContextService UserContext
 @inject SignInManager<ApplicationUser> SignInManager
 @inject IdentityUserAccessor UserAccessor
 @inject IdentityRedirectManager RedirectManager
@@ -88,7 +89,7 @@
             }
         }
         
-        // Update the user properties
+        // Update the user properties in Identity
         user.FirstName = Input.FirstName ?? string.Empty;
         user.LastName = Input.LastName ?? string.Empty;
 
@@ -100,6 +101,19 @@
             return;
         }
 
+        // Update UserProfile to keep denormalized data in sync
+        var profileUpdated = await UserContext.UpdateCurrentUserProfileAsync(
+            Input.FirstName ?? string.Empty,
+            Input.LastName ?? string.Empty,
+            Input.PhoneNumber
+        );
+
+        if (!profileUpdated)
+        {
+            RedirectManager.RedirectToCurrentPageWithStatus("Error: Failed to update user profile.", HttpContext);
+            return;
+        }
+
         await SignInManager.RefreshSignInAsync(user);
         RedirectManager.RedirectToCurrentPageWithStatus("Your profile has been updated", HttpContext);
     }
diff --git a/4-Aquiis.SimpleStart/Shared/Components/Account/Pages/Register.razor b/4-Aquiis.SimpleStart/Shared/Components/Account/Pages/Register.razor
index a602d9b..bf2da7e 100644
--- a/4-Aquiis.SimpleStart/Shared/Components/Account/Pages/Register.razor
+++ b/4-Aquiis.SimpleStart/Shared/Components/Account/Pages/Register.razor
@@ -1,10 +1,7 @@
 @page "/Account/Register"
 
 @using System.ComponentModel.DataAnnotations
-@using System.Text
-@using System.Text.Encodings.Web
 @using Microsoft.AspNetCore.Identity
-@using Microsoft.AspNetCore.WebUtilities
 @using Aquiis.Infrastructure.Data
 @using Aquiis.Application.Services
 @using Aquiis.Core.Entities
@@ -60,12 +57,79 @@ else
                         <label for="Input.OrganizationName">Organization Name</label>
                         <ValidationMessage For="() => Input.OrganizationName" class="text-danger" />
                     </div>
+                    <div class="form-floating mb-3">
+                        <InputSelect @bind-Value="Input.State" id="Input.State" class="form-select" aria-required="true">
+                            <option value="">Select State</option>
+                            <option value="AL">Alabama</option>
+                            <option value="AK">Alaska</option>
+                            <option value="AZ">Arizona</option>
+                            <option value="AR">Arkansas</option>
+                            <option value="CA">California</option>
+                            <option value="CO">Colorado</option>
+                            <option value="CT">Connecticut</option>
+                            <option value="DE">Delaware</option>
+                            <option value="FL">Florida</option>
+                            <option value="GA">Georgia</option>
+                            <option value="HI">Hawaii</option>
+                            <option value="ID">Idaho</option>
+                            <option value="IL">Illinois</option>
+                            <option value="IN">Indiana</option>
+                            <option value="IA">Iowa</option>
+                            <option value="KS">Kansas</option>
+                            <option value="KY">Kentucky</option>
+                            <option value="LA">Louisiana</option>
+                            <option value="ME">Maine</option>
+                            <option value="MD">Maryland</option>
+                            <option value="MA">Massachusetts</option>
+                            <option value="MI">Michigan</option>
+                            <option value="MN">Minnesota</option>
+                            <option value="MS">Mississippi</option>
+                            <option value="MO">Missouri</option>
+                            <option value="MT">Montana</option>
+                            <option value="NE">Nebraska</option>
+                            <option value="NV">Nevada</option>
+                            <option value="NH">New Hampshire</option>
+                            <option value="NJ">New Jersey</option>
+                            <option value="NM">New Mexico</option>
+                            <option value="NY">New York</option>
+                            <option value="NC">North Carolina</option>
+                            <option value="ND">North Dakota</option>
+                            <option value="OH">Ohio</option>
+                            <option value="OK">Oklahoma</option>
+                            <option value="OR">Oregon</option>
+                            <option value="PA">Pennsylvania</option>
+                            <option value="RI">Rhode Island</option>
+                            <option value="SC">South Carolina</option>
+                            <option value="SD">South Dakota</option>
+                            <option value="TN">Tennessee</option>
+                            <option value="TX">Texas</option>
+                            <option value="UT">Utah</option>
+                            <option value="VT">Vermont</option>
+                            <option value="VA">Virginia</option>
+                            <option value="WA">Washington</option>
+                            <option value="WV">West Virginia</option>
+                            <option value="WI">Wisconsin</option>
+                            <option value="WY">Wyoming</option>
+                        </InputSelect>
+                        <label for="Input.State">State</label>
+                        <ValidationMessage For="() => Input.State" class="text-danger" />
+                    </div>
                 }
                 <div class="form-floating mb-3">
                     <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
                     <label for="Input.Email">Email</label>
                     <ValidationMessage For="() => Input.Email" class="text-danger" />
                 </div>
+                <div class="form-floating mb-3">
+                    <InputText @bind-Value="Input.FirstName" id="Input.FirstName" class="form-control" aria-required="true" placeholder="First Name" />
+                    <label for="Input.FirstName">First Name</label>
+                    <ValidationMessage For="() => Input.FirstName" class="text-danger" />
+                </div>
+                <div class="form-floating mb-3">
+                    <InputText @bind-Value="Input.LastName" id="Input.LastName" class="form-control" aria-required="true" placeholder="Last Name" />
+                    <label for="Input.LastName">Last Name</label>
+                    <ValidationMessage For="() => Input.LastName" class="text-danger" />
+                </div>
                 <div class="form-floating mb-3">
                     <InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
                     <label for="Input.Password">Password</label>
@@ -142,6 +206,11 @@ else
         await UserStore.SetUserNameAsync(user, Input.Email, CancellationToken.None);
         var emailStore = GetEmailStore();
         await emailStore.SetEmailAsync(user, Input.Email, CancellationToken.None);
+        
+        // Set FirstName and LastName on ApplicationUser
+        user.FirstName = Input.FirstName;
+        user.LastName = Input.LastName;
+        
         var result = await UserManager.CreateAsync(user, Input.Password);
 
         if (!result.Succeeded)
@@ -154,6 +223,39 @@ else
 
         var userId = await UserManager.GetUserIdAsync(user);
 
+        // Create UserProfile in ApplicationDbContext
+        try
+        {
+            var userProfile = new UserProfile
+            {
+                Id = Guid.NewGuid(),
+                UserId = userId,
+                Email = Input.Email,
+                FirstName = Input.FirstName,
+                LastName = Input.LastName,
+                PhoneNumber = null,
+                OrganizationId = null, // Will be set during organization creation for first user
+                ActiveOrganizationId = null, // Will be set during organization creation for first user
+                CreatedOn = DateTime.UtcNow,
+                CreatedBy = userId,
+                IsDeleted = false
+            };
+
+            await DbContext.UserProfiles.AddAsync(userProfile);
+            await DbContext.SaveChangesAsync();
+
+            Logger.LogInformation("UserProfile created for user {UserId}", userId);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Error creating UserProfile for user {UserId}", userId);
+            identityErrors = new[] { new IdentityError { Description = $"Error creating user profile: {ex.Message}" } };
+            
+            // Clean up user account
+            await UserManager.DeleteAsync(user);
+            return;
+        }
+
         // First user setup - create organization and grant owner access
         if (_isFirstUser)
         {
@@ -173,7 +275,7 @@ else
                     name: Input.OrganizationName!,
                     ownerId: userId,
                     displayName: Input.OrganizationName,
-                    state: null);
+                    state: Input.State);
 
                 if (organization != null)
                 {
@@ -182,6 +284,19 @@ else
                     user.OrganizationId = organization.Id;
                     await UserManager.UpdateAsync(user);
 
+                    // Update UserProfile with organization IDs
+                    var userProfile = await DbContext.UserProfiles
+                        .FirstOrDefaultAsync(up => up.UserId == userId);
+                    
+                    if (userProfile != null)
+                    {
+                        userProfile.OrganizationId = organization.Id;
+                        userProfile.ActiveOrganizationId = organization.Id;
+                        userProfile.LastModifiedOn = DateTime.UtcNow;
+                        userProfile.LastModifiedBy = userId;
+                        await DbContext.SaveChangesAsync();
+                    }
+
                     Logger.LogInformation("Organization {OrgName} created successfully for user {Email}", 
                         Input.OrganizationName, Input.Email);
                 }
@@ -206,21 +321,21 @@ else
             }
         }
 
+        // Auto-confirm email (no email integration yet)
         var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
-        code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
-        var callbackUrl = NavigationManager.GetUriWithQueryParameters(
-            NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
-            new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code, ["returnUrl"] = ReturnUrl });
-
-        await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
-
-        if (UserManager.Options.SignIn.RequireConfirmedAccount)
+        var confirmResult = await UserManager.ConfirmEmailAsync(user, code);
+        
+        if (!confirmResult.Succeeded)
         {
-            RedirectManager.RedirectTo(
-                "Account/RegisterConfirmation",
-                new() { ["email"] = Input.Email, ["returnUrl"] = ReturnUrl });
+            Logger.LogWarning("Failed to auto-confirm email for user {UserId}: {Errors}", 
+                userId, string.Join(", ", confirmResult.Errors.Select(e => e.Description)));
+        }
+        else
+        {
+            Logger.LogInformation("Email auto-confirmed for user {UserId}", userId);
         }
         
+        // Sign in the user directly
         await SignInManager.SignInAsync(user, isPersistent: false);
         RedirectManager.RedirectTo(ReturnUrl);
     }
@@ -254,11 +369,25 @@ else
         [Display(Name = "Organization Name")]
         public string? OrganizationName { get; set; }
 
+        [Required]
+        [Display(Name = "State")]
+        public string State { get; set; } = "";
+
         [Required]
         [EmailAddress]
         [Display(Name = "Email")]
         public string Email { get; set; } = "";
 
+        [Required]
+        [StringLength(50, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 1)]
+        [Display(Name = "First Name")]
+        public string FirstName { get; set; } = "";
+
+        [Required]
+        [StringLength(50, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 1)]
+        [Display(Name = "Last Name")]
+        public string LastName { get; set; } = "";
+
         [Required]
         [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
         [DataType(DataType.Password)]
diff --git a/4-Aquiis.SimpleStart/Shared/Components/AuthorizedHeaderSection.razor b/4-Aquiis.SimpleStart/Shared/Components/AuthorizedHeaderSection.razor
index cd69e63..269f45e 100644
--- a/4-Aquiis.SimpleStart/Shared/Components/AuthorizedHeaderSection.razor
+++ b/4-Aquiis.SimpleStart/Shared/Components/AuthorizedHeaderSection.razor
@@ -3,5 +3,5 @@
 
 <div class="d-flex align-items-center gap-2">
     <NotificationBellWrapper />
-    <OrganizationSwitcher />
+    <OrganizationSwitcherWrapper />
 </div>
diff --git a/4-Aquiis.SimpleStart/Shared/Components/LeaseRenewalWidget.razor b/4-Aquiis.SimpleStart/Shared/Components/LeaseRenewalWidget.razor
index ce2c286..bc0b689 100644
--- a/4-Aquiis.SimpleStart/Shared/Components/LeaseRenewalWidget.razor
+++ b/4-Aquiis.SimpleStart/Shared/Components/LeaseRenewalWidget.razor
@@ -39,13 +39,13 @@
                     <input type="radio" class="btn-check" name="renewalFilter" id="filter60" value="60"
                            checked="@(selectedFilter == 60)" @onchange="() => FilterLeases(60)" />
                     <label class="btn btn-outline-primary" for="filter60">
-                        60 Days <span class="badge bg-warning">@leases60Days.Count()</span>
+                        60 Days <span class="badge bg-warning">@(leases60Days.Count() - leases30Days.Count())</span>
                     </label>
 
                     <input type="radio" class="btn-check" name="renewalFilter" id="filter90" value="90"
                            checked="@(selectedFilter == 90)" @onchange="() => FilterLeases(90)" />
                     <label class="btn btn-outline-primary" for="filter90">
-                        90 Days <span class="badge bg-info">@leases90Days.Count()</span>
+                        90 Days <span class="badge bg-info">@(leases90Days.Count() - leases60Days.Count())</span>
                     </label>
                 </div>
             </div>
@@ -106,7 +106,7 @@
     private List<Lease> leases60Days = new();
     private List<Lease> leases90Days = new();
     private bool isLoading = true;
-    private int selectedFilter = 30;
+    private int selectedFilter = 60;
 
     protected override async Task OnInitializedAsync()
     {
@@ -118,7 +118,7 @@
         try
         {
             isLoading = true;
-            var allLeases = await LeaseService.GetAllAsync();
+            var allLeases = await LeaseService.GetLeasesWithRelationsAsync();
             var today = DateTime.Today;
 
             expiringLeases = allLeases
@@ -152,6 +152,7 @@
     private void FilterLeases(int days)
     {
         selectedFilter = days;
+        StateHasChanged();
     }
 
     private List<Lease> GetFilteredLeases()
diff --git a/4-Aquiis.SimpleStart/Shared/Components/NotificationBellWrapper.razor b/4-Aquiis.SimpleStart/Shared/Components/NotificationBellWrapper.razor
index 9a7377b..272e801 100644
--- a/4-Aquiis.SimpleStart/Shared/Components/NotificationBellWrapper.razor
+++ b/4-Aquiis.SimpleStart/Shared/Components/NotificationBellWrapper.razor
@@ -1,4 +1,4 @@
-@using Aquiis.UI.Shared.Features.Notifications
+@using Aquiis.UI.Shared.Components.Notifications
 @using Aquiis.SimpleStart.Shared.Services
 
 <NotificationBell GetEntityRoute="@EntityRouteHelper.GetEntityRoute" />
diff --git a/4-Aquiis.SimpleStart/Shared/Components/OrganizationSwitcherWrapper.razor b/4-Aquiis.SimpleStart/Shared/Components/OrganizationSwitcherWrapper.razor
new file mode 100644
index 0000000..e4997ba
--- /dev/null
+++ b/4-Aquiis.SimpleStart/Shared/Components/OrganizationSwitcherWrapper.razor
@@ -0,0 +1,4 @@
+@using Aquiis.UI.Shared.Components.OrganizationSwitcher
+@inject UserContextService UserContext
+
+<OrganizationSwitcher UserContext="UserContext" />
\ No newline at end of file
diff --git a/4-Aquiis.SimpleStart/Shared/Components/Pages/Home.razor b/4-Aquiis.SimpleStart/Shared/Components/Pages/Home.razor
index cff06f9..ee3d88e 100644
--- a/4-Aquiis.SimpleStart/Shared/Components/Pages/Home.razor
+++ b/4-Aquiis.SimpleStart/Shared/Components/Pages/Home.razor
@@ -1,5 +1,9 @@
 @page "/"
 @using Aquiis.Application.Services
+@using Aquiis.UI.Shared.Components.Entities.Invoices
+@using Aquiis.UI.Shared.Components.Entities.Properties
+@using Aquiis.UI.Shared.Components.Entities.Repairs
+@using Aquiis.UI.Shared.Components.Entities.Leases
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.EntityFrameworkCore
@@ -13,7 +17,7 @@
 @inject PropertyService PropertyService
 @inject TenantService TenantService
 @inject LeaseService LeaseService
-@inject MaintenanceService MaintenanceService
+@inject RepairService RepairService
 @inject InvoiceService InvoiceService
 @inject UserContextService UserContextService
 @inject ApplicationDbContext DbContext
@@ -48,243 +52,28 @@
                 }
                 else
                 {
-                    <div class="row mb-4">
-                        <div class="col-md-3">
-                            <div class="card text-white bg-primary">
-                                <div class="card-body">
-                                    <div class="d-flex justify-content-between">
-                                        <div>
-                                            <h4>@totalProperties</h4>
-                                            <p class="card-text">Total Properties</p>
-                                        </div>
-                                        <div class="align-self-center">
-                                            <i class="bi bi-house-fill" style="font-size: 2rem;"></i>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-3">
-                            <div class="card text-white bg-success">
-                                <div class="card-body">
-                                    <div class="d-flex justify-content-between">
-                                        <div>
-                                            <h4>@availableProperties</h4>
-                                            <p class="card-text">Available Properties</p>
-                                        </div>
-                                        <div class="align-self-center">
-                                            <i class="bi bi-check-circle" style="font-size: 2rem;"></i>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-3">
-                            <div class="card text-white bg-info">
-                                <div class="card-body">
-                                    <div class="d-flex justify-content-between">
-                                        <div>
-                                            <h4>@totalTenants</h4>
-                                            <p class="card-text">Total Tenants</p>
-                                        </div>
-                                        <div class="align-self-center">
-                                            <i class="bi bi-people-fill" style="font-size: 2rem;"></i>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-3">
-                            <div class="card text-white bg-secondary">
-                                <div class="card-body">
-                                    <div class="d-flex justify-content-between">
-                                        <div>
-                                            <h4>@activeLeases</h4>
-                                            <p class="card-text">Active Leases</p>
-                                        </div>
-                                        <div class="align-self-center">
-                                            <i class="bi bi-file-text" style="font-size: 2rem;"></i>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="row mb-4">
-                        <div class="col-md-6">
-                            <div class="card">
-                                <div class="card-header">
-                                    <h5>Available Properties</h5>
-                                </div>
-                                <div class="card-body">
-                                    @if (availablePropertiesList.Any())
-                                    {
-                                        <div class="list-group list-group-flush">
-                                            @foreach (var property in availablePropertiesList)
-                                            {
-                                                <div class="list-group-item d-flex justify-content-between align-items-center">
-                                                    <div>
-                                                        <h6 class="mb-1">
-                                                            <a href="/propertymanagement/properties/@property.Id" class="text-decoration-none">
-                                                                @property.Address
-                                                            </a>
-                                                        </h6>
-                                                        <small class="text-muted">@property.City, @property.State - @property.PropertyType</small>
-                                                    </div>
-                                                    <div class="text-end">
-                                                        <span class="badge @GetStatusBadgeClass(property.Status) mb-1">@FormatPropertyStatus(property.Status)</span>
-                                                        <br>
-                                                        <small class="text-muted">@property.MonthlyRent.ToString("C")</small>
-                                                    </div>
-                                                </div>
-                                            }
-                                        </div>
-                                    }
-                                    else
-                                    {
-                                        <p class="text-muted">No available properties found.</p>
-                                    }
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <div class="card">
-                                <div class="card-header">
-                                    <h5>Pending Leases</h5>
-                                </div>
-                                <div class="card-body">
-                                    @if (pendingLeases.Any())
-                                    {
-                                        <div class="list-group list-group-flush">
-                                            @foreach (var lease in pendingLeases)
-                                            {
-                                                <div class="list-group-item">
-                                                    <div class="d-flex w-100 justify-content-between">
-                                                        <h6 class="mb-1">
-                                                            <a href="propertymanagement/leases/view/@lease.Id" class="text-decoration-none">
-                                                                @lease.Property.Address
-                                                            </a>
-                                                        </h6>
-                                                        <small>@lease.CreatedOn.ToString("MMM dd, yyyy")</small>
-                                                    </div>
-                                                    <p class="mb-1">@(lease.Tenant?.FullName ?? "Pending")</p>
-                                                    <div class="d-flex justify-content-between">
-                                                        <small class="text-muted">Start: @lease.StartDate.ToString("MMM dd, yyyy")</small>
-                                                        <span class="badge bg-warning">Pending</span>
-                                                    </div>
-                                                </div>
-                                            }
-                                        </div>
-                                    }
-                                    else
-                                    {
-                                        <p class="text-muted">No pending leases found.</p>
-                                    }
-                                </div>
-                            </div>
-                        </div>
+                    <div class="row mb-3">
+                        <PropertyMetricsCard ShowTotalProperties="true" ShowAvailableProperties="true"
+                            ShowOccupancyRate="true" ShowTotalMonthlyRent="true"
+                            TotalPropertiesCount="@totalProperties"
+                            AvailableCount="@availableProperties"
+                            OccupancyRate="@occupancyRate"
+                            TotalMonthlyRent="@totalMonthlyIncome" />
                     </div>
-
-                    <div class="row">
-                        <div class="col-md-6">
-                            <LeaseRenewalWidget />
+                    <div class="row g-4">
+                        <div class="col-md-6 mb-4">
+                        <InvoiceList Invoices="outstandingInvoices" Title="Outstanding Invoices" 
+                            OnViewAll="ViewAllInvoices" OnViewItem="ViewInvoice" />
+                        <RepairList Repairs="recentRepairs" Title="Outstanding Repairs" ShowLinks="true"
+                            OnViewAllRepairs="ViewAllRepairs" ShowAddButton="true" OnAddRepair="AddRepair"
+                            OnViewRepair="ViewRepair" ShowTotalCost="true" />
                         </div>
-                        <div class="col-md-6">
-                            <div class="card">
-                                <div class="card-header d-flex justify-content-between align-items-center">
-                                    <h5 class="mb-0">Open Maintenance Requests</h5>
-                                    <a href="/propertymanagement/maintenance" class="btn btn-sm btn-outline-primary">View All</a>
-                                </div>
-                                <div class="card-body">
-                                    @if (openMaintenanceRequests.Any())
-                                    {
-                                        <div class="list-group list-group-flush">
-                                            @foreach (var request in openMaintenanceRequests)
-                                            {
-                                                <div class="list-group-item">
-                                                    <div class="d-flex w-100 justify-content-between align-items-start">
-                                                        <div>
-                                                            <h6 class="mb-1">
-                                                                <a href="/propertymanagement/maintenance/@request.Id" class="text-decoration-none">
-                                                                    @request.Title
-                                                                </a>
-                                                            </h6>
-                                                            <small class="text-muted">
-                                                                @request.Property?.Address - @request.RequestType
-                                                            </small>
-                                                        </div>
-                                                        <div class="text-end">
-                                                            <span class="badge @request.PriorityBadgeClass mb-1">@request.Priority</span>
-                                                            @if (request.IsOverdue)
-                                                            {
-                                                                <br>
-                                                                <small class="text-danger">Overdue</small>
-                                                            }
-                                                        </div>
-                                                    </div>
-                                                    <div class="d-flex justify-content-between mt-2">
-                                                        <small class="text-muted">@request.RequestedOn.ToString("MMM dd, yyyy")</small>
-                                                        <span class="badge @request.StatusBadgeClass">@request.Status</span>
-                                                    </div>
-                                                </div>
-                                            }
-                                        </div>
-                                    }
-                                    else
-                                    {
-                                        <p class="text-muted">No open maintenance requests.</p>
-                                    }
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <div class="card">
-                                <div class="card-header d-flex justify-content-between align-items-center">
-                                    <h5 class="mb-0">Recent Invoices</h5>
-                                    <a href="/propertymanagement/invoices" class="btn btn-sm btn-outline-primary">View All</a>
-                                </div>
-                                <div class="card-body">
-                                    @if (recentInvoices.Any())
-                                    {
-                                        <div class="list-group list-group-flush">
-                                            @foreach (var invoice in recentInvoices)
-                                            {
-                                                <div class="list-group-item">
-                                                    <div class="d-flex w-100 justify-content-between">
-                                                        <h6 class="mb-1">
-                                                            <a href="/propertymanagement/invoices/@invoice.Id" class="text-decoration-none">
-                                                                @invoice.InvoiceNumber
-                                                            </a>
-                                                        </h6>
-                                                        <small>@invoice.InvoicedOn.ToString("MMM dd, yyyy")</small>
-                                                    </div>
-                                                    <p class="mb-1">@invoice.Lease?.Tenant?.FullName</p>
-                                                    <div class="d-flex justify-content-between">
-                                                        <div>
-                                                            <small class="text-muted">Due: @invoice.DueOn.ToString("MMM dd, yyyy")</small>
-                                                            @if (invoice.IsOverdue)
-                                                            {
-                                                                <br>
-                                                                <small class="text-danger">@invoice.DaysOverdue days overdue</small>
-                                                            }
-                                                        </div>
-                                                        <div class="text-end">
-                                                            <span class="badge @GetInvoiceStatusBadgeClass(invoice.Status)">@invoice.Status</span>
-                                                            <br>
-                                                            <small class="text-muted">@invoice.Amount.ToString("C")</small>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            }
-                                        </div>
-                                    }
-                                    else
-                                    {
-                                        <p class="text-muted">No recent invoices found.</p>
-                                    }
-                                </div>
-                            </div>
+                        <div class="col-md-6 mb-4">
+                        <LeaseRenewalList Leases="leases" Title="Upcoming Lease Renewals" 
+                            OnViewAll="ViewAllLeases"
+                            OnViewLease="ViewLease" />
+                        <PropertyList Properties="availablePropertiesList" Title="Available Properties"
+                            OnViewProperty="ViewProperty" />
                         </div>
                     </div>
                 }
@@ -345,9 +134,16 @@
     private int totalTenants = 0;
     private int activeLeases = 0;
 
+    private decimal occupancyRate = 0m;
+
+    private decimal totalMonthlyIncome = 0m;
+
+    private decimal totalRevenueOpportunity = 0m;
+
     private List<Property> availablePropertiesList = new();
-    private List<Lease> pendingLeases = new List<Lease>();
-    private List<MaintenanceRequest> openMaintenanceRequests = new List<MaintenanceRequest>();
+    private List<Repair> recentRepairs = new List<Repair>();
+    private List<Invoice> outstandingInvoices = new List<Invoice>();
+    
     private List<Invoice> recentInvoices = new List<Invoice>();
 
     private List<Property> properties = new List<Property>();
@@ -404,28 +200,37 @@
                 .Take(5)
                 .ToList();
 
-            pendingLeases = leases
-                .Where(l => l.OrganizationId == organizationId && l.Status == "Pending")
-                .OrderByDescending(l => l.CreatedOn)
+            // Load outstanding repairs (incomplete only - CompletedOn is null)
+            var allRepairs = await RepairService.GetAllAsync();
+            recentRepairs = allRepairs
+                .Where(r => r.OrganizationId == organizationId && !r.CompletedOn.HasValue)
+                .OrderByDescending(r => r.CreatedOn)
                 .Take(5)
                 .ToList();
 
-            // Load open maintenance requests
-            var allMaintenanceRequests = await MaintenanceService.GetAllAsync();
-            openMaintenanceRequests = allMaintenanceRequests
-                .Where(m => m.OrganizationId == organizationId && m.Status != "Completed" && m.Status != "Cancelled")
-                .OrderByDescending(m => m.Priority == "Urgent" ? 1 : m.Priority == "High" ? 2 : 3)
-                .ThenByDescending(m => m.RequestedOn)
-                .Take(5)
-                .ToList();
-
-            // Load recent invoices
+            // Load outstanding invoices (unpaid and overdue only)
             var allInvoices = await InvoiceService.GetAllAsync();
             recentInvoices = allInvoices
                 .Where(i => i.Status != "Paid" && i.Status != "Cancelled")
-                .OrderByDescending(i => i.InvoicedOn)
+                .OrderByDescending(i => i.IsOverdue)
+                .ThenBy(i => i.DueOn)
                 .Take(5)
                 .ToList();
+
+            outstandingInvoices = allInvoices
+                .Where(i => i.Status == ApplicationConstants.InvoiceStatuses.Overdue
+                || i.Status == ApplicationConstants.InvoiceStatuses.PaidPartial
+                || i.Status == ApplicationConstants.InvoiceStatuses.Pending)
+                .OrderBy(i => i.DueOn)
+                .ToList();
+
+            occupancyRate = await PropertyService.CalculatePortfolioOccupancyRateAsync();
+            totalMonthlyIncome = leases
+                                    .Where(l => !l.IsDeleted && l.Status == ApplicationConstants.LeaseStatuses.Active)
+                                    .Sum(l => l.MonthlyRent);
+            totalRevenueOpportunity = properties
+                                    .Where(p => !p.IsDeleted)
+                                    .Sum(p => p.MonthlyRent);
         }
         catch (InvalidOperationException)
         {
@@ -434,6 +239,56 @@
         }
     }
 
+    private void ViewAllRepairs()
+    {
+        NavigationManager.NavigateTo("/propertymanagement/repairs");
+    }
+
+    private void ViewRepair(Guid repairId)
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/repairs/{repairId}");
+    }
+
+    private void AddRepair()
+    {
+        NavigationManager.NavigateTo("/propertymanagement/repairs/create");
+    }
+
+    private void ViewAllProperties()
+    {
+        NavigationManager.NavigateTo("/propertymanagement/properties");
+    }
+
+    private void ViewProperty(Guid propertyId)
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/properties/{propertyId}");
+    }
+
+    private void ViewAllLeases()
+    {
+        NavigationManager.NavigateTo("/propertymanagement/leases");
+    }
+
+    private void ViewLease(Guid leaseId)
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/leases/{leaseId}");
+    }
+
+    private void ViewAllInvoices()
+    {
+        NavigationManager.NavigateTo("/propertymanagement/invoices");
+    }
+
+    private void ViewInvoice(Guid invoiceId)
+    {
+        NavigationManager.NavigateTo($"/propertymanagement/invoices/{invoiceId}");
+    }
+
+    private void NavigateToCalendar()
+    {
+        NavigationManager.NavigateTo("/calendar");
+    }
+    
     private string GetInvoiceStatusBadgeClass(string status)
     {
         return status switch
@@ -472,8 +327,4 @@
         };
     }
 
-    private void NavigateToCalendar()
-    {
-        NavigationManager.NavigateTo("/calendar");
-    }
 }
diff --git a/4-Aquiis.SimpleStart/Shared/Components/Pages/TestColorPalette.razor b/4-Aquiis.SimpleStart/Shared/Components/Pages/TestColorPalette.razor
new file mode 100644
index 0000000..7b74de1
--- /dev/null
+++ b/4-Aquiis.SimpleStart/Shared/Components/Pages/TestColorPalette.razor
@@ -0,0 +1,599 @@
+@page "/test/color-palette"
+@rendermode InteractiveServer
+<PageTitle>Proposed Color Palette Test</PageTitle>
+
+<style>
+    /* Corporate Palette (Deep Blue) */
+    .palette-standard {
+        --aquiis-primary: #2C5F8D;
+        --aquiis-primary-dark: #1E3A5F;
+        --aquiis-secondary: #F59E42;
+        --aquiis-success: #388E3C;
+        --aquiis-success-light: #4CAF50;
+        --aquiis-info: #5A8FBF;
+        --aquiis-danger: #dc3545;
+        --aquiis-warning: #ffc107;
+        --aquiis-neutral-light: #F5F7FA;
+        --aquiis-neutral-gray: #E0E7EE;
+        --aquiis-neutral-gray-dark: #8A9BA8;
+        --aquiis-neutral-dark: #333333;
+        --aquiis-neutral-charcoal: #1a1a1a;
+    }
+    
+    /* Teal Palette (Modern Fresh) */
+    .palette-teal {
+        --aquiis-primary: #0D9488;
+        --aquiis-primary-dark: #0F766E;
+        --aquiis-secondary: #FF6B6B;
+        --aquiis-success: #388E3C;
+        --aquiis-success-light: #4CAF50;
+        --aquiis-info: #14B8A6;
+        --aquiis-danger: #dc3545;
+        --aquiis-warning: #ffc107;
+        --aquiis-neutral-light: #FAFAFA;
+        --aquiis-neutral-gray: #E2E8F0;
+        --aquiis-neutral-gray-dark: #64748B;
+        --aquiis-neutral-dark: #475569;
+        --aquiis-neutral-charcoal: #1e293b;
+    }
+
+    /* Navy Palette (Authority & Elegance) */
+    .palette-obsidian {
+        --aquiis-primary: #25344d;
+        --aquiis-primary-dark: #0F172A;
+        --aquiis-secondary: #d17315;
+        --aquiis-success: #1a531d;
+        --aquiis-success-light: #4CAF50;
+        --aquiis-info: #1b60b4;
+        --aquiis-danger: #712028;
+        --aquiis-warning: #d29e00;
+        --aquiis-neutral-light: #FAF9F6;
+        --aquiis-neutral-gray: #CBD5E1;
+        --aquiis-neutral-gray-dark: #475569;
+        --aquiis-neutral-dark: #2a3749;
+        --aquiis-neutral-charcoal: #1a1f2e;
+        --aquiis-neutral-light-charcoal: #282a2e;
+    }
+
+    .palette-card {
+        border: 1px solid #ddd;
+        border-radius: 0.25rem;
+        overflow: hidden;
+    }
+    
+    .color-swatch {
+        height: 80px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-weight: 600;
+        color: white;
+    }
+    
+    .palette-selector {
+        position: fixed;
+        top: 20px;
+        right: 20px;
+        z-index: 1000;
+        background: white;
+        padding: 1rem;
+        border-radius: 0.5rem;
+        box-shadow: 0 4px 6px rgba(0,0,0,0.1);
+    }
+</style>
+
+<!-- Palette Selector -->
+<div class="palette-selector">
+    <label class="form-label mb-2" style="font-weight: 600;">
+        <i class="bi bi-palette"></i> Select Palette:
+    </label>
+    <select class="form-select" @bind="selectedPalette">
+        <option value="standard">Standard (Deep Blue)</option>
+        <option value="teal">Teal (Modern Fresh)</option>
+        <option value="obsidian">Obsidian (Authority & Elegance)</option>
+    </select>
+</div>
+
+<div class="@GetPaletteClass()">
+    <!-- Navigation Bar Example -->
+    <nav class="navbar navbar-expand-lg mb-4" style="background-color: var(--aquiis-primary-dark);">
+        <div class="container-fluid">
+            <a class="navbar-brand" href="#" style="color: white; font-weight: 600;">
+                <i class="bi bi-building"></i> Aquiis Property Management
+            </a>
+            <div class="navbar-nav ms-auto">
+                <button class="btn btn-sm" style="background-color: var(--aquiis-secondary); color: var(--aquiis-neutral-dark); border: none; font-weight: 600;">
+                    <i class="bi bi-plus-circle"></i> Quick Add
+                </button>
+            </div>
+        </div>
+    </nav>
+
+    <div class="container-fluid">
+    <div class="row mb-4">
+        <div class="col">
+            <h1 style="color: var(--aquiis-primary);">
+                <i class="bi bi-palette"></i> Proposed Color Palette
+            </h1>
+            <p class="text-muted">Visual reference for the new Aquiis color scheme</p>
+        </div>
+    </div>
+
+    <!-- Color Swatches -->
+    <div class="row mb-4">
+        <div class="col-md-12">
+            <h3 style="color: var(--aquiis-primary);">Color Reference</h3>
+        </div>
+        <div class="col-md-2">
+            <div class="palette-card">
+                <div class="color-swatch" style="background-color: var(--aquiis-primary);">
+                    Primary
+                </div>
+                <div class="p-2 text-center">
+                    <small class="text-muted">#2C5F8D</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="palette-card">
+                <div class="color-swatch" style="background-color: var(--aquiis-primary-dark);">
+                    Primary Dark
+                </div>
+                <div class="p-2 text-center">
+                    <small class="text-muted">#1E3A5F</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="palette-card">
+                <div class="color-swatch" style="background-color: var(--aquiis-secondary); color: var(--aquiis-neutral-dark);">
+                    Secondary
+                </div>
+                <div class="p-2 text-center">
+                    <small class="text-muted">#F59E42</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="palette-card">
+                <div class="color-swatch" style="background-color: var(--aquiis-success);">
+                    Success
+                </div>
+                <div class="p-2 text-center">
+                    <small class="text-muted">#388E3C</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="palette-card">
+                <div class="color-swatch" style="background-color: var(--aquiis-info);">
+                    Info
+                </div>
+                <div class="p-2 text-center">
+                    <small class="text-muted">#5A8FBF</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="palette-card">
+                <div class="color-swatch" style="background-color: var(--aquiis-danger);">
+                    Danger
+                </div>
+                <div class="p-2 text-center">
+                    <small class="text-muted">#dc3545</small>
+                </div>
+            </div>
+        </div>
+    </div>
+    
+    <!-- Neutral Colors Row -->
+    <div class="row mb-4">
+        <div class="col-md-12">
+            <h3 style="color: var(--aquiis-primary);">Neutral Colors</h3>
+        </div>
+        <div class="col-md-2">
+            <div class="palette-card">
+                <div class="color-swatch" style="background-color: var(--aquiis-neutral-light); color: var(--aquiis-neutral-dark);">
+                    Neutral Light
+                </div>
+                <div class="p-2 text-center">
+                    <small class="text-muted">#F5F7FA</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="palette-card">
+                <div class="color-swatch" style="background-color: var(--aquiis-neutral-gray); color: var(--aquiis-neutral-dark);">
+                    Gray
+                </div>
+                <div class="p-2 text-center">
+                    <small class="text-muted">#E0E7EE</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="palette-card">
+                <div class="color-swatch" style="background-color: var(--aquiis-neutral-gray-dark);">
+                    Gray Dark
+                </div>
+                <div class="p-2 text-center">
+                    <small class="text-muted">#8A9BA8</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="palette-card">
+                <div class="color-swatch" style="background-color: var(--aquiis-neutral-dark);">
+                    Neutral Dark
+                </div>
+                <div class="p-2 text-center">
+                    <small class="text-muted">#333333</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="palette-card">
+                <div class="color-swatch" style="background-color: var(--aquiis-neutral-light-charcoal);">
+                    Light Charcoal
+                </div>
+                <div class="p-2 text-center">
+                    <small class="text-muted">#282a2e</small>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="palette-card">
+                <div class="color-swatch" style="background-color: var(--aquiis-neutral-charcoal);">
+                    Charcoal
+                </div>
+                <div class="p-2 text-center">
+                    <small class="text-muted">#1a1f2e</small>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Metric Cards -->
+    <div class="row mb-4">
+        <div class="col-md-12">
+            <h3 style="color: var(--aquiis-primary);">Dashboard Metrics</h3>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white h-100" style="background-color: var(--aquiis-primary);">
+                <div class="card-body text-center">
+                    <div class="mb-2">
+                        <i class="bi bi-building display-4"></i>
+                    </div>
+                    <h3 class="mb-0">2</h3>
+                    <p class="mb-0">Total Properties</p>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white h-100" style="background-color: var(--aquiis-success);">
+                <div class="card-body text-center">
+                    <div class="mb-2">
+                        <i class="bi bi-check-circle display-4"></i>
+                    </div>
+                    <h3 class="mb-0">1</h3>
+                    <p class="mb-0">Available Properties</p>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white h-100" style="background-color: var(--aquiis-info);">
+                <div class="card-body text-center">
+                    <div class="mb-2">
+                        <i class="bi bi-bar-chart display-4"></i>
+                    </div>
+                    <h3 class="mb-0">45.8%</h3>
+                    <p class="mb-0">Occupancy Rate</p>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-3">
+            <div class="card text-white h-100" style="background-color: var(--aquiis-info);">
+                <div class="card-body text-center">
+                    <div class="mb-2">
+                        <i class="bi bi-currency-dollar display-4"></i>
+                    </div>
+                    <h3 class="mb-0">$1,800.00</h3>
+                    <p class="mb-0">Total Rent/Month</p>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Buttons -->
+    <div class="row mb-4">
+        <div class="col-md-12">
+            <h3 style="color: var(--aquiis-primary);">Buttons</h3>
+        </div>
+        <div class="col-md-12">
+            <div class="d-flex gap-2 flex-wrap">
+                <button class="btn" style="background-color: var(--aquiis-primary); color: white; border: none;">
+                    <i class="bi bi-save"></i> Primary Action
+                </button>
+                <button class="btn" style="background-color: var(--aquiis-secondary); color: white; border: none; font-weight: 600;">
+                    <i class="bi bi-plus-circle"></i> Call to Action (CTA)
+                </button>
+                <button class="btn" style="background-color: var(--aquiis-success); color: white; border: none;">
+                    <i class="bi bi-check-circle"></i> Success Action
+                </button>
+                <button class="btn" style="background-color: var(--aquiis-danger); color: white; border: none;">
+                    <i class="bi bi-trash"></i> Danger Action
+                </button>
+                <button class="btn" style="background-color: transparent; color: var(--aquiis-primary); border: 2px solid var(--aquiis-primary);">
+                    <i class="bi bi-eye"></i> Outline Button
+                </button>
+                <button class="btn" style="background-color: #6c757d; color: white; border: none;">
+                    Cancel
+                </button>
+            </div>
+        </div>
+    </div>
+
+    <!-- Status Badges -->
+    <div class="row mb-4">
+        <div class="col-md-12">
+            <h3 style="color: var(--aquiis-primary);">Status Badges</h3>
+        </div>
+        <div class="col-md-12">
+            <div class="d-flex gap-2 flex-wrap align-items-center">
+                <span class="badge" style="background-color: var(--aquiis-success-light); color: var(--aquiis-neutral-dark); font-size: 0.875rem; padding: 0.35rem 0.65rem;">
+                    Available
+                </span>
+                <span class="badge" style="background-color: var(--aquiis-primary); color: white; font-size: 0.875rem; padding: 0.35rem 0.65rem;">
+                    Occupied
+                </span>
+                <span class="badge" style="background-color: var(--aquiis-secondary); color: var(--aquiis-neutral-dark); font-size: 0.875rem; padding: 0.35rem 0.65rem;">
+                    Pending
+                </span>
+                <span class="badge" style="background-color: var(--aquiis-danger); color: white; font-size: 0.875rem; padding: 0.35rem 0.65rem;">
+                    Overdue
+                </span>
+                <span class="badge" style="background-color: var(--aquiis-success); color: white; font-size: 0.875rem; padding: 0.35rem 0.65rem;">
+                    Active
+                </span>
+                <span class="badge" style="background-color: var(--aquiis-warning); color: var(--aquiis-neutral-dark); font-size: 0.875rem; padding: 0.35rem 0.65rem;">
+                    Warning
+                </span>
+                <span class="badge" style="background-color: #6c757d; color: white; font-size: 0.875rem; padding: 0.35rem 0.65rem;">
+                    Cancelled
+                </span>
+            </div>
+        </div>
+    </div>
+
+    <!-- Cards -->
+    <div class="row mb-4">
+        <div class="col-md-12">
+            <h3 style="color: var(--aquiis-primary);">Cards</h3>
+        </div>
+        <div class="col-md-4">
+            <div class="card h-100" style="border-top: 4px solid var(--aquiis-primary); background-color: white;">
+                <div class="card-header" style="background-color: var(--aquiis-neutral-light); border-bottom: 1px solid #ddd;">
+                    <div class="d-flex justify-content-between align-items-center">
+                        <h5 class="mb-0" style="color: var(--aquiis-primary); font-weight: 600;">354 Maple Avenue</h5>
+                        <span class="badge" style="background-color: var(--aquiis-success-light); color: var(--aquiis-neutral-dark);">Available</span>
+                    </div>
+                </div>
+                <div class="card-body">
+                    <p class="mb-2"><strong style="color: var(--aquiis-neutral-dark);">Address:</strong> Los Angeles, CA 90210</p>
+                    <p class="mb-2"><strong style="color: var(--aquiis-neutral-dark);">Type:</strong> House</p>
+                    <p class="mb-2"><strong style="color: var(--aquiis-neutral-dark);">Beds:</strong> 4 | <strong>Baths:</strong> 2.5</p>
+                    <p class="mb-0"><strong style="color: var(--aquiis-primary); font-size: 1.25rem;">$2,700.00</strong> /month</p>
+                </div>
+                <div class="card-footer" style="background-color: var(--aquiis-neutral-light); border-top: 1px solid #ddd;">
+                    <div class="d-flex gap-2">
+                        <button class="btn btn-sm flex-fill" style="background-color: var(--aquiis-primary); color: white; border: none;">
+                            <i class="bi bi-eye"></i> View
+                        </button>
+                        <button class="btn btn-sm flex-fill" style="background-color: var(--aquiis-secondary); color: var(--aquiis-neutral-dark); border: none; font-weight: 600;">
+                            <i class="bi bi-plus-circle"></i> Create Lease
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        
+        <div class="col-md-4">
+            <div class="card h-100" style="border-left: 4px solid var(--aquiis-danger); background-color: white;">
+                <div class="card-body">
+                    <div class="d-flex justify-content-between align-items-start mb-3">
+                        <div>
+                            <h5 class="mb-1" style="color: var(--aquiis-primary);">INV-202601-00001</h5>
+                            <p class="text-muted mb-0">Trinity Anderson</p>
+                        </div>
+                        <span class="badge" style="background-color: var(--aquiis-danger); color: white;">Overdue</span>
+                    </div>
+                    <p class="mb-2"><strong style="color: var(--aquiis-neutral-dark);">Due:</strong> Feb 20, 2026</p>
+                    <p class="mb-2"><strong style="color: var(--aquiis-neutral-dark);">Amount:</strong> <span style="color: var(--aquiis-primary); font-weight: 600; font-size: 1.1rem;">$1,800.00</span></p>
+                    <p class="mb-0"><strong style="color: var(--aquiis-neutral-dark);">Status:</strong> Paid Partial</p>
+                </div>
+                <div class="card-footer" style="background-color: var(--aquiis-neutral-light);">
+                    <button class="btn btn-sm w-100" style="background-color: var(--aquiis-primary); color: white; border: none;">
+                        View Invoice
+                    </button>
+                </div>
+            </div>
+        </div>
+        
+        <div class="col-md-4">
+            <div class="card h-100" style="background-color: white; border: 1px solid #ddd;">
+                <div class="card-header" style="background-color: var(--aquiis-primary); color: white;">
+                    <h5 class="mb-0">Card with Header</h5>
+                </div>
+                <div class="card-body">
+                    <p class="mb-3">This card demonstrates the primary color header style with white text.</p>
+                    <p class="mb-0 text-muted">Perfect for modal headers and important sections.</p>
+                </div>
+                <div class="card-footer" style="background-color: var(--aquiis-neutral-light);">
+                    <div class="d-flex justify-content-end gap-2">
+                        <button class="btn btn-sm" style="background-color: transparent; color: #6c757d; border: 1px solid #6c757d;">
+                            Cancel
+                        </button>
+                        <button class="btn btn-sm" style="background-color: var(--aquiis-secondary); color: var(--aquiis-neutral-dark); border: none; font-weight: 600;">
+                            Save
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Data Table -->
+    <div class="row mb-4">
+        <div class="col-md-12">
+            <h3 style="color: var(--aquiis-primary);">Data Table</h3>
+        </div>
+        <div class="col-md-12">
+            <table class="table table-hover" style="background-color: white;">
+                <thead style="background-color: var(--aquiis-neutral-light); color: var(--aquiis-neutral-dark); border-bottom: 2px solid var(--aquiis-primary);">
+                    <tr>
+                        <th>Property</th>
+                        <th>Address</th>
+                        <th>Status</th>
+                        <th>Rent</th>
+                        <th>Actions</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>354 Maple Avenue</td>
+                        <td>Los Angeles, CA 90210</td>
+                        <td>
+                            <span class="badge" style="background-color: var(--aquiis-success-light); color: var(--aquiis-neutral-dark);">Available</span>
+                        </td>
+                        <td style="color: var(--aquiis-primary); font-weight: 600;">$2,700.00</td>
+                        <td>
+                            <button class="btn btn-sm" style="background-color: transparent; color: var(--aquiis-primary); border: 1px solid var(--aquiis-primary);">
+                                <i class="bi bi-eye"></i>
+                            </button>
+                            <button class="btn btn-sm" style="background-color: transparent; color: var(--aquiis-primary); border: 1px solid var(--aquiis-primary);">
+                                <i class="bi bi-pencil"></i>
+                            </button>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>333 Forest Creek</td>
+                        <td>Los Angeles, CA 90210</td>
+                        <td>
+                            <span class="badge" style="background-color: var(--aquiis-primary); color: white;">Occupied</span>
+                        </td>
+                        <td style="color: var(--aquiis-primary); font-weight: 600;">$1,800.00</td>
+                        <td>
+                            <button class="btn btn-sm" style="background-color: transparent; color: var(--aquiis-primary); border: 1px solid var(--aquiis-primary);">
+                                <i class="bi bi-eye"></i>
+                            </button>
+                            <button class="btn btn-sm" style="background-color: transparent; color: var(--aquiis-primary); border: 1px solid var(--aquiis-primary);">
+                                <i class="bi bi-pencil"></i>
+                            </button>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <!-- Alerts -->
+    <div class="row mb-4">
+        <div class="col-md-12">
+            <h3 style="color: var(--aquiis-primary);">Alerts</h3>
+        </div>
+        <div class="col-md-6">
+            <div class="alert" style="background-color: #d4edda; border-left: 4px solid var(--aquiis-success); color: var(--aquiis-neutral-dark);">
+                <div class="d-flex align-items-center">
+                    <i class="bi bi-check-circle-fill" style="color: var(--aquiis-success); font-size: 1.5rem; margin-right: 1rem;"></i>
+                    <div>
+                        <strong>Success!</strong> Property has been added successfully.
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <div class="alert" style="background-color: #d9e9f7; border-left: 4px solid var(--aquiis-info); color: var(--aquiis-neutral-dark);">
+                <div class="d-flex align-items-center">
+                    <i class="bi bi-info-circle-fill" style="color: var(--aquiis-info); font-size: 1.5rem; margin-right: 1rem;"></i>
+                    <div>
+                        <strong>Info:</strong> This property has an active lease through February 2026.
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <div class="alert" style="background-color: #fff3cd; border-left: 4px solid var(--aquiis-warning); color: var(--aquiis-neutral-dark);">
+                <div class="d-flex align-items-center">
+                    <i class="bi bi-exclamation-triangle-fill" style="color: var(--aquiis-warning); font-size: 1.5rem; margin-right: 1rem;"></i>
+                    <div>
+                        <strong>Warning:</strong> Lease expires in 30 days.
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <div class="alert" style="background-color: #f8d7da; border-left: 4px solid var(--aquiis-danger); color: var(--aquiis-neutral-dark);">
+                <div class="d-flex align-items-center">
+                    <i class="bi bi-x-circle-fill" style="color: var(--aquiis-danger); font-size: 1.5rem; margin-right: 1rem;"></i>
+                    <div>
+                        <strong>Error!</strong> Unable to save property. Please check all required fields.
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Form Example -->
+    <div class="row mb-4">
+        <div class="col-md-12">
+            <h3 style="color: var(--aquiis-primary);">Form Example</h3>
+        </div>
+        <div class="col-md-6">
+            <div class="card" style="background-color: white; border: 1px solid #ddd;">
+                <div class="card-header" style="background-color: var(--aquiis-primary); color: white;">
+                    <h5 class="mb-0">Add New Property</h5>
+                </div>
+                <div class="card-body">
+                    <div class="mb-3">
+                        <label class="form-label" style="color: var(--aquiis-neutral-dark); font-weight: 600;">Property Address</label>
+                        <input type="text" class="form-control" placeholder="Enter address" style="border-color: #ddd; border-width: 2px;" />
+                    </div>
+                    
+                    <div class="mb-3">
+                        <label class="form-label" style="color: var(--aquiis-neutral-dark); font-weight: 600;">Monthly Rent</label>
+                        <input type="number" class="form-control" placeholder="$0.00" style="border-color: #ddd; border-width: 2px;" />
+                    </div>
+                    
+                    <div class="mb-3">
+                        <label class="form-label" style="color: var(--aquiis-neutral-dark); font-weight: 600;">Status</label>
+                        <select class="form-select" style="border-color: #ddd; border-width: 2px;">
+                            <option>Available</option>
+                            <option>Occupied</option>
+                            <option>Under Renovation</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="card-footer" style="background-color: var(--aquiis-neutral-light);">
+                    <div class="d-flex gap-2 justify-content-end">
+                        <button class="btn" style="background-color: transparent; color: #6c757d; border: 1px solid #6c757d;">
+                            Cancel
+                        </button>
+                        <button class="btn" style="background-color: var(--aquiis-secondary); color: white; border: none; font-weight: 600; padding: 0.5rem 2rem;">
+                            <i class="bi bi-plus-circle"></i> Add Property
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    </div>
+</div>
+
+@code {
+    private string selectedPalette = "standard";
+    
+    private string GetPaletteClass()
+    {
+        return $"palette-{selectedPalette}";
+    }
+}
diff --git a/4-Aquiis.SimpleStart/Shared/Components/SchemaValidationWarning.razor b/4-Aquiis.SimpleStart/Shared/Components/SchemaValidationWarning.razor
index 9e09d9b..cab7d5e 100644
--- a/4-Aquiis.SimpleStart/Shared/Components/SchemaValidationWarning.razor
+++ b/4-Aquiis.SimpleStart/Shared/Components/SchemaValidationWarning.razor
@@ -26,7 +26,7 @@
         <ul class="mb-2">
             <li>Update the application to match the database version, or</li>
             <li>Restore a backup compatible with the current application version</li>
-            <li><a href="/administration/application/database" class="alert-link">Go to Database Backup & Recovery</a></li>
+            <li><a href="/administration/settings/database" class="alert-link">Go to Database Settings</a></li>
         </ul>
         <button type="button" class="btn-close" @onclick="() => showWarning = false" aria-label="Close"></button>
     </div>
diff --git a/4-Aquiis.SimpleStart/Shared/Layout/MainLayout.razor b/4-Aquiis.SimpleStart/Shared/Layout/MainLayout.razor
index 7b3ff61..a1ce3cc 100644
--- a/4-Aquiis.SimpleStart/Shared/Layout/MainLayout.razor
+++ b/4-Aquiis.SimpleStart/Shared/Layout/MainLayout.razor
@@ -7,7 +7,7 @@
 
 <SharedMainLayout Theme="@ThemeService.CurrentTheme">
     <SidebarContent>
-        <NavMenu @rendermode="InteractiveServer" />
+        <NavMenu @rendermode="InteractiveServer" @key="@($"navmenu-{ThemeService.CurrentTheme}-{ThemeService.CurrentBrandTheme}")" />
     </SidebarContent>
     
     <NotAuthorizedContent>
@@ -15,7 +15,7 @@
     </NotAuthorizedContent>
     
     <AuthorizedHeaderContent>
-        <AuthorizedHeaderSection />
+        <AuthorizedHeaderSection @key="@($"header-{ThemeService.CurrentTheme}-{ThemeService.CurrentBrandTheme}")" />
     </AuthorizedHeaderContent>
     
     <ChildContent>
@@ -36,10 +36,12 @@
     protected override void OnInitialized()
     {
         ThemeService.OnThemeChanged += StateHasChanged;
+        ThemeService.OnBrandThemeChanged += StateHasChanged;
     }
 
     public void Dispose()
     {
         ThemeService.OnThemeChanged -= StateHasChanged;
+        ThemeService.OnBrandThemeChanged -= StateHasChanged;
     }
 }
diff --git a/4-Aquiis.SimpleStart/Shared/Layout/MainLayout.razor.css b/4-Aquiis.SimpleStart/Shared/Layout/MainLayout.razor.css
index 393ac82..d22eff3 100644
--- a/4-Aquiis.SimpleStart/Shared/Layout/MainLayout.razor.css
+++ b/4-Aquiis.SimpleStart/Shared/Layout/MainLayout.razor.css
@@ -8,13 +8,10 @@ main {
   flex: 1;
 }
 
-.sidebar {
-  background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
-}
-
 .top-row {
-  background-color: var(--bs-body-bg) !important;
-  border-bottom: 1px solid var(--bs-border-color) !important;
+  /* background-color: #0f172a !important; */
+  color: white !important;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.1) !important;
   justify-content: flex-end;
   height: 3.5rem;
   display: flex;
@@ -26,7 +23,7 @@ main {
   white-space: nowrap;
   margin-left: 1.5rem;
   text-decoration: none;
-  color: var(--bs-body-color) !important;
+  color: white !important;
 }
 
 .top-row ::deep a:hover,
diff --git a/4-Aquiis.SimpleStart/Shared/Layout/NavMenu.razor b/4-Aquiis.SimpleStart/Shared/Layout/NavMenu.razor
index 9795907..5e4ae1c 100644
--- a/4-Aquiis.SimpleStart/Shared/Layout/NavMenu.razor
+++ b/4-Aquiis.SimpleStart/Shared/Layout/NavMenu.razor
@@ -1,6 +1,7 @@
 @implements IDisposable
 
 @inject NavigationManager NavigationManager
+@inject UserContextService UserContext
 @inject ThemeService ThemeService
 @inject IJSRuntime JSRuntime
 
@@ -8,9 +9,11 @@
 <div class="top-row ps-3 navbar navbar-dark">
     <div class="container-fluid d-flex justify-content-between align-items-center">
         <a class="navbar-brand" href="">Aquiis.SimpleStart</a>
-        <button class="btn btn-link text-white p-0" @onclick="ToggleTheme" title="Toggle theme">
-            <i class="bi @GetThemeIcon()" style="font-size: 1.4rem;"></i>
-        </button>
+        <div class="d-flex gap-2">
+            <button class="btn btn-link p-0" @onclick="ToggleTheme" title="Toggle theme">
+                <i class="bi @GetThemeIcon()" style="font-size: 1.4rem;"></i>
+            </button>
+        </div>
     </div>
 </div>
 
@@ -20,15 +23,14 @@
     <nav class="nav flex-column">
         
         <OrganizationAuthorizeView Roles="Owner,Administrator">
-               
             <div class="nav-item px-3">
-                <NavLink class="nav-link" href="administration/dashboard" Match="NavLinkMatch.All">
+                <NavLink class="nav-link" href="administration/settings/application" Match="NavLinkMatch.All">
                     <div><span class="bi bi-window-dock" aria-hidden="true"></span>Application</div>
                 </NavLink>
             </div>
             <div class="nav-item px-3">
-                <NavLink class="nav-link" href="administration/organizations">
-                    <div><span class="bi bi-building" aria-hidden="true"></span>Organizations</div>
+                <NavLink class="nav-link" href="@($"administration/organizations/{OrganizationId}")">
+                    <div><span class="bi bi-building" aria-hidden="true"></span>Organization</div>
                 </NavLink>
             </div>
         </OrganizationAuthorizeView>
@@ -51,58 +53,8 @@
                 </NavLink>
             </div>
             <div class="nav-item px-3">
-                <NavLink class="nav-link" href="propertymanagement/inspections">
-                    <div><span class="bi bi-calendar-check-fill" aria-hidden="true"></span>Inspections</div>
-                </NavLink>
-            </div>
-            <div class="nav-item px-3">
-                <NavLink class="nav-link" href="propertymanagement/checklists">
-                    <div><span class="bi bi-list-check" aria-hidden="true"></span>Checklists</div>
-                </NavLink>
-            </div>
-            <div class="nav-item px-3">
-                <NavLink class="nav-link" href="propertymanagement/prospectivetenants">
-                    <div><span class="bi bi-person-plus-fill" aria-hidden="true"></span>Prospects</div>
-                </NavLink>
-            </div>
-            <div class="nav-item px-3">
-                <NavLink class="nav-link" href="propertymanagement/tours">
-                    <div><span class="bi bi-calendar-event" aria-hidden="true"></span>Tours</div>
-                </NavLink>
-            </div>
-            <div class="nav-item px-3">
-                <NavLink class="nav-link" href="propertymanagement/tenants">
-                    <div><span class="bi bi-people-fill" aria-hidden="true"></span>Tenants</div>
-                </NavLink>
-            </div>
-                <div class="nav-item px-3">
-                <NavLink class="nav-link" href="propertymanagement/leases">
-                    <div><span class="bi bi-file-earmark-text-fill" aria-hidden="true"></span>Leases</div>
-                </NavLink>
-            </div>
-            <div class="nav-item px-3">
-                <NavLink class="nav-link" href="propertymanagement/invoices">
-                    <div><span class="bi bi-receipt" aria-hidden="true"></span>Invoices</div>
-                </NavLink>
-            </div>
-            <div class="nav-item px-3">
-                <NavLink class="nav-link" href="propertymanagement/payments">
-                    <div><span class="bi bi-cash-coin" aria-hidden="true"></span>Payments</div>
-                </NavLink>
-            </div>
-            <div class="nav-item px-3">
-                <NavLink class="nav-link" href="property-management/security-deposits">
-                    <div><span class="bi bi-piggy-bank-fill" aria-hidden="true"></span>Security Deposits</div>
-                </NavLink>
-            </div>
-            <div class="nav-item px-3">
-                <NavLink class="nav-link" href="propertymanagement/documents">
-                    <div><span class="bi bi-files" aria-hidden="true"></span>Documents</div>
-                </NavLink>
-            </div>
-            <div class="nav-item px-3">
-                <NavLink class="nav-link" href="propertymanagement/maintenance">
-                    <div><span class="bi bi-tools" aria-hidden="true"></span>Maintenance</div>
+                <NavLink class="nav-link" href="propertymanagement/repairs">
+                    <div><span class="bi bi-tools" aria-hidden="true"></span>Repairs</div>
                 </NavLink>
             </div>
             <div class="nav-item px-3">
@@ -147,6 +99,31 @@
                         </button>
                     </form>
                 </div>
+                <div class="nav-item px-3">
+                    <div class="dropdown">
+                        <button class="nav-link dropdown-toggle" type="button" id="brandThemeDropdown" 
+                                @onclick="ToggleBrandThemeDropdown" 
+                                @onclick:stopPropagation="true">
+                            <span class="bi bi-palette-fill-nav-menu" aria-hidden="true"></span> Theme: @FormatBrandThemeName(ThemeService.CurrentBrandTheme)
+                        </button>
+                        @if (showBrandThemeDropdown)
+                        {
+                            <ul class="dropdown-menu show" style="position: relative;">
+                                @foreach (var theme in AvailableBrandThemes)
+                                {
+                                    <li>
+                                        <button class="dropdown-item @(ThemeService.CurrentBrandTheme == theme ? "active" : "")" 
+                                                type="button"
+                                                @onclick="() => SelectBrandTheme(theme)"
+                                                @onclick:stopPropagation="true">
+                                            @FormatBrandThemeName(theme)
+                                        </button>
+                                    </li>
+                                }
+                            </ul>
+                        }
+                    </div>
+                </div>
             </Authorized>
             <NotAuthorized>
                 <div class="nav-item px-3">
@@ -164,6 +141,31 @@
                         <span class="bi bi-person-badge-nav-menu" aria-hidden="true"></span> Login
                     </NavLink>
                 </div>
+                <div class="nav-item px-3">
+                    <div class="dropdown">
+                        <button class="nav-link dropdown-toggle" type="button" 
+                                @onclick="ToggleBrandThemeDropdown"
+                                @onclick:stopPropagation="true">
+                            <span class="bi bi-palette-fill-nav-menu" aria-hidden="true"></span> Theme: @FormatBrandThemeName(ThemeService.CurrentBrandTheme)
+                        </button>
+                        @if (showBrandThemeDropdown)
+                        {
+                            <ul class="dropdown-menu show" style="position: relative;">
+                                @foreach (var theme in AvailableBrandThemes)
+                                {
+                                    <li>
+                                        <button class="dropdown-item @(ThemeService.CurrentBrandTheme == theme ? "active" : "")" 
+                                                type="button"
+                                                @onclick="() => SelectBrandTheme(theme)"
+                                                @onclick:stopPropagation="true">
+                                            @FormatBrandThemeName(theme)
+                                        </button>
+                                    </li>
+                                }
+                            </ul>
+                        }
+                    </div>
+                </div>
             </NotAuthorized>
         </AuthorizeView>
     </nav>
@@ -172,13 +174,28 @@
 @code {
     private string? currentUrl;
     private string currentTheme = "light";
+    private bool showBrandThemeDropdown = false;
+
+    private string OrganizationId = string.Empty;
 
-    protected override void OnInitialized()
+    // Available brand themes - add new themes here
+    private readonly List<string> AvailableBrandThemes = new()
+    {
+        "bootstrap",
+        "obsidian",
+        "teal"
+    };
+
+    protected override async Task OnInitializedAsync()
     {
         currentUrl = NavigationManager.ToBaseRelativePath(NavigationManager.Uri);
         NavigationManager.LocationChanged += OnLocationChanged;
         ThemeService.OnThemeChanged += OnThemeChanged;
+        ThemeService.OnBrandThemeChanged += OnBrandThemeChanged;
         currentTheme = ThemeService.CurrentTheme;
+        
+        var orgId = await UserContext.GetActiveOrganizationIdAsync();
+        OrganizationId = orgId?.ToString() ?? string.Empty;
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
@@ -187,24 +204,38 @@
         {
             try
             {
-                // Load saved theme from localStorage and sync with service
-                var savedTheme = await JSRuntime.InvokeAsync<string>("eval", "localStorage.getItem('theme') || 'light'");
+                // Read current DOM attributes that were set by theme.js initialization
+                var domTheme = await JSRuntime.InvokeAsync<string>("eval", 
+                    "document.documentElement.getAttribute('data-bs-theme') || localStorage.getItem('theme') || 'light'");
+                var domBrandTheme = await JSRuntime.InvokeAsync<string>("eval", 
+                    "document.documentElement.getAttribute('data-brand-theme') || localStorage.getItem('brandTheme') || 'bootstrap'");
+                
+                // Sync the service with the DOM state (which was set by theme.js)
+                if (ThemeService.CurrentTheme != domTheme)
+                {
+                    ThemeService.SetTheme(domTheme);
+                }
                 
-                // Only update if different from current
-                if (ThemeService.CurrentTheme != savedTheme)
+                if (ThemeService.CurrentBrandTheme != domBrandTheme)
                 {
-                    ThemeService.SetTheme(savedTheme);
+                    ThemeService.SetBrandTheme(domBrandTheme);
                 }
                 
-                // Always ensure the DOM has the correct theme attribute
-                await JSRuntime.InvokeVoidAsync("themeManager.setTheme", savedTheme);
+                // Force UI refresh to reflect synced theme
                 StateHasChanged();
+                
+                // Also ensure DOM attributes are still set (in case Blazor cleared them)
+                await JSRuntime.InvokeVoidAsync("themeManager.setTheme", ThemeService.CurrentTheme);
+                await JSRuntime.InvokeVoidAsync("themeManager.setBrandTheme", ThemeService.CurrentBrandTheme);
             }
-            catch
+            catch (Exception ex)
             {
+                Console.WriteLine($"Error loading themes: {ex.Message}");
                 // Fallback if localStorage not available
                 ThemeService.SetTheme("light");
+                ThemeService.SetBrandTheme("bootstrap");
                 await JSRuntime.InvokeVoidAsync("themeManager.setTheme", "light");
+                await JSRuntime.InvokeVoidAsync("themeManager.setBrandTheme", "bootstrap");
             }
         }
     }
@@ -217,7 +248,10 @@
             currentTheme = ThemeService.CurrentTheme;
             // Save to localStorage and update DOM immediately
             await JSRuntime.InvokeVoidAsync("themeManager.setTheme", ThemeService.CurrentTheme);
-            StateHasChanged();
+            
+            // Force a complete page refresh to apply theme changes immediately
+            NavigationManager.Refresh(forceReload: false);
+            
             Console.WriteLine($"Theme toggled to: {ThemeService.CurrentTheme}");
         }
         catch (Exception ex)
@@ -226,6 +260,51 @@
         }
     }
 
+    private async Task SelectBrandTheme(string brandTheme)
+    {
+        try
+        {
+            Console.WriteLine($"SelectBrandTheme called with: {brandTheme}");
+            
+            // Close dropdown first
+            showBrandThemeDropdown = false;
+            StateHasChanged();
+            
+            // Update service and JavaScript
+            ThemeService.SetBrandTheme(brandTheme);
+            await JSRuntime.InvokeVoidAsync("themeManager.setBrandTheme", brandTheme);
+            
+            Console.WriteLine($"Brand theme changed to: {ThemeService.CurrentBrandTheme}");
+            
+            // Force UI refresh
+            NavigationManager.Refresh(forceReload: false);
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Error changing brand theme: {ex.Message}");
+            showBrandThemeDropdown = false;
+            StateHasChanged();
+        }
+    }
+
+    private void ToggleBrandThemeDropdown()
+    {
+        showBrandThemeDropdown = !showBrandThemeDropdown;
+        Console.WriteLine($"Dropdown toggled: {showBrandThemeDropdown}");
+        StateHasChanged();
+    }
+
+    private string FormatBrandThemeName(string theme)
+    {
+        return theme switch
+        {
+            "bootstrap" => "Bootstrap",
+            "obsidian" => "Obsidian",
+            "teal" => "Teal",
+            _ => theme.Substring(0, 1).ToUpper() + theme.Substring(1)
+        };
+    }
+
     private string GetThemeIcon()
     {
         return currentTheme == "light" ? "bi-moon-fill" : "bi-sun-fill";
@@ -246,14 +325,29 @@
         });
     }
 
+    private void OnBrandThemeChanged()
+    {
+        InvokeAsync(async () =>
+        {
+            try
+            {
+                // Re-apply brand theme when service notifies of change
+                await JSRuntime.InvokeVoidAsync("themeManager.setBrandTheme", ThemeService.CurrentBrandTheme);
+            }
+            catch { }
+            StateHasChanged();
+        });
+    }
+
     private async void OnLocationChanged(object? sender, LocationChangedEventArgs e)
     {
         currentUrl = NavigationManager.ToBaseRelativePath(e.Location);
         
-        // Re-apply current theme after navigation
+        // Re-apply current theme and brand theme after navigation
         try
         {
             await JSRuntime.InvokeVoidAsync("themeManager.setTheme", ThemeService.CurrentTheme);
+            await JSRuntime.InvokeVoidAsync("themeManager.setBrandTheme", ThemeService.CurrentBrandTheme);
         }
         catch { }
         
@@ -264,6 +358,7 @@
     {
         NavigationManager.LocationChanged -= OnLocationChanged;
         ThemeService.OnThemeChanged -= OnThemeChanged;
+        ThemeService.OnBrandThemeChanged -= OnBrandThemeChanged;
     }
 }
 
diff --git a/4-Aquiis.SimpleStart/Shared/Layout/NavMenu.razor.css b/4-Aquiis.SimpleStart/Shared/Layout/NavMenu.razor.css
index 01486ae..202219c 100644
--- a/4-Aquiis.SimpleStart/Shared/Layout/NavMenu.razor.css
+++ b/4-Aquiis.SimpleStart/Shared/Layout/NavMenu.razor.css
@@ -14,16 +14,43 @@
 }
 
 .navbar-toggler:checked {
-  background-color: rgba(255, 255, 255, 0.5);
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+[data-bs-theme="light"] .navbar-toggler {
+  border: 1px solid rgba(0, 0, 0, 0.5) !important;
+  background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%280, 0, 0, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e")
+    no-repeat center/1.75rem rgba(0, 0, 0, 0.5) !important;
+}
+
+[data-bs-theme="light"] .navbar-toggler:checked {
+  background-color: rgba(0, 0, 0, 0.25) !important;
+}
+
+[data-bs-theme="light"] .top-row {
+  min-height: 3.5rem;
+  border-bottom: 1px solid var(--bs-border-color);
+  /* background-color: #0f172a !important; */
 }
 
-.top-row {
+[data-bs-theme="dark"] .top-row {
   min-height: 3.5rem;
-  background-color: rgba(0, 0, 0, 0.4);
+  border-bottom: 1px solid var(--bs-border-color);
+  /* background-color: #0a0f1a !important; */
 }
 
 .navbar-brand {
   font-size: 1.1rem;
+  color: var(--bs-body-color) !important;
+}
+
+.top-row .btn-link {
+  color: var(--bs-body-color) !important;
+  text-decoration: none;
+}
+
+.top-row .btn-link:hover {
+  color: var(--bs-link-hover-color) !important;
 }
 
 .bi {
@@ -36,6 +63,19 @@
   background-size: cover;
 }
 
+/* Light mode - invert white icons to dark */
+[data-bs-theme="light"] .bi-house-door-fill-nav-menu,
+[data-bs-theme="light"] .bi-plus-square-fill-nav-menu,
+[data-bs-theme="light"] .bi-list-nested-nav-menu,
+[data-bs-theme="light"] .bi-lock-nav-menu,
+[data-bs-theme="light"] .bi-person-nav-menu,
+[data-bs-theme="light"] .bi-person-badge-nav-menu,
+[data-bs-theme="light"] .bi-person-fill-nav-menu,
+[data-bs-theme="light"] .bi-arrow-bar-left-nav-menu,
+[data-bs-theme="light"] .bi-palette-fill-nav-menu {
+  filter: invert(1);
+}
+
 .bi-house-door-fill-nav-menu {
   background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
 }
@@ -68,6 +108,10 @@
   background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-arrow-bar-left' viewBox='0 0 16 16'%3E%3Cpath d='M12.5 15a.5.5 0 0 1-.5-.5v-13a.5.5 0 0 1 1 0v13a.5.5 0 0 1-.5.5ZM10 8a.5.5 0 0 1-.5.5H3.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L3.707 7.5H9.5a.5.5 0 0 1 .5.5Z'/%3E%3C/svg%3E");
 }
 
+.bi-palette-fill-nav-menu {
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-palette-fill' viewBox='0 0 16 16'%3E%3Cpath d='M12.433 10.07C14.133 10.585 16 11.15 16 8a8 8 0 1 0-8 8c1.996 0 1.826-1.504 1.649-3.08-.124-1.101-.252-2.237.351-2.92.465-.527 1.42-.237 2.433.07zM8 5a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3zm4.5 3a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3zM5 6.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm.5 6.5a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3z'/%3E%3C/svg%3E");
+}
+
 .nav-item {
   font-size: 0.9rem;
   padding-bottom: 0.5rem;
@@ -82,7 +126,7 @@
 }
 
 .nav-item ::deep .nav-link {
-  color: #d7d7d7;
+  color: var(--bs-body-color);
   background: none;
   border: none;
   border-radius: 4px;
@@ -94,18 +138,24 @@
 }
 
 .nav-item ::deep a.active {
-  background-color: rgba(255, 255, 255, 0.37);
+  background-color: var(--bs-primary);
   color: white;
 }
 
 .nav-item ::deep .nav-link:hover {
+  background-color: var(--bs-secondary-bg);
+  color: var(--bs-body-color);
+}
+
+/* Obsidian brand - dark sidebar with lighter hover effect (both modes) */
+[data-brand-theme="obsidian"] .nav-item ::deep .nav-link:hover {
   background-color: rgba(255, 255, 255, 0.1);
   color: white;
 }
 
 .nav-separator {
   border: 0;
-  border-top: 1px solid rgba(255, 255, 255, 0.2);
+  border-top: 1px solid var(--bs-border-color);
   margin: 0.5rem 1rem;
 }
 
@@ -114,8 +164,14 @@
     justify-content: space-between;
   }
 
-  .nav-scrollable {
+  [data-bs-theme="light"] .nav-scrollable {
     display: none;
+    /* background-color: #0f172a; */
+  }
+
+  [data-bs-theme="dark"] .nav-scrollable {
+    display: none;
+    /* background-color: #0a0f1a; */
   }
 
   .navbar-toggler:checked ~ .nav-scrollable {
@@ -128,12 +184,81 @@
     display: none;
   }
 
-  .nav-scrollable {
+  [data-bs-theme="light"] .nav-scrollable {
+    /* Never collapse the sidebar for wide screens */
+    display: block;
+
+    /* Allow sidebar to scroll for tall menus */
+    height: calc(100vh - 3.5rem);
+    overflow-y: auto;
+    /* background-color: #0f172a; */
+  }
+
+  [data-bs-theme="dark"] .nav-scrollable {
     /* Never collapse the sidebar for wide screens */
     display: block;
 
     /* Allow sidebar to scroll for tall menus */
     height: calc(100vh - 3.5rem);
     overflow-y: auto;
+    /* background-color: #0a0f1a; */
   }
 }
+
+/* Brand Theme Dropdown Styling */
+.dropdown {
+  width: 100%;
+}
+
+.dropdown-toggle {
+  width: 100%;
+  text-align: left;
+  border: none;
+  background: transparent;
+}
+
+.dropdown-toggle::after {
+  float: right;
+  margin-top: 0.5rem;
+}
+
+.dropdown-menu {
+  width: 100%;
+  background-color: var(--bs-secondary-bg);
+  border: 1px solid var(--bs-border-color);
+  margin-top: 0;
+}
+
+.dropdown-item {
+  color: var(--bs-body-color);
+  padding: 0.5rem 1rem;
+  border: none;
+  width: 100%;
+  text-align: left;
+  background: transparent;
+}
+
+.dropdown-item:hover {
+  background-color: var(--bs-secondary-bg);
+  color: var(--bs-body-color);
+}
+
+.dropdown-item.active {
+  background-color: var(--bs-primary);
+  color: white;
+}
+
+/* Obsidian brand - dropdown styling (both modes) */
+[data-brand-theme="obsidian"] .dropdown-menu {
+  background-color: rgba(255, 255, 255, 0.05);
+  border-color: rgba(255, 255, 255, 0.15);
+}
+
+[data-brand-theme="obsidian"] .dropdown-item {
+  color: rgba(255, 255, 255, 0.85);
+}
+
+[data-brand-theme="obsidian"] .dropdown-item:hover {
+  background-color: rgba(255, 255, 255, 0.1);
+  color: white;
+}
diff --git a/4-Aquiis.SimpleStart/Shared/Services/ThemeService.cs b/4-Aquiis.SimpleStart/Shared/Services/ThemeService.cs
index 43884f3..a1a30b6 100644
--- a/4-Aquiis.SimpleStart/Shared/Services/ThemeService.cs
+++ b/4-Aquiis.SimpleStart/Shared/Services/ThemeService.cs
@@ -3,10 +3,13 @@ namespace Aquiis.SimpleStart.Shared.Services;
 public class ThemeService
 {
     private string _currentTheme = "light";
+    private string _currentBrandTheme = "bootstrap";
     
     public event Action? OnThemeChanged;
+    public event Action? OnBrandThemeChanged;
     
     public string CurrentTheme => _currentTheme;
+    public string CurrentBrandTheme => _currentBrandTheme;
     
     public void SetTheme(string theme)
     {
@@ -28,4 +31,23 @@ public string GetNextTheme()
     {
         return _currentTheme == "light" ? "dark" : "light";
     }
+    
+    // Valid brand themes - add new themes here when implementing them
+    private readonly HashSet<string> _validBrandThemes = new()
+    {
+        "bootstrap",
+        "obsidian",
+        "teal"
+    };
+
+    public void SetBrandTheme(string brandTheme)
+    {
+        if (!_validBrandThemes.Contains(brandTheme))
+        {
+            throw new ArgumentException($"Brand theme must be one of: {string.Join(", ", _validBrandThemes)}", nameof(brandTheme));
+        }
+        
+        _currentBrandTheme = brandTheme;
+        OnBrandThemeChanged?.Invoke();
+    }
 }
diff --git a/4-Aquiis.SimpleStart/Shared/Services/UserContextService.cs b/4-Aquiis.SimpleStart/Shared/Services/UserContextService.cs
index 5224618..1f1c458 100644
--- a/4-Aquiis.SimpleStart/Shared/Services/UserContextService.cs
+++ b/4-Aquiis.SimpleStart/Shared/Services/UserContextService.cs
@@ -1,12 +1,13 @@
 using Aquiis.SimpleStart.Entities;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.DependencyInjection;
 using Aquiis.Core.Entities;
 using System.Security.Claims;
 using Aquiis.Core.Constants;
 using Aquiis.Core.Interfaces.Services;
 using Aquiis.Application.Services;
+using Aquiis.Infrastructure.Data;
+using Microsoft.EntityFrameworkCore;
 
 namespace Aquiis.SimpleStart.Shared.Services
 {
@@ -18,6 +19,7 @@ namespace Aquiis.SimpleStart.Shared.Services
     public class UserContextService : IUserContextService
     {
         private readonly AuthenticationStateProvider _authenticationStateProvider;
+        private readonly ApplicationDbContext _dbContext;
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly Func<Task<Aquiis.Application.Services.OrganizationService>> _organizationServiceFactory;
 
@@ -25,15 +27,17 @@ public class UserContextService : IUserContextService
         private string? _userId;
         private Guid? _organizationId;
         private Guid? _activeOrganizationId;
-        private ApplicationUser? _currentUser;
+        private UserProfile? _userProfile;
         private bool _isInitialized = false;
 
         public UserContextService(
             AuthenticationStateProvider authenticationStateProvider,
+            ApplicationDbContext dbContext,
             UserManager<ApplicationUser> userManager,
             IServiceProvider serviceProvider)
         {
             _authenticationStateProvider = authenticationStateProvider;
+            _dbContext = dbContext;
             _userManager = userManager;
             // Use factory pattern to avoid circular dependency
             _organizationServiceFactory = async () => 
@@ -52,6 +56,19 @@ public UserContextService(
             return _userId;
         }
 
+        /// <summary>
+        /// Gets the current ApplicationUser from Identity system. Use this when you need the full Identity user object.
+        /// For display purposes, prefer using UserProfile queries against ApplicationDbContext.
+        /// </summary>
+        public async Task<ApplicationUser?> GetCurrentUserAsync()
+        {
+            var userId = await GetUserIdAsync();
+            if (userId == null)
+                return null;
+
+            return await _userManager.FindByIdAsync(userId);
+        }
+
         /// <summary>
         /// Gets the current user's OrganizationId. Cached after first access.
         /// DEPRECATED: Use GetActiveOrganizationIdAsync() for multi-org support
@@ -87,12 +104,12 @@ public UserContextService(
         }
 
         /// <summary>
-        /// Gets the current ApplicationUser object. Cached after first access.
+        /// Gets the current UserProfile object. Cached after first access.
         /// </summary>
-        public async Task<ApplicationUser?> GetCurrentUserAsync()
+        public async Task<UserProfile?> GetUserProfileAsync()
         {
             await EnsureInitializedAsync();
-            return _currentUser;
+            return _userProfile;
         }
 
         /// <summary>
@@ -110,7 +127,7 @@ public async Task<bool> IsAuthenticatedAsync()
         public async Task<string?> GetUserEmailAsync()
         {
             await EnsureInitializedAsync();
-            return _currentUser?.Email;
+            return _userProfile?.Email;
         }
 
         /// <summary>
@@ -119,13 +136,51 @@ public async Task<bool> IsAuthenticatedAsync()
         public async Task<string?> GetUserNameAsync()
         {
             await EnsureInitializedAsync();
-            if (_currentUser != null)
-            {
-                return $"{_currentUser.FirstName} {_currentUser.LastName}".Trim();
-            }
-            return null;
+            return _userProfile?.FullName;
+        }
+
+         /// <summary>
+        /// Updates the current user's profile information and refreshes the cache.
+        /// </summary>
+        public async Task<bool> CreateUserProfile(UserProfile profile)
+        {
+
+        
+            _dbContext.UserProfiles.Add(profile);
+            await _dbContext.SaveChangesAsync();
+
+            // Refresh cache to reflect changes
+            await RefreshAsync();
+            return true;
+        }
+
+        /// <summary>
+        /// Updates the current user's profile information and refreshes the cache.
+        /// </summary>
+        public async Task<bool> UpdateCurrentUserProfileAsync(string firstName, string lastName, string? phoneNumber)
+        {
+            var userId = await GetUserIdAsync();
+            if (string.IsNullOrEmpty(userId))
+                return false;
+
+            var userProfile = await _dbContext.UserProfiles.FirstOrDefaultAsync(up => up.UserId == userId);
+            if (userProfile == null)
+                return false;
+
+            userProfile.FirstName = firstName;
+            userProfile.LastName = lastName;
+            userProfile.PhoneNumber = phoneNumber;
+            userProfile.LastModifiedOn = DateTime.UtcNow;
+            userProfile.LastModifiedBy = userId;
+            await _dbContext.SaveChangesAsync();
+
+            // Refresh cache to reflect changes
+            await RefreshAsync();
+            return true;
         }
 
+
+
         /// <summary>
         /// Checks if the current user is in the specified role.
         /// </summary>
@@ -140,14 +195,14 @@ public async Task<bool> IsInRoleAsync(string role)
         /// <summary>
         /// Get all organizations the current user has access to
         /// </summary>
-        public async Task<List<UserOrganization>> GetAccessibleOrganizationsAsync()
+        public async Task<List<OrganizationUser>> GetAccessibleOrganizationsAsync()
         {
             var userId = await GetUserIdAsync();
             if (string.IsNullOrEmpty(userId))
-                return new List<UserOrganization>();
+                return new List<OrganizationUser>();
 
             var organizationService = await _organizationServiceFactory();
-            return await organizationService.GetUserOrganizationsAsync(userId);
+            return await organizationService.GetOrganizationUsersAsync(userId);
         }
 
         /// <summary>
@@ -204,22 +259,21 @@ public async Task<bool> SwitchOrganizationAsync(Guid organizationId)
             if (!await organizationService.CanAccessOrganizationAsync(userId, organizationId))
                 return false;
 
-            // Update user's active organization
-            var user = await GetCurrentUserAsync();
-            if (user == null)
+            // Update UserProfile's active organization
+            var userProfile = await _dbContext.UserProfiles
+                .FirstOrDefaultAsync(up => up.UserId == userId);
+            
+            if (userProfile == null)
                 return false;
 
-            user.ActiveOrganizationId = organizationId;
-            var result = await _userManager.UpdateAsync(user);
+            userProfile.ActiveOrganizationId = organizationId;
+            userProfile.LastModifiedOn = DateTime.UtcNow;
+            userProfile.LastModifiedBy = userId;
+            await _dbContext.SaveChangesAsync();
 
-            if (result.Succeeded)
-            {
-                // Refresh cache
-                await RefreshAsync();
-                return true;
-            }
-
-            return false;
+            // Refresh cache
+            await RefreshAsync();
+            return true;
         }
 
         /// <summary>
@@ -272,7 +326,7 @@ public async Task RefreshAsync()
             _userId = null;
             _organizationId = null;
             _activeOrganizationId = null;
-            _currentUser = null;
+            _userProfile = null;
             await EnsureInitializedAsync();
         }
 
@@ -295,12 +349,16 @@ private async Task EnsureInitializedAsync()
                 if (!string.IsNullOrEmpty(claimsUserId))
                 {
                     _userId = claimsUserId;
-                }
-                {
-                    _currentUser = await _userManager.FindByIdAsync(_userId!);
-                    if (_currentUser != null)
+                    
+                    // Load UserProfile from ApplicationDbContext (single-context query)
+                    _userProfile = await _dbContext.UserProfiles
+                        .AsNoTracking()
+                        .FirstOrDefaultAsync(up => up.UserId == _userId);
+                    
+                    if (_userProfile != null)
                     {
-                        _activeOrganizationId = _currentUser.ActiveOrganizationId; // New multi-org
+                        _organizationId = _userProfile.OrganizationId;
+                        _activeOrganizationId = _userProfile.ActiveOrganizationId;
                     }
                 }
             }
diff --git a/4-Aquiis.SimpleStart/_Imports.razor b/4-Aquiis.SimpleStart/_Imports.razor
index 2b1af3a..f99c209 100644
--- a/4-Aquiis.SimpleStart/_Imports.razor
+++ b/4-Aquiis.SimpleStart/_Imports.razor
@@ -14,5 +14,7 @@
 @using Aquiis.Application.Services
 @using Aquiis.Core.Entities
 @using Aquiis.Core.Interfaces
-@using Aquiis.UI.Shared.Features.Notifications
+@using Aquiis.UI.Shared.Components.Notifications
+@using Aquiis.UI.Shared.Components.OrganizationSwitcher
 @using Aquiis.UI.Shared.Components.Common
+@using Aquiis.UI.Shared.Components.Entities.Organizations
diff --git a/4-Aquiis.SimpleStart/appsettings.Development.json b/4-Aquiis.SimpleStart/appsettings.Development.json
index 3cacbdc..9d1ab69 100644
--- a/4-Aquiis.SimpleStart/appsettings.Development.json
+++ b/4-Aquiis.SimpleStart/appsettings.Development.json
@@ -2,7 +2,8 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore.Database.Command": "Warning"
     }
   },
   "SessionTimeout": {
diff --git a/4-Aquiis.SimpleStart/appsettings.json b/4-Aquiis.SimpleStart/appsettings.json
index 0258005..68fd678 100644
--- a/4-Aquiis.SimpleStart/appsettings.json
+++ b/4-Aquiis.SimpleStart/appsettings.json
@@ -7,7 +7,7 @@
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning",
       "Microsoft.Hosting.Lifetime": "Information",
-      "Microsoft.EntityFrameworkCore.Database.Command": "Information"
+      "Microsoft.EntityFrameworkCore.Database.Command": "Warning"
     }
   },
   "AllowedHosts": "*",
@@ -20,7 +20,8 @@
     "SoftDeleteEnabled": true,
     "DatabaseFileName": "app_v0.3.0.db",
     "PreviousDatabaseFileName": "app_v0.0.0.db",
-    "SchemaVersion": "0.3.0"
+    "SchemaVersion": "0.3.0",
+    "MaxOrganizationUsers": 3
   },
   "SessionTimeout": {
     "InactivityTimeoutMinutes": 18,
diff --git a/4-Aquiis.SimpleStart/wwwroot/android-chrome-192x192.png b/4-Aquiis.SimpleStart/wwwroot/android-chrome-192x192.png
new file mode 100644
index 0000000..aa0e774
Binary files /dev/null and b/4-Aquiis.SimpleStart/wwwroot/android-chrome-192x192.png differ
diff --git a/4-Aquiis.SimpleStart/wwwroot/android-chrome-512x512.png b/4-Aquiis.SimpleStart/wwwroot/android-chrome-512x512.png
new file mode 100644
index 0000000..013f46d
Binary files /dev/null and b/4-Aquiis.SimpleStart/wwwroot/android-chrome-512x512.png differ
diff --git a/4-Aquiis.SimpleStart/wwwroot/app.css b/4-Aquiis.SimpleStart/wwwroot/app.css
index 1127dd4..56eb65e 100644
--- a/4-Aquiis.SimpleStart/wwwroot/app.css
+++ b/4-Aquiis.SimpleStart/wwwroot/app.css
@@ -1,9 +1,304 @@
+/* ========================================
+   BRAND THEME SYSTEM
+   For documentation on adding new themes, see:
+   Theming-Support-Implementation.md
+   ======================================== */
+
+/* ========================================
+   BRAND THEME: OBSIDIAN
+   Override Bootstrap CSS variables with Obsidian colors
+   Same colors apply to both light and dark modes
+   (Bootstrap controls background/text via data-bs-theme)
+   ======================================== */
+
+/* Obsidian Light Mode */
+:root[data-bs-theme="light"][data-brand-theme="obsidian"],
+[data-bs-theme="light"][data-brand-theme="obsidian"] .page {
+  --bs-primary: #25344d !important;
+  --bs-primary-rgb: 37, 52, 77 !important;
+  --bs-secondary: #d17315 !important;
+  --bs-secondary-rgb: 209, 115, 21 !important;
+  --bs-success: #1a531d !important;
+  --bs-success-rgb: 26, 83, 29 !important;
+  --bs-info: #1b60b4 !important;
+  --bs-info-rgb: 27, 96, 180 !important;
+  --bs-warning: #d29e00 !important;
+  --bs-warning-rgb: 210, 158, 0 !important;
+  --bs-danger: #712028 !important;
+  --bs-danger-rgb: 113, 32, 40 !important;
+
+  /* Additional Bootstrap variables to ensure consistent theming */
+  --bs-link-color: #25344d !important;
+  --bs-link-hover-color: #1a2435 !important;
+  --bs-btn-color: #25344d !important;
+  --bs-emphasis-color: #25344d !important;
+}
+
+/* Obsidian Dark Mode - Identical colors */
+:root[data-bs-theme="dark"][data-brand-theme="obsidian"],
+[data-bs-theme="dark"][data-brand-theme="obsidian"] .page {
+  --bs-primary: #25344d !important;
+  --bs-primary-rgb: 37, 52, 77 !important;
+  --bs-secondary: #d17315 !important;
+  --bs-secondary-rgb: 209, 115, 21 !important;
+  --bs-success: #1a531d !important;
+  --bs-success-rgb: 26, 83, 29 !important;
+  --bs-info: #1b60b4 !important;
+  --bs-info-rgb: 27, 96, 180 !important;
+  --bs-warning: #d29e00 !important;
+  --bs-warning-rgb: 210, 158, 0 !important;
+  --bs-danger: #712028 !important;
+  --bs-danger-rgb: 113, 32, 40 !important;
+
+  /* Additional Bootstrap variables to ensure consistent theming */
+  --bs-link-color: #25344d !important;
+  --bs-link-hover-color: #1a2435 !important;
+  --bs-btn-color: #25344d !important;
+  --bs-emphasis-color: #25344d !important;
+}
+
+/* Table text color for Obsidian dark theme */
+[data-bs-theme="dark"][data-brand-theme="obsidian"] table,
+[data-bs-theme="dark"][data-brand-theme="obsidian"] .table,
+[data-bs-theme="dark"][data-brand-theme="obsidian"] table thead,
+[data-bs-theme="dark"][data-brand-theme="obsidian"] table tbody,
+[data-bs-theme="dark"][data-brand-theme="obsidian"] table th,
+[data-bs-theme="dark"][data-brand-theme="obsidian"] table td {
+  color: whitesmoke !important;
+}
+
+/* Override Bootstrap's table text color more specifically */
+[data-bs-theme="dark"][data-brand-theme="obsidian"]
+  .table
+  > :not(caption)
+  > *
+  > * {
+  color: whitesmoke !important;
+}
+
+/* ========================================
+   BRAND THEME: TEAL
+   Override Bootstrap CSS variables with Teal colors
+   Same colors apply to both light and dark modes
+   (Bootstrap controls background/text via data-bs-theme)
+   ======================================== */
+
+/* Teal Light Mode */
+:root[data-bs-theme="light"][data-brand-theme="teal"],
+[data-bs-theme="light"][data-brand-theme="teal"] .page {
+  --bs-primary: #0d9488 !important;
+  --bs-primary-rgb: 13, 148, 136 !important;
+  --bs-secondary: #ff6b6b !important;
+  --bs-secondary-rgb: 255, 107, 107 !important;
+  --bs-success: #388e3c !important;
+  --bs-success-rgb: 56, 142, 60 !important;
+  --bs-info: #14b8a6 !important;
+  --bs-info-rgb: 20, 184, 166 !important;
+  --bs-warning: #ffc107 !important;
+  --bs-warning-rgb: 255, 193, 7 !important;
+  --bs-danger: #dc3545 !important;
+  --bs-danger-rgb: 220, 53, 69 !important;
+
+  /* Additional Bootstrap variables to ensure consistent theming */
+  --bs-link-color: #0d9488 !important;
+  --bs-link-hover-color: #0a7169 !important;
+  --bs-btn-color: #0d9488 !important;
+  --bs-emphasis-color: #0d9488 !important;
+}
+
+/* Teal Dark Mode - Identical colors */
+:root[data-bs-theme="dark"][data-brand-theme="teal"],
+[data-bs-theme="dark"][data-brand-theme="teal"] .page {
+  --bs-primary: #0d9488 !important;
+  --bs-primary-rgb: 13, 148, 136 !important;
+  --bs-secondary: #ff6b6b !important;
+  --bs-secondary-rgb: 255, 107, 107 !important;
+  --bs-success: #388e3c !important;
+  --bs-success-rgb: 56, 142, 60 !important;
+  --bs-info: #14b8a6 !important;
+  --bs-info-rgb: 20, 184, 166 !important;
+  --bs-warning: #ffc107 !important;
+  --bs-warning-rgb: 255, 193, 7 !important;
+  --bs-danger: #dc3545 !important;
+  --bs-danger-rgb: 220, 53, 69 !important;
+
+  /* Additional Bootstrap variables to ensure consistent theming */
+  --bs-link-color: #0d9488 !important;
+  --bs-link-hover-color: #0a7169 !important;
+  --bs-btn-color: #0d9488 !important;
+  --bs-emphasis-color: #0d9488 !important;
+}
+
+/* Layout Overrides for Obsidian Theme */
+
+[data-bs-theme="light"] main .top-row,
+[data-bs-theme="light"] .page main .top-row,
+[data-bs-theme="dark"] main .top-row,
+[data-bs-theme="dark"] .page main .top-row {
+  border-bottom: 1px solid var(--bs-border-color) !important;
+}
+
+/* Sidebar background and text styling for Obsidian brand (both modes) */
+/* Higher specificity selector to prevent Bootstrap dark from flashing through */
+[data-bs-theme][data-brand-theme="obsidian"] .sidebar,
+[data-brand-theme="obsidian"] .sidebar {
+  background-color: #1a1a1a !important;
+  color: whitesmoke !important;
+}
+
+[data-bs-theme][data-brand-theme="obsidian"] .sidebar .navbar-brand,
+[data-brand-theme="obsidian"] .sidebar .navbar-brand {
+  color: whitesmoke !important;
+}
+
+[data-bs-theme][data-brand-theme="obsidian"] .sidebar .top-row .btn-link,
+[data-brand-theme="obsidian"] .sidebar .top-row .btn-link {
+  color: whitesmoke !important;
+}
+
+[data-bs-theme][data-brand-theme="obsidian"] .sidebar .nav-separator,
+[data-brand-theme="obsidian"] .sidebar .nav-separator {
+  border-top-color: rgba(255, 255, 255, 0.15) !important;
+}
+
+/* Override all text colors in sidebar for Obsidian brand */
+[data-bs-theme][data-brand-theme="obsidian"] .sidebar .nav-link,
+[data-bs-theme][data-brand-theme="obsidian"] .sidebar a,
+[data-bs-theme][data-brand-theme="obsidian"] .sidebar button,
+[data-bs-theme][data-brand-theme="obsidian"] .sidebar div,
+[data-brand-theme="obsidian"] .sidebar .nav-link,
+[data-brand-theme="obsidian"] .sidebar a,
+[data-brand-theme="obsidian"] .sidebar button,
+[data-brand-theme="obsidian"] .sidebar div {
+  color: rgba(255, 255, 255, 100) !important;
+}
+
+/* Keep navigation icons white in dark sidebar for Obsidian brand */
+[data-bs-theme][data-brand-theme="obsidian"]
+  .sidebar
+  .bi-house-door-fill-nav-menu,
+[data-bs-theme][data-brand-theme="obsidian"]
+  .sidebar
+  .bi-plus-square-fill-nav-menu,
+[data-bs-theme][data-brand-theme="obsidian"] .sidebar .bi-list-nested-nav-menu,
+[data-bs-theme][data-brand-theme="obsidian"] .sidebar .bi-lock-nav-menu,
+[data-bs-theme][data-brand-theme="obsidian"] .sidebar .bi-person-nav-menu,
+[data-bs-theme][data-brand-theme="obsidian"] .sidebar .bi-person-badge-nav-menu,
+[data-bs-theme][data-brand-theme="obsidian"] .sidebar .bi-person-fill-nav-menu,
+[data-bs-theme][data-brand-theme="obsidian"]
+  .sidebar
+  .bi-arrow-bar-left-nav-menu,
+[data-bs-theme][data-brand-theme="obsidian"] .sidebar .bi-palette-fill-nav-menu,
+[data-brand-theme="obsidian"] .sidebar .bi-house-door-fill-nav-menu,
+[data-brand-theme="obsidian"] .sidebar .bi-plus-square-fill-nav-menu,
+[data-brand-theme="obsidian"] .sidebar .bi-list-nested-nav-menu,
+[data-brand-theme="obsidian"] .sidebar .bi-lock-nav-menu,
+[data-brand-theme="obsidian"] .sidebar .bi-person-nav-menu,
+[data-brand-theme="obsidian"] .sidebar .bi-person-badge-nav-menu,
+[data-brand-theme="obsidian"] .sidebar .bi-person-fill-nav-menu,
+[data-brand-theme="obsidian"] .sidebar .bi-arrow-bar-left-nav-menu,
+[data-brand-theme="obsidian"] .sidebar .bi-palette-fill-nav-menu {
+  filter: none !important;
+}
+
+/* Background Colors */
+.bg-obsidian-primary {
+  background-color: #25344d !important;
+  color: white !important;
+}
+.bg-obsidian-primary-dark {
+  background-color: #1a1a1a !important;
+  color: white !important;
+}
+.bg-obsidian-secondary {
+  background-color: #d17315 !important;
+  color: white !important;
+}
+.bg-obsidian-success {
+  background-color: #1a531d !important;
+  color: white !important;
+}
+.bg-obsidian-info {
+  background-color: #1b60b4 !important;
+  color: white !important;
+}
+.bg-obsidian-warning {
+  background-color: #d29e00 !important;
+  color: #2a3749 !important;
+}
+.bg-obsidian-danger {
+  background-color: #712028 !important;
+  color: white !important;
+}
+.bg-obsidian-light {
+  background-color: #faf9f6 !important;
+  color: #2a3749 !important;
+}
+.bg-obsidian-dark {
+  background-color: #2a3749 !important;
+  color: white !important;
+}
+
+/* Text Colors */
+.text-obsidian-primary {
+  color: #25344d !important;
+}
+.text-obsidian-primary-dark {
+  color: #1a1a1a !important;
+}
+.text-obsidian-secondary {
+  color: #d17315 !important;
+}
+.text-obsidian-success {
+  color: #1a531d !important;
+}
+.text-obsidian-info {
+  color: #1b60b4 !important;
+}
+.text-obsidian-warning {
+  color: #d29e00 !important;
+}
+.text-obsidian-danger {
+  color: #712028 !important;
+}
+.text-obsidian-light {
+  color: #faf9f6 !important;
+}
+.text-obsidian-dark {
+  color: #2a3749 !important;
+}
+
+/* Border Colors */
+.border-obsidian-primary {
+  border-color: #25344d !important;
+}
+.border-obsidian-primary-dark {
+  border-color: #1a1a1a !important;
+}
+.border-obsidian-secondary {
+  border-color: #d17315 !important;
+}
+.border-obsidian-success {
+  border-color: #1a531d !important;
+}
+.border-obsidian-info {
+  border-color: #1b60b4 !important;
+}
+.border-obsidian-warning {
+  border-color: #d29e00 !important;
+}
+.border-obsidian-danger {
+  border-color: #712028 !important;
+}
+
 html,
 body {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   background-color: var(--bs-body-bg) !important;
   color: var(--bs-body-color) !important;
-  transition: background-color 0.3s ease, color 0.3s ease;
+  transition:
+    background-color 0.3s ease,
+    color 0.3s ease;
 }
 
 /* Ensure color-scheme is set for proper dark mode rendering */
@@ -61,7 +356,9 @@ a,
 .btn-link.nav-link:focus,
 .form-control:focus,
 .form-check-input:focus {
-  box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb;
+  box-shadow:
+    0 0 0 0.1rem white,
+    0 0 0 0.25rem #258cfb;
 }
 
 .content {
@@ -85,7 +382,8 @@ h1:focus {
 }
 
 .blazor-error-boundary {
-  background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=)
+  background:
+    url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=)
       no-repeat 1rem/1.8rem,
     #b32121;
   padding: 1rem 1rem 1rem 3.7rem;
diff --git a/4-Aquiis.SimpleStart/wwwroot/apple-touch-icon.png b/4-Aquiis.SimpleStart/wwwroot/apple-touch-icon.png
new file mode 100644
index 0000000..f62ca1f
Binary files /dev/null and b/4-Aquiis.SimpleStart/wwwroot/apple-touch-icon.png differ
diff --git a/4-Aquiis.SimpleStart/wwwroot/favicon-16x16.png b/4-Aquiis.SimpleStart/wwwroot/favicon-16x16.png
new file mode 100644
index 0000000..609a738
Binary files /dev/null and b/4-Aquiis.SimpleStart/wwwroot/favicon-16x16.png differ
diff --git a/4-Aquiis.SimpleStart/wwwroot/favicon-32x32.png b/4-Aquiis.SimpleStart/wwwroot/favicon-32x32.png
new file mode 100644
index 0000000..7ae6945
Binary files /dev/null and b/4-Aquiis.SimpleStart/wwwroot/favicon-32x32.png differ
diff --git a/4-Aquiis.SimpleStart/wwwroot/favicon.ico b/4-Aquiis.SimpleStart/wwwroot/favicon.ico
new file mode 100644
index 0000000..9d5e16b
Binary files /dev/null and b/4-Aquiis.SimpleStart/wwwroot/favicon.ico differ
diff --git a/5-Aquiis.Professional/Features/Administration/Organizations/Pages/ManageUsers.razor b/5-Aquiis.Professional/Features/Administration/Organizations/Pages/ManageUsers.razor
index 64a1833..1ad105d 100644
--- a/5-Aquiis.Professional/Features/Administration/Organizations/Pages/ManageUsers.razor
+++ b/5-Aquiis.Professional/Features/Administration/Organizations/Pages/ManageUsers.razor
@@ -5,11 +5,13 @@
 @using Aquiis.Professional.Shared.Services
 @using Aquiis.Professional.Shared.Components.Account
 @using Aquiis.Core.Constants
+@using Aquiis.Infrastructure.Data
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.EntityFrameworkCore
 
 @inject OrganizationService OrganizationService
+@inject ApplicationDbContext DbContext
 @inject UserContextService UserContext
 @inject UserManager<ApplicationUser> UserManager
 @inject NavigationManager Navigation
@@ -219,7 +221,7 @@
 
     private bool isLoading = true;
     private Organization? organization;
-    private List<UserOrganization> organizationUsers = new();
+    private List<OrganizationUser> organizationUsers = new();
     private Dictionary<string, string> userEmails = new();
     private bool showAddUserModal = false;
     private List<ApplicationUser> availableUsers = new();
@@ -275,19 +277,21 @@
 
         organizationUsers = await OrganizationService.GetOrganizationUsersAsync(Id);
 
-        // Load user emails
-        foreach (var userOrg in organizationUsers)
-        {
-            var user = await UserManager.FindByIdAsync(userOrg.UserId);
-            if (user != null)
-            {
-                userEmails[userOrg.UserId] = user.Email ?? "Unknown";
-            }
+        // Load user emails from UserProfile (single query)
+        var userIds = organizationUsers
+            .SelectMany(ou => new[] { ou.UserId, ou.GrantedBy })
+            .Distinct()
+            .ToList();
+
+        var profiles = await DbContext.UserProfiles
+            .Where(up => userIds.Contains(up.UserId))
+            .ToDictionaryAsync(up => up.UserId, up => up.Email);
 
-            var grantedByUser = await UserManager.FindByIdAsync(userOrg.GrantedBy);
-            if (grantedByUser != null)
+        foreach (var userId in userIds)
+        {
+            if (profiles.TryGetValue(userId, out var email))
             {
-                userEmails[userOrg.GrantedBy] = grantedByUser.Email ?? "Unknown";
+                userEmails[userId] = email;
             }
         }
     }
@@ -297,11 +301,24 @@
         if (organization == null) return;
 
         // Get all users who are NOT already assigned to this organization
-        var allUsers = await UserManager.Users.ToListAsync();
-        var nonSystemUsers = allUsers.Where(u => u.Id != ApplicationConstants.SystemUser.Id).ToList();
+        // Using UserProfile instead of UserManager.Users
+        var allUserProfiles = await DbContext.UserProfiles
+            .Where(up => up.UserId != ApplicationConstants.SystemUser.Id)
+            .ToListAsync();
+        
         var assignedUserIds = organizationUsers.Select(u => u.UserId).ToHashSet();
         
-        availableUsers = nonSystemUsers.Where(u => !assignedUserIds.Contains(u.Id)).ToList();
+        // Map UserProfile to ApplicationUser for compatibility
+        availableUsers = allUserProfiles
+            .Where(up => !assignedUserIds.Contains(up.UserId))
+            .Select(up => new ApplicationUser
+            {
+                Id = up.UserId,
+                Email = up.Email,
+                FirstName = up.FirstName,
+                LastName = up.LastName
+            })
+            .ToList();
     }
 
     private string GetUserEmail(string userId)
@@ -321,7 +338,7 @@
         };
     }
 
-    private async Task ChangeUserRole(UserOrganization userOrg, string newRole)
+    private async Task ChangeUserRole(OrganizationUser userOrg, string newRole)
     {
         try
         {
@@ -352,7 +369,7 @@
         }
     }
 
-    private async Task RevokeUserAccess(UserOrganization userOrg)
+    private async Task RevokeUserAccess(OrganizationUser userOrg)
     {
         if (!await JSRuntime.InvokeAsync<bool>("confirm", $"Are you sure you want to revoke {GetUserEmail(userOrg.UserId)}'s access to this organization?"))
         {
diff --git a/5-Aquiis.Professional/Features/Administration/Organizations/Pages/Organizations.razor b/5-Aquiis.Professional/Features/Administration/Organizations/Pages/Organizations.razor
index d1381f8..3f943d4 100644
--- a/5-Aquiis.Professional/Features/Administration/Organizations/Pages/Organizations.razor
+++ b/5-Aquiis.Professional/Features/Administration/Organizations/Pages/Organizations.razor
@@ -131,8 +131,8 @@
 
 @code {
     private bool isLoading = true;
-    private List<UserOrganization> organizations = new();
-    private List<UserOrganization> filteredOrganizations = new();
+    private List<OrganizationUser> organizations = new();
+    private List<OrganizationUser> filteredOrganizations = new();
     private string searchTerm = string.Empty;
 
     protected override async Task OnInitializedAsync()
diff --git a/5-Aquiis.Professional/Features/Administration/Organizations/Pages/ViewOrganization.razor b/5-Aquiis.Professional/Features/Administration/Organizations/Pages/ViewOrganization.razor
index fa47f94..e0edde6 100644
--- a/5-Aquiis.Professional/Features/Administration/Organizations/Pages/ViewOrganization.razor
+++ b/5-Aquiis.Professional/Features/Administration/Organizations/Pages/ViewOrganization.razor
@@ -2,15 +2,19 @@
 
 @using Aquiis.Core.Entities
 @using Aquiis.Application.Services
+@using Aquiis.Infrastructure.Data
 @using Aquiis.Professional.Shared.Services
 @using Aquiis.Professional.Shared.Components.Account
 @using Aquiis.Core.Constants
+@using Aquiis.UI.Shared.Features.Organizations
+@using Aquiis.UI.Shared.Components.Entities.Organizations
+@using Aquiis.UI.Shared.Components.Entities.OrganizationUsers
 @using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Identity
+@using Microsoft.EntityFrameworkCore
 
 @inject OrganizationService OrganizationService
 @inject UserContextService UserContext
-@inject UserManager<ApplicationUser> UserManager
+@inject ApplicationDbContext DbContext
 @inject NavigationManager Navigation
 @inject ToastService ToastService
 
@@ -51,175 +55,14 @@
     }
     else
     {
-        <div class="row">
-            <div class="col-md-8">
-                <!-- Organization Information Card -->
-                <div class="card mb-4">
-                    <div class="card-header">
-                        <h5 class="mb-0">Organization Information</h5>
-                    </div>
-                    <div class="card-body">
-                        <dl class="row">
-                            <dt class="col-sm-3">Organization Name:</dt>
-                            <dd class="col-sm-9"><strong>@organization.Name</strong></dd>
-
-                            <dt class="col-sm-3">Display Name:</dt>
-                            <dd class="col-sm-9">@(organization.DisplayName ?? "-")</dd>
-
-                            <dt class="col-sm-3">State:</dt>
-                            <dd class="col-sm-9">@(organization.State ?? "-")</dd>
-
-                            <dt class="col-sm-3">Status:</dt>
-                            <dd class="col-sm-9">
-                                @if (organization.IsActive)
-                                {
-                                    <span class="badge bg-success">Active</span>
-                                }
-                                else
-                                {
-                                    <span class="badge bg-secondary">Inactive</span>
-                                }
-                            </dd>
-
-                            <dt class="col-sm-3">Owner:</dt>
-                            <dd class="col-sm-9">@ownerEmail</dd>
-
-                            <dt class="col-sm-3">Created On:</dt>
-                            <dd class="col-sm-9">@organization.CreatedOn.ToString("MMMM dd, yyyy")</dd>
-
-                            @if (organization.LastModifiedOn.HasValue)
-                            {
-                                <dt class="col-sm-3">Last Modified:</dt>
-                                <dd class="col-sm-9">@organization.LastModifiedOn.Value.ToString("MMMM dd, yyyy")</dd>
-                            }
-                        </dl>
-                    </div>
-                </div>
-
-                <!-- Users with Access Card -->
-                <div class="card">
-                    <div class="card-header d-flex justify-content-between align-items-center">
-                        <h5 class="mb-0">Users with Access</h5>
-                        @if (isOwner || isAdministrator && isCurrentOrganization)
-                        {
-                            <button class="btn btn-sm btn-primary" @onclick="NavigateToManageUsers">
-                                <i class="bi bi-people"></i> Manage Users
-                            </button>
-                        }
-                    </div>
-                    <div class="card-body p-0">
-                        @if (!organizationUsers.Any())
-                        {
-                            <div class="p-3 text-center text-muted">
-                                No users assigned to this organization.
-                            </div>
-                        }
-                        else
-                        {
-                            <div class="table-responsive">
-                                <table class="table table-hover mb-0">
-                                    <thead>
-                                        <tr>
-                                            <th>User</th>
-                                            <th>Role</th>
-                                            <th>Granted By</th>
-                                            <th>Granted On</th>
-                                            <th>Status</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach (var userOrg in organizationUsers)
-                                        {
-                                            <tr>
-                                                <td>
-                                                    <div>
-                                                        <strong>@GetUserEmail(userOrg.UserId)</strong>
-                                                    </div>
-                                                </td>
-                                                <td>
-                                                    <span class="badge @GetRoleBadgeClass(userOrg.Role)">
-                                                        @userOrg.Role
-                                                    </span>
-                                                </td>
-                                                <td>@GetUserEmail(userOrg.GrantedBy)</td>
-                                                <td>@userOrg.GrantedOn.ToString("MMM dd, yyyy")</td>
-                                                <td>
-                                                    @if (userOrg.IsActive && userOrg.RevokedOn == null)
-                                                    {
-                                                        <span class="badge bg-success">Active</span>
-                                                    }
-                                                    else
-                                                    {
-                                                        <span class="badge bg-danger">Revoked</span>
-                                                    }
-                                                </td>
-                                            </tr>
-                                        }
-                                    </tbody>
-                                </table>
-                            </div>
-                        }
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-md-4">
-                <!-- Quick Stats Card -->
-                <div class="card mb-4">
-                    <div class="card-header">
-                        <h6 class="mb-0"><i class="bi bi-bar-chart"></i> Quick Stats</h6>
-                    </div>
-                    <div class="card-body">
-                        <dl class="row mb-0">
-                            <dt class="col-sm-7">Total Users:</dt>
-                            <dd class="col-sm-5 text-end"><strong>@organizationUsers.Count</strong></dd>
-
-                            <dt class="col-sm-7">Active Users:</dt>
-                            <dd class="col-sm-5 text-end"><strong>@organizationUsers.Count(u => u.IsActive)</strong></dd>
-
-                            <dt class="col-sm-7">Owners:</dt>
-                            <dd class="col-sm-5 text-end"><strong>@organizationUsers.Count(u => u.Role == ApplicationConstants.OrganizationRoles.Owner)</strong></dd>
-
-                            <dt class="col-sm-7">Administrators:</dt>
-                            <dd class="col-sm-5 text-end"><strong>@organizationUsers.Count(u => u.Role == ApplicationConstants.OrganizationRoles.Administrator)</strong></dd>
-
-                            <dt class="col-sm-7">Property Managers:</dt>
-                            <dd class="col-sm-5 text-end"><strong>@organizationUsers.Count(u => u.Role == ApplicationConstants.OrganizationRoles.PropertyManager)</strong></dd>
-                        </dl>
-                    </div>
-                </div>
-
-                <!-- Your Access Card -->
-                <div class="card">
-                    <div class="card-header">
-                        <h6 class="mb-0"><i class="bi bi-shield-check"></i> Your Access</h6>
-                    </div>
-                    <div class="card-body">
-                        <p><strong>Your Role:</strong></p>
-                        <p>
-                            <span class="badge @GetRoleBadgeClass(currentUserRole) fs-6">
-                                @currentUserRole
-                            </span>
-                        </p>
-                        <hr />
-                        <p class="small mb-0">
-                            @if (isOwner)
-                            {
-                                <span>You have full control over this organization as the Owner.</span>
-                            }
-                            else if (isAdministrator)
-                            {
-                                <span>You have administrative access to this organization.</span>
-                            }
-                            else
-                            {
-                                <span>You have limited access to this organization.</span>
-                            }
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
+        <OrganizationDetails 
+            OrganizationViewModel="@organizationViewModel"
+            CurrentUserRole="@currentUserRole"
+            CurrentUserViewModel="@currentUserViewModel"
+            IsOwner="@isOwner"
+            IsAdministrator="@isAdministrator"
+            IsCurrentOrganization="@isCurrentOrganization"
+            OnManageUsers="NavigateToManageUsers" />
     }
 </div>
 
@@ -229,15 +72,15 @@
 
     private bool isLoading = true;
     private Organization? organization;
-    private List<UserOrganization> organizationUsers = new();
-    private Dictionary<string, string> userEmails = new();
-    private string ownerEmail = string.Empty;
     private string currentUserRole = string.Empty;
     private bool isOwner = false;
     private bool isAdministrator = false;
 
     private bool isCurrentOrganization = false;
 
+    public OrganizationViewModel organizationViewModel = new();
+    public OrganizationUserViewModel currentUserViewModel = new();
+
     protected override async Task OnInitializedAsync()
     {
         await LoadOrganization();
@@ -270,34 +113,61 @@
             organization = await OrganizationService.GetOrganizationByIdAsync(Id);
             if (organization != null)
             {
-                // Get owner email
-                var owner = await UserManager.FindByIdAsync(organization.OwnerId);
-                ownerEmail = owner?.Email ?? "Unknown";
-
-                // Get users with access to this organization
-                organizationUsers = await OrganizationService.GetOrganizationUsersAsync(Id);
-
-                // Load user emails
-                foreach (var userOrg in organizationUsers)
-                {
-                    var user = await UserManager.FindByIdAsync(userOrg.UserId);
-                    if (user != null)
+                // Single-context query using UserProfile - no cross-context joins needed!
+                organizationViewModel.OrganizationUsers = await (
+                    from ou in DbContext.OrganizationUsers
+                    join profile in DbContext.UserProfiles on ou.UserId equals profile.UserId
+                    join grantedByProfile in DbContext.UserProfiles on ou.GrantedBy equals grantedByProfile.UserId into grantedByJoin
+                    from grantedByProfile in grantedByJoin.DefaultIfEmpty()
+                    where ou.OrganizationId == Id && ou.IsActive && !ou.IsDeleted
+                    select new OrganizationUserViewModel
                     {
-                        userEmails[userOrg.UserId] = user.Email ?? "Unknown";
+                        Id = ou.Id,
+                        OrganizationId = ou.OrganizationId,
+                        UserId = ou.UserId,
+                        Role = ou.Role,
+                        IsActive = ou.IsActive,
+                        GrantedOn = ou.GrantedOn,
+                        GrantedBy = ou.GrantedBy,
+                        GrantedByEmail = grantedByProfile != null ? grantedByProfile.Email : "System",
+                        Email = profile.Email,
+                        FirstName = profile.FirstName,
+                        LastName = profile.LastName,
+                        PhoneNumber = profile.PhoneNumber
                     }
+                ).ToListAsync();
 
-                    var grantedByUser = await UserManager.FindByIdAsync(userOrg.GrantedBy);
-                    if (grantedByUser != null)
-                    {
-                        userEmails[userOrg.GrantedBy] = grantedByUser.Email ?? "Unknown";
-                    }
-                }
+                // Find owner from the list
+                var owner = organizationViewModel.OrganizationUsers
+                    .FirstOrDefault(u => u.Role == ApplicationConstants.OrganizationRoles.Owner);
 
                 // Get current user's role
-                var currentUserOrg = organizationUsers.FirstOrDefault(u => u.UserId == userId);
+                var currentUserOrg = organizationViewModel.OrganizationUsers.FirstOrDefault(u => u.UserId == userId);
                 currentUserRole = currentUserOrg?.Role ?? "Unknown";
                 isOwner = currentUserRole == ApplicationConstants.OrganizationRoles.Owner;
                 isAdministrator = currentUserRole == ApplicationConstants.OrganizationRoles.Administrator;
+
+                organizationViewModel.Organization = organization;
+                organizationViewModel.OrganizationOwner = owner;
+                
+                // Get current user's profile from UserProfile table
+                var currentUserProfile = await DbContext.UserProfiles
+                    .FirstOrDefaultAsync(up => up.UserId == userId);
+                
+                if (currentUserProfile != null)
+                {
+                    currentUserViewModel = new OrganizationUserViewModel
+                    {
+                        UserId = userId,
+                        Email = currentUserProfile.Email,
+                        FirstName = currentUserProfile.FirstName,
+                        LastName = currentUserProfile.LastName,
+                        PhoneNumber = currentUserProfile.PhoneNumber,
+                        Role = currentUserRole,
+                        IsActive = currentUserOrg?.IsActive ?? false,
+                        GrantedOn = currentUserOrg?.GrantedOn ?? DateTime.UtcNow
+                    };
+                }
             }
         }
         catch (Exception ex)
@@ -310,22 +180,7 @@
         }
     }
 
-    private string GetUserEmail(string userId)
-    {
-        return userEmails.ContainsKey(userId) ? userEmails[userId] : "Unknown";
-    }
 
-    private string GetRoleBadgeClass(string role)
-    {
-        return role switch
-        {
-            ApplicationConstants.OrganizationRoles.Owner => "bg-primary",
-            ApplicationConstants.OrganizationRoles.Administrator => "bg-info",
-            ApplicationConstants.OrganizationRoles.PropertyManager => "bg-success",
-            ApplicationConstants.OrganizationRoles.User => "bg-secondary",
-            _ => "bg-secondary"
-        };
-    }
 
     private void NavigateToEdit()
     {
diff --git a/5-Aquiis.Professional/Features/Administration/Users/Manage.razor b/5-Aquiis.Professional/Features/Administration/Users/Manage.razor
index 1d08af6..7aed8fd 100644
--- a/5-Aquiis.Professional/Features/Administration/Users/Manage.razor
+++ b/5-Aquiis.Professional/Features/Administration/Users/Manage.razor
@@ -11,8 +11,10 @@
 @using Microsoft.AspNetCore.Components.Forms
 @using Aquiis.Professional.Shared.Components.Account
 @using Aquiis.Professional.Shared.Authorization
+@using Aquiis.Infrastructure.Data
 
 @inject UserManager<ApplicationUser> UserManager
+@inject ApplicationDbContext AppDbContext
 @inject UserContextService UserContext
 @inject RoleManager<IdentityRole> RoleManager
 @inject OrganizationService OrganizationService
@@ -405,13 +407,20 @@ else
     {
         try
         {
-            // Load all users with their roles
-            List<ApplicationUser>? users = await UserManager.Users.Where(u => u.ActiveOrganizationId == organizationId).ToListAsync();
+            // Load all users with their roles using UserProfile
+            var userProfiles = await AppDbContext.UserProfiles
+                .Where(up => up.ActiveOrganizationId == organizationId)
+                .ToListAsync();
+            
             allUsers.Clear();
             
-            foreach (var user in users)
+            foreach (var profile in userProfiles)
             {
-                // Get user's organization role from UserOrganizations table
+                // Get ApplicationUser from Identity for auth operations
+                var user = await UserManager.FindByIdAsync(profile.UserId);
+                if (user == null) continue;
+                
+                // Get user's organization role from OrganizationUsers table
                 var userOrgRole = await OrganizationService.GetUserRoleForOrganizationAsync(user.Id, organizationId);
                 var roles = userOrgRole != null ? new List<string> { userOrgRole } : new List<string>();
                 
@@ -419,7 +428,7 @@ else
                 
                 allUsers.Add(new UserInfo
                 {
-                    User = (ApplicationUser)user,
+                    User = user,
                     Roles = roles,
                     IsLockedOut = isLockedOut
                 });
diff --git a/5-Aquiis.Professional/Features/Calendar/Calendar.razor b/5-Aquiis.Professional/Features/Calendar/Calendar.razor
index 4222083..59c094a 100644
--- a/5-Aquiis.Professional/Features/Calendar/Calendar.razor
+++ b/5-Aquiis.Professional/Features/Calendar/Calendar.razor
@@ -9,6 +9,7 @@
 
 
 @using Microsoft.AspNetCore.Authorization
+@using System.ComponentModel.DataAnnotations
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @inject CalendarEventService CalendarEventService
 @inject CalendarSettingsService CalendarSettingsService
@@ -502,43 +503,43 @@
                     <h5 class="modal-title"><i class="bi bi-plus-circle"></i> Add Custom Event</h5>
                     <button type="button" class="btn-close" @onclick="CloseAddEventModal"></button>
                 </div>
-                <EditForm Model="newEvent" OnValidSubmit="SaveCustomEvent">
+                <EditForm Model="newEventViewModel" OnValidSubmit="SaveCustomEvent">
                     <DataAnnotationsValidator />
                     <ValidationSummary class="alert alert-danger" />
                     <div class="modal-body">
                         <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Title <span class="text-danger">*</span></label>
-                                <InputText @bind-Value="newEvent.Title" class="form-control" placeholder="Event title" />
-                                <ValidationMessage For="@(() => newEvent.Title)" />
+                                <InputText @bind-Value="newEventViewModel.Title" class="form-control" placeholder="Event title" />
+                                <ValidationMessage For="@(() => newEventViewModel.Title)" />
                             </div>
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Event Type <span class="text-danger">*</span></label>
-                                <InputSelect @bind-Value="newEvent.EventType" class="form-select">
+                                <InputSelect @bind-Value="newEventViewModel.EventType" @bind-Value:after="OnEventTypeChanged" class="form-select">
                                     <option value="">Select type...</option>
                                     @foreach (var type in CalendarEventTypes.GetAllTypes())
                                     {
                                         <option value="@type">@CalendarEventTypes.GetDisplayName(type)</option>
                                     }
                                 </InputSelect>
-                                <ValidationMessage For="@(() => newEvent.EventType)" />
+                                <ValidationMessage For="@(() => newEventViewModel.EventType)" />
                             </div>
                         </div>
                         <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Start Date & Time <span class="text-danger">*</span></label>
-                                <InputDate Type="InputDateType.DateTimeLocal" @bind-Value="newEvent.StartOn" class="form-control" />
-                                <ValidationMessage For="@(() => newEvent.StartOn)" />
+                                <InputDate Type="InputDateType.DateTimeLocal" @bind-Value="newEventViewModel.StartOn" class="form-control" />
+                                <ValidationMessage For="@(() => newEventViewModel.StartOn)" />
                             </div>
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">End Date & Time</label>
-                                <InputDate Type="InputDateType.DateTimeLocal" @bind-Value="newEvent.EndOn" class="form-control" />
+                                <InputDate Type="InputDateType.DateTimeLocal" @bind-Value="newEventViewModel.EndOn" class="form-control" />
                             </div>
                         </div>
                         <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Status</label>
-                                <InputSelect @bind-Value="newEvent.Status" class="form-select">
+                                <InputSelect @bind-Value="newEventViewModel.Status" class="form-select">
                                     <option value="Scheduled">Scheduled</option>
                                     <option value="Confirmed">Confirmed</option>
                                     <option value="Completed">Completed</option>
@@ -548,7 +549,7 @@
                             </div>
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Location</label>
-                                <InputText @bind-Value="newEvent.Location" class="form-control" placeholder="Event location" />
+                                <InputText @bind-Value="newEventViewModel.Location" class="form-control" placeholder="Event location" />
                             </div>
                         </div>
                         <div class="mb-3">
@@ -560,14 +561,14 @@
                                        @oninput="OnPropertySearchInput"
                                        placeholder="Search by address..."
                                        autocomplete="off" />
-                                @if (newEvent.PropertyId.HasValue && selectedPropertyForEvent != null)
+                                @if (newEventViewModel.PropertyId.HasValue && selectedPropertyForEvent != null)
                                 {
                                     <button type="button" class="btn btn-outline-secondary" @onclick="ClearPropertySelection">
                                         <i class="bi bi-x"></i>
                                     </button>
                                 }
                             </div>
-                            @if (newEvent.PropertyId.HasValue && selectedPropertyForEvent != null)
+                            @if (newEventViewModel.PropertyId.HasValue && selectedPropertyForEvent != null)
                             {
                                 <div class="alert alert-info mt-2 mb-0">
                                     <i class="bi bi-house"></i> <strong>@selectedPropertyForEvent.Address</strong>, @selectedPropertyForEvent.City, @selectedPropertyForEvent.State @selectedPropertyForEvent.ZipCode
@@ -589,17 +590,22 @@
                         </div>
                         <div class="mb-3">
                             <label class="form-label">Description</label>
-                            <InputTextArea @bind-Value="newEvent.Description" class="form-control" rows="3" placeholder="Event description" />
+                            <InputTextArea @bind-Value="newEventViewModel.Description" class="form-control" rows="3" placeholder="Event description" />
                         </div>
                         <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Color</label>
-                                <InputText type="color" @bind-Value="newEvent.Color" class="form-control form-control-color" />
+                                <InputText type="color" @bind-Value="newEventViewModel.Color" class="form-control form-control-color" />
                             </div>
                             <div class="col-md-6 mb-3">
                                 <label class="form-label">Icon</label>
-                                <InputSelect @bind-Value="newEvent.Icon" class="form-select">
-                                    <option value="bi-calendar-event">📅 Calendar Event</option>
+                                <InputSelect @bind-Value="newEventViewModel.Icon" class="form-select">
+                                    <option value="bi-calendar-event">📅 Calendar Event (Custom)</option>
+                                    <option value="bi-calendar-check">✅ Tour</option>
+                                    <option value="bi-clipboard-check">📋 Inspection</option>
+                                    <option value="bi-tools">🔧 Maintenance</option>
+                                    <option value="bi-calendar-x">❌ Lease Expiry</option>
+                                    <option value="bi-cash-coin">💰 Rent Due</option>
                                     <option value="bi-bell">🔔 Bell</option>
                                     <option value="bi-clock">🕐 Clock</option>
                                     <option value="bi-flag">🚩 Flag</option>
@@ -607,7 +613,6 @@
                                     <option value="bi-geo-alt">📍 Location Pin</option>
                                     <option value="bi-people">👥 People</option>
                                     <option value="bi-briefcase">💼 Briefcase</option>
-                                    <option value="bi-calendar-check">✅ Calendar Check</option>
                                 </InputSelect>
                                 <small class="text-muted">Choose an icon for this event</small>
                             </div>
@@ -637,7 +642,7 @@
     private List<string> selectedEventTypes = new();
     private bool showFilters = false;
     private bool showAddEventModal = false;
-    private CalendarEvent newEvent = new();
+    private CalendarEventViewModel newEventViewModel = new();
     private string propertySearchTerm = string.Empty;
     private List<Property> propertySearchResults = new();
     private bool showPropertySearchResults = false;
@@ -735,19 +740,12 @@
 
     private async Task ShowAddEventModal()
     {
-        var organizationId = await UserContext.GetActiveOrganizationIdAsync();
-        var userId = await UserContext.GetUserIdAsync();
-        
-        newEvent = new CalendarEvent
+        // Create fresh ViewModel instance - service will set tracking fields
+        newEventViewModel = new CalendarEventViewModel
         {
             StartOn = currentDate.Date.AddHours(9), // Default to 9 AM on current date
-            Color = "#6c757d",
-            Icon = "bi-calendar-event",
-            EventType = CalendarEventTypes.Custom,
             Status = "Scheduled",
-            OrganizationId = organizationId.HasValue ? organizationId.Value : Guid.Empty,
-            CreatedBy = !string.IsNullOrEmpty(userId) ? userId : string.Empty,
-            CreatedOn = DateTime.UtcNow
+            EventType = string.Empty
         };
         showAddEventModal = true;
     }
@@ -755,7 +753,7 @@
     private void CloseAddEventModal()
     {
         showAddEventModal = false;
-        newEvent = new();
+        newEventViewModel = new();
         propertySearchTerm = string.Empty;
         propertySearchResults.Clear();
         showPropertySearchResults = false;
@@ -787,7 +785,7 @@
     private void SelectProperty(Property property)
     {
         selectedPropertyForEvent = property;
-        newEvent.PropertyId = property.Id;
+        newEventViewModel.PropertyId = property.Id;
         propertySearchTerm = $"{property.Address}, {property.City}, {property.State} {property.ZipCode}";
         showPropertySearchResults = false;
         propertySearchResults.Clear();
@@ -796,23 +794,49 @@
     private void ClearPropertySelection()
     {
         selectedPropertyForEvent = null;
-        newEvent.PropertyId = null;
+        newEventViewModel.PropertyId = null;
         propertySearchTerm = string.Empty;
         propertySearchResults.Clear();
         showPropertySearchResults = false;
     }
 
+    private void OnEventTypeChanged()
+    {
+        if (!string.IsNullOrEmpty(newEventViewModel.EventType))
+        {
+            // Auto-update color and icon based on event type
+            newEventViewModel.Color = CalendarEventTypes.GetColor(newEventViewModel.EventType);
+            newEventViewModel.Icon = CalendarEventTypes.GetIcon(newEventViewModel.EventType);
+        }
+    }
+
     private async Task SaveCustomEvent()
     {
         try
         {
             // Calculate duration if end time is set
-            if (newEvent.EndOn.HasValue)
+            if (newEventViewModel.EndOn.HasValue)
             {
-                newEvent.DurationMinutes = (int)(newEvent.EndOn.Value - newEvent.StartOn).TotalMinutes;
+                newEventViewModel.DurationMinutes = (int)(newEventViewModel.EndOn.Value - newEventViewModel.StartOn).TotalMinutes;
             }
 
-            await CalendarEventService.CreateCustomEventAsync(newEvent);
+            // Convert ViewModel to Entity for service
+            var calendarEvent = new CalendarEvent
+            {
+                Title = newEventViewModel.Title,
+                StartOn = newEventViewModel.StartOn,
+                EndOn = newEventViewModel.EndOn,
+                DurationMinutes = newEventViewModel.DurationMinutes,
+                EventType = newEventViewModel.EventType,
+                Status = newEventViewModel.Status,
+                Description = newEventViewModel.Description,
+                PropertyId = newEventViewModel.PropertyId,
+                Location = newEventViewModel.Location,
+                Color = newEventViewModel.Color,
+                Icon = newEventViewModel.Icon
+            };
+
+            await CalendarEventService.CreateCustomEventAsync(calendarEvent);
             
             ToastService.ShowSuccess("Event created successfully");
             CloseAddEventModal();
@@ -951,8 +975,9 @@
                 
                 builder.OpenElement(70, "div");
                 builder.OpenElement(71, "span");
-                builder.AddAttribute(72, "class", $"badge bg-secondary");
-                builder.AddContent(73, CalendarEventTypes.GetDisplayName(evt.EventType));
+                builder.AddAttribute(72, "class", "badge");
+                builder.AddAttribute(73, "style", $"background-color: {CalendarEventTypes.GetColor(evt.EventType)}; color: white;");
+                builder.AddContent(74, CalendarEventTypes.GetDisplayName(evt.EventType));
                 builder.CloseElement();
                 if (!string.IsNullOrEmpty(evt.Status))
                 {
@@ -1059,8 +1084,8 @@
                     builder.OpenElement(index + 40, "small");
                     builder.AddAttribute(index + 41, "class", "d-block text-truncate text-muted");
                     builder.OpenElement(index + 42, "span");
-                    builder.AddAttribute(index + 43, "class", "badge bg-secondary" );
-                    builder.AddAttribute(index + 44, "style", "font-size: 0.65rem;");
+                    builder.AddAttribute(index + 43, "class", "badge");
+                    builder.AddAttribute(index + 44, "style", $"font-size: 0.65rem; background-color: {CalendarEventTypes.GetColor(evt.EventType)}; color: white;");
                     builder.AddContent(index + 45, CalendarEventTypes.GetDisplayName(evt.EventType));
                     builder.CloseElement();
                     if (!string.IsNullOrEmpty(evt.Status))
@@ -1667,4 +1692,54 @@
         
         return "bg-secondary";
     }
+
+    /// <summary>
+    /// View model for creating/editing calendar events from the UI.
+    /// Excludes tracking fields (OrganizationId, CreatedBy, etc.) which are set by the service.
+    /// </summary>
+    public class CalendarEventViewModel
+    {
+        [Required]
+        [StringLength(200)]
+        [Display(Name = "Title")]
+        public string Title { get; set; } = string.Empty;
+
+        [Required]
+        [Display(Name = "Start Date & Time")]
+        public DateTime StartOn { get; set; } = DateTime.Now;
+
+        [Display(Name = "End Date & Time")]
+        public DateTime? EndOn { get; set; }
+
+        [Display(Name = "Duration (Minutes)")]
+        public int DurationMinutes { get; set; }
+
+        [Required]
+        [StringLength(50)]
+        [Display(Name = "Event Type")]
+        public string EventType { get; set; } = string.Empty;
+
+        [StringLength(50)]
+        [Display(Name = "Status")]
+        public string Status { get; set; } = "Scheduled";
+
+        [StringLength(2000)]
+        [Display(Name = "Description")]
+        public string? Description { get; set; }
+
+        [Display(Name = "Property")]
+        public Guid? PropertyId { get; set; }
+
+        [StringLength(500)]
+        [Display(Name = "Location")]
+        public string? Location { get; set; }
+
+        [StringLength(20)]
+        [Display(Name = "Color")]
+        public string Color { get; set; } = "#6c757d";
+
+        [StringLength(50)]
+        [Display(Name = "Icon")]
+        public string Icon { get; set; } = "bi-calendar-event";
+    }
 }
diff --git a/5-Aquiis.Professional/Features/Calendar/CalendarListView.razor b/5-Aquiis.Professional/Features/Calendar/CalendarListView.razor
index 5373ea2..6e10dd8 100644
--- a/5-Aquiis.Professional/Features/Calendar/CalendarListView.razor
+++ b/5-Aquiis.Professional/Features/Calendar/CalendarListView.razor
@@ -113,7 +113,7 @@
                                         </td>
                                         <td>
                                             <i class="bi @evt.Icon" style="color: @evt.Color;"></i>
-                                            <span class="badge bg-secondary ms-1">@CalendarEventTypes.GetDisplayName(evt.EventType)</span>
+                                            <span class="badge ms-1" style="background-color: @CalendarEventTypes.GetColor(evt.EventType); color: white;">@CalendarEventTypes.GetDisplayName(evt.EventType)</span>
                                         </td>
                                         <td>@evt.Title</td>
                                         <td>
diff --git a/5-Aquiis.Professional/Features/Notifications/Pages/Index.razor b/5-Aquiis.Professional/Features/Notifications/Pages/Index.razor
index 8eeeec1..4d36458 100644
--- a/5-Aquiis.Professional/Features/Notifications/Pages/Index.razor
+++ b/5-Aquiis.Professional/Features/Notifications/Pages/Index.razor
@@ -5,4 +5,4 @@
 
 <PageTitle>Notification Center</PageTitle>
 
-<Aquiis.UI.Shared.Features.Notifications.NotificationCenter GetEntityRoute="@EntityRouteHelper.GetEntityRoute" />
+<Aquiis.UI.Shared.Components.Notifications.NotificationCenter GetEntityRoute="@EntityRouteHelper.GetEntityRoute" />
diff --git a/5-Aquiis.Professional/Features/Notifications/Pages/Preferences.razor b/5-Aquiis.Professional/Features/Notifications/Pages/Preferences.razor
index bb58200..a955d70 100644
--- a/5-Aquiis.Professional/Features/Notifications/Pages/Preferences.razor
+++ b/5-Aquiis.Professional/Features/Notifications/Pages/Preferences.razor
@@ -6,4 +6,4 @@
 
 <PageTitle>Notification Preferences - Aquiis</PageTitle>
 
-<Aquiis.UI.Shared.Features.Notifications.NotificationPreferences ToastService="@ToastService" />
+<Aquiis.UI.Shared.Components.Notifications.NotificationPreferences ToastService="@ToastService" />
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/Create.razor b/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/Create.razor
index 1608f35..7472452 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/Create.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/Create.razor
@@ -1,317 +1,5 @@
 @page "/propertymanagement/invoices/create"
-@using Aquiis.Professional.Features.PropertyManagement
-@using Aquiis.Core.Entities
-@using Aquiis.Core.Validation
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Forms
-@using System.ComponentModel.DataAnnotations
-@inject NavigationManager NavigationManager
-@inject InvoiceService InvoiceService
-@inject LeaseService LeaseService
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Create Invoice - Property Management</PageTitle>
-
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <h1><i class="bi bi-receipt"></i> Create Invoice</h1>
-    <button class="btn btn-outline-secondary" @onclick="Cancel">
-        <i class="bi bi-x-lg"></i> Cancel
-    </button>
-</div>
-
-@if (errorMessage != null)
-{
-    <div class="alert alert-danger alert-dismissible fade show" role="alert">
-        @errorMessage
-        <button type="button" class="btn-close" @onclick="() => errorMessage = null"></button>
-    </div>
-}
-
-@if (successMessage != null)
-{
-    <div class="alert alert-success alert-dismissible fade show" role="alert">
-        @successMessage
-        <button type="button" class="btn-close" @onclick="() => successMessage = null"></button>
-    </div>
-}
-
-<div class="row">
-    <div class="col-md-8">
-        <div class="card">
-            <div class="card-header">
-                <h5 class="mb-0">Invoice Information</h5>
-            </div>
-            <div class="card-body">
-                <EditForm Model="invoiceModel" OnValidSubmit="HandleCreateInvoice">
-                    <DataAnnotationsValidator />
-                    <ValidationSummary class="text-danger" />
-
-                    <div class="mb-3">
-                        <label class="form-label">Invoice Number</label>
-                        <InputText @bind-Value="invoiceModel.InvoiceNumber" class="form-control" readonly />
-                        <ValidationMessage For="() => invoiceModel.InvoiceNumber" class="text-danger" />
-                    </div>
-
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <label class="form-label">Invoice Date <span class="text-danger">*</span></label>
-                            <InputDate @bind-Value="invoiceModel.InvoicedOn" class="form-control" />
-                            <ValidationMessage For="() => invoiceModel.InvoicedOn" class="text-danger" />
-                        </div>
-                        <div class="col-md-6">
-                            <label class="form-label">Due Date <span class="text-danger">*</span></label>
-                            <InputDate @bind-Value="invoiceModel.DueOn" class="form-control" />
-                            <ValidationMessage For="() => invoiceModel.DueOn" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="mb-3">
-                        <label class="form-label">Lease <span class="text-danger">*</span></label>
-                        <InputSelect @bind-Value="invoiceModel.LeaseId" @bind-Value:after="OnLeaseSelected" class="form-select">
-                            <option value="0">-- Select Lease --</option>
-                            @if (leases != null)
-                            {
-                                @foreach (var lease in leases)
-                                {
-                                    <option value="@lease.Id">
-                                        @lease.Property?.Address - @lease.Tenant?.FullName (@lease.MonthlyRent.ToString("C")/month)
-                                    </option>
-                                }
-                            }
-                        </InputSelect>
-                        <ValidationMessage For="() => invoiceModel.LeaseId" class="text-danger" />
-                    </div>
-
-                    <div class="mb-3">
-                        <label class="form-label">Description <span class="text-danger">*</span></label>
-                        <InputText @bind-Value="invoiceModel.Description" class="form-control" placeholder="e.g., Monthly Rent - January 2025" />
-                        <ValidationMessage For="() => invoiceModel.Description" class="text-danger" />
-                    </div>
-
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <label class="form-label">Amount <span class="text-danger">*</span></label>
-                            <div class="input-group">
-                                <span class="input-group-text">$</span>
-                                <InputNumber @bind-Value="invoiceModel.Amount" class="form-control" step="0.01" />
-                            </div>
-                            <ValidationMessage For="() => invoiceModel.Amount" class="text-danger" />
-                        </div>
-                        <div class="col-md-6">
-                            <label class="form-label">Status</label>
-                            <InputSelect @bind-Value="invoiceModel.Status" class="form-select">
-                                <option value="Pending">Pending</option>
-                                <option value="Paid">Paid</option>
-                                <option value="Cancelled">Cancelled</option>
-                            </InputSelect>
-                            <ValidationMessage For="() => invoiceModel.Status" class="text-danger" />
-                        </div>
-                    </div>
-
-                    @if (invoiceModel.Status == "Paid")
-                    {
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="form-label">Paid Amount</label>
-                                <div class="input-group">
-                                    <span class="input-group-text">$</span>
-                                    <InputNumber @bind-Value="invoiceModel.AmountPaid" class="form-control" step="0.01" />
-                                </div>
-                                <ValidationMessage For="() => invoiceModel.AmountPaid" class="text-danger" />
-                            </div>
-                            <div class="col-md-6">
-                                <label class="form-label">Paid On</label>
-                                <InputDate @bind-Value="invoiceModel.PaidOn" class="form-control" />
-                                <ValidationMessage For="() => invoiceModel.PaidOn" class="text-danger" />
-                            </div>
-                        </div>
-                    }
-
-                    <div class="mb-3">
-                        <label class="form-label">Notes</label>
-                        <InputTextArea @bind-Value="invoiceModel.Notes" class="form-control" rows="3" placeholder="Additional notes or comments..." />
-                        <ValidationMessage For="() => invoiceModel.Notes" class="text-danger" />
-                    </div>
-
-                    <div class="d-flex gap-2">
-                        <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                            }
-                            <i class="bi bi-check-lg"></i> Create Invoice
-                        </button>
-                        <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                    </div>
-                </EditForm>
-            </div>
-        </div>
-    </div>
-
-    <div class="col-md-4">
-        <div class="card">
-            <div class="card-header">
-                <h5 class="mb-0">Tips</h5>
-            </div>
-            <div class="card-body">
-                <ul class="list-unstyled">
-                    <li class="mb-2">
-                        <i class="bi bi-info-circle text-primary"></i>
-                        Invoice numbers are automatically generated
-                    </li>
-                    <li class="mb-2">
-                        <i class="bi bi-info-circle text-primary"></i>
-                        Select an active lease to create an invoice
-                    </li>
-                    <li class="mb-2">
-                        <i class="bi bi-info-circle text-primary"></i>
-                        The amount defaults to the lease's monthly rent
-                    </li>
-                    <li class="mb-2">
-                        <i class="bi bi-info-circle text-primary"></i>
-                        Use clear descriptions to identify the invoice purpose
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
-
-@code {
-    private InvoiceModel invoiceModel = new InvoiceModel();
-    private List<Lease>? leases;
-    private string? errorMessage;
-    private string? successMessage;
-    private bool isSubmitting = false;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? LeaseId { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadLeases();
-        invoiceModel.InvoiceNumber = await InvoiceService.GenerateInvoiceNumberAsync();
-        invoiceModel.InvoicedOn = DateTime.Now;
-        invoiceModel.DueOn = DateTime.Now.AddDays(30);
-        if (LeaseId.HasValue)
-        {
-            invoiceModel.LeaseId = LeaseId.Value;
-            OnLeaseSelected();
-        }
-    }
-
-    private async Task LoadLeases()
-    {
-        var allLeases = await LeaseService.GetAllAsync();
-        leases = allLeases.Where(l => l.Status == "Active").ToList();
-    }
-
-    private void OnLeaseSelected()
-    {
-        if (invoiceModel.LeaseId != Guid.Empty)
-        {
-            var selectedLease = leases?.FirstOrDefault(l => l.Id == invoiceModel.LeaseId);
-            if (selectedLease != null)
-            {
-                invoiceModel.Amount = selectedLease.MonthlyRent;
-                
-                // Generate description based on current month/year
-                var currentMonth = DateTime.Now.ToString("MMMM yyyy");
-                invoiceModel.Description = $"Monthly Rent - {currentMonth}";
-            }
-        }
-    }
-
-    private async Task HandleCreateInvoice()
-    {
-        try
-        {
-            isSubmitting = true;
-            errorMessage = null;
-            successMessage = null;
-
-            var authState = await AuthenticationStateTask;
-            var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-            if (string.IsNullOrEmpty(userId))
-            {
-                errorMessage = "User not authenticated.";
-                return;
-            }
-
-            var invoice = new Invoice
-            {
-                LeaseId = invoiceModel.LeaseId,
-                InvoiceNumber = invoiceModel.InvoiceNumber,
-                InvoicedOn = invoiceModel.InvoicedOn,
-                DueOn = invoiceModel.DueOn,
-                Amount = invoiceModel.Amount,
-                Description = invoiceModel.Description,
-                Status = invoiceModel.Status,
-                AmountPaid = invoiceModel.Status == "Paid" ? invoiceModel.AmountPaid : 0,
-                PaidOn = invoiceModel.Status == "Paid" ? invoiceModel.PaidOn : null,
-                Notes = invoiceModel.Notes ?? string.Empty
-            };
-
-            await InvoiceService.CreateAsync(invoice);
-
-            NavigationManager.NavigateTo("/propertymanagement/invoices");
-        }
-        catch (Exception ex)
-        {
-            errorMessage = $"Error creating invoice: {ex.Message}";
-        }
-        finally
-        {
-            isSubmitting = false;
-        }
-    }
-
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/invoices");
-    }
-
-    public class InvoiceModel
-    {
-        [RequiredGuid(ErrorMessage = "Lease is required")]
-        public Guid LeaseId { get; set; }
-
-        [Required(ErrorMessage = "Invoice number is required")]
-        [StringLength(50, ErrorMessage = "Invoice number cannot exceed 50 characters")]
-        public string InvoiceNumber { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Invoice date is required")]
-        public DateTime InvoicedOn { get; set; } = DateTime.Now;
-
-        [Required(ErrorMessage = "Due date is required")]
-        public DateTime DueOn { get; set; } = DateTime.Now.AddDays(30);
-
-        [Required(ErrorMessage = "Amount is required")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Amount must be greater than 0")]
-        public decimal Amount { get; set; }
-
-        [Required(ErrorMessage = "Description is required")]
-        [StringLength(100, ErrorMessage = "Description cannot exceed 100 characters")]
-        public string Description { get; set; } = string.Empty;
-
-        [Required]
-        [StringLength(50)]
-        public string Status { get; set; } = "Pending";
-
-        [Range(0, double.MaxValue, ErrorMessage = "Amount paid cannot be negative")]
-        public decimal AmountPaid { get; set; }
-
-        public DateTime? PaidOn { get; set; }
-
-        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
-        public string? Notes { get; set; }
-    }
-}
+<Aquiis.UI.Shared.Features.PropertyManagement.Invoices.CreateForm />
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/Edit.razor b/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/Edit.razor
index 7030a48..4b5ce36 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/Edit.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/Edit.razor
@@ -1,396 +1,9 @@
 @page "/propertymanagement/invoices/edit/{Id:guid}"
-
-@using Aquiis.Professional.Features.PropertyManagement
-@using Aquiis.Core.Entities
-@using Aquiis.Core.Validation
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Forms
-@using System.ComponentModel.DataAnnotations
-@inject NavigationManager NavigationManager
-@inject InvoiceService InvoiceService
-@inject LeaseService LeaseService
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Edit Invoice - Property Management</PageTitle>
-
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <h1><i class="bi bi-receipt"></i> Edit Invoice</h1>
-    <button class="btn btn-outline-secondary" @onclick="Cancel">
-        <i class="bi bi-x-lg"></i> Cancel
-    </button>
-</div>
-
-@if (errorMessage != null)
-{
-    <div class="alert alert-danger alert-dismissible fade show" role="alert">
-        @errorMessage
-        <button type="button" class="btn-close" @onclick="() => errorMessage = null"></button>
-    </div>
-}
-
-@if (successMessage != null)
-{
-    <div class="alert alert-success alert-dismissible fade show" role="alert">
-        @successMessage
-        <button type="button" class="btn-close" @onclick="() => successMessage = null"></button>
-    </div>
-}
-
-@if (invoice == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else
-{
-    <div class="row">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Invoice Information</h5>
-                </div>
-                <div class="card-body">
-                    <EditForm Model="invoiceModel" OnValidSubmit="UpdateInvoice">
-                        <DataAnnotationsValidator />
-                        <ValidationSummary class="text-danger" />
-
-                        <div class="mb-3">
-                            <label class="form-label">Invoice Number</label>
-                            <InputText @bind-Value="invoiceModel.InvoiceNumber" class="form-control" readonly />
-                            <ValidationMessage For="() => invoiceModel.InvoiceNumber" class="text-danger" />
-                        </div>
-
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="form-label">Invoice Date <span class="text-danger">*</span></label>
-                                <InputDate @bind-Value="invoiceModel.InvoicedOn" class="form-control" />
-                                <ValidationMessage For="() => invoiceModel.InvoicedOn" class="text-danger" />
-                            </div>
-                            <div class="col-md-6">
-                                <label class="form-label">Due Date <span class="text-danger">*</span></label>
-                                <InputDate @bind-Value="invoiceModel.DueOn" class="form-control" />
-                                <ValidationMessage For="() => invoiceModel.DueOn" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="mb-3">
-                            <label class="form-label">Lease</label>
-                            <InputSelect @bind-Value="invoiceModel.LeaseId" class="form-select" disabled>
-                                @if (leases != null)
-                                {
-                                    @foreach (var lease in leases)
-                                    {
-                                        <option value="@lease.Id">
-                                            @lease.Property?.Address - @lease.Tenant?.FullName (@lease.MonthlyRent.ToString("C")/month)
-                                        </option>
-                                    }
-                                }
-                            </InputSelect>
-                            <small class="text-muted">Lease cannot be changed after invoice creation</small>
-                        </div>
-
-                        <div class="mb-3">
-                            <label class="form-label">Description <span class="text-danger">*</span></label>
-                            <InputText @bind-Value="invoiceModel.Description" class="form-control" />
-                            <ValidationMessage For="() => invoiceModel.Description" class="text-danger" />
-                        </div>
-
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="form-label">Amount <span class="text-danger">*</span></label>
-                                <div class="input-group">
-                                    <span class="input-group-text">$</span>
-                                    <InputNumber @bind-Value="invoiceModel.Amount" class="form-control" step="0.01" />
-                                </div>
-                                <ValidationMessage For="() => invoiceModel.Amount" class="text-danger" />
-                            </div>
-                            <div class="col-md-6">
-                                <label class="form-label">Status</label>
-                                <InputSelect @bind-Value="invoiceModel.Status" class="form-select">
-                                    <option value="Pending">Pending</option>
-                                    <option value="Paid">Paid</option>
-                                    <option value="Overdue">Overdue</option>
-                                    <option value="Cancelled">Cancelled</option>
-                                </InputSelect>
-                                <ValidationMessage For="() => invoiceModel.Status" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="form-label">Paid Amount</label>
-                                <div class="input-group">
-                                    <span class="input-group-text">$</span>
-                                    <InputNumber @bind-Value="invoiceModel.AmountPaid" class="form-control" step="0.01" />
-                                </div>
-                                <ValidationMessage For="() => invoiceModel.AmountPaid" class="text-danger" />
-                                <small class="text-muted">Balance Due: @((invoiceModel.Amount - invoiceModel.AmountPaid).ToString("C"))</small>
-                            </div>
-                            <div class="col-md-6">
-                                <label class="form-label">Paid Date</label>
-                                <InputDate @bind-Value="invoiceModel.PaidOn" class="form-control" />
-                                <ValidationMessage For="() => invoiceModel.PaidOn" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="mb-3">
-                            <label class="form-label">Notes</label>
-                            <InputTextArea @bind-Value="invoiceModel.Notes" class="form-control" rows="3" />
-                            <ValidationMessage For="() => invoiceModel.Notes" class="text-danger" />
-                        </div>
-
-                        <div class="d-flex gap-2">
-                            <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                                @if (isSubmitting)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                                }
-                                <i class="bi bi-check-lg"></i> Save Changes
-                            </button>
-                            <button type="button" class="btn btn-outline-primary" @onclick="ViewInvoice">View Invoice</button>
-                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                        </div>
-                    </EditForm>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-md-4">
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Invoice Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="ViewInvoice">
-                            <i class="bi bi-eye"></i> View Invoice
-                        </button>
-                        @if (invoice.Status != "Paid" && invoice.BalanceDue > 0)
-                        {
-                            <button class="btn btn-outline-success" @onclick="RecordPayment">
-                                <i class="bi bi-cash"></i> Record Payment
-                            </button>
-                        }
-                        <button class="btn btn-outline-info" @onclick="ViewLease">
-                            <i class="bi bi-file-text"></i> View Lease
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Invoice Summary</h5>
-                </div>
-                <div class="card-body">
-                    <div class="mb-2">
-                        <small class="text-muted">Status</small>
-                        <div>
-                            <span class="badge @GetStatusBadgeClass(invoice.Status)">@invoice.Status</span>
-                        </div>
-                    </div>
-                    <div class="mb-2">
-                        <small class="text-muted">Invoice Amount</small>
-                        <div class="fw-bold">@invoice.Amount.ToString("C")</div>
-                    </div>
-                    <div class="mb-2">
-                        <small class="text-muted">Paid Amount</small>
-                        <div class="text-success">@invoice.AmountPaid.ToString("C")</div>
-                    </div>
-                    <div class="mb-2">
-                        <small class="text-muted">Balance Due</small>
-                        <div class="fw-bold @(invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
-                            @invoice.BalanceDue.ToString("C")
-                        </div>
-                    </div>
-                    @if (invoice.IsOverdue)
-                    {
-                        <div class="alert alert-danger mb-0 mt-2">
-                            <small>
-                                <i class="bi bi-exclamation-triangle"></i>
-                                @invoice.DaysOverdue days overdue
-                            </small>
-                        </div>
-                    }
-                </div>
-            </div>
-        </div>
-    </div>
-}
+<Aquiis.UI.Shared.Features.PropertyManagement.Invoices.EditForm InvoiceId="@Id" />
 
 @code {
-    [Parameter]
-    public Guid Id { get; set; }
-
-    private Invoice? invoice;
-    private InvoiceModel invoiceModel = new InvoiceModel();
-    private List<Lease>? leases;
-    private string? errorMessage;
-    private string? successMessage;
-    private bool isSubmitting = false;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadInvoice();
-        await LoadLeases();
-    }
-
-    private async Task LoadInvoice()
-    {
-        invoice = await InvoiceService.GetByIdAsync(Id);
-        
-        if (invoice != null)
-        {
-            invoiceModel = new InvoiceModel
-            {
-                LeaseId = invoice.LeaseId,
-                InvoiceNumber = invoice.InvoiceNumber,
-                InvoicedOn = invoice.InvoicedOn,
-                DueOn = invoice.DueOn,
-                Amount = invoice.Amount,
-                Description = invoice.Description,
-                Status = invoice.Status,
-                AmountPaid = invoice.AmountPaid,
-                PaidOn = invoice.PaidOn,
-                Notes = invoice.Notes
-            };
-        }
-    }
-
-    private async Task LoadLeases()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (!string.IsNullOrEmpty(userId))
-        {
-            leases = await LeaseService.GetAllAsync();
-        }
-    }
-
-    private async Task UpdateInvoice()
-    {
-        try
-        {
-            isSubmitting = true;
-            errorMessage = null;
-            successMessage = null;
-
-            var authState = await AuthenticationStateTask;
-            var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-            if (string.IsNullOrEmpty(userId))
-            {
-                errorMessage = "User not authenticated.";
-                return;
-            }
-
-            if (invoice == null)
-            {
-                errorMessage = "Invoice not found.";
-                return;
-            }
-
-            invoice.InvoicedOn = invoiceModel.InvoicedOn;
-            invoice.DueOn = invoiceModel.DueOn;
-            invoice.Amount = invoiceModel.Amount;
-            invoice.Description = invoiceModel.Description;
-            invoice.Status = invoiceModel.Status;
-            invoice.AmountPaid = invoiceModel.AmountPaid;
-            invoice.PaidOn = invoiceModel.PaidOn;
-            invoice.Notes = invoiceModel.Notes ?? string.Empty;
-
-            await InvoiceService.UpdateAsync(invoice);
-
-            successMessage = "Invoice updated successfully!";
-        }
-        catch (Exception ex)
-        {
-            errorMessage = $"Error updating invoice: {ex.Message}";
-        }
-        finally
-        {
-            isSubmitting = false;
-        }
-    }
-
-    private string GetStatusBadgeClass(string status)
-    {
-        return status switch
-        {
-            "Paid" => "bg-success",
-            "Pending" => "bg-warning",
-            "Overdue" => "bg-danger",
-            "Cancelled" => "bg-secondary",
-            _ => "bg-info"
-        };
-    }
-
-    private void ViewInvoice()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/invoices/{Id}");
-    }
-
-    private void ViewLease()
-    {
-        if (invoice?.LeaseId != null)
-        {
-            NavigationManager.NavigateTo($"/propertymanagement/leases/{invoice.LeaseId}");
-        }
-    }
-
-    private void RecordPayment()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/payments/create?invoiceId={Id}");
-    }
-
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/invoices");
-    }
-
-    public class InvoiceModel
-    {
-        [RequiredGuid(ErrorMessage = "Lease is required")]
-        public Guid LeaseId { get; set; }
-
-        [Required(ErrorMessage = "Invoice number is required")]
-        [StringLength(50, ErrorMessage = "Invoice number cannot exceed 50 characters")]
-        public string InvoiceNumber { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Invoice date is required")]
-        public DateTime InvoicedOn { get; set; }
-
-        [Required(ErrorMessage = "Due date is required")]
-        public DateTime DueOn { get; set; }
-
-        [Required(ErrorMessage = "Amount is required")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Amount must be greater than 0")]
-        public decimal Amount { get; set; }
-
-        [Required(ErrorMessage = "Description is required")]
-        [StringLength(100, ErrorMessage = "Description cannot exceed 100 characters")]
-        public string Description { get; set; } = string.Empty;
-
-        [Required]
-        [StringLength(50)]
-        public string Status { get; set; } = "Pending";
-
-        [Range(0, double.MaxValue, ErrorMessage = "Paid amount cannot be negative")]
-        public decimal AmountPaid { get; set; }
-
-        public DateTime? PaidOn { get; set; }
-
-        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
-        public string? Notes { get; set; }
-    }
+    [Parameter] public Guid Id { get; set; }
 }
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/Index.razor b/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/Index.razor
index d2d680e..e28d304 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/Index.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/Index.razor
@@ -1,592 +1,5 @@
 @page "/propertymanagement/invoices"
-@using Aquiis.Professional.Features.PropertyManagement
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Forms
-@inject NavigationManager Navigation
-@inject InvoiceService InvoiceService
-@inject IJSRuntime JSRuntime
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Invoices - Property Management</PageTitle>
-
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <h1><span class="bi bi-receipt" aria-hidden="true"></span> Invoices</h1>
-    <button class="btn btn-primary" @onclick="CreateInvoice">
-        <i class="bi bi-plus-lg"></i> Create Invoice
-    </button>
-</div>
-
-@if (invoices == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!invoices.Any())
-{
-    <div class="alert alert-info">
-        <h4>No Invoices Found</h4>
-        <p>Get started by creating your first invoice.</p>
-        <button class="btn btn-primary" @onclick="CreateInvoice">Create First Invoice</button>
-    </div>
-}
-else
-{
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="input-group">
-                <span class="input-group-text"><i class="bi bi-search"></i></span>
-                <input type="text" class="form-control" placeholder="Search invoices..." @bind="searchTerm" @onkeyup="FilterInvoices" />
-            </div>
-        </div>
-        <div class="col-md-3">
-            <select class="form-select" @bind="selectedStatus" @bind:after="FilterInvoices">
-                <option value="">All Statuses</option>
-                <option value="Pending">Pending</option>
-                <option value="Paid">Paid</option>
-                <option value="Overdue">Overdue</option>
-                <option value="Cancelled">Cancelled</option>
-            </select>
-        </div>
-        <div class="col-md-3">
-            <div class="form-check form-switch pt-2">
-                <input class="form-check-input" type="checkbox" id="groupByProperty" @bind="groupByProperty" @bind:after="FilterInvoices">
-                <label class="form-check-label" for="groupByProperty">
-                    Group by Property
-                </label>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <button class="btn btn-outline-secondary" @onclick="ClearFilters">
-                <i class="bi bi-x-circle"></i> Clear Filters
-            </button>
-        </div>
-    </div>
-
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="card text-white bg-warning">
-                <div class="card-body">
-                    <h6>Pending</h6>
-                    <h4>@pendingCount</h4>
-                    <small>@pendingAmount.ToString("C")</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-success">
-                <div class="card-body">
-                    <h6>Paid</h6>
-                    <h4>@paidCount</h4>
-                    <small>@paidAmount.ToString("C")</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-danger">
-                <div class="card-body">
-                    <h6>Overdue</h6>
-                    <h4>@overdueCount</h4>
-                    <small>@overdueAmount.ToString("C")</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-info">
-                <div class="card-body">
-                    <h6>Total</h6>
-                    <h4>@filteredInvoices.Count</h4>
-                    <small>@totalAmount.ToString("C")</small>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="card">
-        <div class="card-body">
-            @if (groupByProperty)
-            {
-                @foreach (var propertyGroup in groupedInvoices)
-                {
-                    var property = propertyGroup.First().Lease?.Property;
-                    var propertyInvoiceCount = propertyGroup.Count();
-                    var propertyTotal = propertyGroup.Sum(i => i.Amount);
-                    var propertyBalance = propertyGroup.Sum(i => i.BalanceDue);
-                    var isExpanded = expandedProperties.Contains(propertyGroup.Key.GetHashCode());
-                    
-                    <div class="card mb-3">
-                        <div class="card-header" style="cursor: pointer;" @onclick="() => TogglePropertyGroup(propertyGroup.Key)">
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div>
-                                    <i class="bi @(isExpanded ? "bi-chevron-down" : "bi-chevron-right")"></i>
-                                    <strong>@property?.Address</strong>
-                                    <span class="ms-3 text-muted">@property?.City, @property?.State @property?.ZipCode</span>
-                                </div>
-                                <div>
-                                    <span class="badge bg-secondary me-2">@propertyInvoiceCount invoice(s)</span>
-                                    <span class="me-2">Total: <strong>@propertyTotal.ToString("C")</strong></span>
-                                    <span>Balance: <strong class="@(propertyBalance > 0 ? "text-danger" : "text-success")">@propertyBalance.ToString("C")</strong></span>
-                                </div>
-                            </div>
-                        </div>
-                        @if (isExpanded)
-                        {
-                            <div class="card-body p-0">
-                                <table class="table table-hover mb-0">
-                                    <thead class="table-light">
-                                        <tr>
-                                            <th>Invoice #</th>
-                                            <th>Tenant</th>
-                                            <th>Invoice Date</th>
-                                            <th>Due Date</th>
-                                            <th>Amount</th>
-                                            <th>Balance Due</th>
-                                            <th>Status</th>
-                                            <th>Actions</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach (var invoice in propertyGroup)
-                                        {
-                                            <tr @onclick="() => ViewInvoice(invoice.Id)" style="cursor: pointer;">
-                                                <td>
-                                                    <strong>@invoice.InvoiceNumber</strong>
-                                                    <br />
-                                                    <small class="text-muted">@invoice.Description</small>
-                                                </td>
-                                                <td>@invoice.Lease?.Tenant?.FullName</td>
-                                                <td>@invoice.InvoicedOn.ToString("MMM dd, yyyy")</td>
-                                                <td>
-                                                    @invoice.DueOn.ToString("MMM dd, yyyy")
-                                                    @if (invoice.IsOverdue)
-                                                    {
-                                                        <br />
-                                                        <small class="text-danger">@invoice.DaysOverdue days overdue</small>
-                                                    }
-                                                </td>
-                                                <td>@invoice.Amount.ToString("C")</td>
-                                                <td>
-                                                    <strong class="@(invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
-                                                        @invoice.BalanceDue.ToString("C")
-                                                    </strong>
-                                                </td>
-                                                <td>
-                                                    <span class="badge @GetStatusBadgeClass(invoice.Status)">
-                                                        @invoice.Status
-                                                    </span>
-                                                </td>
-                                                <td @onclick:stopPropagation="true">
-                                                    <div class="btn-group" role="group">
-                                                        <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewInvoice(invoice.Id)" title="View">
-                                                            <i class="bi bi-eye"></i>
-                                                        </button>
-                                                        <button class="btn btn-sm btn-outline-secondary" @onclick="() => EditInvoice(invoice.Id)" title="Edit">
-                                                            <i class="bi bi-pencil"></i>
-                                                        </button>
-                                                        <button class="btn btn-sm btn-outline-danger" @onclick="() => DeleteInvoice(invoice)" title="Delete">
-                                                            <i class="bi bi-trash"></i>
-                                                        </button>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                        }
-                                    </tbody>
-                                </table>
-                            </div>
-                        }
-                    </div>
-                }
-            }
-            else
-            {
-                <div class="table-responsive">
-                    <table class="table table-hover"><thead><tr>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Invoice.InvoiceNumber))">
-                                    Invoice #
-                                    @if (sortColumn == nameof(Invoice.InvoiceNumber))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick='() => SortBy("Property")'>
-                                    Property
-                                    @if (sortColumn == "Property")
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick='() => SortBy("Tenant")'>
-                                    Tenant
-                                    @if (sortColumn == "Tenant")
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Invoice.InvoicedOn))">
-                                    Invoice Date
-                                    @if (sortColumn == nameof(Invoice.InvoicedOn))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Invoice.DueOn))">
-                                    Due Date
-                                    @if (sortColumn == nameof(Invoice.DueOn))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Invoice.Amount))">
-                                    Amount
-                                    @if (sortColumn == nameof(Invoice.Amount))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>Balance Due</th>
-                            <th>Status</th>
-                            <th>Actions</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (var invoice in pagedInvoices)
-                        {
-                            <tr @onclick="() => ViewInvoice(invoice.Id)" style="cursor: pointer;">
-                                <td>
-                                    <strong>@invoice.InvoiceNumber</strong>
-                                    <br />
-                                    <small class="text-muted">@invoice.Description</small>
-                                </td>
-                                <td>@invoice.Lease?.Property?.Address</td>
-                                <td>@invoice.Lease?.Tenant?.FullName</td>
-                                <td>@invoice.InvoicedOn.ToString("MMM dd, yyyy")</td>
-                                <td>
-                                    @invoice.DueOn.ToString("MMM dd, yyyy")
-                                    @if (invoice.IsOverdue)
-                                    {
-                                        <br />
-                                        <small class="text-danger">@invoice.DaysOverdue days overdue</small>
-                                    }
-                                </td>
-                                <td>@invoice.Amount.ToString("C")</td>
-                                <td>
-                                    <strong class="@(invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
-                                        @invoice.BalanceDue.ToString("C")
-                                    </strong>
-                                </td>
-                                <td>
-                                    <span class="badge @GetStatusBadgeClass(invoice.Status)">
-                                        @invoice.Status
-                                    </span>
-                                </td>
-                                <td @onclick:stopPropagation="true">
-                                    <div class="btn-group" role="group">
-                                        <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewInvoice(invoice.Id)" title="View">
-                                            <i class="bi bi-eye"></i>
-                                        </button>
-                                        <button class="btn btn-sm btn-outline-secondary" @onclick="() => EditInvoice(invoice.Id)" title="Edit">
-                                            <i class="bi bi-pencil"></i>
-                                        </button>
-                                        <button class="btn btn-sm btn-outline-danger" @onclick="() => DeleteInvoice(invoice)" title="Delete">
-                                            <i class="bi bi-trash"></i>
-                                        </button>
-                                    </div>
-                                </td>
-                            </tr>
-                        }
-                    </tbody>
-                </table>
-            </div>
-            }
-
-            @if (totalPages > 1 && !groupByProperty)
-            {
-                <div class="d-flex justify-content-between align-items-center mt-3">
-                    <div>
-                        <select class="form-select form-select-sm" @bind="pageSize" @bind:after="UpdatePagination">
-                            <option value="10">10 per page</option>
-                            <option value="20">20 per page</option>
-                            <option value="50">50 per page</option>
-                            <option value="100">100 per page</option>
-                        </select>
-                    </div>
-                    <div class="text-muted">
-                        Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords invoices
-                    </div>
-                    <nav>
-                        <ul class="pagination pagination-sm mb-0">
-                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                <button class="page-link" @onclick="FirstPage" disabled="@(currentPage == 1)">
-                                    <i class="bi bi-chevron-double-left"></i>
-                                </button>
-                            </li>
-                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                <button class="page-link" @onclick="PreviousPage" disabled="@(currentPage == 1)">
-                                    <i class="bi bi-chevron-left"></i>
-                                </button>
-                            </li>
-                            @for (int i = Math.Max(1, currentPage - 2); i <= Math.Min(totalPages, currentPage + 2); i++)
-                            {
-                                var pageNum = i;
-                                <li class="page-item @(currentPage == pageNum ? "active" : "")">
-                                    <button class="page-link" @onclick="() => GoToPage(pageNum)">@pageNum</button>
-                                </li>
-                            }
-                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                <button class="page-link" @onclick="NextPage" disabled="@(currentPage == totalPages)">
-                                    <i class="bi bi-chevron-right"></i>
-                                </button>
-                            </li>
-                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                <button class="page-link" @onclick="LastPage" disabled="@(currentPage == totalPages)">
-                                    <i class="bi bi-chevron-double-right"></i>
-                                </button>
-                            </li>
-                        </ul>
-                    </nav>
-                </div>
-            }
-        </div>
-    </div>
-}
-
-@code {
-    private List<Invoice>? invoices;
-    private List<Invoice> filteredInvoices = new();
-    private List<Invoice> pagedInvoices = new();
-    private IEnumerable<IGrouping<Guid, Invoice>> groupedInvoices = Enumerable.Empty<IGrouping<Guid, Invoice>>();
-    private HashSet<int> expandedProperties = new();
-    private string searchTerm = string.Empty;
-    private string selectedStatus = string.Empty;
-    private string sortColumn = nameof(Invoice.DueOn);
-    private bool sortAscending = false;
-    private bool groupByProperty = true;
-    
-    private int pendingCount = 0;
-    private int paidCount = 0;
-    private int overdueCount = 0;
-    private decimal pendingAmount = 0;
-    private decimal paidAmount = 0;
-    private decimal overdueAmount = 0;
-    private decimal totalAmount = 0;
-    
-    private int currentPage = 1;
-    private int pageSize = 20;
-    private int totalPages = 1;
-    private int totalRecords = 0;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? LeaseId { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadInvoices();
-    }
-
-    private async Task LoadInvoices()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (!string.IsNullOrEmpty(userId))
-        {
-            invoices = await InvoiceService.GetAllAsync();
-            if (LeaseId.HasValue)
-            {
-                invoices = invoices.Where(i => i.LeaseId == LeaseId.Value).ToList();
-            }
-            FilterInvoices();
-            UpdateStatistics();
-        }
-    }
-
-    private void FilterInvoices()
-    {
-        if (invoices == null) return;
-
-        filteredInvoices = invoices.Where(i =>
-        {
-            bool matchesSearch = string.IsNullOrWhiteSpace(searchTerm) ||
-                i.InvoiceNumber.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-                (i.Lease?.Property?.Address?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ?? false) ||
-                (i.Lease?.Tenant?.FullName?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ?? false) ||
-                i.Description.Contains(searchTerm, StringComparison.OrdinalIgnoreCase);
-
-            bool matchesStatus = string.IsNullOrWhiteSpace(selectedStatus) ||
-                i.Status.Equals(selectedStatus, StringComparison.OrdinalIgnoreCase);
-
-            return matchesSearch && matchesStatus;
-        }).ToList();
-
-        SortInvoices();
-        
-        if (groupByProperty)
-        {
-            groupedInvoices = filteredInvoices
-                .Where(i => i.Lease?.PropertyId != null)
-                .GroupBy(i => i.Lease!.PropertyId)
-                .OrderBy(g => g.First().Lease?.Property?.Address)
-                .ToList();
-        }
-        else
-        {
-            UpdatePagination();
-        }
-    }
-    
-    private void TogglePropertyGroup(Guid propertyId)
-    {
-        if (expandedProperties.Contains(propertyId.GetHashCode()))
-        {
-            expandedProperties.Remove(propertyId.GetHashCode());
-        }
-        else
-        {
-            expandedProperties.Add(propertyId.GetHashCode());
-        }
-    }
-
-    private void SortBy(string column)
-    {
-        if (sortColumn == column)
-        {
-            sortAscending = !sortAscending;
-        }
-        else
-        {
-            sortColumn = column;
-            sortAscending = true;
-        }
-        SortInvoices();
-        UpdatePagination();
-    }
-
-    private void SortInvoices()
-    {
-        filteredInvoices = sortColumn switch
-        {
-            nameof(Invoice.InvoiceNumber) => sortAscending
-                ? filteredInvoices.OrderBy(i => i.InvoiceNumber).ToList()
-                : filteredInvoices.OrderByDescending(i => i.InvoiceNumber).ToList(),
-            "Property" => sortAscending
-                ? filteredInvoices.OrderBy(i => i.Lease?.Property?.Address).ToList()
-                : filteredInvoices.OrderByDescending(i => i.Lease?.Property?.Address).ToList(),
-            "Tenant" => sortAscending
-                ? filteredInvoices.OrderBy(i => i.Lease?.Tenant?.FullName).ToList()
-                : filteredInvoices.OrderByDescending(i => i.Lease?.Tenant?.FullName).ToList(),
-            nameof(Invoice.InvoicedOn) => sortAscending
-                ? filteredInvoices.OrderBy(i => i.InvoicedOn).ToList()
-                : filteredInvoices.OrderByDescending(i => i.InvoicedOn).ToList(),
-            nameof(Invoice.DueOn) => sortAscending
-                ? filteredInvoices.OrderBy(i => i.DueOn).ToList()
-                : filteredInvoices.OrderByDescending(i => i.DueOn).ToList(),
-            nameof(Invoice.Amount) => sortAscending
-                ? filteredInvoices.OrderBy(i => i.Amount).ToList()
-                : filteredInvoices.OrderByDescending(i => i.Amount).ToList(),
-            _ => filteredInvoices.OrderByDescending(i => i.DueOn).ToList()
-        };
-    }
-
-    private void UpdateStatistics()
-    {
-        if (invoices == null) return;
-
-        pendingCount = invoices.Count(i => i.Status == "Pending");
-        paidCount = invoices.Count(i => i.Status == "Paid");
-        overdueCount = invoices.Count(i => i.IsOverdue && i.Status != "Paid");
-        
-        pendingAmount = invoices.Where(i => i.Status == "Pending").Sum(i => i.BalanceDue);
-        paidAmount = invoices.Where(i => i.Status == "Paid").Sum(i => i.Amount);
-        overdueAmount = invoices.Where(i => i.IsOverdue && i.Status != "Paid").Sum(i => i.BalanceDue);
-        totalAmount = invoices.Sum(i => i.Amount);
-    }
-
-    private void UpdatePagination()
-    {
-        totalRecords = filteredInvoices.Count;
-        totalPages = (int)Math.Ceiling(totalRecords / (double)pageSize);
-        currentPage = Math.Min(currentPage, Math.Max(1, totalPages));
-        
-        pagedInvoices = filteredInvoices
-            .Skip((currentPage - 1) * pageSize)
-            .Take(pageSize)
-            .ToList();
-    }
-
-    private void ClearFilters()
-    {
-        searchTerm = string.Empty;
-        selectedStatus = string.Empty;
-        groupByProperty = false;
-        FilterInvoices();
-    }
-
-    private void FirstPage() => GoToPage(1);
-    private void LastPage() => GoToPage(totalPages);
-    private void NextPage() => GoToPage(currentPage + 1);
-    private void PreviousPage() => GoToPage(currentPage - 1);
-    
-    private void GoToPage(int page)
-    {
-        currentPage = Math.Max(1, Math.Min(page, totalPages));
-        UpdatePagination();
-    }
-
-    private string GetStatusBadgeClass(string status)
-    {
-        return status switch
-        {
-            "Paid" => "bg-success",
-            "Pending" => "bg-warning",
-            "Overdue" => "bg-danger",
-            "Cancelled" => "bg-secondary",
-            _ => "bg-info"
-        };
-    }
-
-    private void CreateInvoice()
-    {
-        Navigation.NavigateTo("/propertymanagement/invoices/create");
-    }
-
-    private void ViewInvoice(Guid id)
-    {
-        Navigation.NavigateTo($"/propertymanagement/invoices/{id}");
-    }
-
-    private void EditInvoice(Guid id)
-    {
-        Navigation.NavigateTo($"/propertymanagement/invoices/{id}/edit");
-    }
-
-    private async Task DeleteInvoice(Invoice invoice)
-    {
-        if (await JSRuntime.InvokeAsync<bool>("confirm", $"Are you sure you want to delete invoice {invoice.InvoiceNumber}?"))
-        {
-            await InvoiceService.DeleteAsync(invoice.Id);
-            await LoadInvoices();
-        }
-    }
-}
\ No newline at end of file
+<Aquiis.UI.Shared.Features.PropertyManagement.Invoices.ListForm />
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/View.razor b/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/View.razor
index 77db724..4a11104 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/View.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Invoices/Pages/View.razor
@@ -1,408 +1,9 @@
 @page "/propertymanagement/invoices/view/{Id:guid}"
-@using Aquiis.Professional.Features.PropertyManagement
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@inject NavigationManager NavigationManager
-@inject InvoiceService InvoiceService
-@inject Application.Services.DocumentService DocumentService
-@inject UserContextService UserContextService
-@inject IJSRuntime JSRuntime
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>View Invoice - Property Management</PageTitle>
-
-@if (invoice == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else
-{
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <h1><i class="bi bi-receipt"></i> Invoice Details</h1>
-        <div>
-            <button class="btn btn-outline-secondary" @onclick="BackToList">
-                <i class="bi bi-arrow-left"></i> Back to List
-            </button>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-md-8">
-            <div class="card mb-3">
-                <div class="card-header d-flex justify-content-between align-items-center">
-                    <h5 class="mb-0">Invoice Information</h5>
-                    <span class="badge @GetStatusBadgeClass(invoice.Status) fs-6">@invoice.Status</span>
-                </div>
-                <div class="card-body">
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <div class="mb-3">
-                                <label class="text-muted small">Invoice Number</label>
-                                <div class="fw-bold fs-5">@invoice.InvoiceNumber</div>
-                            </div>
-                            <div class="mb-3">
-                                <label class="text-muted small">Invoice Date</label>
-                                <div>@invoice.InvoicedOn.ToString("MMMM dd, yyyy")</div>
-                            </div>
-                            <div class="mb-3">
-                                <label class="text-muted small">Description</label>
-                                <div>@invoice.Description</div>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <div class="mb-3">
-                                <label class="text-muted small">Due Date</label>
-                                <div class="@(invoice.IsOverdue ? "text-danger fw-bold" : "")">
-                                    @invoice.DueOn.ToString("MMMM dd, yyyy")
-                                    @if (invoice.IsOverdue)
-                                    {
-                                        <br />
-                                        <small>(@invoice.DaysOverdue days overdue)</small>
-                                    }
-                                </div>
-                            </div>
-                            <div class="mb-3">
-                                <label class="text-muted small">Created Date</label>
-                                <div>@invoice.CreatedOn.ToString("MMMM dd, yyyy")</div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <hr />
-
-                    <div class="row">
-                        <div class="col-md-4">
-                            <div class="mb-3">
-                                <label class="text-muted small">Invoice Amount</label>
-                                <div class="fw-bold fs-4">@invoice.Amount.ToString("C")</div>
-                            </div>
-                        </div>
-                        <div class="col-md-4">
-                            <div class="mb-3">
-                                <label class="text-muted small">Paid Amount</label>
-                                <div class="fw-bold fs-4 text-success">@invoice.AmountPaid.ToString("C")</div>
-                            </div>
-                        </div>
-                        <div class="col-md-4">
-                            <div class="mb-3">
-                                <label class="text-muted small">Balance Due</label>
-                                <div class="fw-bold fs-4 @(invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
-                                    @invoice.BalanceDue.ToString("C")
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    @if (invoice.PaidOn.HasValue)
-                    {
-                        <div class="mb-3">
-                            <label class="text-muted small">Paid Date</label>
-                            <div>@invoice.PaidOn.Value.ToString("MMMM dd, yyyy")</div>
-                        </div>
-                    }
-
-                    @if (!string.IsNullOrWhiteSpace(invoice.Notes))
-                    {
-                        <hr />
-                        <div class="mb-3">
-                            <label class="text-muted small">Notes</label>
-                            <div class="border p-2 rounded bg-light">@invoice.Notes</div>
-                        </div>
-                    }
-                </div>
-            </div>
-
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Lease Information</h5>
-                </div>
-                <div class="card-body">
-                    @if (invoice.Lease != null)
-                    {
-                        <div class="row">
-                            <div class="col-md-6">
-                                <div class="mb-3">
-                                    <label class="text-muted small">Property</label>
-                                    <div>
-                                        <a href="/propertymanagement/properties/@invoice.Lease.PropertyId" class="text-decoration-none">
-                                            @invoice.Lease.Property?.Address
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="mb-3">
-                                    <label class="text-muted small">Lease Period</label>
-                                    <div>
-                                        @invoice.Lease.StartDate.ToString("MMM dd, yyyy") - 
-                                        @invoice.Lease.EndDate.ToString("MMM dd, yyyy")
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-6">
-                                <div class="mb-3">
-                                    <label class="text-muted small">Tenant</label>
-                                    <div>
-                                        <a href="/propertymanagement/tenants/@invoice.Lease.TenantId" class="text-decoration-none">
-                                            @invoice.Lease.Tenant?.FullName
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="mb-3">
-                                    <label class="text-muted small">Monthly Rent</label>
-                                    <div>@invoice.Lease.MonthlyRent.ToString("C")</div>
-                                </div>
-                            </div>
-                        </div>
-                    }
-                </div>
-            </div>
-
-            @if (invoice.Payments != null && invoice.Payments.Any())
-            {
-                <div class="card">
-                    <div class="card-header">
-                        <h5 class="mb-0">Payment History</h5>
-                    </div>
-                    <div class="card-body">
-                        <div class="table-responsive">
-                            <table class="table table-sm">
-                                <thead>
-                                    <tr>
-                                        <th>Date</th>
-                                        <th>Amount</th>
-                                        <th>Method</th>
-                                        <th>Notes</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    @foreach (var payment in invoice.Payments.OrderByDescending(p => p.PaidOn))
-                                    {
-                                        <tr>
-                                            <td>@payment.PaidOn.ToString("MMM dd, yyyy")</td>
-                                            <td>@payment.Amount.ToString("C")</td>
-                                            <td>@payment.PaymentMethod</td>
-                                            <td>@payment.Notes</td>
-                                        </tr>
-                                    }
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            }
-        </div>
-
-        <div class="col-md-4">
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Quick Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="EditInvoice">
-                            <i class="bi bi-pencil"></i> Edit Invoice
-                        </button>
-                        @if (invoice.Status != "Paid" && invoice.BalanceDue > 0)
-                        {
-                            <button class="btn btn-outline-success" @onclick="RecordPayment">
-                                <i class="bi bi-cash"></i> Record Payment
-                            </button>
-                        }
-                        <button class="btn btn-outline-info" @onclick="ViewLease">
-                            <i class="bi bi-file-text"></i> View Lease
-                        </button>
-                        @if (invoice.DocumentId == null)
-                        {
-                            <button class="btn btn-outline-secondary" @onclick="GenerateInvoicePdf" disabled="@isGenerating">
-                                @if (isGenerating)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-1" role="status"></span>
-                                }
-                                else
-                                {
-                                    <i class="bi bi-file-pdf"></i>
-                                }
-                                Generate PDF
-                            </button>
-                        }
-                        else
-                        {
-                            <button class="btn btn-primary" @onclick="ViewDocument">
-                                <i class="bi bi-eye"></i> View PDF
-                            </button>
-                            <button class="btn btn-outline-primary" @onclick="DownloadDocument">
-                                <i class="bi bi-download"></i> Download PDF
-                            </button>
-                        }
-                    </div>
-                </div>
-            </div>
-
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Metadata</h5>
-                </div>
-                <div class="card-body">
-                    <div class="mb-2">
-                        <small class="text-muted">Created By:</small>
-                        <div>@(!string.IsNullOrEmpty(invoice.CreatedBy) ? invoice.CreatedBy : "System")</div>
-                    </div>
-                    @if (invoice.LastModifiedOn.HasValue)
-                    {
-                        <div class="mb-2">
-                            <small class="text-muted">Last Modified:</small>
-                            <div>@invoice.LastModifiedOn.Value.ToString("MMM dd, yyyy h:mm tt")</div>
-                        </div>
-                        <div class="mb-2">
-                            <small class="text-muted">Modified By:</small>
-                            <div>@(!string.IsNullOrEmpty(invoice.LastModifiedBy) ? invoice.LastModifiedBy : "System")</div>
-                        </div>
-                    }
-                </div>
-            </div>
-        </div>
-    </div>
-}
+<Aquiis.UI.Shared.Features.PropertyManagement.Invoices.ViewForm InvoiceId="@Id" />
 
 @code {
-    [Parameter]
-    public Guid Id { get; set; }
-
-    private Invoice? invoice;
-    private bool isGenerating = false;
-    private Document? document = null;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadInvoice();
-    }
-
-    private async Task LoadInvoice()
-    {
-        invoice = await InvoiceService.GetByIdAsync(Id);
-        
-        // Load the document if it exists
-        if (invoice?.DocumentId != null)
-        {
-            document = await DocumentService.GetByIdAsync(invoice.DocumentId.Value);
-        }
-    }
-
-    private string GetStatusBadgeClass(string status)
-    {
-        return status switch
-        {
-            "Paid" => "bg-success",
-            "Pending" => "bg-warning",
-            "Overdue" => "bg-danger",
-            "Cancelled" => "bg-secondary",
-            _ => "bg-info"
-        };
-    }
-
-    private void BackToList()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/invoices");
-    }
-
-    private void EditInvoice()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/invoices/{Id}/edit");
-    }
-
-    private void RecordPayment()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/payments/create?invoiceId={Id}");
-    }
-
-    private void ViewLease()
-    {
-        if (invoice?.LeaseId != null)
-        {
-            NavigationManager.NavigateTo($"/propertymanagement/leases/{invoice.LeaseId}");
-        }
-    }
-
-    private async Task ViewDocument()
-    {
-        if (document != null)
-        {
-            var base64Data = Convert.ToBase64String(document.FileData);
-            await JSRuntime.InvokeVoidAsync("viewFile", base64Data, document.FileType);
-        }
-    }
-
-    private async Task DownloadDocument()
-    {
-        if (document != null)
-        {
-            var fileName = document.FileName;
-            var fileData = document.FileData;
-            var mimeType = document.FileType;
-
-            await JSRuntime.InvokeVoidAsync("downloadFile", fileName, Convert.ToBase64String(fileData), mimeType);
-        }
-    }
-
-    private async Task GenerateInvoicePdf()
-    {
-        isGenerating = true;
-        StateHasChanged();
-
-        try
-        {
-            // Generate the PDF
-            byte[] pdfBytes = Aquiis.Application.Services.PdfGenerators.InvoicePdfGenerator.GenerateInvoicePdf(invoice!);
-
-            // Create the document entity
-            var document = new Document
-            {
-                FileName = $"Invoice_{invoice!.InvoiceNumber?.Replace(" ", "_")}_{DateTime.Now:yyyyMMdd}.pdf",
-                FileExtension = ".pdf",
-                FileData = pdfBytes,
-                FileSize = pdfBytes.Length,
-                FileType = "application/pdf",
-                ContentType = "application/pdf",
-                DocumentType = "Invoice",
-                Description = $"Invoice {invoice.InvoiceNumber}",
-                LeaseId = invoice.LeaseId,
-                PropertyId = invoice.Lease?.PropertyId,
-                TenantId = invoice.Lease?.TenantId,
-                IsDeleted = false
-            };
-
-            // Save to database
-            await DocumentService.CreateAsync(document);
-
-            // Update invoice with DocumentId
-            invoice.DocumentId = document.Id;
-            
-            await InvoiceService.UpdateAsync(invoice);
-
-            // Reload invoice and document
-            await LoadInvoice();
-            StateHasChanged();
-
-            await JSRuntime.InvokeVoidAsync("alert", "Invoice PDF generated successfully!");
-        }
-        catch (Exception ex)
-        {
-            await JSRuntime.InvokeVoidAsync("alert", $"Error generating invoice PDF: {ex.Message}");
-        }
-        finally
-        {
-            isGenerating = false;
-            StateHasChanged();
-        }
-    }
+    [Parameter] public Guid Id { get; set; }
 }
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/Create.razor b/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/Create.razor
index 3e6b16b..bc6dbce 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/Create.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/Create.razor
@@ -1,383 +1,5 @@
 @page "/propertymanagement/leases/create"
-
-@using Aquiis.Core.Entities
-@using Aquiis.Core.Constants
-@using Aquiis.Core.Validation
-@using Microsoft.AspNetCore.Components
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Authorization
-@using System.ComponentModel.DataAnnotations
-
-@inject NavigationManager Navigation
-@inject OrganizationService OrganizationService
-@inject LeaseService LeaseService
-@inject PropertyService PropertyService
-@inject TenantService TenantService
-
-@inject AuthenticationStateProvider AuthenticationStateProvider
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Create Lease</PageTitle>
-
-<div class="row">
-    <div class="col-md-8">
-        <div class="card">
-            <div class="card-header">
-                <h3 class="card-title mb-0">Create New Lease</h3>
-            </div>
-            <div class="card-body">
-                <EditForm Model="leaseModel" OnValidSubmit="HandleValidSubmit" FormName="create-lease">
-                    <DataAnnotationsValidator />
-                    <ValidationSummary class="text-danger mb-3" />
-                    
-                    @if (!string.IsNullOrEmpty(errorMessage))
-                    {
-                        <div class="alert alert-danger" role="alert">
-                            @errorMessage
-                        </div>
-                    }
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Property *</label>
-                            <InputSelect @bind-Value="leaseModel.PropertyId" class="form-select" @onchange="@(async () => await OnPropertyChanged())">
-                                <option value="">Select a property</option>
-                                @foreach (var property in availableProperties)
-                                {
-                                    <option value="@property.Id">@property.Address (@property.City)</option>
-                                }
-                            </InputSelect>
-                            <ValidationMessage For="() => leaseModel.PropertyId" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Tenant *</label>
-                            <InputSelect @bind-Value="leaseModel.TenantId" class="form-select">
-                                <option value="">Select a tenant</option>
-                                @foreach (var tenant in userTenants)
-                                {
-                                    <option value="@tenant.Id">@tenant.FullName (@tenant.Email)</option>
-                                }
-                            </InputSelect>
-                            <ValidationMessage For="() => leaseModel.TenantId" class="text-danger" />
-                        </div>
-                    </div>
-
-                    @if (selectedProperty != null)
-                    {
-                        <div class="alert alert-info">
-                            <strong>Selected Property:</strong> @selectedProperty.Address<br />
-                            <strong>Monthly Rent:</strong> @selectedProperty.MonthlyRent.ToString("C")
-                        </div>
-                    }
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Start Date *</label>
-                            <InputDate @bind-Value="leaseModel.StartDate" class="form-control" />
-                            <ValidationMessage For="() => leaseModel.StartDate" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">End Date *</label>
-                            <InputDate @bind-Value="leaseModel.EndDate" class="form-control" />
-                            <ValidationMessage For="() => leaseModel.EndDate" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Monthly Rent *</label>
-                            <InputNumber @bind-Value="leaseModel.MonthlyRent" class="form-control" placeholder="0.00" />
-                            <ValidationMessage For="() => leaseModel.MonthlyRent" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Security Deposit</label>
-                            <InputNumber @bind-Value="leaseModel.SecurityDeposit" class="form-control" placeholder="0.00" />
-                            <ValidationMessage For="() => leaseModel.SecurityDeposit" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Status</label>
-                            <InputSelect @bind-Value="leaseModel.Status" class="form-select">
-                                @foreach (var status in ApplicationConstants.LeaseStatuses.AllLeaseStatuses)
-                                {
-                                    <option value="@status">@status</option>
-                                }
-                            </InputSelect>
-                            <ValidationMessage For="() => leaseModel.Status" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-12 mb-3">
-                            <label class="form-label">Lease Terms</label>
-                            <InputTextArea @bind-Value="leaseModel.Terms" class="form-control" rows="4" placeholder="Enter lease terms and conditions" />
-                            <ValidationMessage For="() => leaseModel.Terms" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-12 mb-3">
-                            <label class="form-label">Notes</label>
-                            <InputTextArea @bind-Value="leaseModel.Notes" class="form-control" rows="3" placeholder="Additional notes" />
-                            <ValidationMessage For="() => leaseModel.Notes" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="d-flex gap-2">
-                        <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                            }
-                            Create Lease
-                        </button>
-                        <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
-                    </div>
-                </EditForm>
-            </div>
-        </div>
-    </div>
-
-    <div class="col-md-4">
-        <div class="card">
-            <div class="card-header">
-                <h5 class="mb-0">Quick Actions</h5>
-            </div>
-            <div class="card-body">
-                <div class="d-grid gap-2">
-                    <button class="btn btn-outline-primary" @onclick="CreateTenant">
-                        <i class="bi bi-person-plus"></i> Add New Tenant
-                    </button>
-                </div>
-            </div>
-        </div>
-
-        @if (selectedProperty != null)
-        {
-            <div class="card mt-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Property Details</h5>
-                </div>
-                <div class="card-body">
-                    <p><strong>Address:</strong> @selectedProperty.Address</p>
-                    <p><strong>Type:</strong> @selectedProperty.PropertyType</p>
-                    <p><strong>Bedrooms:</strong> @selectedProperty.Bedrooms</p>
-                    <p><strong>Bathrooms:</strong> @selectedProperty.Bathrooms</p>
-                    <p><strong>Square Feet:</strong> @selectedProperty.SquareFeet.ToString("N0")</p>
-                </div>
-            </div>
-        }
-    </div>
-</div>
-
-@code {
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? PropertyId { get; set; }
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? TenantId { get; set; }
-
-    private LeaseModel leaseModel = new();
-    private List<Property> availableProperties = new();
-    private List<Tenant> userTenants = new();
-    private Property? selectedProperty;
-    private bool isSubmitting = false;
-    private string errorMessage = string.Empty;
-
-        [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadData();
-        
-        // If PropertyId is provided in query string, pre-select it
-        if (PropertyId.HasValue)
-        {
-            leaseModel.PropertyId = PropertyId.Value;
-            await OnPropertyChanged();
-        }
-        
-        // If TenantId is provided in query string, pre-select it
-        if (TenantId.HasValue)
-        {
-            leaseModel.TenantId = TenantId.Value;
-        }
-    }
-
-    private async Task LoadData()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (string.IsNullOrEmpty(userId))
-            return;
-
-        // Load available properties (only available ones)
-        List<Property>? allProperties = await PropertyService.GetAllAsync();
-
-        availableProperties = allProperties
-            .Where(p => p.IsAvailable)
-            .ToList() ?? new List<Property>();
-
-        // Load user's tenants
-        userTenants = await TenantService.GetAllAsync();
-        userTenants = userTenants
-            .Where(t => t.IsActive)
-            .ToList();
-
-        // Set default values
-        leaseModel.StartDate = DateTime.Today;
-        leaseModel.EndDate = DateTime.Today.AddYears(1);
-        leaseModel.Status = ApplicationConstants.LeaseStatuses.Active;
-    }
-
-    private async Task OnPropertyChanged()
-    {
-        if (leaseModel.PropertyId != Guid.Empty)
-        {
-            selectedProperty = availableProperties.FirstOrDefault(p => p.Id == leaseModel.PropertyId);
-            if (selectedProperty != null)
-            {
-                // Get organization settings for security deposit calculation
-                var settings = await OrganizationService.GetOrganizationSettingsAsync();
-                var depositMultiplier = settings?.AutoCalculateSecurityDeposit == true 
-                    ? settings.SecurityDepositMultiplier 
-                    : 1.0m;
-
-                leaseModel.PropertyAddress = selectedProperty.Address;
-                leaseModel.MonthlyRent = selectedProperty.MonthlyRent;
-                leaseModel.SecurityDeposit = selectedProperty.MonthlyRent * depositMultiplier;
-            }
-        }
-        else
-        {
-            selectedProperty = null;
-        }
-        StateHasChanged();
-    }
-
-    private async Task HandleValidSubmit()
-    {
-        try
-        {
-            isSubmitting = true;
-            errorMessage = string.Empty;
-
-            var authState = await AuthenticationStateTask;
-            var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-            if (string.IsNullOrEmpty(userId))
-            {
-                errorMessage = "User not authenticated.";
-                return;
-            }
-
-            // Verify property and tenant belong to user
-            var property = await PropertyService.GetByIdAsync(leaseModel.PropertyId);
-            var tenant = await TenantService.GetByIdAsync(leaseModel.TenantId);
-
-            if (property == null)
-            {
-                errorMessage = $"Property with ID {leaseModel.PropertyId} not found or access denied.";
-                return;
-            }
-
-            if (tenant == null)
-            {
-                errorMessage = $"Tenant with ID {leaseModel.TenantId} not found or access denied.";
-                return;
-            }
-
-            var lease = new Lease
-            {
-                
-                PropertyId = leaseModel.PropertyId,
-                TenantId = leaseModel.TenantId,
-                StartDate = leaseModel.StartDate,
-                EndDate = leaseModel.EndDate,
-                MonthlyRent = leaseModel.MonthlyRent,
-                SecurityDeposit = leaseModel.SecurityDeposit,
-                Status = leaseModel.Status,
-                Terms = leaseModel.Terms,
-                Notes = leaseModel.Notes
-            };
-
-            await LeaseService.CreateAsync(lease);
-
-            // Mark property as unavailable if lease is active
-            if (leaseModel.Status == ApplicationConstants.LeaseStatuses.Active)
-            {
-                property.IsAvailable = false;
-            }
-
-            await PropertyService.UpdateAsync(property);
-
-            Navigation.NavigateTo("/propertymanagement/leases");
-        }
-        catch (Exception ex)
-        {
-            errorMessage = $"Error creating lease: {ex.Message}";
-            if (ex.InnerException != null)
-            {
-                errorMessage += $" Inner Exception: {ex.InnerException.Message}";
-            }
-        }
-        finally
-        {
-            isSubmitting = false;
-        }
-    }
-
-    private void CreateTenant()
-    {
-        Navigation.NavigateTo("/propertymanagement/tenants/create");
-    }
-
-    private void Cancel()
-    {
-        Navigation.NavigateTo("/propertymanagement/leases");
-    }
-
-    public class LeaseModel
-    {
-        [RequiredGuid(ErrorMessage = "Property is required")]
-        public Guid PropertyId { get; set; }
-
-        public string PropertyAddress { get; set; } = string.Empty;
-
-        [RequiredGuid(ErrorMessage = "Tenant is required")]
-        public Guid TenantId { get; set; }
-
-        [Required(ErrorMessage = "Start date is required")]
-        public DateTime StartDate { get; set; } = DateTime.Today;
-
-        [Required(ErrorMessage = "End date is required")]
-        public DateTime EndDate { get; set; } = DateTime.Today.AddYears(1);
-
-        [Required(ErrorMessage = "Monthly rent is required")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Monthly rent must be greater than 0")]
-        public decimal MonthlyRent { get; set; }
-
-        [Range(0, double.MaxValue, ErrorMessage = "Security deposit cannot be negative")]
-        public decimal SecurityDeposit { get; set; }
-
-        [Required(ErrorMessage = "Status is required")]
-        [StringLength(50)]
-        public string Status { get; set; } = ApplicationConstants.LeaseStatuses.Active;
-
-        [StringLength(1000, ErrorMessage = "Terms cannot exceed 1000 characters")]
-        public string Terms { get; set; } = string.Empty;
-
-        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
-        public string Notes { get; set; } = string.Empty;
-    }
-}
\ No newline at end of file
+<Aquiis.UI.Shared.Features.PropertyManagement.Leases.CreateForm />
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/Edit.razor b/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/Edit.razor
index 948aa4b..869e570 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/Edit.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/Edit.razor
@@ -1,357 +1,9 @@
-@page "/propertymanagement/leases/edit/{Id:guid}"
-
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components
-@using Microsoft.AspNetCore.Components.Web
-@using Aquiis.Professional.Features.PropertyManagement
-@using System.ComponentModel.DataAnnotations
-
-@inject NavigationManager Navigation
-@inject LeaseService LeaseService
-@inject UserContextService UserContextService
-
+@page "/propertymanagement/leases/{Id:guid}/edit"
+@attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-
-@if (lease == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!isAuthorized)
-{
-    <div class="alert alert-danger">
-        <h4>Access Denied</h4>
-        <p>You don't have permission to edit this lease.</p>
-        <a href="/leases" class="btn btn-primary">Back to Leases</a>
-    </div>
-}
-else
-{
-    <div class="row">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">
-                    <h3 class="card-title mb-0">Edit Lease</h3>
-                </div>
-                <div class="card-body">
-                    <EditForm Model="leaseModel" OnValidSubmit="UpdateLease" FormName="edit-lease">
-                        <DataAnnotationsValidator />
-                        
-                        @if (!string.IsNullOrEmpty(errorMessage))
-                        {
-                            <div class="alert alert-danger" role="alert">
-                                @errorMessage
-                            </div>
-                        }
-
-                        @if (!string.IsNullOrEmpty(successMessage))
-                        {
-                            <div class="alert alert-success" role="alert">
-                                @successMessage
-                            </div>
-                        }
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Property</label>
-                                <input type="text" class="form-control" value="@lease.Property?.Address" readonly />
-                                <small class="text-muted">Property cannot be changed for existing lease</small>
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Tenant</label>
-                                <input type="text" class="form-control" value="@lease.Tenant?.FullName" readonly />
-                                <small class="text-muted">Tenant cannot be changed for existing lease</small>
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Start Date *</label>
-                                <InputDate @bind-Value="leaseModel.StartDate" class="form-control" />
-                                <ValidationMessage For="() => leaseModel.StartDate" class="text-danger" />
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">End Date *</label>
-                                <InputDate @bind-Value="leaseModel.EndDate" class="form-control" />
-                                <ValidationMessage For="() => leaseModel.EndDate" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Monthly Rent *</label>
-                                <InputNumber @bind-Value="leaseModel.MonthlyRent" class="form-control" placeholder="0.00" />
-                                <ValidationMessage For="() => leaseModel.MonthlyRent" class="text-danger" />
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Security Deposit</label>
-                                <InputNumber @bind-Value="leaseModel.SecurityDeposit" class="form-control" placeholder="0.00" />
-                                <ValidationMessage For="() => leaseModel.SecurityDeposit" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Status *</label>
-                                <InputSelect @bind-Value="leaseModel.Status" class="form-select" @onchange="OnStatusChanged">
-                                    <option value="Active">Active</option>
-                                    <option value="Pending">Pending</option>
-                                    <option value="Expired">Expired</option>
-                                    <option value="Terminated">Terminated</option>
-                                </InputSelect>
-                                <ValidationMessage For="() => leaseModel.Status" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <label class="form-label">Lease Terms</label>
-                                <InputTextArea @bind-Value="leaseModel.Terms" class="form-control" rows="4" placeholder="Enter lease terms and conditions" />
-                                <ValidationMessage For="() => leaseModel.Terms" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <NotesTimeline EntityType="Lease" EntityId="@lease.Id" />
-                            </div>
-                        </div>
-
-                        <div class="d-flex gap-2">
-                            <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                                @if (isSubmitting)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                                }
-                                Update Lease
-                            </button>
-                            <button type="button" class="btn btn-secondary" @onclick="ViewLease">View Lease</button>
-                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                        </div>
-                    </EditForm>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-md-4">
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Lease Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="ViewLease">
-                            <i class="bi bi-eye"></i> View Lease
-                        </button>
-                        <button class="btn btn-outline-success" @onclick="CreateInvoice">
-                            <i class="bi bi-receipt"></i> Create Invoice
-                        </button>
-                        <button class="btn btn-outline-danger" @onclick="DeleteLease">
-                            <i class="bi bi-trash"></i> Delete Lease
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="card mt-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Lease Information</h5>
-                </div>
-                <div class="card-body">
-                    <small class="text-muted">
-                        <strong>Created:</strong> @lease.CreatedOn.ToString("MMMM dd, yyyy")
-                        <br />
-                        @if (lease.LastModifiedOn.HasValue)
-                        {
-                            <strong>Last Modified:</strong> @lease.LastModifiedOn.Value.ToString("MMMM dd, yyyy")
-                        }
-                    </small>
-                </div>
-            </div>
-
-            @if (statusChangeWarning)
-            {
-                <div class="card mt-3">
-                    <div class="card-body">
-                        <div class="alert alert-warning">
-                            <i class="bi bi-exclamation-triangle"></i>
-                            <strong>Note:</strong> Changing the lease status may affect property availability.
-                        </div>
-                    </div>
-                </div>
-            }
-        </div>
-    </div>
-}
+<Aquiis.UI.Shared.Features.PropertyManagement.Leases.EditForm LeaseId="@Id" />
 
 @code {
     [Parameter] public Guid Id { get; set; }
-    
-    private Lease? lease;
-    private LeaseModel leaseModel = new();
-    private bool isSubmitting = false;
-    private bool isAuthorized = true;
-    private bool statusChangeWarning = false;
-    private string errorMessage = string.Empty;
-    private string successMessage = string.Empty;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadLease();
-    }
-
-    private async Task LoadLease()
-    {
-        lease = await LeaseService.GetByIdAsync(Id);
-
-        if (lease == null)
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        // Map lease to model
-        leaseModel = new LeaseModel
-        {
-            StartDate = lease.StartDate,
-            EndDate = lease.EndDate,
-            MonthlyRent = lease.MonthlyRent,
-            SecurityDeposit = lease.SecurityDeposit,
-            Status = lease.Status,
-            Terms = lease.Terms,
-        };
-    }
-
-    private async Task UpdateLease()
-    {
-        try
-        {
-            isSubmitting = true;
-            errorMessage = string.Empty;
-            successMessage = string.Empty;
-
-            var oldStatus = lease!.Status;
-
-            // Update lease with form data
-            lease.StartDate = leaseModel.StartDate;
-            lease.EndDate = leaseModel.EndDate;
-            lease.MonthlyRent = leaseModel.MonthlyRent;
-            lease.SecurityDeposit = leaseModel.SecurityDeposit;
-            lease.Status = leaseModel.Status;
-            lease.Terms = leaseModel.Terms;
-            
-            // Update property availability based on lease status change
-            if (lease.Property != null && oldStatus != leaseModel.Status)
-            {
-                if (leaseModel.Status == "Active")
-                {
-                    lease.Property.IsAvailable = false;
-                }
-                else if (oldStatus == "Active" && leaseModel.Status != "Active")
-                {
-                    // Check if there are other active leases for this property
-                    var activeLeases = await LeaseService.GetActiveLeasesByPropertyIdAsync(lease.PropertyId);
-                    var otherActiveLeases = activeLeases.Any(l => l.PropertyId == lease.PropertyId && l.Id != Id && l.Status == "Active");
-                    
-                    if (!otherActiveLeases)
-                    {
-                        lease.Property.IsAvailable = true;
-                    }
-                }
-            }
-
-            await LeaseService.UpdateAsync(lease);
-            successMessage = "Lease updated successfully!";
-            statusChangeWarning = false;
-        }
-        catch (Exception ex)
-        {
-            errorMessage = $"Error updating lease: {ex.Message}";
-        }
-        finally
-        {
-            isSubmitting = false;
-        }
-    }
-
-    private void OnStatusChanged()
-    {
-        statusChangeWarning = true;
-        StateHasChanged();
-    }
-
-    private void ViewLease()
-    {
-        Navigation.NavigateTo($"/propertymanagement/leases/{Id}");
-    }
-
-    private void CreateInvoice()
-    {
-        Navigation.NavigateTo($"/propertymanagement/invoices/create?leaseId={Id}");
-    }
-
-    private void Cancel()
-    {
-        Navigation.NavigateTo("/propertymanagement/leases");
-    }
-
-    private async Task DeleteLease()
-    {
-        if (lease != null)
-        {
-            try
-            {
-                // If deleting an active lease, make property available
-                if (lease.Status == "Active" && lease.Property != null)
-                {
-                    var otherActiveLeases = await LeaseService.GetActiveLeasesByPropertyIdAsync(lease.PropertyId);
-                    var otherActiveLeasesExist = otherActiveLeases.Any(l => l.Id != Id && l.Status == "Active");
-
-                    if (!otherActiveLeasesExist)
-                    {
-                        lease.Property.IsAvailable = true;
-                    }
-                }
-    
-                await LeaseService.DeleteAsync(lease.Id);
-                Navigation.NavigateTo("/propertymanagement/leases");
-            }
-            catch (Exception ex)
-            {
-                errorMessage = $"Error deleting lease: {ex.Message}";
-            }
-        }
-    }
-
-    public class LeaseModel
-    {
-        [Required(ErrorMessage = "Start date is required")]
-        public DateTime StartDate { get; set; } = DateTime.Today;
-
-        [Required(ErrorMessage = "End date is required")]
-        public DateTime EndDate { get; set; } = DateTime.Today.AddYears(1);
-
-        [Required(ErrorMessage = "Monthly rent is required")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Monthly rent must be greater than 0")]
-        public decimal MonthlyRent { get; set; }
-
-        [Range(0.00, double.MaxValue, ErrorMessage = "Security deposit cannot be negative")]
-        public decimal SecurityDeposit { get; set; }
-
-        [Required(ErrorMessage = "Status is required")]
-        [StringLength(50)]
-        public string Status { get; set; } = "Active";
-
-        [StringLength(5000, ErrorMessage = "Terms cannot exceed 2000 characters")]
-        public string Terms { get; set; } = string.Empty;
-
-    }
-}
\ No newline at end of file
+}
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/Index.razor b/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/Index.razor
index f2a8cfa..94b987e 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/Index.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/Index.razor
@@ -1,837 +1,5 @@
 @page "/propertymanagement/leases"
-
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.EntityFrameworkCore
-@using Aquiis.Infrastructure.Data
-@using Aquiis.Core.Entities
-@using Aquiis.Professional.Features.PropertyManagement
-@using Aquiis.Professional.Shared.Components.Account
-
-@inject NavigationManager NavigationManager
-@inject LeaseService LeaseService
-@inject TenantService TenantService
-@inject PropertyService PropertyService
-@inject IJSRuntime JSRuntime
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Leases - Property Management</PageTitle>
-
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <div>
-        <h1><span class="bi bi-file-earmark-text-fill" aria-hidden="true"></span> Leases</h1>
-        @if (filterTenant != null)
-        {
-            <p class="text-muted mb-0">
-                Showing leases for tenant: <strong>@filterTenant.FullName</strong>
-                <button class="btn btn-sm btn-outline-secondary ms-2" @onclick="ClearFilter">
-                    <i class="bi bi-x"></i> Clear Filter
-                </button>
-            </p>
-        }
-        else if (filterProperty != null)
-        {
-            <p class="text-muted mb-0">
-                Showing leases for property: <strong>@filterProperty.Address</strong>
-                <button class="btn btn-sm btn-outline-secondary ms-2" @onclick="ClearFilter">
-                    <i class="bi bi-x"></i> Clear Filter
-                </button>
-            </p>
-        }
-    </div>
-    <div class="btn-group">
-        <button class="btn btn-outline-info" @onclick="ViewLeaseOffers">
-            <i class="bi bi-file-earmark-check"></i> View Lease Offers
-        </button>
-        <button class="btn btn-primary" @onclick="CreateLease">
-            <i class="bi bi-plus-lg"></i> Add Lease
-        </button>
-        @if (filterTenant != null)
-        {
-            <button class="btn btn-outline-success" @onclick="CreateLeaseForTenant">
-                <i class="bi bi-plus-lg"></i> Add Lease for @filterTenant.FullName
-            </button>
-        }
-        else if (filterProperty != null)
-        {
-            <button class="btn btn-outline-success" @onclick="CreateLeaseForProperty">
-                <i class="bi bi-plus-lg"></i> Add Lease for This Property
-            </button>
-        }
-    </div>
-</div>
-
-@if (leases == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!leases.Any())
-{
-    <div class="alert alert-info">
-        @if (filterTenant != null)
-        {
-            <h4>No Leases Found for @filterTenant.FullName</h4>
-            <p>This tenant doesn't have any lease agreements yet.</p>
-            <button class="btn btn-primary" @onclick="CreateLeaseForTenant">Create First Lease for @filterTenant.FullName</button>
-            <button class="btn btn-outline-secondary ms-2" @onclick="ClearFilter">View All Leases</button>
-        }
-        else if (filterProperty != null)
-        {
-            <h4>No Leases Found for @filterProperty.Address</h4>
-            <p>This property doesn't have any lease agreements yet.</p>
-            <button class="btn btn-primary" @onclick="CreateLeaseForProperty">Create First Lease for This Property</button>
-            <button class="btn btn-outline-secondary ms-2" @onclick="ClearFilter">View All Leases</button>
-        }
-        else
-        {
-            <h4>No Leases Found</h4>
-            <p>Get started by converting a lease offer to your first lease agreement.</p>
-            <button class="btn btn-primary" @onclick="CreateLease">Create First Lease</button>
-        }
-    </div>
-}
-else
-{
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="input-group">
-                <span class="input-group-text"><i class="bi bi-search"></i></span>
-                <input type="text" class="form-control" placeholder="Search leases..." @bind="searchTerm" @onkeyup="FilterLeases" />
-            </div>
-        </div>
-        <div class="col-md-3">
-            <select class="form-select" @bind="selectedLeaseStatus" @bind:after="FilterLeases">
-                <option value="">All Lease Statuses</option>
-                <option value="Active">Active</option>
-                <option value="Expired">Expired</option>
-                <option value="Terminated">Terminated</option>
-                <option value="Pending">Pending</option>
-            </select>
-        </div>
-        <div class="col-md-3">
-            <select class="form-select" @bind="selectedTenantId" @bind:after="FilterLeases">
-                <option value="">All Tenants</option>
-                @if (availableTenants != null)
-                {
-                    @foreach (var tenant in availableTenants)
-                    {
-                        <option value="@tenant.Id">@tenant.FullName</option>
-                    }
-                }
-            </select>
-        </div>
-        <div class="col-md-3">
-            <div class="form-check form-switch pt-2">
-                <input class="form-check-input" type="checkbox" id="groupByProperty" @bind="groupByProperty" @bind:after="FilterLeases">
-                <label class="form-check-label" for="groupByProperty">
-                    Group by Property
-                </label>
-            </div>
-        </div>
-    </div>
-
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="card text-white bg-success">
-                <div class="card-body">
-                    <h6>Active Leases</h6>
-                    <h4>@activeCount</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-warning">
-                <div class="card-body">
-                    <h6>Expiring Soon</h6>
-                    <h4>@expiringSoonCount</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-info">
-                <div class="card-body">
-                    <h6>Total Rent/Month</h6>
-                    <h4>@totalMonthlyRent.ToString("C")</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-primary">
-                <div class="card-body">
-                    <h6>Total Leases</h6>
-                    <h4>@filteredLeases.Count</h4>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="card">
-        <div class="card-body">
-            @if (groupByProperty)
-            {
-                @foreach (var propertyGroup in groupedLeases)
-                {
-                    var property = propertyGroup.First().Property;
-                    var propertyLeaseCount = propertyGroup.Count();
-                    var activeLeaseCount = propertyGroup.Count(l => l.Status == "Active");
-                    var isExpanded = expandedProperties.Contains(propertyGroup.Key.GetHashCode());
-                    
-                    <div class="card mb-3">
-                        <div class="card-header" style="cursor: pointer;" @onclick="() => TogglePropertyGroup(propertyGroup.Key)">
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div>
-                                    <i class="bi @(isExpanded ? "bi-chevron-down" : "bi-chevron-right")"></i>
-                                    <strong>@property?.Address</strong>
-                                    <span class="ms-3 text-muted">@property?.City, @property?.State @property?.ZipCode</span>
-                                </div>
-                                <div>
-                                    <span class="badge bg-success me-2">@activeLeaseCount active</span>
-                                    <span class="badge bg-secondary">@propertyLeaseCount total lease(s)</span>
-                                </div>
-                            </div>
-                        </div>
-                        @if (isExpanded)
-                        {
-                            <div class="card-body p-0">
-                                <table class="table table-hover mb-0">
-                                    <thead class="table-light">
-                                        <tr>
-                                            <th>Tenant</th>
-                                            <th>Start Date</th>
-                                            <th>End Date</th>
-                                            <th>Monthly Rent</th>
-                                            <th>Status</th>
-                                            <th>Actions</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach (var lease in propertyGroup)
-                                        {
-                                            <tr class="@(lease.IsActive ? "" : "table-warning")">
-                                                <td>
-                                                    @if (lease.Tenant != null)
-                                                    {
-                                                        <strong>@lease.Tenant.FullName</strong>
-                                                        <br />
-                                                        <small class="text-muted">@lease.Tenant.Email</small>
-                                                    }
-                                                    else
-                                                    {
-                                                        <span class="text-warning"><i class="bi bi-hourglass-split"></i> Pending Acceptance</span>
-                                                        <br />
-                                                        <small class="text-muted">Lease offer awaiting tenant</small>
-                                                    }
-                                                </td>
-                                                <td>@lease.StartDate.ToString("MMM dd, yyyy")</td>
-                                                <td>@lease.EndDate.ToString("MMM dd, yyyy")</td>
-                                                <td>@lease.MonthlyRent.ToString("C")</td>
-                                                <td>
-                                                    <span class="badge @GetStatusBadgeClass(lease.Status)">
-                                                        @lease.Status
-                                                    </span>
-                                                    @if (lease.IsActive && lease.DaysRemaining <= 30 && lease.DaysRemaining > 0)
-                                                    {
-                                                        <br />
-                                                        <small class="text-warning">@lease.DaysRemaining days remaining</small>
-                                                    }
-                                                </td>
-                                                <td>
-                                                    <div class="btn-group btn-group-sm">
-                                                        <button class="btn btn-outline-primary" @onclick="() => ViewLease(lease.Id)" title="View">
-                                                            <i class="bi bi-eye"></i>
-                                                        </button>
-                                                        <button class="btn btn-outline-secondary" @onclick="() => EditLease(lease.Id)" title="Edit">
-                                                            <i class="bi bi-pencil"></i>
-                                                        </button>
-                                                        <button class="btn btn-outline-danger" @onclick="() => DeleteLease(lease.Id)" title="Delete">
-                                                            <i class="bi bi-trash"></i>
-                                                        </button>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                        }
-                                    </tbody>
-                                </table>
-                            </div>
-                        }
-                    </div>
-                }
-            }
-            else
-            {
-                <div class="table-responsive">
-                    <table class="table table-hover"><thead><tr>
-                            <th>
-                                <button class="btn btn-link text-decoration-none p-0 text-dark fw-bold" @onclick="@(() => SortBy("Property"))">
-                                    Property 
-                                    @if (sortColumn == "Property")
-                                    {
-                                        @if (sortAscending)
-                                        {
-                                            <i class="bi bi-arrow-up text-primary"></i>
-                                        }
-                                        else
-                                        {
-                                            <i class="bi bi-arrow-down text-primary"></i>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-arrow-down-up text-muted"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link text-decoration-none p-0 text-dark fw-bold" @onclick="@(() => SortBy("Tenant"))">
-                                    Tenant 
-                                    @if (sortColumn == "Tenant")
-                                    {
-                                        @if (sortAscending)
-                                        {
-                                            <i class="bi bi-arrow-up text-primary"></i>
-                                        }
-                                        else
-                                        {
-                                            <i class="bi bi-arrow-down text-primary"></i>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-arrow-down-up text-muted"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link text-decoration-none p-0 text-dark fw-bold" @onclick="@(() => SortBy("StartDate"))">
-                                    Start Date 
-                                    @if (sortColumn == "StartDate")
-                                    {
-                                        @if (sortAscending)
-                                        {
-                                            <i class="bi bi-arrow-up text-primary"></i>
-                                        }
-                                        else
-                                        {
-                                            <i class="bi bi-arrow-down text-primary"></i>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-arrow-down-up text-muted"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link text-decoration-none p-0 text-dark fw-bold" @onclick="@(() => SortBy("EndDate"))">
-                                    End Date 
-                                    @if (sortColumn == "EndDate")
-                                    {
-                                        @if (sortAscending)
-                                        {
-                                            <i class="bi bi-arrow-up text-primary"></i>
-                                        }
-                                        else
-                                        {
-                                            <i class="bi bi-arrow-down text-primary"></i>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-arrow-down-up text-muted"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link text-decoration-none p-0 text-dark fw-bold" @onclick="@(() => SortBy("MonthlyRent"))">
-                                    Monthly Rent 
-                                    @if (sortColumn == "MonthlyRent")
-                                    {
-                                        @if (sortAscending)
-                                        {
-                                            <i class="bi bi-arrow-up text-primary"></i>
-                                        }
-                                        else
-                                        {
-                                            <i class="bi bi-arrow-down text-primary"></i>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-arrow-down-up text-muted"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link text-decoration-none p-0 text-dark fw-bold" @onclick="@(() => SortBy("Status"))">
-                                    Status 
-                                    @if (sortColumn == "Status")
-                                    {
-                                        @if (sortAscending)
-                                        {
-                                            <i class="bi bi-arrow-up text-primary"></i>
-                                        }
-                                        else
-                                        {
-                                            <i class="bi bi-arrow-down text-primary"></i>
-                                        }
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-arrow-down-up text-muted"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>Actions</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (var lease in pagedLeases)
-                        {
-                            <tr class="@(lease.IsActive ? "" : "table-warning")" id="lease-@lease.Id">
-                                <td>
-                                    <strong>@lease.Property?.Address</strong>
-                                    @if (lease.Property != null)
-                                    {
-                                        <br />
-                                        <small class="text-muted">@lease.Property.City, @lease.Property.State</small>
-                                    }
-                                </td>
-                                <td>
-                                    @if (lease.Tenant != null)
-                                    {
-                                        <strong>@lease.Tenant.FullName</strong>
-                                        <br />
-                                        <small class="text-muted">@lease.Tenant.Email</small>
-                                    }
-                                    else
-                                    {
-                                        <span class="text-warning"><i class="bi bi-hourglass-split"></i> Pending Acceptance</span>
-                                        <br />
-                                        <small class="text-muted">Lease offer awaiting tenant</small>
-                                    }
-                                </td>
-                                <td>@lease.StartDate.ToString("MMM dd, yyyy")</td>
-                                <td>@lease.EndDate.ToString("MMM dd, yyyy")</td>
-                                <td>@lease.MonthlyRent.ToString("C")</td>
-                                <td>
-                                    <span class="badge @GetStatusBadgeClass(lease.Status)">
-                                        @lease.Status
-                                    </span>
-                                    @if (lease.IsActive && lease.DaysRemaining <= 30 && lease.DaysRemaining > 0)
-                                    {
-                                        <br />
-                                        <small class="text-warning">@lease.DaysRemaining days remaining</small>
-                                    }
-                                </td>
-                                <td>
-                                    <div class="btn-group btn-group-sm">
-                                        <button class="btn btn-outline-primary" @onclick="() => ViewLease(lease.Id)" title="View">
-                                            <i class="bi bi-eye"></i>
-                                        </button>
-                                        <button class="btn btn-outline-secondary" @onclick="() => EditLease(lease.Id)" title="Edit">
-                                            <i class="bi bi-pencil"></i>
-                                        </button>
-                                        <button class="btn btn-outline-danger" @onclick="() => DeleteLease(lease.Id)" title="Delete">
-                                            <i class="bi bi-trash"></i>
-                                        </button>
-                                    </div>
-                                </td>
-                            </tr>
-                        }
-                    </tbody>
-                </table>
-            </div>
-            }
-            @if (totalPages > 1 && !groupByProperty)
-            {
-                <div class="card-footer">
-                    <nav aria-label="Leases pagination">
-                        <div class="d-flex justify-content-between align-items-center">
-                            <div>
-                                Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords leases
-                            </div>
-                            <div class="d-flex align-items-center">
-                                <label class="me-2">Page size:</label>
-                                <select class="form-select form-select-sm me-3" style="width: auto;" @bind="pageSize" @bind:after="() => { currentPage = 1; FilterLeases(); }">
-                                    <option value="5">5</option>
-                                    <option value="10">10</option>
-                                    <option value="25">25</option>
-                                    <option value="50">50</option>
-                                </select>
-                                <ul class="pagination pagination-sm mb-0">
-                                    <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                        <button class="page-link" @onclick="() => GoToPage(1)" disabled="@(currentPage == 1)">First</button>
-                                    </li>
-                                    <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                        <button class="page-link" @onclick="() => GoToPage(currentPage - 1)" disabled="@(currentPage == 1)">Previous</button>
-                                    </li>
-                                    @for (int pageNum = Math.Max(1, currentPage - 2); pageNum <= Math.Min(totalPages, currentPage + 2); pageNum++)
-                                    {
-                                        var pageNumber = pageNum;
-                                        <li class="page-item @(currentPage == pageNumber ? "active" : "")">
-                                            <button class="page-link" @onclick="() => GoToPage(pageNumber)">@pageNumber</button>
-                                        </li>
-                                    }
-                                    <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                        <button class="page-link" @onclick="() => GoToPage(currentPage + 1)" disabled="@(currentPage == totalPages)">Next</button>
-                                    </li>
-                                    <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                        <button class="page-link" @onclick="() => GoToPage(totalPages)" disabled="@(currentPage == totalPages)">Last</button>
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
-                    </nav>
-                </div>
-            }
-        </div>
-    </div>
-}
-
-@code {
-    private List<Lease>? leases;
-    private List<Lease> filteredLeases = new();
-    private List<Lease> pagedLeases = new();
-    private IEnumerable<IGrouping<Guid, Lease>> groupedLeases = Enumerable.Empty<IGrouping<Guid, Lease>>();
-    private HashSet<int> expandedProperties = new();
-    private string searchTerm = string.Empty;
-    private string selectedLeaseStatus = string.Empty;
-    private Guid? selectedTenantId;
-    private List<Tenant>? availableTenants;
-    private int activeCount = 0;
-    private int expiringSoonCount = 0;
-    private decimal totalMonthlyRent = 0;
-    private Tenant? filterTenant;
-    private Property? filterProperty;
-    private bool groupByProperty = true;
-    
-    // Paging variables
-    private int currentPage = 1;
-    private int pageSize = 10;
-    private int totalPages = 1;
-    private int totalRecords = 0;
-    
-    // Sorting variables
-    private string sortColumn = "StartDate";
-    private bool sortAscending = false;
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? TenantId { get; set; }
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? PropertyId { get; set; }
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public int? LeaseId { get; set; }
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadFilterEntities();
-        await LoadLeases();
-        LoadFilterOptions();
-        FilterLeases();
-        CalculateMetrics();
-    }
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender && LeaseId.HasValue)
-        {
-            await JSRuntime.InvokeVoidAsync("scrollToElement", $"lease-{LeaseId.Value}");
-        }
-    }
-
-    protected override async Task OnParametersSetAsync()
-    {
-        await LoadFilterEntities();
-        await LoadLeases();
-        LoadFilterOptions();
-        FilterLeases();
-        CalculateMetrics();
-        StateHasChanged();
-    }
-
-    private async Task LoadFilterEntities()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-        
-        if (string.IsNullOrEmpty(userId)) return;
-
-        if (TenantId.HasValue)
-        {
-            filterTenant = await TenantService.GetByIdAsync(TenantId.Value);
-        }
-
-        if (PropertyId.HasValue)
-        {
-            filterProperty = await PropertyService.GetByIdAsync(PropertyId.Value);
-        }
-    }
-
-    private async Task LoadLeases()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-        
-        if (string.IsNullOrEmpty(userId))
-        {
-            leases = new List<Lease>();
-            return;
-        }
-
-        var     allLeases = await LeaseService.GetAllAsync();
-        leases = allLeases
-            .Where(l => 
-                   (!TenantId.HasValue || l.TenantId == TenantId.Value) &&
-                   (!PropertyId.HasValue || l.PropertyId == PropertyId.Value))
-            .OrderByDescending(l => l.StartDate)
-            .ToList();
-    }
-
-    private void LoadFilterOptions()
-    {
-        if (leases != null)
-        {
-            // Load available tenants from leases
-            availableTenants = leases
-                .Where(l => l.Tenant != null)
-                .Select(l => l.Tenant!)
-                .DistinctBy(t => t.Id)
-                .OrderBy(t => t.FirstName)
-                .ThenBy(t => t.LastName)
-                .ToList();
-        }
-    }
-
-    private void FilterLeases()
-    {
-        if (leases == null)
-        {
-            filteredLeases = new();
-            pagedLeases = new();
-            CalculateMetrics();
-            return;
-        }
-
-        filteredLeases = leases.Where(l =>
-            (string.IsNullOrEmpty(searchTerm) ||
-             l.Property?.Address.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) == true ||
-             (l.Tenant != null && l.Tenant.FullName.Contains(searchTerm, StringComparison.OrdinalIgnoreCase)) ||
-             l.Notes.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             l.Terms.Contains(searchTerm, StringComparison.OrdinalIgnoreCase)) &&
-            (string.IsNullOrEmpty(selectedLeaseStatus) || l.Status == selectedLeaseStatus) &&
-            (!selectedTenantId.HasValue || l.TenantId == selectedTenantId.Value)
-        ).ToList();
-        
-        // Apply sorting
-        ApplySorting();
-        
-        if (groupByProperty)
-        {
-            groupedLeases = filteredLeases
-                .Where(l => l.PropertyId != Guid.Empty)
-                .GroupBy(l => l.PropertyId)
-                .OrderBy(g => g.First().Property?.Address)
-                .ToList();
-        }
-        else
-        {
-            // Apply paging
-            totalRecords = filteredLeases.Count;
-            totalPages = (int)Math.Ceiling((double)totalRecords / pageSize);
-            if (currentPage > totalPages) currentPage = Math.Max(1, totalPages);
-            
-            pagedLeases = filteredLeases
-                .Skip((currentPage - 1) * pageSize)
-                .Take(pageSize)
-                .ToList();
-        }
-        
-        CalculateMetrics();
-    }
-    
-    private void TogglePropertyGroup(Guid propertyId)
-    {
-        if (expandedProperties.Contains(propertyId.GetHashCode()))
-        {
-            expandedProperties.Remove(propertyId.GetHashCode());
-        }
-        else
-        {
-            expandedProperties.Add(propertyId.GetHashCode());
-        }
-    }
-    
-    private void ApplySorting()
-    {
-        filteredLeases = sortColumn switch
-        {
-            "Property" => sortAscending
-                ? filteredLeases.OrderBy(l => l.Property?.Address).ToList()
-                : filteredLeases.OrderByDescending(l => l.Property?.Address).ToList(),
-            "Tenant" => sortAscending
-                ? filteredLeases.OrderBy(l => l.Tenant?.FullName).ToList()
-                : filteredLeases.OrderByDescending(l => l.Tenant?.FullName).ToList(),
-            "StartDate" => sortAscending
-                ? filteredLeases.OrderBy(l => l.StartDate).ToList()
-                : filteredLeases.OrderByDescending(l => l.StartDate).ToList(),
-            "EndDate" => sortAscending
-                ? filteredLeases.OrderBy(l => l.EndDate).ToList()
-                : filteredLeases.OrderByDescending(l => l.EndDate).ToList(),
-            "MonthlyRent" => sortAscending
-                ? filteredLeases.OrderBy(l => l.MonthlyRent).ToList()
-                : filteredLeases.OrderByDescending(l => l.MonthlyRent).ToList(),
-            "Status" => sortAscending
-                ? filteredLeases.OrderBy(l => l.Status).ToList()
-                : filteredLeases.OrderByDescending(l => l.Status).ToList(),
-            _ => filteredLeases
-        };
-    }
-    
-    private void SortBy(string column)
-    {
-        if (sortColumn == column)
-        {
-            sortAscending = !sortAscending;
-        }
-        else
-        {
-            sortColumn = column;
-            sortAscending = true;
-        }
-        currentPage = 1;
-        FilterLeases();
-    }
-    
-    private void GoToPage(int page)
-    {
-        if (page >= 1 && page <= totalPages)
-        {
-            currentPage = page;
-            FilterLeases();
-        }
-    }
-
-    private void CalculateMetrics()
-    {
-        if (filteredLeases != null && filteredLeases.Any())
-        {
-            activeCount = filteredLeases.Count(l => l.Status == "Active");
-            
-            // Expiring within 30 days
-            var thirtyDaysFromNow = DateTime.Now.AddDays(30);
-            expiringSoonCount = filteredLeases.Count(l => 
-                l.Status == "Active" && l.EndDate <= thirtyDaysFromNow);
-            
-            totalMonthlyRent = filteredLeases
-                .Where(l => l.Status == "Active")
-                .Sum(l => l.MonthlyRent);
-        }
-        else
-        {
-            activeCount = 0;
-            expiringSoonCount = 0;
-            totalMonthlyRent = 0;
-        }
-    }
-
-    private string GetStatusBadgeClass(string status)
-    {
-        return status switch
-        {
-            "Active" => "bg-success",
-            "Pending" => "bg-info",
-            "Expired" => "bg-warning",
-            "Terminated" => "bg-danger",
-            _ => "bg-secondary"
-        };
-    }
-
-    private void ViewLeaseOffers()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/leaseoffers");
-    }
-
-    private void CreateLease()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/leaseoffers");
-    }
-
-    private void CreateLeaseForTenant()
-    {
-        @* if (TenantId.HasValue)
-        {
-            NavigationManager.NavigateTo($"/propertymanagement/leases/create?tenantId={TenantId.Value}");
-        }
-        else
-        {
-            NavigationManager.NavigateTo("/propertymanagement/leases/create");
-        } *@
-        NavigationManager.NavigateTo("/propertymanagement/leaseoffers");
-    }
-
-    private void CreateLeaseForProperty()
-    {
-        @* if (PropertyId.HasValue)
-        {
-            NavigationManager.NavigateTo($"/propertymanagement/leases/create?propertyId={PropertyId.Value}");
-        }
-        else
-        {
-            NavigationManager.NavigateTo("/propertymanagement/leases/create");
-        } *@
-        NavigationManager.NavigateTo("/propertymanagement/leaseoffers");
-    }
-
-    private void ClearFilter()
-    {
-        TenantId = null;
-        PropertyId = null;
-        filterTenant = null;
-        filterProperty = null;
-        selectedLeaseStatus = string.Empty;
-        selectedTenantId = null;
-        searchTerm = string.Empty;
-        NavigationManager.NavigateTo("/propertymanagement/leases", forceLoad: true);
-    }
-
-    private void ViewLease(Guid id)
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/leases/{id}");
-    }
-
-    private void EditLease(Guid id)
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/leases/{id}/edit");
-    }
-
-    private async Task DeleteLease(Guid id)
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-        
-        if (string.IsNullOrEmpty(userId))
-            return;
-
-        // Add confirmation dialog in a real application
-        var confirmed = await JSRuntime.InvokeAsync<bool>("confirm", $"Are you sure you want to delete lease {id}?");
-        if (!confirmed)
-            return;
-
-        await LeaseService.DeleteAsync(id);
-        await LoadLeases();
-    }
-}
\ No newline at end of file
+<Aquiis.UI.Shared.Features.PropertyManagement.Leases.ListForm />
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/View.razor b/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/View.razor
index def44f5..ee2d8bc 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/View.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Leases/Pages/View.razor
@@ -1,1263 +1,9 @@
 @page "/propertymanagement/leases/{Id:guid}/view"
-
-@using Aquiis.Core.Entities
-@using Aquiis.Core.Validation
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components
-@using Microsoft.AspNetCore.Components.Web
-@using Aquiis.Professional.Features.PropertyManagement
-@using System.ComponentModel.DataAnnotations
-@using Aquiis.Application.Services
-@using Aquiis.Application.Services.Workflows
-@using Aquiis.Professional.Shared.Services
-@using Aquiis.Application.Services.PdfGenerators
-
-@inject NavigationManager Navigation
-@inject LeaseService LeaseService
-@inject InvoiceService InvoiceService
-@inject Application.Services.DocumentService DocumentService
-@inject LeaseWorkflowService LeaseWorkflowService
-@inject UserContextService UserContextService
-@inject LeaseRenewalPdfGenerator RenewalPdfGenerator
-@inject ToastService ToastService
-@inject OrganizationService OrganizationService
-@inject IJSRuntime JSRuntime
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
-
 @rendermode InteractiveServer
 
-@if (lease == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!isAuthorized)
-{
-    <div class="alert alert-danger">
-        <h4>Access Denied</h4>
-        <p>You don't have permission to view this lease.</p>
-        <a href="/propertymanagement/leases" class="btn btn-primary">Back to Leases</a>
-    </div>
-}
-else
-{
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <h1>Lease Details</h1>
-        <div class="btn-group">
-            <button class="btn btn-primary" @onclick="EditLease">
-                <i class="bi bi-pencil"></i> Edit
-            </button>
-            <button class="btn btn-secondary" @onclick="BackToList">
-                <i class="bi bi-arrow-left"></i> Back to List
-            </button>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header d-flex justify-content-between align-items-center">
-                    <h5 class="mb-0">Lease Information</h5>
-                    <span class="badge @GetStatusBadgeClass(lease.Status)">
-                        @lease.Status
-                    </span>
-                </div>
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Property:</strong>
-                            <p>@lease.Property?.Address</p>
-                            <small class="text-muted">@lease.Property?.City, @lease.Property?.State</small>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <strong>Tenant:</strong>
-                            @if (lease.Tenant != null)
-                            {
-                                <p>@lease.Tenant.FullName</p>
-                                <small class="text-muted">@lease.Tenant.Email</small>
-                            }
-                            else
-                            {
-                                <p class="text-warning"><i class="bi bi-hourglass-split"></i> Lease Offer - Awaiting Acceptance</p>
-                                <small class="text-muted">Tenant will be assigned upon acceptance</small>
-                            }
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Start Date:</strong>
-                            <p>@lease.StartDate.ToString("MMMM dd, yyyy")</p>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <strong>End Date:</strong>
-                            <p>@lease.EndDate.ToString("MMMM dd, yyyy")</p>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Monthly Rent:</strong>
-                            <p class="text-success fw-bold">@lease.MonthlyRent.ToString("C")</p>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <strong>Security Deposit:</strong>
-                            <p>@lease.SecurityDeposit.ToString("C")</p>
-                        </div>
-                    </div>
-
-                    @if (!string.IsNullOrEmpty(lease.Terms))
-                    {
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <strong>Lease Terms:</strong>
-                                <p>@lease.Terms</p>
-                            </div>
-                        </div>
-                    }
-
-                    @if (!string.IsNullOrEmpty(lease.Notes))
-                    {
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <strong>Notes:</strong>
-                                <p>@lease.Notes</p>
-                            </div>
-                        </div>
-                    }
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Created:</strong>
-                            <p>@lease.CreatedOn.ToString("MMMM dd, yyyy")</p>
-                        </div>
-                        @if (lease.LastModifiedOn.HasValue)
-                        {
-                            <div class="col-md-6 mb-3">
-                                <strong>Last Modified:</strong>
-                                <p>@lease.LastModifiedOn.Value.ToString("MMMM dd, yyyy")</p>
-                            </div>
-                        }
-                    </div>
-
-                    @if (lease.IsActive)
-                    {
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="alert alert-info">
-                                    <i class="bi bi-info-circle"></i>
-                                    <strong>Active Lease:</strong> This lease is currently active with @lease.DaysRemaining days remaining.
-                                </div>
-                            </div>
-                        </div>
-                    }
-                </div>
-            </div>
-        </div>
-
-        <div class="col-md-4">
-            @if (lease.IsExpiringSoon)
-            {
-                <div class="card border-warning mb-3">
-                    <div class="card-header bg-warning text-dark">
-                        <h5 class="mb-0">
-                            <i class="bi bi-exclamation-triangle-fill"></i> Renewal Alert
-                        </h5>
-                    </div>
-                    <div class="card-body">
-                        <p class="mb-2">
-                            <strong>Expires in:</strong> 
-                            <span class="text-danger fw-bold">@lease.DaysRemaining days</span>
-                        </p>
-                        <p class="mb-2">
-                            <strong>End Date:</strong> @lease.EndDate.ToString("MMM dd, yyyy")
-                        </p>
-                        
-                        @if (!string.IsNullOrEmpty(lease.RenewalStatus))
-                        {
-                            <p class="mb-2">
-                                <strong>Status:</strong> 
-                                <span class="badge bg-@GetRenewalStatusBadgeClass(lease.RenewalStatus)">
-                                    @lease.RenewalStatus
-                                </span>
-                            </p>
-                        }
-
-                        @if (lease.ProposedRenewalRent.HasValue)
-                        {
-                            <p class="mb-2">
-                                <strong>Proposed Rent:</strong> @lease.ProposedRenewalRent.Value.ToString("C")
-                                @if (lease.ProposedRenewalRent != lease.MonthlyRent)
-                                {
-                                    var increase = lease.ProposedRenewalRent.Value - lease.MonthlyRent;
-                                    var percentage = (increase / lease.MonthlyRent) * 100;
-                                    <small class="text-muted">
-                                        (@(increase > 0 ? "+" : "")@increase.ToString("C"), @percentage.ToString("F1")%)
-                                    </small>
-                                }
-                            </p>
-                        }
-
-                        @if (lease.RenewalNotificationSentOn.HasValue)
-                        {
-                            <small class="text-muted d-block mb-2">
-                                Notification sent: @lease.RenewalNotificationSentOn.Value.ToString("MMM dd, yyyy")
-                            </small>
-                        }
-
-                        @if (!string.IsNullOrEmpty(lease.RenewalNotes))
-                        {
-                            <hr/>
-                            <small>
-                                <strong>Notes:</strong><br/>
-                                @lease.RenewalNotes
-                            </small>
-                        }
-
-                        <div class="d-grid gap-2 mt-3">
-                            @if (lease.RenewalStatus == "Pending" || string.IsNullOrEmpty(lease.RenewalStatus))
-                            {
-                                <button class="btn btn-success btn-sm" @onclick="() => ShowRenewalOfferModal()">
-                                    <i class="bi bi-envelope-check"></i> Send Renewal Offer
-                                </button>
-                                <button class="btn btn-outline-primary btn-sm" @onclick="GenerateRenewalOfferPdf" disabled="@isGeneratingPdf">
-                                    @if (isGeneratingPdf)
-                                    {
-                                        <span class="spinner-border spinner-border-sm me-1"></span>
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-file-pdf"></i>
-                                    }
-                                    Generate Offer Letter
-                                </button>
-                            }
-                            @if (lease.RenewalStatus == "Offered")
-                            {
-                                <button class="btn btn-outline-success btn-sm" @onclick="() => MarkRenewalAccepted()">
-                                    <i class="bi bi-check-circle"></i> Mark as Accepted
-                                </button>
-                                <button class="btn btn-outline-danger btn-sm" @onclick="() => MarkRenewalDeclined()">
-                                    <i class="bi bi-x-circle"></i> Mark as Declined
-                                </button>
-                                <button class="btn btn-outline-primary btn-sm" @onclick="GenerateRenewalOfferPdf" disabled="@isGeneratingPdf">
-                                    @if (isGeneratingPdf)
-                                    {
-                                        <span class="spinner-border spinner-border-sm me-1"></span>
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-file-pdf"></i>
-                                    }
-                                    Generate Offer Letter
-                                </button>
-                            }
-                        </div>
-                    </div>
-                </div>
-            }
-            
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Quick Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="EditLease">
-                            <i class="bi bi-pencil"></i> Edit Lease
-                        </button>
-                        <button class="btn btn-outline-success" @onclick="CreateInvoice">
-                            <i class="bi bi-receipt"></i> Create Invoice
-                        </button>
-                        <button class="btn btn-outline-info" @onclick="ViewInvoices">
-                            <i class="bi bi-list-check"></i> View Invoices
-                        </button>
-                        <button class="btn btn-outline-secondary" @onclick="ViewDocuments">
-                            <i class="bi bi-folder"></i> View Documents
-                        </button>
-                        @if (lease.DocumentId == null)
-                        {
-                            <button class="btn btn-outline-warning" @onclick="GenerateLeaseDocument" disabled="@isGenerating">
-                                @if (isGenerating)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                                    <span>Generating...</span>
-                                }
-                                else
-                                {
-                                    <i class="bi bi-file-pdf"></i>
-                                    <span> Generate PDF</span>
-                                }
-                            </button>
-                        }
-                        else
-                        {
-                            <button class="btn btn-primary" @onclick="ViewDocument">
-                                <i class="bi bi-eye"></i> View PDF
-                            </button>
-                            <button class="btn btn-outline-primary" @onclick="DownloadDocument">
-                                <i class="bi bi-download"></i> Download PDF
-                            </button>
-                        }
-                    </div>
-                </div>
-            </div>
-
-            <div class="card mt-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Lease Summary</h5>
-                </div>
-                <div class="card-body">
-                    <p><strong>Duration:</strong> @((lease.EndDate - lease.StartDate).Days) days</p>
-                    <p><strong>Total Rent:</strong> @((lease.MonthlyRent * 12).ToString("C"))/year</p>
-                    @if (lease.IsActive)
-                    {
-                        <p><strong>Days Remaining:</strong> @lease.DaysRemaining</p>
-                    }
-                    @if (recentInvoices.Any())
-                    {
-                        <hr />
-                        <small class="text-muted">
-                            <strong>Recent Invoices:</strong><br />
-                            @foreach (var invoice in recentInvoices.Take(3))
-                            {
-                                <span class="badge @(invoice.Status == "Paid" ? "bg-success" : "bg-warning") me-1">
-                                    @invoice.InvoiceNumber
-                                </span>
-                            }
-                        </small>
-                    }
-                </div>
-            </div>
-
-            @* Lease Lifecycle Management Card *@
-            @if (lease.Status == "Active" || lease.Status == "MonthToMonth" || lease.Status == "NoticeGiven")
-            {
-                <div class="card mt-3 border-warning">
-                    <div class="card-header bg-warning text-dark">
-                        <h5 class="mb-0"><i class="bi bi-exclamation-triangle"></i> Lease Management</h5>
-                    </div>
-                    <div class="card-body">
-                        <div class="d-grid gap-2">
-                            @if (lease.Status == "Active" || lease.Status == "MonthToMonth")
-                            {
-                                <button class="btn btn-outline-warning" @onclick="() => showTerminationNoticeModal = true">
-                                    <i class="bi bi-calendar-x"></i> Record Termination Notice
-                                </button>
-                                <button class="btn btn-outline-danger" @onclick="() => showEarlyTerminationModal = true">
-                                    <i class="bi bi-x-octagon"></i> Early Termination
-                                </button>
-                                <button class="btn btn-outline-secondary" @onclick="() => showConvertMTMModal = true">
-                                    <i class="bi bi-arrow-repeat"></i> Convert to Month-to-Month
-                                </button>
-                            }
-                            @if (lease.Status == "NoticeGiven")
-                            {
-                                <div class="alert alert-info mb-2">
-                                    <small>
-                                        <strong>Notice Given:</strong> @lease.TerminationNoticedOn?.ToString("MMM dd, yyyy")<br/>
-                                        <strong>Expected Move-Out:</strong> @lease.ExpectedMoveOutDate?.ToString("MMM dd, yyyy")
-                                    </small>
-                                </div>
-                                <button class="btn btn-primary" @onclick="() => showMoveOutModal = true">
-                                    <i class="bi bi-box-seam"></i> Complete Move-Out
-                                </button>
-                                <button class="btn btn-outline-danger" @onclick="() => showEarlyTerminationModal = true">
-                                    <i class="bi bi-x-octagon"></i> Early Termination
-                                </button>
-                            }
-                        </div>
-                    </div>
-                </div>
-            }
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-8 mt-4">
-            <div class="card">
-                <div class="card-header d-flex justify-content-between align-items-center">
-                    <h5 class="mb-0">Notes</h5>
-                </div>
-                <div class="card-body">
-                    <NotesTimeline EntityType="Lease" EntityId="@lease.Id" />
-                </div>
-            </div>
-        </div>
-    </div>
-    @* Renewal Offer Modal *@
-    @if (showRenewalModal && lease != null)
-    {
-        <div class="modal fade show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title">Send Renewal Offer</h5>
-                        <button type="button" class="btn-close" @onclick="() => showRenewalModal = false"></button>
-                    </div>
-                    <div class="modal-body">
-                        <div class="mb-3">
-                            <label class="form-label">Current Rent</label>
-                            <input type="text" class="form-control" value="@lease.MonthlyRent.ToString("C")" disabled />
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Proposed Renewal Rent</label>
-                            <div class="input-group">
-                                <span class="input-group-text">$</span>
-                                <input type="number" class="form-control" @bind="proposedRent" step="0.01" />
-                            </div>
-                            @if (proposedRent != lease.MonthlyRent)
-                            {
-                                var increase = proposedRent - lease.MonthlyRent;
-                                var percentage = (increase / lease.MonthlyRent) * 100;
-                                <small class="text-muted">
-                                    Change: @(increase > 0 ? "+" : "")@increase.ToString("C") (@percentage.ToString("F1")%)
-                                </small>
-                            }
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Notes (Optional)</label>
-                            <textarea class="form-control" rows="3" @bind="renewalNotes" 
-                                      placeholder="Add any notes about the renewal offer..."></textarea>
-                        </div>
-                        <div class="alert alert-info">
-                            <i class="bi bi-info-circle"></i>
-                            <small>
-                                This will mark the lease as "Offered" and record the proposed rent. 
-                                An email notification will be sent to the tenant (when email service is configured).
-                            </small>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" @onclick="() => showRenewalModal = false">
-                            Cancel
-                        </button>
-                        <button type="button" class="btn btn-primary" @onclick="SendRenewalOffer">
-                            Send Offer
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-
-    @* Termination Notice Modal *@
-    @if (showTerminationNoticeModal && lease != null)
-    {
-        <div class="modal fade show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header bg-warning text-dark">
-                        <h5 class="modal-title"><i class="bi bi-calendar-x"></i> Record Termination Notice</h5>
-                        <button type="button" class="btn-close" @onclick="() => showTerminationNoticeModal = false"></button>
-                    </div>
-                    <div class="modal-body">
-                        <div class="mb-3">
-                            <label class="form-label">Notice Type <span class="text-danger">*</span></label>
-                            <select class="form-select" @bind="terminationNoticeType">
-                                <option value="">Select type...</option>
-                                <option value="Tenant">Tenant Notice (Tenant initiated)</option>
-                                <option value="Landlord">Landlord Notice (Property manager initiated)</option>
-                                <option value="Mutual">Mutual Agreement</option>
-                            </select>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Notice Date <span class="text-danger">*</span></label>
-                            <input type="date" class="form-control" @bind="terminationNoticeDate" />
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Expected Move-Out Date <span class="text-danger">*</span></label>
-                            <input type="date" class="form-control" @bind="terminationExpectedMoveOutDate" />
-                            <small class="text-muted">Must be in the future</small>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Reason <span class="text-danger">*</span></label>
-                            <textarea class="form-control" rows="3" @bind="terminationReason"
-                                      placeholder="Provide the reason for termination..."></textarea>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" @onclick="() => showTerminationNoticeModal = false">
-                            Cancel
-                        </button>
-                        <button type="button" class="btn btn-warning" @onclick="RecordTerminationNotice" 
-                                disabled="@(string.IsNullOrWhiteSpace(terminationNoticeType) || string.IsNullOrWhiteSpace(terminationReason) || isSubmitting)">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-1"></span>
-                            }
-                            Record Notice
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-
-    @* Early Termination Modal *@
-    @if (showEarlyTerminationModal && lease != null)
-    {
-        <div class="modal fade show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header bg-danger text-white">
-                        <h5 class="modal-title"><i class="bi bi-x-octagon"></i> Early Termination</h5>
-                        <button type="button" class="btn-close btn-close-white" @onclick="() => showEarlyTerminationModal = false"></button>
-                    </div>
-                    <div class="modal-body">
-                        <div class="alert alert-danger">
-                            <strong>Warning:</strong> This action will immediately terminate the lease and cannot be undone.
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Termination Type <span class="text-danger">*</span></label>
-                            <select class="form-select" @bind="earlyTerminationType">
-                                <option value="">Select type...</option>
-                                <option value="Eviction">Eviction</option>
-                                <option value="Breach">Lease Breach</option>
-                                <option value="Mutual">Mutual Agreement</option>
-                                <option value="Emergency">Emergency</option>
-                            </select>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Effective Date <span class="text-danger">*</span></label>
-                            <input type="date" class="form-control" @bind="earlyTerminationDate" />
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Reason <span class="text-danger">*</span></label>
-                            <textarea class="form-control" rows="3" @bind="earlyTerminationReason"
-                                      placeholder="Provide detailed reason for early termination..."></textarea>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" @onclick="() => showEarlyTerminationModal = false">
-                            Cancel
-                        </button>
-                        <button type="button" class="btn btn-danger" @onclick="EarlyTerminateLease"
-                                disabled="@(string.IsNullOrWhiteSpace(earlyTerminationType) || string.IsNullOrWhiteSpace(earlyTerminationReason) || isSubmitting)">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-1"></span>
-                            }
-                            Terminate Lease
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-
-    @* Move-Out Completion Modal *@
-    @if (showMoveOutModal && lease != null)
-    {
-        <div class="modal fade show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header bg-primary text-white">
-                        <h5 class="modal-title"><i class="bi bi-box-seam"></i> Complete Move-Out</h5>
-                        <button type="button" class="btn-close btn-close-white" @onclick="() => showMoveOutModal = false"></button>
-                    </div>
-                    <div class="modal-body">
-                        <div class="mb-3">
-                            <label class="form-label">Actual Move-Out Date <span class="text-danger">*</span></label>
-                            <input type="date" class="form-control" @bind="actualMoveOutDate" />
-                        </div>
-                        <div class="mb-3">
-                            <div class="form-check">
-                                <input class="form-check-input" type="checkbox" @bind="moveOutFinalInspection" id="finalInspection" />
-                                <label class="form-check-label" for="finalInspection">
-                                    Final inspection completed
-                                </label>
-                            </div>
-                        </div>
-                        <div class="mb-3">
-                            <div class="form-check">
-                                <input class="form-check-input" type="checkbox" @bind="moveOutKeysReturned" id="keysReturned" />
-                                <label class="form-check-label" for="keysReturned">
-                                    Keys returned
-                                </label>
-                            </div>
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">Notes (Optional)</label>
-                            <textarea class="form-control" rows="3" @bind="moveOutNotes"
-                                      placeholder="Any notes about the move-out condition..."></textarea>
-                        </div>
-                        <div class="alert alert-info">
-                            <small>
-                                <i class="bi bi-info-circle"></i> This will:
-                                <ul class="mb-0 mt-1">
-                                    <li>Mark the lease as Terminated</li>
-                                    <li>Update property status to Available</li>
-                                    <li>Update tenant active status</li>
-                                </ul>
-                            </small>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" @onclick="() => showMoveOutModal = false">
-                            Cancel
-                        </button>
-                        <button type="button" class="btn btn-primary" @onclick="CompleteMoveOut" disabled="@isSubmitting">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-1"></span>
-                            }
-                            Complete Move-Out
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-
-    @* Convert to Month-to-Month Modal *@
-    @if (showConvertMTMModal && lease != null)
-    {
-        <div class="modal fade show d-block" tabindex="-1" style="background-color: rgba(0,0,0,0.5);">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title"><i class="bi bi-arrow-repeat"></i> Convert to Month-to-Month</h5>
-                        <button type="button" class="btn-close" @onclick="() => showConvertMTMModal = false"></button>
-                    </div>
-                    <div class="modal-body">
-                        <p>This will convert the lease to a month-to-month arrangement.</p>
-                        <div class="mb-3">
-                            <label class="form-label">Current Monthly Rent</label>
-                            <input type="text" class="form-control" value="@lease.MonthlyRent.ToString("C")" disabled />
-                        </div>
-                        <div class="mb-3">
-                            <label class="form-label">New Monthly Rent (Optional)</label>
-                            <div class="input-group">
-                                <span class="input-group-text">$</span>
-                                <input type="number" class="form-control" @bind="mtmNewRent" step="0.01" placeholder="Leave empty to keep current rent" />
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" @onclick="() => showConvertMTMModal = false">
-                            Cancel
-                        </button>
-                        <button type="button" class="btn btn-primary" @onclick="ConvertToMonthToMonth" disabled="@isSubmitting">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-1"></span>
-                            }
-                            Convert
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-}
+<Aquiis.UI.Shared.Features.PropertyManagement.Leases.ViewForm LeaseId="@Id" />
 
 @code {
     [Parameter] public Guid Id { get; set; }
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? PropertyId { get; set; }
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? TenantId { get; set; }
-
-    private Lease? lease;
-    private List<Invoice> recentInvoices = new();
-    private bool isAuthorized = true;
-    private bool isGenerating = false;
-    private bool isGeneratingPdf = false;
-    private bool isSubmitting = false;
-    private bool showRenewalModal = false;
-    private decimal proposedRent = 0;
-    private string renewalNotes = "";
-    private Document? document = null;
-
-    // Termination Notice state
-    private bool showTerminationNoticeModal = false;
-    private string terminationNoticeType = "";
-    private DateTime terminationNoticeDate = DateTime.Today;
-    private DateTime terminationExpectedMoveOutDate = DateTime.Today.AddDays(30);
-    private string terminationReason = "";
-
-    // Early Termination state
-    private bool showEarlyTerminationModal = false;
-    private string earlyTerminationType = "";
-    private DateTime earlyTerminationDate = DateTime.Today;
-    private string earlyTerminationReason = "";
-
-    // Move-Out state
-    private bool showMoveOutModal = false;
-    private DateTime actualMoveOutDate = DateTime.Today;
-    private bool moveOutFinalInspection = false;
-    private bool moveOutKeysReturned = false;
-    private string moveOutNotes = "";
-
-    // Month-to-Month conversion state
-    private bool showConvertMTMModal = false;
-    private decimal? mtmNewRent = null;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    private LeaseModel leaseModel = new();
-    private Property? selectedProperty;
-    private List<Property> availableProperties = new();
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadLease();
-
-         // If PropertyId is provided in query string, pre-select it
-        if (PropertyId.HasValue)
-        {
-            leaseModel.PropertyId = PropertyId.Value;
-            await OnPropertyChanged();
-        }
-        
-        // If TenantId is provided in query string, pre-select it
-        if (TenantId.HasValue)
-        {
-            leaseModel.TenantId = TenantId.Value;
-        }
-    }
-
-    private async Task LoadLease()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (string.IsNullOrEmpty(userId))
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        lease = await LeaseService.GetByIdAsync(Id);
-
-        if (lease == null)
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        var invoices = await InvoiceService.GetInvoicesByLeaseIdAsync(Id);
-        recentInvoices = invoices
-            .OrderByDescending(i => i.DueOn)
-            .Take(5)
-            .ToList();
-
-        // Load the document if it exists
-        if (lease.DocumentId != null)
-        {
-            document = await DocumentService.GetByIdAsync(lease.DocumentId.Value);
-        }
-    }
-
-    private string GetStatusBadgeClass(string status)
-    {
-        return status switch
-        {
-            "Active" => "bg-success",
-            "Pending" => "bg-warning",
-            "Expired" => "bg-secondary",
-            "Terminated" => "bg-danger",
-            _ => "bg-secondary"
-        };
-    }
-
-    private string GetRenewalStatusBadgeClass(string status)
-    {
-        return status switch
-        {
-            "Pending" => "secondary",
-            "Offered" => "info",
-            "Accepted" => "success",
-            "Declined" => "danger",
-            "Expired" => "dark",
-            _ => "secondary"
-        };
-    }
-
-    private void ShowRenewalOfferModal()
-    {
-        proposedRent = lease?.MonthlyRent ?? 0;
-        renewalNotes = "";
-        showRenewalModal = true;
-    }
-
-    private async Task SendRenewalOffer()
-    {
-        if (lease == null) return;
-
-        try
-        {
-            // Update lease with renewal offer details
-            lease.RenewalStatus = "Offered";
-            lease.ProposedRenewalRent = proposedRent;
-            lease.RenewalOfferedOn = DateTime.UtcNow;
-            lease.RenewalNotes = renewalNotes;
-
-            await LeaseService.UpdateAsync(lease);
-            
-            // TODO: Send email notification to tenant
-            
-            showRenewalModal = false;
-            await LoadLease();
-            StateHasChanged();
-
-            ToastService.ShowSuccess("Renewal offer sent successfully! You can now generate the offer letter PDF.");
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error sending renewal offer: {ex.Message}");
-        }
-    }
-
-    private async Task GenerateRenewalOfferPdf()
-    {
-        if (lease == null) return;
-
-        try
-        {
-            isGeneratingPdf = true;
-            StateHasChanged();
-
-            // Ensure proposed rent is set
-            if (!lease.ProposedRenewalRent.HasValue)
-            {
-                lease.ProposedRenewalRent = lease.MonthlyRent;
-            }
-
-            // Generate renewal offer PDF
-            var pdfBytes = RenewalPdfGenerator.GenerateRenewalOfferLetter(lease, lease.Property, lease.Tenant!);
-            var fileName = $"Lease_Renewal_Offer_{lease.Property?.Address?.Replace(" ", "_")}_{DateTime.Now:yyyyMMdd_HHmmss}.pdf";
-
-            // Save PDF to Documents table
-            var document = new Document
-            {
-                PropertyId = lease.PropertyId,
-                TenantId = lease.TenantId,
-                LeaseId = lease.Id,
-                FileName = fileName,
-                FileType = "application/pdf",
-                FileSize = pdfBytes.Length,
-                FileData = pdfBytes,
-                FileExtension = ".pdf",
-                ContentType = "application/pdf",
-                DocumentType = "Lease Renewal Offer",
-                Description = $"Renewal offer letter for {lease.Property?.Address}. Proposed rent: {lease.ProposedRenewalRent:C}"
-            };
-
-            await DocumentService.CreateAsync(document);
-            
-            ToastService.ShowSuccess($"Renewal offer letter generated and saved to documents!");
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error generating PDF: {ex.Message}");
-        }
-        finally
-        {
-            isGeneratingPdf = false;
-            StateHasChanged();
-        }
-    }
-
-    private async Task MarkRenewalAccepted()
-    {
-        if (lease == null) return;
-
-        try
-        {
-            // Create renewal model with proposed terms
-            var renewalModel = new LeaseRenewalModel
-            {
-                NewStartDate = DateTime.Today,
-                NewEndDate = DateTime.Today.AddYears(1),
-                NewMonthlyRent = lease.ProposedRenewalRent ?? lease.MonthlyRent,
-                UpdatedSecurityDeposit = lease.SecurityDeposit,
-                NewTerms = lease.Terms
-            };
-
-            var result = await LeaseWorkflowService.RenewLeaseAsync(lease.Id, renewalModel);
-
-            if (result.Success && result.Data != null)
-            {
-                await LoadLease();
-                StateHasChanged();
-
-                ToastService.ShowSuccess($"Renewal accepted! New lease created from {result.Data.StartDate:MMM dd, yyyy} to {result.Data.EndDate:MMM dd, yyyy}.");
-            }
-            else
-            {
-                ToastService.ShowError($"Error accepting renewal: {string.Join(", ", result.Errors)}");
-            }
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error accepting renewal: {ex.Message}");
-        }
-    }
-
-    private async Task MarkRenewalDeclined()
-    {
-        if (lease == null) return;
-
-        try
-        {
-            lease.RenewalStatus = "Declined";
-            lease.RenewalResponseOn = DateTime.UtcNow;
-            await LeaseService.UpdateAsync(lease);
-            await LoadLease();
-            StateHasChanged();
-
-            ToastService.ShowWarning("Renewal offer marked as declined.");
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error updating renewal status: {ex.Message}");
-        }
-    }
-
-    #region Lease Workflow Methods
-
-    private async Task RecordTerminationNotice()
-    {
-        if (lease == null || string.IsNullOrWhiteSpace(terminationNoticeType) || string.IsNullOrWhiteSpace(terminationReason)) 
-            return;
-
-        isSubmitting = true;
-        StateHasChanged();
-
-        try
-        {
-            var result = await LeaseWorkflowService.RecordTerminationNoticeAsync(
-                lease.Id,
-                terminationNoticeDate,
-                terminationExpectedMoveOutDate,
-                terminationNoticeType,
-                terminationReason);
-
-            if (result.Success)
-            {
-                showTerminationNoticeModal = false;
-                ResetTerminationNoticeForm();
-                await LoadLease();
-                ToastService.ShowSuccess(result.Message);
-            }
-            else
-            {
-                ToastService.ShowError(string.Join(", ", result.Errors));
-            }
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error recording termination notice: {ex.Message}");
-        }
-        finally
-        {
-            isSubmitting = false;
-            StateHasChanged();
-        }
-    }
-
-    private async Task EarlyTerminateLease()
-    {
-        if (lease == null || string.IsNullOrWhiteSpace(earlyTerminationType) || string.IsNullOrWhiteSpace(earlyTerminationReason))
-            return;
-
-        isSubmitting = true;
-        StateHasChanged();
-
-        try
-        {
-            var result = await LeaseWorkflowService.EarlyTerminateAsync(
-                lease.Id,
-                earlyTerminationType,
-                earlyTerminationReason,
-                earlyTerminationDate);
-
-            if (result.Success)
-            {
-                showEarlyTerminationModal = false;
-                ResetEarlyTerminationForm();
-                await LoadLease();
-                ToastService.ShowSuccess(result.Message);
-            }
-            else
-            {
-                ToastService.ShowError(string.Join(", ", result.Errors));
-            }
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error terminating lease: {ex.Message}");
-        }
-        finally
-        {
-            isSubmitting = false;
-            StateHasChanged();
-        }
-    }
-
-    private async Task CompleteMoveOut()
-    {
-        if (lease == null) return;
-
-        isSubmitting = true;
-        StateHasChanged();
-
-        try
-        {
-            var moveOutModel = new MoveOutModel
-            {
-                FinalInspectionCompleted = moveOutFinalInspection,
-                KeysReturned = moveOutKeysReturned,
-                Notes = moveOutNotes
-            };
-
-            var result = await LeaseWorkflowService.CompleteMoveOutAsync(
-                lease.Id,
-                actualMoveOutDate,
-                moveOutModel);
-
-            if (result.Success)
-            {
-                showMoveOutModal = false;
-                ResetMoveOutForm();
-                await LoadLease();
-                ToastService.ShowSuccess(result.Message);
-            }
-            else
-            {
-                ToastService.ShowError(string.Join(", ", result.Errors));
-            }
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error completing move-out: {ex.Message}");
-        }
-        finally
-        {
-            isSubmitting = false;
-            StateHasChanged();
-        }
-    }
-
-    private async Task ConvertToMonthToMonth()
-    {
-        if (lease == null) return;
-
-        isSubmitting = true;
-        StateHasChanged();
-
-        try
-        {
-            var result = await LeaseWorkflowService.ConvertToMonthToMonthAsync(
-                lease.Id,
-                mtmNewRent);
-
-            if (result.Success)
-            {
-                showConvertMTMModal = false;
-                mtmNewRent = null;
-                await LoadLease();
-                ToastService.ShowSuccess(result.Message);
-            }
-            else
-            {
-                ToastService.ShowError(string.Join(", ", result.Errors));
-            }
-        }
-        catch (Exception ex)
-        {
-            ToastService.ShowError($"Error converting to month-to-month: {ex.Message}");
-        }
-        finally
-        {
-            isSubmitting = false;
-            StateHasChanged();
-        }
-    }
-
-    private void ResetTerminationNoticeForm()
-    {
-        terminationNoticeType = "";
-        terminationNoticeDate = DateTime.Today;
-        terminationExpectedMoveOutDate = DateTime.Today.AddDays(30);
-        terminationReason = "";
-    }
-
-    private void ResetEarlyTerminationForm()
-    {
-        earlyTerminationType = "";
-        earlyTerminationDate = DateTime.Today;
-        earlyTerminationReason = "";
-    }
-
-    private void ResetMoveOutForm()
-    {
-        actualMoveOutDate = DateTime.Today;
-        moveOutFinalInspection = false;
-        moveOutKeysReturned = false;
-        moveOutNotes = "";
-    }
-
-    #endregion
-
-    private async Task OnPropertyChanged()
-    {
-        if (leaseModel.PropertyId != Guid.Empty)
-        {
-            selectedProperty = availableProperties.FirstOrDefault(p => p.Id == leaseModel.PropertyId);
-            if (selectedProperty != null)
-            {
-                // Get organization settings for security deposit calculation
-                var settings = await OrganizationService.GetOrganizationSettingsAsync();
-                var depositMultiplier = settings?.AutoCalculateSecurityDeposit == true 
-                    ? settings.SecurityDepositMultiplier 
-                    : 1.0m;
-
-                leaseModel.MonthlyRent = selectedProperty.MonthlyRent;
-                leaseModel.SecurityDeposit = selectedProperty.MonthlyRent * depositMultiplier;
-            }
-        }
-        else
-        {
-            selectedProperty = null;
-        }
-        StateHasChanged();
-    }
-
-    private void EditLease()
-    {
-        Navigation.NavigateTo($"/propertymanagement/leases/{Id}/edit");
-    }
-
-    private void BackToList()
-    {
-        Navigation.NavigateTo("/propertymanagement/leases");
-    }
-
-    private void CreateInvoice()
-    {
-        Navigation.NavigateTo($"/propertymanagement/invoices/create?leaseId={Id}");
-    }
-
-    private void ViewInvoices()
-    {
-        Navigation.NavigateTo($"/propertymanagement/invoices?leaseId={Id}");
-    }
-
-    private void ViewDocuments()
-    {
-        Navigation.NavigateTo($"/propertymanagement/leases/{Id}/documents");
-    }
-
-    private async Task ViewDocument()
-    {
-        if (document != null)
-        {
-            var base64Data = Convert.ToBase64String(document.FileData);
-            await JSRuntime.InvokeVoidAsync("viewFile", base64Data, document.FileType);
-        }
-    }
-
-    private async Task DownloadDocument()
-    {
-        if (document != null)
-        {
-            var fileName = document.FileName;
-            var fileData = document.FileData;
-            var mimeType = document.FileType;
-
-            await JSRuntime.InvokeVoidAsync("downloadFile", fileName, Convert.ToBase64String(fileData), mimeType);
-        }
-    }
-
-    private async Task GenerateLeaseDocument()
-    {
-        isGenerating = true;
-        StateHasChanged();
-
-        try
-        {
-            // Generate the PDF
-            byte[] pdfBytes = await LeasePdfGenerator.GenerateLeasePdf(lease!);
-
-            // Create the document entity
-            var document = new Document
-            {
-                FileName = $"Lease_{lease!.Property?.Address?.Replace(" ", "_")}_{DateTime.Now:yyyyMMdd}.pdf",
-                FileExtension = ".pdf",
-                FileData = pdfBytes,
-                FileSize = pdfBytes.Length,
-                FileType = "application/pdf",
-                DocumentType = "Lease Agreement",
-                Description = "Auto-generated lease agreement",
-                LeaseId = lease.Id,
-                PropertyId = lease.PropertyId,
-                TenantId = lease.TenantId,
-            };
-
-            // Save to database
-            await DocumentService.CreateAsync(document);
-
-            // Update lease with DocumentId
-            lease.DocumentId = document.Id;
-            
-            await LeaseService.UpdateAsync(lease);
-
-            // Reload lease and document
-            await LoadLease();
-            StateHasChanged();
-
-            await JSRuntime.InvokeVoidAsync("alert", "Lease document generated successfully!");
-        }
-        catch (Exception ex)
-        {
-            await JSRuntime.InvokeVoidAsync("alert", $"Error generating lease document: {ex.Message}");
-        }
-        finally
-        {
-            isGenerating = false;
-            StateHasChanged();
-        }
-    }
-
-    public class LeaseModel
-    {
-        [RequiredGuid(ErrorMessage = "Property is required")]
-        public Guid PropertyId { get; set; }
-
-        [RequiredGuid(ErrorMessage = "Tenant is required")]
-        public Guid TenantId { get; set; }
-
-        [Required(ErrorMessage = "Start date is required")]
-        public DateTime StartDate { get; set; } = DateTime.Today;
-
-        [Required(ErrorMessage = "End date is required")]
-        public DateTime EndDate { get; set; } = DateTime.Today.AddYears(1);
-
-        [Required(ErrorMessage = "Monthly rent is required")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Monthly rent must be greater than 0")]
-        public decimal MonthlyRent { get; set; }
-
-        [Range(0, double.MaxValue, ErrorMessage = "Security deposit cannot be negative")]
-        public decimal SecurityDeposit { get; set; }
-
-        [Required(ErrorMessage = "Status is required")]
-        [StringLength(50)]
-        public string Status { get; set; } = "Active";
-
-        [StringLength(1000, ErrorMessage = "Terms cannot exceed 1000 characters")]
-        public string Terms { get; set; } = string.Empty;
-
-        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
-        public string Notes { get; set; } = string.Empty;
-    }
-}
\ No newline at end of file
+}
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/Create.razor b/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/Create.razor
index 6e8c922..17e0176 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/Create.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/Create.razor
@@ -1,354 +1,12 @@
-@page "/propertymanagement/maintenance/create/{PropertyId:int?}"
-@using Aquiis.Application.Services
-@using Aquiis.Professional.Shared.Services
-@using Aquiis.Application.Services.PdfGenerators
-@using Microsoft.Extensions.Configuration.UserSecrets
-@using System.ComponentModel.DataAnnotations
-@inject MaintenanceService MaintenanceService
-@inject PropertyService PropertyService
-@inject LeaseService LeaseService
-@inject NavigationManager NavigationManager
-
+@page "/propertymanagement/maintenance/create/{PropertyId:guid?}"
+@using Aquiis.UI.Shared.Features.PropertyManagement.MaintenanceRequests
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Create Maintenance Request</PageTitle>
-
-<div class="container-fluid">
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <h1><i class="bi bi-tools"></i> Create Maintenance Request</h1>
-        <button class="btn btn-outline-secondary" @onclick="Cancel">
-            <i class="bi bi-x-circle"></i> Cancel
-        </button>
-    </div>
-
-    @if (isLoading)
-    {
-        <div class="text-center">
-            <div class="spinner-border" role="status">
-                <span class="visually-hidden">Loading...</span>
-            </div>
-        </div>
-    }
-    else
-    {
-        <div class="row">
-            <div class="col-md-8">
-                <div class="card">
-                    <div class="card-body">
-                        <EditForm Model="maintenanceRequest" OnValidSubmit="HandleValidSubmit">
-                            <DataAnnotationsValidator />
-                            <ValidationSummary class="text-danger" />
-
-                            <div class="row mb-3">
-                                <div class="col-md-6">
-                                    <label class="form-label">Property *</label>
-                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.PropertyId" @bind-Value:after="OnPropertyChangedAsync">
-                                        <option value="0">-- Select Property --</option>
-                                        @foreach (var property in properties)
-                                        {
-                                            <option value="@property.Id">@property.Address</option>
-                                        }
-                                    </InputSelect>
-                                    <ValidationMessage For="@(() => maintenanceRequest.PropertyId)" />
-                                </div>
-                                <div class="col-md-6">
-                                    <label class="form-label">Active Lease</label>
-                                    <div class="form-control bg-light">
-                                        @if (currentLease != null)
-                                        {
-                                            <text>@currentLease.Tenant?.FullName - @currentLease.Status</text>
-                                        }
-                                        else
-                                        {
-                                            <em>No active leases</em>
-                                        }
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="mb-3">
-                                <label class="form-label">Title *</label>
-                                <InputText class="form-control" @bind-Value="maintenanceRequest.Title" placeholder="Brief description of the issue" />
-                                <ValidationMessage For="@(() => maintenanceRequest.Title)" />
-                            </div>
-
-                            <div class="mb-3">
-                                <label class="form-label">Description *</label>
-                                <InputTextArea class="form-control" @bind-Value="maintenanceRequest.Description" rows="4" placeholder="Detailed description of the maintenance issue" />
-                                <ValidationMessage For="@(() => maintenanceRequest.Description)" />
-                            </div>
-
-                            <div class="row mb-3">
-                                <div class="col-md-6">
-                                    <label class="form-label">Request Type *</label>
-                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.RequestType">
-                                        <option value="">-- Select Type --</option>
-                                        @foreach (var type in ApplicationConstants.MaintenanceRequestTypes.AllMaintenanceRequestTypes)
-                                        {
-                                            <option value="@type">@type</option>
-                                        }
-                                    </InputSelect>
-                                    <ValidationMessage For="@(() => maintenanceRequest.RequestType)" />
-                                </div>
-                                <div class="col-md-6">
-                                    <label class="form-label">Priority *</label>
-                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.Priority">
-                                        @foreach (var priority in ApplicationConstants.MaintenanceRequestPriorities.AllMaintenanceRequestPriorities)
-                                        {
-                                            <option value="@priority">@priority</option>
-                                        }
-                                    </InputSelect>
-                                    <ValidationMessage For="@(() => maintenanceRequest.Priority)" />
-                                </div>
-                            </div>
-
-                            <div class="mb-3">
-                                <label class="form-label">Requested By</label>
-                                <InputText class="form-control" @bind-Value="maintenanceRequest.RequestedBy" placeholder="Name of person requesting" />
-                            </div>
-
-                            <div class="row mb-3">
-                                <div class="col-md-6">
-                                    <label class="form-label">Email</label>
-                                    <InputText type="email" class="form-control" @bind-Value="maintenanceRequest.RequestedByEmail" placeholder="email@example.com" />
-                                </div>
-                                <div class="col-md-6">
-                                    <label class="form-label">Phone</label>
-                                    <InputText class="form-control" @bind-Value="maintenanceRequest.RequestedByPhone" placeholder="(555) 123-4567" />
-                                </div>
-                            </div>
-
-                            <div class="row mb-3">
-                                <div class="col-md-6">
-                                    <label class="form-label">Requested Date *</label>
-                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.RequestedOn" />
-                                    <ValidationMessage For="@(() => maintenanceRequest.RequestedOn)" />
-                                </div>
-                                <div class="col-md-6">
-                                    <label class="form-label">Scheduled Date</label>
-                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.ScheduledOn" />
-                                </div>
-                            </div>
-
-                            <div class="row mb-3">
-                                <div class="col-md-6">
-                                    <label class="form-label">Estimated Cost</label>
-                                    <InputNumber class="form-control" @bind-Value="maintenanceRequest.EstimatedCost" />
-                                </div>
-                                <div class="col-md-6">
-                                    <label class="form-label">Assigned To</label>
-                                    <InputText class="form-control" @bind-Value="maintenanceRequest.AssignedTo" placeholder="Contractor or maintenance person" />
-                                </div>
-                            </div>
-
-                            <div class="d-flex justify-content-end gap-2">
-                                <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                                <button type="submit" class="btn btn-primary" disabled="@isSaving">
-                                    @if (isSaving)
-                                    {
-                                        <span class="spinner-border spinner-border-sm me-2" role="status" aria-hidden="true"></span>
-                                        <span>Creating...</span>
-                                    }
-                                    else
-                                    {
-                                        <i class="bi bi-check-circle me-2"></i>
-                                        <span>Create Request</span>
-                                    }
-                                </button>
-                            </div>
-                        </EditForm>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-md-4">
-                <div class="card">
-                    <div class="card-header">
-                        <h5 class="mb-0"><i class="bi bi-info-circle"></i> Information</h5>
-                    </div>
-                    <div class="card-body">
-                        <h6>Priority Levels</h6>
-                        <ul class="list-unstyled">
-                            <li class="mb-2">
-                                <span class="badge bg-danger">Urgent</span> - Immediate attention required
-                            </li>
-                            <li class="mb-2">
-                                <span class="badge bg-warning">High</span> - Should be addressed soon
-                            </li>
-                            <li class="mb-2">
-                                <span class="badge bg-info">Medium</span> - Normal priority
-                            </li>
-                            <li class="mb-2">
-                                <span class="badge bg-secondary">Low</span> - Can wait
-                            </li>
-                        </ul>
-
-                        <hr />
-
-                        <h6>Request Types</h6>
-                        <ul class="small">
-                            <li>Plumbing</li>
-                            <li>Electrical</li>
-                            <li>Heating/Cooling</li>
-                            <li>Appliance</li>
-                            <li>Structural</li>
-                            <li>Landscaping</li>
-                            <li>Pest Control</li>
-                            <li>Other</li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-</div>
+<MaintenanceCreateForm PropertyId="@PropertyId" />
 
 @code {
     [Parameter]
     [SupplyParameterFromQuery]
     public Guid? PropertyId { get; set; }
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? LeaseId { get; set; }
-    private MaintenanceRequestModel maintenanceRequest = new();
-    private List<Property> properties = new();
-    private Lease? currentLease = null;
-    private bool isLoading = true;
-    private bool isSaving = false;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadData();
-    }
-
-    protected override async Task OnParametersSetAsync()
-    {
-        if (PropertyId.HasValue && PropertyId.Value != Guid.Empty && maintenanceRequest.PropertyId != PropertyId.Value)
-        {
-            maintenanceRequest.PropertyId = PropertyId.Value;
-            if (properties.Any())
-            {
-                await LoadLeaseForProperty(PropertyId.Value);
-            }
-        }
-        if (LeaseId.HasValue && LeaseId.Value != Guid.Empty && maintenanceRequest.LeaseId != LeaseId.Value)
-        {
-            maintenanceRequest.LeaseId = LeaseId.Value;
-        }
-    }
-
-    private async Task LoadData()
-    {
-        isLoading = true;
-        try
-        {
-            properties = await PropertyService.GetAllAsync();
-            
-            if (PropertyId.HasValue && PropertyId.Value != Guid.Empty)
-            {
-                maintenanceRequest.PropertyId = PropertyId.Value;
-                await LoadLeaseForProperty(PropertyId.Value);
-            }
-            if (LeaseId.HasValue && LeaseId.Value != Guid.Empty)
-            {
-                maintenanceRequest.LeaseId = LeaseId.Value;
-            }
-        }
-        finally
-        {
-            isLoading = false;
-        }
-    }
-
-    private async Task OnPropertyChangedAsync()
-    {
-        if (maintenanceRequest.PropertyId != Guid.Empty)
-        {
-            await LoadLeaseForProperty(maintenanceRequest.PropertyId);
-        }
-        else
-        {
-            currentLease = null;
-            maintenanceRequest.LeaseId = null;
-        }
-    }
-
-    private async Task LoadLeaseForProperty(Guid propertyId)
-    {
-        var leases = await LeaseService.GetCurrentAndUpcomingLeasesByPropertyIdAsync(propertyId);
-        currentLease = leases.FirstOrDefault();
-        maintenanceRequest.LeaseId = currentLease?.Id;
-    }
-
-    private async Task HandleValidSubmit()
-    {
-        isSaving = true;
-        try
-        {
-            var request = new MaintenanceRequest
-            {
-                PropertyId = maintenanceRequest.PropertyId,
-                LeaseId = maintenanceRequest.LeaseId,
-                Title = maintenanceRequest.Title,
-                Description = maintenanceRequest.Description,
-                RequestType = maintenanceRequest.RequestType,
-                Priority = maintenanceRequest.Priority,
-                RequestedBy = maintenanceRequest.RequestedBy,
-                RequestedByEmail = maintenanceRequest.RequestedByEmail,
-                RequestedByPhone = maintenanceRequest.RequestedByPhone,
-                RequestedOn = maintenanceRequest.RequestedOn,
-                ScheduledOn = maintenanceRequest.ScheduledOn,
-                EstimatedCost = maintenanceRequest.EstimatedCost,
-                AssignedTo = maintenanceRequest.AssignedTo
-            };
-
-            await MaintenanceService.CreateAsync(request);
-            NavigationManager.NavigateTo("/propertymanagement/maintenance");
-        }
-        finally
-        {
-            isSaving = false;
-        }
-    }
-
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/maintenance");
-    }
-
-    public class MaintenanceRequestModel
-    {
-        [Required(ErrorMessage = "Property is required")]
-        public Guid PropertyId { get; set; }
-
-        public Guid? LeaseId { get; set; }
-
-        [Required(ErrorMessage = "Title is required")]
-        [StringLength(100, ErrorMessage = "Title cannot exceed 100 characters")]
-        public string Title { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Description is required")]
-        [StringLength(2000, ErrorMessage = "Description cannot exceed 2000 characters")]
-        public string Description { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Request type is required")]
-        public string RequestType { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Priority is required")]
-        public string Priority { get; set; } = "Medium";
-
-        public string RequestedBy { get; set; } = string.Empty;
-        public string RequestedByEmail { get; set; } = string.Empty;
-        public string RequestedByPhone { get; set; } = string.Empty;
-
-        [Required]
-        public DateTime RequestedOn { get; set; } = DateTime.Today;
-
-        public DateTime? ScheduledOn { get; set; }
-
-        public decimal EstimatedCost { get; set; }
-        public string AssignedTo { get; set; } = string.Empty;
-    }
 }
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/Edit.razor b/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/Edit.razor
index 81a664a..de894b1 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/Edit.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/Edit.razor
@@ -1,306 +1,13 @@
-@page "/propertymanagement/maintenance/{Id:guid}/edit"
-@inject MaintenanceService MaintenanceService
-@inject PropertyService PropertyService
-@inject LeaseService LeaseService
-@inject NavigationManager NavigationManager
-@inject IJSRuntime JSRuntime
+@page "/propertymanagement/maintenance/{MaintenanceRequestId:guid}/edit"
+@using Aquiis.UI.Shared.Features.PropertyManagement.MaintenanceRequests
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
 <PageTitle>Edit Maintenance Request</PageTitle>
 
-<div class="container-fluid">
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <h1><i class="bi bi-pencil"></i> Edit Maintenance Request #@Id</h1>
-        <button class="btn btn-outline-secondary" @onclick="Cancel">
-            <i class="bi bi-x-circle"></i> Cancel
-        </button>
-    </div>
-
-    @if (isLoading)
-    {
-        <div class="text-center">
-            <div class="spinner-border" role="status">
-                <span class="visually-hidden">Loading...</span>
-            </div>
-        </div>
-    }
-    else if (maintenanceRequest == null)
-    {
-        <div class="alert alert-warning">
-            <i class="bi bi-exclamation-triangle"></i> Maintenance request not found.
-        </div>
-    }
-    else
-    {
-        <div class="row">
-            <div class="col-md-8">
-                <div class="card">
-                    <div class="card-body">
-                        <EditForm Model="maintenanceRequest" OnValidSubmit="HandleValidSubmit">
-                            <DataAnnotationsValidator />
-                            <ValidationSummary class="text-danger" />
-
-                            <div class="row mb-3">
-                                <div class="col-md-6">
-                                    <label class="form-label">Property *</label>
-                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.PropertyId" @onchange="OnPropertyChanged">
-                                        <option value="0">-- Select Property --</option>
-                                        @foreach (var property in properties)
-                                        {
-                                            <option value="@property.Id">@property.Address</option>
-                                        }
-                                    </InputSelect>
-                                    <ValidationMessage For="@(() => maintenanceRequest.PropertyId)" />
-                                </div>
-                                <div class="col-md-6">
-                                    <label class="form-label">Lease (Optional)</label>
-                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.LeaseId">
-                                        <option value="">-- No Lease --</option>
-                                        @foreach (var lease in availableLeases)
-                                        {
-                                            <option value="@lease.Id">Lease #@lease.Id - @lease.Tenant?.FullName</option>
-                                        }
-                                    </InputSelect>
-                                </div>
-                            </div>
-
-                            <div class="mb-3">
-                                <label class="form-label">Title *</label>
-                                <InputText class="form-control" @bind-Value="maintenanceRequest.Title" placeholder="Brief description of the issue" />
-                                <ValidationMessage For="@(() => maintenanceRequest.Title)" />
-                            </div>
-
-                            <div class="mb-3">
-                                <label class="form-label">Description *</label>
-                                <InputTextArea class="form-control" @bind-Value="maintenanceRequest.Description" rows="4" placeholder="Detailed description of the maintenance issue" />
-                                <ValidationMessage For="@(() => maintenanceRequest.Description)" />
-                            </div>
-
-                            <div class="row mb-3">
-                                <div class="col-md-4">
-                                    <label class="form-label">Request Type *</label>
-                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.RequestType">
-                                        <option value="">-- Select Type --</option>
-                                        @foreach (var type in ApplicationConstants.MaintenanceRequestTypes.AllMaintenanceRequestTypes)
-                                        {
-                                            <option value="@type">@type</option>
-                                        }
-                                    </InputSelect>
-                                    <ValidationMessage For="@(() => maintenanceRequest.RequestType)" />
-                                </div>
-                                <div class="col-md-4">
-                                    <label class="form-label">Priority *</label>
-                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.Priority">
-                                        @foreach (var priority in ApplicationConstants.MaintenanceRequestPriorities.AllMaintenanceRequestPriorities)
-                                        {
-                                            <option value="@priority">@priority</option>
-                                        }
-                                    </InputSelect>
-                                    <ValidationMessage For="@(() => maintenanceRequest.Priority)" />
-                                </div>
-                                <div class="col-md-4">
-                                    <label class="form-label">Status *</label>
-                                    <InputSelect class="form-select" @bind-Value="maintenanceRequest.Status">
-                                        @foreach (var status in ApplicationConstants.MaintenanceRequestStatuses.AllMaintenanceRequestStatuses)
-                                        {
-                                            <option value="@status">@status</option>
-                                        }
-                                    </InputSelect>
-                                    <ValidationMessage For="@(() => maintenanceRequest.Status)" />
-                                </div>
-                            </div>
-
-                            <div class="mb-3">
-                                <label class="form-label">Requested By</label>
-                                <InputText class="form-control" @bind-Value="maintenanceRequest.RequestedBy" placeholder="Name of person requesting" />
-                            </div>
-
-                            <div class="row mb-3">
-                                <div class="col-md-6">
-                                    <label class="form-label">Email</label>
-                                    <InputText type="email" class="form-control" @bind-Value="maintenanceRequest.RequestedByEmail" placeholder="email@example.com" />
-                                </div>
-                                <div class="col-md-6">
-                                    <label class="form-label">Phone</label>
-                                    <InputText class="form-control" @bind-Value="maintenanceRequest.RequestedByPhone" placeholder="(555) 123-4567" />
-                                </div>
-                            </div>
-
-                            <div class="row mb-3">
-                                <div class="col-md-4">
-                                    <label class="form-label">Requested Date *</label>
-                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.RequestedOn" />
-                                    <ValidationMessage For="@(() => maintenanceRequest.RequestedOn)" />
-                                </div>
-                                <div class="col-md-4">
-                                    <label class="form-label">Scheduled Date</label>
-                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.ScheduledOn" />
-                                </div>
-                                <div class="col-md-4">
-                                    <label class="form-label">Completed Date</label>
-                                    <InputDate class="form-control" @bind-Value="maintenanceRequest.CompletedOn" />
-                                </div>
-                            </div>
-
-                            <div class="row mb-3">
-                                <div class="col-md-4">
-                                    <label class="form-label">Estimated Cost</label>
-                                    <InputNumber class="form-control" @bind-Value="maintenanceRequest.EstimatedCost" />
-                                </div>
-                                <div class="col-md-4">
-                                    <label class="form-label">Actual Cost</label>
-                                    <InputNumber class="form-control" @bind-Value="maintenanceRequest.ActualCost" />
-                                </div>
-                                <div class="col-md-4">
-                                    <label class="form-label">Assigned To</label>
-                                    <InputText class="form-control" @bind-Value="maintenanceRequest.AssignedTo" placeholder="Contractor or maintenance person" />
-                                </div>
-                            </div>
-
-                            <div class="mb-3">
-                                <label class="form-label">Resolution Notes</label>
-                                <InputTextArea class="form-control" @bind-Value="maintenanceRequest.ResolutionNotes" rows="3" placeholder="Notes about how the issue was resolved" />
-                            </div>
-
-                            <div class="d-flex justify-content-between">
-                                <button type="button" class="btn btn-outline-danger" @onclick="DeleteRequest">
-                                    <i class="bi bi-trash"></i> Delete
-                                </button>
-                                <div class="d-flex gap-2">
-                                    <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                                    <button type="submit" class="btn btn-primary" disabled="@isSaving">
-                                        @if (isSaving)
-                                        {
-                                            <span class="spinner-border spinner-border-sm me-2" role="status" aria-hidden="true"></span>
-                                            <span>Saving...</span>
-                                        }
-                                        else
-                                        {
-                                            <i class="bi bi-check-circle me-2"></i>
-                                            <span>Save Changes</span>
-                                        }
-                                    </button>
-                                </div>
-                            </div>
-                        </EditForm>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-md-4">
-                <div class="card">
-                    <div class="card-header">
-                        <h5 class="mb-0"><i class="bi bi-info-circle"></i> Status Information</h5>
-                    </div>
-                    <div class="card-body">
-                        <div class="mb-3">
-                            <label class="text-muted small">Current Priority</label>
-                            <p><span class="badge @maintenanceRequest.PriorityBadgeClass">@maintenanceRequest.Priority</span></p>
-                        </div>
-                        <div class="mb-3">
-                            <label class="text-muted small">Current Status</label>
-                            <p><span class="badge @maintenanceRequest.StatusBadgeClass">@maintenanceRequest.Status</span></p>
-                        </div>
-                        <div class="mb-3">
-                            <label class="text-muted small">Days Open</label>
-                            <p class="mb-0"><span class="badge bg-info">@maintenanceRequest.DaysOpen days</span></p>
-                        </div>
-                        @if (maintenanceRequest.IsOverdue)
-                        {
-                            <div class="alert alert-danger">
-                                <i class="bi bi-exclamation-triangle-fill"></i> <strong>Overdue</strong>
-                            </div>
-                        }
-                    </div>
-                </div>
-            </div>
-        </div>
-    }
-</div>
+<Aquiis.UI.Shared.Features.PropertyManagement.MaintenanceRequests.MaintenanceEditForm MaintenanceRequestId="@MaintenanceRequestId" />
 
 @code {
     [Parameter]
-    public Guid Id { get; set; }
-
-    private MaintenanceRequest? maintenanceRequest;
-    private List<Property> properties = new();
-    private List<Lease> availableLeases = new();
-    private bool isLoading = true;
-    private bool isSaving = false;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadData();
-    }
-
-    private async Task LoadData()
-    {
-        isLoading = true;
-        try
-        {
-            maintenanceRequest = await MaintenanceService.GetByIdAsync(Id);
-            properties = await PropertyService.GetAllAsync();
-            
-            if (maintenanceRequest?.PropertyId != null)
-            {
-                await LoadLeasesForProperty(maintenanceRequest.PropertyId);
-            }
-        }
-        finally
-        {
-            isLoading = false;
-        }
-    }
-
-    private async Task OnPropertyChanged(ChangeEventArgs e)
-    {
-        if (Guid.TryParse(e.Value?.ToString(), out Guid propertyId) && propertyId != Guid.Empty)
-        {
-            await LoadLeasesForProperty(propertyId);
-        }
-        else
-        {
-            availableLeases.Clear();
-        }
-    }
-
-    private async Task LoadLeasesForProperty(Guid propertyId)
-    {
-        var allLeases = await LeaseService.GetLeasesByPropertyIdAsync(propertyId);
-        availableLeases = allLeases.Where(l => l.Status == "Active" || l.Status == "Pending").ToList();
-    }
-
-    private async Task HandleValidSubmit()
-    {
-        if (maintenanceRequest == null) return;
-
-        isSaving = true;
-        try
-        {
-            await MaintenanceService.UpdateAsync(maintenanceRequest);
-            NavigationManager.NavigateTo($"/propertymanagement/maintenance/{Id}");
-        }
-        finally
-        {
-            isSaving = false;
-        }
-    }
-
-    private async Task DeleteRequest()
-    {
-        if (maintenanceRequest == null) return;
-
-        var confirmed = await JSRuntime.InvokeAsync<bool>("confirm", "Are you sure you want to delete this maintenance request?");
-        if (confirmed)
-        {
-            await MaintenanceService.DeleteAsync(Id);
-            NavigationManager.NavigateTo("/propertymanagement/maintenance");
-        }
-    }
-
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/maintenance/{Id}");
-    }
+    public Guid MaintenanceRequestId { get; set; }
 }
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/Index.razor b/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/Index.razor
index c0f61d9..8e16b70 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/Index.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/Index.razor
@@ -1,350 +1,6 @@
 @page "/propertymanagement/maintenance"
-@inject MaintenanceService MaintenanceService
-@inject NavigationManager NavigationManager
+@using Aquiis.UI.Shared.Features.PropertyManagement.MaintenanceRequests
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Maintenance Requests</PageTitle>
-
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <h1><i class="bi bi-tools"></i> Maintenance Requests</h1>
-    <button class="btn btn-primary" @onclick="CreateNew">
-        <i class="bi bi-plus-circle"></i> New Request
-    </button>
-</div>
-
-@if (isLoading)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else
-{
-    <!-- Summary Cards -->
-    <div class="row mb-4">
-        <div class="col-md-3">
-            <div class="card text-white bg-danger">
-                <div class="card-body">
-                    <h6>Urgent</h6>
-                    <h3>@urgentRequests.Count</h3>
-                    <small>High priority requests</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-warning">
-                <div class="card-body">
-                    <h6>In Progress</h6>
-                    <h3>@inProgressRequests.Count</h3>
-                    <small>Currently being worked on</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-primary">
-                <div class="card-body">
-                    <h6>Submitted</h6>
-                    <h3>@submittedRequests.Count</h3>
-                    <small>Awaiting assignment</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-success">
-                <div class="card-body">
-                    <h6>Completed</h6>
-                    <h3>@completedRequests.Count</h3>
-                    <small>This month</small>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Filters -->
-    <div class="card mb-3">
-        <div class="card-body">
-            <div class="row g-3">
-                <div class="col-md-3">
-                    <label class="form-label small">Status</label>
-                    <select class="form-select" @onchange="OnStatusFilterChanged">
-                        <option value="">All Statuses</option>
-                        @foreach (var status in ApplicationConstants.MaintenanceRequestStatuses.AllMaintenanceRequestStatuses)
-                        {
-                            <option value="@status">@status</option>
-                        }
-                    </select>
-                </div>
-                <div class="col-md-3">
-                    <label class="form-label small">Priority</label>
-                    <select class="form-select" @onchange="OnPriorityFilterChanged">
-                        <option value="">All Priorities</option>
-                        @foreach (var priority in ApplicationConstants.MaintenanceRequestPriorities.AllMaintenanceRequestPriorities)
-                        {
-                            <option value="@priority">@priority</option>
-                        }
-                    </select>
-                </div>
-                <div class="col-md-3">
-                    <label class="form-label small">Request Type</label>
-                    <select class="form-select" @onchange="OnTypeFilterChanged">
-                        <option value="">All Types</option>
-                        @foreach (var type in ApplicationConstants.MaintenanceRequestTypes.AllMaintenanceRequestTypes)
-                        {
-                            <option value="@type">@type</option>
-                        }
-                    </select>
-                </div>
-                <div class="col-md-3 d-flex align-items-end">
-                    <button class="btn btn-outline-secondary w-100" @onclick="ClearFilters">
-                        <i class="bi bi-x-circle"></i> Clear Filters
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Overdue Requests -->
-    @if (overdueRequests.Any())
-    {
-        <div class="card mb-3">
-            <div class="card-header bg-danger text-white">
-                <h5 class="mb-0"><i class="bi bi-exclamation-triangle-fill"></i> Overdue Requests</h5>
-            </div>
-            <div class="card-body p-0">
-                <div class="table-responsive">
-                    <table class="table table-hover mb-0">
-                        <thead>
-                            <tr>
-                                <th>ID</th>
-                                <th>Property</th>
-                                <th>Title</th>
-                                <th>Type</th>
-                                <th>Priority</th>
-                                <th>Scheduled</th>
-                                <th>Days Open</th>
-                                <th>Actions</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            @foreach (var request in overdueRequests)
-                            {
-                                <tr>
-                                    <td>@request.Id</td>
-                                    <td>
-                                        <small>@request.Property?.Address</small>
-                                    </td>
-                                    <td>@request.Title</td>
-                                    <td><small>@request.RequestType</small></td>
-                                    <td><span class="badge @request.PriorityBadgeClass">@request.Priority</span></td>
-                                    <td><small>@request.ScheduledOn?.ToString("MMM dd")</small></td>
-                                    <td><span class="badge bg-danger">@request.DaysOpen days</span></td>
-                                    <td>
-                                        <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewRequest(request.Id)">
-                                            <i class="bi bi-eye"></i>
-                                        </button>
-                                    </td>
-                                </tr>
-                            }
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-    }
-
-    <!-- All Requests -->
-    <div class="card">
-        <div class="card-header">
-            <h5 class="mb-0">
-                <i class="bi bi-list-ul"></i> 
-                @if (!string.IsNullOrEmpty(currentStatusFilter))
-                {
-                    <span>@currentStatusFilter Requests</span>
-                }
-                else
-                {
-                    <span>All Requests</span>
-                }
-                <small class="text-muted">(@filteredRequests.Count)</small>
-            </h5>
-        </div>
-        <div class="card-body p-0">
-            @if (filteredRequests.Any())
-            {
-                <div class="table-responsive">
-                    <table class="table table-hover mb-0">
-                        <thead>
-                            <tr>
-                                <th>ID</th>
-                                <th>Property</th>
-                                <th>Title</th>
-                                <th>Type</th>
-                                <th>Priority</th>
-                                <th>Status</th>
-                                <th>Requested</th>
-                                <th>Assigned To</th>
-                                <th>Actions</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            @foreach (var request in filteredRequests)
-                            {
-                                <tr>
-                                    <td>@request.Id</td>
-                                    <td>
-                                        <small>@request.Property?.Address</small>
-                                    </td>
-                                    <td>
-                                        @request.Title
-                                        @if (request.IsOverdue)
-                                        {
-                                            <i class="bi bi-exclamation-triangle-fill text-danger" title="Overdue"></i>
-                                        }
-                                    </td>
-                                    <td><small>@request.RequestType</small></td>
-                                    <td><span class="badge @request.PriorityBadgeClass">@request.Priority</span></td>
-                                    <td><span class="badge @request.StatusBadgeClass">@request.Status</span></td>
-                                    <td><small>@request.RequestedOn.ToString("MMM dd, yyyy")</small></td>
-                                    <td><small>@(string.IsNullOrEmpty(request.AssignedTo) ? "Unassigned" : request.AssignedTo)</small></td>
-                                    <td>
-                                        <div class="btn-group btn-group-sm">
-                                            <button class="btn btn-outline-primary" @onclick="() => ViewRequest(request.Id)" title="View">
-                                                <i class="bi bi-eye"></i>
-                                            </button>
-                                            <button class="btn btn-outline-secondary" @onclick="() => ViewProperty(request.PropertyId)" title="View Property">
-                                                <i class="bi bi-house"></i>
-                                            </button>
-                                        </div>
-                                    </td>
-                                </tr>
-                            }
-                        </tbody>
-                    </table>
-                </div>
-            }
-            else
-            {
-                <div class="text-center py-5">
-                    <i class="bi bi-inbox" style="font-size: 3rem; color: #ccc;"></i>
-                    <p class="text-muted mt-3">No maintenance requests found</p>
-                </div>
-            }
-        </div>
-    </div>
-}
-
-@code {
-    private List<MaintenanceRequest> allRequests = new();
-    private List<MaintenanceRequest> filteredRequests = new();
-    private List<MaintenanceRequest> urgentRequests = new();
-    private List<MaintenanceRequest> inProgressRequests = new();
-    private List<MaintenanceRequest> submittedRequests = new();
-    private List<MaintenanceRequest> completedRequests = new();
-    private List<MaintenanceRequest> overdueRequests = new();
-    
-    private string currentStatusFilter = "";
-    private string currentPriorityFilter = "";
-    private string currentTypeFilter = "";
-    
-    private bool isLoading = true;
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? PropertyId { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadData();
-    }
-
-    private async Task LoadData()
-    {
-        isLoading = true;
-        try
-        {
-            allRequests = await MaintenanceService.GetAllAsync();
-            
-            if (PropertyId.HasValue)
-            {
-                allRequests = allRequests.Where(r => r.PropertyId == PropertyId.Value).ToList();
-            }
-            
-            // Summary cards
-            urgentRequests = allRequests.Where(r => r.Priority == "Urgent" && r.Status != "Completed" && r.Status != "Cancelled").ToList();
-            inProgressRequests = allRequests.Where(r => r.Status == "In Progress").ToList();
-            submittedRequests = allRequests.Where(r => r.Status == "Submitted").ToList();
-            completedRequests = allRequests.Where(r => r.Status == "Completed" && r.CompletedOn?.Month == DateTime.Today.Month).ToList();
-            overdueRequests = await MaintenanceService.GetOverdueMaintenanceRequestsAsync();
-            
-            ApplyFilters();
-        }
-        finally
-        {
-            isLoading = false;
-        }
-    }
-
-    private void ApplyFilters()
-    {
-        filteredRequests = allRequests;
-
-        if (!string.IsNullOrEmpty(currentStatusFilter))
-        {
-            filteredRequests = filteredRequests.Where(r => r.Status == currentStatusFilter).ToList();
-        }
-
-        if (!string.IsNullOrEmpty(currentPriorityFilter))
-        {
-            filteredRequests = filteredRequests.Where(r => r.Priority == currentPriorityFilter).ToList();
-        }
-
-        if (!string.IsNullOrEmpty(currentTypeFilter))
-        {
-            filteredRequests = filteredRequests.Where(r => r.RequestType == currentTypeFilter).ToList();
-        }
-    }
-
-    private void OnStatusFilterChanged(ChangeEventArgs e)
-    {
-        currentStatusFilter = e.Value?.ToString() ?? "";
-        ApplyFilters();
-    }
-
-    private void OnPriorityFilterChanged(ChangeEventArgs e)
-    {
-        currentPriorityFilter = e.Value?.ToString() ?? "";
-        ApplyFilters();
-    }
-
-    private void OnTypeFilterChanged(ChangeEventArgs e)
-    {
-        currentTypeFilter = e.Value?.ToString() ?? "";
-        ApplyFilters();
-    }
-
-    private void ClearFilters()
-    {
-        currentStatusFilter = "";
-        currentPriorityFilter = "";
-        currentTypeFilter = "";
-        ApplyFilters();
-    }
-
-    private void CreateNew()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/maintenance/create");
-    }
-
-    private void ViewRequest(Guid requestId)
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/maintenance/{requestId}");
-    }
-
-    private void ViewProperty(Guid propertyId)
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/properties/{propertyId}");
-    }
-}
+<MaintenanceListForm />
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/View.razor b/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/View.razor
index c60a539..87a17e0 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/View.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/View.razor
@@ -1,309 +1,13 @@
-@page "/propertymanagement/maintenance/{Id:guid}"
-
-@using Aquiis.Application.Services
-@using Aquiis.Professional.Shared.Services
-@using Aquiis.Application.Services.PdfGenerators
-
-@inject MaintenanceService MaintenanceService
-@inject NavigationManager NavigationManager
-@inject ToastService ToastService
-
+@page "/propertymanagement/maintenance/{MaintenanceRequestId:guid}"
+@using Aquiis.UI.Shared.Features.PropertyManagement.MaintenanceRequests
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
 <PageTitle>Maintenance Request Details</PageTitle>
 
-@if (isLoading)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (maintenanceRequest == null)
-{
-    <div class="alert alert-warning">
-        <i class="bi bi-exclamation-triangle"></i> Maintenance request not found.
-    </div>
-}
-else
-{
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <h1><i class="bi bi-tools"></i> Maintenance Request #@maintenanceRequest.Id</h1>
-        <div class="btn-group">
-            <button class="btn btn-outline-primary" @onclick="Edit">
-                <i class="bi bi-pencil"></i> Edit
-            </button>
-            <button class="btn btn-outline-secondary" @onclick="GoBack">
-                <i class="bi bi-arrow-left"></i> Back to List
-            </button>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-md-8">
-            <!-- Request Details Card -->
-            <div class="card mb-3">
-                <div class="card-header d-flex justify-content-between align-items-center">
-                    <h5 class="mb-0">Request Details</h5>
-                    <div>
-                        <span class="badge @maintenanceRequest.PriorityBadgeClass me-2">@maintenanceRequest.Priority</span>
-                        <span class="badge @maintenanceRequest.StatusBadgeClass">@maintenanceRequest.Status</span>
-                    </div>
-                </div>
-                <div class="card-body">
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <label class="text-muted small">Property</label>
-                            <p class="mb-0">
-                                <strong>@maintenanceRequest.Property?.Address</strong><br />
-                                <small class="text-muted">@maintenanceRequest.Property?.City, @maintenanceRequest.Property?.State @maintenanceRequest.Property?.ZipCode</small>
-                            </p>
-                        </div>
-                        <div class="col-md-6">
-                            <label class="text-muted small">Request Type</label>
-                            <p class="mb-0"><strong>@maintenanceRequest.RequestType</strong></p>
-                        </div>
-                    </div>
-
-                    <div class="mb-3">
-                        <label class="text-muted small">Title</label>
-                        <p class="mb-0"><strong>@maintenanceRequest.Title</strong></p>
-                    </div>
-
-                    <div class="mb-3">
-                        <label class="text-muted small">Description</label>
-                        <p class="mb-0" style="white-space: pre-wrap;">@maintenanceRequest.Description</p>
-                    </div>
-
-                    @if (maintenanceRequest.LeaseId.HasValue && maintenanceRequest.Lease != null)
-                    {
-                        <div class="mb-3">
-                            <label class="text-muted small">Associated Lease</label>
-                            <p class="mb-0">
-                                Lease #@maintenanceRequest.LeaseId - @maintenanceRequest.Lease.Tenant?.FullName
-                            </p>
-                        </div>
-                    }
-                </div>
-            </div>
-
-            <!-- Contact Information Card -->
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Contact Information</h5>
-                </div>
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-md-4">
-                            <label class="text-muted small">Requested By</label>
-                            <p class="mb-0">@(string.IsNullOrEmpty(maintenanceRequest.RequestedBy) ? "N/A" : maintenanceRequest.RequestedBy)</p>
-                        </div>
-                        <div class="col-md-4">
-                            <label class="text-muted small">Email</label>
-                            <p class="mb-0">@(string.IsNullOrEmpty(maintenanceRequest.RequestedByEmail) ? "N/A" : maintenanceRequest.RequestedByEmail)</p>
-                        </div>
-                        <div class="col-md-4">
-                            <label class="text-muted small">Phone</label>
-                            <p class="mb-0">@(string.IsNullOrEmpty(maintenanceRequest.RequestedByPhone) ? "N/A" : maintenanceRequest.RequestedByPhone)</p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Timeline Card -->
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Timeline</h5>
-                </div>
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-md-4">
-                            <label class="text-muted small">Requested Date</label>
-                            <p class="mb-0">@maintenanceRequest.RequestedOn.ToString("MMM dd, yyyy")</p>
-                        </div>
-                        <div class="col-md-4">
-                            <label class="text-muted small">Scheduled Date</label>
-                            <p class="mb-0">@(maintenanceRequest.ScheduledOn?.ToString("MMM dd, yyyy") ?? "Not scheduled")</p>
-                        </div>
-                        <div class="col-md-4">
-                            <label class="text-muted small">Completed Date</label>
-                            <p class="mb-0">@(maintenanceRequest.CompletedOn?.ToString("MMM dd, yyyy") ?? "Not completed")</p>
-                        </div>
-                    </div>
-
-                    @if (maintenanceRequest.Status != "Completed" && maintenanceRequest.Status != "Cancelled")
-                    {
-                        <div class="mt-3">
-                            <label class="text-muted small">Days Open</label>
-                            <p class="mb-0">
-                                <span class="badge bg-info">@maintenanceRequest.DaysOpen days</span>
-                            </p>
-                        </div>
-                    }
-
-                    @if (maintenanceRequest.IsOverdue)
-                    {
-                        <div class="alert alert-danger mt-3 mb-0">
-                            <i class="bi bi-exclamation-triangle-fill"></i> <strong>Overdue</strong> - Scheduled date has passed
-                        </div>
-                    }
-                </div>
-            </div>
-
-            <!-- Assignment & Cost Card -->
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Assignment & Cost</h5>
-                </div>
-                <div class="card-body">
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <label class="text-muted small">Assigned To</label>
-                            <p class="mb-0">@(string.IsNullOrEmpty(maintenanceRequest.AssignedTo) ? "Unassigned" : maintenanceRequest.AssignedTo)</p>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-6">
-                            <label class="text-muted small">Estimated Cost</label>
-                            <p class="mb-0">@maintenanceRequest.EstimatedCost.ToString("C")</p>
-                        </div>
-                        <div class="col-md-6">
-                            <label class="text-muted small">Actual Cost</label>
-                            <p class="mb-0">@maintenanceRequest.ActualCost.ToString("C")</p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Resolution Notes Card -->
-            @if (!string.IsNullOrEmpty(maintenanceRequest.ResolutionNotes) || maintenanceRequest.Status == "Completed")
-            {
-                <div class="card mb-3">
-                    <div class="card-header">
-                        <h5 class="mb-0">Resolution Notes</h5>
-                    </div>
-                    <div class="card-body">
-                        <p class="mb-0" style="white-space: pre-wrap;">@(string.IsNullOrEmpty(maintenanceRequest.ResolutionNotes) ? "No notes provided" : maintenanceRequest.ResolutionNotes)</p>
-                    </div>
-                </div>
-            }
-        </div>
-
-        <div class="col-md-4">
-            <!-- Quick Actions Card -->
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Quick Actions</h5>
-                </div>
-                <div class="card-body">
-                    @if (maintenanceRequest.Status != "Completed" && maintenanceRequest.Status != "Cancelled")
-                    {
-                        <div class="d-grid gap-2">
-                            @if (maintenanceRequest.Status == "Submitted")
-                            {
-                                <button class="btn btn-warning" @onclick='() => UpdateStatus("In Progress")'>
-                                    <i class="bi bi-play-circle"></i> Start Work
-                                </button>
-                            }
-                            @if (maintenanceRequest.Status == "In Progress")
-                            {
-                                <button class="btn btn-success" @onclick='() => UpdateStatus("Completed")'>
-                                    <i class="bi bi-check-circle"></i> Mark Complete
-                                </button>
-                            }
-                            <button class="btn btn-outline-danger" @onclick='() => UpdateStatus("Cancelled")'>
-                                <i class="bi bi-x-circle"></i> Cancel Request
-                            </button>
-                        </div>
-                    }
-                    else
-                    {
-                        <div class="alert alert-info mb-0">
-                            <i class="bi bi-info-circle"></i> Request is @maintenanceRequest.Status.ToLower()
-                        </div>
-                    }
-                </div>
-            </div>
-
-            <!-- Property Info Card -->
-            @if (maintenanceRequest.Property != null)
-            {
-                <div class="card">
-                    <div class="card-header">
-                        <h5 class="mb-0">Property Info</h5>
-                    </div>
-                    <div class="card-body">
-                        <p class="mb-2"><strong>@maintenanceRequest.Property.Address</strong></p>
-                        <p class="mb-2">
-                            <small class="text-muted">
-                                @maintenanceRequest.Property.City, @maintenanceRequest.Property.State @maintenanceRequest.Property.ZipCode
-                            </small>
-                        </p>
-                        <p class="mb-2">
-                            <small>Type: @maintenanceRequest.Property.PropertyType</small>
-                        </p>
-                        <button class="btn btn-sm btn-outline-primary w-100 mt-2" @onclick="ViewProperty">
-                            <i class="bi bi-house"></i> View Property
-                        </button>
-                    </div>
-                </div>
-            }
-        </div>
-    </div>
-}
+<MaintenanceViewForm MaintenanceRequestId="@MaintenanceRequestId" />
 
 @code {
     [Parameter]
-    public Guid Id { get; set; }
-
-    private MaintenanceRequest? maintenanceRequest;
-    private bool isLoading = true;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadMaintenanceRequest();
-    }
-
-    private async Task LoadMaintenanceRequest()
-    {
-        isLoading = true;
-        try
-        {
-            maintenanceRequest = await MaintenanceService.GetByIdAsync(Id);
-        }
-        finally
-        {
-            isLoading = false;
-        }
-    }
-
-    private async Task UpdateStatus(string newStatus)
-    {
-        if (maintenanceRequest != null)
-        {
-            await MaintenanceService.UpdateMaintenanceRequestStatusAsync(maintenanceRequest.Id, newStatus);
-            ToastService.ShowSuccess($"Maintenance request status updated to '{newStatus}'.");
-            await LoadMaintenanceRequest();
-        }
-    }
-
-    private void Edit()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/maintenance/{Id}/edit");
-    }
-
-    private void ViewProperty()
-    {
-        if (maintenanceRequest?.PropertyId != null)
-        {
-            NavigationManager.NavigateTo($"/propertymanagement/properties/{maintenanceRequest.PropertyId}");
-        }
-    }
-
-    private void GoBack()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/maintenance");
-    }
+    public Guid MaintenanceRequestId { get; set; }
 }
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/_Imports.razor b/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/_Imports.razor
deleted file mode 100644
index c24e5c5..0000000
--- a/5-Aquiis.Professional/Features/PropertyManagement/MaintenanceRequests/Pages/_Imports.razor
+++ /dev/null
@@ -1,4 +0,0 @@
-@using Aquiis.Professional.Features.PropertyManagement
-@using Aquiis.Core.Entities
-@using Aquiis.Core.Constants
-@using Microsoft.AspNetCore.Authorization
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/Create.razor b/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/Create.razor
index a8bbbec..87052f9 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/Create.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/Create.razor
@@ -1,285 +1,6 @@
 @page "/propertymanagement/payments/create"
-@using Aquiis.Professional.Features.PropertyManagement
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Forms
-@using System.ComponentModel.DataAnnotations
-@using Microsoft.AspNetCore.Http.HttpResults
-@inject NavigationManager Navigation
-@inject PaymentService PaymentService
-@inject InvoiceService InvoiceService
-
+@using Aquiis.UI.Shared.Features.PropertyManagement.Payments
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Record Payment - Property Management</PageTitle>
-
-<div class="row">
-    <div class="col-lg-8">
-        <div class="d-flex justify-content-between align-items-center mb-4">
-            <h1><span class="bi bi-cash-coin" aria-hidden="true"></span> Record Payment</h1>
-            <button class="btn btn-outline-secondary" @onclick="Cancel">
-                <i class="bi bi-x-lg"></i> Cancel
-            </button>
-        </div>
-
-        @if (invoices == null || !invoices.Any())
-        {
-            <div class="alert alert-warning">
-                <h4>No Unpaid Invoices</h4>
-                <p>There are no outstanding invoices to record payments for.</p>
-                <a href="/propertymanagement/invoices" class="btn btn-primary">Go to Invoices</a>
-            </div>
-        }
-        else
-        {
-            <div class="card">
-                <div class="card-body">
-                    <EditForm Model="paymentModel" OnValidSubmit="HandleCreatePayment" FormName="CreatePayment">
-                        <DataAnnotationsValidator />
-                        <ValidationSummary class="text-danger" />
-
-                        <div class="mb-3">
-                            <label for="invoice" class="form-label">Invoice *</label>
-                            <InputSelect id="invoice" class="form-select" @bind-Value="paymentModel.InvoiceId" @bind-Value:after="OnInvoiceSelected">
-                                <option value="0">-- Select Invoice --</option>
-                                @foreach (var invoice in invoices)
-                                {
-                                    var displayText = $"{invoice.InvoiceNumber} - {invoice.Lease?.Property?.Address} - {invoice.Lease?.Tenant?.FullName} - Balance: {invoice.BalanceDue:C}";
-                                    <option value="@invoice.Id">@displayText</option>
-                                }
-                            </InputSelect>
-                            <ValidationMessage For="() => paymentModel.InvoiceId" />
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="paymentDate" class="form-label">Payment Date *</label>
-                            <InputDate id="paymentDate" class="form-control" @bind-Value="paymentModel.PaidOn" />
-                            <ValidationMessage For="() => paymentModel.PaidOn" />
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="amount" class="form-label">Amount *</label>
-                            <InputNumber id="amount" class="form-control" @bind-Value="paymentModel.Amount" />
-                            <ValidationMessage For="() => paymentModel.Amount" />
-                            @if (selectedInvoice != null)
-                            {
-                                <small class="text-muted">Invoice balance due: @selectedInvoice.BalanceDue.ToString("C")</small>
-                            }
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="paymentMethod" class="form-label">Payment Method *</label>
-                            <InputSelect id="paymentMethod" class="form-select" @bind-Value="paymentModel.PaymentMethod">
-                                <option value="">-- Select Payment Method --</option>
-                                <option value="Cash">Cash</option>
-                                <option value="Check">Check</option>
-                                <option value="Credit Card">Credit Card</option>
-                                <option value="Debit Card">Debit Card</option>
-                                <option value="Bank Transfer">Bank Transfer</option>
-                                <option value="Online Payment">Online Payment</option>
-                                <option value="Other">Other</option>
-                            </InputSelect>
-                            <ValidationMessage For="() => paymentModel.PaymentMethod" />
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="notes" class="form-label">Notes</label>
-                            <InputTextArea id="notes" class="form-control" rows="3" @bind-Value="paymentModel.Notes" />
-                            <ValidationMessage For="() => paymentModel.Notes" />
-                        </div>
-
-                        <div class="d-flex justify-content-between">
-                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                            <button type="submit" class="btn btn-primary">
-                                <i class="bi bi-check-lg"></i> Record Payment
-                            </button>
-                        </div>
-                    </EditForm>
-                </div>
-            </div>
-        }
-    </div>
-
-    <div class="col-lg-4">
-        @if (selectedInvoice != null)
-        {
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h6 class="card-title mb-0">Invoice Summary</h6>
-                </div>
-                <div class="card-body">
-                    <div class="mb-3">
-                        <label class="text-muted small">Invoice Number</label>
-                        <p class="fw-bold">@selectedInvoice.InvoiceNumber</p>
-                    </div>
-                    <div class="mb-3">
-                        <label class="text-muted small">Property</label>
-                        <p>@selectedInvoice.Lease?.Property?.Address</p>
-                    </div>
-                    <div class="mb-3">
-                        <label class="text-muted small">Tenant</label>
-                        <p>@selectedInvoice.Lease?.Tenant?.FullName</p>
-                    </div>
-                    <hr />
-                    <div class="mb-2">
-                        <div class="d-flex justify-content-between">
-                            <span class="text-muted">Invoice Amount:</span>
-                            <span class="fw-bold">@selectedInvoice.Amount.ToString("C")</span>
-                        </div>
-                    </div>
-                    <div class="mb-2">
-                        <div class="d-flex justify-content-between">
-                            <span class="text-muted">Already Paid:</span>
-                            <span class="text-success">@selectedInvoice.AmountPaid.ToString("C")</span>
-                        </div>
-                    </div>
-                    <div class="mb-3">
-                        <div class="d-flex justify-content-between">
-                            <span class="text-muted">Balance Due:</span>
-                            <span class="fw-bold text-danger">@selectedInvoice.BalanceDue.ToString("C")</span>
-                        </div>
-                    </div>
-                    @if (paymentModel.Amount > 0)
-                    {
-                        <hr />
-                        <div class="mb-2">
-                            <div class="d-flex justify-content-between">
-                                <span class="text-muted">This Payment:</span>
-                                <span class="fw-bold text-success">@paymentModel.Amount.ToString("C")</span>
-                            </div>
-                        </div>
-                        <div>
-                            <div class="d-flex justify-content-between">
-                                <span class="text-muted">Remaining Balance:</span>
-                                <span class="fw-bold @(remainingBalance <= 0 ? "text-success" : "text-warning")">
-                                    @remainingBalance.ToString("C")
-                                </span>
-                            </div>
-                        </div>
-                        @if (remainingBalance < 0)
-                        {
-                            <div class="alert alert-warning mt-2 mb-0">
-                                <small>Warning: Payment amount exceeds balance due.</small>
-                            </div>
-                        }
-                        else if (remainingBalance == 0)
-                        {
-                            <div class="alert alert-success mt-2 mb-0">
-                                <small>This payment will mark the invoice as Paid.</small>
-                            </div>
-                        }
-                        else
-                        {
-                            <div class="alert alert-info mt-2 mb-0">
-                                <small>This will be a partial payment.</small>
-                            </div>
-                        }
-                    }
-                </div>
-            </div>
-        }
-        else
-        {
-            <div class="card">
-                <div class="card-body text-center text-muted">
-                    <i class="bi bi-info-circle fs-1"></i>
-                    <p class="mt-2">Select an invoice to see details</p>
-                </div>
-            </div>
-        }
-    </div>
-</div>
-
-@code {
-    private List<Invoice>? invoices;
-    private Invoice? selectedInvoice;
-    private PaymentModel paymentModel = new();
-    private decimal remainingBalance => selectedInvoice != null ? selectedInvoice.BalanceDue - paymentModel.Amount : 0;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public Guid? InvoiceId { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        
-            // Get all invoices and filter to those with outstanding balance
-            List<Invoice>? allInvoices = await InvoiceService.GetAllAsync();
-            invoices = allInvoices
-                .Where(i => i.BalanceDue > 0 && i.Status != "Cancelled")
-                .OrderByDescending(i => i.DueOn)
-                .ToList();
-            
-            paymentModel.PaidOn = DateTime.Now;
-            if (InvoiceId.HasValue)
-            {
-                paymentModel.InvoiceId = InvoiceId.Value;
-                await OnInvoiceSelected();
-            }
-    }
-
-    private async Task OnInvoiceSelected()
-    {
-        if (paymentModel.InvoiceId != Guid.Empty)
-        {
-            selectedInvoice = invoices?.FirstOrDefault(i => i.Id == paymentModel.InvoiceId);
-            if (selectedInvoice != null)
-            {
-                // Default payment amount to the balance due
-                paymentModel.Amount = selectedInvoice.BalanceDue;
-            }
-        }
-        else
-        {
-            selectedInvoice = null;
-            paymentModel.Amount = 0;
-        }
-
-        await InvokeAsync(StateHasChanged);
-    }
-
-    private async Task HandleCreatePayment()
-    {
-        Payment payment = new Payment
-        {
-            InvoiceId = paymentModel.InvoiceId,
-            PaidOn = paymentModel.PaidOn,
-            Amount = paymentModel.Amount,
-            PaymentMethod = paymentModel.PaymentMethod,
-            Notes = paymentModel.Notes!
-        };
-        await PaymentService.CreateAsync(payment);
-        Navigation.NavigateTo("/propertymanagement/payments");
-    }
-
-    private void Cancel()
-    {
-        Navigation.NavigateTo("/propertymanagement/payments");
-    }
-
-    public class PaymentModel
-    {
-        [Required(ErrorMessage = "Please select an invoice.")]
-        public Guid InvoiceId { get; set; }
-
-        [Required(ErrorMessage = "Payment date is required.")]
-        public DateTime PaidOn { get; set; } = DateTime.Now;
-
-        [Required(ErrorMessage = "Amount is required.")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Amount must be greater than zero.")]
-        public decimal Amount { get; set; }
-
-        [Required(ErrorMessage = "Payment method is required.")]
-        public string PaymentMethod { get; set; } = string.Empty;
-
-        [MaxLength(1000)]
-        public string? Notes { get; set; } = string.Empty;
-    }
-}
+<CreateForm />
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/Edit.razor b/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/Edit.razor
index f898c3b..89d5b17 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/Edit.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/Edit.razor
@@ -1,278 +1,13 @@
 @page "/propertymanagement/payments/{PaymentId:guid}/edit"
-@using Aquiis.Professional.Features.PropertyManagement
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Forms
-@using System.ComponentModel.DataAnnotations
-@inject NavigationManager Navigation
-@inject PaymentService PaymentService
-
+@using Aquiis.UI.Shared.Features.PropertyManagement.Payments
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
 <PageTitle>Edit Payment - Property Management</PageTitle>
 
-@if (payment == null || paymentModel == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else
-{
-    <div class="row">
-        <div class="col-lg-8">
-            <div class="d-flex justify-content-between align-items-center mb-4">
-                <h1><span class="bi bi-pencil" aria-hidden="true"></span> Edit Payment</h1>
-                <button class="btn btn-outline-secondary" @onclick="Cancel">
-                    <i class="bi bi-x-lg"></i> Cancel
-                </button>
-            </div>
-
-            <div class="card">
-                <div class="card-body">
-                    <EditForm Model="paymentModel" OnValidSubmit="HandleUpdatePayment" FormName="EditPayment">
-                        <DataAnnotationsValidator />
-                        <ValidationSummary class="text-danger" />
-
-                        <div class="mb-3">
-                            <label for="invoice" class="form-label">Invoice</label>
-                            <input type="text" id="invoice" class="form-control" value="@payment.Invoice?.InvoiceNumber" disabled />
-                            <small class="text-muted">Invoice cannot be changed after payment is created.</small>
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="paymentDate" class="form-label">Payment Date *</label>
-                            <InputDate id="paymentDate" class="form-control" @bind-Value="paymentModel.PaidOn" />
-                            <ValidationMessage For="() => paymentModel.PaidOn" />
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="amount" class="form-label">Amount *</label>
-                            <InputNumber id="amount" class="form-control" @bind-Value="paymentModel.Amount" />
-                            <ValidationMessage For="() => paymentModel.Amount" />
-                            @if (payment.Invoice != null)
-                            {
-                                <small class="text-muted">
-                                    Current invoice balance (before this edit): @currentInvoiceBalance.ToString("C")
-                                </small>
-                            }
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="paymentMethod" class="form-label">Payment Method *</label>
-                            <InputSelect id="paymentMethod" class="form-select" @bind-Value="paymentModel.PaymentMethod">
-                                <option value="">-- Select Payment Method --</option>
-                                <option value="Cash">Cash</option>
-                                <option value="Check">Check</option>
-                                <option value="Credit Card">Credit Card</option>
-                                <option value="Debit Card">Debit Card</option>
-                                <option value="Bank Transfer">Bank Transfer</option>
-                                <option value="Online Payment">Online Payment</option>
-                                <option value="Other">Other</option>
-                            </InputSelect>
-                            <ValidationMessage For="() => paymentModel.PaymentMethod" />
-                        </div>
-
-                        <div class="mb-3">
-                            <label for="notes" class="form-label">Notes</label>
-                            <InputTextArea id="notes" class="form-control" rows="3" @bind-Value="paymentModel.Notes" />
-                            <ValidationMessage For="() => paymentModel.Notes" />
-                        </div>
-
-                        <div class="d-flex justify-content-between">
-                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                            <button type="submit" class="btn btn-primary">
-                                <i class="bi bi-check-lg"></i> Save Changes
-                            </button>
-                        </div>
-                    </EditForm>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-lg-4">
-            @if (payment.Invoice != null)
-            {
-                <div class="card mb-3">
-                    <div class="card-header">
-                        <h6 class="card-title mb-0">Invoice Information</h6>
-                    </div>
-                    <div class="card-body">
-                        <div class="mb-3">
-                            <label class="text-muted small">Invoice Number</label>
-                            <p class="fw-bold">
-                                <a href="/propertymanagement/invoices/view/@payment.Invoice.Id">
-                                    @payment.Invoice.InvoiceNumber
-                                </a>
-                            </p>
-                        </div>
-                        <div class="mb-3">
-                            <label class="text-muted small">Property</label>
-                            <p>@payment.Invoice.Lease?.Property?.Address</p>
-                        </div>
-                        <div class="mb-3">
-                            <label class="text-muted small">Tenant</label>
-                            <p>@payment.Invoice.Lease?.Tenant?.FullName</p>
-                        </div>
-                        <hr />
-                        <div class="mb-2">
-                            <div class="d-flex justify-content-between">
-                                <span class="text-muted">Invoice Amount:</span>
-                                <span class="fw-bold">@payment.Invoice.Amount.ToString("C")</span>
-                            </div>
-                        </div>
-                        <div class="mb-2">
-                            <div class="d-flex justify-content-between">
-                                <span class="text-muted">Total Paid:</span>
-                                <span class="text-success">@payment.Invoice.AmountPaid.ToString("C")</span>
-                            </div>
-                        </div>
-                        <div class="mb-3">
-                            <div class="d-flex justify-content-between">
-                                <span class="text-muted">Balance Due:</span>
-                                <span class="fw-bold @(payment.Invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
-                                    @payment.Invoice.BalanceDue.ToString("C")
-                                </span>
-                            </div>
-                        </div>
-                        <div class="mb-2">
-                            <div class="d-flex justify-content-between">
-                                <span class="text-muted">Status:</span>
-                                <span>
-                                    @if (payment.Invoice.Status == "Paid")
-                                    {
-                                        <span class="badge bg-success">@payment.Invoice.Status</span>
-                                    }
-                                    else if (payment.Invoice.Status == "Partial")
-                                    {
-                                        <span class="badge bg-warning">Partially Paid</span>
-                                    }
-                                    else if (payment.Invoice.Status == "Overdue")
-                                    {
-                                        <span class="badge bg-danger">@payment.Invoice.Status</span>
-                                    }
-                                    else
-                                    {
-                                        <span class="badge bg-secondary">@payment.Invoice.Status</span>
-                                    }
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="card">
-                    <div class="card-header">
-                        <h6 class="card-title mb-0">Current Payment</h6>
-                    </div>
-                    <div class="card-body">
-                        <div class="mb-3">
-                            <label class="text-muted small">Original Amount</label>
-                            <p class="fw-bold">@payment.Amount.ToString("C")</p>
-                        </div>
-                        @if (paymentModel.Amount != payment.Amount)
-                        {
-                            <div class="mb-3">
-                                <label class="text-muted small">New Amount</label>
-                                <p class="fw-bold text-primary">@paymentModel.Amount.ToString("C")</p>
-                            </div>
-                            <div class="mb-3">
-                                <label class="text-muted small">Change</label>
-                                <p class="fw-bold @(amountDifference >= 0 ? "text-success" : "text-danger")">
-                                    @(amountDifference >= 0 ? "+" : "")@amountDifference.ToString("C")
-                                </p>
-                            </div>
-                            <hr />
-                            <div>
-                                <label class="text-muted small">New Invoice Balance</label>
-                                <p class="fw-bold @(newInvoiceBalance > 0 ? "text-danger" : "text-success")">
-                                    @newInvoiceBalance.ToString("C")
-                                </p>
-                            </div>
-                            @if (newInvoiceBalance < 0)
-                            {
-                                <div class="alert alert-warning mt-2 mb-0">
-                                    <small>Warning: Total payments exceed invoice amount.</small>
-                                </div>
-                            }
-                            else if (newInvoiceBalance == 0)
-                            {
-                                <div class="alert alert-success mt-2 mb-0">
-                                    <small>Invoice will be marked as Paid.</small>
-                                </div>
-                            }
-                        }
-                    </div>
-                </div>
-            }
-        </div>
-    </div>
-}
+<Aquiis.UI.Shared.Features.PropertyManagement.Payments.EditForm PaymentId="@PaymentId" />
 
 @code {
     [Parameter]
     public Guid PaymentId { get; set; }
-
-    private Payment? payment;
-    private PaymentModel? paymentModel;
-
-    private decimal currentInvoiceBalance => payment?.Invoice != null ? payment.Invoice.BalanceDue + payment.Amount : 0;
-    private decimal amountDifference => paymentModel != null && payment != null ? paymentModel.Amount - payment.Amount : 0;
-    private decimal newInvoiceBalance => currentInvoiceBalance - (paymentModel?.Amount ?? 0) + (payment?.Amount ?? 0);
-
-    protected override async Task OnInitializedAsync()
-    {
-        payment = await PaymentService.GetByIdAsync(PaymentId);
-
-        if (payment == null)
-        {
-            Navigation.NavigateTo("/propertymanagement/payments");
-            return;
-        }
-
-        paymentModel = new PaymentModel
-        {
-            PaidOn = payment.PaidOn,
-            Amount = payment.Amount,
-            PaymentMethod = payment.PaymentMethod,
-            Notes = payment.Notes
-        };
-    }
-
-    private async Task HandleUpdatePayment()
-    {
-        if (payment == null || paymentModel == null) return;
-
-        payment.PaidOn = paymentModel.PaidOn;
-        payment.Amount = paymentModel.Amount;
-        payment.PaymentMethod = paymentModel.PaymentMethod;
-        payment.Notes = paymentModel.Notes!;
-
-        await PaymentService.UpdateAsync(payment);
-        Navigation.NavigateTo("/propertymanagement/payments");
-    }
-
-    private void Cancel()
-    {
-        Navigation.NavigateTo("/propertymanagement/payments");
-    }
-
-    public class PaymentModel
-    {
-        [Required(ErrorMessage = "Payment date is required.")]
-        public DateTime PaidOn { get; set; }
-
-        [Required(ErrorMessage = "Amount is required.")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Amount must be greater than zero.")]
-        public decimal Amount { get; set; }
-
-        [Required(ErrorMessage = "Payment method is required.")]
-        public string PaymentMethod { get; set; } = string.Empty;
-
-        [MaxLength(1000)]
-        public string? Notes { get; set; }
-    }
 }
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/Index.razor b/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/Index.razor
index 47f7825..beb63e4 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/Index.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/Index.razor
@@ -1,492 +1,6 @@
 @page "/propertymanagement/payments"
-@using Aquiis.Professional.Features.PropertyManagement
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Components.Forms
-@inject NavigationManager Navigation
-@inject PaymentService PaymentService
-@inject IJSRuntime JSRuntime
-
+@using Aquiis.UI.Shared.Features.PropertyManagement.Payments
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-<PageTitle>Payments - Property Management</PageTitle>
-
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <h1><span class="bi bi-cash-coin" aria-hidden="true"></span> Payments</h1>
-    <button class="btn btn-primary" @onclick="CreatePayment">
-        <i class="bi bi-plus-lg"></i> Record Payment
-    </button>
-</div>
-
-@if (payments == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!payments.Any())
-{
-    <div class="alert alert-info">
-        <h4>No Payments Found</h4>
-        <p>Get started by recording your first payment.</p>
-        <button class="btn btn-primary" @onclick="CreatePayment">Record First Payment</button>
-    </div>
-}
-else
-{
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="input-group">
-                <span class="input-group-text"><i class="bi bi-search"></i></span>
-                <input type="text" class="form-control" placeholder="Search payments..." @bind="searchTerm" @onkeyup="FilterPayments" />
-            </div>
-        </div>
-        <div class="col-md-3">
-            <select class="form-select" @bind="selectedMethod" @bind:after="FilterPayments">
-                <option value="">All Payment Methods</option>
-                <option value="Cash">Cash</option>
-                <option value="Check">Check</option>
-                <option value="Credit Card">Credit Card</option>
-                <option value="Debit Card">Debit Card</option>
-                <option value="Bank Transfer">Bank Transfer</option>
-                <option value="Online Payment">Online Payment</option>
-                <option value="Other">Other</option>
-            </select>
-        </div>
-        <div class="col-md-3">
-            <div class="form-check form-switch pt-2">
-                <input class="form-check-input" type="checkbox" id="groupByInvoice" @bind="groupByInvoice" @bind:after="FilterPayments">
-                <label class="form-check-label" for="groupByInvoice">
-                    Group by Invoice
-                </label>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <button class="btn btn-outline-secondary" @onclick="ClearFilters">
-                <i class="bi bi-x-circle"></i> Clear Filters
-            </button>
-        </div>
-    </div>
-
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="card text-white bg-success">
-                <div class="card-body">
-                    <h6>Total Payments</h6>
-                    <h4>@paymentsCount</h4>
-                    <small>@totalAmount.ToString("C")</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-primary">
-                <div class="card-body">
-                    <h6>This Month</h6>
-                    <h4>@thisMonthCount</h4>
-                    <small>@thisMonthAmount.ToString("C")</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-info">
-                <div class="card-body">
-                    <h6>This Year</h6>
-                    <h4>@thisYearCount</h4>
-                    <small>@thisYearAmount.ToString("C")</small>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-warning">
-                <div class="card-body">
-                    <h6>Average Payment</h6>
-                    <h4>@averageAmount.ToString("C")</h4>
-                    <small>Per transaction</small>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="card">
-        <div class="card-body">
-            @if (groupByInvoice)
-            {
-                @foreach (var invoiceGroup in groupedPayments)
-                {
-                    var invoice = invoiceGroup.First().Invoice;
-                    var invoiceTotal = invoiceGroup.Sum(p => p.Amount);
-                    var isExpanded = expandedInvoices.Contains(invoiceGroup.Key);
-                    
-                    <div class="card mb-3">
-                        <div class="card-header" style="cursor: pointer;" @onclick="() => ToggleInvoiceGroup(invoiceGroup.Key)">
-                            <div class="d-flex justify-content-between align-items-center">
-                                <div>
-                                    <i class="bi @(isExpanded ? "bi-chevron-down" : "bi-chevron-right")"></i>
-                                    <strong>Invoice: @invoice?.InvoiceNumber</strong>
-                                    <span class="ms-3 text-muted">@invoice?.Lease?.Property?.Address</span>
-                                    <span class="ms-2 text-muted">• @invoice?.Lease?.Tenant?.FullName</span>
-                                </div>
-                                <div>
-                                    <span class="badge bg-secondary me-2">@invoiceGroup.Count() payment(s)</span>
-                                    <strong class="text-success">@invoiceTotal.ToString("C")</strong>
-                                </div>
-                            </div>
-                        </div>
-                        @if (isExpanded)
-                        {
-                            <div class="card-body p-0">
-                                <table class="table table-hover mb-0">
-                                    <thead class="table-light">
-                                        <tr>
-                                            <th>Payment Date</th>
-                                            <th>Amount</th>
-                                            <th>Payment Method</th>
-                                            <th>Notes</th>
-                                            <th>Actions</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @foreach (var payment in invoiceGroup)
-                                        {
-                                            <tr @onclick="() => ViewPayment(payment.Id)" style="cursor: pointer;">
-                                                <td>@payment.PaidOn.ToString("MMM dd, yyyy")</td>
-                                                <td><strong class="text-success">@payment.Amount.ToString("C")</strong></td>
-                                                <td><span class="badge bg-secondary">@payment.PaymentMethod</span></td>
-                                                <td>@(string.IsNullOrEmpty(payment.Notes) ? "-" : payment.Notes)</td>
-                                                <td @onclick:stopPropagation="true">
-                                                    <div class="btn-group" role="group">
-                                                        <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewPayment(payment.Id)" title="View">
-                                                            <i class="bi bi-eye"></i>
-                                                        </button>
-                                                        <button class="btn btn-sm btn-outline-secondary" @onclick="() => EditPayment(payment.Id)" title="Edit">
-                                                            <i class="bi bi-pencil"></i>
-                                                        </button>
-                                                        <button class="btn btn-sm btn-outline-danger" @onclick="() => DeletePayment(payment)" title="Delete">
-                                                            <i class="bi bi-trash"></i>
-                                                        </button>
-                                                    </div>
-                                                </td>
-                                            </tr>
-                                        }
-                                    </tbody>
-                                </table>
-                            </div>
-                        }
-                    </div>
-                }
-            }
-            else
-            {
-                <div class="table-responsive">
-                    <table class="table table-hover">
-                        <thead>
-                            <tr>
-                                <th>
-                                    <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Payment.PaidOn))">
-                                        Payment Date
-                                        @if (sortColumn == nameof(Payment.PaidOn))
-                                        {
-                                            <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                        }
-                                    </button>
-                                </th>
-                                <th>Invoice #</th>
-                                <th>Property</th>
-                                <th>Tenant</th>
-                                <th>
-                                    <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Payment.Amount))">
-                                        Amount
-                                        @if (sortColumn == nameof(Payment.Amount))
-                                        {
-                                            <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                        }
-                                    </button>
-                                </th>
-                                <th>Payment Method</th>
-                                <th>Actions</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            @foreach (var payment in pagedPayments)
-                            {
-                                <tr @onclick="() => ViewPayment(payment.Id)" style="cursor: pointer;">
-                                    <td>@payment.PaidOn.ToString("MMM dd, yyyy")</td>
-                                    <td>
-                                        <a href="/propertymanagement/invoices/view/@payment.InvoiceId" @onclick:stopPropagation="true">
-                                            @payment.Invoice?.InvoiceNumber
-                                        </a>
-                                    </td>
-                                    <td>@payment.Invoice?.Lease?.Property?.Address</td>
-                                    <td>@payment.Invoice?.Lease?.Tenant?.FullName</td>
-                                    <td><strong class="text-success">@payment.Amount.ToString("C")</strong></td>
-                                    <td>
-                                        <span class="badge bg-secondary">@payment.PaymentMethod</span>
-                                    </td>
-                                    <td @onclick:stopPropagation="true">
-                                        <div class="btn-group" role="group">
-                                            <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewPayment(payment.Id)" title="View">
-                                                <i class="bi bi-eye"></i>
-                                            </button>
-                                            <button class="btn btn-sm btn-outline-secondary" @onclick="() => EditPayment(payment.Id)" title="Edit">
-                                                <i class="bi bi-pencil"></i>
-                                            </button>
-                                            <button class="btn btn-sm btn-outline-danger" @onclick="() => DeletePayment(payment)" title="Delete">
-                                                <i class="bi bi-trash"></i>
-                                            </button>
-                                        </div>
-                                    </td>
-                                </tr>
-                            }
-                        </tbody>
-                    </table>
-                </div>
-            }
-
-            @if (totalPages > 1 && !groupByInvoice)
-            {
-                <div class="d-flex justify-content-between align-items-center mt-3">
-                    <div>
-                        <select class="form-select form-select-sm" @bind="pageSize" @bind:after="UpdatePagination">
-                            <option value="10">10 per page</option>
-                            <option value="20">20 per page</option>
-                            <option value="50">50 per page</option>
-                            <option value="100">100 per page</option>
-                        </select>
-                    </div>
-                    <div class="text-muted">
-                        Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords payments
-                    </div>
-                    <nav>
-                        <ul class="pagination pagination-sm mb-0">
-                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                <button class="page-link" @onclick="FirstPage" disabled="@(currentPage == 1)">
-                                    <i class="bi bi-chevron-double-left"></i>
-                                </button>
-                            </li>
-                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                <button class="page-link" @onclick="PreviousPage" disabled="@(currentPage == 1)">
-                                    <i class="bi bi-chevron-left"></i>
-                                </button>
-                            </li>
-                            @for (int i = Math.Max(1, currentPage - 2); i <= Math.Min(totalPages, currentPage + 2); i++)
-                            {
-                                var pageNum = i;
-                                <li class="page-item @(currentPage == pageNum ? "active" : "")">
-                                    <button class="page-link" @onclick="() => GoToPage(pageNum)">@pageNum</button>
-                                </li>
-                            }
-                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                <button class="page-link" @onclick="NextPage" disabled="@(currentPage == totalPages)">
-                                    <i class="bi bi-chevron-right"></i>
-                                </button>
-                            </li>
-                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                <button class="page-link" @onclick="LastPage" disabled="@(currentPage == totalPages)">
-                                    <i class="bi bi-chevron-double-right"></i>
-                                </button>
-                            </li>
-                        </ul>
-                    </nav>
-                </div>
-            }
-        </div>
-    </div>
-}
-
-@code {
-    private List<Payment>? payments;
-    private List<Payment> filteredPayments = new();
-    private List<Payment> pagedPayments = new();
-    private IEnumerable<IGrouping<Guid, Payment>> groupedPayments = Enumerable.Empty<IGrouping<Guid, Payment>>();
-    private HashSet<Guid> expandedInvoices = new();
-    private string searchTerm = string.Empty;
-    private string selectedMethod = string.Empty;
-    private string sortColumn = nameof(Payment.PaidOn);
-    private bool sortAscending = false;
-    private bool groupByInvoice = true;
-    
-    private int paymentsCount = 0;
-    private int thisMonthCount = 0;
-    private int thisYearCount = 0;
-    private decimal totalAmount = 0;
-    private decimal thisMonthAmount = 0;
-    private decimal thisYearAmount = 0;
-    private decimal averageAmount = 0;
-    
-    private int currentPage = 1;
-    private int pageSize = 20;
-    private int totalPages = 1;
-    private int totalRecords = 0;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadPayments();
-    }
-
-    private async Task LoadPayments()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (!string.IsNullOrEmpty(userId))
-        {
-            payments = await PaymentService.GetAllAsync();
-            FilterPayments();
-            UpdateStatistics();
-        }
-    }
-
-    private void FilterPayments()
-    {
-        if (payments == null) return;
-
-        filteredPayments = payments.Where(p =>
-        {
-            bool matchesSearch = string.IsNullOrWhiteSpace(searchTerm) ||
-                (p.Invoice?.InvoiceNumber?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ?? false) ||
-                (p.Invoice?.Lease?.Property?.Address?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ?? false) ||
-                (p.Invoice?.Lease?.Tenant?.FullName?.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ?? false) ||
-                p.PaymentMethod.Contains(searchTerm, StringComparison.OrdinalIgnoreCase);
-
-            bool matchesMethod = string.IsNullOrWhiteSpace(selectedMethod) ||
-                p.PaymentMethod.Equals(selectedMethod, StringComparison.OrdinalIgnoreCase);
-
-            return matchesSearch && matchesMethod;
-        }).ToList();
-
-        SortPayments();
-        
-        if (groupByInvoice)
-        {
-            groupedPayments = filteredPayments
-                .GroupBy(p => p.InvoiceId)
-                .OrderByDescending(g => g.Max(p => p.PaidOn))
-                .ToList();
-        }
-        else
-        {
-            UpdatePagination();
-        }
-    }
-
-    private void ToggleInvoiceGroup(Guid invoiceId)
-    {
-        if (expandedInvoices.Contains(invoiceId))
-        {
-            expandedInvoices.Remove(invoiceId);
-        }
-        else
-        {
-            expandedInvoices.Add(invoiceId);
-        }
-    }
-
-    private void SortBy(string column)
-    {
-        if (sortColumn == column)
-        {
-            sortAscending = !sortAscending;
-        }
-        else
-        {
-            sortColumn = column;
-            sortAscending = true;
-        }
-        SortPayments();
-        UpdatePagination();
-    }
-
-    private void SortPayments()
-    {
-        filteredPayments = sortColumn switch
-        {
-            nameof(Payment.PaidOn) => sortAscending
-                ? filteredPayments.OrderBy(p => p.PaidOn).ToList()
-                : filteredPayments.OrderByDescending(p => p.PaidOn).ToList(),
-            nameof(Payment.Amount) => sortAscending
-                ? filteredPayments.OrderBy(p => p.Amount).ToList()
-                : filteredPayments.OrderByDescending(p => p.Amount).ToList(),
-            _ => filteredPayments.OrderByDescending(p => p.PaidOn).ToList()
-        };
-    }
-
-    private void UpdateStatistics()
-    {
-        if (payments == null) return;
-
-        var now = DateTime.Now;
-        var firstDayOfMonth = new DateTime(now.Year, now.Month, 1);
-        var firstDayOfYear = new DateTime(now.Year, 1, 1);
-
-        paymentsCount = payments.Count;
-        thisMonthCount = payments.Count(p => p.PaidOn >= firstDayOfMonth);
-        thisYearCount = payments.Count(p => p.PaidOn >= firstDayOfYear);
-        
-        totalAmount = payments.Sum(p => p.Amount);
-        thisMonthAmount = payments.Where(p => p.PaidOn >= firstDayOfMonth).Sum(p => p.Amount);
-        thisYearAmount = payments.Where(p => p.PaidOn >= firstDayOfYear).Sum(p => p.Amount);
-        averageAmount = paymentsCount > 0 ? totalAmount / paymentsCount : 0;
-    }
-
-    private void UpdatePagination()
-    {
-        totalRecords = filteredPayments.Count;
-        totalPages = (int)Math.Ceiling(totalRecords / (double)pageSize);
-        currentPage = Math.Min(currentPage, Math.Max(1, totalPages));
-        
-        pagedPayments = filteredPayments
-            .Skip((currentPage - 1) * pageSize)
-            .Take(pageSize)
-            .ToList();
-    }
-
-    private void ClearFilters()
-    {
-        searchTerm = string.Empty;
-        selectedMethod = string.Empty;
-        groupByInvoice = false;
-        FilterPayments();
-    }
-
-    private void FirstPage() => GoToPage(1);
-    private void LastPage() => GoToPage(totalPages);
-    private void NextPage() => GoToPage(currentPage + 1);
-    private void PreviousPage() => GoToPage(currentPage - 1);
-    
-    private void GoToPage(int page)
-    {
-        currentPage = Math.Max(1, Math.Min(page, totalPages));
-        UpdatePagination();
-    }
-
-    private void CreatePayment()
-    {
-        Navigation.NavigateTo("/propertymanagement/payments/create");
-    }
-
-    private void ViewPayment(Guid id)
-    {
-        Navigation.NavigateTo($"/propertymanagement/payments/{id}");
-    }
-
-    private void EditPayment(Guid id)
-    {
-        Navigation.NavigateTo($"/propertymanagement/payments/{id}/edit");
-    }
-
-    private async Task DeletePayment(Payment payment)
-    {
-        if (await JSRuntime.InvokeAsync<bool>("confirm", $"Are you sure you want to delete this payment of {payment.Amount:C}?"))
-        {
-            await PaymentService.DeleteAsync(payment.Id);
-            await LoadPayments();
-        }
-    }
-}
+<ListForm />
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/View.razor b/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/View.razor
index 2077f29..fcffe53 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/View.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/View.razor
@@ -1,417 +1,13 @@
 @page "/propertymanagement/payments/{PaymentId:guid}"
-
-@using Aquiis.Professional.Features.PropertyManagement
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Authorization
-@inject NavigationManager Navigation
-@inject PaymentService PaymentService
-@inject Application.Services.DocumentService DocumentService
-@inject UserContextService UserContextService
-@inject IJSRuntime JSRuntime
-
+@using Aquiis.UI.Shared.Features.PropertyManagement.Payments
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
 <PageTitle>View Payment - Property Management</PageTitle>
 
-@if (payment == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else
-{
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <div>
-            <h1><span class="bi bi-cash-coin" aria-hidden="true"></span> Payment Details</h1>
-            <p class="text-muted">Payment Date: @payment.PaidOn.ToString("MMMM dd, yyyy")</p>
-        </div>
-        <div>
-            <button class="btn btn-outline-secondary me-2" @onclick="GoBack">
-                <i class="bi bi-arrow-left"></i> Back to Payments
-            </button>
-            <button class="btn btn-primary" @onclick="EditPayment">
-                <i class="bi bi-pencil"></i> Edit
-            </button>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-lg-8">
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="card-title mb-0">Payment Information</h5>
-                </div>
-                <div class="card-body">
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <label class="text-muted small">Payment Date</label>
-                            <p class="fw-bold">@payment.PaidOn.ToString("MMMM dd, yyyy")</p>
-                        </div>
-                        <div class="col-md-6">
-                            <label class="text-muted small">Amount</label>
-                            <p class="fw-bold text-success fs-4">@payment.Amount.ToString("C")</p>
-                        </div>
-                    </div>
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <label class="text-muted small">Payment Method</label>
-                            <p class="fw-bold">
-                                <span class="badge bg-secondary">@payment.PaymentMethod</span>
-                            </p>
-                        </div>
-                    </div>
-                    @if (!string.IsNullOrWhiteSpace(payment.Notes))
-                    {
-                        <div class="row">
-                            <div class="col-12">
-                                <label class="text-muted small">Notes</label>
-                                <p>@payment.Notes</p>
-                            </div>
-                        </div>
-                    }
-                </div>
-            </div>
-
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h5 class="card-title mb-0">Invoice Information</h5>
-                </div>
-                <div class="card-body">
-                    @if (payment.Invoice != null)
-                    {
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="text-muted small">Invoice Number</label>
-                                <p class="fw-bold">
-                                    <a href="/propertymanagement/invoices/view/@payment.Invoice.Id">
-                                        @payment.Invoice.InvoiceNumber
-                                    </a>
-                                </p>
-                            </div>
-                            <div class="col-md-6">
-                                <label class="text-muted small">Invoice Status</label>
-                                <p>
-                                    @if (payment.Invoice.Status == "Paid")
-                                    {
-                                        <span class="badge bg-success">@payment.Invoice.Status</span>
-                                    }
-                                    else if (payment.Invoice.Status == "Partial")
-                                    {
-                                        <span class="badge bg-warning">Partially Paid</span>
-                                    }
-                                    else if (payment.Invoice.Status == "Overdue")
-                                    {
-                                        <span class="badge bg-danger">@payment.Invoice.Status</span>
-                                    }
-                                    else
-                                    {
-                                        <span class="badge bg-secondary">@payment.Invoice.Status</span>
-                                    }
-                                </p>
-                            </div>
-                        </div>
-                        <div class="row mb-3">
-                            <div class="col-md-4">
-                                <label class="text-muted small">Invoice Amount</label>
-                                <p class="fw-bold">@payment.Invoice.Amount.ToString("C")</p>
-                            </div>
-                            <div class="col-md-4">
-                                <label class="text-muted small">Total Paid</label>
-                                <p class="fw-bold text-success">@payment.Invoice.AmountPaid.ToString("C")</p>
-                            </div>
-                            <div class="col-md-4">
-                                <label class="text-muted small">Balance Due</label>
-                                <p class="fw-bold @(payment.Invoice.BalanceDue > 0 ? "text-danger" : "text-success")">
-                                    @payment.Invoice.BalanceDue.ToString("C")
-                                </p>
-                            </div>
-                        </div>
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="text-muted small">Invoice Date</label>
-                                <p>@payment.Invoice.InvoicedOn.ToString("MMM dd, yyyy")</p>
-                            </div>
-                            <div class="col-md-6">
-                                <label class="text-muted small">Due Date</label>
-                                <p class="@(payment.Invoice.IsOverdue ? "text-danger fw-bold" : "")">
-                                    @payment.Invoice.DueOn.ToString("MMM dd, yyyy")
-                                    @if (payment.Invoice.IsOverdue)
-                                    {
-                                        <span class="badge bg-danger ms-2">@payment.Invoice.DaysOverdue days overdue</span>
-                                    }
-                                </p>
-                            </div>
-                        </div>
-                        @if (!string.IsNullOrWhiteSpace(payment.Invoice.Description))
-                        {
-                            <div class="row">
-                                <div class="col-12">
-                                    <label class="text-muted small">Description</label>
-                                    <p>@payment.Invoice.Description</p>
-                                </div>
-                            </div>
-                        }
-                    }
-                </div>
-            </div>
-
-            @if (payment.Invoice?.Lease != null)
-            {
-                <div class="card mb-3">
-                    <div class="card-header">
-                        <h5 class="card-title mb-0">Lease & Property Information</h5>
-                    </div>
-                    <div class="card-body">
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="text-muted small">Property Address</label>
-                                <p class="fw-bold">
-                                    <a href="/propertymanagement/properties/view/@payment.Invoice.Lease.PropertyId">
-                                        @payment.Invoice.Lease.Property?.Address
-                                    </a>
-                                </p>
-                            </div>
-                            <div class="col-md-6">
-                                <label class="text-muted small">Tenant</label>
-                                <p class="fw-bold">
-                                    <a href="/propertymanagement/tenants/view/@payment.Invoice.Lease.TenantId">
-                                        @payment.Invoice.Lease.Tenant?.FullName
-                                    </a>
-                                </p>
-                            </div>
-                        </div>
-                        <div class="row mb-3">
-                            <div class="col-md-6">
-                                <label class="text-muted small">Monthly Rent</label>
-                                <p class="fw-bold">@payment.Invoice.Lease.MonthlyRent.ToString("C")</p>
-                            </div>
-                            <div class="col-md-6">
-                                <label class="text-muted small">Lease Status</label>
-                                <p>
-                                    @if (payment.Invoice.Lease.Status == "Active")
-                                    {
-                                        <span class="badge bg-success">@payment.Invoice.Lease.Status</span>
-                                    }
-                                    else if (payment.Invoice.Lease.Status == "Expired")
-                                    {
-                                        <span class="badge bg-danger">@payment.Invoice.Lease.Status</span>
-                                    }
-                                    else
-                                    {
-                                        <span class="badge bg-secondary">@payment.Invoice.Lease.Status</span>
-                                    }
-                                </p>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-6">
-                                <label class="text-muted small">Lease Start</label>
-                                <p>@payment.Invoice.Lease.StartDate.ToString("MMM dd, yyyy")</p>
-                            </div>
-                            <div class="col-md-6">
-                                <label class="text-muted small">Lease End</label>
-                                <p>@payment.Invoice.Lease.EndDate.ToString("MMM dd, yyyy")</p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            }
-        </div>
-
-        <div class="col-lg-4">
-            <div class="card mb-3">
-                <div class="card-header">
-                    <h6 class="card-title mb-0">Quick Actions</h6>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-primary" @onclick="EditPayment">
-                            <i class="bi bi-pencil"></i> Edit Payment
-                        </button>
-                        @if (payment.DocumentId == null)
-                        {
-                            <button class="btn btn-outline-success" @onclick="GeneratePaymentReceipt" disabled="@isGenerating">
-                                @if (isGenerating)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-1" role="status"></span>
-                                }
-                                else
-                                {
-                                    <i class="bi bi-file-pdf"></i>
-                                }
-                                Generate Receipt
-                            </button>
-                        }
-                        else
-                        {
-                            <button class="btn btn-success" @onclick="ViewDocument">
-                                <i class="bi bi-eye"></i> View Receipt
-                            </button>
-                            <button class="btn btn-outline-success" @onclick="DownloadDocument">
-                                <i class="bi bi-download"></i> Download Receipt
-                            </button>
-                        }
-                        <a href="/propertymanagement/invoices/view/@payment.InvoiceId" class="btn btn-outline-primary">
-                            <i class="bi bi-receipt"></i> View Invoice
-                        </a>
-                        @if (payment.Invoice?.Lease != null)
-                        {
-                            <a href="/propertymanagement/leases/view/@payment.Invoice.LeaseId" class="btn btn-outline-secondary">
-                                <i class="bi bi-file-text"></i> View Lease
-                            </a>
-                            <a href="/propertymanagement/properties/view/@payment.Invoice.Lease.PropertyId" class="btn btn-outline-secondary">
-                                <i class="bi bi-house"></i> View Property
-                            </a>
-                            <a href="/propertymanagement/tenants/view/@payment.Invoice.Lease.TenantId" class="btn btn-outline-secondary">
-                                <i class="bi bi-person"></i> View Tenant
-                            </a>
-                        }
-                    </div>
-                </div>
-            </div>
-
-            <div class="card">
-                <div class="card-header">
-                    <h6 class="card-title mb-0">Metadata</h6>
-                </div>
-                <div class="card-body">
-                    <div class="mb-3">
-                        <label class="text-muted small">Created</label>
-                        <p class="mb-0">@payment.CreatedOn.ToString("g")</p>
-                        @if (!string.IsNullOrEmpty(payment.CreatedBy))
-                        {
-                            <small class="text-muted">by @payment.CreatedBy</small>
-                        }
-                    </div>
-                    @if (payment.LastModifiedOn.HasValue)
-                    {
-                        <div>
-                            <label class="text-muted small">Last Modified</label>
-                            <p class="mb-0">@payment.LastModifiedOn.Value.ToString("g")</p>
-                            @if (!string.IsNullOrEmpty(payment.LastModifiedBy))
-                            {
-                                <small class="text-muted">by @payment.LastModifiedBy</small>
-                            }
-                        </div>
-                    }
-                </div>
-            </div>
-        </div>
-    </div>
-}
+<ViewForm PaymentId="@PaymentId" />
 
 @code {
     [Parameter]
     public Guid PaymentId { get; set; }
-
-    private Payment? payment;
-    private bool isGenerating = false;
-    private Document? document = null;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        payment = await PaymentService.GetByIdAsync(PaymentId);
-        
-        if (payment == null)
-        {
-            Navigation.NavigateTo("/propertymanagement/payments");
-        }
-        else if (payment.DocumentId != null)
-        {
-            // Load the document if it exists
-            document = await DocumentService.GetByIdAsync(payment.DocumentId.Value);
-        }
-    }
-
-    private void EditPayment()
-    {
-        Navigation.NavigateTo($"/propertymanagement/payments/{PaymentId}/edit");
-    }
-
-    private void GoBack()
-    {
-        Navigation.NavigateTo("/propertymanagement/payments");
-    }
-
-    private async Task ViewDocument()
-    {
-        if (document != null)
-        {
-            var base64Data = Convert.ToBase64String(document.FileData);
-            await JSRuntime.InvokeVoidAsync("viewFile", base64Data, document.FileType);
-        }
-    }
-
-    private async Task DownloadDocument()
-    {
-        if (document != null)
-        {
-            var fileName = document.FileName;
-            var fileData = document.FileData;
-            var mimeType = document.FileType;
-
-            await JSRuntime.InvokeVoidAsync("downloadFile", fileName, Convert.ToBase64String(fileData), mimeType);
-        }
-    }
-
-    private async Task GeneratePaymentReceipt()
-    {
-        isGenerating = true;
-        StateHasChanged();
-
-        try
-        {
-            // Generate the PDF receipt
-            byte[] pdfBytes = Aquiis.Application.Services.PdfGenerators.PaymentPdfGenerator.GeneratePaymentReceipt(payment!);
-
-            // Create the document entity
-            var document = new Document
-            {
-                FileName = $"Receipt_{payment!.PaidOn:yyyyMMdd}_{DateTime.Now:HHmmss}.pdf",
-                FileExtension = ".pdf",
-                FileData = pdfBytes,
-                FileSize = pdfBytes.Length,
-                FileType = "application/pdf",
-                ContentType = "application/pdf",
-                DocumentType = "Payment Receipt",
-                Description = $"Payment receipt for {payment.Amount:C} on {payment.PaidOn:MMM dd, yyyy}",
-                LeaseId = payment.Invoice?.LeaseId,
-                PropertyId = payment.Invoice?.Lease?.PropertyId,
-                TenantId = payment.Invoice?.Lease?.TenantId,
-                InvoiceId = payment.InvoiceId,
-                IsDeleted = false
-            };
-
-            // Save to database
-            await DocumentService.CreateAsync(document);
-
-            // Update payment with DocumentId
-            payment.DocumentId = document.Id;
-           
-            await PaymentService.UpdateAsync(payment);
-
-            // Reload payment and document
-            this.document = document;
-            StateHasChanged();
-
-            await JSRuntime.InvokeVoidAsync("alert", "Payment receipt generated successfully!");
-        }
-        catch (Exception ex)
-        {
-            await JSRuntime.InvokeVoidAsync("alert", $"Error generating payment receipt: {ex.Message}");
-        }
-        finally
-        {
-            isGenerating = false;
-            StateHasChanged();
-        }
-    }
 }
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/_Imports.razor b/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/_Imports.razor
deleted file mode 100644
index 09581e0..0000000
--- a/5-Aquiis.Professional/Features/PropertyManagement/Payments/Pages/_Imports.razor
+++ /dev/null
@@ -1,12 +0,0 @@
-@using System.Net.Http
-@using System.Net.Http.Json
-@using Microsoft.AspNetCore.Components.Authorization
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using static Microsoft.AspNetCore.Components.Web.RenderMode
-@using Microsoft.AspNetCore.Components.Web.Virtualization
-@using Microsoft.JSInterop
-@using Aquiis.Professional
-@using Aquiis.Infrastructure.Data
-@using Aquiis.Core.Entities
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/Create.razor b/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/Create.razor
index ad962d9..f0a7f13 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/Create.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/Create.razor
@@ -1,260 +1,5 @@
 @page "/propertymanagement/properties/create"
-@using Aquiis.Core.Constants
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components
-@using Microsoft.AspNetCore.Components.Forms
-@using System.ComponentModel.DataAnnotations
-@inject NavigationManager Navigation
-@inject PropertyService PropertyService
-
-@rendermode InteractiveServer
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
+@rendermode InteractiveServer
 
-<div class="row">
-    <div class="col-md-8">
-        <div class="card">
-            <div class="card-header">
-                <h3 class="card-title mb-0">Add New Property</h3>
-            </div>
-            <div class="card-body">
-                <EditForm Model="propertyModel" OnValidSubmit="SaveProperty" FormName="create-property">
-                    <DataAnnotationsValidator />
-                    
-                    @if (!string.IsNullOrEmpty(errorMessage))
-                    {
-                        <div class="alert alert-danger" role="alert">
-                            @errorMessage
-                        </div>
-                    }
-
-                    <div class="row">
-                        <div class="col-md-12 mb-3">
-                            <label class="form-label">Address *</label>
-                            <InputText @bind-Value="propertyModel.Address" class="form-control" placeholder="Enter property address" />
-                            <ValidationMessage For="() => propertyModel.Address" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-8 mb-3">
-                            <label class="form-label">Unit Number</label>
-                            <InputText @bind-Value="propertyModel.UnitNumber" class="form-control" placeholder="e.g., Apt 2B, Unit 101" />
-                            <ValidationMessage For="() => propertyModel.UnitNumber" class="text-danger" />
-                        </div>
-                        @* <div class="col-md-4 mb-3">
-                            <label class="form-label" for="@propertyModel.ZipCode">Postal Code</label>
-                            <InputText @bind-Value="propertyModel.ZipCode" class="form-control" placeholder="#####-####" />
-                            <ValidationMessage For="() => propertyModel.ZipCode" class="text-danger" />
-                        </div> *@
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-4 mb-3">
-                            <label class="form-label">City</label>
-                            <InputText @bind-Value="propertyModel.City" class="form-control" placeholder="City" />
-                            <ValidationMessage For="() => propertyModel.City" class="text-danger" />
-                        </div>
-                        <div class="col-md-4 mb-3">
-                            <label class="form-label">State</label>
-                            <InputSelect @bind-Value="propertyModel.State" class="form-select">
-                                <option value="">Select State</option>
-                                @foreach (var state in States.StatesArray())
-                                {
-                                    <option value="@state.Abbreviation">@state.Name</option>
-                                }
-                            </InputSelect>
-                            <ValidationMessage For="() => propertyModel.State" class="text-danger" />
-                        </div>
-                        <div class="col-md-4 mb-3">
-                            <label class="form-label" for="@propertyModel.ZipCode">Postal Code</label>
-                            <InputText @bind-Value="propertyModel.ZipCode" class="form-control" placeholder="#####-####" />
-                            <ValidationMessage For="() => propertyModel.ZipCode" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Property Type *</label>
-                            <InputSelect @bind-Value="propertyModel.PropertyType" class="form-select">
-                                <option value="">Select property type</option>
-                                <option value="House">House</option>
-                                <option value="Apartment">Apartment</option>
-                                <option value="Condo">Condo</option>
-                                <option value="Townhouse">Townhouse</option>
-                                <option value="Duplex">Duplex</option>
-                                <option value="Commercial">Commercial</option>
-                                <option value="Other">Other</option>
-                            </InputSelect>
-                            <ValidationMessage For="() => propertyModel.PropertyType" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Monthly Rent *</label>
-                            <InputNumber @bind-Value="propertyModel.MonthlyRent" class="form-control" placeholder="0.00" />
-                            <ValidationMessage For="() => propertyModel.MonthlyRent" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Status *</label>
-                            <InputSelect @bind-Value="propertyModel.Status" class="form-select">
-                                <option value="@ApplicationConstants.PropertyStatuses.Available">Available</option>
-                                <option value="@ApplicationConstants.PropertyStatuses.ApplicationPending">Application Pending</option>
-                                <option value="@ApplicationConstants.PropertyStatuses.LeasePending">Lease Pending</option>
-                                <option value="@ApplicationConstants.PropertyStatuses.Occupied">Occupied</option>
-                                <option value="@ApplicationConstants.PropertyStatuses.UnderRenovation">Under Renovation</option>
-                                <option value="@ApplicationConstants.PropertyStatuses.OffMarket">Off Market</option>
-                            </InputSelect>
-                            <ValidationMessage For="() => propertyModel.Status" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-4 mb-3">
-                            <label class="form-label">Bedrooms</label>
-                            <InputNumber @bind-Value="propertyModel.Bedrooms" class="form-control" />
-                            <ValidationMessage For="() => propertyModel.Bedrooms" class="text-danger" />
-                        </div>
-                        <div class="col-md-4 mb-3">
-                            <label class="form-label">Bathrooms</label>
-                            <InputNumber @bind-Value="propertyModel.Bathrooms" class="form-control" />
-                            <ValidationMessage For="() => propertyModel.Bathrooms" class="text-danger" />
-                        </div>
-                        <div class="col-md-4 mb-3">
-                            <label class="form-label">Square Feet</label>
-                            <InputNumber @bind-Value="propertyModel.SquareFeet" class="form-control" />
-                            <ValidationMessage For="() => propertyModel.SquareFeet" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-12 mb-3">
-                            <label class="form-label">Description</label>
-                            <InputTextArea @bind-Value="propertyModel.Description" class="form-control" rows="4" placeholder="Property description and features" />
-                            <ValidationMessage For="() => propertyModel.Description" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-12 mb-3">
-                            <div class="form-check">
-                                <InputCheckbox @bind-Value="propertyModel.IsAvailable" class="form-check-input" />
-                                <label class="form-check-label">
-                                    Property is available for rent
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="d-flex gap-2">
-                        <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                            }
-                            Create Property
-                        </button>
-                        <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
-                    </div>
-                </EditForm>
-            </div>
-        </div>
-    </div>
-</div>
-
-@code {
-    private PropertyModel propertyModel = new();
-     private bool isSubmitting = false;
-    private string errorMessage = string.Empty;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    private async Task SaveProperty()
-    {
-        isSubmitting = true;
-        errorMessage = string.Empty;
-
-        var property = new Property
-        {
-            Address = propertyModel.Address,
-            UnitNumber = propertyModel.UnitNumber,
-            City = propertyModel.City,
-            State = propertyModel.State,
-            ZipCode = propertyModel.ZipCode,
-            PropertyType = propertyModel.PropertyType,
-            MonthlyRent = propertyModel.MonthlyRent,
-            Bedrooms = propertyModel.Bedrooms,
-            Bathrooms = propertyModel.Bathrooms,
-            SquareFeet = propertyModel.SquareFeet,
-            Description = propertyModel.Description,
-            Status = propertyModel.Status,
-            IsAvailable = propertyModel.IsAvailable,
-        };
-
-        // Save the property using a service or API call
-        await PropertyService.CreateAsync(property);
-
-        isSubmitting = false;
-        // Redirect to the properties list page after successful addition
-        Navigation.NavigateTo("/propertymanagement/properties");
-    }
-
-    private void Cancel()
-    {
-        Navigation.NavigateTo("/propertymanagement/properties");
-    }
-
-
-    public class PropertyModel
-    {
-        [Required(ErrorMessage = "Address is required")]
-        [StringLength(200, ErrorMessage = "Address cannot exceed 200 characters")]
-        public string Address { get; set; } = string.Empty;
-
-        [StringLength(50, ErrorMessage = "Unit number cannot exceed 50 characters")]
-        public string? UnitNumber { get; set; }
-
-        [StringLength(100, ErrorMessage = "City cannot exceed 100 characters")]
-        public string City { get; set; } = string.Empty;
-
-        [StringLength(50, ErrorMessage = "State cannot exceed 50 characters")]
-        public string State { get; set; } = string.Empty;
-
-        [StringLength(10, ErrorMessage = "Zip Code cannot exceed 10 characters")]
-        [DataType(DataType.PostalCode)]
-        [RegularExpression(@"^\d{5}(-\d{4})?$", ErrorMessage = "Invalid Zip Code format.")]
-        [MaxLength(10, ErrorMessage = "Zip Code cannot exceed 10 characters.")]
-        [Display(Name = "Postal Code", Description = "Postal Code of the property",
-            Prompt = "e.g., 12345 or 12345-6789", ShortName = "ZIP")]
-        public string ZipCode { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Property type is required")]
-        [StringLength(50, ErrorMessage = "Property type cannot exceed 50 characters")]
-        public string PropertyType { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Monthly rent is required")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Monthly rent must be greater than 0")]
-        public decimal MonthlyRent { get; set; }
-
-        [Range(0, int.MaxValue, ErrorMessage = "Bedrooms cannot be negative")]
-        public int Bedrooms { get; set; }
-
-        [Range(0.0, double.MaxValue, ErrorMessage = "Bathrooms cannot be negative")]
-        public decimal Bathrooms { get; set; }
-
-        [Range(0, int.MaxValue, ErrorMessage = "Square feet cannot be negative")]
-        public int SquareFeet { get; set; }
-
-        [StringLength(1000, ErrorMessage = "Description cannot exceed 1000 characters")]
-        public string Description { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Status is required")]
-        [StringLength(50, ErrorMessage = "Status cannot exceed 50 characters")]
-        public string Status { get; set; } = ApplicationConstants.PropertyStatuses.Available;
-
-        public bool IsAvailable { get; set; } = true;
-    }
-}
\ No newline at end of file
+<Aquiis.UI.Shared.Features.PropertyManagement.Properties.PropertyCreateForm />
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/Edit.razor b/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/Edit.razor
index 0556bda..145a7fd 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/Edit.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/Edit.razor
@@ -1,399 +1,10 @@
 @page "/propertymanagement/properties/{PropertyId:guid}/edit"
-
-@using System.ComponentModel.DataAnnotations
-@using Aquiis.Core.Entities
-@using Aquiis.Core.Constants
-@using Microsoft.AspNetCore.Components.Authorization
-@using System.Security.Claims
-@using Microsoft.AspNetCore.Components
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Web
-@using Microsoft.AspNetCore.Authorization
-
-@rendermode InteractiveServer
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
-@inject PropertyService PropertyService
-@inject NavigationManager NavigationManager
-
-@if (property == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!isAuthorized)
-{
-    <div class="alert alert-danger">
-        <h4>Access Denied</h4>
-        <p>You don't have permission to edit this property.</p>
-        <a href="/properties" class="btn btn-primary">Back to Properties</a>
-    </div>
-}
-else
-{
-    <div class="row">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">
-                    <h3 class="card-title mb-0">Edit Property</h3>
-                </div>
-                <div class="card-body">
-                    <EditForm Model="propertyModel" OnValidSubmit="UpdatePropertyAsync" FormName="edit-property">
-                        <DataAnnotationsValidator />
-                        
-                        @if (!string.IsNullOrEmpty(errorMessage))
-                        {
-                            <div class="alert alert-danger" role="alert">
-                                @errorMessage
-                            </div>
-                        }
-
-                        @if (!string.IsNullOrEmpty(successMessage))
-                        {
-                            <div class="alert alert-success" role="alert">
-                                @successMessage
-                            </div>
-                        }
-
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <label class="form-label">Address *</label>
-                                <InputText @bind-Value="propertyModel.Address" class="form-control" placeholder="Enter property address" />
-                                <ValidationMessage For="() => propertyModel.Address" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-8 mb-3">
-                                <label class="form-label">Unit Number</label>
-                                <InputText @bind-Value="propertyModel.UnitNumber" class="form-control" placeholder="e.g., Apt 2B, Unit 101" />
-                                <ValidationMessage For="() => propertyModel.UnitNumber" class="text-danger" />
-                            </div>
-                            <div class="col-md-4 mb-3">
-                                <label class="form-label">Zip Code</label>
-                                <InputText @bind-Value="propertyModel.ZipCode" class="form-control" placeholder="Zip Code" />
-                                <ValidationMessage For="() => propertyModel.ZipCode" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-4 mb-3">
-                                <label class="form-label">City</label>
-                                <InputText @bind-Value="propertyModel.City" class="form-control" placeholder="City" />
-                                <ValidationMessage For="() => propertyModel.City" class="text-danger" />
-                            </div>
-                            <div class="col-md-4 mb-3">
-                                <label class="form-label">State</label>
-                                <InputSelect @bind-Value="propertyModel.State" class="form-select">
-                                    <option value="">Select State</option>
-                                    @foreach (var state in States.StatesArray())
-                                    {
-                                        <option value="@state.Abbreviation">@state.Name</option>
-                                    }
-                                </InputSelect>
-                                <ValidationMessage For="() => propertyModel.State" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Property Type *</label>
-                                <InputSelect @bind-Value="propertyModel.PropertyType" class="form-select">
-                                    <option value="">Select property type</option>
-                                    <option value="House">House</option>
-                                    <option value="Apartment">Apartment</option>
-                                    <option value="Condo">Condo</option>
-                                    <option value="Townhouse">Townhouse</option>
-                                    <option value="Duplex">Duplex</option>
-                                    <option value="Commercial">Commercial</option>
-                                    <option value="Other">Other</option>
-                                </InputSelect>
-                                <ValidationMessage For="() => propertyModel.PropertyType" class="text-danger" />
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Monthly Rent *</label>
-                                <InputNumber @bind-Value="propertyModel.MonthlyRent" class="form-control" placeholder="0.00" />
-                                <ValidationMessage For="() => propertyModel.MonthlyRent" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Status *</label>
-                                <InputSelect @bind-Value="propertyModel.Status" class="form-select">
-                                    <option value="@ApplicationConstants.PropertyStatuses.Available">Available</option>
-                                    <option value="@ApplicationConstants.PropertyStatuses.ApplicationPending">Application Pending</option>
-                                    <option value="@ApplicationConstants.PropertyStatuses.LeasePending">Lease Pending</option>
-                                    <option value="@ApplicationConstants.PropertyStatuses.Occupied">Occupied</option>
-                                    <option value="@ApplicationConstants.PropertyStatuses.UnderRenovation">Under Renovation</option>
-                                    <option value="@ApplicationConstants.PropertyStatuses.OffMarket">Off Market</option>
-                                </InputSelect>
-                                <ValidationMessage For="() => propertyModel.Status" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-4 mb-3">
-                                <label class="form-label">Bedrooms</label>
-                                <InputNumber @bind-Value="propertyModel.Bedrooms" class="form-control" />
-                                <ValidationMessage For="() => propertyModel.Bedrooms" class="text-danger" />
-                            </div>
-                            <div class="col-md-4 mb-3">
-                                <label class="form-label">Bathrooms</label>
-                                <InputNumber @bind-Value="propertyModel.Bathrooms" class="form-control" />
-                                <ValidationMessage For="() => propertyModel.Bathrooms" class="text-danger" />
-                            </div>
-                            <div class="col-md-4 mb-3">
-                                <label class="form-label">Square Feet</label>
-                                <InputNumber @bind-Value="propertyModel.SquareFeet" class="form-control" />
-                                <ValidationMessage For="() => propertyModel.SquareFeet" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <label class="form-label">Description</label>
-                                <InputTextArea @bind-Value="propertyModel.Description" class="form-control" rows="4" placeholder="Property description and features" />
-                                <ValidationMessage For="() => propertyModel.Description" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <div class="form-check">
-                                    <InputCheckbox @bind-Value="propertyModel.IsAvailable" class="form-check-input" />
-                                    <label class="form-check-label">
-                                        Property is available for rent
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="d-flex gap-2">
-                            <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                                @if (isSubmitting)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                                }
-                                Update Property
-                            </button>
-                            <button type="button" class="btn btn-secondary" @onclick="ViewProperty">View Property</button>
-                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                        </div>
-                    </EditForm>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-md-4">
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Property Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="ViewProperty">
-                            <i class="bi bi-eye"></i> View Property
-                        </button>
-                        <button class="btn btn-outline-danger" @onclick="DeleteProperty">
-                            <i class="bi bi-trash"></i> Delete Property
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="card mt-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Property Information</h5>
-                </div>
-                <div class="card-body">
-                    <small class="text-muted">
-                        <strong>Created:</strong> @property.CreatedOn.ToString("MMMM dd, yyyy")
-                        <br />
-                        @if (property.LastModifiedOn.HasValue)
-                        {
-                            <strong>Last Modified:</strong> @property.LastModifiedOn.Value.ToString("MMMM dd, yyyy")
-                        }
-                    </small>
-                </div>
-            </div>
-        </div>
-    </div>
-}
+@rendermode InteractiveServer
 
+<Aquiis.UI.Shared.Features.PropertyManagement.Properties.PropertyEditForm PropertyId="@PropertyId" />
 
 @code {
     [Parameter]
     public Guid PropertyId { get; set; }
-
-    private string currentUserId = string.Empty;
-    private string errorMessage = string.Empty;
-
-    private Property? property;
-        private PropertyModel propertyModel = new();
-    private bool isSubmitting = false;
-    private bool isAuthorized = true;
-    private string successMessage = string.Empty;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadPropertyAsync();
-    }
-
-    private async Task LoadPropertyAsync()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (string.IsNullOrEmpty(userId))
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        property = await PropertyService.GetByIdAsync(PropertyId);
-
-        if (property == null)
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        // Map property to model
-        propertyModel = new PropertyModel
-        {
-            Address = property.Address,
-            UnitNumber = property.UnitNumber,
-            City = property.City,
-            State = property.State,
-            ZipCode = property.ZipCode,
-            PropertyType = property.PropertyType,
-            MonthlyRent = property.MonthlyRent,
-            Bedrooms = property.Bedrooms,
-            Bathrooms = property.Bathrooms,
-            SquareFeet = property.SquareFeet,
-            Description = property.Description,
-            Status = property.Status,
-            IsAvailable = property.IsAvailable
-        };
-    }
-
-    private async Task SavePropertyAsync()
-    {
-        if (property != null)
-        {
-            await PropertyService.UpdateAsync(property);
-            NavigationManager.NavigateTo("/propertymanagement/properties");
-        }
-    }
-
-    private async Task DeleteProperty()
-    {
-        if (property != null)
-        {
-            await PropertyService.DeleteAsync(property.Id);
-            NavigationManager.NavigateTo("/propertymanagement/properties");
-        }
-    }
-
-    private void ViewProperty()
-    {
-        if (property != null)
-        {
-            NavigationManager.NavigateTo($"/propertymanagement/properties/{property.Id}");
-        }
-    }
-
-    private async Task UpdatePropertyAsync()
-    {
-        
-        if (property != null)
-        {
-            try {
-            isSubmitting = true;
-            errorMessage = string.Empty;
-            successMessage = string.Empty;
-
-            // Update property with form data
-            property!.Address = propertyModel.Address;
-            property.UnitNumber = propertyModel.UnitNumber;
-            property.City = propertyModel.City;
-            property.State = propertyModel.State;
-            property.ZipCode = propertyModel.ZipCode;
-            property.PropertyType = propertyModel.PropertyType;
-            property.MonthlyRent = propertyModel.MonthlyRent;
-            property.Bedrooms = propertyModel.Bedrooms;
-            property.Bathrooms = propertyModel.Bathrooms;
-            property.SquareFeet = propertyModel.SquareFeet;
-            property.Description = propertyModel.Description;
-            property.Status = propertyModel.Status;
-            property.IsAvailable = propertyModel.IsAvailable;
-
-            await PropertyService.UpdateAsync(property);
-            } catch (Exception ex)
-            {
-                errorMessage = $"An error occurred while updating the property: {ex.Message}";
-            }
-            finally
-            {
-                isSubmitting = false;
-            }
-            NavigationManager.NavigateTo("/propertymanagement/properties");
-        }
-    }
-
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/properties");
-    }
-
-    public class PropertyModel
-    {
-        [Required(ErrorMessage = "Address is required")]
-        [StringLength(200, ErrorMessage = "Address cannot exceed 200 characters")]
-        public string Address { get; set; } = string.Empty;
-
-        [StringLength(50, ErrorMessage = "Unit number cannot exceed 50 characters")]
-        public string? UnitNumber { get; set; }
-
-        [StringLength(100, ErrorMessage = "City cannot exceed 100 characters")]
-        public string City { get; set; } = string.Empty;
-
-        [StringLength(50, ErrorMessage = "State cannot exceed 50 characters")]
-        public string State { get; set; } = string.Empty;
-
-        [StringLength(20, ErrorMessage = "Zip Code cannot exceed 20 characters")]
-        public string ZipCode { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Property type is required")]
-        [StringLength(50, ErrorMessage = "Property type cannot exceed 50 characters")]
-        public string PropertyType { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Monthly rent is required")]
-        [Range(0.01, double.MaxValue, ErrorMessage = "Monthly rent must be greater than 0")]
-        public decimal MonthlyRent { get; set; }
-
-        [Range(0, int.MaxValue, ErrorMessage = "Bedrooms cannot be negative")]
-        public int Bedrooms { get; set; }
-
-        [Range(0.0, double.MaxValue, ErrorMessage = "Bathrooms cannot be negative")]
-        public decimal Bathrooms { get; set; }
-
-        [Range(0, int.MaxValue, ErrorMessage = "Square feet cannot be negative")]
-        public int SquareFeet { get; set; }
-
-        [StringLength(1000, ErrorMessage = "Description cannot exceed 1000 characters")]
-        public string Description { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Status is required")]
-        [StringLength(50, ErrorMessage = "Status cannot exceed 50 characters")]
-        public string Status { get; set; } = ApplicationConstants.PropertyStatuses.Available;
-
-        public bool IsAvailable { get; set; } = true;
-    }
-}
\ No newline at end of file
+}
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/Index.razor b/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/Index.razor
index 5bc5acb..8a7358e 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/Index.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/Index.razor
@@ -1,559 +1,5 @@
 @page "/propertymanagement/properties"
-@using Aquiis.Professional.Features.PropertyManagement
-@using Aquiis.Core.Constants
-@using Aquiis.UI.Shared.Features.PropertiesManagement.Properties
-@using Microsoft.AspNetCore.Authorization
-@inject NavigationManager Navigation
-@inject PropertyService PropertyService
-@inject IJSRuntime JSRuntime
-@inject UserContextService UserContext
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager", "User")]
 @rendermode InteractiveServer
 
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <h1><span class="bi bi-house-fill" aria-hidden="true"></span>Properties</h1>
-    <div class="btn-group">
-        <div class="btn-group me-2" role="group">
-            <button class="btn btn-outline-secondary @(isGridView ? "active" : "")" @onclick="() => SetViewMode(true)" title="Grid View">
-                <i class="bi bi-grid-3x3-gap"></i>
-            </button>
-            <button class="btn btn-outline-secondary @(!isGridView ? "active" : "")" @onclick="() => SetViewMode(false)" title="List View">
-                <i class="bi bi-list-ul"></i>
-            </button>
-        </div>
-        @if (!isReadOnlyUser)
-        {
-            <button class="btn btn-primary" @onclick="CreateProperty">
-                <i class="bi bi-plus-lg"></i> Add Property
-            </button>
-        }
-    </div>
-</div>
-
-@if (properties == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!properties.Any())
-{
-    <div class="alert alert-info">
-        <h4>No Properties Found</h4>
-        <p>Get started by adding your first property to the system.</p>
-        <button class="btn btn-primary" @onclick="CreateProperty">Add First Property</button>
-    </div>
-}
-else
-{
-    <div class="row mb-3">
-        <div class="col-md-4">
-            <div class="input-group">
-                <span class="input-group-text"><i class="bi bi-search"></i></span>
-                <input type="text" class="form-control" placeholder="Search properties..." @bind="searchTerm" @onkeyup="FilterProperties" />
-            </div>
-        </div>
-        <div class="col-md-4">
-            <select class="form-select" @bind="selectedPropertyStatus" @bind:after="FilterProperties">
-                <option value="">All Properties</option>
-                <option value="Available">Available</option>
-                <option value="Pending">Pending Lease</option>
-                <option value="Occupied">Occupied</option>
-            </select>
-        </div>
-        <div class="col-md-4">
-            <button class="btn btn-outline-secondary" @onclick="ClearFilters">
-                <i class="bi bi-x-circle"></i> Clear Filters
-            </button>
-        </div>
-    </div>
-
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="card text-white bg-success">
-                <div class="card-body">
-                    <h6>Available</h6>
-                    <h4>@availableCount</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-info">
-                <div class="card-body">
-                    <h6>Pending Lease</h6>
-                    <h4>@pendingCount</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-warning">
-                <div class="card-body">
-                    <h6>Occupied</h6>
-                    <h4>@occupiedCount</h4>
-                </div>
-            </div>
-        </div>
-        @* <div class="col-md-3">
-            <div class="card text-white bg-info">
-                <div class="card-body">
-                    <h6>Total Properties</h6>
-                    <h4>@filteredProperties.Count</h4>
-                </div>
-            </div>
-        </div> *@
-        <div class="col-md-3">
-            <div class="card text-white bg-primary">
-                <div class="card-body">
-                    <h6>Total Rent/Month</h6>
-                    <h4>@totalMonthlyRent.ToString("C")</h4>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    @if (isGridView)
-    {
-        <!-- Grid View -->
-        <div class="row">
-            @foreach (var property in filteredProperties)
-            {
-                <div class="col-md-6 col-lg-4 mb-4" id="property-@property.Id">
-                    <div class="card h-100">
-                        <div class="card-body">
-                            <div class="d-flex justify-content-between align-items-start mb-2">
-                                <h5 class="card-title">@property.Address @(!string.IsNullOrWhiteSpace(property.UnitNumber) ? $", {property.UnitNumber}" : "")</h5>
-                                <span class="badge @GetStatusBadgeClass(property.Status)">
-                                    @property.Status
-                                </span>
-                            </div>
-                            <p class="text-muted mb-2">@property.City, @property.State @property.ZipCode</p>
-                            <p class="card-text mb-2">@property.Description</p>
-                            <div class="row text-center mb-3">
-                                <div class="col-4">
-                                    <small class="text-muted">Bedrooms</small>
-                                    <div class="fw-bold">@property.Bedrooms</div>
-                                </div>
-                                <div class="col-4">
-                                    <small class="text-muted">Bathrooms</small>
-                                    <div class="fw-bold">@property.Bathrooms</div>
-                                </div>
-                                <div class="col-4">
-                                    <small class="text-muted">Sq Ft</small>
-                                    <div class="fw-bold">@property.SquareFeet.ToString("N0")</div>
-                                </div>
-                            </div>
-                            <div class="text-center mb-3">
-                                <span class="h4 text-primary">@property.MonthlyRent.ToString("C")</span>
-                                <small class="text-muted">/month</small>
-                            </div>
-                        </div>
-                        <div class="card-footer">
-                            <div class="btn-group w-100">
-                                <button class="btn btn-outline-primary" @onclick="() => ViewProperty(property.Id)">
-                                    <i class="bi bi-eye"></i> View
-                                </button>
-                                @if (!isReadOnlyUser)
-                                {
-                                    <button class="btn btn-outline-secondary" @onclick="() => EditProperty(property.Id)">
-                                        <i class="bi bi-pencil"></i> Edit
-                                    </button>
-                                    <button class="btn btn-outline-danger" @onclick="() => DeleteProperty(property.Id)">
-                                        <i class="bi bi-trash"></i> Delete
-                                    </button>
-                                }
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            }
-        </div>
-    }
-    else
-    {
-        <!-- Table View -->
-        <div class="card">
-            <div class="card-body p-0">
-                <div class="table-responsive">
-                    <table class="table table-hover mb-0">
-                        <thead>
-                            <tr>
-                                <th @onclick="() => SortTable(nameof(Property.Address))" style="cursor: pointer;">
-                                    Address
-                                    @if (sortColumn == nameof(Property.Address))
-                                    {
-                                        <i class="bi bi-@(sortAscending ? "arrow-up" : "arrow-down")"></i>
-                                    }
-                                </th>
-                                <th @onclick="() => SortTable(nameof(Property.City))" style="cursor: pointer;">
-                                    City
-                                    @if (sortColumn == nameof(Property.City))
-                                    {
-                                        <i class="bi bi-@(sortAscending ? "arrow-up" : "arrow-down")"></i>
-                                    }
-                                </th>
-                                <th @onclick="() => SortTable(nameof(Property.PropertyType))" style="cursor: pointer;">
-                                    Type
-                                    @if (sortColumn == nameof(Property.PropertyType))
-                                    {
-                                        <i class="bi bi-@(sortAscending ? "arrow-up" : "arrow-down")"></i>
-                                    }
-                                </th>
-                                <th class="text-center">Beds</th>
-                                <th class="text-center">Baths</th>
-                                <th class="text-end" @onclick="() => SortTable(nameof(Property.SquareFeet))" style="cursor: pointer;">
-                                    Sq Ft
-                                    @if (sortColumn == nameof(Property.SquareFeet))
-                                    {
-                                        <i class="bi bi-@(sortAscending ? "arrow-up" : "arrow-down")"></i>
-                                    }
-                                </th>
-                                <th @onclick="() => SortTable(nameof(Property.Status))" style="cursor: pointer;">
-                                    Status
-                                    @if (sortColumn == nameof(Property.Status))
-                                    {
-                                        <i class="bi bi-@(sortAscending ? "arrow-up" : "arrow-down")"></i>
-                                    }
-                                </th>
-                                <th class="text-end" @onclick="() => SortTable(nameof(Property.MonthlyRent))" style="cursor: pointer;">
-                                    Rent
-                                    @if (sortColumn == nameof(Property.MonthlyRent))
-                                    {
-                                        <i class="bi bi-@(sortAscending ? "arrow-up" : "arrow-down")"></i>
-                                    }
-                                </th>
-                                <th class="text-center">Actions</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            @foreach (var property in pagedProperties)
-                            {
-                                <tr id="property-@property.Id">
-                                    <td>
-                                        <strong>@property.Address @(!string.IsNullOrWhiteSpace(property.UnitNumber) ? $", {property.UnitNumber}" : "")</strong>
-                                        <br />
-                                        <small class="text-muted">@property.State @property.ZipCode</small>
-                                    </td>
-                                    <td>@property.City</td>
-                                    <td>@property.PropertyType</td>
-                                    <td class="text-center">@property.Bedrooms</td>
-                                    <td class="text-center">@property.Bathrooms</td>
-                                    <td class="text-end">@property.SquareFeet.ToString("N0")</td>
-                                    <td>
-                                        <span class="badge @GetStatusBadgeClass(property.Status)">
-                                            @FormatPropertyStatus(property.Status)
-                                        </span>
-                                    </td>
-                                    <td class="text-end">
-                                        <strong class="text-primary">@property.MonthlyRent.ToString("C")</strong>
-                                    </td>
-                                    <td class="text-center">
-                                        <div class="btn-group btn-group-sm">
-                                            <button class="btn btn-outline-primary" @onclick="() => ViewProperty(property.Id)" title="View">
-                                                <i class="bi bi-eye"></i>
-                                            </button>
-                                            @if (!isReadOnlyUser)
-                                            {
-                                                <button class="btn btn-outline-secondary" @onclick="() => EditProperty(property.Id)" title="Edit">
-                                                    <i class="bi bi-pencil"></i>
-                                                </button>
-                                                <button class="btn btn-outline-danger" @onclick="() => DeleteProperty(property.Id)" title="Delete">
-                                                    <i class="bi bi-trash"></i>
-                                                </button>
-                                            }
-                                        </div>
-                                    </td>
-                                </tr>
-                            }
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            @if (totalPages > 1)
-            {
-                <div class="card-footer">
-                    <div class="d-flex justify-content-between align-items-center">
-                        <div>
-                            <span class="text-muted">Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords properties</span>
-                        </div>
-                        <nav>
-                            <ul class="pagination mb-0">
-                                <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                    <button class="page-link" @onclick="FirstPage" disabled="@(currentPage == 1)">
-                                        <i class="bi bi-chevron-double-left"></i>
-                                    </button>
-                                </li>
-                                <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                    <button class="page-link" @onclick="PreviousPage" disabled="@(currentPage == 1)">
-                                        <i class="bi bi-chevron-left"></i>
-                                    </button>
-                                </li>
-                                @for (int i = Math.Max(1, currentPage - 2); i <= Math.Min(totalPages, currentPage + 2); i++)
-                                {
-                                    var pageNumber = i;
-                                    <li class="page-item @(currentPage == pageNumber ? "active" : "")">
-                                        <button class="page-link" @onclick="() => GoToPage(pageNumber)">@pageNumber</button>
-                                    </li>
-                                }
-                                <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                    <button class="page-link" @onclick="NextPage" disabled="@(currentPage == totalPages)">
-                                        <i class="bi bi-chevron-right"></i>
-                                    </button>
-                                </li>
-                                <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                    <button class="page-link" @onclick="LastPage" disabled="@(currentPage == totalPages)">
-                                        <i class="bi bi-chevron-double-right"></i>
-                                    </button>
-                                </li>
-                            </ul>
-                        </nav>
-                        <div>
-                            <select class="form-select form-select-sm" style="width: auto;" @bind="pageSize" @bind:after="UpdatePagination">
-                                <option value="10">10 per page</option>
-                                <option value="25">25 per page</option>
-                                <option value="50">50 per page</option>
-                                <option value="100">100 per page</option>
-                            </select>
-                        </div>
-                    </div>
-                </div>
-            }
-        </div>
-    }
-}
-
-@code {
-    private List<Property> properties = new();
-    private List<Property> filteredProperties = new();
-    private List<Property> sortedProperties = new();
-    private List<Property> pagedProperties = new();
-    private string searchTerm = string.Empty;
-    private string selectedPropertyStatus = string.Empty;
-    private int availableCount = 0;
-    private int pendingCount = 0;
-    private int occupiedCount = 0;
-    private decimal totalMonthlyRent = 0;
-    private bool isGridView = false;
-    
-    // Sorting
-    private string sortColumn = nameof(Property.Address);
-    private bool sortAscending = true;
-    
-    // Pagination
-    private int currentPage = 1;
-    private int pageSize = 25;
-    private int totalPages = 1;
-    private int totalRecords = 0;
-
-    [Parameter]
-    [SupplyParameterFromQuery]
-    public int? PropertyId { get; set; }
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    private string? currentUserRole;
-    private bool isReadOnlyUser => currentUserRole == ApplicationConstants.OrganizationRoles.User;
-
-    protected override async Task OnInitializedAsync()
-    {
-        // Get current user's role
-        currentUserRole = await UserContext.GetCurrentOrganizationRoleAsync();
-        
-        // Load properties from API or service
-        await LoadProperties();
-        FilterProperties();
-    }
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender && PropertyId.HasValue)
-        {
-            await JSRuntime.InvokeVoidAsync("scrollToElement", $"property-{PropertyId.Value}");
-        }
-    }
-
-    private async Task LoadProperties()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User?.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-        if(string.IsNullOrEmpty(userId)){
-            properties = new List<Property>();
-            return;
-        }
-
-        var allProperties = await PropertyService.GetAllAsync();
-        properties = allProperties.Where(p=>p.IsDeleted==false).ToList();
-    }
-
-    private void FilterProperties()
-    {
-        if (properties == null)
-        {
-            filteredProperties = new();
-            return;
-        }
-
-        filteredProperties = properties.Where(p =>
-            (string.IsNullOrEmpty(searchTerm) ||
-             p.Address.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             p.City.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             p.State.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             p.ZipCode.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             p.Description.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             p.PropertyType.Contains(searchTerm, StringComparison.OrdinalIgnoreCase)) &&
-            (string.IsNullOrEmpty(selectedPropertyStatus) || p.Status.ToString() == selectedPropertyStatus)
-        ).ToList();
-        
-        CalculateMetrics();
-        SortAndPaginateProperties();
-    }
-
-    private void CalculateMetrics(){
-        if (filteredProperties != null)
-        {
-            availableCount = filteredProperties.Count(p => p.Status == ApplicationConstants.PropertyStatuses.Available);
-            pendingCount = filteredProperties.Count(p => p.Status == ApplicationConstants.PropertyStatuses.ApplicationPending || p.Status == ApplicationConstants.PropertyStatuses.LeasePending);
-            occupiedCount = filteredProperties.Count(p => p.Status == ApplicationConstants.PropertyStatuses.Occupied);
-            totalMonthlyRent = filteredProperties.Sum(p => p.MonthlyRent);
-        }
-    }
-
-    private void CreateProperty(){
-        Navigation.NavigateTo("/propertymanagement/properties/create");
-    }
-
-    private void ViewProperty(Guid propertyId)
-    {
-        Navigation.NavigateTo($"/propertymanagement/properties/{propertyId}");
-    }
-
-   private void EditProperty(Guid propertyId)
-   {
-       Navigation.NavigateTo($"/propertymanagement/properties/{propertyId}/edit");
-   }
-
-   private async Task DeleteProperty(Guid propertyId)
-   {
-       var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-        
-        if (string.IsNullOrEmpty(userId))
-            return;
-
-        await PropertyService.DeleteAsync(propertyId);
-
-        // Add confirmation dialog in a real application
-        await LoadProperties();
-        FilterProperties();
-        CalculateMetrics();
-   }
-
-    private void ClearFilters()
-    {
-        searchTerm = string.Empty;
-        selectedPropertyStatus = string.Empty;
-        FilterProperties();
-    }
-
-    private void SetViewMode(bool gridView)
-    {
-        isGridView = gridView;
-    }
-
-    private void SortTable(string column)
-    {
-        if (sortColumn == column)
-        {
-            sortAscending = !sortAscending;
-        }
-        else
-        {
-            sortColumn = column;
-            sortAscending = true;
-        }
-        SortAndPaginateProperties();
-    }
-
-    private void SortAndPaginateProperties()
-    {
-        // Sort
-        sortedProperties = sortColumn switch
-        {
-            nameof(Property.Address) => sortAscending
-                ? filteredProperties.OrderBy(p => p.Address).ToList()
-                : filteredProperties.OrderByDescending(p => p.Address).ToList(),
-            nameof(Property.City) => sortAscending
-                ? filteredProperties.OrderBy(p => p.City).ToList()
-                : filteredProperties.OrderByDescending(p => p.City).ToList(),
-            nameof(Property.PropertyType) => sortAscending
-                ? filteredProperties.OrderBy(p => p.PropertyType).ToList()
-                : filteredProperties.OrderByDescending(p => p.PropertyType).ToList(),
-            nameof(Property.SquareFeet) => sortAscending
-                ? filteredProperties.OrderBy(p => p.SquareFeet).ToList()
-                : filteredProperties.OrderByDescending(p => p.SquareFeet).ToList(),
-            nameof(Property.Status) => sortAscending
-                ? filteredProperties.OrderBy(p => p.Status).ToList()
-                : filteredProperties.OrderByDescending(p => p.Status).ToList(),
-            nameof(Property.MonthlyRent) => sortAscending
-                ? filteredProperties.OrderBy(p => p.MonthlyRent).ToList()
-                : filteredProperties.OrderByDescending(p => p.MonthlyRent).ToList(),
-            _ => filteredProperties.OrderBy(p => p.Address).ToList()
-        };
-
-        // Paginate
-        totalRecords = sortedProperties.Count;
-        totalPages = (int)Math.Ceiling(totalRecords / (double)pageSize);
-        currentPage = Math.Max(1, Math.Min(currentPage, totalPages));
-        
-        pagedProperties = sortedProperties
-            .Skip((currentPage - 1) * pageSize)
-            .Take(pageSize)
-            .ToList();
-    }
-
-    private void UpdatePagination()
-    {
-        currentPage = 1;
-        SortAndPaginateProperties();
-    }
-
-    private void FirstPage() => GoToPage(1);
-    private void LastPage() => GoToPage(totalPages);
-    private void NextPage() => GoToPage(currentPage + 1);
-    private void PreviousPage() => GoToPage(currentPage - 1);
-    
-    private void GoToPage(int page)
-    {
-        currentPage = Math.Max(1, Math.Min(page, totalPages));
-        SortAndPaginateProperties();
-    }
-
-    private string GetStatusBadgeClass(string status)
-    {
-        return status switch
-        {
-            var s when s == ApplicationConstants.PropertyStatuses.Available => "bg-success",
-            var s when s == ApplicationConstants.PropertyStatuses.ApplicationPending => "bg-info",
-            var s when s == ApplicationConstants.PropertyStatuses.LeasePending => "bg-warning",
-            var s when s == ApplicationConstants.PropertyStatuses.Occupied => "bg-danger",
-            var s when s == ApplicationConstants.PropertyStatuses.UnderRenovation => "bg-secondary",
-            var s when s == ApplicationConstants.PropertyStatuses.OffMarket => "bg-dark",
-            _ => "bg-secondary"
-        };
-    }
-
-    private string FormatPropertyStatus(string status)
-    {
-        return status switch
-        {
-            var s when s == ApplicationConstants.PropertyStatuses.ApplicationPending => "Application Pending",
-            var s when s == ApplicationConstants.PropertyStatuses.LeasePending => "Lease Pending",
-            var s when s == ApplicationConstants.PropertyStatuses.UnderRenovation => "Under Renovation",
-            var s when s == ApplicationConstants.PropertyStatuses.OffMarket => "Off Market",
-            _ => status
-        };
-    }
-}
\ No newline at end of file
+<Aquiis.UI.Shared.Features.PropertyManagement.Properties.PropertyListForm />
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/View.razor b/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/View.razor
index 804944d..deba018 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/View.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Properties/Pages/View.razor
@@ -1,626 +1,10 @@
 @page "/propertymanagement/properties/{PropertyId:guid}"
-@using Aquiis.Professional.Features.PropertyManagement
-@using Aquiis.Core.Constants
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Authorization
-
-@inject PropertyService PropertyService
-@inject LeaseService LeaseService
-@inject MaintenanceService MaintenanceService
-@inject InspectionService InspectionService
-@inject Application.Services.DocumentService DocumentService
-@inject ChecklistService ChecklistService
-@inject NavigationManager NavigationManager
-@inject IJSRuntime JSRuntime
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-@if (property == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!isAuthorized)
-{
-    <div class="alert alert-danger">
-        <h4>Access Denied</h4>
-        <p>You don't have permission to view this property.</p>
-        <a href="/properties" class="btn btn-primary">Back to Properties</a>
-    </div>
-}
-else
-{
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <h1>Property Details</h1>
-        <div class="btn-group">
-            <button class="btn btn-primary" @onclick="EditProperty">
-                <i class="bi bi-pencil"></i> Edit
-            </button>
-            <button class="btn btn-secondary" @onclick="BackToList">
-                <i class="bi bi-arrow-left"></i> Back to List
-            </button>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header d-flex justify-content-between align-items-center">
-                    <h5 class="mb-0">Property Information</h5>
-                    <span class="badge @(property.IsAvailable ? "bg-success" : "bg-warning")">
-                        @(property.IsAvailable ? "Available" : "Occupied")
-                    </span>
-                </div>
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-md-12 mb-3">
-                            <strong>Address:</strong>
-                            <p class="mb-1">@property.Address @(!string.IsNullOrWhiteSpace(property.UnitNumber) ? $", {property.UnitNumber}" : "")</p>
-                            <small class="text-muted">@property.City, @property.State @property.ZipCode</small>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Property Type:</strong>
-                            <p>@property.PropertyType</p>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <strong>Monthly Rent:</strong>
-                            <p class="text-success fw-bold">@property.MonthlyRent.ToString("C")</p>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-4 mb-3">
-                            <strong>Bedrooms:</strong>
-                            <p>@property.Bedrooms</p>
-                        </div>
-                        <div class="col-md-4 mb-3">
-                            <strong>Bathrooms:</strong>
-                            <p>@property.Bathrooms</p>
-                        </div>
-                        <div class="col-md-4 mb-3">
-                            <strong>Square Feet:</strong>
-                            <p>@property.SquareFeet.ToString("N0")</p>
-                        </div>
-                    </div>
-
-                    @if (!string.IsNullOrEmpty(property.Description))
-                    {
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <strong>Description:</strong>
-                                <p>@property.Description</p>
-                            </div>
-                        </div>
-                    }
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Created:</strong>
-                            <p>@property.CreatedOn.ToString("MMMM dd, yyyy")</p>
-                        </div>
-                        @if (property.LastModifiedOn.HasValue)
-                        {
-                            <div class="col-md-6 mb-3">
-                                <strong>Last Modified:</strong>
-                                <p>@property.LastModifiedOn.Value.ToString("MMMM dd, yyyy")</p>
-                            </div>
-                        }
-                    </div>
-                </div>
-            </div>
-            <!-- Maintenance Requests Section -->
-            <div class="card mt-3">
-                <div class="card-header d-flex justify-content-between align-items-center">
-                    <h5 class="mb-0">Maintenance Requests</h5>
-                    <button class="btn btn-sm btn-primary" @onclick="CreateMaintenanceRequest">
-                        <i class="bi bi-plus-circle"></i> New Request
-                    </button>
-                </div>
-                <div class="card-body">
-                    @if (maintenanceRequests.Any())
-                    {
-                        <div class="list-group">
-                            @foreach (var request in maintenanceRequests.OrderByDescending(r => r.RequestedOn).Take(5))
-                            {
-                                <div class="list-group-item">
-                                    <div class="d-flex justify-content-between align-items-start">
-                                        <div class="flex-grow-1">
-                                            <div class="d-flex align-items-center mb-1">
-                                                <strong class="me-2">@request.Title</strong>
-                                                <span class="badge @request.PriorityBadgeClass me-1">@request.Priority</span>
-                                                <span class="badge @request.StatusBadgeClass">@request.Status</span>
-                                                @if (request.IsOverdue)
-                                                {
-                                                    <i class="bi bi-exclamation-triangle-fill text-danger ms-2" title="Overdue"></i>
-                                                }
-                                            </div>
-                                            <small class="text-muted d-block mb-1">@request.RequestType</small>
-                                            <small class="text-muted">
-                                                Requested: @request.RequestedOn.ToString("MMM dd, yyyy")
-                                                @if (request.ScheduledOn.HasValue)
-                                                {
-                                                    <span> | Scheduled: @request.ScheduledOn.Value.ToString("MMM dd, yyyy")</span>
-                                                }
-                                            </small>
-                                        </div>
-                                        <button class="btn btn-sm btn-outline-primary" @onclick="() => ViewMaintenanceRequest(request.Id)">
-                                            <i class="bi bi-eye"></i>
-                                        </button>
-                                    </div>
-                                </div>
-                            }
-                        </div>
-                        @if (maintenanceRequests.Count > 5)
-                        {
-                            <div class="mt-2">
-                                <small class="text-muted">Showing 5 of @maintenanceRequests.Count requests</small>
-                            </div>
-                        }
-                        <div class="mt-2">
-                            <button class="btn btn-sm btn-outline-secondary w-100" @onclick="ViewAllMaintenanceRequests">
-                                <i class="bi bi-list-ul"></i> View All Maintenance Requests
-                            </button>
-                        </div>
-                    }
-                    else
-                    {
-                        <div class="text-center text-muted py-3">
-                            <i class="bi bi-tools" style="font-size: 2rem;"></i>
-                            <p class="mb-0 mt-2">No maintenance requests for this property</p>
-                            <button class="btn btn-sm btn-primary mt-2" @onclick="CreateMaintenanceRequest">
-                                <i class="bi bi-plus-circle"></i> Create First Request
-                            </button>
-                        </div>
-                    }
-                </div>
-            </div>
-            
-            <!-- Documents Section -->
-            @if (propertyDocuments.Any())
-            {
-                <div class="card mt-3">
-                    <div class="card-header d-flex justify-content-between align-items-center">
-                        <h5 class="mb-0">Documents</h5>
-                        <span class="badge bg-secondary">@propertyDocuments.Count</span>
-                    </div>
-                    <div class="card-body">
-                        <div class="list-group">
-                            @foreach (var doc in propertyDocuments.OrderByDescending(d => d.CreatedOn))
-                            {
-                                <div class="list-group-item">
-                                    <div class="d-flex justify-content-between align-items-start">
-                                        <div class="flex-grow-1">
-                                            <div class="d-flex align-items-center mb-1">
-                                                <i class="bi @GetFileIcon(doc.FileExtension) me-2"></i>
-                                                <strong>@doc.FileName</strong>
-                                            </div>
-                                            @if (!string.IsNullOrEmpty(doc.Description))
-                                            {
-                                                <small class="text-muted d-block">@doc.Description</small>
-                                            }
-                                            <small class="text-muted">
-                                                <span class="badge @GetDocumentTypeBadge(doc.DocumentType)">@doc.DocumentType</span>
-                                                @doc.FileSizeFormatted | @doc.CreatedOn.ToString("MMM dd, yyyy")
-                                            </small>
-                                        </div>
-                                        <div class="btn-group btn-group-sm">
-                                            <button class="btn btn-outline-info" @onclick="() => ViewDocument(doc)" title="View">
-                                                <i class="bi bi-eye"></i>
-                                            </button>
-                                            <button class="btn btn-outline-primary" @onclick="() => DownloadDocument(doc)" title="Download">
-                                                <i class="bi bi-download"></i>
-                                            </button>
-                                        </div>
-                                    </div>
-                                </div>
-                            }
-                        </div>
-                        <div class="mt-2">
-                            <button class="btn btn-sm btn-outline-secondary w-100" @onclick="ViewDocuments">
-                                <i class="bi bi-folder"></i> View All Documents
-                            </button>
-                        </div>
-                    </div>
-                </div>
-            }
-        </div>
-
-        <div class="col-md-4">
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Quick Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="EditProperty">
-                            <i class="bi bi-pencil"></i> Edit Property
-                        </button>
-                        @if (property.IsAvailable)
-                        {
-                            <button class="btn btn-outline-success" @onclick="CreateLease">
-                                <i class="bi bi-file-plus"></i> New Lease
-                            </button>
-                        }
-                        else
-                        {
-                            <button class="btn btn-outline-info" @onclick="ViewLease">
-                                <i class="bi bi-file-text"></i> View Lease
-                            </button>
-                        }
-                        <button class="btn btn-outline-warning" @onclick="CreateInspection">
-                            <i class="bi bi-clipboard-check"></i> Complete Inspection
-                        </button>
-                        <button class="btn btn-outline-secondary" @onclick="ViewDocuments">
-                            <i class="bi bi-folder"></i> View Documents
-                        </button>
-                        
-                    </div>
-                </div>
-            </div>
-
-            <!-- Routine Inspection Status Card -->
-            <div class="card mt-3">
-                <div class="card-header">
-                    <h5 class="mb-0"><i class="bi bi-clipboard-check"></i> Routine Inspection</h5>
-                </div>
-                <div class="card-body">
-                    @if (property.LastRoutineInspectionDate.HasValue)
-                    {
-                        <div class="mb-3">
-                            <strong>Last Routine Inspection:</strong>
-                            <p class="mb-0">@property.LastRoutineInspectionDate.Value.ToString("MMM dd, yyyy")</p>
-                            @if (propertyInspections.Any())
-                            {
-                                var lastInspection = propertyInspections.Where(i => i.CompletedOn == property.LastRoutineInspectionDate.Value && i.InspectionType == "Routine").FirstOrDefault();
-                                <small>
-                                    <a href="/propertymanagement/inspections/view/@lastInspection!.Id" class="text-decoration-none">
-                                        <i class="bi bi-eye"></i> View Last Routine Inspection
-                                    </a>
-                                </small>
-                            }
-                        </div>
-                    }
-                    
-                    @if (property.NextRoutineInspectionDueDate.HasValue)
-                    {
-                        <div class="mb-3">
-                            <strong>Next Routine Inspection Due:</strong>
-                            <p class="mb-0">@property.NextRoutineInspectionDueDate.Value.ToString("MMM dd, yyyy")</p>
-                        </div>
-                        
-                        <div class="mb-3">
-                            <strong>Status:</strong>
-                            <p class="mb-0">
-                                <span class="badge @GetInspectionStatusBadge(property.InspectionStatus)">
-                                    @property.InspectionStatus
-                                </span>
-                            </p>
-                        </div>
-
-                        @if (property.IsInspectionOverdue)
-                        {
-                            <div class="alert alert-danger py-2 mb-2">
-                                <small>
-                                    <i class="bi bi-exclamation-triangle-fill"></i>
-                                    <strong>Overdue by @property.DaysOverdue days</strong>
-                                </small>
-                            </div>
-                        }
-                        else if (property.DaysUntilInspectionDue <= 30)
-                        {
-                            <div class="alert alert-warning py-2 mb-2">
-                                <small>
-                                    <i class="bi bi-exclamation-circle-fill"></i>
-                                    <strong>Due in @property.DaysUntilInspectionDue days</strong>
-                                </small>
-                            </div>
-                        }
-                    }
-                    else
-                    {
-                        <div class="alert alert-info py-2 mb-2">
-                            <small><i class="bi bi-info-circle"></i> No inspection scheduled</small>
-                        </div>
-                    }
-
-                    <div class="d-grid">
-                        <button class="btn btn-sm btn-outline-warning" @onclick="CreateInspection">
-                            <i class="bi bi-clipboard-check"></i> Complete Routine Inspection
-                        </button>
-                    </div>
-                </div>
-            </div>
+<Aquiis.UI.Shared.Features.PropertyManagement.Properties.PropertyViewForm PropertyId="@PropertyId" />
 
-            @if (activeLeases.Any())
-            {
-                <div class="card mt-3">
-                    <div class="card-header">
-                        <h5 class="mb-0">Active Leases</h5>
-                    </div>
-                    <div class="card-body">
-                        @foreach (var lease in activeLeases)
-                        {
-                            <div class="border-bottom pb-2 mb-2">
-                                <strong>@lease.Tenant?.FullName</strong>
-                                <br />
-                                <small class="text-muted">
-                                    @lease.StartDate.ToString("MMM dd, yyyy") - @lease.EndDate.ToString("MMM dd, yyyy")
-                                </small>
-                                <br />
-                                <small class="text-success">@lease.MonthlyRent.ToString("C")/month</small>
-                            </div>
-                        }
-                    </div>
-                </div>
-            }
-
-            <!-- Completed Checklists Section -->
-            <div class="card mt-3">
-                <div class="card-header d-flex justify-content-between align-items-center">
-                    <h5 class="mb-0">Completed Checklists</h5>
-                    <button class="btn btn-sm btn-primary" @onclick="CreateChecklist">
-                        <i class="bi bi-plus-circle"></i> New Checklist
-                    </button>
-                </div>
-                <div class="card-body">
-                    @if (propertyChecklists.Any())
-                    {
-                        <div class="list-group">
-                            @foreach (var checklist in propertyChecklists.OrderByDescending(c => c.CompletedOn ?? c.CreatedOn).Take(5))
-                            {
-                                <div class="list-group-item">
-                                    <div class="d-flex justify-content-between align-items-start">
-                                        <div class="flex-grow-1">
-                                            <div class="d-flex align-items-center mb-1">
-                                                <strong class="me-2">@checklist.Name</strong>
-                                                <span class="badge @GetChecklistStatusBadge(checklist.Status)">@checklist.Status</span>
-                                            </div>
-                                            <small class="text-muted d-block mb-1">@checklist.ChecklistType</small>
-                                            <small class="text-muted">
-                                                @if (checklist.CompletedOn.HasValue)
-                                                {
-                                                    <span>Completed: @checklist.CompletedOn.Value.ToString("MMM dd, yyyy")</span>
-                                                }
-                                                else
-                                                {
-                                                    <span>Created: @checklist.CreatedOn.ToString("MMM dd, yyyy")</span>
-                                                }
-                                            </small>
-                                        </div>
-                                        <div class="btn-group btn-group-sm">
-                                            <button class="btn btn-outline-primary" @onclick="() => ViewChecklist(checklist.Id)">
-                                                <i class="bi bi-eye"></i>
-                                            </button>
-                                            @if (checklist.Status != ApplicationConstants.ChecklistStatuses.Completed)
-                                            {
-                                                <button class="btn btn-outline-success" @onclick="() => CompleteChecklist(checklist.Id)">
-                                                    <i class="bi bi-check-circle"></i>
-                                                </button>
-                                            }
-                                        </div>
-                                    </div>
-                                </div>
-                            }
-                        </div>
-                        @if (propertyChecklists.Count > 5)
-                        {
-                            <div class="mt-2">
-                                <small class="text-muted">Showing 5 of @propertyChecklists.Count checklists</small>
-                            </div>
-                        }
-                    }
-                    else
-                    {
-                        <div class="text-center text-muted py-3">
-                            <i class="bi bi-list-check" style="font-size: 2rem;"></i>
-                            <p class="mb-0 mt-2">No checklists for this property</p>
-                            <button class="btn btn-sm btn-primary mt-2" @onclick="CreateChecklist">
-                                <i class="bi bi-plus-circle"></i> Create First Checklist
-                            </button>
-                        </div>
-                    }
-                </div>
-            </div>
-
-            
-
-           
-        </div>
-    </div>
-}
 @code {
     [Parameter]
     public Guid PropertyId { get; set; }
-
-    public Guid LeaseId { get; set; }
-
-    List<Lease> activeLeases = new();
-    List<Document> propertyDocuments = new();
-    List<MaintenanceRequest> maintenanceRequests = new();
-    List<Inspection> propertyInspections = new();
-    List<Checklist> propertyChecklists = new();
-
-    private bool isAuthorized = true; 
-
-    private Property? property;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadProperty();
-    }
-
-    private async Task LoadProperty()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (string.IsNullOrEmpty(userId))
-        {
-            isAuthorized = false;
-            return;
-        }
-        property = await PropertyService.GetByIdAsync(PropertyId);
-        if (property == null)
-        {
-            isAuthorized = false;
-            return;
-        }
-        activeLeases = await LeaseService.GetActiveLeasesByPropertyIdAsync(PropertyId);
-
-        Lease? lease = activeLeases.FirstOrDefault();
-        if (lease != null)
-        {
-            LeaseId = lease.Id;
-        }
-        
-        // Load documents for this property
-            propertyDocuments = await DocumentService.GetDocumentsByPropertyIdAsync(PropertyId);
-            propertyDocuments = propertyDocuments
-                .Where(d => !d.IsDeleted)
-            .ToList();
-        
-        // Load maintenance requests for this property
-            maintenanceRequests = await MaintenanceService.GetMaintenanceRequestsByPropertyAsync(PropertyId);
-        // Load inspections for this property
-        propertyInspections = await InspectionService.GetByPropertyIdAsync(PropertyId);
-        
-        // Load checklists for this property
-        var allChecklists = await ChecklistService.GetChecklistsAsync(includeArchived: false);
-        propertyChecklists = allChecklists
-            .Where(c => c.PropertyId == PropertyId)
-            .OrderByDescending(c => c.CompletedOn ?? c.CreatedOn)
-            .ToList();
-    }
-
-    private void EditProperty()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/properties/{PropertyId}/edit");
-    }
-
-    private void CreateLease()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/leases/create/?propertyid={PropertyId}");
-    }
-
-    private void ViewLease()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/leases/{LeaseId}");
-    }
-
-    private void ViewDocuments()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/documents/?propertyid={PropertyId}");
-    }
-
-    private void CreateInspection()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/inspections/create/{PropertyId}");
-    }
-
-    private void CreateMaintenanceRequest()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/maintenance/create?PropertyId={PropertyId}");
-    }
-
-    private void ViewMaintenanceRequest(Guid requestId)
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/maintenance/{requestId}");
-    }
-
-    private void ViewAllMaintenanceRequests()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/maintenance?propertyId={PropertyId}");
-    }
-
-    private void BackToList()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/properties");
-    }
-
-    private async Task ViewDocument(Document doc)
-    {
-        var base64Data = Convert.ToBase64String(doc.FileData);
-        await JSRuntime.InvokeVoidAsync("viewFile", base64Data, doc.FileType);
-    }
-
-    private async Task DownloadDocument(Document doc)
-    {
-        var fileName = doc.FileName;
-        var fileData = doc.FileData;
-        var mimeType = doc.FileType;
-
-        await JSRuntime.InvokeVoidAsync("downloadFile", fileName, Convert.ToBase64String(fileData), mimeType);
-    }
-
-    private string GetFileIcon(string extension)
-    {
-        return extension.ToLower() switch
-        {
-            ".pdf" => "bi-file-pdf text-danger",
-            ".doc" or ".docx" => "bi-file-word text-primary",
-            ".jpg" or ".jpeg" or ".png" => "bi-file-image text-success",
-            ".txt" => "bi-file-text",
-            _ => "bi-file-earmark"
-        };
-    }
-
-    private string GetDocumentTypeBadge(string documentType)
-    {
-        return documentType switch
-        {
-            "Lease Agreement" => "bg-primary",
-            "Invoice" => "bg-warning",
-            "Payment Receipt" => "bg-success",
-            "Inspection Report" => "bg-info",
-            "Addendum" => "bg-secondary",
-            _ => "bg-secondary"
-        };
-    }
-
-    private string GetInspectionStatusBadge(string status)
-    {
-        return status switch
-        {
-            "Overdue" => "bg-danger",
-            "Due Soon" => "bg-warning",
-            "Scheduled" => "bg-success",
-            "Not Scheduled" => "bg-secondary",
-            _ => "bg-secondary"
-        };
-    }
-
-    private string GetChecklistStatusBadge(string status)
-    {
-        return status switch
-        {
-            "Completed" => "bg-success",
-            "In Progress" => "bg-warning",
-            "Draft" => "bg-secondary",
-            _ => "bg-secondary"
-        };
-    }
-
-    private void CreateChecklist()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/checklists");
-    }
-
-    private void ViewChecklist(Guid checklistId)
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/checklists/view/{checklistId}");
-    }
-
-    private void CompleteChecklist(Guid checklistId)
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/checklists/complete/{checklistId}");
-    }
-}
\ No newline at end of file
+}
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/Create.razor b/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/Create.razor
index 7599aca..2a80f89 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/Create.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/Create.razor
@@ -1,217 +1,5 @@
 @page "/propertymanagement/tenants/create"
-
-@using Aquiis.Core.Entities
-@using Aquiis.Application.Services
-@using Aquiis.Professional.Shared.Services
-@using Aquiis.Application.Services.PdfGenerators
-@using System.ComponentModel.DataAnnotations
-@using Microsoft.AspNetCore.Authorization
-@inject TenantService TenantService
-@inject NavigationManager NavigationManager
-@inject ToastService ToastService
-@rendermode InteractiveServer
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
-<h3>Create Tenant</h3>
-
-<div class="row">
-    <div class="col-md-8">
-        <div class="card">
-            <div class="card-header">
-                <h3 class="card-title mb-0">Add New Tenant</h3>
-            </div>
-            <div class="card-body">
-                <EditForm Model="tenantModel" OnValidSubmit="SaveTenant" FormName="create-tenant">
-                    <DataAnnotationsValidator />
-                    
-                    @if (!string.IsNullOrEmpty(errorMessage))
-                    {
-                        <div class="alert alert-danger" role="alert">
-                            @((MarkupString)errorMessage)
-                        </div>
-                    }
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">First Name *</label>
-                            <InputText @bind-Value="tenantModel.FirstName" class="form-control" placeholder="First name" />
-                            <ValidationMessage For="() => tenantModel.FirstName" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Last Name *</label>
-                            <InputText @bind-Value="tenantModel.LastName" class="form-control" placeholder="Last name" />
-                            <ValidationMessage For="() => tenantModel.LastName" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Email *</label>
-                            <InputText @bind-Value="tenantModel.Email" class="form-control" type="email" placeholder="email@example.com" />
-                            <ValidationMessage For="() => tenantModel.Email" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Phone Number</label>
-                            <InputText @bind-Value="tenantModel.PhoneNumber" class="form-control" placeholder="(555) 123-4567" />
-                            <ValidationMessage For="() => tenantModel.PhoneNumber" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Date of Birth</label>
-                            <InputDate @bind-Value="tenantModel.DateOfBirth" class="form-control" />
-                            <ValidationMessage For="() => tenantModel.DateOfBirth" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Identification Number</label>
-                            <InputText @bind-Value="tenantModel.IdentificationNumber" class="form-control" />
-                            <ValidationMessage For="() => tenantModel.IdentificationNumber" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Emergency Contact Name</label>
-                            <InputText @bind-Value="tenantModel.EmergencyContactName" class="form-control" placeholder="Emergency contact name" />
-                            <ValidationMessage For="() => tenantModel.EmergencyContactName" class="text-danger" />
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <label class="form-label">Emergency Contact Phone</label>
-                            <InputText @bind-Value="tenantModel.EmergencyContactPhone" class="form-control" placeholder="(555) 123-4567" />
-                            <ValidationMessage For="() => tenantModel.EmergencyContactPhone" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-12 mb-3">
-                            <label class="form-label">Notes</label>
-                            <InputTextArea @bind-Value="tenantModel.Notes" class="form-control" rows="3" placeholder="Additional notes about the tenant" />
-                            <ValidationMessage For="() => tenantModel.Notes" class="text-danger" />
-                        </div>
-                    </div>
-
-                    <div class="d-flex gap-2">
-                        <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                            @if (isSubmitting)
-                            {
-                                <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                            }
-                            Create Tenant
-                        </button>
-                        <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
-                    </div>
-                </EditForm>
-            </div>
-        </div>
-    </div>
-</div>
-
-@code {
-    private TenantModel tenantModel = new TenantModel();
-    private bool isSubmitting = false;
-    private string errorMessage = string.Empty;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-   private async Task SaveTenant()
-    {
-        try
-        {
-            isSubmitting = true;
-            errorMessage = string.Empty;
-
-            var authState = await AuthenticationStateTask;
-            var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-            if (string.IsNullOrEmpty(userId))
-            {
-                errorMessage = "User not authenticated.";
-                ToastService.ShowError("User not authenticated. Please log in again.");
-                return;
-            }
-
-            // Check for duplicate identification number
-            if (!string.IsNullOrWhiteSpace(tenantModel.IdentificationNumber))
-            {
-                var existingTenant = await TenantService.GetTenantByIdentificationNumberAsync(tenantModel.IdentificationNumber);
-                if (existingTenant != null)
-                {
-                    errorMessage = $"A tenant with identification number <strong>{tenantModel.IdentificationNumber}</strong> already exists. " +
-                                 $"<a href=\"/propertymanagement/tenants/view/{existingTenant.Id}\" class=\"alert-link\">View existing tenant: {existingTenant.FullName}</a>";
-                    ToastService.ShowWarning($"Duplicate identification number found for {existingTenant.FullName}");
-                    return;
-                }
-            }
-
-            var tenant = new Tenant
-            {
-                FirstName = tenantModel.FirstName,
-                LastName = tenantModel.LastName,
-                Email = tenantModel.Email,
-                PhoneNumber = tenantModel.PhoneNumber,
-                DateOfBirth = tenantModel.DateOfBirth,
-                EmergencyContactName = tenantModel.EmergencyContactName,
-                EmergencyContactPhone = tenantModel.EmergencyContactPhone,
-                Notes = tenantModel.Notes,
-                IdentificationNumber = tenantModel.IdentificationNumber,
-                IsActive = true
-            };
-
-            await TenantService.CreateAsync(tenant);
-
-            ToastService.ShowSuccess($"Tenant {tenant.FullName} created successfully!");
-            NavigationManager.NavigateTo("/propertymanagement/tenants");
-        }
-        catch (Exception ex)
-        {
-            errorMessage = $"Error creating tenant: {ex.Message}";
-            ToastService.ShowError($"Failed to create tenant: {ex.Message}");
-        }
-        finally
-        {
-            isSubmitting = false;
-        }
-    }
-
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/tenants");
-    }
-
-    public class TenantModel
-    {
-        [Required(ErrorMessage = "First name is required")]
-        [StringLength(100, ErrorMessage = "First name cannot exceed 100 characters")]
-        public string FirstName { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Last name is required")]
-        [StringLength(100, ErrorMessage = "Last name cannot exceed 100 characters")]
-        public string LastName { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Email is required")]
-        [EmailAddress(ErrorMessage = "Please enter a valid email address")]
-        [StringLength(255, ErrorMessage = "Email cannot exceed 255 characters")]
-        public string Email { get; set; } = string.Empty;
-
-        [Phone(ErrorMessage = "Please enter a valid phone number")]
-        [StringLength(20, ErrorMessage = "Phone number cannot exceed 20 characters")]
-        public string PhoneNumber { get; set; } = string.Empty;
-
-        public DateTime? DateOfBirth { get; set; }
-
-        [Required(ErrorMessage = "Identification number is required")]
-        [StringLength(100, ErrorMessage = "Identification number cannot exceed 100 characters")]
-        public string IdentificationNumber { get; set; } = string.Empty;
-
-        [StringLength(200, ErrorMessage = "Emergency contact name cannot exceed 200 characters")]
-        public string EmergencyContactName { get; set; } = string.Empty;
-
-        [Phone(ErrorMessage = "Please enter a valid phone number")]
-        [StringLength(20, ErrorMessage = "Emergency contact phone cannot exceed 20 characters")]
-        public string EmergencyContactPhone { get; set; } = string.Empty;
+@rendermode InteractiveServer
 
-        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
-        public string Notes { get; set; } = string.Empty;
-    }
-}
\ No newline at end of file
+<Aquiis.UI.Shared.Features.PropertyManagement.Tenants.CreateForm />
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/Edit.razor b/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/Edit.razor
index 2768da8..13dab08 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/Edit.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/Edit.razor
@@ -1,339 +1,9 @@
-@page "/propertymanagement/tenants/edit/{Id:guid}"
-@using Aquiis.Core.Entities
-@using System.ComponentModel.DataAnnotations
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Web
-
+@page "/propertymanagement/tenants/{Id:guid}/edit"
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
-@inject NavigationManager NavigationManager
-@inject TenantService TenantService
 @rendermode InteractiveServer
 
-@if (tenant == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!isAuthorized)
-{
-    <div class="alert alert-danger">
-        <h4>Access Denied</h4>
-        <p>You don't have permission to edit this tenant.</p>
-        <a href="/tenants" class="btn btn-primary">Back to Tenants</a>
-    </div>
-}
-else
-{
-    <div class="row">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">
-                    <h3 class="card-title mb-0">Edit Tenant</h3>
-                </div>
-                <div class="card-body">
-                    <EditForm Model="tenantModel" OnValidSubmit="UpdateTenant" FormName="edit-tenant">
-                        <DataAnnotationsValidator />
-                        
-                        @if (!string.IsNullOrEmpty(errorMessage))
-                        {
-                            <div class="alert alert-danger" role="alert">
-                                @errorMessage
-                            </div>
-                        }
-
-                        @if (!string.IsNullOrEmpty(successMessage))
-                        {
-                            <div class="alert alert-success" role="alert">
-                                @successMessage
-                            </div>
-                        }
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">First Name *</label>
-                                <InputText @bind-Value="tenantModel.FirstName" class="form-control" placeholder="First name" />
-                                <ValidationMessage For="() => tenantModel.FirstName" class="text-danger" />
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Last Name *</label>
-                                <InputText @bind-Value="tenantModel.LastName" class="form-control" placeholder="Last name" />
-                                <ValidationMessage For="() => tenantModel.LastName" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Email *</label>
-                                <InputText @bind-Value="tenantModel.Email" class="form-control" type="email" placeholder="email@example.com" />
-                                <ValidationMessage For="() => tenantModel.Email" class="text-danger" />
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Phone Number</label>
-                                <InputText @bind-Value="tenantModel.PhoneNumber" class="form-control" placeholder="(555) 123-4567" />
-                                <ValidationMessage For="() => tenantModel.PhoneNumber" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Date of Birth</label>
-                                <InputDate @bind-Value="tenantModel.DateOfBirth" class="form-control" />
-                                <ValidationMessage For="() => tenantModel.DateOfBirth" class="text-danger" />
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Identification Number</label>
-                                <InputText @bind-Value="tenantModel.IdentificationNumber" class="form-control" placeholder="Identification number" />
-                                <ValidationMessage For="() => tenantModel.IdentificationNumber" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Emergency Contact Name</label>
-                                <InputText @bind-Value="tenantModel.EmergencyContactName" class="form-control" placeholder="Emergency contact name" />
-                                <ValidationMessage For="() => tenantModel.EmergencyContactName" class="text-danger" />
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Emergency Contact Phone</label>
-                                <InputText @bind-Value="tenantModel.EmergencyContactPhone" class="form-control" placeholder="(555) 123-4567" />
-                                <ValidationMessage For="() => tenantModel.EmergencyContactPhone" class="text-danger" />
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">Status: </label>
-                                <InputCheckbox @bind-Value="tenantModel.IsActive" class="form-check-input" /> Active
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <label class="form-label">Notes</label>
-                                <InputTextArea @bind-Value="tenantModel.Notes" class="form-control" rows="3" placeholder="Additional notes about the tenant" />
-                                <ValidationMessage For="() => tenantModel.Notes" class="text-danger" />
-                            </div>
-                        </div>
-
-                        <div class="d-flex gap-2">
-                            <button type="submit" class="btn btn-primary" disabled="@isSubmitting">
-                                @if (isSubmitting)
-                                {
-                                    <span class="spinner-border spinner-border-sm me-2" role="status"></span>
-                                }
-                                Update Tenant
-                            </button>
-                            <button type="button" class="btn btn-secondary" @onclick="ViewTenant">View Tenant</button>
-                            <button type="button" class="btn btn-outline-secondary" @onclick="Cancel">Cancel</button>
-                        </div>
-                    </EditForm>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-md-4">
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Tenant Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="ViewTenant">
-                            <i class="bi bi-eye"></i> View Tenant
-                        </button>
-                        <button class="btn btn-outline-success" @onclick="CreateLease">
-                            <i class="bi bi-file-plus"></i> Create Lease
-                        </button>
-                        <button class="btn btn-outline-danger" @onclick="DeleteTenant">
-                            <i class="bi bi-trash"></i> Delete Tenant
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="card mt-3">
-                <div class="card-header">
-                    <h5 class="mb-0">Tenant Information</h5>
-                </div>
-                <div class="card-body">
-                    <small class="text-muted">
-                        <strong>Added:</strong> @tenant.CreatedOn.ToString("MMMM dd, yyyy")
-                        <br />
-                        @if (tenant.LastModifiedOn.HasValue)
-                        {
-                            <strong>Last Modified:</strong> @tenant.LastModifiedOn.Value.ToString("MMMM dd, yyyy")
-                        }
-                    </small>
-                </div>
-            </div>
-        </div>
-    </div>
-}
+<Aquiis.UI.Shared.Features.PropertyManagement.Tenants.EditForm TenantId="@Id" />
 
 @code {
     [Parameter] public Guid Id { get; set; }
-    
-    private Tenant? tenant;
-    private TenantModel tenantModel = new();
-    private bool isSubmitting = false;
-    private bool isAuthorized = true;
-    private string errorMessage = string.Empty;
-    private string successMessage = string.Empty;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadTenant();
-    }
-
-    private async Task LoadTenant()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (string.IsNullOrEmpty(userId))
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        tenant = await TenantService.GetByIdAsync(Id);
-
-        if (tenant == null)
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        // Map tenant to model
-        tenantModel = new TenantModel
-        {
-            FirstName = tenant.FirstName,
-            LastName = tenant.LastName,
-            Email = tenant.Email,
-            PhoneNumber = tenant.PhoneNumber,
-            DateOfBirth = tenant.DateOfBirth,
-            IdentificationNumber = tenant.IdentificationNumber,
-            IsActive = tenant.IsActive,
-            EmergencyContactName = tenant.EmergencyContactName,
-            EmergencyContactPhone = tenant.EmergencyContactPhone!,
-            Notes = tenant.Notes
-        };
-    }
-
-    private async Task UpdateTenant()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (string.IsNullOrEmpty(userId))
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        try
-        {
-            isSubmitting = true;
-            errorMessage = string.Empty;
-            successMessage = string.Empty;
-
-            // Update tenant with form data
-            tenant!.FirstName = tenantModel.FirstName;
-            tenant.LastName = tenantModel.LastName;
-            tenant.Email = tenantModel.Email;
-            tenant.PhoneNumber = tenantModel.PhoneNumber;
-            tenant.DateOfBirth = tenantModel.DateOfBirth;
-            tenant.IdentificationNumber = tenantModel.IdentificationNumber;
-            tenant.IsActive = tenantModel.IsActive;
-            tenant.EmergencyContactName = tenantModel.EmergencyContactName;
-            tenant.EmergencyContactPhone = tenantModel.EmergencyContactPhone;
-            tenant.Notes = tenantModel.Notes;
-
-            await TenantService.UpdateAsync(tenant);
-            successMessage = "Tenant updated successfully!";
-        }
-        catch (Exception ex)
-        {
-            errorMessage = $"Error updating tenant: {ex.Message}";
-        }
-        finally
-        {
-            isSubmitting = false;
-        }
-    }
-
-    private void ViewTenant()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/tenants/{Id}");
-    }
-
-    private void CreateLease()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/leases/create?tenantId={Id}");
-    }
-
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/tenants");
-    }
-
-    private async Task DeleteTenant()
-    {
-        if (tenant != null)
-        {
-            try
-            {
-                await TenantService.DeleteAsync(tenant.Id);
-                NavigationManager.NavigateTo("/propertymanagement/tenants");
-            }
-            catch (Exception ex)
-            {
-                errorMessage = $"Error deleting tenant: {ex.Message}";
-            }
-        }
-    }
-
-    public class TenantModel
-    {
-        [Required(ErrorMessage = "First name is required")]
-        [StringLength(100, ErrorMessage = "First name cannot exceed 100 characters")]
-        public string FirstName { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Last name is required")]
-        [StringLength(100, ErrorMessage = "Last name cannot exceed 100 characters")]
-        public string LastName { get; set; } = string.Empty;
-
-        [Required(ErrorMessage = "Email is required")]
-        [EmailAddress(ErrorMessage = "Please enter a valid email address")]
-        [StringLength(255, ErrorMessage = "Email cannot exceed 255 characters")]
-        public string Email { get; set; } = string.Empty;
-
-        [Phone(ErrorMessage = "Please enter a valid phone number")]
-        [StringLength(20, ErrorMessage = "Phone number cannot exceed 20 characters")]
-        public string PhoneNumber { get; set; } = string.Empty;
-
-        public DateTime? DateOfBirth { get; set; }
-
-        [Required(ErrorMessage = "Identification number is required")]
-        [StringLength(100, ErrorMessage = "Identification number cannot exceed 100 characters")]
-        public string IdentificationNumber { get; set; } = string.Empty;
-
-        public bool IsActive { get; set; }
-
-        [StringLength(200, ErrorMessage = "Emergency contact name cannot exceed 200 characters")]
-        public string EmergencyContactName { get; set; } = string.Empty;
-
-        [Phone(ErrorMessage = "Please enter a valid phone number")]
-        [StringLength(20, ErrorMessage = "Emergency contact phone cannot exceed 20 characters")]
-        public string EmergencyContactPhone { get; set; } = string.Empty;
-
-        [StringLength(500, ErrorMessage = "Notes cannot exceed 500 characters")]
-        public string Notes { get; set; } = string.Empty;
-    }
-}
\ No newline at end of file
+}
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/Index.razor b/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/Index.razor
index 1e6eb85..edf1763 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/Index.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/Index.razor
@@ -1,528 +1,5 @@
 @page "/propertymanagement/tenants"
-@using Aquiis.Professional.Features.PropertyManagement
-@using Microsoft.AspNetCore.Authorization
-@inject NavigationManager Navigation
-@inject TenantService TenantService
-@inject IJSRuntime JSRuntime
-@inject UserContextService UserContext
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager", "User")]
 @rendermode InteractiveServer
 
-<div class="d-flex justify-content-between align-items-center mb-4">
-    <h1><span class="bi bi-people-fill" aria-hidden="true"></span> Tenants</h1>
-    @if (!isReadOnlyUser)
-    {
-        <button class="btn btn-primary" @onclick="CreateTenant">
-            <i class="bi bi-plus-lg"></i> Add Tenant
-        </button>
-    }
-</div>
-
-@if (tenants == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!tenants.Any())
-{
-    <div class="alert alert-info">
-        <h4>No Tenants Found</h4>
-        <p>Get started by converting a Prospective Tenant to your first tenant in the system.</p>
-        <button class="btn btn-primary" @onclick="CreateTenant">Add First Tenant</button>
-    </div>
-}
-else
-{
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="input-group">
-                <span class="input-group-text"><i class="bi bi-search"></i></span>
-                <input type="text" class="form-control" placeholder="Search tenants..." @bind="searchTerm" @onkeyup="FilterTenants" />
-            </div>
-        </div>
-        <div class="col-md-3">
-            <select class="form-select" @bind="selectedLeaseStatus" @bind:after="FilterTenants">
-                <option value="">All Lease Statuses</option>
-                <option value="Active">Active Lease</option>
-                <option value="Expired">Expired Lease</option>
-                <option value="Terminated">Terminated Lease</option>
-                <option value="Pending">Pending Lease</option>
-                <option value="No Lease">No Lease</option>
-            </select>
-        </div>
-        <div class="col-md-3">
-            <select class="form-select" @bind="selectedTenantStatus" @bind:after="FilterTenants">
-                <option value="1">Active Tenants</option>
-                <option value="0">Inactive Tenants</option>
-            </select>
-        </div>
-        <div class="col-md-3">
-            <button class="btn btn-outline-secondary" @onclick="ClearFilters">
-                <i class="bi bi-x-circle"></i> Clear Filters
-            </button>
-        </div>
-    </div>
-
-    <div class="row mb-3">
-        <div class="col-md-3">
-            <div class="card text-white bg-success">
-                <div class="card-body">
-                    <h6>Active Tenants</h6>
-                    <h4>@activeTenantsCount</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-warning">
-                <div class="card-body">
-                    <h6>Without Lease</h6>
-                    <h4>@tenantsWithoutLeaseCount</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-info">
-                <div class="card-body">
-                    <h6>Total Tenants</h6>
-                    <h4>@filteredTenants.Count</h4>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-3">
-            <div class="card text-white bg-primary">
-                <div class="card-body">
-                    <h6>New This Month</h6>
-                    <h4>@newThisMonthCount</h4>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="card">
-        <div class="card-body">
-            <div class="table-responsive">
-                <table class="table table-hover">
-                    <thead>
-                        <tr>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.FirstName))">
-                                    Name
-                                    @if (sortColumn == nameof(Tenant.FirstName))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.Email))">
-                                    Email
-                                    @if (sortColumn == nameof(Tenant.Email))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.PhoneNumber))">
-                                    Phone
-                                    @if (sortColumn == nameof(Tenant.PhoneNumber))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.DateOfBirth))">
-                                    Date of Birth
-                                    @if (sortColumn == nameof(Tenant.DateOfBirth))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.IsActive))">
-                                    Status
-                                    @if (sortColumn == nameof(Tenant.IsActive))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>
-                                <button class="btn btn-link p-0 text-decoration-none text-dark fw-bold" @onclick="() => SortBy(nameof(Tenant.CreatedOn))">
-                                    Created
-                                    @if (sortColumn == nameof(Tenant.CreatedOn))
-                                    {
-                                        <i class="bi @(sortAscending ? "bi-caret-up" : "bi-caret-down")"></i>
-                                    }
-                                </button>
-                            </th>
-                            <th>Lease Status</th>
-                            <th>Actions</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (var tenant in pagedTenants)
-                        {
-                            <tr>
-                                <td>
-                                    <div>
-                                        <strong>@tenant.FullName</strong>
-                                        @if (!string.IsNullOrEmpty(tenant.Notes))
-                                        {
-                                            <br />
-                                            <small class="text-muted">@tenant.Notes</small>
-                                        }
-                                    </div>
-                                </td>
-                                <td>@tenant.Email</td>
-                                <td>@tenant.PhoneNumber</td>
-                                <td>
-                                    @if (tenant.DateOfBirth.HasValue)
-                                    {
-                                        @tenant.DateOfBirth.Value.ToString("MMM dd, yyyy")
-                                    }
-                                    else
-                                    {
-                                        <span class="text-muted">Not provided</span>
-                                    }
-                                </td>
-                                <td>
-                                    @if (tenant.IsActive)
-                                    {
-                                        <span class="badge bg-success">Active</span>
-                                    }
-                                    else
-                                    {
-                                        <span class="badge bg-secondary">Inactive</span>
-                                    }
-                                </td>
-                                <td>@tenant.CreatedOn.ToString("MMM dd, yyyy")</td>
-                                <td>
-                                    @{
-                                        var activeLease = tenant.Leases?.FirstOrDefault(l => l.Status == "Active");
-                                        var latestLease = tenant.Leases?.OrderByDescending(l => l.StartDate).FirstOrDefault();
-                                    }
-                                    @if (activeLease != null)
-                                    {
-                                        <span class="badge bg-success">Active</span>
-                                    }
-                                    else if (latestLease != null)
-                                    {
-                                        <span class="badge bg-@(GetLeaseStatusClass(latestLease.Status))">@latestLease.Status</span>
-                                    }
-                                    else
-                                    {
-                                        <span class="badge bg-secondary">No Lease</span>
-                                    }
-                                </td>
-                                <td>
-                                    <div class="btn-group btn-group-sm">
-                                        <button class="btn btn-outline-primary" @onclick="() => ViewTenant(tenant.Id)" title="View">
-                                            <i class="bi bi-eye"></i>
-                                        </button>
-                                        @if (!isReadOnlyUser)
-                                        {
-                                            <button class="btn btn-outline-secondary" @onclick="() => EditTenant(tenant.Id)" title="Edit">
-                                                <i class="bi bi-pencil"></i>
-                                            </button>
-                                            <button class="btn btn-outline-danger" @onclick="() => DeleteTenant(tenant.Id)" title="Delete">
-                                                <i class="bi bi-trash"></i>
-                                            </button>
-                                        }
-                                    </div>
-                                </td>
-                            </tr>
-                        }
-                    </tbody>
-                </table>
-            </div>
-            
-            @if (totalPages > 1)
-            {
-                <div class="d-flex justify-content-between align-items-center mt-3">
-                    <div>
-                        <small class="text-muted">
-                            Showing @((currentPage - 1) * pageSize + 1) to @Math.Min(currentPage * pageSize, totalRecords) of @totalRecords tenants
-                        </small>
-                    </div>
-                    <nav aria-label="Tenants pagination">
-                        <ul class="pagination pagination-sm mb-0">
-                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                <button class="page-link" @onclick="() => GoToPage(1)" disabled="@(currentPage == 1)">
-                                    <i class="bi bi-chevron-double-left"></i>
-                                </button>
-                            </li>
-                            <li class="page-item @(currentPage == 1 ? "disabled" : "")">
-                                <button class="page-link" @onclick="() => GoToPage(currentPage - 1)" disabled="@(currentPage == 1)">
-                                    <i class="bi bi-chevron-left"></i>
-                                </button>
-                            </li>
-                            
-                            @for (int page = Math.Max(1, currentPage - 2); page <= Math.Min(totalPages, currentPage + 2); page++)
-                            {
-                                var pageNumber = page;
-                                <li class="page-item @(currentPage == pageNumber ? "active" : "")">
-                                    <button class="page-link" @onclick="() => GoToPage(pageNumber)">
-                                        @pageNumber
-                                    </button>
-                                </li>
-                            }
-                            
-                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                <button class="page-link" @onclick="() => GoToPage(currentPage + 1)" disabled="@(currentPage == totalPages)">
-                                    <i class="bi bi-chevron-right"></i>
-                                </button>
-                            </li>
-                            <li class="page-item @(currentPage == totalPages ? "disabled" : "")">
-                                <button class="page-link" @onclick="() => GoToPage(totalPages)" disabled="@(currentPage == totalPages)">
-                                    <i class="bi bi-chevron-double-right"></i>
-                                </button>
-                            </li>
-                        </ul>
-                    </nav>
-                </div>
-            }
-        </div>
-    </div>
-}
-
-@code {
-    private List<Tenant>? tenants;
-    private List<Tenant> filteredTenants = new();
-    private List<Tenant> pagedTenants = new();
-    private string searchTerm = string.Empty;
-    private string selectedLeaseStatus = string.Empty;
-
-    private int selectedTenantStatus = 1;
-
-    private string sortColumn = nameof(Tenant.FirstName);
-    private bool sortAscending = true;
-    private int activeTenantsCount = 0;
-    private int tenantsWithoutLeaseCount = 0;
-    private int newThisMonthCount = 0;
-    
-    // Pagination variables
-    private int currentPage = 1;
-    private int pageSize = 20;
-    private int totalPages = 1;
-    private int totalRecords = 0;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    private string? currentUserRole;
-    private bool isReadOnlyUser => currentUserRole == ApplicationConstants.OrganizationRoles.User;
-
-    protected override async Task OnInitializedAsync()
-    {
-        // Get current user's role
-        currentUserRole = await UserContext.GetCurrentOrganizationRoleAsync();
-        
-        await LoadTenants();
-        FilterTenants();
-        CalculateMetrics();
-    }
-
-    private async Task LoadTenants()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-        
-        if (string.IsNullOrEmpty(userId))
-        {
-            tenants = new List<Tenant>();
-            return;
-        }
-
-        tenants = await TenantService.GetAllAsync();
-    }
-
-    private void CreateTenant()
-    {
-        Navigation.NavigateTo("/propertymanagement/prospectivetenants");
-    }
-
-    private void ViewTenant(Guid id)
-    {
-        Navigation.NavigateTo($"/propertymanagement/tenants/{id}");
-    }
-
-    private void EditTenant(Guid id)
-    {
-        Navigation.NavigateTo($"/propertymanagement/tenants/{id}/edit");
-    }
-
-    private async Task DeleteTenant(Guid id)
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-        
-        if (string.IsNullOrEmpty(userId))
-            return;
-
-        
-        // Add confirmation dialog in a real application
-        var tenant = await TenantService.GetByIdAsync(id);
-        if (tenant != null)
-        {
-
-            await TenantService.DeleteAsync(tenant.Id);
-            await LoadTenants();
-            FilterTenants();
-            CalculateMetrics();
-        }
-    }
-
-    private void FilterTenants()
-    {
-        if (tenants == null)
-        {
-            filteredTenants = new();
-            pagedTenants = new();
-            return;
-        }
-
-        filteredTenants = tenants.Where(t =>
-            (string.IsNullOrEmpty(searchTerm) ||
-             t.FullName.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             t.Email.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             t.PhoneNumber.Contains(searchTerm, StringComparison.OrdinalIgnoreCase) ||
-             t.Notes.Contains(searchTerm, StringComparison.OrdinalIgnoreCase)) &&
-            (string.IsNullOrEmpty(selectedLeaseStatus) || GetTenantLeaseStatus(t) == selectedLeaseStatus) &&
-            (selectedTenantStatus == 1 ? t.IsActive : !t.IsActive)
-        ).ToList();
-        
-        SortTenants();
-        UpdatePagination();
-        CalculateMetrics();
-    }
-
-    private string GetTenantLeaseStatus(Tenant tenant)
-    {
-        var activeLease = tenant.Leases?.FirstOrDefault(l => l.Status == "Active");
-        if (activeLease != null) return "Active";
-        
-        var latestLease = tenant.Leases?.OrderByDescending(l => l.StartDate).FirstOrDefault();
-        if (latestLease != null) return latestLease.Status;
-        
-        return "No Lease";
-    }
-
-    private void SortBy(string column)
-    {
-        if (sortColumn == column)
-        {
-            sortAscending = !sortAscending;
-        }
-        else
-        {
-            sortColumn = column;
-            sortAscending = true;
-        }
-        
-        SortTenants();
-    }
-
-    private void SortTenants()
-    {
-        if (filteredTenants == null) return;
-
-        filteredTenants = sortColumn switch
-        {
-            nameof(Tenant.FirstName) => sortAscending 
-                ? filteredTenants.OrderBy(t => t.FirstName).ThenBy(t => t.LastName).ToList()
-                : filteredTenants.OrderByDescending(t => t.FirstName).ThenByDescending(t => t.LastName).ToList(),
-            nameof(Tenant.Email) => sortAscending 
-                ? filteredTenants.OrderBy(t => t.Email).ToList()
-                : filteredTenants.OrderByDescending(t => t.Email).ToList(),
-            nameof(Tenant.PhoneNumber) => sortAscending 
-                ? filteredTenants.OrderBy(t => t.PhoneNumber).ToList()
-                : filteredTenants.OrderByDescending(t => t.PhoneNumber).ToList(),
-            nameof(Tenant.DateOfBirth) => sortAscending 
-                ? filteredTenants.OrderBy(t => t.DateOfBirth ?? DateTime.MinValue).ToList()
-                : filteredTenants.OrderByDescending(t => t.DateOfBirth ?? DateTime.MinValue).ToList(),
-            nameof(Tenant.IsActive) => sortAscending 
-                ? filteredTenants.OrderBy(t => t.IsActive).ToList()
-                : filteredTenants.OrderByDescending(t => t.IsActive).ToList(),
-            nameof(Tenant.CreatedOn) => sortAscending 
-                ? filteredTenants.OrderBy(t => t.CreatedOn).ToList()
-                : filteredTenants.OrderByDescending(t => t.CreatedOn).ToList(),
-            _ => filteredTenants
-        };
-        
-        UpdatePagination();
-    }
-
-    private void CalculateMetrics()
-    {
-        if (filteredTenants != null)
-        {
-            activeTenantsCount = filteredTenants.Count(t => 
-                t.Leases?.Any(l => l.Status == "Active") == true);
-            
-            tenantsWithoutLeaseCount = filteredTenants.Count(t => 
-                t.Leases?.Any() != true);
-            
-            var now = DateTime.Now;
-            newThisMonthCount = filteredTenants.Count(t => 
-                t.CreatedOn.Month == now.Month && t.CreatedOn.Year == now.Year);
-        }
-    }
-
-    private string GetLeaseStatusClass(string status)
-    {
-        return status switch
-        {
-            "Active" => "success",
-            "Expired" => "warning",
-            "Terminated" => "danger",
-            "Pending" => "info",
-            _ => "secondary"
-        };
-    }
-
-    private void ClearFilters()
-    {
-        searchTerm = string.Empty;
-        selectedLeaseStatus = string.Empty;
-        currentPage = 1;
-        FilterTenants();
-    }
-
-    private void UpdatePagination()
-    {
-        totalRecords = filteredTenants?.Count ?? 0;
-        totalPages = (int)Math.Ceiling((double)totalRecords / pageSize);
-        
-        // Ensure current page is valid
-        if (currentPage > totalPages && totalPages > 0)
-        {
-            currentPage = totalPages;
-        }
-        else if (currentPage < 1)
-        {
-            currentPage = 1;
-        }
-        
-        // Get the current page of data
-        pagedTenants = filteredTenants?
-            .Skip((currentPage - 1) * pageSize)
-            .Take(pageSize)
-            .ToList() ?? new List<Tenant>();
-    }
-
-    private void GoToPage(int page)
-    {
-        if (page >= 1 && page <= totalPages && page != currentPage)
-        {
-            currentPage = page;
-            UpdatePagination();
-        }
-    }
-}
\ No newline at end of file
+<Aquiis.UI.Shared.Features.PropertyManagement.Tenants.ListForm />
diff --git a/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/View.razor b/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/View.razor
index 2e5021f..c02c25b 100644
--- a/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/View.razor
+++ b/5-Aquiis.Professional/Features/PropertyManagement/Tenants/Pages/View.razor
@@ -1,241 +1,9 @@
 @page "/propertymanagement/tenants/view/{Id:guid}"
-@using Aquiis.Core.Entities
-@using Microsoft.AspNetCore.Authorization
-@inject NavigationManager NavigationManager
-@inject TenantService TenantService
-@inject LeaseService LeaseService
-
 @attribute [OrganizationAuthorize("Owner", "Administrator", "PropertyManager")]
 @rendermode InteractiveServer
 
-@if (tenant == null)
-{
-    <div class="text-center">
-        <div class="spinner-border" role="status">
-            <span class="visually-hidden">Loading...</span>
-        </div>
-    </div>
-}
-else if (!isAuthorized)
-{
-    <div class="alert alert-danger">
-        <h4>Access Denied</h4>
-        <p>You don't have permission to view this tenant.</p>
-        <a href="/tenants" class="btn btn-primary">Back to Tenants</a>
-    </div>
-}
-else
-{
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <h1>Tenant Details</h1>
-        <div class="btn-group">
-            <button class="btn btn-primary" @onclick="EditTenant">
-                <i class="bi bi-pencil"></i> Edit
-            </button>
-            <button class="btn btn-secondary" @onclick="BackToList">
-                <i class="bi bi-arrow-left"></i> Back to List
-            </button>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Personal Information</h5>
-                </div>
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Full Name:</strong>
-                            <p>@tenant.FullName</p>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <strong>Email:</strong>
-                            <p><a href="mailto:@tenant.Email">@tenant.Email</a></p>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Phone Number:</strong>
-                            <p>@(!string.IsNullOrEmpty(tenant.PhoneNumber) ? tenant.PhoneNumber : "Not provided")</p>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <strong>Date of Birth:</strong>
-                            <p>@(tenant.DateOfBirth?.ToString("MMMM dd, yyyy") ?? "Not provided")</p>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Identification Number:</strong>
-                            <p>@(!string.IsNullOrEmpty(tenant.IdentificationNumber) ? tenant.IdentificationNumber : "Not provided")</p>
-                        </div>
-                        <div class="col-md-6 mb-3">
-                            <strong>Status:</strong>
-                            <p>@(tenant.IsActive ? "Active" : "Inactive")</p>
-                        </div>
-                    </div>
-
-                    @if (!string.IsNullOrEmpty(tenant.EmergencyContactName) || !string.IsNullOrEmpty(tenant.EmergencyContactPhone))
-                    {
-                        <hr />
-                        <h6>Emergency Contact</h6>
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <strong>Contact Name:</strong>
-                                <p>@(!string.IsNullOrEmpty(tenant.EmergencyContactName) ? tenant.EmergencyContactName : "Not provided")</p>
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <strong>Contact Phone:</strong>
-                                <p>@(!string.IsNullOrEmpty(tenant.EmergencyContactPhone) ? tenant.EmergencyContactPhone : "Not provided")</p>
-                            </div>
-                        </div>
-                    }
-
-                    @if (!string.IsNullOrEmpty(tenant.Notes))
-                    {
-                        <hr />
-                        <div class="row">
-                            <div class="col-md-12 mb-3">
-                                <strong>Notes:</strong>
-                                <p>@tenant.Notes</p>
-                            </div>
-                        </div>
-                    }
-
-                    <hr />
-                    <div class="row">
-                        <div class="col-md-6 mb-3">
-                            <strong>Added to System:</strong>
-                            <p>@tenant.CreatedOn.ToString("MMMM dd, yyyy")</p>
-                        </div>
-                        @if (tenant.LastModifiedOn.HasValue)
-                        {
-                            <div class="col-md-6 mb-3">
-                                <strong>Last Modified:</strong>
-                                <p>@tenant.LastModifiedOn.Value.ToString("MMMM dd, yyyy")</p>
-                            </div>
-                        }
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-md-4">
-            <div class="card">
-                <div class="card-header">
-                    <h5 class="mb-0">Quick Actions</h5>
-                </div>
-                <div class="card-body">
-                    <div class="d-grid gap-2">
-                        <button class="btn btn-outline-primary" @onclick="EditTenant">
-                            <i class="bi bi-pencil"></i> Edit Tenant
-                        </button>
-                        <button class="btn btn-outline-success" @onclick="CreateLease">
-                            <i class="bi bi-file-plus"></i> Create Lease
-                        </button>
-                        <button class="btn btn-outline-info" @onclick="ViewLeases">
-                            <i class="bi bi-file-text"></i> View Leases
-                        </button>
-                        <button class="btn btn-outline-secondary" @onclick="ViewDocuments">
-                            <i class="bi bi-folder"></i> View Documents
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            @if (tenantLeases.Any())
-            {
-                <div class="card mt-3">
-                    <div class="card-header">
-                        <h5 class="mb-0">Lease History</h5>
-                    </div>
-                    <div class="card-body">
-                        @foreach (var lease in tenantLeases.OrderByDescending(l => l.StartDate))
-                        {
-                            <div class="border-bottom pb-2 mb-2">
-                                <strong>@lease.Property?.Address</strong>
-                                <br />
-                                <small class="text-muted">
-                                    @lease.StartDate.ToString("MMM dd, yyyy") - @lease.EndDate.ToString("MMM dd, yyyy")
-                                </small>
-                                <br />
-                                <span class="badge @(lease.Status == "Active" ? "bg-success" : "bg-secondary")">
-                                    @lease.Status
-                                </span>
-                                <small class="text-success ms-2">@lease.MonthlyRent.ToString("C")/month</small>
-                            </div>
-                        }
-                    </div>
-                </div>
-            }
-        </div>
-    </div>
-}
+<Aquiis.UI.Shared.Features.PropertyManagement.Tenants.ViewForm TenantId="@Id" />
 
 @code {
-    [Parameter]
-    public Guid Id { get; set; }
-    
-    private Tenant? tenant;
-    private List<Lease> tenantLeases = new();
-    private bool isAuthorized = true;
-
-    [CascadingParameter]
-    private Task<AuthenticationState> AuthenticationStateTask { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        await LoadTenant();
-    }
-
-    private async Task LoadTenant()
-    {
-        var authState = await AuthenticationStateTask;
-        var userId = authState.User.FindFirst(System.Security.Claims.ClaimTypes.NameIdentifier)?.Value;
-
-        if (string.IsNullOrEmpty(userId))
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        tenant = await TenantService.GetByIdAsync(Id);
-
-        if (tenant == null)
-        {
-            isAuthorized = false;
-            return;
-        }
-
-        // Load leases for this tenant
-        tenantLeases = await LeaseService.GetLeasesByTenantIdAsync(Id);
-    }
-
-    private void EditTenant()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/tenants/{Id}/edit");
-    }
-
-    private void BackToList()
-    {
-        NavigationManager.NavigateTo("/propertymanagement/tenants");
-    }
-
-    private void CreateLease()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/leases/create?tenantId={Id}");
-    }
-
-    private void ViewLeases()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/leases?tenantId={Id}");
-    }
-
-    private void ViewDocuments()
-    {
-        NavigationManager.NavigateTo($"/propertymanagement/documents?tenantId={Id}");
-    }
-}
\ No newline at end of file
+    [Parameter] public Guid Id { get; set; }
+}
diff --git a/5-Aquiis.Professional/Features/_Imports.razor b/5-Aquiis.Professional/Features/_Imports.razor
index 0c7307e..e20426d 100644
--- a/5-Aquiis.Professional/Features/_Imports.razor
+++ b/5-Aquiis.Professional/Features/_Imports.razor
@@ -19,3 +19,4 @@
 @using Aquiis.Core.Constants
 @using Aquiis.Professional.Features.PropertyManagement
 @using Aquiis.Professional.Features.Administration
+@using Aquiis.UI.Shared.Components.Entities.Properties
diff --git a/5-Aquiis.Professional/Program.cs b/5-Aquiis.Professional/Program.cs
index 87f3afe..afc4117 100644
--- a/5-Aquiis.Professional/Program.cs
+++ b/5-Aquiis.Professional/Program.cs
@@ -543,7 +543,7 @@
         }
         
         // DO NOT assign to any organization - service account is org-agnostic
-        // DO NOT create UserOrganizations entries
+        // DO NOT create OrganizationUsers entries
         // DO NOT set ActiveOrganizationId
     }
 }
diff --git a/5-Aquiis.Professional/Services/WebPathService.cs b/5-Aquiis.Professional/Services/WebPathService.cs
index 98f8c55..2d5c8d0 100644
--- a/5-Aquiis.Professional/Services/WebPathService.cs
+++ b/5-Aquiis.Professional/Services/WebPathService.cs
@@ -31,16 +31,25 @@ public async Task<string> GetConnectionStringAsync(object configuration)
     public async Task<string> GetDatabasePathAsync()
     {
         var connectionString = await GetConnectionStringAsync(_configuration);
-        // Extract Data Source from connection string
-        var dataSource = connectionString.Split(';')
-            .FirstOrDefault(s => s.Trim().StartsWith("Data Source=", StringComparison.OrdinalIgnoreCase));
+        // Extract Data Source from connection string (supports both "Data Source=" and "DataSource=")
+        var dbPath = connectionString
+            .Replace("Data Source=", "")
+            .Replace("DataSource=", "")
+            .Split(';')[0]
+            .Trim();
         
-        if (dataSource != null)
+        if (string.IsNullOrEmpty(dbPath))
         {
-            return dataSource.Split('=')[1].Trim();
+            dbPath = "aquiis.db"; // Default
         }
         
-        return "aquiis.db"; // Default
+        // Make absolute path if relative
+        if (!Path.IsPathRooted(dbPath))
+        {
+            dbPath = Path.Combine(Directory.GetCurrentDirectory(), dbPath);
+        }
+        
+        return dbPath;
     }
     
     public async Task<string> GetUserDataPathAsync()
diff --git a/5-Aquiis.Professional/Shared/App.razor b/5-Aquiis.Professional/Shared/App.razor
index 3e6deb4..df75f5c 100644
--- a/5-Aquiis.Professional/Shared/App.razor
+++ b/5-Aquiis.Professional/Shared/App.razor
@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="_content/Aquiis.UI.Shared/css/organization-switcher.css" />
     <link rel="stylesheet" href="@Assets["Aquiis.Professional.styles.css"]" />
     <ImportMap />
-    <link rel="icon" type="image/png" href="favicon.png" />
+    <link rel="icon" type="image/x-icon" href="favicon.ico" />
     <!-- Load theme immediately to prevent flash -->
     <script src="_content/Aquiis.UI.Shared/js/theme.js"></script>
     <HeadOutlet />
diff --git a/5-Aquiis.Professional/Shared/Authorization/OrganizationRoleAuthorizationHandler copy.cs b/5-Aquiis.Professional/Shared/Authorization/OrganizationRoleAuthorizationHandler copy.cs
index 1da3a22..6695e93 100644
--- a/5-Aquiis.Professional/Shared/Authorization/OrganizationRoleAuthorizationHandler copy.cs	
+++ b/5-Aquiis.Professional/Shared/Authorization/OrganizationRoleAuthorizationHandler copy.cs	
@@ -51,21 +51,21 @@ protected override async Task HandleRequirementAsync(
         }
 
         // Get user's role in the active organization
-        var userOrganization = await _dbContext.UserOrganizations
+        var OrganizationUser = await _dbContext.OrganizationUsers
             .Where(uo => uo.UserId == userId 
                       && uo.OrganizationId == user.ActiveOrganizationId 
                       && uo.IsActive 
                       && !uo.IsDeleted)
             .FirstOrDefaultAsync();
 
-        if (userOrganization == null)
+        if (OrganizationUser == null)
         {
             return;
         }
 
         // Check if user's role is in the allowed roles
         // If no roles specified (empty array), allow any authenticated org member
-        if (requirement.AllowedRoles.Length == 0 || requirement.AllowedRoles.Contains(userOrganization.Role))
+        if (requirement.AllowedRoles.Length == 0 || requirement.AllowedRoles.Contains(OrganizationUser.Role))
         {
             context.Succeed(requirement);
         }
diff --git a/5-Aquiis.Professional/Shared/Components/Account/Pages/Login.razor b/5-Aquiis.Professional/Shared/Components/Account/Pages/Login.razor
index 160895f..b55359a 100644
--- a/5-Aquiis.Professional/Shared/Components/Account/Pages/Login.razor
+++ b/5-Aquiis.Professional/Shared/Components/Account/Pages/Login.razor
@@ -54,13 +54,13 @@
             </EditForm>
         </section>
     </div>
-    <div class="col-lg-4 col-lg-offset-2">
+    @* <div class="col-lg-4 col-lg-offset-2">
         <section>
             <h3>Use another service to log in.</h3>
             <hr />
             <ExternalLoginPicker />
         </section>
-    </div>
+    </div> *@
 </div>
 
 @code {
diff --git a/5-Aquiis.Professional/Shared/Components/Account/Pages/Manage/Index.razor b/5-Aquiis.Professional/Shared/Components/Account/Pages/Manage/Index.razor
index 0ae4a5c..5ed3d65 100644
--- a/5-Aquiis.Professional/Shared/Components/Account/Pages/Manage/Index.razor
+++ b/5-Aquiis.Professional/Shared/Components/Account/Pages/Manage/Index.razor
@@ -4,6 +4,7 @@
 @using Microsoft.AspNetCore.Identity
 
 @inject UserManager<ApplicationUser> UserManager
+@inject UserContextService UserContext
 @inject SignInManager<ApplicationUser> SignInManager
 @inject IdentityUserAccessor UserAccessor
 @inject IdentityRedirectManager RedirectManager
@@ -88,7 +89,7 @@
             }
         }
         
-        // Update the user properties
+        // Update the user properties in Identity
         user.FirstName = Input.FirstName ?? string.Empty;
         user.LastName = Input.LastName ?? string.Empty;
 
@@ -100,6 +101,19 @@
             return;
         }
 
+        // Update UserProfile to keep denormalized data in sync
+        var profileUpdated = await UserContext.UpdateCurrentUserProfileAsync(
+            Input.FirstName ?? string.Empty,
+            Input.LastName ?? string.Empty,
+            Input.PhoneNumber
+        );
+
+        if (!profileUpdated)
+        {
+            RedirectManager.RedirectToCurrentPageWithStatus("Error: Failed to update user profile.", HttpContext);
+            return;
+        }
+
         await SignInManager.RefreshSignInAsync(user);
         RedirectManager.RedirectToCurrentPageWithStatus("Your profile has been updated", HttpContext);
     }
diff --git a/5-Aquiis.Professional/Shared/Components/Account/Pages/Register.razor b/5-Aquiis.Professional/Shared/Components/Account/Pages/Register.razor
index a602d9b..bf2da7e 100644
--- a/5-Aquiis.Professional/Shared/Components/Account/Pages/Register.razor
+++ b/5-Aquiis.Professional/Shared/Components/Account/Pages/Register.razor
@@ -1,10 +1,7 @@
 @page "/Account/Register"
 
 @using System.ComponentModel.DataAnnotations
-@using System.Text
-@using System.Text.Encodings.Web
 @using Microsoft.AspNetCore.Identity
-@using Microsoft.AspNetCore.WebUtilities
 @using Aquiis.Infrastructure.Data
 @using Aquiis.Application.Services
 @using Aquiis.Core.Entities
@@ -60,12 +57,79 @@ else
                         <label for="Input.OrganizationName">Organization Name</label>
                         <ValidationMessage For="() => Input.OrganizationName" class="text-danger" />
                     </div>
+                    <div class="form-floating mb-3">
+                        <InputSelect @bind-Value="Input.State" id="Input.State" class="form-select" aria-required="true">
+                            <option value="">Select State</option>
+                            <option value="AL">Alabama</option>
+                            <option value="AK">Alaska</option>
+                            <option value="AZ">Arizona</option>
+                            <option value="AR">Arkansas</option>
+                            <option value="CA">California</option>
+                            <option value="CO">Colorado</option>
+                            <option value="CT">Connecticut</option>
+                            <option value="DE">Delaware</option>
+                            <option value="FL">Florida</option>
+                            <option value="GA">Georgia</option>
+                            <option value="HI">Hawaii</option>
+                            <option value="ID">Idaho</option>
+                            <option value="IL">Illinois</option>
+                            <option value="IN">Indiana</option>
+                            <option value="IA">Iowa</option>
+                            <option value="KS">Kansas</option>
+                            <option value="KY">Kentucky</option>
+                            <option value="LA">Louisiana</option>
+                            <option value="ME">Maine</option>
+                            <option value="MD">Maryland</option>
+                            <option value="MA">Massachusetts</option>
+                            <option value="MI">Michigan</option>
+                            <option value="MN">Minnesota</option>
+                            <option value="MS">Mississippi</option>
+                            <option value="MO">Missouri</option>
+                            <option value="MT">Montana</option>
+                            <option value="NE">Nebraska</option>
+                            <option value="NV">Nevada</option>
+                            <option value="NH">New Hampshire</option>
+                            <option value="NJ">New Jersey</option>
+                            <option value="NM">New Mexico</option>
+                            <option value="NY">New York</option>
+                            <option value="NC">North Carolina</option>
+                            <option value="ND">North Dakota</option>
+                            <option value="OH">Ohio</option>
+                            <option value="OK">Oklahoma</option>
+                            <option value="OR">Oregon</option>
+                            <option value="PA">Pennsylvania</option>
+                            <option value="RI">Rhode Island</option>
+                            <option value="SC">South Carolina</option>
+                            <option value="SD">South Dakota</option>
+                            <option value="TN">Tennessee</option>
+                            <option value="TX">Texas</option>
+                            <option value="UT">Utah</option>
+                            <option value="VT">Vermont</option>
+                            <option value="VA">Virginia</option>
+                            <option value="WA">Washington</option>
+                            <option value="WV">West Virginia</option>
+                            <option value="WI">Wisconsin</option>
+                            <option value="WY">Wyoming</option>
+                        </InputSelect>
+                        <label for="Input.State">State</label>
+                        <ValidationMessage For="() => Input.State" class="text-danger" />
+                    </div>
                 }
                 <div class="form-floating mb-3">
                     <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
                     <label for="Input.Email">Email</label>
                     <ValidationMessage For="() => Input.Email" class="text-danger" />
                 </div>
+                <div class="form-floating mb-3">
+                    <InputText @bind-Value="Input.FirstName" id="Input.FirstName" class="form-control" aria-required="true" placeholder="First Name" />
+                    <label for="Input.FirstName">First Name</label>
+                    <ValidationMessage For="() => Input.FirstName" class="text-danger" />
+                </div>
+                <div class="form-floating mb-3">
+                    <InputText @bind-Value="Input.LastName" id="Input.LastName" class="form-control" aria-required="true" placeholder="Last Name" />
+                    <label for="Input.LastName">Last Name</label>
+                    <ValidationMessage For="() => Input.LastName" class="text-danger" />
+                </div>
                 <div class="form-floating mb-3">
                     <InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
                     <label for="Input.Password">Password</label>
@@ -142,6 +206,11 @@ else
         await UserStore.SetUserNameAsync(user, Input.Email, CancellationToken.None);
         var emailStore = GetEmailStore();
         await emailStore.SetEmailAsync(user, Input.Email, CancellationToken.None);
+        
+        // Set FirstName and LastName on ApplicationUser
+        user.FirstName = Input.FirstName;
+        user.LastName = Input.LastName;
+        
         var result = await UserManager.CreateAsync(user, Input.Password);
 
         if (!result.Succeeded)
@@ -154,6 +223,39 @@ else
 
         var userId = await UserManager.GetUserIdAsync(user);
 
+        // Create UserProfile in ApplicationDbContext
+        try
+        {
+            var userProfile = new UserProfile
+            {
+                Id = Guid.NewGuid(),
+                UserId = userId,
+                Email = Input.Email,
+                FirstName = Input.FirstName,
+                LastName = Input.LastName,
+                PhoneNumber = null,
+                OrganizationId = null, // Will be set during organization creation for first user
+                ActiveOrganizationId = null, // Will be set during organization creation for first user
+                CreatedOn = DateTime.UtcNow,
+                CreatedBy = userId,
+                IsDeleted = false
+            };
+
+            await DbContext.UserProfiles.AddAsync(userProfile);
+            await DbContext.SaveChangesAsync();
+
+            Logger.LogInformation("UserProfile created for user {UserId}", userId);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Error creating UserProfile for user {UserId}", userId);
+            identityErrors = new[] { new IdentityError { Description = $"Error creating user profile: {ex.Message}" } };
+            
+            // Clean up user account
+            await UserManager.DeleteAsync(user);
+            return;
+        }
+
         // First user setup - create organization and grant owner access
         if (_isFirstUser)
         {
@@ -173,7 +275,7 @@ else
                     name: Input.OrganizationName!,
                     ownerId: userId,
                     displayName: Input.OrganizationName,
-                    state: null);
+                    state: Input.State);
 
                 if (organization != null)
                 {
@@ -182,6 +284,19 @@ else
                     user.OrganizationId = organization.Id;
                     await UserManager.UpdateAsync(user);
 
+                    // Update UserProfile with organization IDs
+                    var userProfile = await DbContext.UserProfiles
+                        .FirstOrDefaultAsync(up => up.UserId == userId);
+                    
+                    if (userProfile != null)
+                    {
+                        userProfile.OrganizationId = organization.Id;
+                        userProfile.ActiveOrganizationId = organization.Id;
+                        userProfile.LastModifiedOn = DateTime.UtcNow;
+                        userProfile.LastModifiedBy = userId;
+                        await DbContext.SaveChangesAsync();
+                    }
+
                     Logger.LogInformation("Organization {OrgName} created successfully for user {Email}", 
                         Input.OrganizationName, Input.Email);
                 }
@@ -206,21 +321,21 @@ else
             }
         }
 
+        // Auto-confirm email (no email integration yet)
         var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
-        code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
-        var callbackUrl = NavigationManager.GetUriWithQueryParameters(
-            NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
-            new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code, ["returnUrl"] = ReturnUrl });
-
-        await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
-
-        if (UserManager.Options.SignIn.RequireConfirmedAccount)
+        var confirmResult = await UserManager.ConfirmEmailAsync(user, code);
+        
+        if (!confirmResult.Succeeded)
         {
-            RedirectManager.RedirectTo(
-                "Account/RegisterConfirmation",
-                new() { ["email"] = Input.Email, ["returnUrl"] = ReturnUrl });
+            Logger.LogWarning("Failed to auto-confirm email for user {UserId}: {Errors}", 
+                userId, string.Join(", ", confirmResult.Errors.Select(e => e.Description)));
+        }
+        else
+        {
+            Logger.LogInformation("Email auto-confirmed for user {UserId}", userId);
         }
         
+        // Sign in the user directly
         await SignInManager.SignInAsync(user, isPersistent: false);
         RedirectManager.RedirectTo(ReturnUrl);
     }
@@ -254,11 +369,25 @@ else
         [Display(Name = "Organization Name")]
         public string? OrganizationName { get; set; }
 
+        [Required]
+        [Display(Name = "State")]
+        public string State { get; set; } = "";
+
         [Required]
         [EmailAddress]
         [Display(Name = "Email")]
         public string Email { get; set; } = "";
 
+        [Required]
+        [StringLength(50, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 1)]
+        [Display(Name = "First Name")]
+        public string FirstName { get; set; } = "";
+
+        [Required]
+        [StringLength(50, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 1)]
+        [Display(Name = "Last Name")]
+        public string LastName { get; set; } = "";
+
         [Required]
         [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
         [DataType(DataType.Password)]
diff --git a/5-Aquiis.Professional/Shared/Components/Account/Pages/RegisterConfirmation.razor b/5-Aquiis.Professional/Shared/Components/Account/Pages/RegisterConfirmation.razor
index d8f7061..090151f 100644
--- a/5-Aquiis.Professional/Shared/Components/Account/Pages/RegisterConfirmation.razor
+++ b/5-Aquiis.Professional/Shared/Components/Account/Pages/RegisterConfirmation.razor
@@ -17,9 +17,13 @@
 
 @if (emailConfirmationLink is not null)
 {
-    <p>
+    @* <p>
         This app does not currently have a real email sender registered, see <a href="https://aka.ms/aspaccountconf">these docs</a> for how to configure a real email sender.
         Normally this would be emailed: <a href="@emailConfirmationLink">Click here to confirm your account</a>
+    </p> *@
+    <p>
+        This app does not currently integrate email, this is something we hope to consider in the future.
+        <a href="@emailConfirmationLink">Click here to confirm your account</a>
     </p>
 }
 else
diff --git a/5-Aquiis.Professional/Shared/Components/AuthorizedHeaderSection.razor b/5-Aquiis.Professional/Shared/Components/AuthorizedHeaderSection.razor
index 6f7537e..ddda635 100644
--- a/5-Aquiis.Professional/Shared/Components/AuthorizedHeaderSection.razor
+++ b/5-Aquiis.Professional/Shared/Components/AuthorizedHeaderSection.razor
@@ -1,7 +1,9 @@
 @using Aquiis.Professional.Shared.Components
+@using Aquiis.UI.Shared.Components.OrganizationSwitcher
+@inject UserContextService UserContext
 @rendermode InteractiveServer
 
 <div class="d-flex align-items-center gap-2">
     <NotificationBellWrapper />
-    <OrganizationSwitcher />
+    <Aquiis.UI.Shared.Components.OrganizationSwitcher.OrganizationSwitcher UserContext="UserContext" />
 </div>
diff --git a/5-Aquiis.Professional/Shared/Components/NotificationBellWrapper.razor b/5-Aquiis.Professional/Shared/Components/NotificationBellWrapper.razor
index 158a290..7ffe0b5 100644
--- a/5-Aquiis.Professional/Shared/Components/NotificationBellWrapper.razor
+++ b/5-Aquiis.Professional/Shared/Components/NotificationBellWrapper.razor
@@ -1,4 +1,4 @@
-@using Aquiis.UI.Shared.Features.Notifications
+@using Aquiis.UI.Shared.Components.Notifications
 @using Aquiis.Professional.Shared.Services
 
 <NotificationBell GetEntityRoute="@EntityRouteHelper.GetEntityRoute" />
diff --git a/5-Aquiis.Professional/Shared/Components/OrganizationSwitcher.razor b/5-Aquiis.Professional/Shared/Components/OrganizationSwitcher.razor
index 8405134..467d39e 100644
--- a/5-Aquiis.Professional/Shared/Components/OrganizationSwitcher.razor
+++ b/5-Aquiis.Professional/Shared/Components/OrganizationSwitcher.razor
@@ -70,7 +70,7 @@ else if (accessibleOrganizations.Count > 0)
 }
 
 @code {
-    private List<UserOrganization> accessibleOrganizations = new();
+    private List<OrganizationUser> accessibleOrganizations = new();
     private Organization? currentOrg;
     private string? currentRole;
     private bool isAccountOwner;
diff --git a/5-Aquiis.Professional/Shared/Layout/MainLayout.razor.css b/5-Aquiis.Professional/Shared/Layout/MainLayout.razor.css
index 393ac82..b4325c1 100644
--- a/5-Aquiis.Professional/Shared/Layout/MainLayout.razor.css
+++ b/5-Aquiis.Professional/Shared/Layout/MainLayout.razor.css
@@ -9,7 +9,7 @@ main {
 }
 
 .sidebar {
-  background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
+  background-color: #0f172a !important;
 }
 
 .top-row {
diff --git a/5-Aquiis.Professional/Shared/Layout/NavMenu.razor.css b/5-Aquiis.Professional/Shared/Layout/NavMenu.razor.css
index 01486ae..698cad9 100644
--- a/5-Aquiis.Professional/Shared/Layout/NavMenu.razor.css
+++ b/5-Aquiis.Professional/Shared/Layout/NavMenu.razor.css
@@ -19,7 +19,7 @@
 
 .top-row {
   min-height: 3.5rem;
-  background-color: rgba(0, 0, 0, 0.4);
+  background-color: #0f172a;
 }
 
 .navbar-brand {
@@ -116,6 +116,7 @@
 
   .nav-scrollable {
     display: none;
+    background-color: #0f172a;
   }
 
   .navbar-toggler:checked ~ .nav-scrollable {
@@ -135,5 +136,6 @@
     /* Allow sidebar to scroll for tall menus */
     height: calc(100vh - 3.5rem);
     overflow-y: auto;
+    background-color: #0f172a;
   }
 }
diff --git a/5-Aquiis.Professional/Shared/Services/UserContextService.cs b/5-Aquiis.Professional/Shared/Services/UserContextService.cs
index 128095e..1bcf9ff 100644
--- a/5-Aquiis.Professional/Shared/Services/UserContextService.cs
+++ b/5-Aquiis.Professional/Shared/Services/UserContextService.cs
@@ -6,8 +6,8 @@
 using System.Security.Claims;
 using Aquiis.Core.Constants;
 using Aquiis.Core.Interfaces.Services;
-using Aquiis.Application.Services;
-
+using Aquiis.Application.Services;using Aquiis.Infrastructure.Data;
+using Microsoft.EntityFrameworkCore;
 namespace Aquiis.Professional.Shared.Services
 {
 
@@ -18,6 +18,7 @@ namespace Aquiis.Professional.Shared.Services
     public class UserContextService : IUserContextService
     {
         private readonly AuthenticationStateProvider _authenticationStateProvider;
+        private readonly ApplicationDbContext _dbContext;
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly Func<Task<Aquiis.Application.Services.OrganizationService>> _organizationServiceFactory;
 
@@ -25,15 +26,17 @@ public class UserContextService : IUserContextService
         private string? _userId;
         private Guid? _organizationId;
         private Guid? _activeOrganizationId;
-        private ApplicationUser? _currentUser;
+        private UserProfile? _userProfile;
         private bool _isInitialized = false;
 
         public UserContextService(
             AuthenticationStateProvider authenticationStateProvider,
+            ApplicationDbContext dbContext,
             UserManager<ApplicationUser> userManager,
             IServiceProvider serviceProvider)
         {
             _authenticationStateProvider = authenticationStateProvider;
+            _dbContext = dbContext;
             _userManager = userManager;
             // Use factory pattern to avoid circular dependency
             _organizationServiceFactory = async () => 
@@ -52,6 +55,19 @@ public UserContextService(
             return _userId;
         }
 
+        /// <summary>
+        /// Gets the current ApplicationUser from Identity system. Use this when you need the full Identity user object.
+        /// For display purposes, prefer using UserProfile queries against ApplicationDbContext.
+        /// </summary>
+        public async Task<ApplicationUser?> GetCurrentUserAsync()
+        {
+            var userId = await GetUserIdAsync();
+            if (userId == null)
+                return null;
+
+            return await _userManager.FindByIdAsync(userId);
+        }
+
         /// <summary>
         /// Gets the current user's OrganizationId. Cached after first access.
         /// DEPRECATED: Use GetActiveOrganizationIdAsync() for multi-org support
@@ -87,12 +103,12 @@ public UserContextService(
         }
 
         /// <summary>
-        /// Gets the current ApplicationUser object. Cached after first access.
+        /// Gets the current UserProfile object. Cached after first access.
         /// </summary>
-        public async Task<ApplicationUser?> GetCurrentUserAsync()
+        public async Task<UserProfile?> GetUserProfileAsync()
         {
             await EnsureInitializedAsync();
-            return _currentUser;
+            return _userProfile;
         }
 
         /// <summary>
@@ -110,7 +126,7 @@ public async Task<bool> IsAuthenticatedAsync()
         public async Task<string?> GetUserEmailAsync()
         {
             await EnsureInitializedAsync();
-            return _currentUser?.Email;
+            return _userProfile?.Email;
         }
 
         /// <summary>
@@ -119,11 +135,32 @@ public async Task<bool> IsAuthenticatedAsync()
         public async Task<string?> GetUserNameAsync()
         {
             await EnsureInitializedAsync();
-            if (_currentUser != null)
-            {
-                return $"{_currentUser.FirstName} {_currentUser.LastName}".Trim();
-            }
-            return null;
+            return _userProfile?.FullName;
+        }
+
+        /// <summary>
+        /// Updates the current user's profile information and refreshes the cache.
+        /// </summary>
+        public async Task<bool> UpdateCurrentUserProfileAsync(string firstName, string lastName, string? phoneNumber)
+        {
+            var userId = await GetUserIdAsync();
+            if (string.IsNullOrEmpty(userId))
+                return false;
+
+            var userProfile = await _dbContext.UserProfiles.FirstOrDefaultAsync(up => up.UserId == userId);
+            if (userProfile == null)
+                return false;
+
+            userProfile.FirstName = firstName;
+            userProfile.LastName = lastName;
+            userProfile.PhoneNumber = phoneNumber;
+            userProfile.LastModifiedOn = DateTime.UtcNow;
+            userProfile.LastModifiedBy = userId;
+            await _dbContext.SaveChangesAsync();
+
+            // Refresh cache to reflect changes
+            await RefreshAsync();
+            return true;
         }
 
         /// <summary>
@@ -140,14 +177,14 @@ public async Task<bool> IsInRoleAsync(string role)
         /// <summary>
         /// Get all organizations the current user has access to
         /// </summary>
-        public async Task<List<UserOrganization>> GetAccessibleOrganizationsAsync()
+        public async Task<List<OrganizationUser>> GetAccessibleOrganizationsAsync()
         {
             var userId = await GetUserIdAsync();
             if (string.IsNullOrEmpty(userId))
-                return new List<UserOrganization>();
+                return new List<OrganizationUser>();
 
             var organizationService = await _organizationServiceFactory();
-            return await organizationService.GetUserOrganizationsAsync(userId);
+            return await organizationService.GetOrganizationUsersAsync(userId);
         }
 
         /// <summary>
@@ -204,22 +241,21 @@ public async Task<bool> SwitchOrganizationAsync(Guid organizationId)
             if (!await organizationService.CanAccessOrganizationAsync(userId, organizationId))
                 return false;
 
-            // Update user's active organization
-            var user = await GetCurrentUserAsync();
-            if (user == null)
+            // Update UserProfile's active organization
+            var userProfile = await _dbContext.UserProfiles
+                .FirstOrDefaultAsync(up => up.UserId == userId);
+            
+            if (userProfile == null)
                 return false;
 
-            user.ActiveOrganizationId = organizationId;
-            var result = await _userManager.UpdateAsync(user);
+            userProfile.ActiveOrganizationId = organizationId;
+            userProfile.LastModifiedOn = DateTime.UtcNow;
+            userProfile.LastModifiedBy = userId;
+            await _dbContext.SaveChangesAsync();
 
-            if (result.Succeeded)
-            {
-                // Refresh cache
-                await RefreshAsync();
-                return true;
-            }
-
-            return false;
+            // Refresh cache
+            await RefreshAsync();
+            return true;
         }
 
         /// <summary>
@@ -272,7 +308,7 @@ public async Task RefreshAsync()
             _userId = null;
             _organizationId = null;
             _activeOrganizationId = null;
-            _currentUser = null;
+            _userProfile = null;
             await EnsureInitializedAsync();
         }
 
@@ -295,12 +331,16 @@ private async Task EnsureInitializedAsync()
                 if (!string.IsNullOrEmpty(claimsUserId))
                 {
                     _userId = claimsUserId;
-                }
-                {
-                    _currentUser = await _userManager.FindByIdAsync(_userId!);
-                    if (_currentUser != null)
+                    
+                    // Load UserProfile from ApplicationDbContext (single-context query)
+                    _userProfile = await _dbContext.UserProfiles
+                        .AsNoTracking()
+                        .FirstOrDefaultAsync(up => up.UserId == _userId);
+                    
+                    if (_userProfile != null)
                     {
-                        _activeOrganizationId = _currentUser.ActiveOrganizationId; // New multi-org
+                        _organizationId = _userProfile.OrganizationId;
+                        _activeOrganizationId = _userProfile.ActiveOrganizationId;
                     }
                 }
             }
diff --git a/5-Aquiis.Professional/_Imports.razor b/5-Aquiis.Professional/_Imports.razor
index 27e8645..37d4c49 100644
--- a/5-Aquiis.Professional/_Imports.razor
+++ b/5-Aquiis.Professional/_Imports.razor
@@ -14,5 +14,5 @@
 @using Aquiis.Application.Services
 @using Aquiis.Core.Entities
 @using Aquiis.Core.Interfaces
-@using Aquiis.UI.Shared.Features.Notifications
+@using Aquiis.UI.Shared.Components.Notifications
 @using Aquiis.UI.Shared.Components.Common
diff --git a/5-Aquiis.Professional/appsettings.json b/5-Aquiis.Professional/appsettings.json
index 0258005..40fc2ad 100644
--- a/5-Aquiis.Professional/appsettings.json
+++ b/5-Aquiis.Professional/appsettings.json
@@ -20,7 +20,8 @@
     "SoftDeleteEnabled": true,
     "DatabaseFileName": "app_v0.3.0.db",
     "PreviousDatabaseFileName": "app_v0.0.0.db",
-    "SchemaVersion": "0.3.0"
+    "SchemaVersion": "0.3.0",
+    "MaxOrganizationUsers": 0
   },
   "SessionTimeout": {
     "InactivityTimeoutMinutes": 18,
diff --git a/5-Aquiis.Professional/wwwroot/android-chrome-192x192.png b/5-Aquiis.Professional/wwwroot/android-chrome-192x192.png
new file mode 100644
index 0000000..aa0e774
Binary files /dev/null and b/5-Aquiis.Professional/wwwroot/android-chrome-192x192.png differ
diff --git a/5-Aquiis.Professional/wwwroot/android-chrome-512x512.png b/5-Aquiis.Professional/wwwroot/android-chrome-512x512.png
new file mode 100644
index 0000000..013f46d
Binary files /dev/null and b/5-Aquiis.Professional/wwwroot/android-chrome-512x512.png differ
diff --git a/5-Aquiis.Professional/wwwroot/app.css b/5-Aquiis.Professional/wwwroot/app.css
index 1127dd4..8d9eb15 100644
--- a/5-Aquiis.Professional/wwwroot/app.css
+++ b/5-Aquiis.Professional/wwwroot/app.css
@@ -1,9 +1,103 @@
+/* Obsidian Palette - Utility Classes */
+
+/* Background Colors */
+.bg-obsidian-primary {
+  background-color: #25344d !important;
+  color: white !important;
+}
+.bg-obsidian-primary-dark {
+  background-color: #0f172a !important;
+  color: white !important;
+}
+.bg-obsidian-secondary {
+  background-color: #d17315 !important;
+  color: white !important;
+}
+.bg-obsidian-success {
+  background-color: #1a531d !important;
+  color: white !important;
+}
+.bg-obsidian-info {
+  background-color: #1b60b4 !important;
+  color: white !important;
+}
+.bg-obsidian-warning {
+  background-color: #d29e00 !important;
+  color: #2a3749 !important;
+}
+.bg-obsidian-danger {
+  background-color: #712028 !important;
+  color: white !important;
+}
+.bg-obsidian-light {
+  background-color: #faf9f6 !important;
+  color: #2a3749 !important;
+}
+.bg-obsidian-dark {
+  background-color: #2a3749 !important;
+  color: white !important;
+}
+
+/* Text Colors */
+.text-obsidian-primary {
+  color: #25344d !important;
+}
+.text-obsidian-primary-dark {
+  color: #0f172a !important;
+}
+.text-obsidian-secondary {
+  color: #d17315 !important;
+}
+.text-obsidian-success {
+  color: #1a531d !important;
+}
+.text-obsidian-info {
+  color: #1b60b4 !important;
+}
+.text-obsidian-warning {
+  color: #d29e00 !important;
+}
+.text-obsidian-danger {
+  color: #712028 !important;
+}
+.text-obsidian-light {
+  color: #faf9f6 !important;
+}
+.text-obsidian-dark {
+  color: #2a3749 !important;
+}
+
+/* Border Colors */
+.border-obsidian-primary {
+  border-color: #25344d !important;
+}
+.border-obsidian-primary-dark {
+  border-color: #0f172a !important;
+}
+.border-obsidian-secondary {
+  border-color: #d17315 !important;
+}
+.border-obsidian-success {
+  border-color: #1a531d !important;
+}
+.border-obsidian-info {
+  border-color: #1b60b4 !important;
+}
+.border-obsidian-warning {
+  border-color: #d29e00 !important;
+}
+.border-obsidian-danger {
+  border-color: #712028 !important;
+}
+
 html,
 body {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   background-color: var(--bs-body-bg) !important;
   color: var(--bs-body-color) !important;
-  transition: background-color 0.3s ease, color 0.3s ease;
+  transition:
+    background-color 0.3s ease,
+    color 0.3s ease;
 }
 
 /* Ensure color-scheme is set for proper dark mode rendering */
@@ -61,7 +155,9 @@ a,
 .btn-link.nav-link:focus,
 .form-control:focus,
 .form-check-input:focus {
-  box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb;
+  box-shadow:
+    0 0 0 0.1rem white,
+    0 0 0 0.25rem #258cfb;
 }
 
 .content {
@@ -85,7 +181,8 @@ h1:focus {
 }
 
 .blazor-error-boundary {
-  background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=)
+  background:
+    url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=)
       no-repeat 1rem/1.8rem,
     #b32121;
   padding: 1rem 1rem 1rem 3.7rem;
diff --git a/5-Aquiis.Professional/wwwroot/apple-touch-icon.png b/5-Aquiis.Professional/wwwroot/apple-touch-icon.png
new file mode 100644
index 0000000..f62ca1f
Binary files /dev/null and b/5-Aquiis.Professional/wwwroot/apple-touch-icon.png differ
diff --git a/5-Aquiis.Professional/wwwroot/favicon-16x16.png b/5-Aquiis.Professional/wwwroot/favicon-16x16.png
new file mode 100644
index 0000000..609a738
Binary files /dev/null and b/5-Aquiis.Professional/wwwroot/favicon-16x16.png differ
diff --git a/5-Aquiis.Professional/wwwroot/favicon-32x32.png b/5-Aquiis.Professional/wwwroot/favicon-32x32.png
new file mode 100644
index 0000000..7ae6945
Binary files /dev/null and b/5-Aquiis.Professional/wwwroot/favicon-32x32.png differ
diff --git a/5-Aquiis.Professional/wwwroot/favicon.ico b/5-Aquiis.Professional/wwwroot/favicon.ico
new file mode 100644
index 0000000..9d5e16b
Binary files /dev/null and b/5-Aquiis.Professional/wwwroot/favicon.ico differ
diff --git a/6-Tests/Aquiis.Application.Tests/Services/PaymentServiceTests.cs b/6-Tests/Aquiis.Application.Tests/Services/PaymentServiceTests.cs
index 4cc310b..c9939dc 100644
--- a/6-Tests/Aquiis.Application.Tests/Services/PaymentServiceTests.cs
+++ b/6-Tests/Aquiis.Application.Tests/Services/PaymentServiceTests.cs
@@ -515,10 +515,10 @@ public async Task CreateAsync_PartialPayment_UpdatesInvoiceAmountPaid()
             // Act
             await _service.CreateAsync(payment);
 
-            // Assert - Check invoice updated but not marked as paid
+            // Assert - Check invoice updated with partial payment status
             var invoice = await _context.Invoices.FindAsync(_testInvoiceId);
             Assert.NotNull(invoice);
-            Assert.Equal("Pending", invoice.Status);
+            Assert.Equal("Paid Partial", invoice.Status);
             Assert.Equal(750, invoice.AmountPaid);
         }
 
diff --git a/6-Tests/Aquiis.Application.Tests/Workflows/ApplicationWorkflowService.EdgeCaseTests.cs b/6-Tests/Aquiis.Application.Tests/Workflows/ApplicationWorkflowService.EdgeCaseTests.cs
index 633f086..2721fe8 100644
--- a/6-Tests/Aquiis.Application.Tests/Workflows/ApplicationWorkflowService.EdgeCaseTests.cs
+++ b/6-Tests/Aquiis.Application.Tests/Workflows/ApplicationWorkflowService.EdgeCaseTests.cs
@@ -56,8 +56,8 @@ private static async Task<TestContext> CreateTestContextAsync()
         var org = new Organization { Id = orgId, Name = "TestOrg", OwnerId = testUserId, CreatedBy = testUserId, CreatedOn = DateTime.UtcNow };
         context.Organizations.Add(org);
         
-        // Add UserOrganization relationship so notifications can find users
-        var userOrg = new UserOrganization 
+        // Add OrganizationUser relationship so notifications can find users
+        var userOrg = new OrganizationUser 
         { 
             UserId = testUserId, 
             OrganizationId = orgId, 
@@ -65,7 +65,7 @@ private static async Task<TestContext> CreateTestContextAsync()
             CreatedBy = testUserId,
             CreatedOn = DateTime.UtcNow
         };
-        context.UserOrganizations.Add(userOrg);
+        context.OrganizationUsers.Add(userOrg);
         
         await context.SaveChangesAsync();
 
diff --git a/6-Tests/Aquiis.UI.Professional.Tests/NewSetupUITests.cs b/6-Tests/Aquiis.UI.Professional.Tests/NewSetupUITests.cs
index 37fa703..0a75d07 100644
--- a/6-Tests/Aquiis.UI.Professional.Tests/NewSetupUITests.cs
+++ b/6-Tests/Aquiis.UI.Professional.Tests/NewSetupUITests.cs
@@ -31,32 +31,38 @@ public async Task CreateNewAccount()
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Organization Name" }).ClickAsync();
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Organization Name" }).FillAsync("Aquiis");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Organization Name" }).PressAsync("Tab");
+        await Page.Locator("select[id='Input.State']").SelectOptionAsync(new[] { "TX" });
+        await Page.Locator("select[id='Input.State']").PressAsync("Tab");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "First Name" }).FillAsync("Solid");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "First Name" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Last Name" }).FillAsync("One");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Last Name" }).PressAsync("Tab");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password", Exact = true }).FillAsync("Today123");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password", Exact = true }).PressAsync("Tab");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Confirm Password" }).FillAsync("Today123");
         await Page.GetByRole(AriaRole.Button, new() { Name = "Register" }).ClickAsync();
 
-        await Page.WaitForSelectorAsync("h1:has-text('Register confirmation')");
+        // await Page.WaitForSelectorAsync("h1:has-text('Register confirmation')");
 
-        // await Page.GetByRole(AriaRole.Heading, new() { Name = "Register confirmation" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Click here to confirm your account" }).ClickAsync();
+        // // await Page.GetByRole(AriaRole.Heading, new() { Name = "Register confirmation" }).ClickAsync();
+        // await Page.GetByRole(AriaRole.Link, new() { Name = "Click here to confirm your account" }).ClickAsync();
 
-        await Page.WaitForSelectorAsync("h1:has-text('Confirm email')");
+        // await Page.WaitForSelectorAsync("h1:has-text('Confirm email')");
 
-        // await Page.GetByText("Thank you for confirming your").ClickAsync();
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Home" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+        // // await Page.GetByText("Thank you for confirming your").ClickAsync();
+        // await Page.GetByRole(AriaRole.Link, new() { Name = "Home" }).ClickAsync();
+        // await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
 
-        await Page.WaitForSelectorAsync("h1:has-text('Log in')");
+        // await Page.WaitForSelectorAsync("h1:has-text('Log in')");
 
-        // await Page.GetByRole(AriaRole.Heading, new() { Name = "Log in", Exact = true }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
+        // // await Page.GetByRole(AriaRole.Heading, new() { Name = "Log in", Exact = true }).ClickAsync();
+        // await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+        // await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+        // await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+        // await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+        // await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
 
         await Page.WaitForSelectorAsync("text=Dashboard");
 
@@ -88,19 +94,19 @@ public async Task AddProperty()
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., Apt 2B, Unit" }).PressAsync("Tab");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "City" }).FillAsync("New Orleans");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "City" }).PressAsync("Tab");
-        await Page.Locator("select[name=\"propertyModel.State\"]").SelectOptionAsync(new[] { "LA" });
-        await Page.Locator("select[name=\"propertyModel.State\"]").PressAsync("Tab");
+        await Page.Locator("select[name=\"Model.State\"]").SelectOptionAsync(new[] { "LA" });
+        await Page.Locator("select[name=\"Model.State\"]").PressAsync("Tab");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "#####-####" }).FillAsync("70119");
-        await Page.Locator("select[name=\"propertyModel.PropertyType\"]").SelectOptionAsync(new[] { "House" });
+        await Page.Locator("select[name=\"Model.PropertyType\"]").SelectOptionAsync(new[] { "House" });
         await Page.GetByPlaceholder("0.00").ClickAsync();
         await Page.GetByPlaceholder("0.00").FillAsync("1800");
-        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").ClickAsync();
-        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").FillAsync("4");
-        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").PressAsync("Tab");
-        await Page.Locator("input[name=\"propertyModel.Bathrooms\"]").FillAsync("4.5");
-        await Page.Locator("input[name=\"propertyModel.Bathrooms\"]").PressAsync("Tab");
-        await Page.Locator("input[name=\"propertyModel.SquareFeet\"]").FillAsync("2500");
-        await Page.Locator("input[name=\"propertyModel.SquareFeet\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"Model.Bedrooms\"]").ClickAsync();
+        await Page.Locator("input[name=\"Model.Bedrooms\"]").FillAsync("4");
+        await Page.Locator("input[name=\"Model.Bedrooms\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"Model.Bathrooms\"]").FillAsync("4.5");
+        await Page.Locator("input[name=\"Model.Bathrooms\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"Model.SquareFeet\"]").FillAsync("2500");
+        await Page.Locator("input[name=\"Model.SquareFeet\"]").PressAsync("Tab");
         await Page.GetByRole(AriaRole.Button, new() { Name = "Create Property" }).ClickAsync();
         
         // Verify property was created successfully
@@ -114,19 +120,19 @@ public async Task AddProperty()
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., Apt 2B, Unit" }).PressAsync("Tab");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "City" }).FillAsync("Los Angeles");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "City" }).PressAsync("Tab");
-        await Page.Locator("select[name=\"propertyModel.State\"]").SelectOptionAsync(new[] { "CA" });
-        await Page.Locator("select[name=\"propertyModel.State\"]").PressAsync("Tab");
+        await Page.Locator("select[name=\"Model.State\"]").SelectOptionAsync(new[] { "CA" });
+        await Page.Locator("select[name=\"Model.State\"]").PressAsync("Tab");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "#####-####" }).FillAsync("90210");
-        await Page.Locator("select[name=\"propertyModel.PropertyType\"]").SelectOptionAsync(new[] { "House" });
+        await Page.Locator("select[name=\"Model.PropertyType\"]").SelectOptionAsync(new[] { "House" });
         await Page.GetByPlaceholder("0.00").ClickAsync();
         await Page.GetByPlaceholder("0.00").FillAsync("4900");
-        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").ClickAsync();
-        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").FillAsync("4");
-        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").PressAsync("Tab");
-        await Page.Locator("input[name=\"propertyModel.Bathrooms\"]").FillAsync("4.5");
-        await Page.Locator("input[name=\"propertyModel.Bathrooms\"]").PressAsync("Tab");
-        await Page.Locator("input[name=\"propertyModel.SquareFeet\"]").FillAsync("3200");
-        await Page.Locator("input[name=\"propertyModel.SquareFeet\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"Model.Bedrooms\"]").ClickAsync();
+        await Page.Locator("input[name=\"Model.Bedrooms\"]").FillAsync("4");
+        await Page.Locator("input[name=\"Model.Bedrooms\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"Model.Bathrooms\"]").FillAsync("4.5");
+        await Page.Locator("input[name=\"Model.Bathrooms\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"Model.SquareFeet\"]").FillAsync("3200");
+        await Page.Locator("input[name=\"Model.SquareFeet\"]").PressAsync("Tab");
         await Page.GetByRole(AriaRole.Button, new() { Name = "Create Property" }).ClickAsync();
 
         // Verify property was created successfully
diff --git a/6-Tests/Aquiis.UI.Shared.Tests/Components/Layout/SharedMainLayoutTests.cs b/6-Tests/Aquiis.UI.Shared.Tests/Components/Layout/SharedMainLayoutTests.cs
index 0b32488..9dcaa56 100644
--- a/6-Tests/Aquiis.UI.Shared.Tests/Components/Layout/SharedMainLayoutTests.cs
+++ b/6-Tests/Aquiis.UI.Shared.Tests/Components/Layout/SharedMainLayoutTests.cs
@@ -132,7 +132,7 @@ public void SharedMainLayout_Has_Theme_Attribute()
         );
 
         // Assert
-        cut.Markup.Should().Contain("data-theme=\"dark\"");
+        cut.Markup.Should().Contain("data-bs-theme=\"dark\"");
     }
 
     [Fact]
diff --git a/6-Tests/Aquiis.UI.Shared.Tests/Features/Notifications/NotificationBellTests.cs b/6-Tests/Aquiis.UI.Shared.Tests/Features/Notifications/NotificationBellTests.cs
index e0b364a..ccdb355 100644
--- a/6-Tests/Aquiis.UI.Shared.Tests/Features/Notifications/NotificationBellTests.cs
+++ b/6-Tests/Aquiis.UI.Shared.Tests/Features/Notifications/NotificationBellTests.cs
@@ -1,4 +1,4 @@
-using Aquiis.UI.Shared.Features.Notifications;
+using Aquiis.UI.Shared.Components.Notifications;
 using Bunit;
 using FluentAssertions;
 using Xunit;
diff --git a/6-Tests/Aquiis.UI.Shared.Tests/Features/Notifications/NotificationCenterTests.cs b/6-Tests/Aquiis.UI.Shared.Tests/Features/Notifications/NotificationCenterTests.cs
index 63ec400..966eab7 100644
--- a/6-Tests/Aquiis.UI.Shared.Tests/Features/Notifications/NotificationCenterTests.cs
+++ b/6-Tests/Aquiis.UI.Shared.Tests/Features/Notifications/NotificationCenterTests.cs
@@ -1,4 +1,4 @@
-using Aquiis.UI.Shared.Features.Notifications;
+using Aquiis.UI.Shared.Components.Notifications;
 using Bunit;
 using FluentAssertions;
 using Xunit;
diff --git a/6-Tests/Aquiis.UI.Shared.Tests/Features/Notifications/NotificationPreferencesTests.cs b/6-Tests/Aquiis.UI.Shared.Tests/Features/Notifications/NotificationPreferencesTests.cs
index c729f26..33c9f1a 100644
--- a/6-Tests/Aquiis.UI.Shared.Tests/Features/Notifications/NotificationPreferencesTests.cs
+++ b/6-Tests/Aquiis.UI.Shared.Tests/Features/Notifications/NotificationPreferencesTests.cs
@@ -1,4 +1,4 @@
-using Aquiis.UI.Shared.Features.Notifications;
+using Aquiis.UI.Shared.Components.Notifications;
 using Bunit;
 using FluentAssertions;
 using Xunit;
diff --git a/6-Tests/Aquiis.UI.SimpleStart.Tests/NewSetupUITests.cs b/6-Tests/Aquiis.UI.SimpleStart.Tests/NewSetupUITests.cs
index 19d579b..6e84aac 100644
--- a/6-Tests/Aquiis.UI.SimpleStart.Tests/NewSetupUITests.cs
+++ b/6-Tests/Aquiis.UI.SimpleStart.Tests/NewSetupUITests.cs
@@ -31,32 +31,38 @@ public async Task CreateNewAccount()
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Organization Name" }).ClickAsync();
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Organization Name" }).FillAsync("Aquiis");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Organization Name" }).PressAsync("Tab");
+        await Page.Locator("select[id='Input.State']").SelectOptionAsync(new[] { "TX" });
+        await Page.Locator("select[id='Input.State']").PressAsync("Tab");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "First Name" }).FillAsync("Solid");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "First Name" }).PressAsync("Tab");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Last Name" }).FillAsync("One");
+        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Last Name" }).PressAsync("Tab");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password", Exact = true }).FillAsync("Today123");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password", Exact = true }).PressAsync("Tab");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "Confirm Password" }).FillAsync("Today123");
         await Page.GetByRole(AriaRole.Button, new() { Name = "Register" }).ClickAsync();
 
-        await Page.WaitForSelectorAsync("h1:has-text('Register confirmation')");
+        //await Page.WaitForSelectorAsync("h1:has-text('Register confirmation')");
 
         // await Page.GetByRole(AriaRole.Heading, new() { Name = "Register confirmation" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Click here to confirm your account" }).ClickAsync();
+        //await Page.GetByRole(AriaRole.Link, new() { Name = "Click here to confirm your account" }).ClickAsync();
 
-        await Page.WaitForSelectorAsync("h1:has-text('Confirm email')");
+        //await Page.WaitForSelectorAsync("h1:has-text('Confirm email')");
 
         // await Page.GetByText("Thank you for confirming your").ClickAsync();
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Home" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+        //await Page.GetByRole(AriaRole.Link, new() { Name = "Home" }).ClickAsync();
+        //await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
 
-        await Page.WaitForSelectorAsync("h1:has-text('Log in')");
+        //await Page.WaitForSelectorAsync("h1:has-text('Log in')");
 
         // await Page.GetByRole(AriaRole.Heading, new() { Name = "Log in", Exact = true }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
+        // await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+        // await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+        // await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+        // await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+        // await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
 
         await Page.WaitForSelectorAsync("text=Dashboard");
 
@@ -88,19 +94,19 @@ public async Task AddProperty()
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., Apt 2B, Unit" }).PressAsync("Tab");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "City" }).FillAsync("New Orleans");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "City" }).PressAsync("Tab");
-        await Page.Locator("select[name=\"propertyModel.State\"]").SelectOptionAsync(new[] { "LA" });
-        await Page.Locator("select[name=\"propertyModel.State\"]").PressAsync("Tab");
+        await Page.Locator("select[name=\"Model.State\"]").SelectOptionAsync(new[] { "LA" });
+        await Page.Locator("select[name=\"Model.State\"]").PressAsync("Tab");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "#####-####" }).FillAsync("70119");
-        await Page.Locator("select[name=\"propertyModel.PropertyType\"]").SelectOptionAsync(new[] { "House" });
+        await Page.Locator("select[name=\"Model.PropertyType\"]").SelectOptionAsync(new[] { "House" });
         await Page.GetByPlaceholder("0.00").ClickAsync();
         await Page.GetByPlaceholder("0.00").FillAsync("1800");
-        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").ClickAsync();
-        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").FillAsync("4");
-        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").PressAsync("Tab");
-        await Page.Locator("input[name=\"propertyModel.Bathrooms\"]").FillAsync("4.5");
-        await Page.Locator("input[name=\"propertyModel.Bathrooms\"]").PressAsync("Tab");
-        await Page.Locator("input[name=\"propertyModel.SquareFeet\"]").FillAsync("2500");
-        await Page.Locator("input[name=\"propertyModel.SquareFeet\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"Model.Bedrooms\"]").ClickAsync();
+        await Page.Locator("input[name=\"Model.Bedrooms\"]").FillAsync("4");
+        await Page.Locator("input[name=\"Model.Bedrooms\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"Model.Bathrooms\"]").FillAsync("4.5");
+        await Page.Locator("input[name=\"Model.Bathrooms\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"Model.SquareFeet\"]").FillAsync("2500");
+        await Page.Locator("input[name=\"Model.SquareFeet\"]").PressAsync("Tab");
         await Page.GetByRole(AriaRole.Button, new() { Name = "Create Property" }).ClickAsync();
         
         // Verify property was created successfully
@@ -114,19 +120,19 @@ public async Task AddProperty()
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., Apt 2B, Unit" }).PressAsync("Tab");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "City" }).FillAsync("Los Angeles");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "City" }).PressAsync("Tab");
-        await Page.Locator("select[name=\"propertyModel.State\"]").SelectOptionAsync(new[] { "CA" });
-        await Page.Locator("select[name=\"propertyModel.State\"]").PressAsync("Tab");
+        await Page.Locator("select[name=\"Model.State\"]").SelectOptionAsync(new[] { "CA" });
+        await Page.Locator("select[name=\"Model.State\"]").PressAsync("Tab");
         await Page.GetByRole(AriaRole.Textbox, new() { Name = "#####-####" }).FillAsync("90210");
-        await Page.Locator("select[name=\"propertyModel.PropertyType\"]").SelectOptionAsync(new[] { "House" });
+        await Page.Locator("select[name=\"Model.PropertyType\"]").SelectOptionAsync(new[] { "House" });
         await Page.GetByPlaceholder("0.00").ClickAsync();
         await Page.GetByPlaceholder("0.00").FillAsync("4900");
-        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").ClickAsync();
-        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").FillAsync("4");
-        await Page.Locator("input[name=\"propertyModel.Bedrooms\"]").PressAsync("Tab");
-        await Page.Locator("input[name=\"propertyModel.Bathrooms\"]").FillAsync("4.5");
-        await Page.Locator("input[name=\"propertyModel.Bathrooms\"]").PressAsync("Tab");
-        await Page.Locator("input[name=\"propertyModel.SquareFeet\"]").FillAsync("3200");
-        await Page.Locator("input[name=\"propertyModel.SquareFeet\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"Model.Bedrooms\"]").ClickAsync();
+        await Page.Locator("input[name=\"Model.Bedrooms\"]").FillAsync("4");
+        await Page.Locator("input[name=\"Model.Bedrooms\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"Model.Bathrooms\"]").FillAsync("4.5");
+        await Page.Locator("input[name=\"Model.Bathrooms\"]").PressAsync("Tab");
+        await Page.Locator("input[name=\"Model.SquareFeet\"]").FillAsync("3200");
+        await Page.Locator("input[name=\"Model.SquareFeet\"]").PressAsync("Tab");
         await Page.GetByRole(AriaRole.Button, new() { Name = "Create Property" }).ClickAsync();
 
         // Verify property was created successfully
@@ -134,273 +140,273 @@ public async Task AddProperty()
         await Expect(Page.GetByText("354 Maple Avenue").First).ToBeVisibleAsync();
     }
 
-    [Test, Order(3)]
-    public async Task AddProspect()
-    {
-        await Page.GotoAsync("http://localhost:5197/");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
-
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Add New Prospect" }).ClickAsync();
-
-        await Page.Locator("input[name=\"newProspect.FirstName\"]").ClickAsync();
-        await Page.Locator("input[name=\"newProspect.FirstName\"]").FillAsync("Mya");
-        await Page.Locator("input[name=\"newProspect.FirstName\"]").PressAsync("Tab");
-        await Page.Locator("input[name=\"newProspect.LastName\"]").ClickAsync();
-        await Page.Locator("input[name=\"newProspect.LastName\"]").FillAsync("Smith");
-        await Page.Locator("input[name=\"newProspect.LastName\"]").PressAsync("Tab");
-        await Page.Locator("input[name=\"newProspect.Email\"]").FillAsync("mya@gmail.com");
-        await Page.Locator("input[name=\"newProspect.Email\"]").PressAsync("Tab");
-        await Page.Locator("input[name=\"newProspect.Phone\"]").FillAsync("504-234-3600");
-        await Page.Locator("input[name=\"newProspect.Phone\"]").PressAsync("Tab");
-        await Page.Locator("input[name=\"newProspect.DateOfBirth\"]").FillAsync("1993-09-29");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., Driver's License #" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., Driver's License #" }).FillAsync("12345678");
-        await Page.Locator("select[name=\"newProspect.IdentificationState\"]").SelectOptionAsync(new[] { "LA" });
-        await Page.Locator("select[name=\"newProspect.Source\"]").SelectOptionAsync(new[] { "Zillow" });
-        await Page.Locator("select[name=\"newProspect.InterestedPropertyId\"]").SelectOptionAsync(new[] { "354 Maple Avenue" });
-        await Page.Locator("input[name=\"newProspect.DesiredMoveInDate\"]").FillAsync("2026-01-01");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Save Prospect" }).ClickAsync();
-
-         // Verify property was created successfully
-        await Page.WaitForSelectorAsync("h1:has-text('Prospective Tenants')");
-        await Expect(Page.GetByText("Mya Smith").First).ToBeVisibleAsync();
-    }
-
-    [Test, Order(4)]
-    public async Task ScheduleAndCompleteTour()
-    {
-        await Page.GotoAsync("http://localhost:5197/");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
-
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
-
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
-        await Page.GetByTitle("Schedule Tour").ClickAsync();
-
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
-
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Schedule Tour" }).ClickAsync();
-
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
-
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Complete Tour", Exact = true }).ClickAsync();
-
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
-
-        // await Page.GetByRole(AriaRole.Button, new() { Name = " Continue Editing" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).First.ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).Nth(1).ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).Nth(2).ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).Nth(3).ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).Nth(4).ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).Nth(5).ClickAsync();
-
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter value" }).First.ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter value" }).First.FillAsync("1800");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., $" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., $" }).FillAsync("1800");
-
-        await Page.Locator("div:nth-child(10) > .card-header > .btn").ClickAsync();
-        await Page.Locator("div:nth-child(11) > .card-header > .btn").ClickAsync();
-
-        await Page.GetByText("Interested", new() { Exact = true }).ClickAsync();
-
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Save Progress" }).ClickAsync();
-
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
-
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Mark as Complete" }).ClickAsync();
-
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
-
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Generate PDF" }).ClickAsync();
-
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
-
-        var page1 = await Page.RunAndWaitForPopupAsync(async () =>
-        {
-            await Page.GetByRole(AriaRole.Button, new() { Name = " View PDF" }).ClickAsync();
-        });
-
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
-
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Dashboard" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Logout" }).ClickAsync();
-    }
-
-    [Test, Order(5)]
-    public async Task SubmitApplication()
-    {
-        await Page.GotoAsync("http://localhost:5197/");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
-
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
-
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
-
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
-
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Apply" }).ClickAsync();
-
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
-
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Main St" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Main St" }).FillAsync("123 Main Street");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Main St" }).PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Los Angeles" }).FillAsync("Los Angeles");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Los Angeles" }).PressAsync("Tab");
-        await Page.Locator("select[name=\"applicationModel.CurrentState\"]").SelectOptionAsync(new[] { "CA" });
-        await Page.Locator("select[name=\"applicationModel.CurrentState\"]").PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "90210" }).FillAsync("90210");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "90210" }).PressAsync("Tab");
-        await Page.Locator("input[name=\"applicationModel.CurrentRent\"]").FillAsync("1500");
-        await Page.Locator("input[name=\"applicationModel.CurrentRent\"]").PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "John Smith" }).FillAsync("John Smith");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "John Smith" }).PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "(555) 123-" }).FillAsync("555-123-4567");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "(555) 123-" }).PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "ABC Company" }).PressAsync("CapsLock");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "ABC Company" }).FillAsync("ABC");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "ABC Company" }).PressAsync("CapsLock");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "ABC Company" }).FillAsync("ABC Company");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "ABC Company" }).PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Software Engineer" }).FillAsync("Software Engineer");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Software Engineer" }).PressAsync("Tab");
-        await Page.Locator("input[name=\"applicationModel.MonthlyIncome\"]").FillAsync("9600");
-        await Page.Locator("input[name=\"applicationModel.MonthlyIncome\"]").PressAsync("Tab");
-        await Page.Locator("input[name=\"applicationModel.EmploymentLengthMonths\"]").FillAsync("15");
-        await Page.Locator("input[name=\"applicationModel.EmploymentLengthMonths\"]").PressAsync("Tab");
-        await Page.Locator("input[name=\"applicationModel.Reference1Name\"]").FillAsync("Richard");
-        await Page.Locator("input[name=\"applicationModel.Reference1Name\"]").PressAsync("Tab");
-        await Page.Locator("input[name=\"applicationModel.Reference1Phone\"]").FillAsync("Zachary");
-        await Page.Locator("input[name=\"applicationModel.Reference1Phone\"]").PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Friend, Coworker, etc." }).FillAsync("Spouse");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Submit Application" }).ClickAsync();
-
-        // Verify property was created successfully
-        await Expect(Page.GetByText("Application submitted successfully")).ToBeVisibleAsync();
-
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
-
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
-
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
-
-        await Page.WaitForSelectorAsync("h1:has-text('Prospective Tenants')");
-
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Dashboard" }).ClickAsync();
+    // [Test, Order(3)]
+    // public async Task AddProspect()
+    // {
+    //     await Page.GotoAsync("http://localhost:5197/");
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
+
+    //     await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Add New Prospect" }).ClickAsync();
+
+    //     await Page.Locator("input[name=\"newProspect.FirstName\"]").ClickAsync();
+    //     await Page.Locator("input[name=\"newProspect.FirstName\"]").FillAsync("Mya");
+    //     await Page.Locator("input[name=\"newProspect.FirstName\"]").PressAsync("Tab");
+    //     await Page.Locator("input[name=\"newProspect.LastName\"]").ClickAsync();
+    //     await Page.Locator("input[name=\"newProspect.LastName\"]").FillAsync("Smith");
+    //     await Page.Locator("input[name=\"newProspect.LastName\"]").PressAsync("Tab");
+    //     await Page.Locator("input[name=\"newProspect.Email\"]").FillAsync("mya@gmail.com");
+    //     await Page.Locator("input[name=\"newProspect.Email\"]").PressAsync("Tab");
+    //     await Page.Locator("input[name=\"newProspect.Phone\"]").FillAsync("504-234-3600");
+    //     await Page.Locator("input[name=\"newProspect.Phone\"]").PressAsync("Tab");
+    //     await Page.Locator("input[name=\"newProspect.DateOfBirth\"]").FillAsync("1993-09-29");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., Driver's License #" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., Driver's License #" }).FillAsync("12345678");
+    //     await Page.Locator("select[name=\"newProspect.IdentificationState\"]").SelectOptionAsync(new[] { "LA" });
+    //     await Page.Locator("select[name=\"newProspect.Source\"]").SelectOptionAsync(new[] { "Zillow" });
+    //     await Page.Locator("select[name=\"newProspect.InterestedPropertyId\"]").SelectOptionAsync(new[] { "354 Maple Avenue" });
+    //     await Page.Locator("input[name=\"newProspect.DesiredMoveInDate\"]").FillAsync("2026-01-01");
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Save Prospect" }).ClickAsync();
+
+    //      // Verify property was created successfully
+    //     await Page.WaitForSelectorAsync("h1:has-text('Prospective Tenants')");
+    //     await Expect(Page.GetByText("Mya Smith").First).ToBeVisibleAsync();
+    // }
+
+    // [Test, Order(4)]
+    // public async Task ScheduleAndCompleteTour()
+    // {
+    //     await Page.GotoAsync("http://localhost:5197/");
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
+
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+    //     await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
+    //     await Page.GetByTitle("Schedule Tour").ClickAsync();
+
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Schedule Tour" }).ClickAsync();
+
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Complete Tour", Exact = true }).ClickAsync();
+
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+    //     // await Page.GetByRole(AriaRole.Button, new() { Name = " Continue Editing" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).First.ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).Nth(1).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).Nth(2).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).Nth(3).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).Nth(4).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Check All" }).Nth(5).ClickAsync();
+
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter value" }).First.ClickAsync();
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter value" }).First.FillAsync("1800");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., $" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "e.g., $" }).FillAsync("1800");
+
+    //     await Page.Locator("div:nth-child(10) > .card-header > .btn").ClickAsync();
+    //     await Page.Locator("div:nth-child(11) > .card-header > .btn").ClickAsync();
+
+    //     await Page.GetByText("Interested", new() { Exact = true }).ClickAsync();
+
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Save Progress" }).ClickAsync();
+
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Mark as Complete" }).ClickAsync();
+
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Generate PDF" }).ClickAsync();
+
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+    //     var page1 = await Page.RunAndWaitForPopupAsync(async () =>
+    //     {
+    //         await Page.GetByRole(AriaRole.Button, new() { Name = " View PDF" }).ClickAsync();
+    //     });
+
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+    //     await Page.GetByRole(AriaRole.Link, new() { Name = "Dashboard" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Logout" }).ClickAsync();
+    // }
+
+    // [Test, Order(5)]
+    // public async Task SubmitApplication()
+    // {
+    //     await Page.GotoAsync("http://localhost:5197/");
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
+
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+    //     await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
+
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Apply" }).ClickAsync();
+
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Main St" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Main St" }).FillAsync("123 Main Street");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Main St" }).PressAsync("Tab");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Los Angeles" }).FillAsync("Los Angeles");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Los Angeles" }).PressAsync("Tab");
+    //     await Page.Locator("select[name=\"applicationModel.CurrentState\"]").SelectOptionAsync(new[] { "CA" });
+    //     await Page.Locator("select[name=\"applicationModel.CurrentState\"]").PressAsync("Tab");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "90210" }).FillAsync("90210");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "90210" }).PressAsync("Tab");
+    //     await Page.Locator("input[name=\"applicationModel.CurrentRent\"]").FillAsync("1500");
+    //     await Page.Locator("input[name=\"applicationModel.CurrentRent\"]").PressAsync("Tab");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "John Smith" }).FillAsync("John Smith");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "John Smith" }).PressAsync("Tab");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "(555) 123-" }).FillAsync("555-123-4567");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "(555) 123-" }).PressAsync("Tab");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "ABC Company" }).PressAsync("CapsLock");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "ABC Company" }).FillAsync("ABC");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "ABC Company" }).PressAsync("CapsLock");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "ABC Company" }).FillAsync("ABC Company");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "ABC Company" }).PressAsync("Tab");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Software Engineer" }).FillAsync("Software Engineer");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Software Engineer" }).PressAsync("Tab");
+    //     await Page.Locator("input[name=\"applicationModel.MonthlyIncome\"]").FillAsync("9600");
+    //     await Page.Locator("input[name=\"applicationModel.MonthlyIncome\"]").PressAsync("Tab");
+    //     await Page.Locator("input[name=\"applicationModel.EmploymentLengthMonths\"]").FillAsync("15");
+    //     await Page.Locator("input[name=\"applicationModel.EmploymentLengthMonths\"]").PressAsync("Tab");
+    //     await Page.Locator("input[name=\"applicationModel.Reference1Name\"]").FillAsync("Richard");
+    //     await Page.Locator("input[name=\"applicationModel.Reference1Name\"]").PressAsync("Tab");
+    //     await Page.Locator("input[name=\"applicationModel.Reference1Phone\"]").FillAsync("Zachary");
+    //     await Page.Locator("input[name=\"applicationModel.Reference1Phone\"]").PressAsync("Tab");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Friend, Coworker, etc." }).FillAsync("Spouse");
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Submit Application" }).ClickAsync();
+
+    //     // Verify property was created successfully
+    //     await Expect(Page.GetByText("Application submitted successfully")).ToBeVisibleAsync();
+
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+    //     await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
+
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+    //     await Page.WaitForSelectorAsync("h1:has-text('Prospective Tenants')");
+
+    //     await Page.GetByRole(AriaRole.Link, new() { Name = "Dashboard" }).ClickAsync();
+
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Logout" }).ClickAsync();
+    // }
 
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
-
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Logout" }).ClickAsync();
-    }
-
-    [Test, Order(6)]
-    public async Task ApproveApplication()
-    {
-        await Page.GotoAsync("http://localhost:5197/");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
+    // [Test, Order(6)]
+    // public async Task ApproveApplication()
+    // {
+    //     await Page.GotoAsync("http://localhost:5197/");
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
        
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
 
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
 
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
 
-        await Page.GetByTitle("View Details").ClickAsync();
+    //     await Page.GetByTitle("View Details").ClickAsync();
 
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
 
-        await Page.GetByRole(AriaRole.Button, new() { Name = " View Application" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " View Application" }).ClickAsync();
 
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
 
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Collect Application Fee" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Combobox).SelectOptionAsync(new[] { "Online Payment" });
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Confirm Payment" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Collect Application Fee" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Combobox).SelectOptionAsync(new[] { "Online Payment" });
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Confirm Payment" }).ClickAsync();
 
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
 
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Initiate Screening" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Pass" }).First.ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Confirm Pass" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Pass" }).Nth(1).ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Confirm Pass" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Initiate Screening" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Pass" }).First.ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Confirm Pass" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Pass" }).Nth(1).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Confirm Pass" }).ClickAsync();
 
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Approve Application" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Approve Application" }).ClickAsync();
 
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
 
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Dashboard" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Logout" }).ClickAsync();
-    }
+    //     await Page.GetByRole(AriaRole.Link, new() { Name = "Dashboard" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Logout" }).ClickAsync();
+    // }
 
-    [Test]
-    public async Task GenerateLeaseOfferAndConvertToLease()
-    {
-        await Page.GotoAsync("http://localhost:5197/");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
-        await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
+    // [Test]
+    // public async Task GenerateLeaseOfferAndConvertToLease()
+    // {
+    //     await Page.GotoAsync("http://localhost:5197/");
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Sign In" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).FillAsync("owner1@aquiis.com");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Email" }).PressAsync("Tab");
+    //     await Page.GetByRole(AriaRole.Textbox, new() { Name = "Password" }).FillAsync("Today123");
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Log in" }).ClickAsync();
 
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
 
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Link, new() { Name = "Prospects" }).ClickAsync();
 
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
 
-        await Page.GetByTitle("View Details").ClickAsync();
+    //     await Page.GetByTitle("View Details").ClickAsync();
 
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
 
-        await Page.GetByRole(AriaRole.Button, new() { Name = " View Application" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " View Application" }).ClickAsync();
 
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
 
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Generate Lease Offer" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Generate Lease Offer" }).ClickAsync();
 
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
 
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Generate Lease Offer" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Generate Lease Offer" }).ClickAsync();
 
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
 
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Accept Offer (Convert to Lease" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Accept Offer (Convert to Lease" }).ClickAsync();
 
-        await Page.GetByRole(AriaRole.Combobox).SelectOptionAsync(new[] { "Online Payment" });
-        await Page.GetByRole(AriaRole.Button, new() { Name = " Accept & Create Lease" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Combobox).SelectOptionAsync(new[] { "Online Payment" });
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = " Accept & Create Lease" }).ClickAsync();
 
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
 
-        await Page.GetByRole(AriaRole.Link, new() { Name = "Dashboard" }).ClickAsync();
+    //     await Page.GetByRole(AriaRole.Link, new() { Name = "Dashboard" }).ClickAsync();
 
-        await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
+    //     await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
 
-        await Page.GetByRole(AriaRole.Button, new() { Name = "Logout" }).ClickAsync();
-    }
+    //     await Page.GetByRole(AriaRole.Button, new() { Name = "Logout" }).ClickAsync();
+    // }
 
 }
\ No newline at end of file