Fix subscription expiry logic and HTML entities in page titles

Subscription expiry (SubscriptionExpiryBackgroundService):
- Trials with no grace period now go directly Active -> Expired instead
  of briefly entering GracePeriod for a day, which was causing repeated
  'Grace Period Started' admin notification emails
- Remove redundant isTrial variable (query already filters to non-Stripe
  companies, so all processed companies are trials by definition)
- Save per-company inside the loop so a single SaveChangesAsync failure
  no longer discards all other companies' status changes and notification
  log entries (which was the other cause of repeated emails)

HTML entities in page titles (33 views):
- Replace – / — with plain ' - ' in ViewData["Title"] C#
  strings; Razor HTML-encodes these when rendering @ViewData["Title"],
  causing browsers to display the literal text '–' instead of a dash

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

src/PowderCoating.Web/BackgroundServices/SubscriptionExpiryBackgroundService.cs

@@ -67,9 +67,9 @@ public class SubscriptionExpiryBackgroundService : BackgroundService
     }
 
     /// <summary>
-    /// Opens a DI scope, queries non-Stripe-managed companies with active or grace-period subscriptions,
+    /// Opens a DI scope, queries non-Stripe-managed (trial) companies with active or grace-period
-    /// and calls <see cref="ProcessCompanyAsync"/> for each. A single <c>SaveChangesAsync</c> at the
+    /// subscriptions, and calls <see cref="ProcessCompanyAsync"/> for each. Each company is saved
-    /// end batches all status mutations into one round-trip. Errors are caught to keep the loop alive.
+    /// individually so a single failure does not prevent other companies from being updated.
     /// </summary>
     private async Task RunAsync(CancellationToken ct)
     {
@@ -103,15 +103,27 @@ public class SubscriptionExpiryBackgroundService : BackgroundService
 
             _logger.LogDebug("Found {Count} companies to evaluate.", companies.Count);
 
+            // All companies reaching this point have no StripeSubscriptionId — they are trials.
+            // Paid subscribers are managed by Stripe and filtered out above.
+            var effectiveGraceDays = gracePeriodAppliesToTrials ? gracePeriodDays : 0;
+
             foreach (var company in companies)
             {
                 if (ct.IsCancellationRequested) break;
-                var isTrial = string.IsNullOrEmpty(company.StripeSubscriptionId);
+                try
-                var effectiveGraceDays = isTrial && !gracePeriodAppliesToTrials ? 0 : gracePeriodDays;
+                {
-                await ProcessCompanyAsync(db, emailService, adminNotification, company, today, effectiveGraceDays, ct);
+                    await ProcessCompanyAsync(db, emailService, adminNotification, company, today, effectiveGraceDays, ct);
+                    await db.SaveChangesAsync(ct);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex,
+                        "Failed to process subscription expiry for company {Id} ({Name}). Status change was not persisted.",
+                        company.Id, company.CompanyName);
+                    // Clear EF tracked changes so bad state does not bleed into the next company.
+                    db.ChangeTracker.Clear();
+                }
             }
-
-            await db.SaveChangesAsync(ct);
         }
         catch (Exception ex)
         {
@@ -121,10 +133,15 @@ public class SubscriptionExpiryBackgroundService : BackgroundService
 
     /// <summary>
     /// Evaluates a single company and performs any required status transitions or reminder sends.
-    /// Transition logic: Active past end date → GracePeriod; GracePeriod past grace deadline → Expired + deactivated.
+    /// Transition logic:
+    /// <list type="bullet">
+    ///   <item>Active past end date, grace days = 0 → Expired + deactivated immediately (trials).</item>
+    ///   <item>Active past end date, grace days &gt; 0 → GracePeriod + grace-period email.</item>
+    ///   <item>GracePeriod past grace deadline → Expired + deactivated.</item>
+    /// </list>
     /// Reminder emails at <see cref="ReminderDays"/> offsets are sent only while the company is still Active.
-    /// Platform admin is notified asynchronously (fire-and-forget) for both grace period start and full expiry
+    /// Platform admin is notified asynchronously (fire-and-forget) so that operator action can be taken
-    /// so that operator action can be taken without delaying the main processing loop.
+    /// without delaying the main processing loop.
     /// </summary>
     private async Task ProcessCompanyAsync(
         ApplicationDbContext db,
@@ -153,35 +170,55 @@ public class SubscriptionExpiryBackgroundService : BackgroundService
             await WriteAuditLogAsync(db, company,
                 $"Auto-expired: grace period ended {gracePeriodDays} days after subscription end {endDate:d}.");
 
-            // Notify platform admin
             _ = adminNotification.NotifyCompanyExpiredAsync(
                 company.Id, company.CompanyName,
                 company.PrimaryContactEmail ?? string.Empty, expiredDate);
         }
         else if (company.SubscriptionStatus == SubscriptionStatus.Active && today > endDate)
         {
-            _logger.LogInformation(
+            if (gracePeriodDays == 0)
-                "Company {Id} ({Name}) subscription ended. Entering grace period.",
+            {
-                company.Id, company.CompanyName);
+                // No grace period configured — expire immediately without going through GracePeriod.
+                // Trials always land here since gracePeriodAppliesToTrials defaults to false.
+                _logger.LogInformation(
+                    "Company {Id} ({Name}) subscription ended with no grace period. Marking Expired and deactivating.",
+                    company.Id, company.CompanyName);
 
-            company.SubscriptionStatus = SubscriptionStatus.GracePeriod;
+                company.SubscriptionStatus = SubscriptionStatus.Expired;
-            company.UpdatedAt = DateTime.UtcNow;
+                company.IsActive = false;
-            company.UpdatedBy = "System";
+                company.UpdatedAt = DateTime.UtcNow;
+                company.UpdatedBy = "System";
 
-            await WriteAuditLogAsync(db, company,
+                await WriteAuditLogAsync(db, company,
-                $"Auto-moved to GracePeriod: subscription ended {endDate:d}. Grace period expires {expiredDate:d}.");
+                    $"Auto-expired: subscription ended {endDate:d} with no grace period.");
 
-            // Send "grace period started" email to company immediately
+                _ = adminNotification.NotifyCompanyExpiredAsync(
-            await SendEmailIfNotSentAsync(db, emailService, company, today,
+                    company.Id, company.CompanyName,
-                NotificationType.SubscriptionExpiryReminder,
+                    company.PrimaryContactEmail ?? string.Empty, endDate);
-                daysBeforeExpiry: 0,
+            }
-                gracePeriodDays,
+            else
-                ct);
+            {
+                _logger.LogInformation(
+                    "Company {Id} ({Name}) subscription ended. Entering {Days}-day grace period.",
+                    company.Id, company.CompanyName, gracePeriodDays);
 
-            // Notify platform admin
+                company.SubscriptionStatus = SubscriptionStatus.GracePeriod;
-            _ = adminNotification.NotifyCompanyGracePeriodAsync(
+                company.UpdatedAt = DateTime.UtcNow;
-                company.Id, company.CompanyName,
+                company.UpdatedBy = "System";
-                company.PrimaryContactEmail ?? string.Empty, expiredDate);
+
+                await WriteAuditLogAsync(db, company,
+                    $"Auto-moved to GracePeriod: subscription ended {endDate:d}. Grace period expires {expiredDate:d}.");
+
+                await SendEmailIfNotSentAsync(db, emailService, company, today,
+                    NotificationType.SubscriptionExpiryReminder,
+                    daysBeforeExpiry: 0,
+                    gracePeriodDays,
+                    ct);
+
+                _ = adminNotification.NotifyCompanyGracePeriodAsync(
+                    company.Id, company.CompanyName,
+                    company.PrimaryContactEmail ?? string.Empty, expiredDate);
+            }
         }
 
         // ── Reminder emails (only while still Active) ────────────────────

src/PowderCoating.Web/Controllers/InventoryController.cs

@@ -56,15 +56,16 @@ public class InventoryController : Controller
 
     /// <summary>
     /// Displays the paginated inventory list with optional keyword search, category filter,
-    /// and a low-stock quick-filter. When lowStockOnly is active the default sort switches
+    /// color family filter, and a low-stock quick-filter. When lowStockOnly is active the
-    /// to QuantityOnHand ascending so the most depleted items surface immediately. Stats
+    /// default sort switches to QuantityOnHand ascending so the most depleted items surface
-    /// (total value, active count, low-stock count) are computed directly on the DbSet
+    /// immediately. Stats (total value, active count, low-stock count) are computed directly
-    /// using aggregate SQL to avoid loading all rows into memory.
+    /// on the DbSet using aggregate SQL to avoid loading all rows into memory.
     /// </summary>
     public async Task<IActionResult> Index(
         string? searchTerm,
         string? category,
         string? location,
+        string? colorFamily,
         string? sortColumn,
         string sortDirection = "asc",
         bool lowStockOnly = false,
@@ -88,64 +89,35 @@ public class InventoryController : Controller
             };
             gridRequest.Validate();
 
-            // Build filter — compose search, category, location, and low-stock predicates
+            var hasSearch      = !string.IsNullOrWhiteSpace(searchTerm);
+            var hasCategory    = !string.IsNullOrWhiteSpace(category);
+            var hasLocation    = !string.IsNullOrWhiteSpace(location);
+            var hasColorFamily = !string.IsNullOrWhiteSpace(colorFamily);
+
+            var search   = searchTerm?.ToLower() ?? "";
+            var cat      = category ?? "";
+            var loc      = location ?? "";
+            var colorFam = colorFamily ?? "";
+
+            // Single composable predicate — EF Core evaluates the captured booleans as constants
+            // so inactive conditions fold to true and are omitted from the generated SQL WHERE clause.
             System.Linq.Expressions.Expression<Func<InventoryItem, bool>>? filter = null;
-
+            if (hasSearch || hasCategory || hasLocation || hasColorFamily || lowStockOnly)
-            var hasSearch   = !string.IsNullOrWhiteSpace(searchTerm);
+            {
-            var hasCategory = !string.IsNullOrWhiteSpace(category);
+                filter = i =>
-            var hasLocation = !string.IsNullOrWhiteSpace(location);
+                    (!lowStockOnly || (i.IsActive && i.QuantityOnHand <= i.ReorderPoint)) &&
-
+                    (!hasSearch || (i.SKU.ToLower().Contains(search) || i.Name.ToLower().Contains(search)
-            var search = searchTerm?.ToLower() ?? "";
-            var cat    = category ?? "";
-            var loc    = location ?? "";
-
-            if (lowStockOnly && hasSearch && hasLocation)
-                filter = i => i.IsActive && i.QuantityOnHand <= i.ReorderPoint
-                    && (i.Location != null && i.Location.ToLower() == loc.ToLower())
-                    && (i.SKU.ToLower().Contains(search) || i.Name.ToLower().Contains(search)
-                        || (i.ColorName != null && i.ColorName.ToLower().Contains(search))
-                        || (i.Manufacturer != null && i.Manufacturer.ToLower().Contains(search)));
-            else if (lowStockOnly && hasSearch)
-                filter = i => i.IsActive && i.QuantityOnHand <= i.ReorderPoint
-                    && (i.SKU.ToLower().Contains(search) || i.Name.ToLower().Contains(search)
-                        || (i.ColorName != null && i.ColorName.ToLower().Contains(search))
-                        || (i.Manufacturer != null && i.Manufacturer.ToLower().Contains(search)));
-            else if (lowStockOnly && hasLocation)
-                filter = i => i.IsActive && i.QuantityOnHand <= i.ReorderPoint
-                    && (i.Location != null && i.Location.ToLower() == loc.ToLower());
-            else if (lowStockOnly)
-                filter = i => i.IsActive && i.QuantityOnHand <= i.ReorderPoint;
-            else if (hasSearch && hasCategory && hasLocation)
-                filter = i => (i.SKU.ToLower().Contains(search) || i.Name.ToLower().Contains(search)
                         || (i.Description != null && i.Description.ToLower().Contains(search))
                         || (i.ColorName != null && i.ColorName.ToLower().Contains(search))
-                        || (i.Manufacturer != null && i.Manufacturer.ToLower().Contains(search)))
+                        || (i.Manufacturer != null && i.Manufacturer.ToLower().Contains(search)))) &&
-                    && i.Category.ToLower() == cat.ToLower()
+                    (!hasCategory || i.Category.ToLower() == cat.ToLower()) &&
-                    && (i.Location != null && i.Location.ToLower() == loc.ToLower());
+                    (!hasLocation || (i.Location != null && i.Location.ToLower() == loc.ToLower())) &&
-            else if (hasSearch && hasCategory)
+                    (!hasColorFamily || (i.ColorFamilies != null && (
-                filter = i => (i.SKU.ToLower().Contains(search) || i.Name.ToLower().Contains(search)
+                        i.ColorFamilies == colorFam ||
-                        || (i.Description != null && i.Description.ToLower().Contains(search))
+                        i.ColorFamilies.StartsWith(colorFam + ",") ||
-                        || (i.ColorName != null && i.ColorName.ToLower().Contains(search))
+                        i.ColorFamilies.EndsWith("," + colorFam) ||
-                        || (i.Manufacturer != null && i.Manufacturer.ToLower().Contains(search)))
+                        i.ColorFamilies.Contains("," + colorFam + ","))));
-                    && i.Category.ToLower() == cat.ToLower();
+            }
-            else if (hasSearch && hasLocation)
-                filter = i => (i.SKU.ToLower().Contains(search) || i.Name.ToLower().Contains(search)
-                        || (i.Description != null && i.Description.ToLower().Contains(search))
-                        || (i.ColorName != null && i.ColorName.ToLower().Contains(search))
-                        || (i.Manufacturer != null && i.Manufacturer.ToLower().Contains(search)))
-                    && (i.Location != null && i.Location.ToLower() == loc.ToLower());
-            else if (hasSearch)
-                filter = i => i.SKU.ToLower().Contains(search) || i.Name.ToLower().Contains(search)
-                    || (i.Description != null && i.Description.ToLower().Contains(search))
-                    || (i.ColorName != null && i.ColorName.ToLower().Contains(search))
-                    || (i.Manufacturer != null && i.Manufacturer.ToLower().Contains(search));
-            else if (hasCategory && hasLocation)
-                filter = i => i.Category.ToLower() == cat.ToLower()
-                    && (i.Location != null && i.Location.ToLower() == loc.ToLower());
-            else if (hasCategory)
-                filter = i => i.Category.ToLower() == cat.ToLower();
-            else if (hasLocation)
-                filter = i => i.Location != null && i.Location.ToLower() == loc.ToLower();
 
             // Build orderBy function
             Func<IQueryable<InventoryItem>, IOrderedQueryable<InventoryItem>> orderBy = gridRequest.SortColumn switch
@@ -179,6 +151,14 @@ public class InventoryController : Controller
             var allItems = (await _unitOfWork.InventoryItems.FindAsync(i => i.CompanyId == companyId)).ToList();
             ViewBag.Categories         = allItems.Select(i => i.Category).Where(c => c != null).Distinct().OrderBy(c => c).ToList();
             ViewBag.Locations          = allItems.Select(i => i.Location).Where(l => !string.IsNullOrWhiteSpace(l)).Distinct().OrderBy(l => l).ToList();
+            ViewBag.ColorFamilies      = allItems
+                .Where(i => !string.IsNullOrEmpty(i.ColorFamilies))
+                .SelectMany(i => i.ColorFamilies!.Split(',', StringSplitOptions.RemoveEmptyEntries))
+                .Select(f => f.Trim())
+                .Where(f => f.Length > 0)
+                .Distinct()
+                .OrderBy(f => f)
+                .ToList();
             ViewBag.StatsLowStockCount = allItems.Count(i => i.IsActive && i.QuantityOnHand <= i.ReorderPoint);
             ViewBag.StatsActiveCount   = allItems.Count(i => i.IsActive);
             ViewBag.StatsTotalValue    = allItems.Sum(i => (decimal?)i.QuantityOnHand * i.UnitCost) ?? 0m;
@@ -187,6 +167,7 @@ public class InventoryController : Controller
             ViewBag.SearchTerm   = searchTerm;
             ViewBag.Category     = category;
             ViewBag.Location     = location;
+            ViewBag.ColorFamily  = colorFamily;
             ViewBag.LowStockOnly = lowStockOnly;
             ViewBag.SortColumn   = gridRequest.SortColumn;
             ViewBag.SortDirection = gridRequest.SortDirection;

src/PowderCoating.Web/Controllers/VendorsController.cs

@@ -215,8 +215,23 @@ public class VendorsController : Controller
         try
         {
             var currentUser = await _userManager.GetUserAsync(User);
+            var companyId = currentUser!.CompanyId;
+
+            var duplicate = await _unitOfWork.Vendors.FirstOrDefaultAsync(
+                v => v.CompanyId == companyId && v.CompanyName.ToLower() == dto.CompanyName.ToLower());
+            if (duplicate != null)
+            {
+                var msg = $"A vendor named '{dto.CompanyName}' already exists.";
+                if (inline)
+                    return Json(new { success = false, errors = new[] { msg } });
+                ModelState.AddModelError(nameof(dto.CompanyName), msg);
+                await PopulateExpenseAccountsAsync();
+                await PopulateVendorCategoriesAsync(dto.CategoryIds);
+                return View(dto);
+            }
+
             var vendor = _mapper.Map<Vendor>(dto);
-            vendor.CompanyId = currentUser!.CompanyId;
+            vendor.CompanyId = companyId;
 
             if (dto.CategoryIds.Any())
             {

src/PowderCoating.Web/Views/Accounts/Ledger.cshtml

@@ -1,8 +1,8 @@
-@model PowderCoating.Application.DTOs.Accounting.AccountLedgerDto
+@model PowderCoating.Application.DTOs.Accounting.AccountLedgerDto
 @using PowderCoating.Core.Enums
 
 @{
-    ViewData["Title"] = $"Ledger — {Model.AccountNumber} {Model.Name}";
+    ViewData["Title"] = $"Ledger - {Model.AccountNumber} {Model.Name}";
     ViewData["PageIcon"] = "bi-journal-text";
     ViewData["PageHelpTitle"] = "Account Ledger";
     ViewData["PageHelpContent"] = "A chronological list of every transaction posted to this account. Click any Reference to open the source record. Debit increases asset and expense accounts; credit increases liability, equity, and revenue accounts. Use the date range or quick buttons (This Month, YTD, etc.) to narrow the view.";

src/PowderCoating.Web/Views/BankReconciliations/Report.cshtml

@@ -1,7 +1,7 @@
-@model PowderCoating.Core.Entities.BankReconciliation
+@model PowderCoating.Core.Entities.BankReconciliation
 @using PowderCoating.Web.Controllers
 @{
-    ViewData["Title"] = $"Reconciliation Report – {Model.Account?.Name}";
+    ViewData["Title"] = $"Reconciliation Report - {Model.Account?.Name}";
     var clearedDeposits = ViewBag.ClearedDeposits as IEnumerable<PowderCoating.Core.Entities.Payment> ?? Enumerable.Empty<PowderCoating.Core.Entities.Payment>();
     var clearedPayments = ViewBag.ClearedPayments as List<ReconciliationItem> ?? new();
 }

src/PowderCoating.Web/Views/Budgets/Edit.cshtml

@@ -1,8 +1,8 @@
-@using PowderCoating.Web.Controllers
+@using PowderCoating.Web.Controllers
 @model BudgetCreateVm
 
 @{
-    ViewData["Title"] = $"Edit Budget — {Model.Name}";
+    ViewData["Title"] = $"Edit Budget - {Model.Name}";
     ViewData["PageIcon"] = "bi-pencil";
     var months = new[] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
 }

src/PowderCoating.Web/Views/CompanySettings/EditTemplate.cshtml

@@ -1,6 +1,6 @@
-@model PowderCoating.Application.DTOs.Notification.NotificationTemplateDto
+@model PowderCoating.Application.DTOs.Notification.NotificationTemplateDto
 @{
-    ViewData["Title"] = $"Edit Template — {Model.DisplayName}";
+    ViewData["Title"] = $"Edit Template - {Model.DisplayName}";
     ViewData["PageIcon"] = "bi-envelope-gear";
     var placeholders = ViewBag.Placeholders as List<(string Placeholder, string Description)>
         ?? new List<(string, string)>();

src/PowderCoating.Web/Views/Customers/Statement.cshtml

@@ -1,6 +1,6 @@
-@model PowderCoating.Application.DTOs.Accounting.CustomerStatementDto
+@model PowderCoating.Application.DTOs.Accounting.CustomerStatementDto
 @{
-    ViewData["Title"] = $"Statement – {Model.CustomerName}";
+    ViewData["Title"] = $"Statement - {Model.CustomerName}";
 }
 
 <div class="d-flex justify-content-between align-items-start mb-4 flex-wrap gap-2">

src/PowderCoating.Web/Views/Inventory/Index.cshtml

@@ -124,8 +124,9 @@
 @{
     var lowStockOnly = (bool)(ViewBag.LowStockOnly ?? false);
     var activeLocation = ViewBag.Location as string;
+    var activeColorFamily = ViewBag.ColorFamily as string;
 }
-@if (!string.IsNullOrEmpty(ViewBag.SearchTerm) || !string.IsNullOrEmpty(ViewBag.Category) || !string.IsNullOrEmpty(activeLocation) || lowStockOnly)
+@if (!string.IsNullOrEmpty(ViewBag.SearchTerm) || !string.IsNullOrEmpty(ViewBag.Category) || !string.IsNullOrEmpty(activeLocation) || !string.IsNullOrEmpty(activeColorFamily) || lowStockOnly)
 {
     <div class="alert @(lowStockOnly ? "alert-warning" : "alert-info") alert-permanent d-flex justify-content-between align-items-center flex-wrap gap-2">
         <div>
@@ -149,6 +150,10 @@
                 {
                     <span> in bin "<strong>@activeLocation</strong>"</span>
                 }
+                @if (!string.IsNullOrEmpty(activeColorFamily))
+                {
+                    <span> in color family "<strong>@activeColorFamily</strong>"</span>
+                }
             }
         </div>
         <div class="d-flex gap-2 flex-wrap">
@@ -182,6 +187,16 @@
                             <option value="@cat" selected="@(cat == ViewBag.Category)">@cat</option>
                         }
                     </select>
+                    @if (((IEnumerable<string>)ViewBag.ColorFamilies).Any())
+                    {
+                        <select name="colorFamily" class="form-select" style="max-width: 160px; min-width: 120px;" onchange="this.form.submit()">
+                            <option value="">All Colors</option>
+                            @foreach (var family in ViewBag.ColorFamilies)
+                            {
+                                <option value="@family" selected="@(family == activeColorFamily)">@family</option>
+                            }
+                        </select>
+                    }
                     @if (((IEnumerable<string?>)ViewBag.Locations).Any())
                     {
                         <select name="location" class="form-select" style="max-width: 180px; min-width: 130px;" onchange="this.form.submit()">
@@ -215,7 +230,7 @@
     <div class="card-body p-0">
         @if (!Model.Items.Any())
         {
-            var isInventoryFiltered = !string.IsNullOrEmpty(ViewBag.SearchTerm as string) || !string.IsNullOrEmpty(ViewBag.Category as string) || lowStockOnly;
+            var isInventoryFiltered = !string.IsNullOrEmpty(ViewBag.SearchTerm as string) || !string.IsNullOrEmpty(ViewBag.Category as string) || !string.IsNullOrEmpty(activeColorFamily) || lowStockOnly;
             <div class="text-center py-5">
                 <i class="bi bi-inbox" style="font-size: 4rem; color: #d1d5db;"></i>
                 <h5 class="mt-3 text-muted">No inventory items found</h5>

src/PowderCoating.Web/Views/Inventory/Label.cshtml

@@ -1,6 +1,6 @@
-@model PowderCoating.Application.DTOs.Inventory.InventoryItemDto
+@model PowderCoating.Application.DTOs.Inventory.InventoryItemDto
 @{
-    ViewData["Title"] = $"Label — {Model.Name}";
+    ViewData["Title"] = $"Label - {Model.Name}";
     Layout = null; // standalone print page
 }
 <!DOCTYPE html>
@@ -95,6 +95,12 @@
             color: #333;
         }
 
+        .label-location {
+            font-size: 14px;
+            font-weight: 700;
+            color: #111;
+        }
+
         .label-scan-hint {
             font-size: 9px;
             color: #888;
@@ -158,6 +164,11 @@
             <div class="label-sku" style="color:#777">@Model.Manufacturer</div>
         }
 
+        @if (!string.IsNullOrEmpty(Model.Location))
+        {
+            <div class="label-location">Location: @Model.Location</div>
+        }
+
         <div class="label-scan-hint">
             Scan to log usage &bull; Powder Coating Logix
         </div>

src/PowderCoating.Web/Views/Inventory/Scan.cshtml

@@ -1,4 +1,4 @@
-@using PowderCoating.Application.DTOs.Inventory
+@using PowderCoating.Application.DTOs.Inventory
 @using PowderCoating.Web.Controllers
 @{
     var item = ViewBag.ItemDto as InventoryItemDto;
@@ -6,7 +6,7 @@
     var otherJobs = ViewBag.OtherJobs as List<ScanJobOption> ?? new();
     var preselectedJobId = ViewBag.PreselectedJobId as int?;
     var scanError = ViewBag.ScanError as string;
-    ViewData["Title"] = $"Log Usage &mdash; {item?.Name}";
+    ViewData["Title"] = $"Log Usage - {item?.Name}";
     Layout = null; // mobile-first standalone page
 }
 <!DOCTYPE html>

src/PowderCoating.Web/Views/Jobs/EditItems.cshtml

@@ -1,8 +1,8 @@
-@model PowderCoating.Application.DTOs.Job.JobEditItemsViewModel
+@model PowderCoating.Application.DTOs.Job.JobEditItemsViewModel
 @using PowderCoating.Core.Entities
 
 @{
-    ViewData["Title"] = $"Edit Items — {Model.JobNumber}";
+    ViewData["Title"] = $"Edit Items - {Model.JobNumber}";
     ViewData["PageIcon"] = "bi-list-check";
 }
 

src/PowderCoating.Web/Views/Jobs/Intake.cshtml

@@ -1,7 +1,7 @@
-@model (PowderCoating.Application.DTOs.Job.JobDto Job, PowderCoating.Application.DTOs.Job.IntakeJobDto Form)
+@model (PowderCoating.Application.DTOs.Job.JobDto Job, PowderCoating.Application.DTOs.Job.IntakeJobDto Form)
 
 @{
-    ViewData["Title"] = $"Part Intake — {Model.Job.JobNumber}";
+    ViewData["Title"] = $"Part Intake - {Model.Job.JobNumber}";
     ViewData["PageIcon"] = "bi-box-seam";
     var job = Model.Job;
     var form = Model.Form;

src/PowderCoating.Web/Views/PurchaseOrders/Receive.cshtml

@@ -1,8 +1,8 @@
-@using PowderCoating.Application.DTOs.PurchaseOrder
+@using PowderCoating.Application.DTOs.PurchaseOrder
 @model ReceivePurchaseOrderDto
 
 @{
-    ViewData["Title"] = $"Receive Goods — {ViewBag.PoNumber}";
+    ViewData["Title"] = $"Receive Goods - {ViewBag.PoNumber}";
     int poId = (int)ViewBag.PoId;
 }
 

src/PowderCoating.Web/Views/SetupWizard/Step1.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardStep1Dto
 @{
-    ViewData["Title"] = "Setup Wizard — Company Profile";
+    ViewData["Title"] = "Setup Wizard - Company Profile";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 1;
 }

src/PowderCoating.Web/Views/SetupWizard/Step10.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardStep9Dto
 @{
-    ViewData["Title"] = "Setup Wizard — Team Members";
+    ViewData["Title"] = "Setup Wizard - Team Members";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 10;
 }

src/PowderCoating.Web/Views/SetupWizard/Step11.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardStep6Dto
 @{
-    ViewData["Title"] = "Setup Wizard — Chart of Accounts";
+    ViewData["Title"] = "Setup Wizard - Chart of Accounts";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 11;
 }

src/PowderCoating.Web/Views/SetupWizard/Step12.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardStep10Dto
 @{
-    ViewData["Title"] = "Setup Wizard — Vendors & Suppliers";
+    ViewData["Title"] = "Setup Wizard - Vendors & Suppliers";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 12;
 }

src/PowderCoating.Web/Views/SetupWizard/Step13.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardStep8Dto
 @{
-    ViewData["Title"] = "Setup Wizard — Inventory / Powder Colors";
+    ViewData["Title"] = "Setup Wizard - Inventory / Powder Colors";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 13;
 }

src/PowderCoating.Web/Views/SetupWizard/Step14.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardOvensStepDto
 @{
-    ViewData["Title"] = "Setup Wizard — Equipment & Ovens";
+    ViewData["Title"] = "Setup Wizard - Equipment & Ovens";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 14;
 }

src/PowderCoating.Web/Views/SetupWizard/Step15.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardPricingTiersStepDto
 @{
-    ViewData["Title"] = "Setup Wizard — Pricing Tiers";
+    ViewData["Title"] = "Setup Wizard - Pricing Tiers";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 15;
 }

src/PowderCoating.Web/Views/SetupWizard/Step16.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardCatalogStepDto
 @{
-    ViewData["Title"] = "Setup Wizard — Service Catalog";
+    ViewData["Title"] = "Setup Wizard - Service Catalog";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 16;
 }

src/PowderCoating.Web/Views/SetupWizard/Step17.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardStep7Dto
 @{
-    ViewData["Title"] = "Setup Wizard — Notifications";
+    ViewData["Title"] = "Setup Wizard - Notifications";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 17;
 }

src/PowderCoating.Web/Views/SetupWizard/Step18.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardStep9Dto
 @{
-    ViewData["Title"] = "Setup Wizard — Team Members";
+    ViewData["Title"] = "Setup Wizard - Team Members";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 18;
 }

src/PowderCoating.Web/Views/SetupWizard/Step2.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardStep2QbDto
 @{
-    ViewData["Title"] = "Setup Wizard — QuickBooks Migration";
+    ViewData["Title"] = "Setup Wizard - QuickBooks Migration";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 2;
 }

src/PowderCoating.Web/Views/SetupWizard/Step3.cshtml

@@ -1,8 +1,8 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @using PowderCoating.Core.Enums
 @model WizardStep2Dto
 @{
-    ViewData["Title"] = "Setup Wizard — Operating Costs";
+    ViewData["Title"] = "Setup Wizard - Operating Costs";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 3;
 }

src/PowderCoating.Web/Views/SetupWizard/Step4.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardOvensStepDto
 @{
-    ViewData["Title"] = "Setup Wizard — Shop Equipment";
+    ViewData["Title"] = "Setup Wizard - Shop Equipment";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 4;
 }

src/PowderCoating.Web/Views/SetupWizard/Step5.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardStep3Dto
 @{
-    ViewData["Title"] = "Setup Wizard — Document Numbering";
+    ViewData["Title"] = "Setup Wizard - Document Numbering";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 5;
 }

src/PowderCoating.Web/Views/SetupWizard/Step6.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardStep5Dto
 @{
-    ViewData["Title"] = "Setup Wizard — Job Settings";
+    ViewData["Title"] = "Setup Wizard - Job Settings";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 6;
 }

src/PowderCoating.Web/Views/SetupWizard/Step7.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardStep4Dto
 @{
-    ViewData["Title"] = "Setup Wizard — Payment Terms";
+    ViewData["Title"] = "Setup Wizard - Payment Terms";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 7;
 }

src/PowderCoating.Web/Views/SetupWizard/Step8.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardPricingTiersStepDto
 @{
-    ViewData["Title"] = "Setup Wizard — Pricing Tiers";
+    ViewData["Title"] = "Setup Wizard - Pricing Tiers";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 8;
 }

src/PowderCoating.Web/Views/SetupWizard/Step9.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Application.DTOs.Wizard
+@using PowderCoating.Application.DTOs.Wizard
 @model WizardStep7Dto
 @{
-    ViewData["Title"] = "Setup Wizard — Notifications";
+    ViewData["Title"] = "Setup Wizard - Notifications";
     var progress = ViewBag.Progress as WizardProgressDto ?? new WizardProgressDto();
     int step = ViewBag.Step as int? ?? 5;
 }

src/PowderCoating.Web/Views/Shared/_KioskLayout.cshtml

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en" data-bs-theme="light">
 <head>
     <meta charset="utf-8" />

src/PowderCoating.Web/Views/Shared/_Pagination.cshtml

@@ -83,4 +83,12 @@
             </nav>
         </div>
     </div>
+    <script>
+        function changePageSize(size) {
+            var url = new URL(window.location.href);
+            url.searchParams.set('pageSize', size);
+            url.searchParams.set('pageNumber', '1');
+            window.location.href = url.toString();
+        }
+    </script>
 }

src/PowderCoating.Web/Views/StripeEvents/Details.cshtml

@@ -1,7 +1,7 @@
-@using PowderCoating.Core.Entities
+@using PowderCoating.Core.Entities
 @model StripeWebhookEvent
 @{
-    ViewData["Title"] = $"Webhook Event – {Model.EventId}";
+    ViewData["Title"] = $"Webhook Event - {Model.EventId}";
     var statusClass = Model.Status switch
     {
         StripeWebhookEventStatus.Processed => "success",

src/PowderCoating.Web/Views/SubscriptionManagement/Manage.cshtml

@@ -2,7 +2,7 @@
 @using PowderCoating.Core.Enums
 @model Company
 @{
-    ViewData["Title"] = $"Manage – {Model.CompanyName}";
+    ViewData["Title"] = $"Manage - {Model.CompanyName}";
     var planConfigs = (dynamic)ViewBag.PlanConfigs;
 
     string PlanName(int plan)

src/PowderCoating.Web/Views/Vendors/Statement.cshtml

@@ -1,6 +1,6 @@
-@model PowderCoating.Application.DTOs.Accounting.VendorStatementDto
+@model PowderCoating.Application.DTOs.Accounting.VendorStatementDto
 @{
-    ViewData["Title"] = $"Statement – {Model.VendorName}";
+    ViewData["Title"] = $"Statement - {Model.VendorName}";
 }
 
 <div class="d-flex justify-content-between align-items-start mb-4 flex-wrap gap-2">

src/PowderCoating.Web/wwwroot/css/company-settings-lookups.css

@@ -88,6 +88,20 @@
     border-bottom: 3px solid var(--bs-primary);
 }
 
+/* ── Dark mode fix for main settings tabs: UA button styling bleeds through
+   without an explicit background-color, producing white buttons with faint text. */
+[data-bs-theme="dark"] #settingsTabs .nav-link {
+    background-color: transparent;
+}
+
+[data-bs-theme="dark"] #settingsTabs .nav-link:hover:not(.active) {
+    background-color: var(--bs-tertiary-bg);
+}
+
+[data-bs-theme="dark"] #settingsTabs .nav-link.active {
+    background-color: var(--bs-body-bg);
+}
+
 /* ── PDF Templates inner tabs (card-header-tabs) ────────────────────────── */
 #pdfTemplateTabs .nav-link {
     color: var(--bs-secondary-color);