diff --git a/Modules/Company/Resources/views/show.blade.php b/Modules/Company/Resources/views/show.blade.php
old mode 100755
new mode 100644
index 4d68a33e..6769f0dd
--- a/Modules/Company/Resources/views/show.blade.php
+++ b/Modules/Company/Resources/views/show.blade.php
@@ -276,8 +276,8 @@
                         </div>
 
                         <div>
-                            <label class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Description</label>
-                            <textarea name="description" rows="3" class="mt-2 w-full rounded-xl border-zinc-300 bg-white px-4 py-3 text-sm font-medium text-zinc-900 shadow-sm outline-none transition focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white">{{ $division->description }}</textarea>
+                            <label for="division-description-{{ $division->id }}" class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Description</label>
+                            <textarea id="division-description-{{ $division->id }}" name="description" rows="3" class="mt-2 w-full rounded-xl border-zinc-300 bg-white px-4 py-3 text-sm font-medium text-zinc-900 shadow-sm outline-none transition focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white">{{ $division->description }}</textarea>
                         </div>
                     </form>
                     <div class="mt-6"><h4 class="font-semibold">Division address</h4><form method="POST" action="{{ route('platform.companies.divisions.address.update', [$company, $division]) }}" class="mt-4">@csrf @method('PUT')@include('company::partials.address-form', ['address' => $division->address, 'defaultLabel' => 'Operating address'])</form></div>
diff --git a/Modules/Helpdesk/Resources/views/components/colour-select.blade.php b/Modules/Helpdesk/Resources/views/components/colour-select.blade.php
old mode 100755
new mode 100644
index 323e45f5..d53305b8
--- a/Modules/Helpdesk/Resources/views/components/colour-select.blade.php
+++ b/Modules/Helpdesk/Resources/views/components/colour-select.blade.php
@@ -20,6 +20,7 @@
 
             <div class="grid gap-2 sm:grid-cols-[minmax(0,1fr)_auto] sm:items-center">
                 <select
+                    id="colour-select-{{ md5($model) }}"
                     wire:model.live="{{ $model }}"
                     class="h-9 w-full rounded-lg border border-zinc-300 bg-white px-3 text-sm font-semibold text-zinc-900 shadow-sm outline-none transition-colors duration-150 focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-900 dark:text-zinc-100"
                 >
diff --git a/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php b/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
old mode 100755
new mode 100644
index 5708bf4d..67b5aa00
--- a/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
@@ -166,8 +166,7 @@
                                                 onchange="this.form.requestSubmit ? this.form.requestSubmit() : this.form.submit()"
                                                 onclick="event.stopPropagation()"
                                                 onkeydown="event.stopPropagation()"
-                                                onmousedown="event.stopPropagation()"
-                                                aria-label="Move {{ $ticket->reference }} to another board">
+                                                onmousedown="event.stopPropagation()">
                                                 @foreach ($boards as $ticketBoard)
                                                     <option value="{{ $ticketBoard->id }}"
                                                         @selected((int) $ticket->board_id === (int) $ticketBoard->id)>{{ $ticketBoard->name }}</option>
diff --git a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
old mode 100755
new mode 100644
index 73ddcf6f..6903d933
--- a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
@@ -486,6 +486,7 @@
                                  class="prose prose-sm min-h-[12rem] max-w-none bg-white p-4 text-sm leading-6 text-zinc-900 outline-none dark:prose-invert dark:bg-zinc-950 dark:text-zinc-100"
                                  data-placeholder="Write a public reply or internal note. Right-click or Ctrl-click underlined words for spelling suggestions.">{!! $oldCommentBody !!}</div>
 
+                            <label for="ticket-comment-body" class="sr-only">Public reply or internal note</label>
                             <textarea id="ticket-comment-body" name="commentBody" required spellcheck="true" lang="en-GB" autocorrect="on" autocomplete="on" autocapitalize="sentences" inputmode="text" class="sr-only" tabindex="-1" aria-hidden="true">{{ $oldCommentBody }}</textarea>
                         </div>
 
diff --git a/Modules/M3/Http/Controllers/API/CloseShipment.php b/Modules/M3/Http/Controllers/API/CloseShipment.php
old mode 100755
new mode 100644
index ecb48be5..8691293d
--- a/Modules/M3/Http/Controllers/API/CloseShipment.php
+++ b/Modules/M3/Http/Controllers/API/CloseShipment.php
@@ -783,7 +783,7 @@ class CloseShipment extends Controller
                 elseif (count($iCM695M1TMP) > 0 && $tRANSTYPE == 'Z') {
                     $errorMsgs = '';
 
-                    foreach ($iCM695M1TMP as $key => $ICM695M1JOINR) {
+                    foreach ($iCM695M1TMP as $ICM695M1JOINR) {
                         $sHIPTYPE = trim($ICM695M1JOINR->A4SHIPTYPE);
                         $fREIGHTTERMS = trim($ICM695M1JOINR->A4OFSTRM);
                         $a4RATEM3 = trim($ICM695M1JOINR->A4RATEM3);
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
old mode 100755
new mode 100644
index 53a553c5..9fd85c9f
--- 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,20 +11,19 @@
                 <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="container-fluid px-0">
+                    
+                    
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col-md-6"><b>Delivery Method</b></div> <!-- ALPHA -->
+                            <div class="col-md-6" class="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-md-6"><b>Ship Via</b></div> <!-- ALPHA -->
+                            <div class="col-md-6" class="text-right">
                                 <label for="addAVSHPVIA" class="visually-hidden">addAVSHPVIA</label>
                                 <select id="addAVSHPVIA" name="addAVSHPVIA">
                                     <option value="">Select Ship Via</option>
@@ -32,32 +31,32 @@
                                     <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-md-6"><b>Sentinel Route</b></div> <!-- ALPHA -->
+                            <div class="col-md-6" class="text-right">
                                 <label for="addAVSHSRT" class="visually-hidden">addAVSHSRT</label>
                                 <select aria-label="Addavshsrt" 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-md-6"><b>International Code</b></div> <!-- ALPHA -->
+                            <div class="col-md-6" class="text-right">
                                 <label for="addAVSHORCL" class="visually-hidden">addAVSHORCL</label>
                                 <select aria-label="Addavshorcl" 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 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
old mode 100755
new mode 100644
index 6ca731ba..a10b6a90
--- 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="container-fluid px-0">
+                    
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col-md-6"><b>Delivery Method</b></div> <!-- ALPHA -->
+                            <div class="col-md-6" class="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-md-6"><b>Ship Via</b></div> <!-- ALPHA -->
+                            <div class="col-md-6" class="text-right">
                                 <label for="OLD_AVSHPVIA" class="visually-hidden">OLD AVSHPVIA</label>
 <input type="hidden" name="OLD_AVSHPVIA" id="OLD_AVSHPVIA">
                                 <label for="AVSHPVIA" class="visually-hidden">AVSHPVIA</label>
@@ -33,11 +33,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-md-6"><b>Sentinel Route</b></div> <!-- ALPHA -->
+                            <div class="col-md-6" class="text-right">
                                 <label for="OLD_AVSHSRT" class="visually-hidden">OLD AVSHSRT</label>
 <input type="hidden" name="OLD_AVSHSRT" id="OLD_AVSHSRT">
                                 <label for="AVSHSRT" class="visually-hidden">AVSHSRT</label>
@@ -46,11 +46,11 @@
                                     <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-md-6"><b>International Code</b></div> <!-- ALPHA -->
+                            <div class="col-md-6" class="text-right">
                                 <label for="OLD_AVSHORCL" class="visually-hidden">OLD AVSHORCL</label>
 <input type="hidden" name="OLD_AVSHORCL" id="OLD_AVSHORCL">
                                 <label for="AVSHORCL" class="visually-hidden">AVSHORCL</label>
@@ -58,11 +58,11 @@
                                     <option value=" "  selected></option>
                                     <option value="Y">002 - International</option>
                                 </select>
-                            </td>
-                        </tr>
+                            </div>
+                        </div>
 
-                    </tbody>
-                </table>
+                    
+                </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
old mode 100755
new mode 100644
index 30d3cfb7..c064524d
--- 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,12 @@
         </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="container-fluid px-0">
+                    
+                    
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col-md-6"><label for="AT9DPW" class="col-form-label"><b>Div-Plt-Whs:</b></label></div>
+                            <div class="col-md-6">
                             <div class="mb-3">
                                 <label for="addAT9DPW" class="visually-hidden">addAT9DPW</label>
                                 <select class="form-select-sm" id="addAT9DPW"
@@ -31,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-md-6"><b>Part</b></div> <!-- ALPHA -->
+                            <div class="col-md-6" class="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-md-6"><b>Pallet Qty</b></div> <!-- NUMERIC -->
+                            <div class="col-md-6" class="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-md-6"><b>Hazardous Material</b></div> <!-- ALPHA -->
+                            <div class="col-md-6" class="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 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
old mode 100755
new mode 100644
index f11dede1..cb2a8d30
--- 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="container-fluid px-0">
+                    
                     <!-- 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-md-6">
+                <div class="container-fluid px-0">
+                <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-md-6"><b>Status</b></div> <!-- Switch Active/Inactive -->
+                            <div class="col-md-6" class="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-md-6"><b>User profile</b></div> <!-- ALPHA -->
+                            <div class="col-md-6" 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"></div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col-md-6"><b>First Name</b></div> <!-- ALPHA -->
+                            <div class="col-md-6" 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"></div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col-md-6"><b>Family Name</b></div> <!-- ALPHA -->
+                            <div class="col-md-6" 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"></div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col-md-6"><b>Email</b></div> <!-- ALPHA -->
+                            <div class="col-md-6" 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"></div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col-md-6"><b>Employee code</b></div> <!-- MAX -->
+                            <div class="col-md-6" 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"></div>
+                        </div>
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col-md-6"><label for="R428DPW1" class="col-form-label"><b>Div-Plt-Whs:</b></label></div>
+                            <div class="col-md-6">
                             <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>
+                            </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-md-6">
                 <table class="table table-condensed">
-                        <tr>
-                            <td><b>Admin user</b></td> <!-- SWITCH Y/N -->
-                            <td class="text-center">
+                        <div class="row g-2 align-items-center mb-2">
+                            <div class="col-md-6"><b>Admin user</b></div> <!-- SWITCH Y/N -->
+                            <div class="col-md-6" class="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-md-6"><b>Power user</b></div> <!-- SWITCH Y/N -->
+                            <div class="col-md-6" class="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-md-6"><b>CSR</b></div> <!-- SWITCH Y/N -->
+                            <div class="col-md-6" class="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-md-6"><b>Executive</b></div> <!-- SWITCH Y/N -->
+                            <div class="col-md-6" class="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-md-6" colspan=2> </div><div class="col-md-6" colspan=2> </div><div class="col-md-6" colspan=2> </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-md-6"><b>Picking</b></div> <!-- SWITCH Y/N -->
+                            <div class="col-md-6" class="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-md-6"><b>Ticket processing</b></div> <!-- SWITCH Y/N Replenishment menu -->
+                            <div class="col-md-6" class="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-md-6"><b>Document Reprints1</b></div> <!-- SWITCH Y/N Document Reprints menu -->
+                            <div class="col-md-6" class="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-md-6"><b>Stock View Program</b></div> <!-- SWITCH Y/N -->
+                            <div class="col-md-6" class="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-md-6"><b>Ticket reset</b></div> <!-- SWITCH Y/N Replenishment menu -->
+                            <div class="col-md-6" class="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-md-6"><b>Document Reprints2</b></div> <!-- SWITCH Y/N Document Reprints menu -->
+                            <div class="col-md-6" class="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-md-6"><b>Split Box Labels</b></div> <!-- SWITCH Y/N -->
+                            <div class="col-md-6" class="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-md-6" colspan=2></div>
+                            <div class="col-md-6"><b>Document Reprints3</b></div> <!-- SWITCH Y/N Document Reprints menu -->
+                            <div class="col-md-6" class="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-md-6"><b>Small parcel loading/closing</b></div> <!-- SWITCH Y/N -->
+                            <div class="col-md-6" class="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-md-6"><b>Weekly Labor card entry</b></div> <!-- SWITCH Y/N -->
+                            <div class="col-md-6" class="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-md-6"><b>Open dock door</b></div> <!-- SWITCH Y/N -->
+                            <div class="col-md-6" class="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-md-6"><b>MACPAC</b></div> <!-- SWITCH Y/N -->
+                            <div class="col-md-6" class="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-md-6"><b>Close dock door</b></div> <!-- SWITCH Y/N -->
+                            <div class="col-md-6" class="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-md-6"><b>2Ship send/aggregate</b></div> <!-- SWITCH Y/N -->
+                            <div class="col-md-6" class="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-md-6"><b>LTL loading</b></div> <!-- SWITCH Y/N -->
+                            <div class="col-md-6" class="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 class="modal-footer">
diff --git a/resources/css/wms-dashboard.css b/resources/css/wms-dashboard.css
old mode 100755
new mode 100644
index e0d36149..dab096d2
--- 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: #075e59;
+    color: #064e49;
     display: flex;
     font-size: 1.35rem;
     height: 56px;