diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/Components/DataGrid/EditDataRowModal.cshtml b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/Components/DataGrid/EditDataRowModal.cshtml
index cec22d74f7..47e4666671 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/Components/DataGrid/EditDataRowModal.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/Components/DataGrid/EditDataRowModal.cshtml
@@ -48,7 +48,7 @@
                             @if (!isEditable)
                             {
                                 <label class="form-label">@df.Name</label>
-                                <input type="text" class="form-control" value="@df.Value" disabled />
+                                <input type="text" class="form-control" value="@df.Value" aria-label="@df.Name" disabled />
                             }
                             else if (fieldType == CustomFieldType.Checkbox)
                             {
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/RadioDefinitionWidget/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/RadioDefinitionWidget/Default.cshtml
index 18c5eed1da..26ec440416 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/RadioDefinitionWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/RadioDefinitionWidget/Default.cshtml
@@ -11,7 +11,7 @@
             foreach (var option in Model.Options)
             {
                 <div class="option-container" id="option@(Model.Options.IndexOf(option) + 1)Container">
-                    <input type="radio" name="radio_input" />
+                    <input type="radio" name="radio_input" aria-label="@option" />
                     <input type="text" id="option@(Model.Options.IndexOf(option) + 1)" name="Options" class="form-control" value="@option" minlength="1" maxlength="60" />
                     <button type="button" class="btn btn-danger btn-sm remove-option-btn" data-option-id="option@(Model.Options.IndexOf(option) + 1)Container">Delete Option</button>
                 </div>
@@ -56,7 +56,7 @@
             newOption.className = "option-container";
             newOption.id = optionId;
             newOption.innerHTML = `
-                            <input type="radio" name="radio_input" />
+                            <input type="radio" name="radio_input" aria-label="Radio option" />
                             <input type="text" id="option${optionCount}" name="Options" class="form-control" minlength="1" maxlength="60" />
                             <button type="button" class="btn btn-danger btn-sm remove-option-btn" data-option-id="${optionId}">Delete Option</button>`;
             document.getElementById("radioOptions").appendChild(newOption);
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/AccountCoding/CreateModal.cshtml b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/AccountCoding/CreateModal.cshtml
index fcda3d04eb..2aa6bff48a 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/AccountCoding/CreateModal.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/AccountCoding/CreateModal.cshtml
@@ -14,7 +14,7 @@
             <abp-row>
                 <abp-column size="_12" class="p-3">
                     <span class="form-label">Account Coding</span>
-                    <input id="account-coding" type="text" value="" readonly="" class="valid form-control readonly" aria-invalid="false">
+                    <input id="account-coding" type="text" value="" readonly="" class="valid form-control readonly" aria-invalid="false" aria-label="Account Coding">
                 </abp-column>
             </abp-row>
         </abp-modal-body>
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/AccountCoding/UpdateModal.cshtml b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/AccountCoding/UpdateModal.cshtml
index 900ec8ec4d..5c42170c35 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/AccountCoding/UpdateModal.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/AccountCoding/UpdateModal.cshtml
@@ -15,7 +15,7 @@
             <abp-row>
                 <abp-column size="_12" class="p-3">
                     <span class="form-label">Account Coding</span>
-                    <input id="account-coding" type="text" value="" readonly="" class="valid form-control readonly" aria-invalid="false">
+                    <input id="account-coding" type="text" value="" readonly="" class="valid form-control readonly" aria-invalid="false" aria-label="Account Coding">
                 </abp-column>
             </abp-row>
             <abp-input hidden="true" asp-for="Id" suppress-label="true"/>
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentConfigurations/Index.cshtml b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentConfigurations/Index.cshtml
index 0af601c312..6fa7ee0bef 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentConfigurations/Index.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentConfigurations/Index.cshtml
@@ -37,7 +37,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>
@@ -61,7 +61,7 @@
             <abp-column size="_12" class="p-3">
                 <span class="form-label">Payment ID Prefix</span>
                 <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">
+                <input id="payment-id-prefix" maxlength="5" type="text" value="@Model.PaymentIdPrefix" class="valid form-control" aria-label="Payment ID Prefix">
             </abp-column>
         </abp-row>
         <div class="d-flex p-2">
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentActionBar/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentActionBar/Default.cshtml
index 2d251fbacc..b4854c5b38 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentActionBar/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentActionBar/Default.cshtml
@@ -6,7 +6,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">
 
         @if (Model)
         {
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/docs/FormsIoMappingUsageExamples.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/docs/FormsIoMappingUsageExamples.cs
index 6ad1043167..a49fb5ee78 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/docs/FormsIoMappingUsageExamples.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/docs/FormsIoMappingUsageExamples.cs
@@ -80,12 +80,10 @@
 bool viewExists = await columnsMappingService.ViewExistsAsync("my_form_view");
 
 // Get view data with pagination
-var request = new ViewDataRequest 
+var request = new ViewDataRequest
 {
     Skip = 0,
-    Take = 100,
-    Filter = "column_name IS NOT NULL", // Optional SQL WHERE clause
-    OrderBy = "column_name ASC" // Optional SQL ORDER BY clause
+    Take = 100
 };
 
 ViewDataResult data = await columnsMappingService.GetViewDataAsync("my_form_view", request);
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/IReportMappingService.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/IReportMappingService.cs
index 6626f00ca8..4a326e30aa 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/IReportMappingService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application.Contracts/Configuration/IReportMappingService.cs
@@ -101,18 +101,18 @@ public interface IReportMappingService
         public Task<ViewGenerationResult> GenerateViewAsync(Guid correlationId, string correlationProvider, string viewName);
         
         /// <summary>
-        /// Retrieves paginated and filtered data from a generated database view with support for sorting and custom filtering.
+        /// Retrieves paginated data from a generated database view.
         /// </summary>
         /// <param name="viewName">The name of the database view to query for data.</param>
-        /// <param name="request">The request parameters containing pagination settings, filtering criteria, and sort ordering.</param>
+        /// <param name="request">The request parameters containing pagination settings.</param>
         /// <returns>A ViewDataResult containing the queried data rows, total record count, and column information for the requested page.</returns>
         public Task<ViewDataResult> GetViewDataAsync(string viewName, ViewDataRequest request);
-        
+
         /// <summary>
         /// Retrieves preview data from a generated database view showing only the top record for preview purposes.
         /// </summary>
         /// <param name="viewName">The name of the database view to query for preview data.</param>
-        /// <param name="request">The request parameters for filtering (pagination settings are ignored as only top 1 record is returned).</param>
+        /// <param name="request">The request parameters (pagination settings are ignored as only top 1 record is returned).</param>
         /// <returns>A ViewDataResult containing the preview data (single top record), count of 1, and column information.</returns>
         public Task<ViewDataResult> GetViewPreviewDataAsync(string viewName, ViewDataRequest request);
         
@@ -132,8 +132,8 @@ public interface IReportMappingService
     }
     
     /// <summary>
-    /// Represents a request for view data with pagination, filtering, and sorting options.
-    /// Provides flexible data retrieval parameters for querying generated reporting views.
+    /// Represents a request for view data with pagination options.
+    /// Provides data retrieval parameters for querying generated reporting views.
     /// </summary>
     public class ViewDataRequest
     {
@@ -148,18 +148,6 @@ public class ViewDataRequest
         /// Defaults to 100 to prevent excessive data transfer while allowing reasonable page sizes.
         /// </summary>
         public int Take { get; set; } = 100;
-        
-        /// <summary>
-        /// Gets or sets the SQL WHERE clause filter to apply to the view query.
-        /// Should be a valid PostgreSQL WHERE clause condition without the "WHERE" keyword.
-        /// </summary>
-        public string? Filter { get; set; }
-        
-        /// <summary>
-        /// Gets or sets the SQL ORDER BY clause to apply for result sorting.
-        /// Should be a valid PostgreSQL ORDER BY clause without the "ORDER BY" keywords.
-        /// </summary>
-        public string? OrderBy { get; set; }
     }
     
     /// <summary>
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingService.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingService.cs
index 7524e0cf45..e5a8f62729 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingService.cs
@@ -375,12 +375,12 @@ await backgroundJobManager.EnqueueAsync(new GenerateViewBackgroundJobArgs
         }
 
         /// <summary>
-        /// Retrieves paginated and filtered data from a generated database view with support for sorting and custom filtering.
+        /// Retrieves paginated data from a generated database view.
         /// Validates view existence, normalizes the view name, and delegates to the repository for secure data access
         /// with proper pagination controls to handle large datasets efficiently.
         /// </summary>
         /// <param name="viewName">The name of the database view to query for data.</param>
-        /// <param name="request">The request parameters containing pagination settings (skip/take), filtering criteria, and sort ordering.</param>
+        /// <param name="request">The request parameters containing pagination settings (skip/take).</param>
         /// <returns>A ViewDataResult containing the queried data rows, total record count, and column information for the requested page.</returns>
         /// <exception cref="ArgumentException">
         /// Thrown when:
@@ -411,7 +411,7 @@ public async Task<ViewDataResult> GetViewDataAsync(string viewName, ViewDataRequ
         /// Validates view existence and normalizes the view name before querying.
         /// </summary>
         /// <param name="viewName">The name of the database view to query for preview data.</param>
-        /// <param name="request">The request parameters for filtering (pagination settings are ignored as only top 1 record is returned).</param>
+        /// <param name="request">The request parameters (pagination settings are ignored as only top 1 record is returned).</param>
         /// <returns>A ViewDataResult containing the preview data (single top record), count of 1, and column information.</returns>
         /// <exception cref="ArgumentException">
         /// Thrown when:
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Domain/Configuration/IReportColumnsMapRepository.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Domain/Configuration/IReportColumnsMapRepository.cs
index d401204e6f..693de8ee57 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Domain/Configuration/IReportColumnsMapRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Domain/Configuration/IReportColumnsMapRepository.cs
@@ -45,7 +45,7 @@ public interface IReportColumnsMapRepository : IBasicRepository<ReportColumnsMap
         Task GenerateViewAsync(Guid correlationId, string correlationProvider);
 
         /// <summary>
-        /// Retrieves data from a generated view with pagination and filtering.
+        /// Retrieves data from a generated view with pagination.
         /// </summary>
         /// <param name="viewName">The name of the view to query.</param>
         /// <param name="request">The request parameters for data retrieval.</param>
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/EntityFrameworkCore/Repositories/ReportColumnsMapRepository.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/EntityFrameworkCore/Repositories/ReportColumnsMapRepository.cs
index 6d3cb324d5..9c4cd9d1b3 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/EntityFrameworkCore/Repositories/ReportColumnsMapRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/EntityFrameworkCore/Repositories/ReportColumnsMapRepository.cs
@@ -108,6 +108,15 @@ public async Task<ViewDataResult> GetViewPreviewDataAsync(string viewName, ViewD
             // Normalize view name to lowercase for consistency
             var normalizedViewName = viewName.Trim().ToLowerInvariant();
 
+            // SECURITY: Validate the identifier before it is interpolated into SQL below.
+            // ViewExistsAsync alone is not sufficient - it only proves a matching row exists in
+            // pg_views, not that the name is free of characters that would break out of the
+            // quoted identifier it gets embedded in.
+            if (!IsValidPostgreSqlIdentifier(normalizedViewName))
+            {
+                throw new ArgumentException($"Invalid view name format: {viewName}", nameof(viewName));
+            }
+
             var dbContext = await GetDbContextAsync();
             var connection = dbContext.Database.GetDbConnection();
             await dbContext.Database.OpenConnectionAsync();
@@ -132,18 +141,6 @@ ORDER BY a.""CreationTime"" DESC
                         LIMIT 1
                     )";
 
-                // Add filtering if provided
-                if (!string.IsNullOrWhiteSpace(request.Filter))
-                {
-                    previewQuery += $" AND ({request.Filter})";
-                }
-
-                // Add ordering if provided
-                if (!string.IsNullOrWhiteSpace(request.OrderBy))
-                {
-                    previewQuery += $" ORDER BY {request.OrderBy}";
-                }
-
                 // Execute the preview query
                 using var dataCommand = connection.CreateCommand();
                 dataCommand.CommandText = previewQuery;
@@ -180,6 +177,15 @@ public async Task<ViewDataResult> GetViewDataAsync(string viewName, ViewDataRequ
             // Normalize view name to lowercase for consistency
             var normalizedViewName = viewName.Trim().ToLowerInvariant();
 
+            // SECURITY: Validate the identifier before it is interpolated into SQL below.
+            // ViewExistsAsync alone is not sufficient - it only proves a matching row exists in
+            // pg_views, not that the name is free of characters that would break out of the
+            // quoted identifier it gets embedded in.
+            if (!IsValidPostgreSqlIdentifier(normalizedViewName))
+            {
+                throw new ArgumentException($"Invalid view name format: {viewName}", nameof(viewName));
+            }
+
             var dbContext = await GetDbContextAsync();
             var connection = dbContext.Database.GetDbConnection();
             await dbContext.Database.OpenConnectionAsync();
@@ -196,14 +202,6 @@ public async Task<ViewDataResult> GetViewDataAsync(string viewName, ViewDataRequ
                 var baseQuery = $@"SELECT * FROM ""Reporting"".""{normalizedViewName}""";
                 var countQuery = $@"SELECT COUNT(*) FROM ""Reporting"".""{normalizedViewName}""";
 
-                // Add filtering if provided
-                if (!string.IsNullOrWhiteSpace(request.Filter))
-                {
-                    var whereClause = $" WHERE {request.Filter}";
-                    baseQuery += whereClause;
-                    countQuery += whereClause;
-                }
-
                 // Get total count
                 using (var countCommand = connection.CreateCommand())
                 {
@@ -212,12 +210,6 @@ public async Task<ViewDataResult> GetViewDataAsync(string viewName, ViewDataRequ
                     result.TotalCount = Convert.ToInt32(countResult);
                 }
 
-                // Add ordering if provided
-                if (!string.IsNullOrWhiteSpace(request.OrderBy))
-                {
-                    baseQuery += $" ORDER BY {request.OrderBy}";
-                }
-
                 // Add pagination
                 baseQuery += $" OFFSET {request.Skip} LIMIT {request.Take}";
 
@@ -399,6 +391,14 @@ FROM pg_views
                 // Grant SELECT permission on each view to the role
                 foreach (var viewName in viewNames)
                 {
+                    // SECURITY: Validate each identifier read back from pg_views before it is
+                    // interpolated into SQL - quoted PostgreSQL identifiers can contain characters
+                    // (embedded quotes, semicolons) that would otherwise break out of the quotes below.
+                    if (!IsValidPostgreSqlIdentifier(viewName))
+                    {
+                        throw new ArgumentException($"Invalid view name format: {viewName}", nameof(viewName));
+                    }
+
                     var sql = $"GRANT SELECT ON \"Reporting\".\"{viewName}\" TO \"{role}\"";
                     await dbContext.Database.ExecuteSqlRawAsync(sql);
                 }
@@ -551,7 +551,7 @@ FROM information_schema.views
         /// </summary>
         /// <param name="identifier">The identifier to validate</param>
         /// <returns>True if the identifier is valid, false otherwise</returns>
-        private static bool IsValidPostgreSqlIdentifier(string identifier)
+        internal static bool IsValidPostgreSqlIdentifier(string identifier)
         {
             if (string.IsNullOrWhiteSpace(identifier))
                 return false;
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Pages/ReportingAdmin/Configuration/Index.cshtml b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Pages/ReportingAdmin/Configuration/Index.cshtml
index 540b18aa36..62e111b10e 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Pages/ReportingAdmin/Configuration/Index.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Pages/ReportingAdmin/Configuration/Index.cshtml
@@ -44,7 +44,8 @@
                                                value="@tenantRole.ViewRole" 
                                                data-tenant-id="@tenantRole.TenantId"
                                                data-is-default="@tenantRole.IsDefaultInferred"
-                                               placeholder="@($"{tenantRole.TenantName.ToLowerInvariant()}_readonly")" />
+                                               placeholder="@($"{tenantRole.TenantName.ToLowerInvariant()}_readonly")"
+                                               aria-label="@($"View role for {tenantRole.TenantName}")" />
                                         @if (tenantRole.IsDefaultInferred)
                                         {
                                             <i class="fa fa-exclamation-triangle text-warning ms-2 default-role-indicator" 
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationController.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationController.cs
index f27de9e932..7d8536a7b0 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationController.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/ReportingConfigurationController.cs
@@ -311,18 +311,16 @@ public IActionResult GenerateColumnNames([FromBody] GenerateColumnNamesRequest r
 
         /// <summary>
         /// Retrieves preview data from a generated database view showing sample records for interface display.
-        /// Fetches sample data from the first application ID found in the view with pagination and filtering support.
+        /// Fetches sample data from the first application ID found in the view with pagination support.
         /// Provides preview functionality for users to validate view structure and content before full data access.
         /// </summary>
         /// <param name="viewName">The name of the database view to query for preview data.</param>
         /// <param name="skip">The number of records to skip for pagination (defaults to 0).</param>
         /// <param name="take">The maximum number of records to return (defaults to 100).</param>
-        /// <param name="filter">Optional SQL WHERE clause filter for restricting preview data.</param>
-        /// <param name="orderBy">Optional SQL ORDER BY clause for sorting preview results.</param>
         /// <returns>An OK result with preview data including sample records and column information, or BadRequest for invalid view names or query parameters.</returns>
         [HttpGet]
         [Route("GetViewPreviewData")]
-        public async Task<IActionResult> GetViewPreviewData(string viewName, int skip = 0, int take = 100, string? filter = null, string? orderBy = null)
+        public async Task<IActionResult> GetViewPreviewData(string viewName, int skip = 0, int take = 100)
         {
             if (!ModelState.IsValid)
             {
@@ -335,9 +333,7 @@ public async Task<IActionResult> GetViewPreviewData(string viewName, int skip =
                 var request = new Unity.Reporting.Configuration.ViewDataRequest
                 {
                     Skip = skip,
-                    Take = take,
-                    Filter = filter,
-                    OrderBy = orderBy
+                    Take = take
                 };
 
                 var result = await reportMappingService.GetViewPreviewDataAsync(viewName, request);
@@ -438,38 +434,6 @@ public class GenerateColumnNamesRequest
         public Dictionary<string, string> PathColumns { get; set; } = new Dictionary<string, string>();
     }
 
-    /// <summary>
-    /// Request model for view data retrieval operations with pagination, filtering, and sorting capabilities.
-    /// Provides flexible parameters for querying generated reporting views with proper data access controls
-    /// and performance optimization through pagination and selective filtering.
-    /// </summary>
-    public class ViewDataRequest
-    {
-        /// <summary>
-        /// Gets or sets the number of records to skip for pagination.
-        /// Used in combination with Take to implement efficient pagination for large datasets.
-        /// </summary>
-        public int Skip { get; set; }
-
-        /// <summary>
-        /// Gets or sets the maximum number of records to return in the query result.
-        /// Provides control over result set size for performance and user interface optimization.
-        /// </summary>
-        public int Take { get; set; }
-
-        /// <summary>
-        /// Gets or sets the optional SQL WHERE clause filter for restricting query results.
-        /// Should be a valid PostgreSQL WHERE clause condition without the "WHERE" keyword.
-        /// </summary>
-        public string? Filter { get; set; }
-
-        /// <summary>
-        /// Gets or sets the optional SQL ORDER BY clause for sorting query results.
-        /// Should be a valid PostgreSQL ORDER BY clause without the "ORDER BY" keywords.
-        /// </summary>
-        public string? OrderBy { get; set; }
-    }
-
     /// <summary>
     /// Request model for report mapping deletion operations with configurable view cleanup behavior.
     /// Specifies which mapping configuration to delete and whether to remove associated database objects
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfigurationViewStatus/ReportingConfigurationViewStatusController.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfigurationViewStatus/ReportingConfigurationViewStatusController.cs
index 03f7d34790..160601b5d2 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfigurationViewStatus/ReportingConfigurationViewStatusController.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfigurationViewStatus/ReportingConfigurationViewStatusController.cs
@@ -75,9 +75,7 @@ public async Task<IActionResult> PreviewData(Guid versionId, string provider)
                 var request = new ViewDataRequest
                 {
                     Skip = 0,
-                    Take = 100, // This will be ignored by the preview method since it uses LIMIT 1 pattern
-                    OrderBy = null,
-                    Filter = null
+                    Take = 100 // This will be ignored by the preview method since it uses LIMIT 1 pattern
                 };
 
                 var viewData = await reportMappingService.GetViewPreviewDataAsync(reportColumnsMap.ViewName, request);
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Menu/_MenuItem.cshtml b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Menu/_MenuItem.cshtml
index 7dae29b077..92997eed0b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Menu/_MenuItem.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Menu/_MenuItem.cshtml
@@ -35,7 +35,8 @@ else
 {
     <div class="dropdown-submenu">
         <a role="button" class="btn dropdown-toggle" data-bs-toggle="dropdown"
-           aria-haspopup="true" aria-expanded="false">
+           aria-haspopup="true" aria-expanded="false" tabindex="0"
+           onkeydown="if(event.key==='Enter'){event.preventDefault();this.click();}else if(event.key===' '){event.preventDefault();if(!event.repeat){this.click();}}">
             @if (!string.IsNullOrEmpty(Model.Icon))
             {
                 // Render icon span only if an icon is set.
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Toolbar/LanguageSwitch/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Toolbar/LanguageSwitch/Default.cshtml
index 56ac718e60..3a43c2823b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Toolbar/LanguageSwitch/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Toolbar/LanguageSwitch/Default.cshtml
@@ -5,11 +5,12 @@
 @if (Model.OtherLanguages.Any())
 {
     <div class="dropdown">
-        <a class="nav-link dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <a class="nav-link dropdown-toggle" href="#" role="button" id="languageSwitchDropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+           onkeydown="if(event.key==='Enter'){event.preventDefault();this.click();}else if(event.key===' '){event.preventDefault();if(!event.repeat){this.click();}}">
             @Model.CurrentLanguage.DisplayName
         </a>
 
-        <div class="dropdown-menu dropdown-menu-end border-0 shadow-sm" aria-labelledby="dropdownMenuLink">
+        <div class="dropdown-menu dropdown-menu-end border-0 shadow-sm" aria-labelledby="languageSwitchDropdownMenuLink">
             @foreach (var language in Model.OtherLanguages)
             {
                 <a class="dropdown-item" href="~/Abp/Languages/Switch?culture=@(language.CultureName)&uiCulture=@(language.UiCultureName)&returnUrl=@(System.Net.WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery()))">@language.DisplayName</a>
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Toolbar/UserMenu/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Toolbar/UserMenu/Default.cshtml
index a467d37be2..edbcb200b4 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Toolbar/UserMenu/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Toolbar/UserMenu/Default.cshtml
@@ -8,7 +8,8 @@
 @inject IHtmlLocalizer<AbpUiResource> L
 @model ApplicationMenu
 <div class="dropdown">
-    <a class="nav-link dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+    <a class="nav-link dropdown-toggle" href="#" role="button" id="userMenuDropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+       onkeydown="if(event.key==='Enter'){event.preventDefault();this.click();}else if(event.key===' '){event.preventDefault();if(!event.repeat){this.click();}}">
         @if (CurrentUser.TenantId != null)
         {
             <small><i>@CurrentTenant.Name</i>\</small>@CurrentUser.UserName
@@ -21,7 +22,7 @@
 
     @if (Model.Items.Any())
     {
-        <div class="dropdown-menu dropdown-menu-end border-0 shadow-sm" aria-labelledby="dropdownMenuLink">
+        <div class="dropdown-menu dropdown-menu-end border-0 shadow-sm" aria-labelledby="userMenuDropdownMenuLink">
             @foreach (var menuItem in Model.Items)
             {
                 var elementId = string.IsNullOrEmpty(menuItem.ElementId) ? string.Empty : $"id=\"{menuItem.ElementId}\"";
diff --git a/applications/Unity.GrantManager/sonar-project.properties b/applications/Unity.GrantManager/sonar-project.properties
index dd79cd7e17..f5d66f8714 100644
--- a/applications/Unity.GrantManager/sonar-project.properties
+++ b/applications/Unity.GrantManager/sonar-project.properties
@@ -31,10 +31,28 @@ sonar.exclusions=src/Unity.GrantManager.EntityFrameworkCore/Migrations/**,src/Un
 # 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,e2,e3,e4,e5
 sonar.issue.ignore.multicriteria.e1.ruleKey=javascript:S7721
 sonar.issue.ignore.multicriteria.e1.resourceKey=**/*.js
 
+# Rule exclusion: Web:MouseEventWithoutKeyboardEquivalentCheck (RSPEC S1082)
+# "Mouse events should have corresponding keyboard events"
+# Flags <abp-button> tags with an onclick handler for missing onKeyDown/onKeyUp.
+# The ABP <abp-button> tag helper always renders a native <button type="button">
+# element, which already fires its click handler on Enter/Space via standard
+# browser keyboard semantics. No JS keyboard handler is needed or meaningful here;
+# the rule can't see past the tag helper to the native button it compiles to.
+# Scoped to the specific files with flagged abp-button usages (not rule-wide),
+# so unrelated onKeyDown/onKeyUp findings on other tags (e.g. <a>) still surface.
+sonar.issue.ignore.multicriteria.e2.ruleKey=Web:MouseEventWithoutKeyboardEquivalentCheck
+sonar.issue.ignore.multicriteria.e2.resourceKey=**/ScoresheetConfiguration/Index.cshtml
+sonar.issue.ignore.multicriteria.e3.ruleKey=Web:MouseEventWithoutKeyboardEquivalentCheck
+sonar.issue.ignore.multicriteria.e3.resourceKey=**/PaymentApprovals/UpdatePaymentRequestStatus.cshtml
+sonar.issue.ignore.multicriteria.e4.ruleKey=Web:MouseEventWithoutKeyboardEquivalentCheck
+sonar.issue.ignore.multicriteria.e4.resourceKey=**/PaymentRequests/CreatePaymentRequests.cshtml
+sonar.issue.ignore.multicriteria.e5.ruleKey=Web:MouseEventWithoutKeyboardEquivalentCheck
+sonar.issue.ignore.multicriteria.e5.resourceKey=**/BulkApprovals/ApproveApplicationsModal.cshtml
+
 # Test exclusions
 sonar.test.exclusions=**/bin/**,**/obj/**
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs
index bacbdb7800..8a83f33587 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs
@@ -74,6 +74,7 @@ public PermissionGrantsDataSeeder(IPermissionDataSeeder permissionDataSeeder)
         ];
 
         public readonly List<string> NotificationsScheduling_CommonPermissions = [
+            NotificationsPermissions.Email.NotificationsTab,
             NotificationsPermissions.Email.CancelScheduled,
             NotificationsPermissions.Email.ScheduleCreate,
             NotificationsPermissions.Email.ScheduleCancel,
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Components/ApplicationUiSettingGroup/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Components/ApplicationUiSettingGroup/Default.cshtml
index 538bb3ac21..2f82be4d33 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Components/ApplicationUiSettingGroup/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Components/ApplicationUiSettingGroup/Default.cshtml
@@ -13,12 +13,12 @@
         <form id="ApplicationTabsSettingsForm">
             <abp-row>
                 <abp-column size-md="_12" class="mx-2 fw-bold">
-                    <abp-input asp-for="@Model.Submission" role="switch" disabled="true" />
-                    <abp-input asp-for="@Model.Assessment" role="switch" />
-                    <abp-input asp-for="@Model.Project" role="switch" />
-                    <abp-input asp-for="@Model.Applicant" role="switch" />
-                    <abp-input asp-for="@Model.Payments" role="switch" />
-                    <abp-input asp-for="@Model.FundingAgreement" role="switch" />
+                    <abp-input asp-for="@Model.Submission" role="switch" aria-checked="@Model.Submission.ToString().ToLowerInvariant()" disabled="true" />
+                    <abp-input asp-for="@Model.Assessment" role="switch" aria-checked="@Model.Assessment.ToString().ToLowerInvariant()" />
+                    <abp-input asp-for="@Model.Project" role="switch" aria-checked="@Model.Project.ToString().ToLowerInvariant()" />
+                    <abp-input asp-for="@Model.Applicant" role="switch" aria-checked="@Model.Applicant.ToString().ToLowerInvariant()" />
+                    <abp-input asp-for="@Model.Payments" role="switch" aria-checked="@Model.Payments.ToString().ToLowerInvariant()" />
+                    <abp-input asp-for="@Model.FundingAgreement" role="switch" aria-checked="@Model.FundingAgreement.ToString().ToLowerInvariant()" />
                 </abp-column>
             </abp-row>
             <abp-row>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Components/ApplicationUiSettingGroup/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Components/ApplicationUiSettingGroup/Default.js
index 1dc1f28178..d15b466777 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Components/ApplicationUiSettingGroup/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Components/ApplicationUiSettingGroup/Default.js
@@ -1,49 +1,63 @@
-(function ($) {
-    $(function () {
-        $('.form-check').addClass('form-switch');
-
-        const TabsUiElements = {
-            settingForm: $("#ApplicationTabsSettingsForm"),
-            saveButton: $("#ApplicationTabsSaveButton"),
-            discardButton: $("#ApplicationTabsDiscardButton")
-        }
-
-        let initialFormState = TabsUiElements.settingForm.serialize();
-
-        function checkFormChanges() {
-            let currentFormState = TabsUiElements.settingForm.serialize();
-            let isFormChanged = currentFormState !== initialFormState;
-
-            TabsUiElements.saveButton.prop('disabled', !isFormChanged);
-            TabsUiElements.discardButton.prop('disabled', !isFormChanged);
-        }
-
-        TabsUiElements.settingForm.on('input change', function () {
-            checkFormChanges();
-        });
-
-        TabsUiElements.settingForm.on('submit', function (event) {
-            event.preventDefault();
-
-            if (!$(this).valid()) {
-                return;
-            }
-
-            let form = $(this).serializeFormToObject();
-            unity.grantManager.settingManagement.applicationUiSettings.update(form).then(function (result) {
-                $(document).trigger("AbpSettingSaved");
-                initialFormState = TabsUiElements.settingForm.serialize();
-                checkFormChanges();
-            });
-
-        });
-
-        TabsUiElements.discardButton.on('click', function () {
-            TabsUiElements.settingForm[0].reset();
-            initialFormState = TabsUiElements.settingForm.serialize();
-            checkFormChanges();
-        });
-
-        checkFormChanges();
-    });
+(function ($) {
+    $(function () {
+        $('.form-check').addClass('form-switch');
+
+        const syncSwitchAriaChecked = (el) => {
+            $(el).attr('aria-checked', el.checked ? 'true' : 'false');
+        };
+
+        const $switchInputs = $('input[role="switch"]');
+        $switchInputs.each(function () { syncSwitchAriaChecked(this); });
+        $switchInputs.on('change', function () { syncSwitchAriaChecked(this); });
+
+        $(document).on('reset', '#ApplicationTabsSettingsForm', function () {
+            window.setTimeout(function () {
+                $(this).find('input[role="switch"]').each(function () { syncSwitchAriaChecked(this); });
+            }.bind(this), 0);
+        });
+
+        const TabsUiElements = {
+            settingForm: $("#ApplicationTabsSettingsForm"),
+            saveButton: $("#ApplicationTabsSaveButton"),
+            discardButton: $("#ApplicationTabsDiscardButton")
+        }
+
+        let initialFormState = TabsUiElements.settingForm.serialize();
+
+        function checkFormChanges() {
+            let currentFormState = TabsUiElements.settingForm.serialize();
+            let isFormChanged = currentFormState !== initialFormState;
+
+            TabsUiElements.saveButton.prop('disabled', !isFormChanged);
+            TabsUiElements.discardButton.prop('disabled', !isFormChanged);
+        }
+
+        TabsUiElements.settingForm.on('input change', function () {
+            checkFormChanges();
+        });
+
+        TabsUiElements.settingForm.on('submit', function (event) {
+            event.preventDefault();
+
+            if (!TabsUiElements.settingForm.valid()) {
+                return;
+            }
+
+            let form = TabsUiElements.settingForm.serializeFormToObject();
+            unity.grantManager.settingManagement.applicationUiSettings.update(form).then(function (result) {
+                $(document).trigger("AbpSettingSaved");
+                initialFormState = TabsUiElements.settingForm.serialize();
+                checkFormChanges();
+            });
+
+        });
+
+        TabsUiElements.discardButton.on('click', function () {
+            TabsUiElements.settingForm[0].reset();
+            initialFormState = TabsUiElements.settingForm.serialize();
+            checkFormChanges();
+        });
+
+        checkFormChanges();
+    });
 })(jQuery);
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.cshtml
index 25f57c64a1..3105c1da37 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/UnityAdmin/Index.cshtml
@@ -45,7 +45,7 @@
             <div class="reconciliation-filter-inputs gap-3 px-1">
                 <div>
                     <label class="form-label" for="search"></label>
-                    <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>
                     <label class="form-label" for="ReconciliationTenantFilter">Tenant: <span class="text-danger">*</span></label>
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 540cea5163..6ace7c0b51 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
@@ -36,7 +36,7 @@
             <abp-table id="FundingHistoryTable" hoverable-rows="true" class="w-100"></abp-table>
 
             <div class="mt-3">
-                <label class="form-label fw-bold">Previous Funding Notes</label>
+                <label class="form-label fw-bold" for="FundingHistoryComments">Previous Funding Notes</label>
                 <br/>
                 <label class="form-label" for="FundingHistoryComments">Additional Comments</label>
                 <textarea id="FundingHistoryComments"
@@ -61,7 +61,7 @@
             <abp-table id="IssueTrackingTable" hoverable-rows="true" class="w-100"></abp-table>
 
             <div class="mt-3">
-                <label class="form-label fw-bold">Issue Notes</label>
+                <label class="form-label fw-bold" for="IssueTrackingComments">Issue Notes</label>
                 <br/>
                 <label class="form-label" for="IssueTrackingComments">Additional Comments</label>
                 <textarea id="IssueTrackingComments"
@@ -83,7 +83,7 @@
             <abp-table id="AuditHistoryTable" hoverable-rows="true" class="w-100"></abp-table>
 
             <div class="mt-3">
-                <label class="form-label fw-bold">Audit History Notes</label>
+                <label class="form-label fw-bold" for="AuditComments">Audit History Notes</label>
                 <br/>
                 <label class="form-label" for="AuditComments">Additional Comments</label>
                 <textarea id="AuditComments"
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml
index 1be46ee77b..46b745379c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml
@@ -429,13 +429,13 @@
                                 <td>@L["ApplicantInfoView:ApplicantInfo.UnityApplicant"].Value</td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_UnityApplicantId" value="existing" class="me-2" />
+                                        <input type="radio" name="merge_UnityApplicantId" value="existing" class="me-2" aria-label="Select existing value for @L["ApplicantInfoView:ApplicantInfo.UnityApplicant"].Value" />
                                         <span id="existing_UnityApplicantId"></span>
                                     </label>
                                 </td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0" for="merge_UnityApplicantId_new">
-                                        <input type="radio" id="merge_UnityApplicantId_new" name="merge_UnityApplicantId" value="new" class="me-2" aria-labelledby="merge_UnityApplicantId_new" />
+                                        <input type="radio" id="merge_UnityApplicantId_new" name="merge_UnityApplicantId" value="new" class="me-2" aria-label="Select new value for @L["ApplicantInfoView:ApplicantInfo.UnityApplicant"].Value" />
                                         <span id="new_UnityApplicantId"></span>
                                     </label>
                                 </td>
@@ -444,13 +444,13 @@
                                 <td>@L["ApplicantInfoView:ApplicantInfo.ApplicantName"].Value</td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_ApplicantName" value="existing" class="me-2" />
+                                        <input type="radio" name="merge_ApplicantName" value="existing" class="me-2" aria-label="Select existing value for @L["ApplicantInfoView:ApplicantInfo.ApplicantName"].Value" />
                                         <span id="existing_ApplicantName"></span>
                                     </label>
                                 </td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_ApplicantName" value="new" class="me-2" />
+                                        <input type="radio" name="merge_ApplicantName" value="new" class="me-2" aria-label="Select new value for @L["ApplicantInfoView:ApplicantInfo.ApplicantName"].Value" />
                                         <span id="new_ApplicantName"></span>
                                     </label>
                                 </td>
@@ -459,13 +459,13 @@
                                 <td>@L["ApplicantInfoView:ApplicantInfo.OrgName"].Value</td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_OrgName" value="existing" class="me-2" />
+                                        <input type="radio" name="merge_OrgName" value="existing" class="me-2" aria-label="Select existing value for @L["ApplicantInfoView:ApplicantInfo.OrgName"].Value" />
                                         <span id="existing_OrgName"></span>
                                     </label>
                                 </td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_OrgName" value="new" class="me-2" />
+                                        <input type="radio" name="merge_OrgName" value="new" class="me-2" aria-label="Select new value for @L["ApplicantInfoView:ApplicantInfo.OrgName"].Value" />
                                         <span id="new_OrgName"></span>
                                     </label>
                                 </td>
@@ -474,13 +474,13 @@
                                 <td>@L["ApplicantInfoView:ApplicantInfo.OrgNumber"].Value</td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_OrgNumber" value="existing" class="me-2" />
+                                        <input type="radio" name="merge_OrgNumber" value="existing" class="me-2" aria-label="Select existing value for @L["ApplicantInfoView:ApplicantInfo.OrgNumber"].Value" />
                                         <span id="existing_OrgNumber"></span>
                                     </label>
                                 </td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_OrgNumber" value="new" class="me-2" />
+                                        <input type="radio" name="merge_OrgNumber" value="new" class="me-2" aria-label="Select new value for @L["ApplicantInfoView:ApplicantInfo.OrgNumber"].Value" />
                                         <span id="new_OrgNumber"></span>
                                     </label>
                                 </td>
@@ -489,13 +489,13 @@
                                 <td>@L["ApplicantInfoView:ApplicantInfo.NonRegOrgName"].Value</td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_NonRegOrgName" value="existing" class="me-2" />
+                                        <input type="radio" name="merge_NonRegOrgName" value="existing" class="me-2" aria-label="Select existing value for @L["ApplicantInfoView:ApplicantInfo.NonRegOrgName"].Value" />
                                         <span id="existing_NonRegOrgName"></span>
                                     </label>
                                 </td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_NonRegOrgName" value="new" class="me-2" />
+                                        <input type="radio" name="merge_NonRegOrgName" value="new" class="me-2" aria-label="Select new value for @L["ApplicantInfoView:ApplicantInfo.NonRegOrgName"].Value" />
                                         <span id="new_NonRegOrgName"></span>
                                     </label>
                                 </td>
@@ -504,13 +504,13 @@
                                 <td>@L["ApplicantInfoView:ApplicantInfo.OrganizationType"].Value</td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_OrganizationType" value="existing" class="me-2" />
+                                        <input type="radio" name="merge_OrganizationType" value="existing" class="me-2" aria-label="Select existing value for @L["ApplicantInfoView:ApplicantInfo.OrganizationType"].Value" />
                                         <span id="existing_OrganizationType"></span>
                                     </label>
                                 </td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_OrganizationType" value="new" class="me-2" />
+                                        <input type="radio" name="merge_OrganizationType" value="new" class="me-2" aria-label="Select new value for @L["ApplicantInfoView:ApplicantInfo.OrganizationType"].Value" />
                                         <span id="new_OrganizationType"></span>
                                     </label>
                                 </td>
@@ -519,13 +519,13 @@
                                 <td>@L["ApplicantInfoView:ApplicantInfo.ApproxNumberOfEmployees"].Value</td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_ApproxNumberOfEmployees" value="existing" class="me-2" />
+                                        <input type="radio" name="merge_ApproxNumberOfEmployees" value="existing" class="me-2" aria-label="Select existing value for @L["ApplicantInfoView:ApplicantInfo.ApproxNumberOfEmployees"].Value" />
                                         <span id="existing_ApproxNumberOfEmployees"></span>
                                     </label>
                                 </td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_ApproxNumberOfEmployees" value="new" class="me-2" />
+                                        <input type="radio" name="merge_ApproxNumberOfEmployees" value="new" class="me-2" aria-label="Select new value for @L["ApplicantInfoView:ApplicantInfo.ApproxNumberOfEmployees"].Value" />
                                         <span id="new_ApproxNumberOfEmployees"></span>
                                     </label>
                                 </td>
@@ -534,13 +534,13 @@
                                 <td>@L["ApplicantInfoView:ApplicantInfo.OrgBookStatus"].Value</td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_OrgStatus" value="existing" class="me-2" />
+                                        <input type="radio" name="merge_OrgStatus" value="existing" class="me-2" aria-label="Select existing value for @L["ApplicantInfoView:ApplicantInfo.OrgBookStatus"].Value" />
                                         <span id="existing_OrgStatus"></span>
                                     </label>
                                 </td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_OrgStatus" value="new" class="me-2" />
+                                        <input type="radio" name="merge_OrgStatus" value="new" class="me-2" aria-label="Select new value for @L["ApplicantInfoView:ApplicantInfo.OrgBookStatus"].Value" />
                                         <span id="new_OrgStatus"></span>
                                     </label>
                                 </td>
@@ -549,13 +549,13 @@
                                 <td>@L["ApplicantInfoView:ApplicantInfo.IndigenousOrgInd"].Value</td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_IndigenousOrgInd" value="existing" class="me-2" />
+                                        <input type="radio" name="merge_IndigenousOrgInd" value="existing" class="me-2" aria-label="Select existing value for @L["ApplicantInfoView:ApplicantInfo.IndigenousOrgInd"].Value" />
                                         <span id="existing_IndigenousOrgInd"></span>
                                     </label>
                                 </td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_IndigenousOrgInd" value="new" class="me-2" />
+                                        <input type="radio" name="merge_IndigenousOrgInd" value="new" class="me-2" aria-label="Select new value for @L["ApplicantInfoView:ApplicantInfo.IndigenousOrgInd"].Value" />
                                         <span id="new_IndigenousOrgInd"></span>
                                     </label>
                                 </td>
@@ -564,13 +564,13 @@
                                 <td>@L["ApplicantInfoView:ApplicantInfo.Sector"].Value</td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_Sector" value="existing" class="me-2" />
+                                        <input type="radio" name="merge_Sector" value="existing" class="me-2" aria-label="Select existing value for @L["ApplicantInfoView:ApplicantInfo.Sector"].Value" />
                                         <span id="existing_Sector"></span>
                                     </label>
                                 </td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_Sector" value="new" class="me-2" />
+                                        <input type="radio" name="merge_Sector" value="new" class="me-2" aria-label="Select new value for @L["ApplicantInfoView:ApplicantInfo.Sector"].Value" />
                                         <span id="new_Sector"></span>
                                     </label>
                                 </td>
@@ -579,13 +579,13 @@
                                 <td>@L["ApplicantInfoView:ApplicantInfo.SubSector"].Value</td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_SubSector" value="existing" class="me-2" />
+                                        <input type="radio" name="merge_SubSector" value="existing" class="me-2" aria-label="Select existing value for @L["ApplicantInfoView:ApplicantInfo.SubSector"].Value" />
                                         <span id="existing_SubSector"></span>
                                     </label>
                                 </td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_SubSector" value="new" class="me-2" />
+                                        <input type="radio" name="merge_SubSector" value="new" class="me-2" aria-label="Select new value for @L["ApplicantInfoView:ApplicantInfo.SubSector"].Value" />
                                         <span id="new_SubSector"></span>
                                     </label>
                                 </td>
@@ -594,13 +594,13 @@
                                 <td>@L["ApplicantInfoView:ApplicantInfo.SectorSubSectorIndustryDesc"].Value</td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_SectorSubSectorIndustryDesc" value="existing" class="me-2" />
+                                        <input type="radio" name="merge_SectorSubSectorIndustryDesc" value="existing" class="me-2" aria-label="Select existing value for @L["ApplicantInfoView:ApplicantInfo.SectorSubSectorIndustryDesc"].Value" />
                                         <span id="existing_SectorSubSectorIndustryDesc"></span>
                                     </label>
                                 </td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_SectorSubSectorIndustryDesc" value="new" class="me-2" />
+                                        <input type="radio" name="merge_SectorSubSectorIndustryDesc" value="new" class="me-2" aria-label="Select new value for @L["ApplicantInfoView:ApplicantInfo.SectorSubSectorIndustryDesc"].Value" />
                                         <span id="new_SectorSubSectorIndustryDesc"></span>
                                     </label>
                                 </td>
@@ -609,13 +609,13 @@
                                 <td>@L["ApplicantInfoView:ApplicantInfo.FiscalDay"].Value</td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_FiscalDay" value="existing" class="me-2" />
+                                        <input type="radio" name="merge_FiscalDay" value="existing" class="me-2" aria-label="Select existing value for @L["ApplicantInfoView:ApplicantInfo.FiscalDay"].Value" />
                                         <span id="existing_FiscalDay"></span>
                                     </label>
                                 </td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_FiscalDay" value="new" class="me-2" />
+                                        <input type="radio" name="merge_FiscalDay" value="new" class="me-2" aria-label="Select new value for @L["ApplicantInfoView:ApplicantInfo.FiscalDay"].Value" />
                                         <span id="new_FiscalDay"></span>
                                     </label>
                                 </td>
@@ -624,13 +624,13 @@
                                 <td>@L["ApplicantInfoView:ApplicantInfo.FiscalMonth"].Value</td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_FiscalMonth" value="existing" class="me-2" />
+                                        <input type="radio" name="merge_FiscalMonth" value="existing" class="me-2" aria-label="Select existing value for @L["ApplicantInfoView:ApplicantInfo.FiscalMonth"].Value" />
                                         <span id="existing_FiscalMonth"></span>
                                     </label>
                                 </td>
                                 <td>
                                     <label class="d-flex align-items-center w-100 mb-0">
-                                        <input type="radio" name="merge_FiscalMonth" value="new" class="me-2" />
+                                        <input type="radio" name="merge_FiscalMonth" value="new" class="me-2" aria-label="Select new value for @L["ApplicantInfoView:ApplicantInfo.FiscalMonth"].Value" />
                                         <span id="new_FiscalMonth"></span>
                                     </label>
                                 </td>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantPayments/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantPayments/Default.cshtml
index 0c9a9cdc61..8828cafc33 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantPayments/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantPayments/Default.cshtml
@@ -56,6 +56,7 @@
             <input type="search"
                    id="applicant-payments-search"
                    placeholder="Search payments..."
+                   aria-label="Search payments"
                    class="tbl-search" />
             <div id="applicantPaymentsDynamicButtonContainerId" class="dynamic-buttons-div button-gap-1"></div>
         </div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantSubmissions/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantSubmissions/Default.cshtml
index 245a26e126..04c3dbd0a7 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantSubmissions/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantSubmissions/Default.cshtml
@@ -14,6 +14,7 @@ else
                 <input type="search"
                        id="submissions-search"
                        placeholder="Search submissions..."
+                       aria-label="Search submissions"
                        class="form-control tbl-search">
             </div>
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/Default.cshtml
index e3f11a5e69..2804c5524e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantsActionBar/Default.cshtml
@@ -10,7 +10,7 @@
 
 <div class="action-bar p-2 search-action-bar">
     <div class="search-action-bar_search-wrapper">
-        <input type="search" id="search" placeholder="@L["Common:Command:Search"].Value" class="tbl-search">
+        <input type="search" id="search" placeholder="@L["Common:Command:Search"].Value" aria-label="@L["Common:Command:Search"].Value" class="tbl-search">
     </div>
 
     <div class="btn-group" id="app_custom_buttons">
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationAttachments/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationAttachments/Default.cshtml
index 0d99b4dd07..526720df3a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationAttachments/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationAttachments/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="application_attachment_upload" name="application_attachment_upload" type="file" size="1" multiple onchange="uploadApplicationFiles('application_attachment_upload');" style="display: none" />
+        <input id="application_attachment_upload" name="application_attachment_upload" type="file" size="1" multiple onchange="uploadApplicationFiles('application_attachment_upload');" aria-label="Add Attachments" style="display: none" />
         <abp-button text="Add Attachments"
                     id="application_attachment_upload_btn"
                     icon-type="Other"
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml
index ee8e8220a2..d1c3780fea 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml
@@ -49,15 +49,16 @@
                     <label class="form-check-label direct-approval" for="directApproval">Direct Approval</label>
                 </div>
             </div>
-            <label class="form-label note mt-1">
+            <span class="form-label note mt-1">
                 <b>NOTE:</b> @L["ApplicationForms.Configuration.Notes:BypassAssessmentWorkflow"].Value
-            </label>
+            </span>
         </div>
     </div>
     <hr />
     <div class="row">
         <div class="col-12 p-3">
             <h6 class="mb-3"><b>Electoral District Configuration</b></h6>
+            <label class="form-label" for="electoralDistrictAddressType">Electoral District Address Type</label>
             <select class="form-select form-control"
                     id="electoralDistrictAddressType"
                     name="electoralDistrictAddressType">
@@ -67,12 +68,12 @@
                     <option value="@option.Value" selected="@(selected ? "selected" : null)">@option.Text</option>
                 }
             </select>
-            <label class="form-label note mt-1" style="display:block"><b>NOTE:</b>
+            <span class="form-label note mt-1" style="display:block"><b>NOTE:</b>
                 @L["ApplicationForms.Configuration.Notes:SelectedApplicantElectoralAddress"].Value
-            </label>
-            <label class="note mt-1 configuration-warning" style="display:none" id="change-electoral-address-warning"><b>WARNING:</b> 
+            </span>
+            <span class="note mt-1 configuration-warning" style="display:none" id="change-electoral-address-warning"><b>WARNING:</b>
                 @L["ApplicationForms.Configuration.Warnings:ApplicantElectoralAddressTypeChange"].Value
-            </label>
+            </span>
         </div>
     </div>
     <hr />
@@ -114,16 +115,16 @@
                         </div>
                     </div>
                 </div>
-            <label class="form-label note mt-1" style="display:block">
+            <span class="form-label note mt-1" style="display:block">
                 <b>NOTE:</b>
-                The system will automatically generate a unique ID for each new submission by combining your chosen prefix with either a sequential number 
+                The system will automatically generate a unique ID for each new submission by combining your chosen prefix with either a sequential number
                 or a submission number, depending on the suffix type.
-                <br /> 
-                <br /> 
+                <br />
+                <br />
                 <b>NOTE:</b>
                 If multiple forms are assigned the same prefix, they will share a single, continuous sequence of numbers.
                 @* @L["ApplicationForms.Configuration.Notes:SelectedApplicantElectoralAddress"].Value *@
-            </label>
+            </span>
         </div>
     </div>
 </form>
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 225d525062..b345ff71b3 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):not(.tox-tooltip):not(.tox-tooltip *):not(.tox-dialog):not(.tox-dialog *) {
+.tox *:not(svg):not(rect):not(.tox-tooltip):not(.tox-tooltip *):not(.tox-dialog):not(.tox-dialog *):not(.tox-menu):not(.tox-menu *):not(.tox-collection):not(.tox-collection *) {
     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 8c929bca66..3fa62d5305 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
@@ -2118,6 +2118,7 @@
             selector: '#EmailBody',
             plugins: getPlugins(),
             menubar: 'file edit view insert format tools',
+            toolbar: getToolbarOptions(),
             resize: true,
             statusbar: true,
             elementpath: false,
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/SummaryWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/SummaryWidget/Default.cshtml
index ac30082e69..70b39b9fe9 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/SummaryWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/SummaryWidget/Default.cshtml
@@ -30,7 +30,7 @@
                     }
                     else
                     {
-                    <label class="empty-user-role">{Owner}</label>
+                    <span class="empty-user-role">{Owner}</span>
                     }
                     
                 </div>
@@ -47,15 +47,15 @@
                     @foreach (var assignee in Model.Assignees)
                     {
                             <div class="user-tag tags-common tag-wrap">
-                                <label class="full-length-tag">@assignee.FullName</label>
+                                <span class="full-length-tag">@assignee.FullName</span>
                                 <br>
                                 @if(!assignee.Duty.IsNullOrEmpty() )
                                 {
-                                    <label>@assignee.Duty</label>
+                                    <span>@assignee.Duty</span>
                                 }
                                 else
                                 {
-                                    <label class="empty-user-role">Duties</label>
+                                    <span class="empty-user-role">Duties</span>
                                 }
 
                             </div>