From 66aeefbba5083b23ab230c88bdd4e6fe9c8f2ed4 Mon Sep 17 00:00:00 2001
From: Mark Gregory <mark.gregory@abbeysoftware.com>
Date: Mon, 21 Sep 2026 13:33:05 +0100
Subject: [PATCH] M3 Integration fixes

---
 .../views/livewire/ticket-index.blade.php     |   6 +-
 .../views/livewire/ticket-show.blade.php      |   3 +-
 Modules/M3/Console/ClosedOrderSaveXls.php     |  56 ++--
 Modules/M3/Helpers/Helper.php                 |  38 ++-
 .../M3/Http/Controllers/API/CloseShipment.php |   2 +-
 .../M3/Http/Controllers/API/PdfStorage.php    |  51 ++--
 .../M3/Http/Controllers/API/TwoShipAPIs.php   |  47 ++--
 .../Controllers/M3CallCloseAPIController.php  |  40 +--
 Modules/M3/Http/Middleware/BasicAuth.php      |  30 +-
 .../public/liberty-theme/css/styles.css       |  30 +-
 .../partials/modals/M3DeliveryAdd.blade.php   |  52 ++--
 .../partials/modals/M3DeliveryEdit.blade.php  |  48 ++--
 .../partials/modals/carrierAdd.blade.php      |  72 ++---
 .../partials/modals/carrierEdit.blade.php     |  68 ++---
 .../partials/modals/qtyAdd.blade.php          |  52 ++--
 .../partials/modals/qtyEdit.blade.php         |  48 ++--
 .../partials/modals/shipToEdit.blade.php      | 116 ++++----
 .../partials/modals/userAdd.blade.php         | 264 ++++++++---------
 .../partials/modals/userEdit.blade.php        | 266 +++++++++---------
 .../partials/modals/userPassword.blade.php    |  32 +--
 public/css/wms-dashboard.css                  |   4 +-
 resources/css/app.css                         |  36 +--
 resources/css/wms-dashboard.css               |   4 +-
 23 files changed, 674 insertions(+), 691 deletions(-)

diff --git a/Modules/Helpdesk/Resources/views/livewire/ticket-index.blade.php b/Modules/Helpdesk/Resources/views/livewire/ticket-index.blade.php
index f69bf638..b2dfe8f7 100755
--- a/Modules/Helpdesk/Resources/views/livewire/ticket-index.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/ticket-index.blade.php
@@ -157,8 +157,8 @@
     </div>
 
     @if ($deleteModalOpen)
-        <div class="fixed inset-0 z-[9998] flex items-center justify-center bg-black/75 px-4 py-6 backdrop-blur-sm"
-            role="dialog" aria-modal="true" aria-labelledby="delete-ticket-modal-title"
+        <dialog open class="fixed inset-0 z-[9998] flex items-center justify-center bg-black/75 px-4 py-6 backdrop-blur-sm"
+            aria-modal="true" aria-labelledby="delete-ticket-modal-title"
             wire:key="ticket-delete-modal-{{ $pendingDeleteTicketId ?? 'none' }}"
             dusk="delete-ticket-confirmation-modal">
             <div
@@ -215,6 +215,6 @@
                     </button>
                 </div>
             </div>
-        </div>
+        </dialog>
     @endif
 </div>
diff --git a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
index 9cf5b609..f9dc82a3 100755
--- a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
@@ -500,7 +500,7 @@
                             class="rounded-xl border border-zinc-200 bg-zinc-50 p-3 dark:border-zinc-700 dark:bg-zinc-950">
                             <div class="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
                                 <div class="min-w-0">
-                                    <label class="block text-xs font-bold text-zinc-700 dark:text-zinc-200">Attach files
+                                    <label for="sonar-input-cc351ecc57" class="block text-xs font-bold text-zinc-700 dark:text-zinc-200">Attach files
                                         to
                                         this reply</label>
                                     <p class="mt-1 truncate text-xs font-semibold text-zinc-500 dark:text-zinc-400"
@@ -511,7 +511,6 @@
                                        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>
-                                    <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>
diff --git a/Modules/M3/Console/ClosedOrderSaveXls.php b/Modules/M3/Console/ClosedOrderSaveXls.php
index a8ba70b4..b967b492 100755
--- a/Modules/M3/Console/ClosedOrderSaveXls.php
+++ b/Modules/M3/Console/ClosedOrderSaveXls.php
@@ -87,16 +87,13 @@ class ClosedOrderSaveXls extends Command
             : $warehouse . '/Closedorderlinesreport_' . $from . '-' . $to . '-' . $warehouse . self::XLSX_EXTENSION;
 
         $this->info('Generate Last Month Report...');
-        $this->generateReport(
-            $company,
-            $warehouse,
-            $plant,
-            str_replace('-', '', $from),
-            str_replace('-', '', $to),
-            $file,
-            ! Storage::disk('publicCL')->exists($file),
-            'Last Month',
-        );
+        $this->generateReport($company, $warehouse, $plant, [
+            'from' => str_replace('-', '', $from),
+            'to' => str_replace('-', '', $to),
+            'file' => $file,
+            'shouldGenerate' => ! Storage::disk('publicCL')->exists($file),
+            'label' => 'Last Month',
+        ]);
     }
 
     private function generateCurrentMonthReport(string $company, string $warehouse, string $plant): void
@@ -109,47 +106,40 @@ class ClosedOrderSaveXls extends Command
             : $warehouse . '/first_of_month_to_current_date_' . $warehouse . self::XLSX_EXTENSION;
 
         $this->info('Generate Current Month Report...');
-        $this->generateReport(
-            $company,
-            $warehouse,
-            $plant,
-            str_replace('-', '', $from),
-            str_replace('-', '', $to),
-            $file,
-            true,
-            'Current Month',
-        );
+        $this->generateReport($company, $warehouse, $plant, [
+            'from' => str_replace('-', '', $from),
+            'to' => str_replace('-', '', $to),
+            'file' => $file,
+            'shouldGenerate' => true,
+            'label' => 'Current Month',
+        ]);
     }
 
     private function generateReport(
         string $company,
         string $warehouse,
         string $plant,
-        string $from,
-        string $to,
-        string $file,
-        bool $shouldGenerate,
-        string $label,
+        array $report,
     ): void {
-        $this->info('From Date: ' . $from);
-        $this->info('To Date: ' . $to);
+        $this->info('From Date: ' . $report['from']);
+        $this->info('To Date: ' . $report['to']);
 
-        if (! $shouldGenerate || ! $this->hasReportScope($company, $warehouse, $plant)) {
+        if (! $report['shouldGenerate'] || ! $this->hasReportScope($company, $warehouse, $plant)) {
             return;
         }
 
-        $rows = $this->closedOrderRows($company, $warehouse, $plant, $from, $to);
+        $rows = $this->closedOrderRows($company, $warehouse, $plant, $report['from'], $report['to']);
         if ($rows->isEmpty()) {
-            Log::channel('dailyCron')->info($label . ' report, no records found: Nothing to save...');
+            Log::channel('dailyCron')->info($report['label'] . ' report, no records found: Nothing to save...');
 
             return;
         }
 
         $rows->prepend($this->headers());
         $this->logRecordLimit($rows->count());
-        $this->info('Saving ' . $label . ' Excel Report to Disk');
-        Log::channel('dailyCron')->info('Saving ' . $label . ' Excel Report to Disk');
-        app(SpreadsheetExport::class)->store($rows, $file, 'publicCL');
+        $this->info('Saving ' . $report['label'] . ' Excel Report to Disk');
+        Log::channel('dailyCron')->info('Saving ' . $report['label'] . ' Excel Report to Disk');
+        app(SpreadsheetExport::class)->store($rows, $report['file'], 'publicCL');
     }
 
     private function hasReportScope(string $company, string $warehouse, string $plant): bool
diff --git a/Modules/M3/Helpers/Helper.php b/Modules/M3/Helpers/Helper.php
index 9a994016..b9bd47d4 100755
--- a/Modules/M3/Helpers/Helper.php
+++ b/Modules/M3/Helpers/Helper.php
@@ -313,7 +313,7 @@ class Helper
 
     public static function getUserCOWHSPLT()
     {
-        $defaults = [
+        $result = [
             'UserCO' => '',
             'UserWHS' => '',
             'UserPL' => '',
@@ -321,32 +321,28 @@ class Helper
 
         $loggedUser = strtoupper(trim((string) m3User()));
         if ($loggedUser === '') {
-            return $defaults;
+            return $result;
         }
 
         try {
-            if (! Schema::connection(config('m3.connection', 'pgsql'))->hasTable('icm428m')) {
-                return $defaults;
+            if (Schema::connection(config('m3.connection', 'pgsql'))->hasTable('icm428m')) {
+                $user = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
+                    ->select('R428US', 'R428ADMUSR', 'R428PWRUSR', 'R428CO', 'R428PL', 'R428WH', 'R42811A', 'R42821A')
+                    ->where('R428US', $loggedUser)
+                    ->first();
+
+                if ($user) {
+                    $result = [
+                        'UserCO' => trim((string) ($user->R428CO ?? '')),
+                        'UserWHS' => trim((string) ($user->R428WH ?? '')),
+                        'UserPL' => trim((string) ($user->R428PL ?? '')),
+                    ];
+                }
             }
-
-            $user = DB::connection(config('m3.connection', 'pgsql'))->table('icm428m')
-                ->select('R428US', 'R428ADMUSR', 'R428PWRUSR', 'R428CO', 'R428PL', 'R428WH', 'R42811A', 'R42821A')
-                ->where('R428US', $loggedUser)
-                ->first();
-
-            if (! $user) {
-                return $defaults;
-            }
-
-            return [
-                'UserCO' => trim((string) ($user->R428CO ?? '')),
-                'UserWHS' => trim((string) ($user->R428WH ?? '')),
-                'UserPL' => trim((string) ($user->R428PL ?? '')),
-            ];
         } catch (\Throwable $e) {
             \Illuminate\Support\Facades\Log::warning('M3 user context unavailable', ['exception' => $e->getMessage()]);
-
-            return $defaults;
         }
+
+        return $result;
     }
 }
diff --git a/Modules/M3/Http/Controllers/API/CloseShipment.php b/Modules/M3/Http/Controllers/API/CloseShipment.php
index cadd3f32..b9470c60 100755
--- a/Modules/M3/Http/Controllers/API/CloseShipment.php
+++ b/Modules/M3/Http/Controllers/API/CloseShipment.php
@@ -454,7 +454,7 @@ class CloseShipment extends Controller
                             $contentLabel = '';
 
                             $docTypes = ['ContentLabel', 'CarrierLabel'];
-                            foreach ($docTypes as $key => $value) {
+                            foreach ($docTypes as $value) {
                                 switch ($value) {
                                     case 'CarrierLabel':
                                         $dOCTYPE = 'CarrierLabel';
diff --git a/Modules/M3/Http/Controllers/API/PdfStorage.php b/Modules/M3/Http/Controllers/API/PdfStorage.php
index 2092f36a..4191c39a 100755
--- a/Modules/M3/Http/Controllers/API/PdfStorage.php
+++ b/Modules/M3/Http/Controllers/API/PdfStorage.php
@@ -18,37 +18,36 @@ class PdfStorage extends Controller
     public function PdfStorageAPI(Request $request): JsonResponse
     {
         $this->configureTimeouts();
-
         $context = $this->requestContext($request);
+
         if ($context === null) {
-            return $this->errorResponse('No URL Parameters Sent', self::ZERO_PAD, '', '', '');
-        }
+            $result = $this->errorResponse('No URL Parameters Sent', self::ZERO_PAD, '', '', '');
+        } else {
+            try {
+                $this->logRequest($context);
+                $cacheKey = $this->buildCacheKey($context);
+                $pdfFileName = (string) Config::get('arrays.PdfPath') . $context['FILENAME'] . '.pdf';
+                $error = $this->validateStorageRequest($pdfFileName, $cacheKey);
 
-        try {
-            $this->logRequest($context);
-
-            $cacheKey = $this->buildCacheKey($context);
-            $pdfFileName = (string) Config::get('arrays.PdfPath') . $context['FILENAME'] . '.pdf';
-            $error = $this->validateStorageRequest($pdfFileName, $cacheKey);
-
-            if ($error !== null) {
-                return $this->errorResponse($error, $context['DELIVERYNO'], $context['DOCNUM'], $context['COMPANY'], $context['WHS']);
+                if ($error !== null) {
+                    $result = $this->errorResponse($error, $context['DELIVERYNO'], $context['DOCNUM'], $context['COMPANY'], $context['WHS']);
+                } else {
+                    Cache::forever($cacheKey, base64_encode(File::get($pdfFileName)));
+                    $this->logResult($context, 'PDF File converted to Base64 and Saved to Cache.Key: ' . $cacheKey);
+                    $result = response()->json(['code' => '200', 'status' => 'Success', 'cacheKey' => $cacheKey]);
+                }
+            } catch (\Throwable $exception) {
+                $message = 'An Error Occured - ' . substr($exception->getMessage(), 0, 300);
+                $this->safeLog($context, $message, true);
+                $result = response()->json([
+                    'code' => '405',
+                    'status' => 'error',
+                    'message' => 'Catched Error: ' . $exception->getMessage(),
+                ]);
             }
-
-            Cache::forever($cacheKey, base64_encode(File::get($pdfFileName)));
-            $this->logResult($context, 'PDF File converted to Base64 and Saved to Cache.Key: ' . $cacheKey);
-
-            return response()->json(['code' => '200', 'status' => 'Success', 'cacheKey' => $cacheKey]);
-        } catch (\Throwable $exception) {
-            $message = 'An Error Occured - ' . substr($exception->getMessage(), 0, 300);
-            $this->safeLog($context, $message, true);
-
-            return response()->json([
-                'code' => '405',
-                'status' => 'error',
-                'message' => 'Catched Error: ' . $exception->getMessage(),
-            ]);
         }
+
+        return $result;
     }
 
     private function configureTimeouts(): void
diff --git a/Modules/M3/Http/Controllers/API/TwoShipAPIs.php b/Modules/M3/Http/Controllers/API/TwoShipAPIs.php
index bfae73a9..3bf35768 100755
--- a/Modules/M3/Http/Controllers/API/TwoShipAPIs.php
+++ b/Modules/M3/Http/Controllers/API/TwoShipAPIs.php
@@ -28,33 +28,32 @@ class TwoShipAPIs extends Controller
 
         if ($params === []) {
             $this->log($macpkr ?: '000000', $co, $whs, $user, 'X', 'No URL Parameters Sent');
+            $result = response()->json(['code' => '405', 'status' => 'Error', 'message' => 'No URL Parameters Sent']);
+        } else {
+            try {
+                $this->logRequest($macpkr, $co, $whs, $user);
+                $orders = $this->aggregationOrders($macpkr, $co, $whs);
+                $response = $this->callTwoShip($orders);
+                $error = $this->responseError($response);
 
-            return response()->json(['code' => '405', 'status' => 'Error', 'message' => 'No URL Parameters Sent']);
-        }
-
-        try {
-            $this->logRequest($macpkr, $co, $whs, $user);
-            $orders = $this->aggregationOrders($macpkr, $co, $whs);
-            $response = $this->callTwoShip($orders);
-            $error = $this->responseError($response);
-            if ($error !== '') {
-                $this->log($macpkr, $co, $whs, $user, 'X', $response->status() . '-' . $error);
-
-                return response()->json(['code' => '405', 'status' => 'error', 'message' => 'Status: ' . $response->status() . '-' . $error]);
+                if ($error !== '') {
+                    $this->log($macpkr, $co, $whs, $user, 'X', $response->status() . '-' . $error);
+                    $result = response()->json(['code' => '405', 'status' => 'error', 'message' => 'Status: ' . $response->status() . '-' . $error]);
+                } else {
+                    $this->log($macpkr, $co, $whs, $user, '', $response->body());
+                    $this->markAggregationComplete($orders, $co, $whs);
+                    $result = response()->json(['code' => '200', 'status' => 'Success']);
+                }
+            } catch (\Throwable $th) {
+                $message = str_contains($th->getMessage(), 'cURL error')
+                    ? 'Curl Error: Communication with 2Ship Timed Out.'
+                    : '2Ship communication failed.';
+                $this->log($macpkr, $co, $whs, $user, 'X', $message);
+                $result = response()->json(['code' => '405', 'status' => 'error', 'message' => $message]);
             }
-
-            $this->log($macpkr, $co, $whs, $user, '', $response->body());
-            $this->markAggregationComplete($orders, $co, $whs);
-
-            return response()->json(['code' => '200', 'status' => 'Success']);
-        } catch (\Throwable $th) {
-            $message = str_contains($th->getMessage(), 'cURL error')
-                ? 'Curl Error: Communication with 2Ship Timed Out.'
-                : '2Ship communication failed.';
-            $this->log($macpkr, $co, $whs, $user, 'X', $message);
-
-            return response()->json(['code' => '405', 'status' => 'error', 'message' => $message]);
         }
+
+        return $result;
     }
 
     private function configureTimeouts(): void
diff --git a/Modules/M3/Http/Controllers/M3CallCloseAPIController.php b/Modules/M3/Http/Controllers/M3CallCloseAPIController.php
index 829bf0f4..6eaa3e62 100755
--- a/Modules/M3/Http/Controllers/M3CallCloseAPIController.php
+++ b/Modules/M3/Http/Controllers/M3CallCloseAPIController.php
@@ -16,31 +16,31 @@ class M3CallCloseAPIController extends Controller
     {
         self::configureTimeouts();
         $params = self::validatedParams($request);
+        $response = null;
 
         if ($params === null) {
             Log::channel('dailyCron')->error('Manifest CloseAPI: Manifest, company and warehouse must be defined.');
-
-            return self::errorResponse('Manifest CloseAPI: Manifest, company and warehouse must be defined.');
-        }
-
-        try {
-            $records = self::findOpenManifestRecords($params);
-            if ($records->isEmpty()) {
-                Log::channel('dailyCron')->info('Manifest CloseAPI: No records found in ICM705M1.');
-
-                return self::errorResponse('Manifest CloseAPI: No records found in ICM705M1.');
+            $response = self::errorResponse('Manifest CloseAPI: Manifest, company and warehouse must be defined.');
+        } else {
+            try {
+                $records = self::findOpenManifestRecords($params);
+                if ($records->isEmpty()) {
+                    Log::channel('dailyCron')->info('Manifest CloseAPI: No records found in ICM705M1.');
+                    $response = self::errorResponse('Manifest CloseAPI: No records found in ICM705M1.');
+                } else {
+                    $response = self::submitManifest($records->first(), $params['SHUSER']);
+                }
+            } catch (\Throwable $exception) {
+                Log::error($exception);
+                $response = response()->json([
+                    'code' => '500',
+                    'status' => 'Error',
+                    'message' => 'Manifest Closing failed unexpectedly.',
+                ], 500);
             }
-
-            return self::submitManifest($records->first(), $params['SHUSER']);
-        } catch (\Throwable $exception) {
-            Log::error($exception);
-
-            return response()->json([
-                'code' => '500',
-                'status' => 'Error',
-                'message' => 'Manifest Closing failed unexpectedly.',
-            ], 500);
         }
+
+        return $response;
     }
 
     private static function configureTimeouts(): void
diff --git a/Modules/M3/Http/Middleware/BasicAuth.php b/Modules/M3/Http/Middleware/BasicAuth.php
index cb0f79d1..20fb2777 100755
--- a/Modules/M3/Http/Middleware/BasicAuth.php
+++ b/Modules/M3/Http/Middleware/BasicAuth.php
@@ -27,26 +27,26 @@ class BasicAuth
         }
 
         $handle = fopen($passwordFile, 'rb');
-        if ($handle === false) {
-            return false;
-        }
+        $valid = false;
 
-        try {
-            while (($line = fgets($handle)) !== false) {
-                $parts = explode(':', trim($line), 2);
-                if (count($parts) !== 2 || ! hash_equals($parts[0], $login)) {
-                    continue;
+        if ($handle !== false) {
+            try {
+                while (($line = fgets($handle)) !== false) {
+                    $parts = explode(':', trim($line), 2);
+                    if (count($parts) !== 2 || ! hash_equals($parts[0], $login)) {
+                        continue;
+                    }
+
+                    $storedHash = trim($parts[1]);
+                    $valid = $storedHash !== '' && password_verify($password, $storedHash);
+                    break;
                 }
-
-                $storedHash = trim($parts[1]);
-
-                return $storedHash !== '' && password_verify($password, $storedHash);
+            } finally {
+                fclose($handle);
             }
-        } finally {
-            fclose($handle);
         }
 
-        return false;
+        return $valid;
     }
 
     private function unauthorized(): Response
diff --git a/Modules/M3/Resources/public/liberty-theme/css/styles.css b/Modules/M3/Resources/public/liberty-theme/css/styles.css
index 48c9f01f..2aa7658d 100755
--- a/Modules/M3/Resources/public/liberty-theme/css/styles.css
+++ b/Modules/M3/Resources/public/liberty-theme/css/styles.css
@@ -452,7 +452,7 @@ legend + * {
   font: inherit;
 }
 
-::-webkit-file-upload-button {
+:where(html) ::-webkit-file-upload-button {
   font: inherit;
   -webkit-appearance: button;
 }
@@ -2276,7 +2276,7 @@ div.table-responsive > table > tbody > tr:last-child > td{
 .form-control:hover:not(:disabled):not([readonly])::file-selector-button, .dataTable-input:hover:not(:disabled):not([readonly])::file-selector-button {
   background-color: #dde0e3;
 }
-.form-control::-webkit-file-upload-button, .dataTable-input::-webkit-file-upload-button {
+:where(html) .form-control::-webkit-file-upload-button, .dataTable-input::-webkit-file-upload-button {
   padding: 0.375rem 0.75rem;
   margin: -0.375rem -0.75rem;
   -webkit-margin-end: 0.75rem;
@@ -2298,7 +2298,7 @@ div.table-responsive > table > tbody > tr:last-child > td{
     transition: none;
   }
 }
-.form-control:hover:not(:disabled):not([readonly])::-webkit-file-upload-button, .dataTable-input:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
+:where(html) .form-control:hover:not(:disabled):not([readonly])::-webkit-file-upload-button, .dataTable-input:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
   background-color: #dde0e3;
 }
 
@@ -2336,7 +2336,7 @@ div.table-responsive > table > tbody > tr:last-child > td{
   -webkit-margin-end: 0.5rem;
           margin-inline-end: 0.5rem;
 }
-.form-control-sm::-webkit-file-upload-button {
+:where(html) .form-control-sm::-webkit-file-upload-button {
   padding: 0.25rem 0.5rem;
   margin: -0.25rem -0.5rem;
   -webkit-margin-end: 0.5rem;
@@ -2361,7 +2361,7 @@ div.table-responsive > table > tbody > tr:last-child > td{
   -webkit-margin-end: 1rem;
           margin-inline-end: 1rem;
 }
-.form-control-lg::-webkit-file-upload-button {
+:where(html) .form-control-lg::-webkit-file-upload-button {
   padding: 0.5rem 1rem;
   margin: -0.5rem -1rem;
   -webkit-margin-end: 1rem;
@@ -3721,7 +3721,7 @@ textarea.form-control-lg {
 .dropend .dropdown-toggle:empty::after {
   margin-left: 0;
 }
-.dropend .dropdown-toggle::after {
+:where(html) .dropend .dropdown-toggle::after {
   vertical-align: 0;
 }
 
@@ -3738,7 +3738,7 @@ textarea.form-control-lg {
   vertical-align: 0.255em;
   content: "";
 }
-.dropstart .dropdown-toggle::after {
+:where(html) .dropstart .dropdown-toggle::after {
   display: none;
 }
 .dropstart .dropdown-toggle::before {
@@ -3753,7 +3753,7 @@ textarea.form-control-lg {
 .dropstart .dropdown-toggle:empty::after {
   margin-left: 0;
 }
-.dropstart .dropdown-toggle::before {
+:where(html) .dropstart .dropdown-toggle::before {
   vertical-align: 0;
 }
 
@@ -3821,7 +3821,7 @@ textarea.form-control-lg {
 }
 .dropdown-menu-dark .dropdown-item:hover, .dropdown-menu-dark .dropdown-item:focus {
   color: #fff;
-  background-color: rgba(255, 255, 255, 0.15);
+  background-color: rgba(255, 255, 255, 0.25);
 }
 .dropdown-menu-dark .dropdown-item.active, .dropdown-menu-dark .dropdown-item:active {
   color: #fff;
@@ -4849,7 +4849,7 @@ textarea.form-control-lg {
   border-color: #dee2e6;
 }
 
-.page-link, .dataTable-pagination a {
+:where(html) .page-link, .dataTable-pagination a {
   padding: 0.375rem 0.75rem;
 }
 
@@ -7673,7 +7673,7 @@ textarea.form-control-lg {
 /* rtl:begin:remove */
 .text-break {
   word-wrap: break-word !important;
-  word-break: break-word !important;
+  overflow-wrap: anywhere !important;
 }
 
 /* rtl:end:remove */
@@ -11652,11 +11652,11 @@ body {
   border-color: #dbe3e6
 }
 
-.breadcrumb {
+:where(html) .breadcrumb {
   border: 1px solid #f3f3f3
 }
 
-.breadcrumb {
+:where(body) .breadcrumb {
   display: flex;
   flex-wrap: wrap;
   padding: 0.56rem 1.13rem;
@@ -11717,7 +11717,7 @@ nav {
   margin-left: 20px;
 }
 
-.breadcrumb.breadcrumb-custom .breadcrumb-item:before {
+:where(html) .breadcrumb.breadcrumb-custom .breadcrumb-item:before {
   content: ""
 }
 
@@ -11736,7 +11736,7 @@ a:link {
   text-decoration: none
 }
 
-.breadcrumb-item+.breadcrumb-item::before {
+:where(html) .breadcrumb-item+.breadcrumb-item::before {
   display: inline-block;
   padding-right: 0.5rem;
   color: #6c757d;
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 038318b0..d8d38d46 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php
@@ -11,50 +11,50 @@
                 <input type="hidden" id="addAVCO" name="addAVCO" value="{{$power_user->R428CO}}">
                 <input type="hidden" id="addAVPLANT" name="addAVPLANT" value="{{$power_user->R428PL}}">
                 <input type="hidden" id="addAVWHS" name="addAVWHS" value="{{$power_user->R428WH}}">
-                <table role="presentation" class="table table-condensed" >
-                    <thead>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td><b>Delivery Method</b></td> <!-- ALPHA -->
-                            <td class="text-right">
+                <div class="sonar-form-layout">
+                    <div>
+                    </div>
+                    <div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Delivery Method</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <label for="addAVDELMETH" class="visually-hidden">addAVDELMETH</label>
 <input type="text" maxlength="4" length="4" class="myinput" name="addAVDELMETH" id="addAVDELMETH">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><b>Ship Via</b></td> <!-- ALPHA -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Ship Via</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <select id="addAVSHPVIA" name="addAVSHPVIA">
                                     <option value="">Select Ship Via</option>
                                     @foreach($shipvia as $key=>$val)
                                     <option value="{{$val->AXCODE}}">{{$val->AXCODE}} - {{$val->AXDESC}}</option>
                                     @endforeach
                                 </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><b>Sentinel Route</b></td> <!-- ALPHA -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Sentinel Route</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <select id="addAVSHSRT" name="addAVSHSRT">
                                     <option value=" "></option>
                                     <option value="GR">GR</option>
                                     <option value="PU">PU</option>
                                 </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><b>International Code</b></td> <!-- ALPHA -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>International Code</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <select id="addAVSHORCL" name="addAVSHORCL">
                                     <option value=" "  selected></option>
                                     <option value="Y">002 - International</option>
                                 </select>
-                            </td>
-                        </tr>
+                            </div>
+                        </div>
 
-                    </tbody>
-                </table>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="modal-footer">
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 4817151a..2b9227eb 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php
@@ -11,19 +11,19 @@
                 <input type="hidden" id="AVCO" name="AVCO" value="{{$power_user->R428CO}}">
                 <input type="hidden" id="AVPLANT" name="AVPLANT" value="{{$power_user->R428PL}}">
                 <input type="hidden" id="AVWHS" name="AVWHS" value="{{$power_user->R428WH}}">
-                <table role="presentation" class="table table-condensed">
-                    <tbody>
-                        <tr>
-                            <td><b>Delivery Method</b></td> <!-- ALPHA -->
-                            <td class="text-right">
+                <div class="sonar-form-layout">
+                    <div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Delivery Method</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <input type="hidden" name="OLD_AVDELMETH" id="OLD_AVDELMETH">
                                 <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>
-                            <td><b>Ship Via</b></td> <!-- ALPHA -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Ship Via</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <label for="OLD_AVSHPVIA" class="visually-hidden">OLD AVSHPVIA</label>
 <input type="hidden" name="OLD_AVSHPVIA" id="OLD_AVSHPVIA">
                                 <select id="AVSHPVIA" name="AVSHPVIA">
@@ -32,11 +32,11 @@
                                     <option value="{{$val->AXCODE}}">{{$val->AXCODE}} - {{$val->AXDESC}}</option>
                                     @endforeach
                                 </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><b>Sentinel Route</b></td> <!-- ALPHA -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Sentinel Route</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <label for="OLD_AVSHSRT" class="visually-hidden">OLD AVSHSRT</label>
 <input type="hidden" name="OLD_AVSHSRT" id="OLD_AVSHSRT">
                                 <select id="AVSHSRT" name="AVSHSRT">
@@ -44,22 +44,22 @@
                                     <option value="GR">GR</option>
                                     <option value="PU">PU</option>
                                 </select>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><b>International Code</b></td> <!-- ALPHA -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>International Code</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <label for="OLD_AVSHORCL" class="visually-hidden">OLD AVSHORCL</label>
 <input type="hidden" name="OLD_AVSHORCL" id="OLD_AVSHORCL">
                                 <select id="AVSHORCL" name="AVSHORCL">
                                     <option value=" "  selected></option>
                                     <option value="Y">002 - International</option>
                                 </select>
-                            </td>
-                        </tr>
+                            </div>
+                        </div>
 
-                    </tbody>
-                </table>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="modal-footer">
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 b010a212..91d3ac39 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/carrierAdd.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/carrierAdd.blade.php
@@ -8,67 +8,67 @@
         </div>
         <div class="modal-body">
             <div class="table-responsive" id="carrierAddData">
-                <table role="presentation" class="table table-condensed" >
-                    <thead>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td><b>Carrier Number</b></td> <!-- ALPHA -->
-                            <td class="text-right">
+                <div class="sonar-form-layout">
+                    <div>
+                    </div>
+                    <div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Carrier Number</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <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">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Carrier Name</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <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">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>2ship Carrier Code</b></div> <!-- NUMERIC -->
+                            <div class="col text-right">
                                 <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>
-                        <tr>
-                            <td><b>Parcel Carrier Code</b></td> <!-- Switch -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Parcel Carrier Code</b></div> <!-- Switch -->
+                            <div class="col text-right">
                                 LTL
                                 <div class="col-sm-1 form-check form-check-inline form-switch">
                                     <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>
-                        </tr>
-                        <tr>
-                            <td><b>ERP Carrier Code</b></td> <!-- ALPHA -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>ERP Carrier Code</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <!--#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))'> -->
                                 <label for="addCASPR10A01" class="visually-hidden">addCASPR10A01</label>
 <input type="text" maxlength="10"class="myinput" name="addCASPR10A01" id="addCASPR10A01" required>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><b>Timing of M3 closing</b></td> <!-- Switch -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Timing of M3 closing</b></div> <!-- Switch -->
+                            <div class="col text-right">
                                 Overnight
                                 <div class="col-sm-1 form-check form-check-inline form-switch">
                                     <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>
-                        </tr>
+                            </div>
+                        </div>
 
-                    </tbody>
-                </table>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="modal-footer">
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 b082043c..2a75db49 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/carrierEdit.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/carrierEdit.blade.php
@@ -8,36 +8,36 @@
         </div>
         <div class="modal-body">
             <div class="table-responsive" id="carrierEditData">
-                <table role="presentation" class="table table-condensed">
-                    <tbody>
-                        <tr>
-                            <td><b>Carrier Number</b></td> <!-- ALPHA -->
-                            <td class="text-right">
+                <div class="sonar-form-layout">
+                    <div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Carrier Number</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <input type="hidden" name="OLD_CANUM" id="OLD_CANUM">
                                 <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">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Carrier Name</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <input type="hidden" name="OLD_CANAM" id="OLD_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">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>2ship Carrier Code</b></div> <!-- NUMERIC -->
+                            <div class="col text-right">
                                 <input type="hidden" name="OLD_TWOSHIPCARRIERCODE" id="OLD_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>
-                        <tr>
-                            <td><b>Parcel Carrier Code</b></td> <!-- Switch -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Parcel Carrier Code</b></div> <!-- Switch -->
+                            <div class="col text-right">
                                 LTL
                                 <div class="col-sm-1 form-check form-check-inline form-switch">
                                     <input type="hidden" name="OLD_PARCELCARRIERCODE" id="OLD_PARCELCARRIERCODE">
@@ -45,22 +45,22 @@
 <input type="checkbox" class="form-check-input" role="switch" id="PARCELCARRIERCODE" name="PARCELCARRIERCODE" data-on="X" data-off="" aria-checked="false">
                                     Parcel
                                 </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><b>ERP Carrier Code</b></td> <!-- ALPHA -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>ERP Carrier Code</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <input type="hidden" name="OLD_CASPR10A01" id="OLD_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> -->
                                 <label for="CASPR10A01" class="visually-hidden">CASPR10A01</label>
 <input type="text" maxlength="10" class="myinput" name="CASPR10A01" id="CASPR10A01" required>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><b>Timing of M3 closing</b></td> <!-- Switch -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Timing of M3 closing</b></div> <!-- Switch -->
+                            <div class="col text-right">
                                 Overnight
                                 <div class="col-sm-1 form-check form-check-inline form-switch">
                                     <input type="hidden" name="OLD_CASPR1A01" id="OLD_CASPR1A01">
@@ -68,11 +68,11 @@
 <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>
-                        </tr>
+                            </div>
+                        </div>
 
-                    </tbody>
-                </table>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="modal-footer">
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 9c5e38c0..ca4ec6a1 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyAdd.blade.php
@@ -8,13 +8,13 @@
         </div>
         <div class="modal-body">
             <div class="table-responsive" id="qtyAddData">
-                <table role="presentation" class="table table-condensed" >
-                    <thead>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td><label for="AT9DPW" class="col-form-label"><b>Div-Plt-Whs:</b></label></td>
-                            <td>
+                <div class="sonar-form-layout">
+                    <div>
+                    </div>
+                    <div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><label for="AT9DPW" class="col-form-label"><b>Div-Plt-Whs:</b></label></div>
+                            <div class="col">
                             <div class="mb-3">
                                 <select class="form-select-sm" id="addAT9DPW"
                                 @if($power_user->R428PWRUSR=="N")
@@ -30,32 +30,32 @@
                                     @endforeach
                                 </select>
                             </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><b>Part</b></td> <!-- ALPHA -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Part</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <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">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Pallet Qty</b></div> <!-- NUMERIC -->
+                            <div class="col text-right">
                                 <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">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Hazardous Material</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <label for="addAT9WRN" class="visually-hidden">addAT9WRN</label>
 <input type="text" maxlength="5" class="myinput" name="addAT9WRN" id="addAT9WRN">
-                            </td>
-                        </tr>
+                            </div>
+                        </div>
 
-                    </tbody>
-                </table>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="modal-footer">
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 b7c8a370..730dfd9c 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyEdit.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/qtyEdit.blade.php
@@ -8,11 +8,11 @@
         </div>
         <div class="modal-body">
             <div class="table-responsive" id="qtyEditData">
-                <table role="presentation" class="table table-condensed">
-                    <tbody>
-                        <tr>
-                            <td><label for="AT9DPW" class="col-form-label"><b>Div-Plt-Whs:</b></label></td>
-                            <td>
+                <div class="sonar-form-layout">
+                    <div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><label for="AT9DPW" class="col-form-label"><b>Div-Plt-Whs:</b></label></div>
+                            <div class="col">
                             <input type="hidden" name="USERDPW" id="USERDPW">
                             <div class="mb-3">
                                 <input type="hidden" name="OLD_AT9DPW" id="OLD_AT9DPW">
@@ -25,35 +25,35 @@
                                     @endforeach
                                 </select>
                             </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td><b>Part</b></td> <!-- ALPHA -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Part</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <input type="hidden" name="OLD_AT9PART" id="OLD_AT9PART">
                                 <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">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Pallet Qty</b></div> <!-- NUMERIC -->
+                            <div class="col text-right">
                                 <input type="hidden" name="OLD_AT9QTY" id="OLD_AT9QTY">
                                 <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">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Hazardous Material</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <input type="hidden" name="OLD_AT9WRN" id="OLD_AT9WRN">
                                 <label for="AT9WRN" class="visually-hidden">AT9WRN</label>
 <input type="text" maxlength="5" class="myinput" name="AT9WRN" id="AT9WRN">
-                            </td>
-                        </tr>
+                            </div>
+                        </div>
 
-                    </tbody>
-                </table>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="modal-footer">
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 4881b5df..6f19dc8e 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/shipToEdit.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/shipToEdit.blade.php
@@ -7,64 +7,64 @@
         </div>
         <div class="modal-body">
             <div class="table-responsive" id="shipToEditData">
-                <table role="presentation" class="table table-condensed" >
-                    <thead>
-                        <tr>
-                            <td></td>
-                            <td class="text-center"><strong>Original</strong></td>
-                            <td class="text-center"><strong>Current</strong></td>
-                            <td class="text-center"><strong>New Values</strong></td>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td><b>Name</b></td><!-- ALPHA -->
-                            <td class="text-left smalltxt">{!! (isset($original->PSHNM)&&trim($original->PSHNM)!=''?trim($original->PSHNM):'') !!}</td>
-                            <td class="text-left smalltxt">{!! (isset($order->SHSHNM)&&trim($order->SHSHNM)!=''?trim($order->SHSHNM):'') !!}</td>
-                            <td class="text-left smalltxt">{!! (isset($order->SHSHNM)&&trim($order->SHSHNM)!=''?trim($order->SHSHNM):'') !!}</td>
-                        </tr>
-                        <tr>
-                            <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"><label for="sonar-input-deb2f9aedc" class="visually-hidden">SHSHA1</label>
-<input maxlength="30" class="myinput toUpper" type="text" name="SHSHA1" value="{!! (isset($order->SHSHA1)&&trim($order->SHSHA1)!=''?trim($order->SHSHA1):' ') !!}" id="sonar-input-deb2f9aedc"></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"><label for="sonar-input-bf4a0acc70" class="visually-hidden">SHSHA2</label>
-<input maxlength="30" class="myinput toUpper" type="text" name="SHSHA2" value="{!! (isset($order->SHSHA2)&&trim($order->SHSHA2)!=''?trim($order->SHSHA2):' ') !!}" id="sonar-input-bf4a0acc70"></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"><label for="sonar-input-e043dfd88b" class="visually-hidden">sonar input e043dfd88b</label>
-<input id="sonar-input-e043dfd88b" aria-label="Shshci" 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>
-                        </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"><label for="sonar-input-967e1c005d" class="visually-hidden">sonar input 967e1c005d</label>
-<input id="sonar-input-967e1c005d" aria-label="Shshst" 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>
-                        <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"><label for="sonar-input-d755055c65" class="visually-hidden">SHSHZP</label>
-<input maxlength="9" class="myinput toUpper" type="text" name="SHSHZP" value="{!! (isset($order->SHSHZP)&&trim($order->SHSHZP)!=''?trim($order->SHSHZP):' ') !!}" id="sonar-input-d755055c65"></td>
-                        </tr>
-                        <tr>
-                            <td><b>Country</b></td> <!-- ALPHA MAX -->
-                            <td class="text-left smalltxt">{!! (isset($original->PSHCT)&&trim($original->PSHCT)!=''?trim($original->PSHCT):'') !!}</td>
-                            <td class="text-left smalltxt">{!! (isset($order->SHSHCT)&&trim($order->SHSHCT)!=''?trim($order->SHSHCT):'') !!}</td>
-                            <td class="text-left smalltxt">{!! (isset($order->SHSHCT)&&trim($order->SHSHCT)!=''?trim($order->SHSHCT):'') !!}</td>
-                        </tr>
-                    </tbody>
-                </table>
+                <div class="sonar-form-layout">
+                    <div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"></div>
+                            <div class="col text-center"><strong>Original</strong></div>
+                            <div class="col text-center"><strong>Current</strong></div>
+                            <div class="col text-center"><strong>New Values</strong></div>
+                        </div>
+                    </div>
+                    <div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Name</b></div><!-- ALPHA -->
+                            <div class="col text-left smalltxt">{!! (isset($original->PSHNM)&&trim($original->PSHNM)!=''?trim($original->PSHNM):'') !!}</div>
+                            <div class="col text-left smalltxt">{!! (isset($order->SHSHNM)&&trim($order->SHSHNM)!=''?trim($order->SHSHNM):'') !!}</div>
+                            <div class="col text-left smalltxt">{!! (isset($order->SHSHNM)&&trim($order->SHSHNM)!=''?trim($order->SHSHNM):'') !!}</div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Address line 1</b></div> <!-- MAX -->
+                            <div class="col text-left smalltxt">{!! (isset($original->PSHA1)&&trim($original->PSHA1)!=''?trim($original->PSHA1):'') !!}</div>
+                            <div class="col text-left smalltxt">{!! (isset($order->SHSHA1)&&trim($order->SHSHA1)!=''?trim($order->SHSHA1):'') !!}</div>
+                            <div class="col 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->SHSHA1)&&trim($order->SHSHA1)!=''?trim($order->SHSHA1):' ') !!}" id="sonar-input-deb2f9aedc"></div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Address line 2</b></div> <!-- MAX -->
+                            <div class="col text-left smalltxt">{!! (isset($original->PSHA2)&&trim($original->PSHA2)!=''?trim($original->PSHA2):'') !!}</div>
+                            <div class="col text-left smalltxt">{!! (isset($order->SHSHA2)&&trim($order->SHSHA2)!=''?trim($order->SHSHA2):'') !!}</div>
+                            <div class="col 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->SHSHA2)&&trim($order->SHSHA2)!=''?trim($order->SHSHA2):' ') !!}" id="sonar-input-bf4a0acc70"></div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>City</b></div> <!-- ALPHA MAX -->
+                            <div class="col text-left smalltxt">{!! (isset($original->PSHCI)&&trim($original->PSHCI)!=''?trim($original->PSHCI):'') !!}</div>
+                            <div class="col text-left smalltxt">{!! (isset($order->SHSHCI)&&trim($order->SHSHCI)!=''?trim($order->SHSHCI):'') !!}</div>
+                            <div class="col text-right"><label for="sonar-input-e043dfd88b" class="visually-hidden">sonar input e043dfd88b</label>
+<input id="sonar-input-e043dfd88b" aria-label="Shshci" 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):' ') !!}"></div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>State</b></div> <!-- ALPHA MAX -->
+                            <div class="col text-left smalltxt">{!! (isset($original->PSHST)&&trim($original->PSHST)!=''?trim($original->PSHST):'') !!}</div>
+                            <div class="col text-left smalltxt">{!! (isset($order->SHSHST)&&trim($order->SHSHST)!=''?trim($order->SHSHST):'') !!}</div>
+                            <div class="col text-right"><label for="sonar-input-967e1c005d" class="visually-hidden">sonar input 967e1c005d</label>
+<input id="sonar-input-967e1c005d" aria-label="Shshst" 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):' ') !!}"></div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Zip</b></div> <!-- MAX -->
+                            <div class="col text-left smalltxt">{!! (isset($original->PSHZP)&&trim($original->PSHZP)!=''?trim($original->PSHZP):'') !!}</div>
+                            <div class="col text-left smalltxt">{!! (isset($order->SHSHZP)&&trim($order->SHSHZP)!=''?trim($order->SHSHZP):'') !!}</div>
+                            <div class="col 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->SHSHZP)&&trim($order->SHSHZP)!=''?trim($order->SHSHZP):' ') !!}" id="sonar-input-d755055c65"></div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Country</b></div> <!-- ALPHA MAX -->
+                            <div class="col text-left smalltxt">{!! (isset($original->PSHCT)&&trim($original->PSHCT)!=''?trim($original->PSHCT):'') !!}</div>
+                            <div class="col text-left smalltxt">{!! (isset($order->SHSHCT)&&trim($order->SHSHCT)!=''?trim($order->SHSHCT):'') !!}</div>
+                            <div class="col text-left smalltxt">{!! (isset($order->SHSHCT)&&trim($order->SHSHCT)!=''?trim($order->SHSHCT):'') !!}</div>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="modal-footer">
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 82c164cf..647234d0 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php
@@ -8,52 +8,52 @@
         </div>
         <div class="modal-body">
             <div class="table-responsive" id="userAddData">
-                <table role="presentation" class="table table-condensed">
-                    <tbody>
+                <div class="sonar-form-layout">
+                    <div>
                     <!-- R428DV R428PL R428WHS R428STS R428US R428FIRST R428FAMILY R428EMAIL R428EMPCDE R428ADMUSR R428PWRUSR  -->
-                        <tr>
-                <td>
-                <table role="presentation" class="table table-condensed">
-                <tr>
+                        <div class="row g-2 align-items-center mb-2">
+                <div class="col">
+                <div class="sonar-form-layout">
+                <div class="row g-2 align-items-center mb-2">
                             <input type="hidden" id="R428CO" name="R428CO">
                             <input type="hidden" id="R428PL" name="R428PL">
                             <input type="hidden" id="R428WH" name="R428WH">
-                            <td><b>Status</b></td> <!-- Switch Active/Inactive -->
-                            <td class="text-center">
+                            <div class="col"><b>Status</b></div> <!-- Switch Active/Inactive -->
+                            <div class="col text-center">
                                 <div class="form-check form-switch">
                                     <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"><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"><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"><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"><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"><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>
-                            <td>
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>User profile</b></div> <!-- ALPHA -->
+                            <div class="col 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"></div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>First Name</b></div> <!-- ALPHA -->
+                            <div class="col 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"></div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Family Name</b></div> <!-- ALPHA -->
+                            <div class="col 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"></div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Email</b></div> <!-- ALPHA -->
+                            <div class="col 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"></div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Employee code</b></div> <!-- MAX -->
+                            <div class="col 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"></div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><label for="R428DPW1" class="col-form-label"><b>Div-Plt-Whs:</b></label></div>
+                            <div class="col">
                             <div class="mb-3">
                                 <select class="form-select-sm myinput" name="R428DPW1" id="R428DPW1" required>
                                     <option value="" selected disabled hidden>Select a value</option>
@@ -66,180 +66,180 @@
                                     @endforeach
                                 </select>
                             </div>
-                            </td>
-                        </tr>
-                        <!-- <tr> -->
-                </tr>
-                </table>
-                </td>
-                </tr>
-                <tr>
-                <td>
-                <table class="table table-condensed">
-                        <tr>
-                            <td><b>Admin user</b></td> <!-- SWITCH Y/N -->
-                            <td class="text-center">
+                            </div>
+                        </div>
+                        <!-- <div class="row g-2 align-items-center mb-2"> -->
+                </div>
+                </div>
+                </div>
+                </div>
+                <div class="row g-2 align-items-center mb-2">
+                <div class="col">
+                <div class="sonar-form-layout">
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Admin user</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-center">
                                 <div class="form-check form-switch">
                                     <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>
+                            <div class="col"><b>Power user</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-center">
                                 <div class="form-check form-switch">
                                     <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>
+                            <div class="col"><b>CSR</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-center">
                                 <div class="form-check form-switch">
                                     <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>
+                            </div>
 
-                            <td><b>Executive</b></td> <!-- SWITCH Y/N -->
-                            <td class="text-right">
+                            <div class="col"><b>Executive</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <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>
-                        <tr>
-                            <td colspan=2> </td><td colspan=2> </td><td colspan=2> </td>
-                        </tr>
-                        <tr>
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"> </div><div class="col"> </div><div class="col"> </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
                             <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>
+                        <div class="col"><b>Picking</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-center">
                                 <div class="form-check form-switch">
                                     <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>
+                            <div class="col"><b>Ticket processing</b></div> <!-- SWITCH Y/N Replenishment menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <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>
+                            <div class="col"><b>Document Reprints1</b></div> <!-- SWITCH Y/N Document Reprints menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <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>
-                        <tr>
-                        <td><b>Stock View Program</b></td> <!-- SWITCH Y/N -->
-                            <td class="text-center">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                        <div class="col"><b>Stock View Program</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-center">
                                 <div class="form-check form-switch">
                                     <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>
+                            <div class="col"><b>Ticket reset</b></div> <!-- SWITCH Y/N Replenishment menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <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>
+                            <div class="col"><b>Document Reprints2</b></div> <!-- SWITCH Y/N Document Reprints menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <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>
+                        </div>
+                            <div class="col"><b>Split Box Labels</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-center">
                                 <div class="form-check form-switch">
                                     <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>
+                            <div class="col"></div>
+                            <div class="col"><b>Document Reprints3</b></div> <!-- SWITCH Y/N Document Reprints menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <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>
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
                             <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>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Small parcel loading/closing</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-center">
                                 <div class="form-check form-switch">
                                     <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>
+                            <div class="col"><b>Weekly Labor card entry</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-center">
                                 <div class="form-check form-switch">
                                     <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>
-                        <tr>
-                            <td><b>Open dock door</b></td> <!-- SWITCH Y/N -->
-                            <td class="text-center">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Open dock door</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-center">
                                 <div class="form-check form-switch">
                                     <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>
+                            <div class="col"><b>MACPAC</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-center">
                                 <div class="form-check form-switch">
                                     <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>
-                        <tr>
-                            <td><b>Close dock door</b></td> <!-- SWITCH Y/N -->
-                            <td class="text-center">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Close dock door</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-center">
                                 <div class="form-check form-switch">
                                     <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>
+                            <div class="col"><b>2Ship send/aggregate</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-center">
                                 <div class="form-check form-switch">
                                     <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>
-                        <tr>
-                            <td><b>LTL loading</b></td> <!-- SWITCH Y/N -->
-                            <td class="text-center">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>LTL loading</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-center">
                                 <div class="form-check form-switch">
                                     <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>
-                </table>
-                </td>
-                </tr>
+                            </div>
+                        </div>
+                </div>
+                </div>
+                </div>
 
-                    </tbody>
-                </table>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="modal-footer">
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 8c45f814..ff0378d4 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/userEdit.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/userEdit.blade.php
@@ -8,71 +8,71 @@
         </div>
         <div class="modal-body">
             <div class="table-responsive" id="userEditData">
-                <table role="presentation" class="table table-condensed">
-                    <tbody>
+                <div class="sonar-form-layout">
+                    <div>
                     <!-- R428DV R428PL R428WHS R428STS R428US R428FIRST R428FAMILY R428EMAIL R428EMPCDE R428ADMUSR R428PWRUSR  -->
-                        <tr>
-                <td>
-                <table role="presentation" class="table table-condensed">
-                <tr>
+                        <div class="row g-2 align-items-center mb-2">
+                <div class="col">
+                <div class="sonar-form-layout">
+                <div class="row g-2 align-items-center mb-2">
                             <input type="hidden" id="OLD_R428CO" name="OLD_R428CO">
                             <input type="hidden" id="OLD_R428PL" name="OLD_R428PL">
                             <input type="hidden" id="OLD_R428WH" name="OLD_R428WH">
                             <input type="hidden" id="R428CO" name="R428CO">
                             <input type="hidden" id="R428PL" name="R428PL">
                             <input type="hidden" id="R428WH" name="R428WH">
-                            <td><b>Status</b></td> <!-- Switch Active/Inactive -->
-                            <td class="text-right">
+                            <div class="col"><b>Status</b></div> <!-- Switch Active/Inactive -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_R428STS" name="OLD_R428STS">
                                     <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>
-                        <tr>
-                            <td><b>User profile</b></td> <!-- ALPHA -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>User profile</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <input type="hidden" name="OLD_R428US" id="OLD_R428US">
                                 <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">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>First Name</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <input type="hidden" name="OLD_R428FIRST" id="OLD_R428FIRST">
                                 <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">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Family Name</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <input type="hidden" name="OLD_R428FAMILY" id="OLD_R428FAMILY">
                                 <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">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Email</b></div> <!-- ALPHA -->
+                            <div class="col text-right">
                                 <input type="hidden" name="OLD_R428EMAIL" id="OLD_R428EMAIL">
                                 <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">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Employee code</b></div> <!-- MAX -->
+                            <div class="col text-right">
                                 <input type="hidden" name="OLD_R428EMPCDE" id="OLD_R428EMPCDE">
                                 <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>
-                            <td><label for="R428DPW" class="col-form-label"><b>Div-Plt-Whs:</b></label></td>
-                            <td>
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><label for="R428DPW" class="col-form-label"><b>Div-Plt-Whs:</b></label></div>
+                            <div class="col">
                             <div class="mb-3">
                                 <input type="hidden" name="OLD_R428DPW" id="OLD_R428DPW">
                                 <select class="form-select-sm" id="R428DPW" required>
@@ -85,199 +85,199 @@
                                     @endforeach
                                 </select>
                             </div>
-                            </td>
-                        </tr>
-                </tr>
-                </table>
-                </td>
-                </tr>
-                <tr>
-                <td>
-                <table class="table table-condensed">
-                        <tr>
-                            <td><b>Admin user</b></td> <!-- SWITCH Y/N -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                </div>
+                </div>
+                </div>
+                </div>
+                <div class="row g-2 align-items-center mb-2">
+                <div class="col">
+                <div class="sonar-form-layout">
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Admin user</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_R428ADMUSR" name="OLD_R428ADMUSR">
                                     <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>
+                            <div class="col"><b>Power user</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_R428PWRUSR" name="OLD_R428PWRUSR">
                                     <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>
+                            <div class="col"><b>CSR</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_R42811A" name="OLD_R42811A">
                                     <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>
+                            <div class="col"><b>Executive</b></div> <!-- SWITCH Y/N -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_R42821A" name="OLD_R42821A">
                                     <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>
-                        <tr>
-                            <td colspan=2> </td>
-                        </tr>
-                        <tr>
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"> </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
                             <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>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Picking</b></div> <!-- SWITCH Y/N Inventory Options menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU2OPT3" name="OLD_MENU2OPT3">
                                     <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>
+                            <div class="col"><b>Ticket processing</b></div> <!-- SWITCH Y/N Replenishment menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU3OPT1" name="OLD_MENU3OPT1">
                                     <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>
+                            <div class="col"><b>Document Reprints1</b></div> <!-- SWITCH Y/N Document Reprints menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU4OPT1" name="OLD_MENU4OPT1">
                                     <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>
-                        <tr>
-                            <td><b>Stock View Program</b></td> <!-- SWITCH Y/N Inventory Options menu -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Stock View Program</b></div> <!-- SWITCH Y/N Inventory Options menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU2OPT7" name="OLD_MENU2OPT7">
                                     <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>
+                            <div class="col"><b>Ticket reset</b></div> <!-- SWITCH Y/N Replenishment menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU3OPT2" name="OLD_MENU3OPT2">
                                     <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>
+                            <div class="col"><b>Document Reprints2</b></div> <!-- SWITCH Y/N Document Reprints menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU4OPT2" name="OLD_MENU4OPT2">
                                     <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>
-                        <tr>
-                        <td><b>Split Box Labels</b></td> <!-- SWITCH Y/N Inventory Options menu -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                        <div class="col"><b>Split Box Labels</b></div> <!-- SWITCH Y/N Inventory Options menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU2OPT8" name="OLD_MENU2OPT8">
                                     <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>
-                            <td><b>Document Reprints3</b></td> <!-- SWITCH Y/N Document Reprints menu -->
-                            <td class="text-right">
+                            </div>
+                            <div class="col"></div><div class="col"></div>
+                            <div class="col"><b>Document Reprints3</b></div> <!-- SWITCH Y/N Document Reprints menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU4OPT3" name="OLD_MENU4OPT3">
                                     <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>
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
                             <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>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Small parcel loading/closing</b></div> <!-- SWITCH Y/N Loading menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU5OPT1" name="OLD_MENU5OPT1">
                                     <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>
+                            <div class="col"><b>Weekly Labor card entry</b></div> <!-- SWITCH Y/N Loading menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU6OPT1" name="OLD_MENU6OPT1">
                                     <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>
-                        <tr>
-                            <td><b>Open dock door</b></td> <!-- SWITCH Y/N Loading menu -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Open dock door</b></div> <!-- SWITCH Y/N Loading menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU5OPT2" name="OLD_MENU5OPT2">
                                     <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>
+                            <div class="col"><b>MACPAC</b></div> <!-- SWITCH Y/N Loading menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU6OPT2" name="OLD_MENU6OPT2">
                                     <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>
-                        <tr>
-                            <td><b>Close dock door</b></td> <!-- SWITCH Y/N Loading menu -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Close dock door</b></div> <!-- SWITCH Y/N Loading menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU5OPT3" name="OLD_MENU5OPT3">
                                     <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>
+                            <div class="col"><b>2Ship send/aggregate</b></div> <!-- SWITCH Y/N Loading menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU6OPT3" name="OLD_MENU6OPT3">
                                     <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>
-                        <tr>
-                            <td><b>LTL loading</b></td> <!-- SWITCH Y/N Loading menu -->
-                            <td class="text-right">
+                            </div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>LTL loading</b></div> <!-- SWITCH Y/N Loading menu -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" id="OLD_MENU5OPT5" name="OLD_MENU5OPT5">
                                     <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>
-                </table>
-                </td>
-                </tr>
+                            </div>
+                        </div>
+                </div>
+                </div>
+                </div>
 
-                    </tbody>
-                </table>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="modal-footer">
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 02a23262..eb3caa2c 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/userPassword.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/userPassword.blade.php
@@ -8,27 +8,27 @@
         </div>
         <div class="modal-body">
             <div class="table-responsive" id="userPasswordData">
-                <table role="presentation" class="table table-condensed">
-                    <tbody>
-                    <tr>
-                    <td>
-                        <table role="presentation" class="table table-condensed">
-                        <tr>
-                            <td><b>Enter a new password to re-enable user</b></td> <!-- Password -->
-                            <td class="text-right">
+                <div class="sonar-form-layout">
+                    <div>
+                    <div class="row g-2 align-items-center mb-2">
+                    <div class="col">
+                        <div class="sonar-form-layout">
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col"><b>Enter a new password to re-enable user</b></div> <!-- Password -->
+                            <div class="col text-right">
                                 <div class="form-check form-switch">
                                     <input type="hidden" name="R428US_PWD" id="R428US_PWD" value="">
                                     <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>
-                        </table>
-                    </td>
-                    </tr>
-                    </table>
-                    </tbody>
-                </table>
+                            </div>
+                        </div>
+                        </div>
+                    </div>
+                    </div>
+                    </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="modal-footer">
diff --git a/public/css/wms-dashboard.css b/public/css/wms-dashboard.css
index 72e35f2e..bdfa6541 100755
--- a/public/css/wms-dashboard.css
+++ b/public/css/wms-dashboard.css
@@ -102,7 +102,7 @@
     align-items: center;
     background: linear-gradient(135deg, rgba(15, 118, 110, 0.14), rgba(37, 99, 235, 0.12));
     border-radius: 18px;
-    color: #115e59;
+    color: #064e3b;
     display: flex;
     font-size: 1.35rem;
     height: 56px;
@@ -117,7 +117,7 @@
 }
 
 .wms-chart-card__eyebrow {
-    color: #115e59;
+    color: #064e3b;
     font-size: 0.72rem;
     font-weight: 800;
     letter-spacing: 0.12em;
diff --git a/resources/css/app.css b/resources/css/app.css
index f1e685f7..5fba8685 100755
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -179,13 +179,13 @@ select:focus[data-flux-control] {
     .wms-mobile-menu {
         border-color: rgb(14 116 144 / 0.22);
         background: linear-gradient(135deg, rgb(255 255 255), rgb(236 254 255));
-        color: rgb(21 94 117);
+        color: rgb(12 74 110);
     }
 
     .dark .wms-mobile-menu {
         border-color: rgb(103 232 249 / 0.22);
         background: linear-gradient(135deg, rgb(24 24 27), rgb(8 47 73));
-        color: rgb(165 243 252);
+        color: white;
     }
 
     .wms-sidebar-toggle {
@@ -200,8 +200,8 @@ select:focus[data-flux-control] {
     .wms-sidebar-toggle:hover,
     .wms-mobile-close:hover,
     .wms-mobile-menu:hover {
-        border-color: rgb(21 94 117);
-        color: rgb(21 94 117);
+        border-color: rgb(12 74 110);
+        color: rgb(12 74 110);
     }
 
     .dark .wms-sidebar-toggle,
@@ -260,12 +260,12 @@ select:focus[data-flux-control] {
 
     .wms-sidebar-link:hover {
         background: rgb(244 244 245);
-        color: rgb(21 94 117);
+        color: rgb(12 74 110);
     }
 
     .wms-sidebar-link.is-active {
         background: rgb(236 254 255);
-        color: rgb(21 94 117);
+        color: rgb(12 74 110);
     }
 
     .dark .wms-sidebar-link {
@@ -319,12 +319,12 @@ select:focus[data-flux-control] {
     }
 
     .wms-user-card-button:hover {
-        border-color: rgb(21 94 117);
+        border-color: rgb(12 74 110);
         background: rgb(244 244 245);
     }
 
     .dark .wms-user-card-button:hover {
-        border-color: rgb(21 94 117);
+        border-color: rgb(12 74 110);
         background: rgb(48 48 52);
     }
 
@@ -462,7 +462,7 @@ select:focus[data-flux-control] {
     .wms-page-hero-description {
         max-width: 48rem;
         margin: 0.5rem 0 0;
-        color: rgb(219 234 254 / 0.90);
+        color: white;
         font-size: 0.875rem;
         line-height: 1.35rem;
     }
@@ -482,7 +482,7 @@ select:focus[data-flux-control] {
         border: 1px solid rgb(255 255 255 / 0.18);
         background: rgb(255 255 255 / 0.10);
         padding: 0.7rem 0.85rem;
-        color: rgb(219 234 254 / 0.90);
+        color: white;
         box-shadow: 0 10px 24px rgb(0 0 0 / 0.18);
     }
 
@@ -758,7 +758,7 @@ select:focus[data-flux-control] {
             border-radius: 999px;
             border: 1px solid rgb(14 116 144 / 0.24);
             background: linear-gradient(135deg, rgb(14 116 144 / 0.14), rgb(37 99 235 / 0.12));
-            color: rgb(21 94 117);
+            color: rgb(12 74 110);
             font-size: 0.72rem;
             font-weight: 900;
             letter-spacing: 0.12em;
@@ -767,7 +767,7 @@ select:focus[data-flux-control] {
         .dark .wms-mobile-badge {
             border-color: rgb(103 232 249 / 0.26);
             background: linear-gradient(135deg, rgb(8 145 178 / 0.26), rgb(37 99 235 / 0.20));
-            color: rgb(165 243 252);
+            color: white;
         }
 
         .wms-page-hero {
@@ -846,7 +846,7 @@ select:focus[data-flux-control] {
             border-radius: 0.9rem;
             border: 1px solid rgb(14 116 144 / 0.28);
             background: linear-gradient(135deg, rgb(255 255 255), rgb(236 254 255));
-            color: rgb(21 94 117);
+            color: rgb(12 74 110);
             font-size: 1.05rem;
             box-shadow: 0 12px 28px rgb(14 116 144 / 0.16);
         }
@@ -854,7 +854,7 @@ select:focus[data-flux-control] {
         .dark .wms-mobile-menu {
             border-color: rgb(103 232 249 / 0.30);
             background: linear-gradient(135deg, rgb(24 24 27), rgb(8 47 73));
-            color: rgb(165 243 252);
+            color: white;
         }
 
         .wms-mobile-title {
@@ -883,7 +883,7 @@ select:focus[data-flux-control] {
             border-radius: 999px;
             border: 1px solid rgb(14 116 144 / 0.24);
             background: linear-gradient(135deg, rgb(14 116 144 / 0.14), rgb(37 99 235 / 0.12));
-            color: rgb(21 94 117);
+            color: rgb(12 74 110);
             font-size: 0.72rem;
             font-weight: 900;
             letter-spacing: 0.12em;
@@ -892,7 +892,7 @@ select:focus[data-flux-control] {
         .dark .wms-mobile-badge {
             border-color: rgb(103 232 249 / 0.26);
             background: linear-gradient(135deg, rgb(8 145 178 / 0.26), rgb(37 99 235 / 0.20));
-            color: rgb(165 243 252);
+            color: white;
         }
 
         .wms-sidebar {
@@ -1489,7 +1489,7 @@ html[data-wms-sidebar="collapsed"] .wms-sidebar {
 
     .select2-container--default .select2-results__option--selected {
         background: rgb(236 254 255);
-        color: rgb(21 94 117);
+        color: rgb(12 74 110);
     }
 
     .dark .wms-select2-field .select2-container--default .select2-selection--single {
@@ -1523,7 +1523,7 @@ html[data-wms-sidebar="collapsed"] .wms-sidebar {
 
     .dark .select2-container--default .select2-results__option--selected {
         background: rgb(8 47 73);
-        color: rgb(165 243 252);
+        color: white;
     }
 }
 
diff --git a/resources/css/wms-dashboard.css b/resources/css/wms-dashboard.css
index 72e35f2e..bdfa6541 100755
--- a/resources/css/wms-dashboard.css
+++ b/resources/css/wms-dashboard.css
@@ -102,7 +102,7 @@
     align-items: center;
     background: linear-gradient(135deg, rgba(15, 118, 110, 0.14), rgba(37, 99, 235, 0.12));
     border-radius: 18px;
-    color: #115e59;
+    color: #064e3b;
     display: flex;
     font-size: 1.35rem;
     height: 56px;
@@ -117,7 +117,7 @@
 }
 
 .wms-chart-card__eyebrow {
-    color: #115e59;
+    color: #064e3b;
     font-size: 0.72rem;
     font-weight: 800;
     letter-spacing: 0.12em;