diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml
index 1b4d2bddd8..4eb0df8069 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml
@@ -22,7 +22,7 @@
             <h4>@L["AIPrompts"]</h4>
         </div>
         <div class="filter-search-action-bar_search-wrapper">
-            <input type="search" id="search-prompts" placeholder="Search" class="tbl-search">
+            <input type="search" id="search-prompts" placeholder="Search" aria-label="Search" class="tbl-search">
         </div>
         <div id="dynamicButtonContainerId" class="dynamic-buttons-div button-gap-1"></div>
     </div>
@@ -48,7 +48,7 @@
                 <div class="card-header version-editor-header py-2">
                     <div class="d-flex align-items-center gap-2 flex-wrap">
                         <strong id="versionEditorTitle" class="text-truncate me-1" style="max-width:160px;"></strong>
-                        <label class="mb-0 small text-muted">Version:</label>
+                        <label for="versionSelect" class="mb-0 small text-muted">Version:</label>
                         <select id="versionSelect" class="form-select form-select-sm version-select"></select>
                         <button id="newVersionBtn" class="btn btn-sm btn-outline-primary">
                             <i class="fa fa-plus"></i> New Version
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIPromptsWidget/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIPromptsWidget/Default.cshtml
index cdad35bf5e..c896fe8181 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIPromptsWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIPromptsWidget/Default.cshtml
@@ -5,7 +5,7 @@
 <div class="container-fluid px-0">
     <div class="action-bar p-2 filter-search-action-bar">
         <div class="filter-search-action-bar_search-wrapper">
-            <input type="search" id="search-prompts" placeholder="@L["Common:Search"]" class="tbl-search">
+            <input type="search" id="search-prompts" placeholder="@L["Common:Search"]" aria-label="@L["Common:Search"]" class="tbl-search">
         </div>
     </div>
     <div class="p-3 pt-0">
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/ScoresheetConfiguration/Index.cshtml b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/ScoresheetConfiguration/Index.cshtml
index cda677d651..dad300cb3f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/ScoresheetConfiguration/Index.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/ScoresheetConfiguration/Index.cshtml
@@ -30,7 +30,7 @@
                         <h4><b>Scoresheets</b></h4>
                         <div class="d-flex justify-content-end m-3">
                             <form id="form" name="form" action="/uploader" enctype="multipart/form-data" method="post">
-                                <input id="scoresheet_import_upload" name="scoresheet_import_upload" type="file" size="1" onchange="importScoresheetFile('scoresheet_import_upload');" style="display: none" />
+                                <input id="scoresheet_import_upload" name="scoresheet_import_upload" type="file" size="1" onchange="importScoresheetFile('scoresheet_import_upload');" aria-label="Import Scoresheet" style="display: none" />
                                 <abp-button text="Import Scoresheet"
                                             id="scoresheet_import_upload_btn"
                                             icon-type="Other"
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/WorksheetConfiguration/UpsertSectionModal.cshtml b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/WorksheetConfiguration/UpsertSectionModal.cshtml
index b1f3eeb3d8..f91ce5df33 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/WorksheetConfiguration/UpsertSectionModal.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/WorksheetConfiguration/UpsertSectionModal.cshtml
@@ -44,6 +44,7 @@
                                min="0" max="100" step="1"
                                value="@Model.FieldWidth"
                                style="width: 70px;"
+                               aria-label="Field width percentage"
                                oninput="onNumberInput(this.value)" />
                     </div>
                     <div class="d-flex align-items-center gap-2 mt-2">
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxGroupDefinitionWidget/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxGroupDefinitionWidget/Default.cshtml
index 40e498b845..e1f8e65e43 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxGroupDefinitionWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CheckboxGroupDefinitionWidget/Default.cshtml
@@ -45,8 +45,8 @@
         <th></th>
         </thead>
         <tr id="new-checkbox-row">
-            <td><input type="text" class="form-control" id="new-row-key" pattern="[a-zA-Z0-9 ]+" minlength="1" maxlength="60" placeholder="Key" /></td>
-            <td><input type="text" class="form-control" id="new-row-label" maxlength="100" placeholder="Label" /></td>
+            <td><input type="text" class="form-control" id="new-row-key" pattern="[a-zA-Z0-9 ]+" minlength="1" maxlength="60" placeholder="Key" aria-label="Key" /></td>
+            <td><input type="text" class="form-control" id="new-row-label" maxlength="100" placeholder="Label" aria-label="Label" /></td>
             <td class="new-row-actions">
                 <abp-button id="save-checkbox-option-btn" icon-type="Other" icon="fl fl-checkmark"
                             abp-tooltip="Confirm"
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridDefinitionWidget/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridDefinitionWidget/Default.cshtml
index f5aea8fcc3..397b557a8b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridDefinitionWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/DataGridDefinitionWidget/Default.cshtml
@@ -52,9 +52,9 @@
         <th></th>
         <th></th></thead>
         <tr id="new-column-row">
-            <td><input type="text" class="form-control" id="new-row-key" placeholder="Name" /></td>
+            <td><input type="text" class="form-control" id="new-row-key" placeholder="Name" aria-label="Name" /></td>
             <td>
-                <select class="form-control form-select" id="new-row-type" asp-items="@Model.SupportedFieldTypes"></select>
+                <select class="form-control form-select" id="new-row-type" asp-items="@Model.SupportedFieldTypes" aria-label="Type"></select>
             </td>
             <td class="new-row-actions">
                 <abp-button id="save-column-option-btn" icon-type="Other" icon="fl fl-checkmark"
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/ScoresheetConfiguration/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/ScoresheetConfiguration/Default.cshtml
index fabde53c6c..0a3aab55c5 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/ScoresheetConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/ScoresheetConfiguration/Default.cshtml
@@ -14,7 +14,7 @@
             <abp-column id="scoresheet-left-col" class="p-0 d-flex flex-column">
                 <div class="scoresheet-left-header">
                     <form id="scoresheet-import-form" name="scoresheet-import-form" action="/uploader" enctype="multipart/form-data" method="post" class="d-none">
-                        <input id="scoresheet_import_upload" name="scoresheet_import_upload" type="file" size="1" onchange="importScoresheetFile('scoresheet_import_upload');" />
+                        <input id="scoresheet_import_upload" name="scoresheet_import_upload" type="file" size="1" onchange="importScoresheetFile('scoresheet_import_upload');" aria-label="Import Scoresheet" />
                     </form>
                     <div class="d-flex justify-content-between align-items-center mb-3">
                         <h4 class="mb-0"><b>Scoresheets</b></h4>
@@ -34,7 +34,7 @@
                         </div>
                     </div>
                     <div class="scoresheet-filters d-flex gap-2 mb-2 align-items-center px-1">
-                        <input type="text" id="scoresheet-name-filter" class="form-control form-control-sm" placeholder="Filter by title or name..." />
+                        <input type="text" id="scoresheet-name-filter" class="form-control form-control-sm" placeholder="Filter by title or name..." aria-label="Filter by title or name" />
                         <fieldset class="btn-group btn-group-sm flex-shrink-0" id="scoresheet-published-toggle">
                             <legend class="visually-hidden">Scoresheet filter</legend>
                             <button type="button" class="btn btn-outline-secondary active" data-filter="all">All</button>
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/SelectListDefinitionWidget/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/SelectListDefinitionWidget/Default.cshtml
index 516be6f8f6..cf1ad644fa 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/SelectListDefinitionWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/SelectListDefinitionWidget/Default.cshtml
@@ -45,8 +45,8 @@
         <th></th>
         </thead>
         <tr id="new-selectlist-row">
-            <td><input type="text" class="form-control" id="new-row-key" minlength="1" maxlength="100" placeholder="Key" /></td>
-            <td><input type="text" class="form-control" id="new-row-label" minlength="1" maxlength="250" placeholder="Value" /></td>
+            <td><input type="text" class="form-control" id="new-row-key" minlength="1" maxlength="100" placeholder="Key" aria-label="Key" /></td>
+            <td><input type="text" class="form-control" id="new-row-label" minlength="1" maxlength="250" placeholder="Value" aria-label="Value" /></td>
             <td class="new-row-actions">
                 <abp-button id="save-selectlist-option-btn" icon-type="Other" icon="fl fl-checkmark"
                             abp-tooltip="Confirm"
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetConfiguration/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetConfiguration/Default.cshtml
index bde3e6c6f3..44b800c23b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetConfiguration/Default.cshtml
@@ -15,7 +15,7 @@
             <abp-column id="worksheet-left-col" class="p-0 d-flex flex-column">
                 <div class="worksheet-left-header">
                     <form id="form" name="form" action="/uploader" enctype="multipart/form-data" method="post" class="d-none">
-                        <input id="worksheet_import_upload" name="worksheet_import_upload" type="file" size="1" onchange="importWorksheetFile('worksheet_import_upload');" />
+                        <input id="worksheet_import_upload" name="worksheet_import_upload" type="file" size="1" onchange="importWorksheetFile('worksheet_import_upload');" aria-label="Import Worksheet" />
                     </form>
                     <div class="d-flex justify-content-between align-items-center mb-3">
                         <h4 class="mb-0"><b>Worksheets</b></h4>
@@ -33,7 +33,7 @@
                         </div>
                     </div>
                     <div class="worksheet-filters d-flex gap-2 mb-2 align-items-center px-1">
-                        <input type="text" id="worksheet-name-filter" class="form-control form-control-sm" placeholder="Filter by title or name..." />
+                        <input type="text" id="worksheet-name-filter" class="form-control form-control-sm" placeholder="Filter by title or name..." aria-label="Filter by title or name" />
                         <fieldset class="btn-group btn-group-sm flex-shrink-0" id="worksheet-published-toggle">
                             <legend class="visually-hidden">Published filter</legend>
                             <button type="button" class="btn btn-outline-secondary active" data-filter="all">All</button>
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/Index.cshtml b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/Index.cshtml
index 51e0555b49..95399c8d69 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/Index.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/Index.cshtml
@@ -38,7 +38,7 @@
         </div>
 
         <div class="filter-search-action-bar_search-wrapper">
-            <input type="search" id="search-roles" placeholder="Search" class="tbl-search">
+            <input type="search" id="search-roles" placeholder="Search" aria-label="Search" class="tbl-search">
         </div>
 
         <div class="btn-group" id="app_custom_buttons"></div>
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml
index 9b86a080f7..a1dd940807 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml
@@ -55,7 +55,7 @@
             <h4 id="PermissionRoleMatrixTitle">Permission-Role Matrix - @CurrentTenant.Name</h4>
         </div>
         <div class="filter-search-action-bar_search-wrapper">
-            <input type="search" id="search" placeholder="Search" class="tbl-search">
+            <input type="search" id="search" placeholder="Search" aria-label="Search" class="tbl-search">
         </div>
 
         <div class="btn-group" id="app_custom_buttons">
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/EditModal.cshtml b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/EditModal.cshtml
index e7fb61ddd3..478a316e7c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/EditModal.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/EditModal.cshtml
@@ -22,8 +22,8 @@
             <abp-tabs name="create-user-modal-tabs">
                 <abp-tab title="@L["UserInformations"].Value">
                     <div class="mt-3" >
-                        <input asp-for="UserInfo.Id" />
-                        <input asp-for="UserInfo.ConcurrencyStamp" />
+                        <input type="hidden" asp-for="UserInfo.Id" />
+                        <input type="hidden" asp-for="UserInfo.ConcurrencyStamp" />
                         <abp-input disabled readonly="true" asp-for="UserInfo.UserName" />
                         <abp-input disabled readonly="true" asp-for="UserInfo.Name" />
                         <abp-input disabled readonly="true" asp-for="UserInfo.Surname" />
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/Index.cshtml b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/Index.cshtml
index 37a9c8a2e3..e00d257dff 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/Index.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/Index.cshtml
@@ -38,7 +38,7 @@
         </div>
 
         <div class="filter-search-action-bar_search-wrapper">
-            <input type="search" id="search-users" placeholder="Search" class="tbl-search">
+            <input type="search" id="search-users" placeholder="Search" aria-label="Search" class="tbl-search">
         </div>
 
         <div class="btn-group" id="app_custom_buttons"></div>
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs
index 9cd659d376..d19c2b67bf 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/InvoiceService.cs
@@ -157,16 +157,21 @@ private async Task<string> GetLevel1DecisionUserNameAsync(
                     return string.Empty;
                 }
 
+                var fullName = $"{user.Name} {user.Surname}".Trim();
+
+                if(!string.IsNullOrWhiteSpace(fullName))
+                {
+                    return fullName.Length > 150 ? fullName[..150] : fullName;
+                }
+
                 if (!string.IsNullOrWhiteSpace(user.UserName))
                 {
                     return user.UserName;
                 }
 
-                var fullName = $"{user.Name} {user.Surname}".Trim();
+                return string.Empty;
+
 
-                return string.IsNullOrWhiteSpace(fullName)
-                    ? string.Empty
-                    : fullName;
             }
             catch (Exception ex)
             {
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js
index 7239d4cb53..61a8dbcb4a 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js
@@ -529,7 +529,8 @@ $(function () {
             }
         },
         onStateLoaded: function (dtApi, data) {
-            if (!initialLoad) {
+            if (!initialLoad && data) {
+                // A saved state was restored
                 isRestoringState = false;
                 dtApi.ajax.reload(null, false);
             }
@@ -539,9 +540,22 @@ $(function () {
         contextMenuActionsSelector: '[data-selector="batch-payment-table-actions"]'
     });
 
-    $('.grp-savedStates').text('Save View');
+    // Initialize savedStates button styling
     $('.grp-savedStates').closest('.btn-group').addClass('cstm-save-view');
 
+    // Update button text based on whether any named saved views exist.
+    // Driven by the StateRestore extension's own 'stateRestore-change' event (the same
+    // event it uses internally to update its default label) rather than a localStorage
+    // key guess or a one-shot draw handler - those raced against the extension's own
+    // loading of previously-saved states from storage on page refresh.
+    function updateSavedStatesButtonText() {
+        const savedStatesExist = dataTable.stateRestore.states().length > 0;
+        $('.grp-savedStates').text(savedStatesExist ? 'Saved States' : 'Save View');
+    }
+
+    dataTable.on('stateRestore-change', updateSavedStatesButtonText);
+    updateSavedStatesButtonText();
+
     dataTable.on('column-visibility.dt', function (e, settings, columnIdx) {
         try {
             const cols = dataTable.settings()[0].aoColumns;
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
index f238989357..063723ecef 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
@@ -168,7 +168,7 @@
         <!-- Action Bar -->
         <div class="action-bar p-2 filter-search-action-bar">
             <div class="filter-search-action-bar_search-wrapper">
-                <input type="search" id="search-report-config" placeholder="Search" class="tbl-search">
+                <input type="search" id="search-report-config" placeholder="Search" aria-label="Search" class="tbl-search">
             </div>
             <div class="d-flex align-items-center gap-2">
                 <div id="div-duplicate-keys-warning"
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/EndpointManagement/Endpoints/Index.cshtml b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/EndpointManagement/Endpoints/Index.cshtml
index 36a2d6ef6f..72fef437f2 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/EndpointManagement/Endpoints/Index.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/EndpointManagement/Endpoints/Index.cshtml
@@ -27,7 +27,7 @@
             <h4>Endpoint Management</h4>
         </div>
         <div class="filter-search-action-bar_search-wrapper">
-            <input type="search" id="search-endpoints" placeholder="Search" class="tbl-search">
+            <input type="search" id="search-endpoints" placeholder="Search" aria-label="Search" class="tbl-search">
         </div>
 
         <div class="btn-group" id="app_custom_buttons"></div>
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/AssignManagerModal.cshtml b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/AssignManagerModal.cshtml
index c4d7ecc3f4..77cfafd933 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/AssignManagerModal.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/AssignManagerModal.cshtml
@@ -19,8 +19,8 @@
     <abp-modal>
         <abp-modal-header title="@L["AssignManager"].Value"></abp-modal-header>
         <abp-modal-body>
-            <input asp-for="Tenant.Id" />
-            <input asp-for="Tenant.ConcurrencyStamp" />
+            <input type="hidden" asp-for="Tenant.Id" />
+            <input type="hidden" asp-for="Tenant.ConcurrencyStamp" />
             <abp-input asp-for="Tenant.Name" disabled label="@L["TenantName"].Value" readonly="true" />
 
             @foreach (ObjectExtensionPropertyInfo propertyInfo in ObjectExtensionManager.Instance.GetProperties<AssignManagerModalModel.AssignManagerInfoModel>().Where(p => !p.Name.EndsWith("_Text")))
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml
index 5b2b0a4142..1421d24d89 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml
@@ -17,16 +17,16 @@
     <abp-modal>
         <abp-modal-header title="@L["Edit"].Value"></abp-modal-header>
         <abp-modal-body>
-            <input asp-for="Tenant.Id" />
-            <input asp-for="Tenant.ConcurrencyStamp" />
+            <input type="hidden" asp-for="Tenant.Id" />
+            <input type="hidden" asp-for="Tenant.ConcurrencyStamp" />
             <abp-input asp-for="Tenant.Name" label="@L["TenantName"].Value" />
             <abp-input asp-for="Tenant.Division" label="Division" />
             <abp-input asp-for="Tenant.Branch" label="Branch" />
             <abp-input asp-for="Tenant.Description" label="Description" />
 
             <div class="form-group">
-                <label for="Tenant_ClientCode">CAS Client Code</label>
-                <select asp-for="Tenant.CasClientCode" class="form-control cas-client-select" 
+                <label for="Tenant_CasClientCode">CAS Client Code</label>
+                <select asp-for="Tenant.CasClientCode" id="Tenant_CasClientCode" class="form-control cas-client-select"
                         data-ministry-target="#selected-ministry">
                     <option value="">Select a Client Code</option>
                     @foreach (var option in Model.CasClientOptions)
diff --git a/applications/Unity.GrantManager/sonar-project.properties b/applications/Unity.GrantManager/sonar-project.properties
index ef578dfb60..dd79cd7e17 100644
--- a/applications/Unity.GrantManager/sonar-project.properties
+++ b/applications/Unity.GrantManager/sonar-project.properties
@@ -12,11 +12,28 @@ sonar.projectDescription=Grant management application for the Province of Britis
 sonar.sources=src,modules
 sonar.tests=test
 
-# Quality gate settings (from Azure SonarQube)
+# Quality gate settings
 sonar.qualitygate.wait=true
 
-# SonarQube Exclusions (from existing Azure configuration)
-sonar.exclusions=src/Unity.GrantManager.EntityFrameworkCore/Migrations/**,modules/Unity.Payments/src/Unity.Payments.Web/Pages/BatchPayments/Index.js,src/Unity.GrantManager.EntityFrameworkCore/Scripts/**,**/bin/**,**/obj/**,**/wwwroot/lib/**,**/*.Designer.cs,**/node_modules/**
+# SonarQube Exclusions (generic build artifacts and generated code only)
+sonar.exclusions=src/Unity.GrantManager.EntityFrameworkCore/Migrations/**,src/Unity.GrantManager.EntityFrameworkCore/Scripts/**,**/bin/**,**/obj/**,**/wwwroot/lib/**,**/*.Designer.cs,**/node_modules/**
+
+# Rule exclusion: javascript:S7721 "Functions should be moved to the highest possible scope"
+# Disabled project-wide for JS. ABP renders pages by composing many independent widgets,
+# and dynamically bundles each widget's scripts together onto whatever page happens to
+# host them, at runtime. Widgets have no visibility into what else will be on the same
+# page, so the established, intentional pattern across this codebase is to nest each
+# widget's helper functions inside its own $(function(){...}) DOM-ready handler, using
+# that nesting as the widget's isolation boundary against same-named helpers in other
+# widgets (e.g. formatItems, responseCallback, updatePreview are common names reused
+# across many widgets). S7721 pushes these helpers up to module/global scope, which
+# breaks that isolation and creates real cross-widget name collisions that the rule
+# has no way to detect, since it only ever sees one file at a time. This has already
+# caused a production bug (two widgets bundled onto the same page silently overwrote
+# each other's same-named global function). Keep the nesting.
+sonar.issue.ignore.multicriteria=e1
+sonar.issue.ignore.multicriteria.e1.ruleKey=javascript:S7721
+sonar.issue.ignore.multicriteria.e1.resourceKey=**/*.js
 
 # Test exclusions
 sonar.test.exclusions=**/bin/**,**/obj/**
@@ -24,7 +41,7 @@ sonar.test.exclusions=**/bin/**,**/obj/**
 # Coverage analysis explicitly disabled (excludes all files from coverage)
 sonar.coverage.exclusions=**/*
 
-# Code duplication exclusions (from existing Azure configuration + all files)
+# Code duplication exclusions
 sonar.cpd.exclusions=**/*.aspx,**/*.aspx.designer.cs,**/*.cshtml,**/*.html,**/*.js,**/*
 
 # SCM settings
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerDefaultTenantSeederContributor.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerDefaultTenantSeederContributor.cs
index c817bed8ca..018f65c58f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerDefaultTenantSeederContributor.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/GrantManagerDefaultTenantSeederContributor.cs
@@ -83,7 +83,7 @@ private async Task SeedOnboardingTenantAsync()
                     // "Unity.Onboarding" = SpecializationConsts.Onboarding; "T" = TenantFeatureValueProvider.ProviderName
                     await _featureManager.SetAsync(
                         "Unity.Onboarding",
-                        "true",
+                        "True",
                         "T",
                         newTenant.Id.ToString());
                 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Index.js
index 041ac4eaff..46c9c51dd3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Index.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Index.js
@@ -650,9 +650,22 @@ $(function () {
     });
 
     // For savedStates
-    $('.grp-savedStates').text('Save View');
+    // Initialize button styling
     $('.grp-savedStates').closest('.btn-group').addClass('cstm-save-view');
 
+    // Update button text based on whether any named saved views exist.
+    // Driven by the StateRestore extension's own 'stateRestore-change' event (the same
+    // event it uses internally to update its default label) rather than a localStorage
+    // key guess or a one-shot draw handler - those raced against the extension's own
+    // loading of previously-saved states from storage on page refresh.
+    function updateSavedStatesButtonText() {
+        const savedStatesExist = dataTable.stateRestore.states().length > 0;
+        $('.grp-savedStates').text(savedStatesExist ? 'Saved States' : 'Save View');
+    }
+
+    dataTable.on('stateRestore-change', updateSavedStatesButtonText);
+    updateSavedStatesButtonText();
+
     // Subscribe to refresh events
     PubSub.subscribe('refresh_applicant_list', (msg, data) => {
         dataTable.ajax.reload(null, false);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.cshtml
index 433e35701a..663bf9772b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.cshtml
@@ -30,7 +30,7 @@
             <h4>@L["ApplicationForms"]</h4>
         </div>
         <div class="search-action-bar_search-wrapper">
-            <input type="search" id="search-forms" placeholder="Search" class="tbl-search">
+            <input type="search" id="search-forms" placeholder="Search" aria-label="Search" class="tbl-search">
         </div>
 
         <div class="btn-group" id="app_custom_buttons"></div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
index ca9ed8bfca..4d20a2bf76 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
@@ -356,7 +356,7 @@
             <abp-modal-header title="Edit Mapping JSON"></abp-modal-header>
         <abp-modal-body>
             <textarea id="jsonText" rows="15"
-                cols="80">@Model?.ApplicationFormVersionDto?.SubmissionHeaderMapping</textarea>
+                cols="80" aria-label="Mapping JSON">@Model?.ApplicationFormVersionDto?.SubmissionHeaderMapping</textarea>
         </abp-modal-body>
         <abp-modal-footer>
             <abp-button id="btn-save-mapping" text="Save Mapping JSON" icon-type="Other"
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTagsSelectionModal.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTagsSelectionModal.cshtml
index 4db55d8ef0..f26af4d6a6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTagsSelectionModal.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationTags/ApplicationTagsSelectionModal.cshtml
@@ -25,7 +25,7 @@
         else
         {
             <div>
-                <input type="text" id="SelectedTags" asp-for="@Model.SelectedTags" />
+                <input type="text" id="SelectedTags" asp-for="@Model.SelectedTags" aria-label="Selected Tags" />
 
                 <input type="hidden" id="SelectedTagsJson" name="SelectedTagsJson" />
                 <abp-input type="hidden" id="SelectedApplicationIds" asp-for="@Model.SelectedApplicationIds" />
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml
index d94f3f4ba3..2636b8fc95 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ConfigurationManagement/Index.cshtml
@@ -139,7 +139,7 @@
                                         <h4>Account Codes</h4>
                                     </div>
                                     <div class="filter-search-action-bar_search-wrapper">
-                                        <input type="search" id="search-data-table" placeholder="Search" class="tbl-search">
+                                        <input type="search" id="search-data-table" placeholder="Search" aria-label="Search" class="tbl-search">
                                     </div>
                                     <div class="btn-group" id="app_custom_buttons"></div>
                                     <div id="dynamicButtonContainerId" class="dynamic-buttons-div button-gap-1"></div>
@@ -161,7 +161,7 @@
                                 </abp-row>
                                 <abp-row>
                                     <abp-column size="_12" class="p-3">
-                                        <span class="form-label">Payment ID Prefix</span>
+                                        <label for="payment-id-prefix" class="form-label">Payment ID Prefix</label>
                                         <input id="payment-id-prefix-original" type="hidden" value="@Model.PaymentIdPrefix">
                                         <input id="payment-id-prefix" maxlength="5" type="text" value="@Model.PaymentIdPrefix" class="valid form-control">
                                     </abp-column>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
index cceadeda4c..eef2868ee3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
@@ -329,7 +329,7 @@
 
                         <div class="d-flex justify-content-end m-3">
                             <form id="form" name="form" action="/uploader" enctype="multipart/form-data" method="post">
-                                <input id="assessment_upload" name="assessment_upload" type="file" size="1" multiple onchange="uploadAssessmentFiles('assessment_upload');" style="display: none" />
+                                <input id="assessment_upload" name="assessment_upload" type="file" size="1" multiple onchange="uploadAssessmentFiles('assessment_upload');" aria-label="Add Attachments" style="display: none" />
                                 <abp-button text="Add Attachments"
                                             id="assessment_upload_btn"
                                             class="assessment-upload-btn"
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js
index 442ec9b777..70524e66f9 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js
@@ -520,9 +520,22 @@ $(function () {
     });
 
     //For savedStates
-    $('.grp-savedStates').text('Save View');
+    // Initialize button styling
     $('.grp-savedStates').closest('.btn-group').addClass('cstm-save-view');
 
+    // Update button text based on whether any named saved views exist.
+    // Driven by the StateRestore extension's own 'stateRestore-change' event (the same
+    // event it uses internally to update its default label) rather than a localStorage
+    // key guess or a one-shot draw handler - those raced against the extension's own
+    // loading of previously-saved states from storage on page refresh.
+    function updateSavedStatesButtonText() {
+        const savedStatesExist = dataTable.stateRestore.states().length > 0;
+        $('.grp-savedStates').text(savedStatesExist ? 'Saved States' : 'Save View');
+    }
+
+    dataTable.on('stateRestore-change', updateSavedStatesButtonText);
+    updateSavedStatesButtonText();
+
     // Helper function to restore custom filters when loading table views.
     function restoreCustomFilters(filters) {
         UIElements.searchField.val(filters.searchValue || '');
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.cshtml
index 71b133178a..9a75c7e436 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.cshtml
@@ -28,7 +28,7 @@
             <h4>@L["GrantPrograms"]</h4>
         </div>
         <div class="filter-search-action-bar_search-wrapper">
-            <input type="search" id="search-grant-programs" placeholder="Search" class="tbl-search">
+            <input type="search" id="search-grant-programs" placeholder="Search" aria-label="Search" class="tbl-search">
         </div>
 
         <div class="btn-group" id="app_custom_buttons"></div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.cshtml
index 0df238eae8..2c5dd6875c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.cshtml
@@ -25,7 +25,7 @@
             <h4>@L["Intakes"]</h4>
         </div>
         <div class="filter-search-action-bar_search-wrapper">
-            <input type="search" id="search-intakes" placeholder="Search" class="tbl-search">
+            <input type="search" id="search-intakes" placeholder="Search" aria-label="Search" class="tbl-search">
         </div>
 
         <div class="btn-group" id="app_custom_buttons"></div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.cshtml
index 557fb5bb3f..1ade8b64cd 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.cshtml
@@ -29,7 +29,7 @@
             <h4>Payment History</h4>
         </div>
         <div class="search-action-bar_search-wrapper">
-            <input type="search" id="search-payment-history" placeholder="Search" class="tbl-search">
+            <input type="search" id="search-payment-history" placeholder="Search" aria-label="Search" class="tbl-search">
         </div>
 
         <div class="btn-group" id="app_custom_buttons"></div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml
index 274ae5d1a7..fa4b64e81d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ActionBar/Default.cshtml
@@ -15,7 +15,7 @@
 
 <div class="action-bar p-2 search-action-bar">
     <div class="search-action-bar_search-wrapper">
-        <input type="search" id="search" placeholder="Search" class="tbl-search">
+        <input type="search" id="search" placeholder="Search" aria-label="Search" class="tbl-search">
         <div class="mb-3 date-input-filter-div">
             <label class="form-label" for="quickDateRange">Quick Date Range</label>
             <select id="quickDateRange" class="form-control quick-date-input">
@@ -30,7 +30,7 @@
         </div>
         <div class="mb-3 custom-date-range-container-div" id="customDateInputs" style="display: none;">
             <div class="mb-3 date-input-filter-div">
-                <label class="form-label" for="SubmittedFromDate">Submission Date From</label>
+                <label class="form-label" for="submittedFromDate">Submission Date From</label>
                 <input   
                     abp-data-datepicker="false"              
                     type="date"
@@ -42,7 +42,7 @@
                     max="2100-01-01">
             </div>
             <div class="mb-3 date-input-filter-div">
-                <label class="form-label" for="SubmittedToDate">Submission Date To</label>
+                <label class="form-label" for="submittedToDate">Submission Date To</label>
                 <input
                     abp-data-datepicker="false" 
                     type="date"
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAttachments/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAttachments/Default.cshtml
index 1d285558e3..269ad32600 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAttachments/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantAttachments/Default.cshtml
@@ -16,7 +16,7 @@
 </div>
 <div class="d-flex justify-content-end m-3">
     <form id="form" name="form" action="/uploader" enctype="multipart/form-data" method="post">
-        <input id="applicant_attachment_upload" name="applicant_attachment_upload" type="file" size="1" multiple onchange="uploadApplicantFiles('applicant_attachment_upload');" style="display: none" />
+        <input id="applicant_attachment_upload" name="applicant_attachment_upload" type="file" size="1" multiple onchange="uploadApplicantFiles('applicant_attachment_upload');" aria-label="Add Attachments" style="display: none" />
         <abp-button text="Add Attachments"
                     id="applicant_attachment_upload_btn"
                     icon-type="Other"
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.cshtml
index e0c080e325..540cea5163 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.cshtml
@@ -30,7 +30,7 @@
                 <span class="history-section__subtitle">Previous Funding History</span>
             </div>
             <div class="history-section__toolbar">
-                <input type="search" id="funding-history-search" class="tbl-search" placeholder="Search" />
+                <input type="search" id="funding-history-search" class="tbl-search" placeholder="Search" aria-label="Search Funding History" />
                 <div id="fundingHistoryDynamicButtons" class="dynamic-buttons-div button-gap-1"></div>
             </div>
             <abp-table id="FundingHistoryTable" hoverable-rows="true" class="w-100"></abp-table>
@@ -38,7 +38,7 @@
             <div class="mt-3">
                 <label class="form-label fw-bold">Previous Funding Notes</label>
                 <br/>
-                <label class="form-label">Additional Comments</label>
+                <label class="form-label" for="FundingHistoryComments">Additional Comments</label>
                 <textarea id="FundingHistoryComments"
                           name="FundingHistoryComments"
                           class="form-control"
@@ -55,7 +55,7 @@
                 <span class="history-section__subtitle">Previous Issues</span>
             </div>
             <div class="history-section__toolbar">
-                <input type="search" id="issue-tracking-search" class="tbl-search" placeholder="Search" />
+                <input type="search" id="issue-tracking-search" class="tbl-search" placeholder="Search" aria-label="Search Issue Tracking" />
                 <div id="issueTrackingDynamicButtons" class="dynamic-buttons-div button-gap-1"></div>
             </div>
             <abp-table id="IssueTrackingTable" hoverable-rows="true" class="w-100"></abp-table>
@@ -63,7 +63,7 @@
             <div class="mt-3">
                 <label class="form-label fw-bold">Issue Notes</label>
                 <br/>
-                <label class="form-label">Additional Comments</label>
+                <label class="form-label" for="IssueTrackingComments">Additional Comments</label>
                 <textarea id="IssueTrackingComments"
                           name="IssueTrackingComments"
                           class="form-control"
@@ -77,7 +77,7 @@
                 <h6 class="fw-bold mb-0">Audit History</h6>
             </div>
             <div class="history-section__toolbar">
-                <input type="search" id="audit-history-search" class="tbl-search" placeholder="Search" />
+                <input type="search" id="audit-history-search" class="tbl-search" placeholder="Search" aria-label="Search Audit History" />
                 <div id="auditHistoryDynamicButtons" class="dynamic-buttons-div button-gap-1"></div>
             </div>
             <abp-table id="AuditHistoryTable" hoverable-rows="true" class="w-100"></abp-table>
@@ -85,7 +85,7 @@
             <div class="mt-3">
                 <label class="form-label fw-bold">Audit History Notes</label>
                 <br/>
-                <label class="form-label">Additional Comments</label>
+                <label class="form-label" for="AuditComments">Additional Comments</label>
                 <textarea id="AuditComments"
                           name="AuditComments"
                           class="form-control"
@@ -102,7 +102,7 @@
                 <span class="history-section__subtitle">Reports Notes</span>
             </div>
             <div class="history-section__toolbar">
-                <input type="search" id="reports-history-search" class="tbl-search" placeholder="Search" />
+                <input type="search" id="reports-history-search" class="tbl-search" placeholder="Search" aria-label="Search Reports History" />
                 <div id="reportsHistoryDynamicButtons" class="dynamic-buttons-div button-gap-1"></div>
             </div>
             <abp-table id="ReportsHistoryTable" hoverable-rows="true" class="w-100"></abp-table>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js
index e0555114ab..f37202aa03 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js
@@ -6,12 +6,20 @@
         return applicationId;
     }
 
+    let hasReceivedInitialResponse = false;
+    let hasLoadedEmptyState = false;
+
     let responseCallback = function (result) {
         const normalizedResult = (result || []).map(item => ({
             ...item,
             templateName: resolveTemplateName(item)
         }));
 
+        if (!hasReceivedInitialResponse) {
+            hasReceivedInitialResponse = true;
+            hasLoadedEmptyState = normalizedResult.length === 0;
+        }
+
         if (result) {
             setTimeout(function () {
                 PubSub.publish('update_application_emails_count', { itemCount: normalizedResult.length });
@@ -82,7 +90,8 @@
                     data: 'sentDateTime',
                     className: 'data-table-header',
                     width: '12%',
-                    render: function (data) {
+                    render: function (data, type, full) {
+                        if (full.sendOnDateTime) return '—';
                         return data ? luxon.DateTime.fromISO(data, {
                             locale: abp.localization.currentCulture.name,
                         }).toLocaleString({
@@ -153,16 +162,20 @@
                     width: '8%',
                     className: 'text-center',
                     render: function (data, _, full, meta) {
+                        // Only needed when the Scheduled Send column is shown, and only for
+                        // tables that started out empty (see hasLoadedEmptyState above).
+                        const addWidthClass = enableEmailDelay && hasLoadedEmptyState;
+
                         // Show delete button for drafts
                         if (data === 'Draft' && abp.auth.isGranted('Notifications.Email.DeleteDraft')) {
-                            return generateDeleteButtonContent(full, meta.row);
+                            return generateDeleteButtonContent(full, meta.row, addWidthClass);
                         }
                         // Show cancel button for scheduled sends that haven't passed yet
                         else if (full.sendOnDateTime && abp.auth.isGranted('Notifications.Email.CancelScheduled')) {
                             const sendOnDateTime = parseUtcDateTime(full.sendOnDateTime);
                             const now = luxon.DateTime.utc();
                             if (sendOnDateTime && sendOnDateTime > now) {
-                                return generateCancelScheduledButtonContent(full, meta.row);
+                                return generateCancelScheduledButtonContent(full, meta.row, addWidthClass);
                             }
                         }
                         return '';
@@ -173,8 +186,9 @@
         })
     );
 
-    function generateDeleteButtonContent(full, row) {
-        return `<button class="btn btn-delete-draft" type="button" onclick="deleteDraftEmail('${full.id}', '${row}')"><i class="fl fl-cancel"></i></button>`;
+    function generateDeleteButtonContent(full, row, addWidthClass) {
+        const widthClass = addWidthClass ? ' btn-w30' : '';
+        return `<button class="btn btn-delete-draft${widthClass}" type="button" onclick="deleteDraftEmail('${full.id}', '${row}')"><i class="fl fl-cancel"></i></button>`;
     }
 
 
@@ -275,8 +289,9 @@ function formatScheduledSendDateTimeUtcToPacific(value, type) {
         });
 }
 
-function generateCancelScheduledButtonContent(full, row) {
-    return `<button class="btn btn-delete-delayed" type="button" onclick="cancelScheduledEmail('${full.id}', '${row}')"><i class="fl fl-cancel"></i></button>`;
+function generateCancelScheduledButtonContent(full, row, addWidthClass) {
+    const widthClass = addWidthClass ? ' btn-w30' : '';
+    return `<button class="btn btn-delete-delayed${widthClass}" type="button" onclick="cancelScheduledEmail('${full.id}', '${row}')"><i class="fl fl-cancel"></i></button>`;
 }
 
 function cancelScheduledEmail(id, rowIndex) {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistory.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistory.css
index 1a95daec66..f80ba9b4bb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistory.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistory.css
@@ -50,7 +50,7 @@
     white-space: normal;
 }
 
-.btn-delete-delayed {
+.btn-w30 {
     width: 30px !important;
 }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css
index d4aae78553..225d525062 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css
@@ -1038,7 +1038,7 @@ input#EmailFrom.input-validation-error {
     z-index: 10 !important;
 }
 
-.tox *:not(svg):not(rect) {
+.tox *:not(svg):not(rect):not(.tox-tooltip):not(.tox-tooltip *):not(.tox-dialog):not(.tox-dialog *) {
     background-color: initial;
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
     font-size: 14px !important;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
index 56db3501e0..8c929bca66 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js
@@ -1349,9 +1349,10 @@
         // Then initialize TinyMCE
         tinymce.init({
             license_key: 'gpl',
-            selector: '#EmailBody',
+            selector: '#EmailBody',            
             plugins: getPlugins(),
             menubar: 'file edit view insert format tools',
+            toolbar: getToolbarOptions(),
             resize: true,
             statusbar: true,
             elementpath: false,