From 34c346076059a0710042a28f5fe8c1417ba9c679 Mon Sep 17 00:00:00 2001
From: Mark Gregory <mark.gregory@mpba.co.uk>
Date: Thu, 17 Sep 2026 13:08:40 +0100
Subject: [PATCH] M3 Security Fixes for Pass 39

---
 .../ChatGPT/Resources/views/index.blade.php   |  18 +-
 .../Company/Resources/views/show.blade.php    |  12 +-
 .../Countries/Resources/views/index.blade.php |   5 +-
 .../Resources/views/documents/index.blade.php |   5 +-
 .../views/livewire/settings-manager.blade.php |  76 +++---
 .../views/livewire/ticket-show.blade.php      |  19 +-
 .../views/partials/ticket-controls.blade.php  |   5 +-
 Modules/M3/Console/GenerateGS1Cmd.php         |   7 +-
 .../M3/Http/Controllers/API/CloseShipment.php |  22 +-
 .../M3/Http/Controllers/API/M3Controller.php  |   5 +-
 Modules/M3/Http/Controllers/API/ReplenAPI.php |   9 +-
 .../M3/Http/Controllers/API/TransferAPI.php   |   5 +-
 .../Controllers/GetContentsController.php     |   1 -
 .../M3GetPDFFromCacheController.php           |   3 +-
 .../Controllers/OrderLinesOfClosedOrder.php   |   3 +-
 .../ReplenishSettingsController.php           |  11 +-
 .../Controllers/execSummaryController.php     |   4 +-
 .../Controllers/execSummaryLineController.php |   6 +-
 .../Http/Controllers/fillBOL2Controller.php   |   4 +-
 .../M3/Http/Controllers/fillBOLController.php |   4 +-
 .../Controllers/userControlController.php     |  11 +-
 .../Http/Controllers/utilitiesContoller.php   |   8 +-
 .../Controllers/whsePerfDetailsController.php |   4 -
 .../pages/BoxPackToPalletScan.blade.php       |   3 +-
 .../liberty-theme/pages/M3Delivery.blade.php  |   4 +-
 .../pages/M3ErrorsDisplay.blade.php           |  12 +-
 .../liberty-theme/pages/M3GetPDF.blade.php    |  22 +-
 .../pages/OrderLinesOfClosed.blade.php        |  66 ++---
 .../pages/ReplenishSettings.blade.php         |  66 +++--
 .../pages/WhsPerfMetrics.blade.php            |   9 +-
 .../pages/exedashboard.blade.php              |   3 +-
 .../liberty-theme/pages/fillBOL.blade.php     |   8 +-
 .../liberty-theme/pages/fillBOL2.blade.php    |   8 +-
 .../pages/orderInquiry.blade.php              |   5 +-
 .../pages/ordersOnHoldReq.blade.php           |  31 +--
 .../pages/ordersOnHoldReqOrder.blade.php      |   2 +-
 .../pages/ordersOnHoldReqReason.blade.php     |   2 +-
 .../pages/pendingClosure.blade.php            |   3 +-
 .../pages/ship-to/create.blade.php            |  44 ++--
 .../pages/ship-to/edit.blade.php              |  44 ++--
 .../pages/userPickingStats4.blade.php         |   4 +-
 .../pages/userPickingStats4_old.blade.php     |   5 +-
 .../pages/userPickingStats5.blade.php         |   3 +-
 .../liberty-theme/pages/userProfile.blade.php |  16 +-
 .../liberty-theme/pages/whsePerf.blade.php    | 238 +++++++++---------
 .../pages/whsePerfRequest.blade.php           |   3 +-
 .../partials/modals/M3DeliveryAdd.blade.php   |   3 +-
 .../partials/modals/M3DeliveryEdit.blade.php  |   3 +-
 .../partials/modals/carrierAdd.blade.php      |  21 +-
 .../partials/modals/carrierEdit.blade.php     |  21 +-
 .../partials/modals/qtyAdd.blade.php          |   9 +-
 .../partials/modals/qtyEdit.blade.php         |  10 +-
 .../partials/modals/shipToEdit.blade.php      |  15 +-
 .../partials/modals/userAdd.blade.php         |  79 ++++--
 .../partials/modals/userEdit.blade.php        |  79 ++++--
 .../partials/modals/userPassword.blade.php    |   3 +-
 .../partials/top-navigation.blade.php         |   2 +-
 .../resources/views/licenses/index.blade.php  |  10 +-
 .../resources/views/payments/index.blade.php  |  15 +-
 .../resources/views/rules/index.blade.php     |  15 +-
 .../views/warehouses/index.blade.php          |  15 +-
 resources/js/Components/Checkbox.vue          |   5 +-
 .../livewire/settings/security.blade.php      |   5 +-
 63 files changed, 655 insertions(+), 503 deletions(-)

diff --git a/Modules/ChatGPT/Resources/views/index.blade.php b/Modules/ChatGPT/Resources/views/index.blade.php
index 0cade86e..80099ae6 100644
--- a/Modules/ChatGPT/Resources/views/index.blade.php
+++ b/Modules/ChatGPT/Resources/views/index.blade.php
@@ -65,7 +65,8 @@
                 </div>
 
                 <label class="inline-flex items-center gap-2 text-sm text-slate-700">
-                    <input type="checkbox" name="is_active" value="1" checked class="rounded border-slate-300 text-blue-600 focus:ring-blue-500">
+                    <label for="sonar-input-a09f3b253f" class="visually-hidden">is active</label>
+<input type="checkbox" name="is_active" value="1" checked class="rounded border-slate-300 text-blue-600 focus:ring-blue-500" id="sonar-input-a09f3b253f">
                     Make active key
                 </label>
 
@@ -100,28 +101,31 @@
                                         @csrf
                                         @method('PUT')
 
-                                        <input
+                                        <label for="sonar-input-30f47d1294" class="visually-hidden">name</label>
+<input
                                             name="name"
                                             type="text"
-                                            value="{{ old('name', $setting->name) }}"
+                                            value="{{ old('name', $setting- id="sonar-input-30f47d1294">name) }}"
                                             class="w-full rounded-lg border-slate-300 text-sm shadow-sm focus:border-blue-500 focus:ring-blue-500"
                                         >
 
-                                        <input
+                                        <label for="sonar-input-707eb8d2ba" class="visually-hidden">Leave blank to keep existing key</label>
+<input
                                             name="api_key"
                                             type="password"
                                             value=""
                                             autocomplete="new-password"
                                             placeholder="Leave blank to keep existing key"
                                             class="w-full rounded-lg border-slate-300 text-sm shadow-sm focus:border-blue-500 focus:ring-blue-500"
-                                        >
+                                         id="sonar-input-707eb8d2ba">
 
                                         <label class="inline-flex items-center gap-2 text-xs text-slate-600">
-                                            <input
+                                            <label for="sonar-input-da782f0360" class="visually-hidden">is active</label>
+<input
                                                 type="checkbox"
                                                 name="is_active"
                                                 value="1"
-                                                @checked($setting->is_active)
+                                                @checked($setting- id="sonar-input-da782f0360">is_active)
                                                 class="rounded border-slate-300 text-blue-600 focus:ring-blue-500"
                                             >
                                             Active
diff --git a/Modules/Company/Resources/views/show.blade.php b/Modules/Company/Resources/views/show.blade.php
index 3dcb3c60..d9062090 100644
--- a/Modules/Company/Resources/views/show.blade.php
+++ b/Modules/Company/Resources/views/show.blade.php
@@ -253,18 +253,18 @@
 
                         <div class="grid gap-4 md:grid-cols-4 md:items-end">
                             <div>
-                                <label class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Division name</label>
-                                <input name="name" value="{{ $division->name }}" class="mt-2 h-12 w-full rounded-xl border-zinc-300 bg-white px-4 text-sm font-medium text-zinc-900 shadow-sm outline-none transition focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white" required>
+                                <label for="sonar-input-47ea6fa2d4" class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Division name</label>
+                                <input name="name" value="{{ $division- id="sonar-input-47ea6fa2d4">name }}" class="mt-2 h-12 w-full rounded-xl border-zinc-300 bg-white px-4 text-sm font-medium text-zinc-900 shadow-sm outline-none transition focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white" required>
                             </div>
 
                             <div>
-                                <label class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Code</label>
-                                <input name="code" value="{{ $division->code }}" class="mt-2 h-12 w-full rounded-xl border-zinc-300 bg-white px-4 text-sm font-medium text-zinc-900 shadow-sm outline-none transition focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white">
+                                <label for="sonar-input-5c50085e3c" class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Code</label>
+                                <input name="code" value="{{ $division- id="sonar-input-5c50085e3c">code }}" class="mt-2 h-12 w-full rounded-xl border-zinc-300 bg-white px-4 text-sm font-medium text-zinc-900 shadow-sm outline-none transition focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white">
                             </div>
 
                             <div class="wms-select2-field">
-                                <label class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Status</label>
-                                <select name="status" data-wms-select2 data-placeholder="Select status" class="wms-select2-control">
+                                <label for="sonar-select-47ea6fa2d4" class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Status</label>
+                                <select name="status" data-wms-select2 data-placeholder="Select status" class="wms-select2-control" id="sonar-select-47ea6fa2d4">
                                     <option value="active" @selected($division->status === 'active')>Active</option>
                                     <option value="suspended" @selected($division->status === 'suspended')>Suspended</option>
                                     <option value="inactive" @selected($division->status === 'inactive')>Inactive</option>
diff --git a/Modules/Countries/Resources/views/index.blade.php b/Modules/Countries/Resources/views/index.blade.php
index 683fa4bf..1b238af6 100644
--- a/Modules/Countries/Resources/views/index.blade.php
+++ b/Modules/Countries/Resources/views/index.blade.php
@@ -53,9 +53,10 @@
 
         <form method="GET" action="{{ route('countries.index') }}"
             class="grid gap-3 rounded-2xl border border-zinc-200 bg-white p-4 shadow-sm dark:border-zinc-700 dark:bg-zinc-900 md:grid-cols-[1fr_220px_220px_auto] md:items-center">
-            <input name="search" value="{{ $search }}"
+            <label for="sonar-input-517d4d4cc5" class="visually-hidden">Search by country, ISO code, currency or calling code</label>
+<input name="search" value="{{ $search }}"
                 placeholder="Search by country, ISO code, currency or calling code"
-                class="min-h-11 rounded-xl border-zinc-300 shadow-sm focus:border-blue-500 focus:ring-blue-500 dark:border-zinc-700 dark:bg-zinc-950 dark:text-zinc-100" />
+                class="min-h-11 rounded-xl border-zinc-300 shadow-sm focus:border-blue-500 focus:ring-blue-500 dark:border-zinc-700 dark:bg-zinc-950 dark:text-zinc-100" id="sonar-input-517d4d4cc5">
             <select name="status"
                 class="min-h-11 rounded-xl border-zinc-300 shadow-sm focus:border-blue-500 focus:ring-blue-500 dark:border-zinc-700 dark:bg-zinc-950 dark:text-zinc-100">
                 <option value="all" @selected($status === 'all')>All statuses</option>
diff --git a/Modules/Documentation/Resources/views/documents/index.blade.php b/Modules/Documentation/Resources/views/documents/index.blade.php
index 9d241c54..279a9d0f 100644
--- a/Modules/Documentation/Resources/views/documents/index.blade.php
+++ b/Modules/Documentation/Resources/views/documents/index.blade.php
@@ -44,8 +44,9 @@
             </div>
             <div class="doc-card-body">
                 <form class="doc-filter" method="GET" action="{{ route('documentation.documents.index') }}">
-                    <input class="doc-input" name="search" value="{{ request('search') }}"
-                        placeholder="Search title, reference, summary or body">
+                    <label for="sonar-input-9f8539cc9d" class="visually-hidden">Search title, reference, summary or body</label>
+<input class="doc-input" name="search" value="{{ request('search') }}"
+                        placeholder="Search title, reference, summary or body" id="sonar-input-9f8539cc9d">
                     <select class="doc-select" name="status">
                         <option value="">All statuses</option>
                         @foreach ($statuses as $value => $label)
diff --git a/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php b/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php
index e0cdb203..8f36ee90 100644
--- a/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/settings-manager.blade.php
@@ -152,12 +152,14 @@
                         <flux:input wire:model="statusForm.sort_order" label="Sort" type="number" min="0" />
                     </div>
                     <label class="flex min-h-9 items-center gap-2 rounded-lg border border-zinc-200 bg-white px-3 py-2 text-xs font-semibold text-zinc-700 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/60 dark:text-zinc-200 xl:col-span-3">
-                        <input type="checkbox" wire:model="statusForm.is_closed" class="rounded border-zinc-600 bg-zinc-950 text-blue-600 focus:ring-blue-500">
+                        <label for="sonar-input-39c53a1533" class="visually-hidden">sonar input 39c53a1533</label>
+<input type="checkbox" wire:model="statusForm.is_closed" class="rounded border-zinc-600 bg-zinc-950 text-blue-600 focus:ring-blue-500" id="sonar-input-39c53a1533">
                         Closed status
                     </label>
                     <label class="flex min-h-9 items-center gap-2 rounded-lg border border-zinc-200 bg-white px-3 py-2 text-xs font-semibold text-zinc-700 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/60 dark:text-zinc-200 xl:col-span-4">
-                        <input type="checkbox" wire:model="statusForm.is_default"
-                            class="rounded border-zinc-300 bg-zinc-950 text-blue-600 focus:ring-blue-500">
+                        <label for="sonar-input-ecdb37bbfb" class="visually-hidden">sonar input ecdb37bbfb</label>
+<input type="checkbox" wire:model="statusForm.is_default"
+                            class="rounded border-zinc-300 bg-zinc-950 text-blue-600 focus:ring-blue-500" id="sonar-input-ecdb37bbfb">
                         Default status for new tickets
                     </label>
                     <div class="flex flex-wrap items-center gap-2 xl:col-span-12">
@@ -189,8 +191,9 @@
                         <flux:input wire:model="priorityForm.sort_order" label="Sort" type="number" min="0" />
                     </div>
                     <label class="flex min-h-9 items-center gap-2 rounded-lg border border-zinc-200 bg-white px-3 py-2 text-xs font-semibold text-zinc-700 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/60 dark:text-zinc-200 xl:col-span-4">
-                        <input type="checkbox" wire:model="priorityForm.is_default"
-                            class="rounded border-zinc-300 bg-zinc-950 text-blue-600 focus:ring-blue-500">
+                        <label for="sonar-input-dbeb3e74c7" class="visually-hidden">sonar input dbeb3e74c7</label>
+<input type="checkbox" wire:model="priorityForm.is_default"
+                            class="rounded border-zinc-300 bg-zinc-950 text-blue-600 focus:ring-blue-500" id="sonar-input-dbeb3e74c7">
                         Default for new tickets
                     </label>
                     <div class="flex flex-wrap items-center gap-2 xl:col-span-12">
@@ -231,8 +234,9 @@
                         <flux:textarea wire:model="categoryForm.description" label="Description" rows="3" />
                     </div>
                     <label class="flex min-h-9 items-center gap-2 rounded-lg border border-zinc-200 bg-white px-3 py-2 text-xs font-semibold text-zinc-700 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/60 dark:text-zinc-200 xl:col-span-4">
-                        <input type="checkbox" wire:model="categoryForm.is_default"
-                            class="rounded border-zinc-300 bg-zinc-950 text-blue-600 focus:ring-blue-500">
+                        <label for="sonar-input-994d89012d" class="visually-hidden">sonar input 994d89012d</label>
+<input type="checkbox" wire:model="categoryForm.is_default"
+                            class="rounded border-zinc-300 bg-zinc-950 text-blue-600 focus:ring-blue-500" id="sonar-input-994d89012d">
                         Default category for new tickets
                     </label>
                     <div class="flex flex-wrap items-center gap-2 xl:col-span-12">
@@ -273,8 +277,9 @@
                         <flux:textarea wire:model="teamForm.description" label="Description" rows="3" />
                     </div>
                     <label class="flex min-h-9 items-center gap-2 rounded-lg border border-zinc-200 bg-white px-3 py-2 text-xs font-semibold text-zinc-700 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/60 dark:text-zinc-200 xl:col-span-4">
-                        <input type="checkbox" wire:model="teamForm.is_default"
-                            class="rounded border-zinc-300 bg-zinc-950 text-blue-600 focus:ring-blue-500">
+                        <label for="sonar-input-e96f3a3323" class="visually-hidden">sonar input e96f3a3323</label>
+<input type="checkbox" wire:model="teamForm.is_default"
+                            class="rounded border-zinc-300 bg-zinc-950 text-blue-600 focus:ring-blue-500" id="sonar-input-e96f3a3323">
                         Default team for new tickets
                     </label>
                     <div class="flex flex-wrap items-center gap-2 xl:col-span-12">
@@ -323,8 +328,9 @@
                         <flux:textarea wire:model="projectForm.description" label="Description" rows="3" />
                     </div>
                     <label class="flex min-h-9 items-center gap-2 rounded-lg border border-zinc-200 bg-white px-3 py-2 text-xs font-semibold text-zinc-700 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/60 dark:text-zinc-200 xl:col-span-4">
-                        <input type="checkbox" wire:model="projectForm.is_default"
-                            class="rounded border-zinc-300 bg-zinc-950 text-blue-600 focus:ring-blue-500">
+                        <label for="sonar-input-12a008cf80" class="visually-hidden">sonar input 12a008cf80</label>
+<input type="checkbox" wire:model="projectForm.is_default"
+                            class="rounded border-zinc-300 bg-zinc-950 text-blue-600 focus:ring-blue-500" id="sonar-input-12a008cf80">
                         Default project for new tickets
                     </label>
                     <div class="flex flex-wrap items-center gap-2 xl:col-span-12">
@@ -357,7 +363,8 @@
                         @endforeach
                     </flux:select>
                     <label class="flex min-h-9 items-center gap-2 rounded-lg border border-zinc-200 bg-white px-3 py-2 text-xs font-semibold text-zinc-700 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/60 dark:text-zinc-200">
-                        <input type="checkbox" wire:model="boardForm.is_default" class="rounded border-zinc-300">
+                        <label for="sonar-input-ca4f2ae3c4" class="visually-hidden">sonar input ca4f2ae3c4</label>
+<input type="checkbox" wire:model="boardForm.is_default" class="rounded border-zinc-300" id="sonar-input-ca4f2ae3c4">
                         Default board
                     </label>
                     <div class="md:col-span-2">
@@ -370,8 +377,9 @@
                             @foreach ($statuses as $status)
                                 <label
                                     class="flex items-center gap-2 rounded-xl border border-zinc-200 bg-white px-3 py-2 text-sm text-zinc-700 dark:border-zinc-700 dark:bg-zinc-950 dark:text-zinc-200">
-                                    <input type="checkbox" wire:model="boardForm.status_ids"
-                                        value="{{ $status->id }}" class="rounded border-zinc-300">
+                                    <label for="sonar-input-d3efdc11be" class="visually-hidden">sonar input d3efdc11be</label>
+<input type="checkbox" wire:model="boardForm.status_ids"
+                                        value="{{ $status- id="sonar-input-d3efdc11be">id }}" class="rounded border-zinc-300">
                                     <span class="inline-flex h-3 w-3 rounded-full"
                                         style="background-color: {{ \Modules\Helpdesk\Support\Color::css($status->color) }}"></span>
                                     <span>{{ $status->name }}</span>
@@ -515,8 +523,9 @@
                         placeholder="Optional comma-separated emails" />
                     <flux:input wire:model="workflowForm.bcc" label="BCC"
                         placeholder="Optional comma-separated emails" />
-                    <label class="flex min-h-9 items-center gap-2 rounded-lg border border-zinc-200 bg-white px-3 py-2 text-xs font-semibold text-zinc-700 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/60 dark:text-zinc-200"><input
-                            type="checkbox" wire:model="workflowForm.is_active" class="rounded border-zinc-300">
+                    <label class="flex min-h-9 items-center gap-2 rounded-lg border border-zinc-200 bg-white px-3 py-2 text-xs font-semibold text-zinc-700 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/60 dark:text-zinc-200"><label for="sonar-input-d05aecf041" class="visually-hidden">sonar input d05aecf041</label>
+<input
+                            type="checkbox" wire:model="workflowForm.is_active" class="rounded border-zinc-300" id="sonar-input-d05aecf041">
                         Active</label>
                     <div class="md:col-span-full">
                         <flux:input wire:model="workflowForm.subject" label="Subject"
@@ -611,8 +620,9 @@
                             <option value="{{ $team->id }}">{{ $team->name }}</option>
                         @endforeach
                     </flux:select>
-                    <label class="flex min-h-9 items-center gap-2 rounded-lg border border-zinc-200 bg-white px-3 py-2 text-xs font-semibold text-zinc-700 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/60 dark:text-zinc-200"><input
-                            type="checkbox" wire:model="cannedForm.is_active" class="rounded border-zinc-300">
+                    <label class="flex min-h-9 items-center gap-2 rounded-lg border border-zinc-200 bg-white px-3 py-2 text-xs font-semibold text-zinc-700 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/60 dark:text-zinc-200"><label for="sonar-input-a305855102" class="visually-hidden">sonar input a305855102</label>
+<input
+                            type="checkbox" wire:model="cannedForm.is_active" class="rounded border-zinc-300" id="sonar-input-a305855102">
                         Active</label>
                     <div class="md:col-span-full">
                         <flux:input wire:model="cannedForm.subject" label="Optional subject" />
@@ -689,14 +699,17 @@
                         type="number" min="1" />
                     <flux:input wire:model="slaForm.resolution_minutes" label="Resolution minutes" type="number"
                         min="1" />
-                    <label class="flex items-center gap-2 text-sm text-zinc-700 dark:text-zinc-200"><input
-                            type="checkbox" wire:model="slaForm.is_default" class="rounded border-zinc-300">
+                    <label class="flex items-center gap-2 text-sm text-zinc-700 dark:text-zinc-200"><label for="sonar-input-fc91c07151" class="visually-hidden">sonar input fc91c07151</label>
+<input
+                            type="checkbox" wire:model="slaForm.is_default" class="rounded border-zinc-300" id="sonar-input-fc91c07151">
                         Default</label>
-                    <label class="flex items-center gap-2 text-sm text-zinc-700 dark:text-zinc-200"><input
-                            type="checkbox" wire:model="slaForm.business_hours_only" class="rounded border-zinc-300">
+                    <label class="flex items-center gap-2 text-sm text-zinc-700 dark:text-zinc-200"><label for="sonar-input-8ed03e31d9" class="visually-hidden">sonar input 8ed03e31d9</label>
+<input
+                            type="checkbox" wire:model="slaForm.business_hours_only" class="rounded border-zinc-300" id="sonar-input-8ed03e31d9">
                         Business hours</label>
-                    <label class="flex items-center gap-2 text-sm text-zinc-700 dark:text-zinc-200"><input
-                            type="checkbox" wire:model="slaForm.is_active" class="rounded border-zinc-300">
+                    <label class="flex items-center gap-2 text-sm text-zinc-700 dark:text-zinc-200"><label for="sonar-input-f551debb0e" class="visually-hidden">sonar input f551debb0e</label>
+<input
+                            type="checkbox" wire:model="slaForm.is_active" class="rounded border-zinc-300" id="sonar-input-f551debb0e">
                         Active</label>
                     <div class="md:col-span-full flex gap-2">
                         <flux:button size="sm" type="submit" variant="primary"
@@ -795,8 +808,9 @@
                             <option value="{{ $status->id }}">{{ $status->name }}</option>
                         @endforeach
                     </flux:select>
-                    <label class="flex min-h-9 items-center gap-2 rounded-lg border border-zinc-200 bg-white px-3 py-2 text-xs font-semibold text-zinc-700 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/60 dark:text-zinc-200"><input
-                            type="checkbox" wire:model="automationForm.is_active" class="rounded border-zinc-300">
+                    <label class="flex min-h-9 items-center gap-2 rounded-lg border border-zinc-200 bg-white px-3 py-2 text-xs font-semibold text-zinc-700 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/60 dark:text-zinc-200"><label for="sonar-input-bdabe054d8" class="visually-hidden">sonar input bdabe054d8</label>
+<input
+                            type="checkbox" wire:model="automationForm.is_active" class="rounded border-zinc-300" id="sonar-input-bdabe054d8">
                         Active</label>
                     <div class="md:col-span-full flex gap-2">
                         <flux:button size="sm" type="submit" variant="primary"
@@ -852,8 +866,9 @@
                             <option value="{{ $project->id }}">{{ $project->title }}</option>
                         @endforeach
                     </flux:select>
-                    <label class="flex items-end gap-2 pb-2 text-sm"><input type="checkbox"
-                            wire:model="checklistTemplateForm.is_active" class="rounded border-zinc-300">
+                    <label class="flex items-end gap-2 pb-2 text-sm"><label for="sonar-input-cc3bd705c8" class="visually-hidden">sonar input cc3bd705c8</label>
+<input type="checkbox"
+                            wire:model="checklistTemplateForm.is_active" class="rounded border-zinc-300" id="sonar-input-cc3bd705c8">
                         Active</label>
                     <div class="md:col-span-full">
                         <flux:textarea wire:model="checklistTemplateForm.items_text"
@@ -948,8 +963,9 @@
                     <flux:input wire:model="productForm.type" label="Type" />
                     <flux:input wire:model="productForm.version" label="Version" />
                     <flux:input wire:model="productForm.release_channel" label="Release/build" /><label
-                        class="flex items-end gap-2 pb-2 text-sm"><input type="checkbox"
-                            wire:model="productForm.is_active" class="rounded border-zinc-300"> Active</label>
+                        class="flex items-end gap-2 pb-2 text-sm"><label for="sonar-input-6a8040737f" class="visually-hidden">sonar input 6a8040737f</label>
+<input type="checkbox"
+                            wire:model="productForm.is_active" class="rounded border-zinc-300" id="sonar-input-6a8040737f"> Active</label>
                     <div class="md:col-span-full">
                         <flux:textarea wire:model="productForm.description" label="Description" rows="3" />
                     </div>
diff --git a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
index aa0d213b..a2c89316 100644
--- a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
@@ -149,8 +149,9 @@
                                            class="hd-attachment-action !rounded-lg !px-3 !py-2 !text-xs">
                                         <i class="fa-solid fa-paperclip" aria-hidden="true"></i>
                                         <span>Choose files</span>
-                                        <input name="attachments[]" type="file" multiple accept="{{ $helpdeskAttachmentAccept }}" class="sr-only"
-                                               data-helpdesk-file-input>
+                                        <label for="sonar-input-d20751f562" class="visually-hidden">attachments[]</label>
+<input name="attachments[]" type="file" multiple accept="{{ $helpdeskAttachmentAccept }}" class="sr-only"
+                                               data-helpdesk-file-input id="sonar-input-d20751f562">
                                     </label>
 
                                     <button type="submit"
@@ -510,8 +511,9 @@
                                        class="inline-flex cursor-pointer items-center justify-center rounded-lg bg-blue-600 px-3 py-2 text-xs font-bold text-white shadow-sm transition hover:bg-blue-700 focus-within:outline-none focus-within:ring-2 focus-within:ring-blue-400/70">
                                     <i class="fa-solid fa-paperclip mr-2 text-xs" aria-hidden="true"></i>
                                     <span>Choose files</span>
-                                    <input name="comment_attachments[]" type="file" multiple accept="{{ $helpdeskAttachmentAccept }}" class="sr-only"
-                                           data-helpdesk-file-input>
+                                    <label for="sonar-input-cc351ecc57" class="visually-hidden">comment attachments[]</label>
+<input name="comment_attachments[]" type="file" multiple accept="{{ $helpdeskAttachmentAccept }}" class="sr-only"
+                                           data-helpdesk-file-input id="sonar-input-cc351ecc57">
                                 </label>
                             </div>
 
@@ -535,7 +537,8 @@
                             @if ($canSeeInternalNotes)
                                 <div class="grid gap-3 sm:grid-cols-2">
                                     <label class="flex cursor-pointer items-start gap-3 rounded-xl border border-emerald-300 bg-emerald-50 p-3 text-emerald-950 shadow-sm transition hover:border-emerald-400 hover:bg-emerald-100/80 focus-within:border-emerald-500 focus-within:bg-emerald-100/80 focus-within:ring-2 focus-within:ring-emerald-400/30 active:bg-emerald-100/80 dark:border-emerald-900 dark:bg-emerald-950/60 dark:text-emerald-100 dark:hover:border-emerald-700 dark:hover:bg-emerald-900/50 dark:focus-within:bg-emerald-900/50">
-                                        <input type="radio" name="internal" value="0" @checked(! old('internal')) class="mt-1 border-emerald-400 text-emerald-600 focus:ring-emerald-500">
+                                        <label for="sonar-input-f732ff44ac" class="visually-hidden">internal</label>
+<input type="radio" name="internal" value="0" @checked(! old('internal')) class="mt-1 border-emerald-400 text-emerald-600 focus:ring-emerald-500" id="sonar-input-f732ff44ac">
                                         <span>
                                             <span class="block text-sm font-extrabold">Public reply</span>
                                             <span class="mt-1 block text-xs font-semibold opacity-80">Visible to the requester and counts as the first SLA response.</span>
@@ -543,7 +546,8 @@
                                     </label>
 
                                     <label class="flex cursor-pointer items-start gap-3 rounded-xl border border-purple-300 bg-purple-50 p-3 text-purple-950 shadow-sm transition hover:border-purple-400 hover:bg-purple-100/80 focus-within:border-purple-500 focus-within:bg-purple-100/80 focus-within:ring-2 focus-within:ring-purple-400/30 active:bg-purple-100/80 dark:border-purple-900 dark:bg-purple-950/60 dark:text-purple-100 dark:hover:border-purple-700 dark:hover:bg-purple-900/50 dark:focus-within:bg-purple-900/50">
-                                        <input type="radio" name="internal" value="1" @checked((bool) old('internal')) class="mt-1 border-purple-400 text-purple-600 focus:ring-purple-500">
+                                        <label for="sonar-input-2d1a395f19" class="visually-hidden">internal</label>
+<input type="radio" name="internal" value="1" @checked((bool) old('internal')) class="mt-1 border-purple-400 text-purple-600 focus:ring-purple-500" id="sonar-input-2d1a395f19">
                                         <span>
                                             <span class="block text-sm font-extrabold">Internal note</span>
                                             <span class="mt-1 block text-xs font-semibold opacity-80">MPBA/support-only note. Does not count as a public SLA response.</span>
@@ -1328,7 +1332,8 @@
                         @foreach ($ticket->checklistItems as $item)
                             <label
                                 class="flex items-start gap-2 rounded-lg border border-zinc-200 p-2 text-xs dark:border-zinc-700">
-                                <input type="checkbox" wire:click="toggleChecklistItem({{ $item->id }})"
+                                <label for="sonar-input-a729c04093" class="visually-hidden">sonar input a729c04093</label>
+<input type="checkbox" wire:click="toggleChecklistItem({{ $item- id="sonar-input-a729c04093">id }})"
                                        @checked($item->is_completed) class="mt-1 rounded border-zinc-300">
                                 <span
                                     class="{{ $item->is_completed ? 'text-zinc-500 line-through' : 'text-zinc-800 dark:text-zinc-100' }}">{{ $item->title }}</span>
diff --git a/Modules/Helpdesk/Resources/views/partials/ticket-controls.blade.php b/Modules/Helpdesk/Resources/views/partials/ticket-controls.blade.php
index a7e13032..cc08655c 100644
--- a/Modules/Helpdesk/Resources/views/partials/ticket-controls.blade.php
+++ b/Modules/Helpdesk/Resources/views/partials/ticket-controls.blade.php
@@ -153,8 +153,9 @@
 
                     <label class="flex items-start gap-3 rounded-xl border border-emerald-200 bg-emerald-50 p-3 text-sm text-emerald-950 dark:border-emerald-900 dark:bg-emerald-950 dark:text-emerald-100">
                         <input type="hidden" name="closure_internal" value="0">
-                        <input type="checkbox" name="closure_internal" value="1"
-                               class="mt-1 rounded border-emerald-400 text-purple-600 focus:ring-purple-500">
+                        <label for="sonar-input-25ff0676dc" class="visually-hidden">closure internal</label>
+<input type="checkbox" name="closure_internal" value="1"
+                               class="mt-1 rounded border-emerald-400 text-purple-600 focus:ring-purple-500" id="sonar-input-25ff0676dc">
                         <span>
                             <span class="block font-extrabold">Internal closure note</span>
                             <span class="mt-1 block text-xs font-semibold opacity-80">Leave unticked to save the closure as a public customer-visible response.</span>
diff --git a/Modules/M3/Console/GenerateGS1Cmd.php b/Modules/M3/Console/GenerateGS1Cmd.php
index 10dd2182..8e4de583 100644
--- a/Modules/M3/Console/GenerateGS1Cmd.php
+++ b/Modules/M3/Console/GenerateGS1Cmd.php
@@ -2,6 +2,7 @@
 
 namespace Modules\M3\Console;
 
+use App;
 use Ayeo\Barcode;
 use Cache;
 use Config;
@@ -35,7 +36,7 @@ class GenerateGS1Cmd extends Command
      *
      * @return void
      */
-    /**
+/**
      * Execute the console command.
      *
      * @return int
@@ -76,9 +77,7 @@ class GenerateGS1Cmd extends Command
                     ->where('R428US', '=', $sHUSER)
                     ->first();
 
-                $r428US = isset($iCM428M->R428US) ? $iCM428M->R428US : '';     // User
                 $cOMPANY = isset($iCM428M->R428CO) ? $iCM428M->R428CO : '';     // Company
-                $pLANT = isset($iCM428M->R428PL) ? $iCM428M->R428PL : '';     // Plant
                 $wHS = isset($iCM428M->R428WH) ? $iCM428M->R428WH : '';     // WareHouse
 
                 $macpkr = $gSArray['Macpkr'];
@@ -117,7 +116,7 @@ class GenerateGS1Cmd extends Command
                 // Get number of Pallets
                 $packageCount = count($gSArray['PackagesArray']);
                 $packageNum = 1;
-                foreach ($gSArray['PackagesArray'] as $key => $value) {
+                foreach ($gSArray['PackagesArray'] as $value) {
                     $table_style = $packageNum < $packageCount ? ' style="page-break-after: always;" ' : '';
 
                     if (Cache::has('GS1SEQUENCE')) {
diff --git a/Modules/M3/Http/Controllers/API/CloseShipment.php b/Modules/M3/Http/Controllers/API/CloseShipment.php
index 21584239..73e52ae5 100644
--- a/Modules/M3/Http/Controllers/API/CloseShipment.php
+++ b/Modules/M3/Http/Controllers/API/CloseShipment.php
@@ -17,9 +17,7 @@ use Str;
 class CloseShipment extends Controller
 {
     private const ZERO_PAD = '000000';
-
     private const JSON_CONTENT_TYPE = 'application/json';
-
     private const NULL_M3_RESPONSE = 'M3 API responded with null value';
 
     // CloseShipmentCoChargeAPI : with URL PARAMS COCharge
@@ -56,6 +54,7 @@ class CloseShipment extends Controller
             $pdfFilePath = Config::get('arrays.PdfPath');
             $dELIVERYNO = $mANIFEST != '' ? $mANIFEST : self::ZERO_PAD;
 
+
             if ($urlParams != '') {
                 // Write to Logs : JSON
                 $jSONIN = json_encode([
@@ -217,6 +216,7 @@ class CloseShipment extends Controller
                 }
                 $iCM695M1TMP = $iCM695M1TMPF;
 
+
                 $freightTermsTMP = DB::connection(config('m3.connection', 'pgsql'))->table('icm321m')
                     ->selectRaw('TRIM(ARCODE) as FREIGHTTERMS,ARCHARGE as BILLABLE')
                     ->get();
@@ -261,9 +261,7 @@ class CloseShipment extends Controller
 
                         // PFC : Check that Picked / Packed are all Equal
                         foreach ($iCM688M2SL as $key => $ICM688M2SLR) {
-                            $a5PACKED = isset($ICM688M2SLR->A5PACKED) ? $ICM688M2SLR->A5PACKED : 0;
                             $a5PICKED = isset($ICM688M2SLR->A5PICKED) ? $ICM688M2SLR->A5PICKED : 0;
-                            $a5PKLN = isset($ICM688M2SLR->A5PKLN) ? $ICM688M2SLR->A5PKLN : 0;
                             $a5RSVQTY = isset($ICM688M2SLR->A5RSVQTY) ? $ICM688M2SLR->A5RSVQTY : 0;
                             $a5ShortShipQty = (int) $a5RSVQTY - (int) $a5PICKED;
 
@@ -607,10 +605,10 @@ class CloseShipment extends Controller
                                 Helper::logToICM699M($data);
 
                                 $response = Http::withHeaders([
-                                    'accept' => self::JSON_CONTENT_TYPE,
-                                    'Content-Type' => self::JSON_CONTENT_TYPE,
-                                    'Connection' => 'close',
-                                ])
+                                        'accept' => self::JSON_CONTENT_TYPE,
+                                        'Content-Type' => self::JSON_CONTENT_TYPE,
+                                        'Connection' => 'close',
+                                    ])
                                     ->withToken($token)
                                     ->withBody($jSONCS, self::JSON_CONTENT_TYPE)
                                     ->timeout(Config::get('arrays.curlTimeOut'))
@@ -828,10 +826,10 @@ class CloseShipment extends Controller
                         Helper::logToICM699M($data);
 
                         $response = Http::withHeaders([
-                            'accept' => self::JSON_CONTENT_TYPE,
-                            'Content-Type' => self::JSON_CONTENT_TYPE,
-                            'Connection' => 'close',
-                        ])
+                                'accept' => self::JSON_CONTENT_TYPE,
+                                'Content-Type' => self::JSON_CONTENT_TYPE,
+                                'Connection' => 'close',
+                            ])
                             ->withToken($token)
                             ->withBody($jSONCS, self::JSON_CONTENT_TYPE)
                             ->timeout(Config::get('arrays.curlTimeOut'))
diff --git a/Modules/M3/Http/Controllers/API/M3Controller.php b/Modules/M3/Http/Controllers/API/M3Controller.php
index 8f9b5b5a..958495fd 100644
--- a/Modules/M3/Http/Controllers/API/M3Controller.php
+++ b/Modules/M3/Http/Controllers/API/M3Controller.php
@@ -5,6 +5,7 @@ namespace Modules\M3\Http\Controllers\API;
 use Config;
 use DB;
 use Illuminate\Http\Request;
+use Log;
 use Modules\M3\Helpers\Helper;
 use Modules\M3\Http\Controllers\Controller;
 use Modules\M3\Services\PostgresProgramBridge;
@@ -13,7 +14,6 @@ use Str;
 class M3Controller extends Controller
 {
     private const FIELD_PREFIX = 'Field: ';
-
     private const M3_LIST_SUFFIX = ' M3-Lis-JSN';
 
     // Split Data and Write to ICM666M2
@@ -258,14 +258,12 @@ class M3Controller extends Controller
                     $partNumber = isset($product['PartNumber']) ? $product['PartNumber'] : '';
                     $orderLine = isset($product['OrderLine']) ? $product['OrderLine'] : '';
                     $partWeight = isset($product['PartWeight']) ? $product['PartWeight'] : '';
-                    $pickerLine = isset($product['PickerLine']) ? $product['PickerLine'] : '';
                     $primaryLocation = isset($product['PrimaryLocation']) ? $product['PrimaryLocation'] : '';
                     $allocation = isset($product['Allocation']) ? $product['Allocation'] : '';
                     $allocatedTo = isset($product['AllocatedTo']) ? $product['AllocatedTo'] : '';
                     $locationSeq = isset($product['LocationSeq']) ? $product['LocationSeq'] : '';
                     $zone = isset($product['Zone']) ? $product['Zone'] : '';
                     $baseUnitPrice = isset($product['BaseUnitPrice']) ? $product['BaseUnitPrice'] : '';
-                    $frgnUnitPrice = isset($product['FrgnUnitPrice']) ? $product['FrgnUnitPrice'] : '';
                     $sellUOM = isset($product['SellUOM']) ? $product['SellUOM'] : '';
                     $partConv = isset($product['PartConv']) ? $product['PartConv'] : '';
                     $uOM = isset($product['UOM']) ? $product['UOM'] : '';
@@ -461,7 +459,6 @@ class M3Controller extends Controller
                     $params[] = $conn->AddParameterChar('in', 11, 'PickerNumber', '', $pickerNumberNoZero);
 
                     // Start Time Tracking
-                    $start = microtime(true);
 
                     // ICM700C EWOBJTST  ICM700C  ICM700CSBM
                     $result = $conn->PgmCall('ICM700CSBM', env('OBJLIB'), $params, [], []);
diff --git a/Modules/M3/Http/Controllers/API/ReplenAPI.php b/Modules/M3/Http/Controllers/API/ReplenAPI.php
index 0babee16..11b7309d 100644
--- a/Modules/M3/Http/Controllers/API/ReplenAPI.php
+++ b/Modules/M3/Http/Controllers/API/ReplenAPI.php
@@ -15,7 +15,6 @@ use Str;
 class ReplenAPI extends Controller
 {
     private const ZERO_PAD = '000000';
-
     private const JSON_CONTENT_TYPE = 'application/json';
 
     // M3Replenishement with URL Params
@@ -85,9 +84,9 @@ class ReplenAPI extends Controller
                 $token = $ionToken;
 
                 $response = Http::withHeaders([
-                    'accept' => self::JSON_CONTENT_TYPE,
-                    'Content-Type' => self::JSON_CONTENT_TYPE,
-                ])
+                        'accept' => self::JSON_CONTENT_TYPE,
+                        'Content-Type' => self::JSON_CONTENT_TYPE,
+                    ])
                     ->withToken($token)
                     ->withBody($jSON, self::JSON_CONTENT_TYPE)
                     ->timeout(Config::get('arrays.curlTimeOut'))
@@ -138,7 +137,7 @@ class ReplenAPI extends Controller
                         if ($key2 != 'Locations') {
                             $dataToWrite[$key2] = $content;
                         } else {
-                            foreach ($content as $key3 => $content2) {
+                            foreach ($content as $content2) {
                                 $dataToWrite2[] = array_merge($dataToWrite, $content2);
                             }
                         }
diff --git a/Modules/M3/Http/Controllers/API/TransferAPI.php b/Modules/M3/Http/Controllers/API/TransferAPI.php
index 21ce6aa1..247d5d8e 100644
--- a/Modules/M3/Http/Controllers/API/TransferAPI.php
+++ b/Modules/M3/Http/Controllers/API/TransferAPI.php
@@ -16,11 +16,8 @@ use Str;
 class TransferAPI extends Controller
 {
     private const ZERO_PAD = '000000';
-
     private const JSON_CONTENT_TYPE = 'application/json';
-
     private const ORDER_CATEGORY_LABEL = ' Order Category: ';
-
     private const NO_URL_PARAMETERS = 'No URL Parameters Sent';
 
     // TransferAPIURL : with URL PARAMS
@@ -474,7 +471,7 @@ class TransferAPI extends Controller
                     }
                     $iCM688M1SL = $iCM688M1SLTMP->get();
                     // Loop ICM688M1 to get all A4MACPKR
-                    foreach ($iCM688M1SL as $key => $ICM688M1) {
+                    foreach ($iCM688M1SL as $ICM688M1) {
                         $allMacpkrs[] = $ICM688M1->A4MACPKR;
                     }
                 }
diff --git a/Modules/M3/Http/Controllers/GetContentsController.php b/Modules/M3/Http/Controllers/GetContentsController.php
index d490cf2b..51331d9f 100644
--- a/Modules/M3/Http/Controllers/GetContentsController.php
+++ b/Modules/M3/Http/Controllers/GetContentsController.php
@@ -98,7 +98,6 @@ class GetContentsController extends Controller
         }
 
         $row = $result[0];
-        $aggCode = trim($row->A4SHPAGGCD);
 
         return [
             'orderNumber' => trim($row->A4MACPKR),
diff --git a/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php b/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php
index f26d01d9..e222d3e1 100644
--- a/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php
+++ b/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php
@@ -14,7 +14,6 @@ class M3GetPDFFromCacheController extends Controller
     public static function index(Request $request)
     {
         // Parse PDF file and build necessary objects.
-        $parser = new Parser;
 
         $aggno = $aggmsg = '';
         $iC670M = $pDFArray = $carrier = $trackingno = $iCM688M1 = [];
@@ -36,7 +35,6 @@ class M3GetPDFFromCacheController extends Controller
                     ->where('R428US', '=', $sHUSER)
                     ->first();
 
-                $r428US = isset($iCM428M->R428US) ? $iCM428M->R428US : '';
                 $cOMPANY = isset($iCM428M->R428CO) ? $iCM428M->R428CO : '';     // Company
                 $pLANT = isset($iCM428M->R428PL) ? $iCM428M->R428PL : '';     // Plant
                 $wHS = isset($iCM428M->R428WH) ? $iCM428M->R428WH : '';     // WareHouse
@@ -98,6 +96,7 @@ class M3GetPDFFromCacheController extends Controller
                         ->get();
                 }
 
+
                 if (count($iCM695M1) > 0) {
                     $tmpCacheArr = $carrier = $trackingno = [];
                     // Loop the Results from $ICM595M1TMP
diff --git a/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php b/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php
index 40fdeda0..e0bac3cc 100644
--- a/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php
+++ b/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php
@@ -242,6 +242,8 @@ class OrderLinesOfClosedOrder extends Controller
             // MAK Store the File to Storage
             app(SpreadsheetExport::class)->store($iCM688M2Col, $prevMonthFile, 'publicCL');
 
+
+
             return back();
         } catch (\Throwable $th) {
             Log::error($th);
@@ -296,7 +298,6 @@ class OrderLinesOfClosedOrder extends Controller
         if (Storage::disk('publicCL')->exists($fileName)) {
             // File exists, retrieve content or URL
             // $content = Storage::disk('publicCL')->get($fileName);
-            $fileUrl = Storage::disk('publicCL')->url($fileName);
             $fileNameOnly = strpos($fileName, '/') != false ? substr($fileName, strpos($fileName, '/') + 1) : $fileName;
 
             // Download the file
diff --git a/Modules/M3/Http/Controllers/ReplenishSettingsController.php b/Modules/M3/Http/Controllers/ReplenishSettingsController.php
index ed890136..a9708a94 100644
--- a/Modules/M3/Http/Controllers/ReplenishSettingsController.php
+++ b/Modules/M3/Http/Controllers/ReplenishSettingsController.php
@@ -69,15 +69,15 @@ class ReplenishSettingsController extends Controller
 
     public function update(Request $request)
     {
-        $r658PN = (trim($request->R658PN) ?? trim($request->R658PN)) != null ? trim($request->R658PN) : '';
-        $r658CO = (trim($request->R658CO) ?? trim($request->R658CO)) != null ? trim($request->R658CO) : '';
-        $r658PL = (trim($request->R658PL) ?? trim($request->R658PL)) != null ? trim($request->R658PL) : '';
-        $r658WH = (trim($request->R658WH) ?? trim($request->R658WH)) != null ? trim($request->R658WH) : '';
+        $r658PN = trim((string) ($request->R658PN ?? ''));
+        $r658CO = trim((string) ($request->R658CO ?? ''));
+        $r658PL = trim((string) ($request->R658PL ?? ''));
+        $r658WH = trim((string) ($request->R658WH ?? ''));
         $r658MQ = trim($request->R658MQ);
         $r658RQ = trim($request->R658RQ);
         $r658RMQ = trim($request->R658RMQ);
         $r658TL = trim($request->R658TL);
-        $r658IZLCF = (trim($request->R658IZLCF) ?? trim($request->R658IZLCF)) != null ? trim($request->R658IZLCF) : '0';
+        $r658IZLCF = trim((string) ($request->R658IZLCF ?? '0'));
 
         DB::connection(config('m3.connection', 'pgsql'))->table('icm658m')
             ->where('R658PN', $r658PN)
@@ -176,6 +176,7 @@ class ReplenishSettingsController extends Controller
         // $rEFCAT658 = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt);
         // dd($rEFCAT658);
 
+
         return Datatables::of($rEFCAT658)->addIndexColumn()->make(true);
     }
 }
diff --git a/Modules/M3/Http/Controllers/execSummaryController.php b/Modules/M3/Http/Controllers/execSummaryController.php
index 7a2a5c8e..cd059eb2 100644
--- a/Modules/M3/Http/Controllers/execSummaryController.php
+++ b/Modules/M3/Http/Controllers/execSummaryController.php
@@ -10,7 +10,6 @@ use Str;
 class execSummaryController extends Controller
 {
     private const WAREHOUSE_IN_CLAUSE = "' and a5whs in (";
-
     public static function index(Request $request)
     {
         $iC670M = collect();
@@ -24,7 +23,7 @@ class execSummaryController extends Controller
             if ($request->ajax()) {
                 $wHDDA = isset($request->WHDDA) ? $request->WHDDA : [];
                 $wHArr = [];
-                foreach ($wHDDA as $key => $WHDDAV) {
+                foreach ($wHDDA as $WHDDAV) {
                     $cO = substr($WHDDAV, 0, 3);
                     $wHArr[] = substr($WHDDAV, 6, 3);
                 }
@@ -145,7 +144,6 @@ class execSummaryController extends Controller
                     ->where('R428US', '=', $sHUSER)
                     ->first();
 
-                $r428US = isset($iCM428M->R428US) ? $iCM428M->R428US : '';        // User
                 $cOMPANY = isset($iCM428M->R428CO) ? $iCM428M->R428CO : '110';     // Company
                 $pLANT = isset($iCM428M->R428PL) ? $iCM428M->R428PL : '144';     // Plant
                 $wHS = isset($iCM428M->R428WH) ? $iCM428M->R428WH : '322';     // WareHouse
diff --git a/Modules/M3/Http/Controllers/execSummaryLineController.php b/Modules/M3/Http/Controllers/execSummaryLineController.php
index 5eaac123..f518eaf6 100644
--- a/Modules/M3/Http/Controllers/execSummaryLineController.php
+++ b/Modules/M3/Http/Controllers/execSummaryLineController.php
@@ -10,11 +10,8 @@ use Str;
 class execSummaryLineController extends Controller
 {
     private const WAREHOUSE_IN_CLAUSE = "' and a5whs in (";
-
     private const FIRST_DAY_THIS_MONTH = 'first day of this month';
-
     private const LAST_DAY_THIS_MONTH = 'last day of this month';
-
     private const ONE_YEAR_AGO = '-1 year';
 
     public static function index(Request $request)
@@ -24,7 +21,7 @@ class execSummaryLineController extends Controller
             if ($request->ajax()) {
                 $wHDDA = isset($request->WHDDA) ? $request->WHDDA : [];
                 $wHArr = [];
-                foreach ($wHDDA as $key => $WHDDAV) {
+                foreach ($wHDDA as $WHDDAV) {
                     $cO = substr($WHDDAV, 0, 3);
                     $wHArr[] = substr($WHDDAV, 6, 3);
                 }
@@ -186,7 +183,6 @@ class execSummaryLineController extends Controller
                     ->where('R428US', '=', $sHUSER)
                     ->first();
 
-                $r428US = isset($iCM428M->R428US) ? $iCM428M->R428US : '';        // User
                 $cOMPANY = isset($iCM428M->R428CO) ? $iCM428M->R428CO : '110';     // Company
                 $pLANT = isset($iCM428M->R428PL) ? $iCM428M->R428PL : '144';     // Plant
                 $wHS = isset($iCM428M->R428WH) ? $iCM428M->R428WH : '322';     // WareHouse
diff --git a/Modules/M3/Http/Controllers/fillBOL2Controller.php b/Modules/M3/Http/Controllers/fillBOL2Controller.php
index 3ac9c7b1..547baf3b 100644
--- a/Modules/M3/Http/Controllers/fillBOL2Controller.php
+++ b/Modules/M3/Http/Controllers/fillBOL2Controller.php
@@ -31,7 +31,7 @@ class fillBOL2Controller extends Controller
             'bol_number' => $request->input('BOL_number') ?? '1234567890',
             'shipper_no' => $request->input('shipper_no') ?? '1234567890',
             'date' => now()->format('m/d/Y') ?? '01/01/2000',
-            'master_bill_no' => $request->input('master_bill_no') ? 'X' : 'X',
+            'master_bill_no' => 'X',
             'master_bill_yes' => $request->input('master_bill_yes') ? 'X' : '',
             'master_bill_drops' => $request->input('master_bill_drops') ?? '',
             'consignor_name' => $request->input('consignor_name') ?? 'ERICO INTERNATIONAL CORP',
@@ -42,7 +42,7 @@ class fillBOL2Controller extends Controller
             'consignee_address1' => $request->input('consignee_address1') ?? 'JULES VERNEWEG 75',
             'consignee_address2' => $request->input('consignee_address2') ?? '',
             'consignee_address3' => $request->input('consignee_address3') ?? 'TILBURG           .  5015 BG',
-            'freight_collect' => $request->input('freight_collect') ? 'X' : 'X',
+            'freight_collect' => 'X',
             'carrier_name' => $request->input('carrier_name') ?? 'ICL / Expeditors',
 
             'pieces' => $request->input('pieces') ?? '20',
diff --git a/Modules/M3/Http/Controllers/fillBOLController.php b/Modules/M3/Http/Controllers/fillBOLController.php
index e891afe3..0a729258 100644
--- a/Modules/M3/Http/Controllers/fillBOLController.php
+++ b/Modules/M3/Http/Controllers/fillBOLController.php
@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
 use mikehaertl\pdftk\Pdf;
 use Storage;
 
+
 class fillBOLController extends Controller
 {
     public static function index(Request $request)
@@ -31,6 +32,7 @@ class fillBOLController extends Controller
             dd($error);
         }
 
+
         $newfile = "BOL-{$bOL['BOL_number']}.pdf";
         var_dump($newfile);
 
@@ -41,6 +43,7 @@ class fillBOLController extends Controller
             dd($error);
         }
 
+
         $result = $pdf->fillForm([
             'DTESHIPED.1' => date('d/m/Y'),
             'invoice_number' => $bOL['BOL_number'],
@@ -207,7 +210,6 @@ class fillBOLController extends Controller
             dd($error);
         } else {
             return response()->file(Storage::disk('public')->path($newfile));
-            dd('step 4');
         }
 
     }
diff --git a/Modules/M3/Http/Controllers/userControlController.php b/Modules/M3/Http/Controllers/userControlController.php
index 68edb831..a5c6b042 100644
--- a/Modules/M3/Http/Controllers/userControlController.php
+++ b/Modules/M3/Http/Controllers/userControlController.php
@@ -12,13 +12,9 @@ use Modules\M3\Services\PostgresProgramBridge;
 class userControlController extends Controller
 {
     private const AUTH_FAILURE_MESSAGE = 'Could not connect due to wrong user or password.';
-
     private const DATABASE_NOT_FOUND_MESSAGE = 'Database not found. Try WRKRDBDIRE to check.';
-
     private const CONNECTION_ERROR_PREFIX = 'Could not connect. Error: ';
-
     private const PROGRAM_ERROR_PREFIX = 'Error calling program. Code: ';
-
     private const MESSAGE_SEPARATOR = ' Msg: ';
 
     public static function index(Request $request)
@@ -197,6 +193,7 @@ class userControlController extends Controller
             }
         }
 
+
         //  Add LIB
         // $result  = $conn->CLCommand('ADDLIBLE LIB(MPDAT10)');
 
@@ -212,9 +209,11 @@ class userControlController extends Controller
         // Add Delivery Note Param
         // $params[]   = $conn->AddParameterPackDec('in', 11, 0, 'ParamIn','','00000087125');
 
+
         // Start Time Tracking
         // $start = microtime(true);
 
+
         // Config::get('eproconf.misc.PGM1'), Config::get('eproconf.misc.libname4')
         // ICM700C EWOBJTST  ICM700C  ICM700CSBM
         $result = $conn->PgmCall('ICMCHGPRF', 'EWOBJ', $params, [], []);
@@ -224,7 +223,6 @@ class userControlController extends Controller
             echo "<script>alert($pGMERRORS);</script>";
 
             return 'error';
-            exit();
         }
         // Successful Call
         else {
@@ -256,6 +254,7 @@ class userControlController extends Controller
 
         $pGMERRORS = '';
 
+
         // echo "B3<br>";
         // connect to toolkit using DB2 credentials (can also leave blank for default authority)
         try {
@@ -300,7 +299,6 @@ class userControlController extends Controller
         }
 
     }
-
     private static function programBridgeConnectionError(\Throwable $exception): string
     {
         $code = (int) $exception->getCode();
@@ -311,4 +309,5 @@ class userControlController extends Controller
             default => 'error profile5',
         };
     }
+
 }
diff --git a/Modules/M3/Http/Controllers/utilitiesContoller.php b/Modules/M3/Http/Controllers/utilitiesContoller.php
index 97bddd0f..9c16dd79 100644
--- a/Modules/M3/Http/Controllers/utilitiesContoller.php
+++ b/Modules/M3/Http/Controllers/utilitiesContoller.php
@@ -9,6 +9,7 @@ use DB;
 use Dompdf\Dompdf;
 use File;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Log;
 use Modules\M3\Services\PostgresProgramBridge;
 use PDF;
@@ -64,6 +65,7 @@ class utilitiesContoller extends Controller
         // Add Delivery Note Param
         $params[] = $conn->AddParameterPackDec('in', 11, 0, 'ParamIn', '', '00000087125');
 
+
         // Start Time Tracking
         $start = microtime(true);
 
@@ -98,6 +100,7 @@ class utilitiesContoller extends Controller
         // Parse PDF file and build necessary objects.
         $parser = new Parser;
 
+
         $pdfFile = File::get('/www/sentm3test/htdocs/labels/' . $pdfFileName . '.pdf');
 
         // Transform content to base64
@@ -196,7 +199,6 @@ class utilitiesContoller extends Controller
                     ->where('R428US', '=', $sHUSER)
                     ->first();
 
-                $r428US = isset($iCM428M->R428US) ? $iCM428M->R428US : '';     // User
                 $cOMPANY = isset($iCM428M->R428CO) ? $iCM428M->R428CO : '';     // Company
                 $pLANT = isset($iCM428M->R428PL) ? $iCM428M->R428PL : '';     // Plant
                 $wHS = isset($iCM428M->R428WH) ? $iCM428M->R428WH : '';     // WareHouse
@@ -392,6 +394,7 @@ class utilitiesContoller extends Controller
             // DB::connection(config('m3.connection', 'pgsql'))->table('icm695m3')
             // ->insert(['A2CO'=> $cOMPANY,'A2WHS'=> $wHS,'A2MACPKR'=> $macpkr,'A2GS1LABEL'=> $gs1_128_bc]);
 
+
             return json_encode(['result' => 'success', 'GS1File' => $gS1FileNameNoRoot]);
 
         } catch (\Throwable $th) {
@@ -406,6 +409,8 @@ class utilitiesContoller extends Controller
     {
         print_r('>>> Generate PDF');
 
+
+
         $data = [
             'from' => 'Any Vendor<br>123 Any Street<br>SomeTown, ST 01234',
             'ship_to' => 'True Value Hardware<br>123 Any Street<br>SomeTown, ST 01234',
@@ -494,6 +499,7 @@ class utilitiesContoller extends Controller
         </body>
         </html>';
 
+
         // Initialize Dompdf
         $dompdf = new Dompdf;
         $dompdf->loadHtml($html);
diff --git a/Modules/M3/Http/Controllers/whsePerfDetailsController.php b/Modules/M3/Http/Controllers/whsePerfDetailsController.php
index 7f6129bb..db60db54 100644
--- a/Modules/M3/Http/Controllers/whsePerfDetailsController.php
+++ b/Modules/M3/Http/Controllers/whsePerfDetailsController.php
@@ -12,7 +12,6 @@ class whsePerfDetailsController extends Controller
     {
 
         $date_in = isset($request->date) ? date('Y-m-d', strtotime($request->date)) : date('Y-m-d');
-        $date_in_minus_4_months = date('Y-m-d', strtotime($date_in . ' -4 months'));
         $for = isset($request->for) ? $request->for : 'a';
 
         $username = m3_user() !== '' ? Str::upper(trim(m3_user())) : '';
@@ -22,9 +21,6 @@ class whsePerfDetailsController extends Controller
             ->where('R428US', '=', $username)
             ->first();
 
-        $co = isset($iCM428M->R428CO) ? $iCM428M->R428CO : '';
-        $whseno = isset($iCM428M->R428WH) ? $iCM428M->R428WH : '';
-        $plantno = isset($iCM428M->R428PL) ? $iCM428M->R428PL : '';
 
         $all = "tempfile4 as (
             select a5macpkr, a4shshnm, a4shipvia1, interco, a4shiptype, sum(dollarvalue) as dollarvalue, sum(weight) as weight, max(source) as source
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/BoxPackToPalletScan.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/BoxPackToPalletScan.blade.php
index 7ef9d95e..f62f4393 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/BoxPackToPalletScan.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/BoxPackToPalletScan.blade.php
@@ -56,7 +56,8 @@
                             <div>
                                 <div class="input-group">
                                     <div class="input-group-text">Box #</div>
-                                    <input type="text" id="scan-input" class="form-control" maxlength="12"
+                                    <label for="scan-input" class="visually-hidden">Scan or type box #</label>
+<input type="text" id="scan-input" class="form-control" maxlength="12"
                                         placeholder="Scan or type box #" autocomplete="off" autofocus style="width: 180px;">
                                 </div>
                             </div>
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/M3Delivery.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/M3Delivery.blade.php
index e5378f39..dbf097c1 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/M3Delivery.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/M3Delivery.blade.php
@@ -13,8 +13,7 @@
                 <button name="M3DeliveryAdd" type="button" class="btn btn-sm btn-info M3DeliveryAdd_click" id="M3DeliveryAdd_click"
                     data-AT9DPW="{{$power_user->R428CO.$power_user->R428PL.$power_user->R428WH}}">Add Record</button>
                 @endif
-                <!-- data-AT9DPW="$co.$plant.$whs">Add Record</button> -->
-            </div>
+                </div>
    {{-- // AVCO            AVCO        CHARACTER    3    No        ' '        Division
         // AVWHS        AVWHS        CHARACTER    3    No        ' '        Warehouse
         // AVPLANT        AVPLANT        CHARACTER    3    No        ' '        Plant
@@ -30,7 +29,6 @@
                         <tr>
                             <th></th>
                             <th></th>
-                            <!-- <th>Co-Plt-Whs</th> -->
                             <th>Delivery method</th>
                             <th>Ship Via</th>
                             <th>Route</th>
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/M3ErrorsDisplay.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/M3ErrorsDisplay.blade.php
index 33d73210..0094dae3 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/M3ErrorsDisplay.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/M3ErrorsDisplay.blade.php
@@ -17,27 +17,31 @@
                                 <div class="col-auto">
                                     <label class=" form-check-label" for="flexSwitchCheckDefault">Show errors</label>
                                     <div class="form-check form-switch">
-                                        <input class="form-check-input" type="checkbox" id="SHOWERRORS" name="SHOWERRORS"
+                                        <label for="SHOWERRORS" class="visually-hidden">SHOWERRORS</label>
+<input class="form-check-input" type="checkbox" id="SHOWERRORS" name="SHOWERRORS"
                                             value="Y" {{ $showerrors == 'Y' ? 'checked' : '' }}>
                                     </div>
                                 </div>
                                 {{-- MACPKR --}}
                                 <div class="col-auto">
                                     <label for="inputPassword2" class="col-form-label">Delivery Note</label>
-                                    <input type="text" class="form-control form-control-sm" name="SHMACPKR"
+                                    <label for="SHMACPKR" class="visually-hidden">SHMACPKR</label>
+<input type="text" class="form-control form-control-sm" name="SHMACPKR"
                                         id="SHMACPKR" value="{{ old('SHMACPKR') ?? $macpkr }}" maxlength="11">
                                 </div>
                                 {{-- Start Date --}}
                                 <div class="col-auto">
                                     <label for="exampleFormControlInput1" class="col-form-label">Start Date</label>
-                                    <input type="date" class="form-control form-control-sm" id="STARTDATE"
+                                    <label for="STARTDATE" class="visually-hidden">STARTDATE</label>
+<input type="date" class="form-control form-control-sm" id="STARTDATE"
                                         name="STARTDATE"
                                         value="{{ old('STARTDATE') ?? today()->subDays(1)->format('Y-m-d') }}" required>
                                 </div>
                                 {{-- End Date --}}
                                 <div class="col-auto">
                                     <label for="exampleFormControlInput1" class="col-form-label">End Date</label>
-                                    <input type="date" class="form-control form-control-sm" id="ENDDATE" name="ENDDATE"
+                                    <label for="ENDDATE" class="visually-hidden">ENDDATE</label>
+<input type="date" class="form-control form-control-sm" id="ENDDATE" name="ENDDATE"
                                         value="{{ old('ENDDATE') ?? date('Y-m-d') }}" required>
                                 </div>
                                 {{-- SHSOURCE --}}
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php
index bd45b19c..f7f2cb30 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php
@@ -15,7 +15,8 @@ Sentinel Doc Archive
                             <div class="mb-3 row">
                                 <label for="inputPassword2" class="col-sm-1 col-form-label">Del. Note #</label>
                                 <div class="col-sm-1">
-                                    <input type="text" class="form-control form-control-sm" name="MACPKR" id="SHMACPKR" value="{{$AYMACPKR}}">
+                                    <label for="SHMACPKR" class="visually-hidden">MACPKR</label>
+<input type="text" class="form-control form-control-sm" name="MACPKR" id="SHMACPKR" value="{{$AYMACPKR}}">
                                 </div>
                                 <label for="recipient-name" class="col-sm-1 col-form-label">Warehouse:</label>
                                 <div class="col-sm-2">
@@ -32,15 +33,18 @@ Sentinel Doc Archive
                                 </div>
                                 <label for="recipient-name" class="col-sm-1 col-form-label">Division:</label>
                                 <div class="col-sm-1">
-                                    <input type="text" class="form-control" name="COMPANY" id="COMPANY" required readonly>
+                                    <label for="COMPANY" class="visually-hidden">COMPANY</label>
+<input type="text" class="form-control" name="COMPANY" id="COMPANY" required readonly>
                                 </div>
                                 <label for="recipient-name" class="col-sm-1 col-form-label">Plant:</label>
                                 <div class="col-sm-1">
-                                    <input type="text" class="form-control" name="PLANT" id="PLANT" required readonly>
+                                    <label for="PLANT" class="visually-hidden">PLANT</label>
+<input type="text" class="form-control" name="PLANT" id="PLANT" required readonly>
                                 </div>
                                 <label for="recipient-name" class="col-sm-1 col-form-label">Warehouse:</label>
                                 <div class="col-sm-1">
-                                    <input type="text" class="form-control" name="WHS" id="WHS" required readonly>
+                                    <label for="WHS" class="visually-hidden">WHS</label>
+<input type="text" class="form-control" name="WHS" id="WHS" required readonly>
                                 </div>
                                 <div class="col-sm-1">
                                     <button type="submit" class="btn btn-primary mb-3" id="filterTop">Submit</button>
@@ -48,19 +52,19 @@ Sentinel Doc Archive
                             </div>
                         </form>
                         @if($aggmsg!="")
-                            <center><b> {{ $aggmsg }}
+                            <div class="text-center"><b> {{ $aggmsg }}
                             (
                             @foreach($ICM688M1 as $key => $ICM688M1R)
                                 <a href="M3GetPDFFromCache?MACPKR={{$ICM688M1R->A4MACPKR}}&COMPANY={{$COMPANY}}&PLANT={{$PLANT}}&WHS={{$WHS}}">{{$ICM688M1R->A4MACPKR}}</a>
                             @endforeach
-                            ) </b></center>
+                            ) </b></div>
                         @endif
                         @if(count($trackingno)>0)
                         @foreach($trackingno as $key => $val)
                             @if(trim($carrier[$key])=="UPSG")
-                                <center><b> UPSG <a href=https://www.ups.com/track?loc=en_US&tracknum={{$val}}>{{$val}}</a> </b></center>
+                                <div class="text-center"><b> UPSG <a href=https://www.ups.com/track?loc=en_US&tracknum={{$val}}>{{$val}}</a> </b></div>
                             @elseif(trim($carrier[$key])=="FEDG" || trim($carrier[$key])=="FXFE")
-                                <center><b> Fedex <a href=https://www.fedex.com/fedextrack/?trknbr={{$val}}>{{$val}}</a> </b></center>
+                                <div class="text-center"><b> Fedex <a href=https://www.fedex.com/fedextrack/?trknbr={{$val}}>{{$val}}</a> </b></div>
                             @endif
                         @endforeach
                         @endif
@@ -72,7 +76,7 @@ Sentinel Doc Archive
                     @if(count($PDFArray)>0)
                     {{-- {{ dump(count($PDFArray)); }} --}}
                     @foreach ($PDFArray as $pdf)
-                        <iframe src="data:application/pdf;base64,{{ $pdf }}" style="width: 100%; height: 500px;"></iframe>
+                        <iframe title="Embedded document" src="data:application/pdf;base64,{{ $pdf }}" style="width: 100%; height: 500px;"></iframe>
                     @endforeach
                     @endif
                 </div>
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/OrderLinesOfClosed.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/OrderLinesOfClosed.blade.php
index 13d1b524..ca5d20dc 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/OrderLinesOfClosed.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/OrderLinesOfClosed.blade.php
@@ -42,15 +42,18 @@
                                 </div>
                                 <div class="col">
                                     <label for="recipient-name">Division:</label>
-                                    <input type="text" class="form-control" id="COMPANY" required readonly>
+                                    <label for="COMPANY" class="visually-hidden">COMPANY</label>
+<input type="text" class="form-control" id="COMPANY" required readonly>
                                 </div>
                                 <div class="col">
                                     <label for="recipient-name">Plant:</label>
-                                    <input type="text" class="form-control" id="PLANT" required readonly>
+                                    <label for="PLANT" class="visually-hidden">PLANT</label>
+<input type="text" class="form-control" id="PLANT" required readonly>
                                 </div>
                                 <div class="col">
                                     <label for="recipient-name">Warehouse:</label>
-                                    <input type="text" class="form-control"  id="WHS" required readonly>
+                                    <label for="WHS" class="visually-hidden">WHS</label>
+<input type="text" class="form-control"  id="WHS" required readonly>
                                 </div>
                                 <div class="col">
                                     <button type="submit" class="btn btn-primary mt-4" id="filterTop">Submit</button>
@@ -62,30 +65,30 @@
                     <div class="card-body">
                         <div class="container-fluid table-responsive">
                             <table class="table table-striped table-bordered table-hover" id="datatableslinesCLosed" style="width:100%">
-                                <thead>
+                                <th scope="col"ead>
                                     <tr>
-                                        <th></th>
-                                        <th>Close Date</th>
-                                        <th>Delivery #</th>
-                                        <th>Order #</th>
+                                        <th scope="col"></th>
+                                        <th scope="col">Close Date</th>
+                                        <th scope="col">Delivery #</th>
+                                        <th scope="col">Order #</th>
 
-                                        <th>Terms</th>
-                                        <th>Weight</th>
-                                        <th>Carrier</th>
-                                        <th>Mode</th>
+                                        <th scope="col">Terms</th>
+                                        <th scope="col">Weight</th>
+                                        <th scope="col">Carrier</th>
+                                        <th scope="col">Mode</th>
 
-                                        <th>Order Type</th>
-                                        <th>Part #</th>
-                                        <th>Reserved</th>
-                                        <th>Packed</th>
-                                        <th>Back Order Qty</th>
-                                        <th>Value Packed $</th>
-                                        <th>Customer name</th>
-                                        {{-- <th>Date</th>
-                                        <th>Time</th> --}}
-                                        <th>Failure Reason</th>
-                                        <th>Currency Code</th>
-                                        <th>Freight</th>
+                                        <th scope="col">Order Type</th>
+                                        <th scope="col">Part #</th>
+                                        <th scope="col">Reserved</th>
+                                        <th scope="col">Packed</th>
+                                        <th scope="col">Back Order Qty</th>
+                                        <th scope="col">Value Packed $</th>
+                                        <th scope="col">Customer name</th>
+                                        {{-- <th scope="col">Date</th>
+                                        <th scope="col">Time</th> --}}
+                                        <th scope="col">Failure Reason</th>
+                                        <th scope="col">Currency Code</th>
+                                        <th scope="col">Freight</th>
                                     </tr>
                                 </thead>
                                 <tbody>
@@ -118,12 +121,12 @@
                                 </tbody>
                                 <tfoot>
                                     <tr>
-                                        <th colspan="12"></th>
-                                        <th>Total:</th>
-                                        <th class="text-end"></th>
-                                        <th></th><th></th><th></th>
-                                        {{-- <th></th><th></th> --}}
-                                        <th></th>
+                                        <th scope="col" colspan="12"></th>
+                                        <th scope="col">Total:</th>
+                                        <th scope="col" class="text-end"></th>
+                                        <th scope="col"></th><th scope="col"></th><th scope="col"></th>
+                                        {{-- <th scope="col"></th><th scope="col"></th> --}}
+                                        <th scope="col"></th>
                                     </tr>
                                 </tfoot>
                             </table>
@@ -148,7 +151,8 @@
                                 </div>
                                 <div class="col">
                                     <label for="REPORTDATE">To Date</label>
-                                    <input type="date" class="form-control" id="TOREPORTDATE" name="TOREPORTDATE" value="{{ $toreportDate }}" max={{ date('Y-m-d') }} required>
+                                    <label for="TOREPORTDATE" class="visually-hidden">TOREPORTDATE</label>
+<input type="date" class="form-control" id="TOREPORTDATE" name="TOREPORTDATE" value="{{ $toreportDate }}" max={{ date('Y-m-d') }} required>
                                 </div>
                                 <div class="col">
                                     <button type="button" class="btn btn-primary mt-4" id="exportExcel">Download Excel</button>
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php
index 185d1519..874da3fd 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php
@@ -88,27 +88,33 @@
                             <div class="col-6">
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Part:</label>
-                                    <input type="text" class="form-control" name="R658PN" id="R658PNA" required>
+                                    <label for="R658PNA" class="visually-hidden">R658PN</label>
+<input type="text" class="form-control" name="R658PN" id="R658PNA" required>
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Location:</label>
-                                    <input type="text" class="form-control" name="R658LC" id="R658LCA" required>
+                                    <label for="R658LCA" class="visually-hidden">R658LC</label>
+<input type="text" class="form-control" name="R658LC" id="R658LCA" required>
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Minimum quantity:</label>
-                                    <input type="number" class="form-control" name="R658MQ" id="R658MQA" required>
+                                    <label for="R658MQA" class="visually-hidden">R658MQ</label>
+<input type="number" class="form-control" name="R658MQ" id="R658MQA" required>
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Replenishment quantity:</label>
-                                    <input type="number" class="form-control" name="R658RQ" id="R658RQA" required>
+                                    <label for="R658RQA" class="visually-hidden">R658RQ</label>
+<input type="number" class="form-control" name="R658RQ" id="R658RQA" required>
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Replenishment Min quantity:</label>
-                                    <input type="number" class="form-control" name="R658RMQ" id="R658RMQA" required>
+                                    <label for="R658RMQA" class="visually-hidden">R658RMQ</label>
+<input type="number" class="form-control" name="R658RMQ" id="R658RMQA" required>
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Tolerance:</label>
-                                    <input type="text" class="form-control" name="R658TL" id="R658TLA" maxlength="2" required>
+                                    <label for="R658TLA" class="visually-hidden">R658TL</label>
+<input type="text" class="form-control" name="R658TL" id="R658TLA" maxlength="2" required>
                                 </div>
                             </div>
 
@@ -127,18 +133,22 @@
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Division:</label>
-                                    <input type="text" class="form-control" name="R658CO" id="R658COA" required readonly>
+                                    <label for="R658COA" class="visually-hidden">R658CO</label>
+<input type="text" class="form-control" name="R658CO" id="R658COA" required readonly>
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Plant:</label>
-                                    <input type="text" class="form-control" name="R658PL" id="R658PLA" required readonly>
+                                    <label for="R658PLA" class="visually-hidden">R658PL</label>
+<input type="text" class="form-control" name="R658PL" id="R658PLA" required readonly>
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Warehouse:</label>
-                                    <input type="text" class="form-control" name="R658WH" id="R658WHA" required readonly>
+                                    <label for="R658WHA" class="visually-hidden">R658WH</label>
+<input type="text" class="form-control" name="R658WH" id="R658WHA" required readonly>
                                 </div>
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="R658IZLCF" id="R658IZLCFA" value="1" aria-checked="false">
+                                    <label for="R658IZLCFA" class="visually-hidden">R658IZLCF</label>
+<input class="form-check-input" type="checkbox" role="switch" name="R658IZLCF" id="R658IZLCFA" value="1" aria-checked="false">
                                     <label class="form-check-label" for="flexSwitchCheckDefault">Lot Controlled</label>
                                 </div>
                             </div>
@@ -172,27 +182,33 @@
                             <div class="col-6">
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Part:</label>
-                                    <input type="text" class="form-control" name="R658PN" id="R658PN" required>
+                                    <label for="R658PN" class="visually-hidden">R658PN</label>
+<input type="text" class="form-control" name="R658PN" id="R658PN" required>
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Location:</label>
-                                    <input type="text" class="form-control" name="R658LC" id="R658LC" required>
+                                    <label for="R658LC" class="visually-hidden">R658LC</label>
+<input type="text" class="form-control" name="R658LC" id="R658LC" required>
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Minimum quantity:</label>
-                                    <input type="number" class="form-control" name="R658MQ" id="R658MQ" required>
+                                    <label for="R658MQ" class="visually-hidden">R658MQ</label>
+<input type="number" class="form-control" name="R658MQ" id="R658MQ" required>
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Replenishment quantity:</label>
-                                    <input type="number" class="form-control" name="R658RQ" id="R658RQ" required>
+                                    <label for="R658RQ" class="visually-hidden">R658RQ</label>
+<input type="number" class="form-control" name="R658RQ" id="R658RQ" required>
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Replenishment Min quantity:</label>
-                                    <input type="number" class="form-control" name="R658RMQ" id="R658RMQ" required>
+                                    <label for="R658RMQ" class="visually-hidden">R658RMQ</label>
+<input type="number" class="form-control" name="R658RMQ" id="R658RMQ" required>
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Tolerance:</label>
-                                    <input type="text" class="form-control" name="R658TL" id="R658TL" maxlength="2" required>
+                                    <label for="R658TL" class="visually-hidden">R658TL</label>
+<input type="text" class="form-control" name="R658TL" id="R658TL" maxlength="2" required>
                                 </div>
                             </div>
 
@@ -211,18 +227,22 @@
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Division:</label>
-                                    <input type="text" class="form-control" name="R658CO" id="R658CO" required readonly>
+                                    <label for="R658CO" class="visually-hidden">R658CO</label>
+<input type="text" class="form-control" name="R658CO" id="R658CO" required readonly>
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Plant:</label>
-                                    <input type="text" class="form-control" name="R658PL" id="R658PL" required readonly>
+                                    <label for="R658PL" class="visually-hidden">R658PL</label>
+<input type="text" class="form-control" name="R658PL" id="R658PL" required readonly>
                                 </div>
                                 <div class="mb-3">
                                     <label for="recipient-name" class="col-form-label">Warehouse:</label>
-                                    <input type="text" class="form-control" name="R658WH" id="R658WH" required readonly>
+                                    <label for="R658WH" class="visually-hidden">R658WH</label>
+<input type="text" class="form-control" name="R658WH" id="R658WH" required readonly>
                                 </div>
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="R658IZLCF" id="R658IZLCF" value="1" aria-checked="false">
+                                    <label for="R658IZLCF" class="visually-hidden">R658IZLCF</label>
+<input class="form-check-input" type="checkbox" role="switch" name="R658IZLCF" id="R658IZLCF" value="1" aria-checked="false">
                                     <label class="form-check-label" for="flexSwitchCheckDefault">Lot Controlled</label>
                                 </div>
                             </div>
@@ -282,7 +302,8 @@ $(document).ready(function() {
             orderable: false,
             searchable: false,
             render: function (data, type, row) {
-                return '<input type="checkbox" class="select-checkbox" value="' + row.id + '">';
+                return '<label for="sonar-input-5b415a7750" class="visually-hidden">sonar input 5b415a7750</label>
+<input type="checkbox" class="select-checkbox" value="' + row.id + '" id="sonar-input-5b415a7750">';
             }
         },
         {
@@ -329,7 +350,8 @@ $(document).ready(function() {
             render: function (data, type, row) {
                 // console.log("data: "+data);
                 return  data=='1' ? '<i class="fas fa-lg fa-check"></i>' :'<i class="fas fa-lg fa-times"></i>';
-                // return '<input type="checkbox" class="select-checkbox" value="' + row.id + '">';
+                // return '<label for="sonar-input-b328551d58" class="visually-hidden">sonar input b328551d58</label>
+<input type="checkbox" class="select-checkbox" value="' + row.id + '" id="sonar-input-b328551d58">';
             }
         },
         {
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/WhsPerfMetrics.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/WhsPerfMetrics.blade.php
index 6fc02450..0dd2eb2a 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/WhsPerfMetrics.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/WhsPerfMetrics.blade.php
@@ -32,15 +32,18 @@ Warehouse Performance Metrics report
                         </div>
                         <div class="col">
                             <label for="recipient-name">Division:</label>
-                            <input type="text" class="form-control" id="COMPANY" required readonly>
+                            <label for="COMPANY" class="visually-hidden">COMPANY</label>
+<input type="text" class="form-control" id="COMPANY" required readonly>
                         </div>
                         <div class="col">
                             <label for="recipient-name">Plant:</label>
-                            <input type="text" class="form-control" id="PLANT" required readonly>
+                            <label for="PLANT" class="visually-hidden">PLANT</label>
+<input type="text" class="form-control" id="PLANT" required readonly>
                         </div>
                         <div class="col">
                             <label for="recipient-name">Warehouse:</label>
-                            <input type="text" class="form-control"  id="WHS" required readonly>
+                            <label for="WHS" class="visually-hidden">WHS</label>
+<input type="text" class="form-control"  id="WHS" required readonly>
                         </div>
                         <div class="col">
                             {{-- <button type="submit" class="btn btn-primary mt-4" id="filterTop">Submit</button> --}}
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php
index 88b1e924..6a216a53 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php
@@ -20,7 +20,8 @@ Solon Sentinel Portal
                     <div class="row mb-3">
                         <label for="inputEmail" class="col-sm-2 col-form-label">Date Range</label>
                             <div class="col-sm-10">
-                                <input value="{{ $starting }} - {{ $ending }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
+                                <label for="text" class="visually-hidden">dates</label>
+<input value="{{ $starting }} - {{ $ending }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
                             </div>
                     </div>
 
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/fillBOL.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/fillBOL.blade.php
index 96bb2b82..01476aca 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/fillBOL.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/fillBOL.blade.php
@@ -25,12 +25,12 @@
                         <form method="POST" action="{{ route('m3.fillBOLPDF') }}">
                             @csrf
                             <div class="form-group">
-                                <label>BOL number</label>
-                                <input type="text" class="form-control" name="BOL_number" value="" >
+                                <label for="sonar-input-b5ab07fdda">BOL number</label>
+                                <input type="text" class="form-control" name="BOL_number" value="" id="sonar-input-b5ab07fdda">
                             </div>
                             <div class="form-group">
-                                <label>Amount</label>
-                                <input type="text" class="form-control" name="amount" value="">
+                                <label for="sonar-input-e32a7fe74c">Amount</label>
+                                <input type="text" class="form-control" name="amount" value="" id="sonar-input-e32a7fe74c">
                             </div>
                             <input type="hidden" name="referrer" id="referrer" value="">
                             <div class="form-group mt-3 mb-2">
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/fillBOL2.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/fillBOL2.blade.php
index 37b95ded..fbb80370 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/fillBOL2.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/fillBOL2.blade.php
@@ -25,12 +25,12 @@
                         <form method="POST" action="{{ route('m3.fillBOL2PDF') }}">
                             @csrf
                             <div class="form-group">
-                                <label>BOL number</label>
-                                <input type="text" class="form-control" name="BOL_number" value="" >
+                                <label for="sonar-input-903d906a51">BOL number</label>
+                                <input type="text" class="form-control" name="BOL_number" value="" id="sonar-input-903d906a51">
                             </div>
                             <div class="form-group">
-                                <label>Amount</label>
-                                <input type="text" class="form-control" name="amount" value="">
+                                <label for="sonar-input-0ef98af069">Amount</label>
+                                <input type="text" class="form-control" name="amount" value="" id="sonar-input-0ef98af069">
                             </div>
                             <input type="hidden" name="referrer" id="referrer" value="">
                             <div class="form-group mt-3 mb-2">
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/orderInquiry.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/orderInquiry.blade.php
index 04100855..3faef7f7 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/orderInquiry.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/orderInquiry.blade.php
@@ -5,7 +5,7 @@ Solon Sentinel Portal - Order Inquiry
 @section('breadcrumb')
 <div class="row">
     <hr class="hr-primary" />
-    <nav class="navbar navbar-expand-lg navbar-light">
+    <nav class="navbar navbar-expand-lg navbar-light" aria-label="Page navigation">
         <div class="container-fluid">
           <nav aria-label="breadcrumb">
             <ol class="breadcrumb breadcrumb-custom">
@@ -37,7 +37,8 @@ Solon Sentinel Portal - Order Inquiry
                             <div class="col-sm-10">
                             <label for="inputOrder" class="col-sm-2 col-form-label">Please enter an order number</label>
                                 <input type="hidden" id="reason" name="reason" value="-">
-                                <input type="text" id="order" name="order" maxlength=6 length=4 aria-describedby="textHelpBlock">
+                                <label for="order" class="visually-hidden">order</label>
+<input type="text" id="order" name="order" maxlength=6 length=4 aria-describedby="textHelpBlock">
                                 <button name="submit" type="submit" class="btn btn-primary">Submit</button>
                             </div>
                         </div>
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReq.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReq.blade.php
index 83b8327d..55da0ef4 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReq.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReq.blade.php
@@ -5,7 +5,7 @@ Solon Sentinel Portal - Orders On Hold Summary
 @section('breadcrumb')
 <div class="row">
     <hr class="hr-primary" />
-    <nav class="navbar navbar-expand-lg navbar-light">
+    <nav class="navbar navbar-expand-lg navbar-light" aria-label="Page navigation">
         <div class="container-fluid">
           <nav aria-label="breadcrumb">
             <ol class="breadcrumb breadcrumb-custom">
@@ -37,7 +37,8 @@ Solon Sentinel Portal - Orders On Hold Summary
                             <div class="col-sm-10">
                             <label for="inputWhs" class="col-sm-2 col-form-label">Please choose Selling warehouse subset</label>
                                 @foreach($whs_list as $key => $val)
-                                    <input value="{{ $val->SLSRWH }}" id="whs" name="whs[]" type="checkbox" aria-describedby="textHelpBlock"
+                                    <label for="sonar-input-5fd2d62166" class="visually-hidden">sonar input 5fd2d62166</label>
+<input value="{{ $val- id="sonar-input-5fd2d62166">SLSRWH }}" id="whs" name="whs[]" type="checkbox" aria-describedby="textHelpBlock"
                                     @if(array_key_exists($val->SLSRWH, $checked_whs)) checked @endif
                                     > {{ $val->SLSRWH }} &nbsp; &nbsp; &nbsp;
                                 @endforeach
@@ -59,14 +60,14 @@ Solon Sentinel Portal - Orders On Hold Summary
                 <div class="card-body">
 
                     <table class="table table-striped table-bordered table-hover" id="datatablesSimple4">
-                        <thead>
+                        <th scope="col"ead>
                             <tr>
-                                <th>Reason</th>
-                                <th style="text-align:center">No of Orders</th>
-                                <th style="text-align:right">Total</th>
-                                <th style="text-align:right">Total for subset</th>
-                                <th style="text-align:right">Reserved for subset</th>
-                                <th style="text-align:right">On pick for subset</th>
+                                <th scope="col">Reason</th>
+                                <th scope="col" style="text-align:center">No of Orders</th>
+                                <th scope="col" style="text-align:right">Total</th>
+                                <th scope="col" style="text-align:right">Total for subset</th>
+                                <th scope="col" style="text-align:right">Reserved for subset</th>
+                                <th scope="col" style="text-align:right">On pick for subset</th>
                             </tr>
                         </thead>
                         <tbody>
@@ -84,12 +85,12 @@ Solon Sentinel Portal - Orders On Hold Summary
                         </tbody>
                         <tfoot>
                             <tr style="text-align:right">
-                                <th style="text-align:right"></th>
-                                <th style="text-align:center"></th>
-                                <th style="text-align:right"></th>
-                                <th style="text-align:right"></th>
-                                <th style="text-align:right"></th>
-                                <th style="text-align:right"></th>
+                                <th scope="col" style="text-align:right"></th>
+                                <th scope="col" style="text-align:center"></th>
+                                <th scope="col" style="text-align:right"></th>
+                                <th scope="col" style="text-align:right"></th>
+                                <th scope="col" style="text-align:right"></th>
+                                <th scope="col" style="text-align:right"></th>
                             </tr>
                         </tfoot>
                     </table>
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReqOrder.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReqOrder.blade.php
index a68d082c..b27664ca 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReqOrder.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReqOrder.blade.php
@@ -5,7 +5,7 @@
 @section('breadcrumb')
 <div class="row">
     <hr class="hr-primary" />
-    <nav class="navbar navbar-expand-lg navbar-light">
+    <nav class="navbar navbar-expand-lg navbar-light" aria-label="Page navigation">
         <div class="container-fluid">
           <nav aria-label="breadcrumb">
             <ol class="breadcrumb breadcrumb-custom">
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReqReason.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReqReason.blade.php
index 1f779dcf..d3e7eba0 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReqReason.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/ordersOnHoldReqReason.blade.php
@@ -5,7 +5,7 @@
 @section('breadcrumb')
 <div class="row">
     <hr class="hr-primary" />
-    <nav class="navbar navbar-expand-lg navbar-light">
+    <nav class="navbar navbar-expand-lg navbar-light" aria-label="Page navigation">
         <div class="container-fluid">
           <nav aria-label="breadcrumb">
             <ol class="breadcrumb breadcrumb-custom">
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/pendingClosure.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/pendingClosure.blade.php
index 9b6435e8..8f082178 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/pendingClosure.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/pendingClosure.blade.php
@@ -134,7 +134,8 @@ Solon Sentinel Portal - Trucks pending closure with M3
                               <label class="visually-hidden" for="inlineFormInputGroupManifest #">Manifest #</label>
                               <div class="input-group">
                                 <div class="input-group-text">View closed manifest</div>
-                                <input type="text" class="form-control" id="MFInput" placeholder="Manifest #">
+                                <label for="MFInput" class="visually-hidden">Manifest #</label>
+<input type="text" class="form-control" id="MFInput" placeholder="Manifest #">
                               </div>
                             </div>
                             <div class="col-12">
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/ship-to/create.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/ship-to/create.blade.php
index c107e16f..d2239b63 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/ship-to/create.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/ship-to/create.blade.php
@@ -26,43 +26,43 @@
                         <form method="POST" action="{{ route('m3.ship-to.store') }}">
                             @csrf
                             <div class="form-group">
-                                <label>Customer Number</label>
+                                <label for="sonar-input-a5f61985b0">Customer Number</label>
                                 <input type="text" class="form-control" name="AUSTCN" value="{{ old('AUSTCN') }}"
-                                    maxlength="11">
+                                    maxlength="11" id="sonar-input-a5f61985b0">
                             </div>
                             <div class="form-group">
-                                <label>Company Name &bull;</label>
+                                <label for="sonar-input-20156147e6">Company Name &bull;</label>
                                 <input type="text" class="form-control" name="AUSHSHNM" value="{{ old('AUSHSHNM') }}"
-                                    required maxlength="36">
+                                    required maxlength="36" id="sonar-input-20156147e6">
                             </div>
                             <div class="form-group">
-                                <label>Address 1 &bull;</label>
+                                <label for="sonar-input-709c1e07ef">Address 1 &bull;</label>
                                 <input type="text" class="form-control" name="AUSHSHA1" value="{{ old('AUSHSHA1') }}"
-                                    required maxlength="36">
+                                    required maxlength="36" id="sonar-input-709c1e07ef">
                             </div>
                             <div class="form-group">
-                                <label>Address 2 &bull;</label>
+                                <label for="sonar-input-e3787f959d">Address 2 &bull;</label>
                                 <input type="text" class="form-control" name="AUSHSHA2" value="{{ old('AUSHSHA2') }}"
-                                    required maxlength="36">
+                                    required maxlength="36" id="sonar-input-e3787f959d">
                             </div>
                             <div class="form-group">
-                                <label>Address 3</label>
+                                <label for="sonar-input-5bbfb65f3b">Address 3</label>
                                 <input type="text" class="form-control" name="AUSHSHA3" value="{{ old('AUSHSHA3') }}"
-                                    maxlength="36">
+                                    maxlength="36" id="sonar-input-5bbfb65f3b">
                             </div>
                             <div class="form-group">
-                                <label>Address 4</label>
+                                <label for="sonar-input-e7a28e585b">Address 4</label>
                                 <input type="text" class="form-control" name="AUSHSHA4" value="{{ old('AUSHSHA4') }}"
-                                    maxlength="36">
+                                    maxlength="36" id="sonar-input-e7a28e585b">
                             </div>
                             <div class="form-group">
-                                <label>City &bull;</label>
+                                <label for="sonar-input-0620339934">City &bull;</label>
                                 <input type="text" class="form-control" name="AUSHSHCI" value="{{ old('AUSHSHCI') }}"
-                                    required maxlength="20">
+                                    required maxlength="20" id="sonar-input-0620339934">
                             </div>
                             <div class="form-group">
-                                <label>State &bull;</label>
-                                <select class="form-select" name="AUSHSHST" required>
+                                <label for="sonar-select-a5f61985b0">State &bull;</label>
+                                <select class="form-select" name="AUSHSHST" required id="sonar-select-a5f61985b0">
                                     <option value="">Select a state</option>
                                     @foreach ($states as $code => $name)
                                         <option value="{{ $code }}"
@@ -74,19 +74,19 @@
                             </div>
 
                             <div class="form-group">
-                                <label>Zip Code &bull;</label>
+                                <label for="sonar-input-2ed60d69e4">Zip Code &bull;</label>
                                 <input type="text" class="form-control" name="AUSHSHZP" value="{{ old('AUSHSHZP') }}"
-                                    required maxlength="10">
+                                    required maxlength="10" id="sonar-input-2ed60d69e4">
                             </div>
                             <div class="form-group">
-                                <label>Country Code &bull;</label>
+                                <label for="sonar-input-d95b035dcf">Country Code &bull;</label>
                                 <input type="text" class="form-control" name="AUSHSHCT" value="{{ old('AUSHSHCT') }}"
-                                    required maxlength="3">
+                                    required maxlength="3" id="sonar-input-d95b035dcf">
                             </div>
                             <div class="form-group">
-                                <label>Warehouse &bull;</label>
+                                <label for="sonar-input-3912060202">Warehouse &bull;</label>
                                 <input type="text" class="form-control" name="AUSHWHS" value="{{ old('AUSHWHS') }}"
-                                    required maxlength="3">
+                                    required maxlength="3" id="sonar-input-3912060202">
                             </div>
                             <div class="form-group mt-3 mb-2">
                                 <button type="submit" class="btn btn-primary">Submit</button>
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/ship-to/edit.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/ship-to/edit.blade.php
index e2d2d375..0f08e198 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/ship-to/edit.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/ship-to/edit.blade.php
@@ -27,43 +27,43 @@
                             @method('PUT')
 
                             <div class="form-group">
-                                <label>Customer Number</label>
+                                <label for="sonar-input-9efe270e0a">Customer Number</label>
                                 <input type="text" class="form-control" name="AUSTCN"
-                                    value="{{ trim($shipTo->AUSTCN) }}">
+                                    value="{{ trim($shipTo- id="sonar-input-9efe270e0a">AUSTCN) }}">
                             </div>
                             <div class="form-group">
-                                <label>Company Name &bull;</label>
+                                <label for="sonar-input-7c20b39e9b">Company Name &bull;</label>
                                 <input type="text" class="form-control" name="AUSHSHNM"
-                                    value="{{ old('AUSHSHNM', trim($shipTo->AUSHSHNM)) }}" required maxlength="36">
+                                    value="{{ old('AUSHSHNM', trim($shipTo- id="sonar-input-7c20b39e9b">AUSHSHNM)) }}" required maxlength="36">
                             </div>
                             <div class="form-group">
-                                <label>Address 1 &bull;</label>
+                                <label for="sonar-input-2f1f7536fe">Address 1 &bull;</label>
                                 <input type="text" class="form-control" name="AUSHSHA1"
-                                    value="{{ old('AUSHSHA1', trim($shipTo->AUSHSHA1)) }}" required maxlength="36">
+                                    value="{{ old('AUSHSHA1', trim($shipTo- id="sonar-input-2f1f7536fe">AUSHSHA1)) }}" required maxlength="36">
                             </div>
                             <div class="form-group">
-                                <label>Address 2 &bull;</label>
+                                <label for="sonar-input-1709fb5d67">Address 2 &bull;</label>
                                 <input type="text" class="form-control" name="AUSHSHA2"
-                                    value="{{ old('AUSHSHA2', trim($shipTo->AUSHSHA2)) }}" required maxlength="36">
+                                    value="{{ old('AUSHSHA2', trim($shipTo- id="sonar-input-1709fb5d67">AUSHSHA2)) }}" required maxlength="36">
                             </div>
                             <div class="form-group">
-                                <label>Address 3</label>
+                                <label for="sonar-input-fb35089be3">Address 3</label>
                                 <input type="text" class="form-control" name="AUSHSHA3"
-                                    value="{{ old('AUSHSHA3', trim($shipTo->AUSHSHA3)) }}" maxlength="36">
+                                    value="{{ old('AUSHSHA3', trim($shipTo- id="sonar-input-fb35089be3">AUSHSHA3)) }}" maxlength="36">
                             </div>
                             <div class="form-group">
-                                <label>Address 4</label>
+                                <label for="sonar-input-5452b56d11">Address 4</label>
                                 <input type="text" class="form-control" name="AUSHSHA4"
-                                    value="{{ old('AUSHSHA4', trim($shipTo->AUSHSHA4)) }}" maxlength="36">
+                                    value="{{ old('AUSHSHA4', trim($shipTo- id="sonar-input-5452b56d11">AUSHSHA4)) }}" maxlength="36">
                             </div>
                             <div class="form-group">
-                                <label>City &bull;</label>
+                                <label for="sonar-input-a1059c7901">City &bull;</label>
                                 <input type="text" class="form-control" name="AUSHSHCI"
-                                    value="{{ old('AUSHSHCI', trim($shipTo->AUSHSHCI)) }}" required maxlength="20">
+                                    value="{{ old('AUSHSHCI', trim($shipTo- id="sonar-input-a1059c7901">AUSHSHCI)) }}" required maxlength="20">
                             </div>
                             <div class="form-group">
-                                <label>State &bull;</label>
-                                <select class="form-select" name="AUSHSHST" required>
+                                <label for="sonar-select-9efe270e0a">State &bull;</label>
+                                <select class="form-select" name="AUSHSHST" required id="sonar-select-9efe270e0a">
                                     <option value="">Select a state</option>
                                     @foreach ($states as $code => $name)
                                         <option value="{{ $code }}"
@@ -74,17 +74,17 @@
                                 </select>
                             </div>
                             <div class="form-group">
-                                <label>Zip Code</label>
-                                <input type="text" class="form-control" value="{{ trim($shipTo->AUSHSHZP) }}" readonly>
+                                <label for="sonar-input-07cebce94f">Zip Code</label>
+                                <input type="text" class="form-control" value="{{ trim($shipTo- id="sonar-input-07cebce94f">AUSHSHZP) }}" readonly>
                             </div>
                             <div class="form-group">
-                                <label>Country Code &bull;</label>
+                                <label for="sonar-input-8b496b4c51">Country Code &bull;</label>
                                 <input type="text" class="form-control" name="AUSHSHCT"
-                                    value="{{ old('AUSHSHCT', trim($shipTo->AUSHSHCT)) }}" required maxlength="3">
+                                    value="{{ old('AUSHSHCT', trim($shipTo- id="sonar-input-8b496b4c51">AUSHSHCT)) }}" required maxlength="3">
                             </div>
                             <div class="form-group">
-                                <label>Warehouse</label>
-                                <input type="text" class="form-control" value="{{ $shipTo->AUSHWHS }}" readonly>
+                                <label for="sonar-input-2b51446d4a">Warehouse</label>
+                                <input type="text" class="form-control" value="{{ $shipTo- id="sonar-input-2b51446d4a">AUSHWHS }}" readonly>
                             </div>
 
                             <div class="form-group mt-3 mb-2">
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php
index 2c377581..afb86169 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php
@@ -19,7 +19,8 @@ Solon Sentinel Portal - Daily User Efficiency
                         <div class="row mb-3">
                             <label for="inputEmail" class="col-sm-2 col-form-label">Date</label>
                             <div class="col-sm-10">
-                                <input value="{{ $starting }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
+                                <label for="text" class="visually-hidden">dates</label>
+<input value="{{ $starting }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
                             </div>
                         </div>
                         <div class="row mb-3">
@@ -98,7 +99,6 @@ Solon Sentinel Portal - Daily User Efficiency
                             <td style="text-align:right" colspan="5"> Total </td>
                             <td style="text-align:right"> {{ (isset($totals_array['entries']) ? $totals_array['entries'] : "") }} </td>
                             <td style="text-align:right"> {{number_format($totals_array['weight'],2)}} </td>
-                            {{-- <!--<td style="text-align:right"> ${{number_format($totals_array['value'],2)}} </td>--> --}}
                             <td style="text-align:right"> {{number_format($totals_array['picked'],0)}} </td>
                             <td> </td>
                             <td> </td>
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4_old.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4_old.blade.php
index c36138d4..aab2c817 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4_old.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4_old.blade.php
@@ -21,7 +21,8 @@ Solon Sentinel Portal - userPickingStats v4
                         <div class="row mb-3">
                             <label for="inputEmail" class="col-sm-2 col-form-label">Date</label>
                             <div class="col-sm-10">
-                                <input value="{{ $starting }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
+                                <label for="text" class="visually-hidden">dates</label>
+<input value="{{ $starting }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
                             </div>
                         </div>
                         <div class="row mb-3">
@@ -81,7 +82,6 @@ Solon Sentinel Portal - userPickingStats v4
                                 <td> {{ $val->HOUR }} </td>
                                 <td> {{ str_replace(' ','______',$val->A5PICKCMTS) }} </td>
                                 <td style="text-align:right"> {{ number_format($val->WEIGHT,2) }} </td>
-                                <!--<td style="text-align:right"> ${{ number_format($val->A5VALUE,2) }} </td>-->
                                 <td style="text-align:right"> {{ number_format($val->A5PICKED,0) }} </td>
                                 <td style="text-align:right"> {{ $val->A5PART }} </td>
                                 <td style="text-align:left">
@@ -103,7 +103,6 @@ Solon Sentinel Portal - userPickingStats v4
                             <td style="text-align:right"> Total </td>
                             <td style="text-align:right"> {{ (isset($totals_array['entries']) ? $totals_array['entries'] : "") }} </td>
                             <td style="text-align:right"> {{number_format($totals_array['weight'],2)}} </td>
-                            <!--<td style="text-align:right"> ${{number_format($totals_array['value'],2)}} </td>-->
                             <td style="text-align:right"> {{number_format($totals_array['picked'],0)}} </td>
                             <td> </td>
                             <td> </td>
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats5.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats5.blade.php
index 9edcce9b..c110b068 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats5.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats5.blade.php
@@ -19,7 +19,8 @@ Solon Sentinel Portal - Graph User Efficiency
                         <div class="row mb-3">
                             <label for="inputEmail" class="col-sm-2 col-form-label">Date Range</label>
                             <div class="col-sm-10">
-                                <input value="{{ $starting }} - {{ $ending }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
+                                <label for="text" class="visually-hidden">dates</label>
+<input value="{{ $starting }} - {{ $ending }}" id="text" name="dates" type="text"  aria-describedby="textHelpBlock" class="form-control">
                             </div>
                         </div>
                         <div class="row mb-3">
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/userProfile.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/userProfile.blade.php
index 74515e29..b7ecaaad 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/userProfile.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/userProfile.blade.php
@@ -25,20 +25,20 @@ Change Warehouse
                         <form method="POST" action="{{ route('m3.userprofileupdate') }}">
                             @csrf
                             <div class="form-group">
-                                <label>User profile</label>
-                                <input type="text" class="form-control" name="R428US" value="{{ trim($ICM428M->R428US) }}" readonly>
+                                <label for="sonar-input-06ac09682b">User profile</label>
+                                <input type="text" class="form-control" name="R428US" value="{{ trim($ICM428M- id="sonar-input-06ac09682b">R428US) }}" readonly>
                             </div>
                             <div class="form-group">
-                                <label>First Name</label>
-                                <input type="text" class="form-control" value="{{ trim($ICM428M->R428FIRST) }}" readonly>
+                                <label for="sonar-input-95fa12106e">First Name</label>
+                                <input type="text" class="form-control" value="{{ trim($ICM428M- id="sonar-input-95fa12106e">R428FIRST) }}" readonly>
                             </div>
                             <div class="form-group">
-                                <label>Family Name</label>
-                                <input type="text" class="form-control" value="{{ trim($ICM428M->R428FAMILY) }}" readonly>
+                                <label for="sonar-input-a6f8891ebe">Family Name</label>
+                                <input type="text" class="form-control" value="{{ trim($ICM428M- id="sonar-input-a6f8891ebe">R428FAMILY) }}" readonly>
                             </div>
                             <div class="form-group">
-                                <label>Div-Plt-Whs</label>
-                                <select class="form-select" name="R428DPW" required>
+                                <label for="sonar-select-06ac09682b">Div-Plt-Whs</label>
+                                <select class="form-select" name="R428DPW" required id="sonar-select-06ac09682b">
                                     <option value="" disabled hidden>Select</option>
                                     @foreach ($IC670M as $key => $IC670MR)
                                         @php
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/whsePerf.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/whsePerf.blade.php
index c4d3d284..e7bb2251 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/whsePerf.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/whsePerf.blade.php
@@ -3,141 +3,147 @@
     Solon Sentinel Portal - Warehouse Performance Metrics
 @endsection
 @section('content')
-    <!-- /.row -->
-    <!-- <div class="container-fluid px-4"> -->
-        <h1 class="mt-4">Warehouse Performance Metrics</h1>
+    <h1 class="mt-4">Warehouse Performance Metrics</h1>
 
         <table class="table table-striped table-bordered table-hover table-sm" id="datatablesSimple1" style="width:100%">
-        <!-- <table class="table table-striped table-bordered table-hover table-sm" style="width:100%"> -->
-            <thead style="position: sticky; top: 56px; z-index: 1000; background-color: #F8F9FA; border: 2px solid black;">
+            <th scope="col"ead style="position: sticky; top: 56px; z-index: 1000; background-color: #F8F9FA; border: 2px solid black;">
                 <tr class="border-bottom: 1px solid black;">
-                    <th style="width:80px">For month</th>
-                    <th style="width:70px">{{ date('Y-m',strtotime($date_in)) }}</th>
-                    <th class="text-center" style="background-color:lightgrey" colspan=14>Non-interco and Ground/Air</th>
-                    <th></th>
-                    <th class="text-center" style="background-color:lightgrey" colspan=2>Intercompany & Ocean</th>
+                    <th scope="col" style="width:80px">For month</th>
+                    <th scope="col" style="width:70px">{{ date('Y-m',strtotime($date_in)) }}</th>
+                    <th scope="col" class="text-center" style="background-color:lightgrey" colspan=14>Non-interco and Ground/Air</th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-center" style="background-color:lightgrey" colspan=2>Intercompany & Ocean</th>
                 </tr>
                 <tr class="border-bottom: 1px solid black;">
-                    <th style="width:80px"></th>
-                    <th style="width:70px"></th>
-                    <th class="text-center" colspan=4>All</th>
-                    <th></th>
-                    <th class="text-center" colspan=4>LTL</th>
-                    <th></th>
-                    <th class="text-center" colspan=4>Parcel</th>
-                    <th></th>
-                    <th colspan=2></th>
+                    <th scope="col" style="width:80px"></th>
+                    <th scope="col" style="width:70px"></th>
+                    <th scope="col" class="text-center" colspan=4>All</th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-center" colspan=4>LTL</th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-center" colspan=4>Parcel</th>
+                    <th scope="col"></th>
+                    <th scope="col" colspan=2></th>
                 </tr>
                 <tr class="border-bottom: 1px solid black;">
-                    <th></th>
-                    <th></th>
-                    <th class="text-center" style="width:50px">A1+C1</th>
-                    <th class="text-center" style="width:50px">B</th>
-                    <th class="text-center" style="width:50px">A3+C2</th>
-                    <th class="text-center" style="width:20px"></th>
-                    <th style="width:10px"></th>
-                    <th class="text-center" style="width:50px">A1+C1</th>
-                    <th class="text-center" style="width:50px">B</th>
-                    <th class="text-center" style="width:50px">A3+C2</th>
-                    <th class="text-center" style="width:20px"></th>
-                    <th style="width:10px"></th>
-                    <th class="text-center" style="width:50px">A1+C1</th>
-                    <th class="text-center" style="width:50px">B</th>
-                    <th class="text-center" style="width:50px">A3+C2</th>
-                    <th class="text-center" style="width:20px"></th>
-                    <th style="width:10px"></th>
-                    <th class="text-center" style="width:50px">A1+C1</th>
-                    <th class="text-center" style="width:50px">A3+C2</th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-center" style="width:50px">A1+C1</th>
+                    <th scope="col" class="text-center" style="width:50px">B</th>
+                    <th scope="col" class="text-center" style="width:50px">A3+C2</th>
+                    <th scope="col" class="text-center" style="width:20px"></th>
+                    <th scope="col" style="width:10px"></th>
+                    <th scope="col" class="text-center" style="width:50px">A1+C1</th>
+                    <th scope="col" class="text-center" style="width:50px">B</th>
+                    <th scope="col" class="text-center" style="width:50px">A3+C2</th>
+                    <th scope="col" class="text-center" style="width:20px"></th>
+                    <th scope="col" style="width:10px"></th>
+                    <th scope="col" class="text-center" style="width:50px">A1+C1</th>
+                    <th scope="col" class="text-center" style="width:50px">B</th>
+                    <th scope="col" class="text-center" style="width:50px">A3+C2</th>
+                    <th scope="col" class="text-center" style="width:20px"></th>
+                    <th scope="col" style="width:10px"></th>
+                    <th scope="col" class="text-center" style="width:50px">A1+C1</th>
+                    <th scope="col" class="text-center" style="width:50px">A3+C2</th>
                 </tr>
                 <tr class="border-bottom: 1px solid black;">
-                    <th></th>
-                    <th></th>
-                    <th class="text-center" style="width:50px">Closed</th>
-                    <th class="text-center" style="width:50px">Closed (Cherry)</th>
-                    <th class="text-center" style="width:50px">Still Open</th>
-                    <th class="text-center" style="width:20px">OTTC</th>
-                    <th></th>
-                    <th class="text-center" style="width:50px">Closed</th>
-                    <th class="text-center" style="width:50px">Closed (Cherry)</th>
-                    <th class="text-center" style="width:50px">Still Open</th>
-                    <th class="text-center" style="width:20px">OTTC</th>
-                    <th></th>
-                    <th class="text-center" style="width:50px">Closed</th>
-                    <th class="text-center" style="width:50px">Closed (Cherry)</th>
-                    <th class="text-center" style="width:50px">Still Open</th>
-                    <th class="text-center" style="width:20px">OTTC</th>
-                    <th></th>
-                    <th class="text-center" style="width:50px">Closed</th>
-                    <th class="text-center" style="width:50px">Still Open</th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-center" style="width:50px">Closed</th>
+                    <th scope="col" class="text-center" style="width:50px">Closed (Cherry)</th>
+                    <th scope="col" class="text-center" style="width:50px">Still Open</th>
+                    <th scope="col" class="text-center" style="width:20px">OTTC</th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-center" style="width:50px">Closed</th>
+                    <th scope="col" class="text-center" style="width:50px">Closed (Cherry)</th>
+                    <th scope="col" class="text-center" style="width:50px">Still Open</th>
+                    <th scope="col" class="text-center" style="width:20px">OTTC</th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-center" style="width:50px">Closed</th>
+                    <th scope="col" class="text-center" style="width:50px">Closed (Cherry)</th>
+                    <th scope="col" class="text-center" style="width:50px">Still Open</th>
+                    <th scope="col" class="text-center" style="width:20px">OTTC</th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-center" style="width:50px">Closed</th>
+                    <th scope="col" class="text-center" style="width:50px">Still Open</th>
                 </tr>
                 <tr class="border-bottom: 1px solid black;">
-                    <th style="background-color:grey" colspan=19></th>
+                    <th scope="col" style="background-color:grey" colspan=19></th>
                 </tr>
                 <tr>
-                    <th>Targets</th>
-                    <th>Deliv Notes</th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th class="text-right" style="width:20px"><input type=text name=ALLtgtnotes maxlength=3 size=2 readonly value={{ $pct_array['all_notes'] }}></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th class="text-right" style="width:20px"><input type=text name=LTLtgtnotes maxlength=3 size=2 readonly value={{ $pct_array['ltl_notes'] }}></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th class="text-right" style="width:20px"><input type=text name=PARCELtgtnotes maxlength=3 size=2 readonly value={{ $pct_array['parcel_notes'] }}></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
+                    <th scope="col">Targets</th>
+                    <th scope="col">Deliv Notes</th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-right" style="width:20px"><label for="sonar-input-270366714a" class="visually-hidden">sonar input 270366714a</label>
+<input type=text name=ALLtgtnotes maxlength=3 size=2 readonly value={{ $pct_array['all_notes'] }} id="sonar-input-270366714a"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-right" style="width:20px"><label for="sonar-input-8d3c22d334" class="visually-hidden">sonar input 8d3c22d334</label>
+<input type=text name=LTLtgtnotes maxlength=3 size=2 readonly value={{ $pct_array['ltl_notes'] }} id="sonar-input-8d3c22d334"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-right" style="width:20px"><label for="sonar-input-ea8cafd287" class="visually-hidden">sonar input ea8cafd287</label>
+<input type=text name=PARCELtgtnotes maxlength=3 size=2 readonly value={{ $pct_array['parcel_notes'] }} id="sonar-input-ea8cafd287"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
                 </tr>
                 <tr>
-                    <th></th>
-                    <th>Dollars</th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th class="text-right" style="width:20px"><input type=text name=ALLtgtdlr maxlength=3 size=2 readonly value={{ $pct_array['all_dollars'] }}></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th class="text-right" style="width:20px"><input type=text name=LTLtgtdlr maxlength=3 size=2 readonly value={{ $pct_array['ltl_dollars'] }}></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th class="text-right" style="width:20px"><input type=text name=PARCELtgtdlr maxlength=3 size=2 readonly value={{ $pct_array['parcel_dollars'] }}></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
+                    <th scope="col"></th>
+                    <th scope="col">Dollars</th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-right" style="width:20px"><label for="sonar-input-8b6c7add91" class="visually-hidden">sonar input 8b6c7add91</label>
+<input type=text name=ALLtgtdlr maxlength=3 size=2 readonly value={{ $pct_array['all_dollars'] }} id="sonar-input-8b6c7add91"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-right" style="width:20px"><label for="sonar-input-fcd53e4974" class="visually-hidden">sonar input fcd53e4974</label>
+<input type=text name=LTLtgtdlr maxlength=3 size=2 readonly value={{ $pct_array['ltl_dollars'] }} id="sonar-input-fcd53e4974"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-right" style="width:20px"><label for="sonar-input-379ed77e4a" class="visually-hidden">sonar input 379ed77e4a</label>
+<input type=text name=PARCELtgtdlr maxlength=3 size=2 readonly value={{ $pct_array['parcel_dollars'] }} id="sonar-input-379ed77e4a"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
                 </tr>
                 <tr class="border-bottom: 1px solid black;">
-                    <th></th>
-                    <th>Weight</th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th class="text-right" style="width:20px"><input type=text name=ALLtgtwgt maxlength=3 size=2 readonly value={{ $pct_array['all_weight'] }}></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th class="text-right" style="width:20px"><input type=text name=LTLtgtwgt maxlength=3 size=2 readonly value={{ $pct_array['ltl_weight'] }}></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
-                    <th class="text-right" style="width:20px"><input type=text name=PARCELtgtwgt maxlength=3 size=2 readonly value={{ $pct_array['parcel_weight'] }}></th>
-                    <th></th>
-                    <th></th>
-                    <th></th>
+                    <th scope="col"></th>
+                    <th scope="col">Weight</th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-right" style="width:20px"><label for="sonar-input-ada5156033" class="visually-hidden">sonar input ada5156033</label>
+<input type=text name=ALLtgtwgt maxlength=3 size=2 readonly value={{ $pct_array['all_weight'] }} id="sonar-input-ada5156033"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-right" style="width:20px"><label for="sonar-input-aefaf4ca2b" class="visually-hidden">sonar input aefaf4ca2b</label>
+<input type=text name=LTLtgtwgt maxlength=3 size=2 readonly value={{ $pct_array['ltl_weight'] }} id="sonar-input-aefaf4ca2b"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col" class="text-right" style="width:20px"><label for="sonar-input-2da53b6d4f" class="visually-hidden">sonar input 2da53b6d4f</label>
+<input type=text name=PARCELtgtwgt maxlength=3 size=2 readonly value={{ $pct_array['parcel_weight'] }} id="sonar-input-2da53b6d4f"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
                 </tr>
                 <tr class="border-bottom: 1px solid black;">
-                    <th style="background-color:grey" colspan=19></th>
+                    <th scope="col" style="background-color:grey" colspan=19></th>
                 </tr>
             </thead>
             <tbody style="border: 1px solid black;">
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/whsePerfRequest.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/whsePerfRequest.blade.php
index b450b681..d5c8a8fe 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/whsePerfRequest.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/whsePerfRequest.blade.php
@@ -32,7 +32,8 @@ Sentinel Doc Archive
                                     </select>
                                 </div>
                             </div>
-                            <input type=submit class="btn btn-primary" value="Display table">
+                            <label for="sonar-input-54ed629414" class="visually-hidden">sonar input 54ed629414</label>
+<input type=submit class="btn btn-primary" value="Display table" id="sonar-input-54ed629414">
                             &nbsp;&nbsp;
                             <button type="button" class="btn btn-warning" id="exportExcel">Download to Excel</button>
 
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php
index e00729c0..9973e239 100644
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php
@@ -18,7 +18,8 @@
                         <tr>
                             <td><b>Delivery Method</b></td> <!-- ALPHA -->
                             <td class="text-right">
-                                <input type="text" maxlength="4" length="4" class="myinput" name="addAVDELMETH" id="addAVDELMETH">
+                                <label for="addAVDELMETH" class="visually-hidden">addAVDELMETH</label>
+<input type="text" maxlength="4" length="4" class="myinput" name="addAVDELMETH" id="addAVDELMETH">
                             </td>
                         </tr>
                         <tr>
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php
index ed5789f5..2ea234e6 100644
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php
@@ -17,7 +17,8 @@
                             <td><b>Delivery Method</b></td> <!-- ALPHA -->
                             <td class="text-right">
                                 <input type="hidden" name="OLD_AVDELMETH" id="OLD_AVDELMETH">
-                                <input type="text" maxlength="4" length="4" class="myinput" name="AVDELMETH" id="AVDELMETH" readonly>
+                                <label for="AVDELMETH" class="visually-hidden">AVDELMETH</label>
+<input type="text" maxlength="4" length="4" class="myinput" name="AVDELMETH" id="AVDELMETH" readonly>
                             </td>
                         </tr>
                         <tr>
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/carrierAdd.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/carrierAdd.blade.php
index ebd7af9d..20bccf25 100644
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/carrierAdd.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/carrierAdd.blade.php
@@ -15,19 +15,22 @@
                         <tr>
                             <td><b>Carrier Number</b></td> <!-- ALPHA -->
                             <td class="text-right">
-                                <input type="text" maxlength="5" class="myinput" name="addCANUM" id="addCANUM" required>
+                                <label for="addCANUM" class="visually-hidden">addCANUM</label>
+<input type="text" maxlength="5" class="myinput" name="addCANUM" id="addCANUM" required>
                             </td>
                         </tr>
                         <tr>
                             <td><b>Carrier Name</b></td> <!-- ALPHA -->
                             <td class="text-right">
-                                <input type="text" maxlength="30" class="myinput" name="addCANAM" id="addCANAM">
+                                <label for="addCANAM" class="visually-hidden">addCANAM</label>
+<input type="text" maxlength="30" class="myinput" name="addCANAM" id="addCANAM">
                             </td>
                         </tr>
                         <tr>
                             <td><b>2ship Carrier Code</b></td> <!-- NUMERIC -->
                             <td class="text-right">
-                                <input type="number" min="1" max="999" increment="1" pattern="[0-9]{3}" class="myinput" name="addTWOSHIPCARRIERCODE" id="addTWOSHIPCARRIERCODE"
+                                <label for="addTWOSHIPCARRIERCODE" class="visually-hidden">addTWOSHIPCARRIERCODE</label>
+<input type="number" min="1" max="999" increment="1" pattern="[0-9]{3}" class="myinput" name="addTWOSHIPCARRIERCODE" id="addTWOSHIPCARRIERCODE"
                                     onkeypress='return ((event.charCode >= 48 && event.charCode <= 57) || (event.charCode == 32))'>
                             </td>
                         </tr>
@@ -36,7 +39,8 @@
                             <td class="text-right">
                                 LTL
                                 <div class="col-sm-1 form-check form-check-inline form-switch">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="addPARCELCARRIERCODE" name="addPARCELCARRIERCODE" data-on="X" data-off="" aria-checked="false">
+                                    <label for="addPARCELCARRIERCODE" class="visually-hidden">addPARCELCARRIERCODE</label>
+<input type="checkbox" class="form-check-input" role="switch" id="addPARCELCARRIERCODE" name="addPARCELCARRIERCODE" data-on="X" data-off="" aria-checked="false">
                                     Parcel
                                 </div>
                             </td>
@@ -44,9 +48,11 @@
                         <tr>
                             <td><b>ERP Carrier Code</b></td> <!-- ALPHA -->
                             <td class="text-right">
-                                <!--#553 <input type="number" min="1" max="999999" increment="1" pattern="[0-9]{6}" class="myinput" name="addCASPR10A01" id="addCASPR10A01"
+                                <!--#553 <label for="addCASPR10A01" class="visually-hidden">addCASPR10A01</label>
+<input type="number" min="1" max="999999" increment="1" pattern="[0-9]{6}" class="myinput" name="addCASPR10A01" id="addCASPR10A01"
                                     onkeypress='return ((event.charCode >= 48 && event.charCode <= 57) || (event.charCode == 32))'> -->
-                                <input type="text" maxlength="10"class="myinput" name="addCASPR10A01" id="addCASPR10A01" required>
+                                <label for="addCASPR10A01" class="visually-hidden">addCASPR10A01</label>
+<input type="text" maxlength="10"class="myinput" name="addCASPR10A01" id="addCASPR10A01" required>
                             </td>
                         </tr>
                         <tr>
@@ -54,7 +60,8 @@
                             <td class="text-right">
                                 Overnight
                                 <div class="col-sm-1 form-check form-check-inline form-switch">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="addCASPR1A01" name="addCASPR1A01" data-on="Y" data-off="" aria-checked="false">
+                                    <label for="addCASPR1A01" class="visually-hidden">addCASPR1A01</label>
+<input type="checkbox" class="form-check-input" role="switch" id="addCASPR1A01" name="addCASPR1A01" data-on="Y" data-off="" aria-checked="false">
                                 </div>
                                 When closing truck
                             </td>
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/carrierEdit.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/carrierEdit.blade.php
index 787836ca..39a8e7fe 100644
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/carrierEdit.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/carrierEdit.blade.php
@@ -14,21 +14,24 @@
                             <td><b>Carrier Number</b></td> <!-- ALPHA -->
                             <td class="text-right">
                                 <input type="hidden" name="OLD_CANUM" id="OLD_CANUM">
-                                <input type="text" maxlength="5" class="myinput" name="CANUM" id="CANUM" readonly>
+                                <label for="CANUM" class="visually-hidden">CANUM</label>
+<input type="text" maxlength="5" class="myinput" name="CANUM" id="CANUM" readonly>
                             </td>
                         </tr>
                         <tr>
                             <td><b>Carrier Name</b></td> <!-- ALPHA -->
                             <td class="text-right">
                                 <input type="hidden" name="OLD_CANAM" id="OLD_CANAM">
-                                <input type="text" maxlength="30" class="myinput" name="CANAM" id="CANAM">
+                                <label for="CANAM" class="visually-hidden">CANAM</label>
+<input type="text" maxlength="30" class="myinput" name="CANAM" id="CANAM">
                             </td>
                         </tr>
                         <tr>
                             <td><b>2ship Carrier Code</b></td> <!-- NUMERIC -->
                             <td class="text-right">
                                 <input type="hidden" name="OLD_TWOSHIPCARRIERCODE" id="OLD_TWOSHIPCARRIERCODE">
-                                <input type="number" min="1" max="999" step="1" pattern="[0-9]{3}" class="myinput" name="TWOSHIPCARRIERCODE" id="TWOSHIPCARRIERCODE"
+                                <label for="TWOSHIPCARRIERCODE" class="visually-hidden">TWOSHIPCARRIERCODE</label>
+<input type="number" min="1" max="999" step="1" pattern="[0-9]{3}" class="myinput" name="TWOSHIPCARRIERCODE" id="TWOSHIPCARRIERCODE"
                                     onkeypress='return ((event.charCode >= 48 && event.charCode <= 57) || (event.charCode == 32))' required>
                             </td>
                         </tr>
@@ -38,7 +41,8 @@
                                 LTL
                                 <div class="col-sm-1 form-check form-check-inline form-switch">
                                     <input type="hidden" name="OLD_PARCELCARRIERCODE" id="OLD_PARCELCARRIERCODE">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="PARCELCARRIERCODE" name="PARCELCARRIERCODE" data-on="X" data-off="" aria-checked="false">
+                                    <label for="PARCELCARRIERCODE" class="visually-hidden">PARCELCARRIERCODE</label>
+<input type="checkbox" class="form-check-input" role="switch" id="PARCELCARRIERCODE" name="PARCELCARRIERCODE" data-on="X" data-off="" aria-checked="false">
                                     Parcel
                                 </div>
                             </td>
@@ -47,9 +51,11 @@
                             <td><b>ERP Carrier Code</b></td> <!-- ALPHA -->
                             <td class="text-right">
                                 <input type="hidden" name="OLD_CASPR10A01" id="OLD_CASPR10A01">
-                                <!--#553 <input type="number" min="1" max="999999" step="1" class="myinput" pattern="[0-9]{6}" name="CASPR10A01" id="CASPR10A01"
+                                <!--#553 <label for="CASPR10A01" class="visually-hidden">CASPR10A01</label>
+<input type="number" min="1" max="999999" step="1" class="myinput" pattern="[0-9]{6}" name="CASPR10A01" id="CASPR10A01"
                                     onkeypress='return ((event.charCode >= 48 && event.charCode <= 57) || (event.charCode == 32))' required> -->
-                                <input type="text" maxlength="10" class="myinput" name="CASPR10A01" id="CASPR10A01" required>
+                                <label for="CASPR10A01" class="visually-hidden">CASPR10A01</label>
+<input type="text" maxlength="10" class="myinput" name="CASPR10A01" id="CASPR10A01" required>
                             </td>
                         </tr>
                         <tr>
@@ -58,7 +64,8 @@
                                 Overnight
                                 <div class="col-sm-1 form-check form-check-inline form-switch">
                                     <input type="hidden" name="OLD_CASPR1A01" id="OLD_CASPR1A01">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="CASPR1A01" name="CASPR1A01" data-on="Y" data-off="" aria-checked="false">
+                                    <label for="CASPR1A01" class="visually-hidden">CASPR1A01</label>
+<input type="checkbox" class="form-check-input" role="switch" id="CASPR1A01" name="CASPR1A01" data-on="Y" data-off="" aria-checked="false">
                                 </div>
                                 When closing truck
                             </td>
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php
index 15dec557..fe2f07c1 100644
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php
@@ -35,19 +35,22 @@
                         <tr>
                             <td><b>Part</b></td> <!-- ALPHA -->
                             <td class="text-right">
-                                <input type="text" maxlength="15" class="myinput" name="addAT9PART" id="addAT9PART" required>
+                                <label for="addAT9PART" class="visually-hidden">addAT9PART</label>
+<input type="text" maxlength="15" class="myinput" name="addAT9PART" id="addAT9PART" required>
                             </td>
                         </tr>
                         <tr>
                             <td><b>Pallet Qty</b></td> <!-- NUMERIC -->
                             <td class="text-right">
-                                <input type="number" min="1" max="999999999" increment=1 class="myinput" name="addAT9QTY" id="addAT9QTY" required>
+                                <label for="addAT9QTY" class="visually-hidden">addAT9QTY</label>
+<input type="number" min="1" max="999999999" increment=1 class="myinput" name="addAT9QTY" id="addAT9QTY" required>
                             </td>
                         </tr>
                         <tr>
                             <td><b>Hazardous Material</b></td> <!-- ALPHA -->
                             <td class="text-right">
-                                <input type="text" maxlength="5" class="myinput" name="addAT9WRN" id="addAT9WRN">
+                                <label for="addAT9WRN" class="visually-hidden">addAT9WRN</label>
+<input type="text" maxlength="5" class="myinput" name="addAT9WRN" id="addAT9WRN">
                             </td>
                         </tr>
 
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyEdit.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyEdit.blade.php
index e7857f5a..0b966d01 100644
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyEdit.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyEdit.blade.php
@@ -17,7 +17,6 @@
                             <div class="mb-3">
                                 <input type="hidden" name="OLD_AT9DPW" id="OLD_AT9DPW">
                                 <select class="form-select-sm" name="AT9DPW" id="AT9DPW" required>
-                                    <!--<option value="" selected disabled hidden>Select</option>-->
                                     @foreach ($IC670M as $key => $IC670MR)
                                         <option selected value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
                                         data-AT9CO="{{ trim($IC670MR->WDCO) }}" data-AT9PLT="{{ trim($IC670MR->WDPL) }}" data-AT9WHS="{{ trim($IC670MR->WDWHS) }}" >
@@ -32,21 +31,24 @@
                             <td><b>Part</b></td> <!-- ALPHA -->
                             <td class="text-right">
                                 <input type="hidden" name="OLD_AT9PART" id="OLD_AT9PART">
-                                <input type="text" maxlength="15" class="myinput" name="AT9PART" id="AT9PART" readonly>
+                                <label for="AT9PART" class="visually-hidden">AT9PART</label>
+<input type="text" maxlength="15" class="myinput" name="AT9PART" id="AT9PART" readonly>
                             </td>
                         </tr>
                         <tr>
                             <td><b>Pallet Qty</b></td> <!-- NUMERIC -->
                             <td class="text-right">
                                 <input type="hidden" name="OLD_AT9QTY" id="OLD_AT9QTY">
-                                <input type="number" min="1" max="999999999" increment=1 class="myinput" name="AT9QTY" id="AT9QTY" required>
+                                <label for="AT9QTY" class="visually-hidden">AT9QTY</label>
+<input type="number" min="1" max="999999999" increment=1 class="myinput" name="AT9QTY" id="AT9QTY" required>
                             </td>
                         </tr>
                         <tr>
                             <td><b>Hazardous Material</b></td> <!-- ALPHA -->
                             <td class="text-right">
                                 <input type="hidden" name="OLD_AT9WRN" id="OLD_AT9WRN">
-                                <input type="text" maxlength="5" class="myinput" name="AT9WRN" id="AT9WRN">
+                                <label for="AT9WRN" class="visually-hidden">AT9WRN</label>
+<input type="text" maxlength="5" class="myinput" name="AT9WRN" id="AT9WRN">
                             </td>
                         </tr>
 
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/shipToEdit.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/shipToEdit.blade.php
index 958694d3..3c176582 100644
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/shipToEdit.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/shipToEdit.blade.php
@@ -27,30 +27,35 @@
                             <td><b>Address line 1</b></td> <!-- MAX -->
                             <td class="text-left smalltxt" id="ORIG_PSHA1">{!! (isset($original->PSHA1)&&trim($original->PSHA1)!=''?trim($original->PSHA1):'') !!}</td>
                             <td class="text-left smalltxt" id="OLD_SHSHA1">{!! (isset($order->SHSHA1)&&trim($order->SHSHA1)!=''?trim($order->SHSHA1):'') !!}</td>
-                            <td class="text-right"><input maxlength="30" class="myinput toUpper" type="text" name="SHSHA1" value="{!! (isset($order->SHSHA1)&&trim($order->SHSHA1)!=''?trim($order->SHSHA1):' ') !!}"></td>
+                            <td class="text-right"><label for="sonar-input-deb2f9aedc" class="visually-hidden">SHSHA1</label>
+<input maxlength="30" class="myinput toUpper" type="text" name="SHSHA1" value="{!! (isset($order- id="sonar-input-deb2f9aedc">SHSHA1)&&trim($order->SHSHA1)!=''?trim($order->SHSHA1):' ') !!}"></td>
                         </tr>
                         <tr>
                             <td><b>Address line 2</b></td> <!-- MAX -->
                             <td class="text-left smalltxt" id="ORIG_PSHA2">{!! (isset($original->PSHA2)&&trim($original->PSHA2)!=''?trim($original->PSHA2):'') !!}</td>
                             <td class="text-left smalltxt" id="OLD_SHSHA2">{!! (isset($order->SHSHA2)&&trim($order->SHSHA2)!=''?trim($order->SHSHA2):'') !!}</td>
-                            <td class="text-right"><input maxlength="30" class="myinput toUpper" type="text" name="SHSHA2" value="{!! (isset($order->SHSHA2)&&trim($order->SHSHA2)!=''?trim($order->SHSHA2):' ') !!}"></td>
+                            <td class="text-right"><label for="sonar-input-bf4a0acc70" class="visually-hidden">SHSHA2</label>
+<input maxlength="30" class="myinput toUpper" type="text" name="SHSHA2" value="{!! (isset($order- id="sonar-input-bf4a0acc70">SHSHA2)&&trim($order->SHSHA2)!=''?trim($order->SHSHA2):' ') !!}"></td>
                         </tr>
                         <tr>
                             <td><b>City</b></td> <!-- ALPHA MAX -->
                             <td class="text-left smalltxt" id="ORIG_PSHCI">{!! (isset($original->PSHCI)&&trim($original->PSHCI)!=''?trim($original->PSHCI):'') !!}</td>
                             <td class="text-left smalltxt" id="OLD_SHSHCI">{!! (isset($order->SHSHCI)&&trim($order->SHSHCI)!=''?trim($order->SHSHCI):'') !!}</td>
-                            <td class="text-right"><input maxlength="17" onkeypress='return ((event.charCode >= 65 && event.charCode <= 90) || (event.charCode >= 97 && event.charCode <= 122) || (event.charCode == 32))' class="myinput toUpper" type="text" name="SHSHCI" value="{!! (isset($order->SHSHCI)&&trim($order->SHSHCI)!=''?trim($order->SHSHCI):' ') !!}"></td>
+                            <td class="text-right"><label for="sonar-input-e043dfd88b" class="visually-hidden">sonar input e043dfd88b</label>
+<input maxlength="17" onkeypress='return ((event.charCode  id="sonar-input-e043dfd88b">= 65 && event.charCode <= 90) || (event.charCode >= 97 && event.charCode <= 122) || (event.charCode == 32))' class="myinput toUpper" type="text" name="SHSHCI" value="{!! (isset($order->SHSHCI)&&trim($order->SHSHCI)!=''?trim($order->SHSHCI):' ') !!}"></td>
                         </tr>
                         <tr>
                             <td><b>State</b></td> <!-- ALPHA MAX -->
                             <td class="text-left smalltxt" id="ORIG_PSHST">{!! (isset($original->PSHST)&&trim($original->PSHST)!=''?trim($original->PSHST):'') !!}</td>
                             <td class="text-left smalltxt" id="OLD_SHSHST">{!! (isset($order->SHSHST)&&trim($order->SHSHST)!=''?trim($order->SHSHST):'') !!}</td>
-                            <td class="text-right"><input maxlength="2" onkeypress='return ((event.charCode >= 65 && event.charCode <= 90) || (event.charCode >= 97 && event.charCode <= 122) || (event.charCode == 32))' class="myinput toUpper" type="text" name="SHSHST" value="{!! (isset($order->SHSHST)&&trim($order->SHSHST)!=''?trim($order->SHSHST):' ') !!}"></td>
+                            <td class="text-right"><label for="sonar-input-967e1c005d" class="visually-hidden">sonar input 967e1c005d</label>
+<input maxlength="2" onkeypress='return ((event.charCode  id="sonar-input-967e1c005d">= 65 && event.charCode <= 90) || (event.charCode >= 97 && event.charCode <= 122) || (event.charCode == 32))' class="myinput toUpper" type="text" name="SHSHST" value="{!! (isset($order->SHSHST)&&trim($order->SHSHST)!=''?trim($order->SHSHST):' ') !!}"></td>
                         <tr>
                             <td><b>Zip</b></td> <!-- MAX -->
                             <td class="text-left smalltxt" id="ORIG_PSHZP">{!! (isset($original->PSHZP)&&trim($original->PSHZP)!=''?trim($original->PSHZP):'') !!}</td>
                             <td class="text-left smalltxt" id="OLD_SHSHZP">{!! (isset($order->SHSHZP)&&trim($order->SHSHZP)!=''?trim($order->SHSHZP):'') !!}</td>
-                            <td class="text-right"><input maxlength="9" class="myinput toUpper" type="text" name="SHSHZP" value="{!! (isset($order->SHSHZP)&&trim($order->SHSHZP)!=''?trim($order->SHSHZP):' ') !!}"></td>
+                            <td class="text-right"><label for="sonar-input-d755055c65" class="visually-hidden">SHSHZP</label>
+<input maxlength="9" class="myinput toUpper" type="text" name="SHSHZP" value="{!! (isset($order- id="sonar-input-d755055c65">SHSHZP)&&trim($order->SHSHZP)!=''?trim($order->SHSHZP):' ') !!}"></td>
                         </tr>
                         <tr>
                             <td><b>Country</b></td> <!-- ALPHA MAX -->
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php
index 40507c81..e411004b 100644
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php
@@ -21,29 +21,35 @@
                             <td><b>Status</b></td> <!-- Switch Active/Inactive -->
                             <td class="text-center">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="R428STS" value="A" checked data-on="A" data-off="I" aria-checked="false">
+                                    <label for="sonar-input-63da19b195" class="visually-hidden">R428STS</label>
+<input class="form-check-input" type="checkbox" role="switch" name="R428STS" value="A" checked data-on="A" data-off="I" aria-checked="false" id="sonar-input-63da19b195">
                                 </div>
                             </td>
                         </tr>
                         <tr>
                             <td><b>User profile</b></td> <!-- ALPHA -->
-                            <td class="text-right"><input type="text" maxlength="10" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428US" required></td>
+                            <td class="text-right"><label for="sonar-input-afd6168b6c" class="visually-hidden">R428US</label>
+<input type="text" maxlength="10" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428US" required id="sonar-input-afd6168b6c"></td>
                         </tr>
                         <tr>
                             <td><b>First Name</b></td> <!-- ALPHA -->
-                            <td class="text-right"><input type="text" maxlength="20" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428FIRST" required></td>
+                            <td class="text-right"><label for="sonar-input-9e6c6eaa8b" class="visually-hidden">R428FIRST</label>
+<input type="text" maxlength="20" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428FIRST" required id="sonar-input-9e6c6eaa8b"></td>
                         </tr>
                         <tr>
                             <td><b>Family Name</b></td> <!-- ALPHA -->
-                            <td class="text-right"><input type="text" maxlength="30" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428FAMILY" required></td>
+                            <td class="text-right"><label for="sonar-input-22147e2614" class="visually-hidden">R428FAMILY</label>
+<input type="text" maxlength="30" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428FAMILY" required id="sonar-input-22147e2614"></td>
                         </tr>
                         <tr>
                             <td><b>Email</b></td> <!-- ALPHA -->
-                            <td class="text-right"><input type="text" maxlength="100" class="myinput" oninput="this.value = this.value.toLowerCase()" name="R428EMAIL" required></td>
+                            <td class="text-right"><label for="sonar-input-a7fe91c914" class="visually-hidden">R428EMAIL</label>
+<input type="text" maxlength="100" class="myinput" oninput="this.value = this.value.toLowerCase()" name="R428EMAIL" required id="sonar-input-a7fe91c914"></td>
                         </tr>
                         <tr>
                             <td><b>Employee code</b></td> <!-- MAX -->
-                            <td class="text-right"><input type="number" min=0 max=9999 class="myinput" name="R428EMPCDE" value=0 required></td>
+                            <td class="text-right"><label for="sonar-input-8e3a421fd3" class="visually-hidden">R428EMPCDE</label>
+<input type="number" min=0 max=9999 class="myinput" name="R428EMPCDE" value=0 required id="sonar-input-8e3a421fd3"></td>
                         </tr>
                         <tr>
                             <td><label for="R428DPW1" class="col-form-label"><b>Div-Plt-Whs:</b></label></td>
@@ -74,26 +80,30 @@
                             <td><b>Admin user</b></td> <!-- SWITCH Y/N -->
                             <td class="text-center">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="R428ADMUSR" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-d30d801b67" class="visually-hidden">R428ADMUSR</label>
+<input class="form-check-input" type="checkbox" role="switch" name="R428ADMUSR" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-d30d801b67">
                                 </div>
                             </td>
                             <td><b>Power user</b></td> <!-- SWITCH Y/N -->
                             <td class="text-center">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="R428PWRUSR" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-aeca45ced5" class="visually-hidden">R428PWRUSR</label>
+<input class="form-check-input" type="checkbox" role="switch" name="R428PWRUSR" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-aeca45ced5">
                                 </div>
                             </td>
                             <td><b>CSR</b></td> <!-- SWITCH Y/N -->
                             <td class="text-center">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="R42811A" value="N" data-on="C" data-off="" aria-checked="false">
+                                    <label for="sonar-input-41e1a8347c" class="visually-hidden">R42811A</label>
+<input class="form-check-input" type="checkbox" role="switch" name="R42811A" value="N" data-on="C" data-off="" aria-checked="false" id="sonar-input-41e1a8347c">
                                 </div>
                             </td>
 
                             <td><b>Executive</b></td> <!-- SWITCH Y/N -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
-                                    <input type="checkbox" class="form-check-input" role="switch" name="R42821A" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-34ca226a28" class="visually-hidden">R42821A</label>
+<input type="checkbox" class="form-check-input" role="switch" name="R42821A" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-34ca226a28">
                                 </div>
                             </td>
                         </tr>
@@ -101,24 +111,27 @@
                             <td colspan=2> </td><td colspan=2> </td><td colspan=2> </td>
                         </tr>
                         <tr>
-                            <th colspan=2><u>Inventory Options menu</u></th><th colspan=2><u>Replenishment menu</u></th><th colspan=2><u>Document Reprints</u></th>
+                            <th scope="col" colspan=2><u>Inventory Options menu</u></th><th scope="col" colspan=2><u>Replenishment menu</u></th><th scope="col" colspan=2><u>Document Reprints</u></th>
                         </tr>
                         <td><b>Picking</b></td> <!-- SWITCH Y/N -->
                             <td class="text-center">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="MENU2OPT3" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-6600a098cd" class="visually-hidden">MENU2OPT3</label>
+<input class="form-check-input" type="checkbox" role="switch" name="MENU2OPT3" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-6600a098cd">
                                 </div>
                             </td>
                             <td><b>Ticket processing</b></td> <!-- SWITCH Y/N Replenishment menu -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="MENU3OPT1" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-34905fd14f" class="visually-hidden">MENU3OPT1</label>
+<input class="form-check-input" type="checkbox" role="switch" name="MENU3OPT1" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-34905fd14f">
                                 </div>
                             </td>
                             <td><b>Document Reprints1</b></td> <!-- SWITCH Y/N Document Reprints menu -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="MENU4OPT1" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-962b09fa8c" class="visually-hidden">MENU4OPT1</label>
+<input class="form-check-input" type="checkbox" role="switch" name="MENU4OPT1" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-962b09fa8c">
                                 </div>
                             </td>
                         </tr>
@@ -126,50 +139,57 @@
                         <td><b>Stock View Program</b></td> <!-- SWITCH Y/N -->
                             <td class="text-center">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="MENU2OPT7" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-2d1307dd34" class="visually-hidden">MENU2OPT7</label>
+<input class="form-check-input" type="checkbox" role="switch" name="MENU2OPT7" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-2d1307dd34">
                                 </div>
                             </td>
                             <td><b>Ticket reset</b></td> <!-- SWITCH Y/N Replenishment menu -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch"name="MENU3OPT2" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-c82fe0a38a" class="visually-hidden">MENU3OPT2</label>
+<input class="form-check-input" type="checkbox" role="switch"name="MENU3OPT2" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-c82fe0a38a">
                                 </div>
                             </td>
                             <td><b>Document Reprints2</b></td> <!-- SWITCH Y/N Document Reprints menu -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="MENU4OPT2" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-9de73b8a95" class="visually-hidden">MENU4OPT2</label>
+<input class="form-check-input" type="checkbox" role="switch" name="MENU4OPT2" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-9de73b8a95">
                                 </div>
                             </td>
                         </tr>
                             <td><b>Split Box Labels</b></td> <!-- SWITCH Y/N -->
                             <td class="text-center">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="MENU2OPT8" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-5afc785c7f" class="visually-hidden">MENU2OPT8</label>
+<input class="form-check-input" type="checkbox" role="switch" name="MENU2OPT8" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-5afc785c7f">
                                 </div>
                             </td>
                             <td colspan=2></td>
                             <td><b>Document Reprints3</b></td> <!-- SWITCH Y/N Document Reprints menu -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="MENU4OPT3" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-d11c3d9636" class="visually-hidden">MENU4OPT3</label>
+<input class="form-check-input" type="checkbox" role="switch" name="MENU4OPT3" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-d11c3d9636">
                                 </div>
                             </td>
                         </tr>
                         <tr>
-                            <th colspan=2><u>Loading menu</u></th><th colspan=2><u>Main menu</u></th>
+                            <th scope="col" colspan=2><u>Loading menu</u></th><th scope="col" colspan=2><u>Main menu</u></th>
                         </tr>
                         <tr>
                             <td><b>Small parcel loading/closing</b></td> <!-- SWITCH Y/N -->
                             <td class="text-center">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="MENU5OPT1" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-7f45697209" class="visually-hidden">MENU5OPT1</label>
+<input class="form-check-input" type="checkbox" role="switch" name="MENU5OPT1" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-7f45697209">
                                 </div>
                             </td>
                             <td><b>Weekly Labor card entry</b></td> <!-- SWITCH Y/N -->
                             <td class="text-center">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="MENU6OPT1" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-97bd3e4192" class="visually-hidden">MENU6OPT1</label>
+<input class="form-check-input" type="checkbox" role="switch" name="MENU6OPT1" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-97bd3e4192">
                                 </div>
                             </td>
                         </tr>
@@ -177,13 +197,15 @@
                             <td><b>Open dock door</b></td> <!-- SWITCH Y/N -->
                             <td class="text-center">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="MENU5OPT2" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-2a6256fe9b" class="visually-hidden">MENU5OPT2</label>
+<input class="form-check-input" type="checkbox" role="switch" name="MENU5OPT2" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-2a6256fe9b">
                                 </div>
                             </td>
                             <td><b>MACPAC</b></td> <!-- SWITCH Y/N -->
                             <td class="text-center">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="MENU6OPT2" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-ad632b9e62" class="visually-hidden">MENU6OPT2</label>
+<input class="form-check-input" type="checkbox" role="switch" name="MENU6OPT2" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-ad632b9e62">
                                 </div>
                             </td>
                         </tr>
@@ -191,13 +213,15 @@
                             <td><b>Close dock door</b></td> <!-- SWITCH Y/N -->
                             <td class="text-center">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="MENU5OPT3" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-a07d5c2573" class="visually-hidden">MENU5OPT3</label>
+<input class="form-check-input" type="checkbox" role="switch" name="MENU5OPT3" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-a07d5c2573">
                                 </div>
                             </td>
                             <td><b>2Ship send/aggregate</b></td> <!-- SWITCH Y/N -->
                             <td class="text-center">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="MENU6OPT3" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-36ffe64b74" class="visually-hidden">MENU6OPT3</label>
+<input class="form-check-input" type="checkbox" role="switch" name="MENU6OPT3" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-36ffe64b74">
                                 </div>
                             </td>
                         </tr>
@@ -205,7 +229,8 @@
                             <td><b>LTL loading</b></td> <!-- SWITCH Y/N -->
                             <td class="text-center">
                                 <div class="form-check form-switch">
-                                    <input class="form-check-input" type="checkbox" role="switch" name="MENU5OPT5" value="N" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="sonar-input-debe99b4bd" class="visually-hidden">MENU5OPT5</label>
+<input class="form-check-input" type="checkbox" role="switch" name="MENU5OPT5" value="N" data-on="Y" data-off="N" aria-checked="false" id="sonar-input-debe99b4bd">
                                 </div>
                             </td>
                         </tr>
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/userEdit.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/userEdit.blade.php
index a645634e..c74588fc 100644
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/userEdit.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/userEdit.blade.php
@@ -25,7 +25,8 @@
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_R428STS" name="OLD_R428STS">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="R428STS" name="R428STS" data-on="A" data-off="I" aria-checked="false">
+                                    <label for="R428STS" class="visually-hidden">R428STS</label>
+<input type="checkbox" class="form-check-input" role="switch" id="R428STS" name="R428STS" data-on="A" data-off="I" aria-checked="false">
                                 </div>
                             </td>
                         </tr>
@@ -33,35 +34,40 @@
                             <td><b>User profile</b></td> <!-- ALPHA -->
                             <td class="text-right">
                                 <input type="hidden" name="OLD_R428US" id="OLD_R428US">
-                                <input type="text" maxlength="10" class="myinput toUpper" oninput="this.value = this.value.toUpperCase()" name="R428US" id="R428US" readonly>
+                                <label for="R428US" class="visually-hidden">R428US</label>
+<input type="text" maxlength="10" class="myinput toUpper" oninput="this.value = this.value.toUpperCase()" name="R428US" id="R428US" readonly>
                             </td>
                         </tr>
                         <tr>
                             <td><b>First Name</b></td> <!-- ALPHA -->
                             <td class="text-right">
                                 <input type="hidden" name="OLD_R428FIRST" id="OLD_R428FIRST">
-                                <input type="text" maxlength="20" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428FIRST" id="R428FIRST" required>
+                                <label for="R428FIRST" class="visually-hidden">R428FIRST</label>
+<input type="text" maxlength="20" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428FIRST" id="R428FIRST" required>
                             </td>
                         </tr>
                         <tr>
                             <td><b>Family Name</b></td> <!-- ALPHA -->
                             <td class="text-right">
                                 <input type="hidden" name="OLD_R428FAMILY" id="OLD_R428FAMILY">
-                                <input type="text" maxlength="30" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428FAMILY" id="R428FAMILY" required>
+                                <label for="R428FAMILY" class="visually-hidden">R428FAMILY</label>
+<input type="text" maxlength="30" class="myinput" oninput="this.value = this.value.toUpperCase()" name="R428FAMILY" id="R428FAMILY" required>
                             </td>
                         </tr>
                         <tr>
                             <td><b>Email</b></td> <!-- ALPHA -->
                             <td class="text-right">
                                 <input type="hidden" name="OLD_R428EMAIL" id="OLD_R428EMAIL">
-                                <input type="text" maxlength="100" class="myinput" oninput="this.value = this.value.toLowerCase()" id="R428EMAIL" required>
+                                <label for="R428EMAIL" class="visually-hidden">R428EMAIL</label>
+<input type="text" maxlength="100" class="myinput" oninput="this.value = this.value.toLowerCase()" id="R428EMAIL" required>
                             </td>
                         </tr>
                         <tr>
                             <td><b>Employee code</b></td> <!-- MAX -->
                             <td class="text-right">
                                 <input type="hidden" name="OLD_R428EMPCDE" id="OLD_R428EMPCDE">
-                                <input type="number" min=0 max=9999 class="myinput" name="R428EMPCDE" id="R428EMPCDE" value=0 required>
+                                <label for="R428EMPCDE" class="visually-hidden">R428EMPCDE</label>
+<input type="number" min=0 max=9999 class="myinput" name="R428EMPCDE" id="R428EMPCDE" value=0 required>
                             </td>
                         </tr>
                         <tr>
@@ -93,28 +99,32 @@
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_R428ADMUSR" name="OLD_R428ADMUSR">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="R428ADMUSR" name="R428ADMUSR" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="R428ADMUSR" class="visually-hidden">R428ADMUSR</label>
+<input type="checkbox" class="form-check-input" role="switch" id="R428ADMUSR" name="R428ADMUSR" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                             <td><b>Power user</b></td> <!-- SWITCH Y/N -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_R428PWRUSR" name="OLD_R428PWRUSR">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="R428PWRUSR" name="R428PWRUSR" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="R428PWRUSR" class="visually-hidden">R428PWRUSR</label>
+<input type="checkbox" class="form-check-input" role="switch" id="R428PWRUSR" name="R428PWRUSR" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                             <td><b>CSR</b></td> <!-- SWITCH Y/N -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_R42811A" name="OLD_R42811A">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="R42811A" name="R42811A" data-on="C" data-off="" aria-checked="false">
+                                    <label for="R42811A" class="visually-hidden">R42811A</label>
+<input type="checkbox" class="form-check-input" role="switch" id="R42811A" name="R42811A" data-on="C" data-off="" aria-checked="false">
                                 </div>
                             </td>
                             <td><b>Executive</b></td> <!-- SWITCH Y/N -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_R42821A" name="OLD_R42821A">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="R42821A" name="R42821A" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="R42821A" class="visually-hidden">R42821A</label>
+<input type="checkbox" class="form-check-input" role="switch" id="R42821A" name="R42821A" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                         </tr>
@@ -122,28 +132,31 @@
                             <td colspan=2> </td>
                         </tr>
                         <tr>
-                            <th colspan=2><u>Inventory Options menu</u></th><th colspan=2><u>Replenishment menu</u></th><th colspan=2><u>Document Reprints</u></th>
+                            <th scope="col" colspan=2><u>Inventory Options menu</u></th><th scope="col" colspan=2><u>Replenishment menu</u></th><th scope="col" colspan=2><u>Document Reprints</u></th>
                         </tr>
                         <tr>
                             <td><b>Picking</b></td> <!-- SWITCH Y/N Inventory Options menu -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU2OPT3" name="OLD_MENU2OPT3">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="MENU2OPT3" name="MENU2OPT3" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="MENU2OPT3" class="visually-hidden">MENU2OPT3</label>
+<input type="checkbox" class="form-check-input" role="switch" id="MENU2OPT3" name="MENU2OPT3" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                             <td><b>Ticket processing</b></td> <!-- SWITCH Y/N Replenishment menu -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU3OPT1" name="OLD_MENU3OPT1">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="MENU3OPT1" name="MENU3OPT1" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="MENU3OPT1" class="visually-hidden">MENU3OPT1</label>
+<input type="checkbox" class="form-check-input" role="switch" id="MENU3OPT1" name="MENU3OPT1" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                             <td><b>Document Reprints1</b></td> <!-- SWITCH Y/N Document Reprints menu -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU4OPT1" name="OLD_MENU4OPT1">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="MENU4OPT1" name="MENU4OPT1" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="MENU4OPT1" class="visually-hidden">MENU4OPT1</label>
+<input type="checkbox" class="form-check-input" role="switch" id="MENU4OPT1" name="MENU4OPT1" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                         </tr>
@@ -152,21 +165,24 @@
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU2OPT7" name="OLD_MENU2OPT7">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="MENU2OPT7" name="MENU2OPT7" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="MENU2OPT7" class="visually-hidden">MENU2OPT7</label>
+<input type="checkbox" class="form-check-input" role="switch" id="MENU2OPT7" name="MENU2OPT7" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                             <td><b>Ticket reset</b></td> <!-- SWITCH Y/N Replenishment menu -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU3OPT2" name="OLD_MENU3OPT2">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="MENU3OPT2" name="MENU3OPT2" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="MENU3OPT2" class="visually-hidden">MENU3OPT2</label>
+<input type="checkbox" class="form-check-input" role="switch" id="MENU3OPT2" name="MENU3OPT2" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                             <td><b>Document Reprints2</b></td> <!-- SWITCH Y/N Document Reprints menu -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU4OPT2" name="OLD_MENU4OPT2">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="MENU4OPT2" name="MENU4OPT2" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="MENU4OPT2" class="visually-hidden">MENU4OPT2</label>
+<input type="checkbox" class="form-check-input" role="switch" id="MENU4OPT2" name="MENU4OPT2" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                         </tr>
@@ -175,7 +191,8 @@
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU2OPT8" name="OLD_MENU2OPT8">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="MENU2OPT8" name="MENU2OPT8" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="MENU2OPT8" class="visually-hidden">MENU2OPT8</label>
+<input type="checkbox" class="form-check-input" role="switch" id="MENU2OPT8" name="MENU2OPT8" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                             <td></td><td></td>
@@ -183,26 +200,29 @@
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU4OPT3" name="OLD_MENU4OPT3">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="MENU4OPT3" name="MENU4OPT3" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="MENU4OPT3" class="visually-hidden">MENU4OPT3</label>
+<input type="checkbox" class="form-check-input" role="switch" id="MENU4OPT3" name="MENU4OPT3" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                         </tr>
                         <tr>
-                            <th colspan=2><u>Loading menu</u></th><th colspan=2><u>Main menu</u></th><th colspan=2></th>
+                            <th scope="col" colspan=2><u>Loading menu</u></th><th scope="col" colspan=2><u>Main menu</u></th><th scope="col" colspan=2></th>
                         </tr>
                         <tr>
                             <td><b>Small parcel loading/closing</b></td> <!-- SWITCH Y/N Loading menu -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU5OPT1" name="OLD_MENU5OPT1">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="MENU5OPT1" name="MENU5OPT1" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="MENU5OPT1" class="visually-hidden">MENU5OPT1</label>
+<input type="checkbox" class="form-check-input" role="switch" id="MENU5OPT1" name="MENU5OPT1" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                             <td><b>Weekly Labor card entry</b></td> <!-- SWITCH Y/N Loading menu -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU6OPT1" name="OLD_MENU6OPT1">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="MENU6OPT1" name="MENU6OPT1" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="MENU6OPT1" class="visually-hidden">MENU6OPT1</label>
+<input type="checkbox" class="form-check-input" role="switch" id="MENU6OPT1" name="MENU6OPT1" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                         </tr>
@@ -211,14 +231,16 @@
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU5OPT2" name="OLD_MENU5OPT2">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="MENU5OPT2" name="MENU5OPT2" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="MENU5OPT2" class="visually-hidden">MENU5OPT2</label>
+<input type="checkbox" class="form-check-input" role="switch" id="MENU5OPT2" name="MENU5OPT2" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                             <td><b>MACPAC</b></td> <!-- SWITCH Y/N Loading menu -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU6OPT2" name="OLD_MENU6OPT2">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="MENU6OPT2" name="MENU6OPT2" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="MENU6OPT2" class="visually-hidden">MENU6OPT2</label>
+<input type="checkbox" class="form-check-input" role="switch" id="MENU6OPT2" name="MENU6OPT2" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                         </tr>
@@ -227,14 +249,16 @@
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU5OPT3" name="OLD_MENU5OPT3">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="MENU5OPT3" name="MENU5OPT3" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="MENU5OPT3" class="visually-hidden">MENU5OPT3</label>
+<input type="checkbox" class="form-check-input" role="switch" id="MENU5OPT3" name="MENU5OPT3" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                             <td><b>2Ship send/aggregate</b></td> <!-- SWITCH Y/N Loading menu -->
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU6OPT3" name="OLD_MENU6OPT3">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="MENU6OPT3" name="MENU6OPT3" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="MENU6OPT3" class="visually-hidden">MENU6OPT3</label>
+<input type="checkbox" class="form-check-input" role="switch" id="MENU6OPT3" name="MENU6OPT3" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                         </tr>
@@ -243,7 +267,8 @@
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU5OPT5" name="OLD_MENU5OPT5">
-                                    <input type="checkbox" class="form-check-input" role="switch" id="MENU5OPT5" name="MENU5OPT5" data-on="Y" data-off="N" aria-checked="false">
+                                    <label for="MENU5OPT5" class="visually-hidden">MENU5OPT5</label>
+<input type="checkbox" class="form-check-input" role="switch" id="MENU5OPT5" name="MENU5OPT5" data-on="Y" data-off="N" aria-checked="false">
                                 </div>
                             </td>
                         </tr>
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/userPassword.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/userPassword.blade.php
index a68b7191..36cdeb25 100644
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/userPassword.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/userPassword.blade.php
@@ -18,7 +18,8 @@
                             <td class="text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" name="R428US_PWD" id="R428US_PWD" value="">
-                                    <input type="password" maxlength="10" length="7" class="myinput" name="NEW_PASSWORD" id="NEW_PASSWORD" required>
+                                    <label for="NEW_PASSWORD" class="visually-hidden">NEW PASSWORD</label>
+<input type="password" maxlength="10" length="7" class="myinput" name="NEW_PASSWORD" id="NEW_PASSWORD" required>
                                 </div>
                             </td>
                         </tr>
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/top-navigation.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/top-navigation.blade.php
index 67800f0b..3e43c78e 100644
--- a/Modules/M3/Resources/views/liberty-theme/partials/top-navigation.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/top-navigation.blade.php
@@ -14,7 +14,7 @@
                     {{-- <li><a class="dropdown-item" href="/userprofile">Change Warehouse</a></li> --}}
                     <li>
                         <div class="form-group">
-                            <label>Div-Plt-Whs</label>
+                            <label for="R428DPWSel">Div-Plt-Whs</label>
                             <select class="form-select" id="R428DPWSel">
                                 <option value="" disabled hidden>Select</option>
                                 @foreach ($IC670MAllWHS as $key => $IC670MR)
diff --git a/Modules/Platform/resources/views/licenses/index.blade.php b/Modules/Platform/resources/views/licenses/index.blade.php
index e6f3ef8b..71595b8a 100644
--- a/Modules/Platform/resources/views/licenses/index.blade.php
+++ b/Modules/Platform/resources/views/licenses/index.blade.php
@@ -16,15 +16,17 @@
                         <option value="{{ $company->id }}">{{ $company->name }}</option>
                     @endforeach
                 </select>
-                <input name="label" placeholder="Licence label"
-                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required>
+                <label for="sonar-input-959b26bb51" class="visually-hidden">Licence label</label>
+<input name="label" placeholder="Licence label"
+                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required id="sonar-input-959b26bb51">
                 <select name="plan" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
                     <option>standard</option>
                     <option>professional</option>
                     <option>enterprise</option>
                 </select>
-                <input name="max_users" type="number" value="10"
-                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required>
+                <label for="sonar-input-d9d34872cd" class="visually-hidden">max users</label>
+<input name="max_users" type="number" value="10"
+                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required id="sonar-input-d9d34872cd">
                 <button
                     class="rounded-xl bg-zinc-900 px-4 py-2 font-semibold text-white dark:bg-white dark:text-zinc-900">Issue</button>
             </form>
diff --git a/Modules/Platform/resources/views/payments/index.blade.php b/Modules/Platform/resources/views/payments/index.blade.php
index 1360cc0c..84505250 100644
--- a/Modules/Platform/resources/views/payments/index.blade.php
+++ b/Modules/Platform/resources/views/payments/index.blade.php
@@ -12,10 +12,12 @@
                         <option value="{{ $company->id }}">{{ $company->name }}</option>
                     @endforeach
                 </select>
-                <input name="amount" type="number" value="0"
-                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required>
-                <input name="currency" value="gbp"
-                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required>
+                <label for="sonar-input-654d959f2a" class="visually-hidden">amount</label>
+<input name="amount" type="number" value="0"
+                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required id="sonar-input-654d959f2a">
+                <label for="sonar-input-e17e77c7c9" class="visually-hidden">currency</label>
+<input name="currency" value="gbp"
+                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required id="sonar-input-e17e77c7c9">
                 <select name="status" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
                     <option>paid</option>
                     <option>pending</option>
@@ -23,8 +25,9 @@
                     <option>refunded</option>
                     <option>override</option>
                 </select>
-                <input name="description" placeholder="Description"
-                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
+                <label for="sonar-input-0a3d32bbe3" class="visually-hidden">Description</label>
+<input name="description" placeholder="Description"
+                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" id="sonar-input-0a3d32bbe3">
                 <button
                     class="rounded-xl bg-zinc-900 px-4 py-2 font-semibold text-white dark:bg-white dark:text-zinc-900">Add</button>
             </form>
diff --git a/Modules/Warehouse/resources/views/rules/index.blade.php b/Modules/Warehouse/resources/views/rules/index.blade.php
index fd2c8c1c..619478c6 100644
--- a/Modules/Warehouse/resources/views/rules/index.blade.php
+++ b/Modules/Warehouse/resources/views/rules/index.blade.php
@@ -12,18 +12,21 @@
                         <option value="{{ $warehouse->id }}">{{ $warehouse->name }}</option>
                     @endforeach
                 </select>
-                <input name="name" placeholder="Rule name"
-                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required>
-                <input name="rule_key" placeholder="stock.location.required"
-                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required>
+                <label for="sonar-input-c8d25929e4" class="visually-hidden">Rule name</label>
+<input name="name" placeholder="Rule name"
+                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required id="sonar-input-c8d25929e4">
+                <label for="sonar-input-e1cd9e371a" class="visually-hidden">stock.location.required</label>
+<input name="rule_key" placeholder="stock.location.required"
+                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required id="sonar-input-e1cd9e371a">
                 <select name="severity" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
                     <option>error</option>
                     <option>warning</option>
                     <option>blocker</option>
                     <option>info</option>
                 </select>
-                <input name="configuration" placeholder='{"min": 1}'
-                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
+                <label for="sonar-input-c6588b7747" class="visually-hidden">{"min": 1}</label>
+<input name="configuration" placeholder='{"min": 1}'
+                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" id="sonar-input-c6588b7747">
                 <button
                     class="rounded-xl bg-zinc-900 px-4 py-2 font-semibold text-white dark:bg-white dark:text-zinc-900">Add
                     rule</button>
diff --git a/Modules/Warehouse/resources/views/warehouses/index.blade.php b/Modules/Warehouse/resources/views/warehouses/index.blade.php
index f53aac2e..54367b87 100644
--- a/Modules/Warehouse/resources/views/warehouses/index.blade.php
+++ b/Modules/Warehouse/resources/views/warehouses/index.blade.php
@@ -7,12 +7,15 @@
             <h2 class="text-lg font-bold text-zinc-900 dark:text-white">Create warehouse</h2>
             <form method="POST" action="{{ route('warehouses.store') }}" class="mt-5 grid gap-4 md:grid-cols-4">
                 @csrf
-                <input name="code" placeholder="Code"
-                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required>
-                <input name="name" placeholder="Warehouse name"
-                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required>
-                <input name="address" placeholder="Address"
-                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
+                <label for="sonar-input-19d6ae863c" class="visually-hidden">Code</label>
+<input name="code" placeholder="Code"
+                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required id="sonar-input-19d6ae863c">
+                <label for="sonar-input-b4b83a7c6f" class="visually-hidden">Warehouse name</label>
+<input name="name" placeholder="Warehouse name"
+                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" required id="sonar-input-b4b83a7c6f">
+                <label for="sonar-input-cff76a65ee" class="visually-hidden">Address</label>
+<input name="address" placeholder="Address"
+                    class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950" id="sonar-input-cff76a65ee">
                 <button
                     class="rounded-xl bg-zinc-900 px-4 py-2 font-semibold text-white dark:bg-white dark:text-zinc-900">Create</button>
             </form>
diff --git a/resources/js/Components/Checkbox.vue b/resources/js/Components/Checkbox.vue
index f70153ca..58dc935a 100644
--- a/resources/js/Components/Checkbox.vue
+++ b/resources/js/Components/Checkbox.vue
@@ -27,10 +27,11 @@ const proxyChecked = computed({
 
 
 <template>
-    <input
+    <label for="sonar-input-26eb253f2c" class="visually-hidden">sonar input 26eb253f2c</label>
+<input
         v-model="proxyChecked"
         type="checkbox"
         :value="value"
         class="rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800"
-    >
+     id="sonar-input-26eb253f2c">
 </template>
diff --git a/resources/views/livewire/settings/security.blade.php b/resources/views/livewire/settings/security.blade.php
index 314a4660..92feae96 100644
--- a/resources/views/livewire/settings/security.blade.php
+++ b/resources/views/livewire/settings/security.blade.php
@@ -169,8 +169,9 @@
                                     <flux:icon.loading variant="mini" />
                                 </div>
                             @else
-                                <input type="text" readonly value="{{ $manualSetupKey }}"
-                                    class="w-full p-3 bg-transparent outline-none text-stone-900 dark:text-stone-100" />
+                                <label for="sonar-input-b757771a44" class="visually-hidden">sonar input b757771a44</label>
+<input type="text" readonly value="{{ $manualSetupKey }}"
+                                    class="w-full p-3 bg-transparent outline-none text-stone-900 dark:text-stone-100" id="sonar-input-b757771a44">
 
                                 <button @click="copy()"
                                     class="px-3 transition-colors border-l cursor-pointer border-stone-200 dark:border-stone-600">