diff --git a/app/Views/attributes/manage.php b/app/Views/attributes/manage.php
index 41e2a2355..857d24474 100644
--- a/app/Views/attributes/manage.php
+++ b/app/Views/attributes/manage.php
@@ -27,7 +27,7 @@ echo view('configs/config_header', $title_info);
 </script>
 
 <div class="d-flex gap-2 justify-content-end d-print-none">
-    <button type="button" class="btn btn-primary" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc('$controller_name/view') ?>" title="<?= lang(ucfirst($controller_name). '.new') ?>">
+    <button type="button" class="btn btn-primary modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc("$controller_name/view") ?>" title="<?= lang(ucfirst($controller_name). '.new') ?>">
         <i class="bi bi-star me-2"></i><?= lang(ucfirst($controller_name). '.new') ?>
     </button>
 </div>
diff --git a/app/Views/cashups/manage.php b/app/Views/cashups/manage.php
index 7e236840a..0c3f2994c 100644
--- a/app/Views/cashups/manage.php
+++ b/app/Views/cashups/manage.php
@@ -49,8 +49,8 @@ echo view('configs/config_header', $title_info);
 <?= view('partial/print_receipt', ['print_after_sale' => false, 'selected_printer' => 'takings_printer']) ?>
 
 <div class="d-flex gap-2 justify-content-end d-print-none">
-    <button type="button" class="btn btn-primary" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= '$controller_name/view' ?>" title="<?= lang(esc(ucfirst($controller_name)) . '.new') //TODO: String Interpolation ?>">
-        <i class="bi bi-journal-check me-2"></i><?= lang(esc(ucfirst($controller_name)) . '.new') //TODO: String Interpolation ?>
+    <button type="button" class="btn btn-primary modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "$controller_name/view" ?>" title="<?= lang(ucfirst($controller_name) . '.new') ?>">
+        <i class="bi bi-journal-check me-2"></i><?= lang(ucfirst($controller_name) . '.new') ?>
     </button>
     <button type="button" class="btn btn-primary" onclick="window.print()" title="<?= lang('Common.print') ?>">
         <i class="bi bi-printer me-2"></i><?= lang('Common.print') ?>
diff --git a/app/Views/configs/message_config.php b/app/Views/configs/message_config.php
index 744ef30e6..f29e1efc5 100644
--- a/app/Views/configs/message_config.php
+++ b/app/Views/configs/message_config.php
@@ -15,26 +15,26 @@
 
     <div class="row">
         <div class="col-12 col-lg-6 mb-3">
-            <label for="msg-uid" class="form-label"><?= lang('Config.msg_uid'); ?><sup><span class="badge text-primary"><i class="bi bi-asterisk"></i></span></sup></label>
+            <label for="msg_uid" class="form-label"><?= lang('Config.msg_uid'); ?><sup><span class="badge text-primary"><i class="bi bi-asterisk"></i></span></sup></label>
             <div class="input-group">
-                <span class="input-group-text" id="msg-uid-icon"><i class="bi bi-person"></i></span>
-                <input type="text" class="form-control" id="msg-uid" aria-describedby="msg-uid-icon" required value="<?= $config['msg_uid']; ?>">
+                <span class="input-group-text" id="msg_uid_icon"><i class="bi bi-person"></i></span>
+                <input type="text" class="form-control" name="msg_uid" id="msg_uid" aria-describedby="msg_uid_icon" required value="<?= esc($config['msg_uid']); ?>">
             </div>
         </div>
 
         <div class="col-12 col-lg-6 mb-3">
-            <label for="msg-pwd" class="form-label"><?= lang('Config.msg_pwd'); ?><sup><span class="badge text-primary"><i class="bi bi-asterisk"></i></span></sup></label>
+            <label for="msg_pwd" class="form-label"><?= lang('Config.msg_pwd'); ?><sup><span class="badge text-primary"><i class="bi bi-asterisk"></i></span></sup></label>
             <div class="input-group">
-                <span class="input-group-text" id="msg-pwd-icon"><i class="bi bi-lock"></i></span>
-                <input type="password" class="form-control" id="msg-pwd" aria-describedby="msg-pwd-icon" required value="<?= $config['msg_pwd']; ?>">
+                <span class="input-group-text" id="msg_pwd_icon"><i class="bi bi-lock"></i></span>
+                <input type="password" class="form-control" name="msg_pwd" id="msg_pwd" aria-describedby="msg_pwd_icon" required value="<?= esc($config['msg_pwd']); ?>">
             </div>
         </div>
 
         <div class="col-12 col-lg-6 mb-3">
-            <label for="msg-src" class="form-label"><?= lang('Config.msg_src'); ?><sup><span class="badge text-primary"><i class="bi bi-asterisk"></i></span></sup></label>
+            <label for="msg_src" class="form-label"><?= lang('Config.msg_src'); ?><sup><span class="badge text-primary"><i class="bi bi-asterisk"></i></span></sup></label>
             <div class="input-group">
-                <span class="input-group-text" id="msg-src-icon"><i class="bi bi-megaphone"></i></span>
-                <input type="text" class="form-control" id="msg-src" aria-describedby="msg-src-icon" required value="<?= $config['msg_src'] == null ? $config['company'] : $config['msg_src']; ?>">
+                <span class="input-group-text" id="msg_src_icon"><i class="bi bi-megaphone"></i></span>
+                <input type="text" class="form-control" name="msg_src" id="msg_src" aria-describedby="msg_src_icon" required value="<?= esc($config['msg_src'] == null ? $config['company'] : $config['msg_src']); ?>">
             </div>
         </div>
     </div>
diff --git a/app/Views/expenses/manage.php b/app/Views/expenses/manage.php
index 361f6b5f2..7ff221e49 100644
--- a/app/Views/expenses/manage.php
+++ b/app/Views/expenses/manage.php
@@ -56,7 +56,7 @@ echo view('configs/config_header', $title_info);
 <?= view('partial/print_receipt', ['print_after_sale' => false, 'selected_printer' => 'takings_printer']) ?>
 
 <div class="d-flex gap-2 justify-content-end d-print-none">
-    <button type="button" class="btn btn-primary" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= '$controller_name/view' ?>" title="<?= lang(ucfirst($controller_name). '.new') ?>">
+    <button type="button" class="btn btn-primary modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "$controller_name/view" ?>" title="<?= lang(ucfirst($controller_name). '.new') ?>">
         <i class="bi bi-bag-check me-2"></i><?= lang(ucfirst($controller_name) .".new") ?>
     </button>
     <button type="button" class="btn btn-primary" onclick="window.print()" title="<?= lang('Common.print') ?>">
diff --git a/app/Views/expenses_categories/manage.php b/app/Views/expenses_categories/manage.php
index c348d52f2..96b14e0c6 100644
--- a/app/Views/expenses_categories/manage.php
+++ b/app/Views/expenses_categories/manage.php
@@ -33,7 +33,7 @@ echo view('configs/config_header', $title_info);
 </script>
 
 <div class="d-flex gap-2 justify-content-end">
-    <button type="button" class="btn btn-primary" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc('$controller_name/view') ?>" title="<?= lang(ucfirst($controller_name). ".new") ?>">
+    <button type="button" class="btn btn-primary modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc("$controller_name/view") ?>" title="<?= lang(ucfirst($controller_name). ".new") ?>">
         <i class="bi bi-bookmark-plus me-2"></i><?= lang(ucfirst($controller_name). ".new") ?>
     </button>
 </div>
diff --git a/app/Views/giftcards/manage.php b/app/Views/giftcards/manage.php
index 26be29b7e..9231a6bd6 100644
--- a/app/Views/giftcards/manage.php
+++ b/app/Views/giftcards/manage.php
@@ -26,7 +26,7 @@ echo view('configs/config_header', $title_info);
 </script>
 
 <div class="d-flex gap-2 justify-content-end">
-    <button type="button" class="btn btn-primary" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc("$controller_name/view") ?>" title="<?= lang(ucfirst($controller_name). '.new') ?>">
+    <button type="button" class="btn btn-primary modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc("$controller_name/view") ?>" title="<?= lang(ucfirst($controller_name). '.new') ?>">
         <i class="bi bi-gift me-2"></i><?= lang(ucfirst($controller_name) .'.new') ?>
     </button>
 </div>
diff --git a/app/Views/home/profile.php b/app/Views/home/profile.php
index 0d9932d65..48f506e60 100644
--- a/app/Views/home/profile.php
+++ b/app/Views/home/profile.php
@@ -14,7 +14,7 @@ $grav_url = 'https://www.gravatar.com/avatar/' . md5(strtolower(trim($email))) .
                         <button type="button" id="modal-button-profile" onclick="modalSwitchProfile()" class="nav-link active">Profile</button>
                     </li>
                     <li class="nav-item" title="<?= lang('Employees.change_password'); ?>">
-                        <button type="button" id="modal-button-password" onclick="modalSwitchPassword()" class="nav-link"><?= lang('Employees.change_password'); ?></a>
+                        <button type="button" id="modal-button-password" onclick="modalSwitchPassword()" class="nav-link"><?= lang('Employees.change_password'); ?></button>
                     </li>
                 </ul>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
diff --git a/app/Views/item_kits/manage.php b/app/Views/item_kits/manage.php
index e259a823d..8f4c33740 100644
--- a/app/Views/item_kits/manage.php
+++ b/app/Views/item_kits/manage.php
@@ -34,17 +34,17 @@ echo view('configs/config_header', $title_info);
 </script>
 
 <div class="d-flex gap-2 justify-content-end">
-    <button type="button" class="btn btn-primary" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc("$controller_name/view") ?>" title="<?= lang(ucfirst($controller_name). '.new') ?>">
+    <button type="button" class="btn btn-primary modal-dlg" data-btn-submit="<?= esc(lang('Common.submit')) ?>" data-href="<?= esc("$controller_name/view") ?>" title="<?= esc(lang(ucfirst($controller_name) . '.new')) ?>">
         <i class="bi bi-tags me-2"></i><?= lang(ucfirst($controller_name) .".new") ?>
     </button>
 </div>
 
 <div id="toolbar">
     <div class="d-flex gap-2">
-        <button type="button" class="btn btn-secondary">
+        <button type="button" class="btn btn-secondary" id="delete">
             <i class="bi bi-trash"></i><span class="d-none d-sm-inline ms-2"><?= lang('Common.delete') ?></span>
         </button>
-        <button type="button" class="btn btn-secondary" data-href="<?= esc('$controller_name/generateBarcodes') ?>" title="<?= lang('Items.generate_barcodes') ?>">
+        <button type="button" class="btn btn-secondary" id="generate_barcodes" data-href="<?= esc($controller_name . '/generateBarcodes') ?>" title="<?= esc(lang('Items.generate_barcodes')) ?>">
             <i class="bi bi-upc-scan"></i><span class="d-none d-sm-inline ms-2"><?= lang('Items.generate_barcodes') ?></span>
         </button>
     </div>
diff --git a/app/Views/items/manage.php b/app/Views/items/manage.php
index 25820033e..4dab4a403 100644
--- a/app/Views/items/manage.php
+++ b/app/Views/items/manage.php
@@ -81,10 +81,10 @@ echo view('configs/config_header', $title_info);
 </script>
 
 <div class="d-flex gap-2 justify-content-end">
-    <button type="button" class="btn btn-primary" data-btn-new="<?= lang('Common.new') ?>" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= '$controller_name/view' ?>" title="<?= lang(ucfirst($controller_name) .".new") ?>">
+    <button type="button" class="btn btn-primary modal-dlg" data-btn-new="<?= lang('Common.new') ?>" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "$controller_name/view" ?>" title="<?= lang(ucfirst($controller_name) .".new") ?>">
         <i class="bi bi-tag me-2"></i><?= lang(ucfirst($controller_name) .".new") ?>
     </button>
-    <button type="button" class="btn btn-primary" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= '$controller_name/csvImport' ?>" title="<?= lang('Items.import_items_csv') ?>">
+    <button type="button" class="btn btn-primary modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= "$controller_name/csvImport" ?>" title="<?= lang('Items.import_items_csv') ?>">
         <i class="bi bi-file-earmark-arrow-down me-2"></i><?= lang('Common.import_csv') ?>
     </button>
 </div>
@@ -97,7 +97,7 @@ echo view('configs/config_header', $title_info);
         <button type="button" class="btn btn-secondary d-print-none" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= 'items/bulkEdit' ?>" title="<?= lang('Items.edit_multiple_items') ?>">
             <i class="bi bi-pencil-square"></i><span class="d-none d-md-inline ms-2"><?= lang('Items.bulk_edit') ?></span>
         </button>
-        <button type="button" class="btn btn-secondary d-print-none" data-href="<?= '$controller_name/generateBarcodes' ?>" title="<?= lang('Items.generate_barcodes') ?>">
+        <button type="button" class="btn btn-secondary d-print-none" data-href="<?= "$controller_name/generateBarcodes" ?>" title="<?= lang('Items.generate_barcodes') ?>">
             <i class="bi bi-upc-scan"></i><span class="d-none d-md-inline ms-2"><?= lang('Items.generate_barcodes') ?></span>
         </button>
         <input type="text" class="form-control" name="daterangepicker" id="daterangepicker">
diff --git a/app/Views/partial/daterangepicker.php b/app/Views/partial/daterangepicker.php
index 05bdd1fe3..a2d3be042 100644
--- a/app/Views/partial/daterangepicker.php
+++ b/app/Views/partial/daterangepicker.php
@@ -121,7 +121,7 @@
     $('#daterangepicker').daterangepicker({
         "ranges": {
             "<?= lang('Datepicker.today') ?>": [
-            "<?= date($config['dateformat'] . ' ' . $config['dateformat'], mktime(0, 0, 0, date("m"), date("d"), date("Y"))) ?>",
+            "<?= date($config['dateformat'] . ' ' . $config['timeformat'], mktime(0, 0, 0, date("m"), date("d"), date("Y"))) ?>",
             "<?= date($config['dateformat'] . ' ' . $config['timeformat'], mktime(23, 59, 59, date("m"), date("d"), date("Y"))) ?>"
         ],
         "<?= lang('Datepicker.today_last_year') ?>": [
diff --git a/app/Views/partial/dinner_tables.php b/app/Views/partial/dinner_tables.php
index 442a8800c..364e295ed 100644
--- a/app/Views/partial/dinner_tables.php
+++ b/app/Views/partial/dinner_tables.php
@@ -21,7 +21,7 @@ foreach ($dinner_tables as $table_key => $table) {
         <label for="dinner_table_<?= $dinner_table_id ?>" class="form-label"><?= lang('Config.dinner_table') . " $i"; ?></label>
         <div class="input-group mb-3">
             <span class="input-group-text"><?= $dinner_table_id ?>.</span>
-            <input type="text" class="form-control dinner_table valid_chars" name="dinner_table_<?= $dinner_table_id ?>" id="dinner_table_<?= $dinner_table_id ?>" value="<?= $dinner_table_name ?>" required <?= $table['deleted'] && $form_data['disabled'] = 'disabled' ?>>
+            <input type="text" class="form-control dinner_table valid_chars" name="dinner_table_<?= (int) $dinner_table_id ?>" id="dinner_table_<?= (int) $dinner_table_id ?>" value="<?= esc($dinner_table_name) ?>" required <?= $table['deleted'] ? 'disabled' : '' ?>>
             <button class="btn btn-outline-danger remove_dinner_table" type="button"><i class="bi bi-x-lg"></i></button>
         </div>
     </div>
diff --git a/app/Views/people/manage.php b/app/Views/people/manage.php
index 025a5d0f9..b5475d3a2 100644
--- a/app/Views/people/manage.php
+++ b/app/Views/people/manage.php
@@ -38,11 +38,11 @@ echo view('configs/config_header', $title_info);
 </script>
 
 <div class="d-flex gap-2 justify-content-end">
-    <button type="button" class="btn btn-primary" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= '$controller_name/view' ?>" title="<?= lang(ucfirst($controller_name). '.new') ?>">
+    <button type="button" class="btn btn-primary modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc("$controller_name/view") ?>" title="<?= lang(ucfirst($controller_name). '.new') ?>">
         <i class="bi bi-person-add me-2"></i><?= lang(ucfirst($controller_name) .".new") ?>
     </button>
     <?php if ($controller_name == 'customers') { ?>
-    <button type="button" class="btn btn-primary" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= '$controller_name/csvImport' ?>" title="<?= lang(ucfirst($controller_name) .'.import_items_csv') ?>">
+    <button type="button" class="btn btn-primary modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc("$controller_name/csvImport") ?>" title="<?= lang(ucfirst($controller_name) .'.import_items_csv') ?>">
         <i class="bi bi-file-earmark-arrow-down me-2"></i><?= lang('Common.import_csv') ?>
     </button>
     <?php } ?>
diff --git a/app/Views/sales/register.php b/app/Views/sales/register.php
index 23501f892..2b459508b 100644
--- a/app/Views/sales/register.php
+++ b/app/Views/sales/register.php
@@ -163,10 +163,10 @@ helper('url');
                         <input type="text" name="customer" id="customer" class="form-control" value="<?= lang(ucfirst($controller_name) . '.start_typing_customer_name') ?>">
                     </div>
                     <div class="d-flex gap-2 justify-content-center mb-3">
-                        <button class="btn btn-primary" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= 'customers/view' ?>" title="<?= lang(ucfirst($controller_name) .'.new_customer') ?>">
+                        <button class="btn btn-primary modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= 'customers/view' ?>" title="<?= lang(ucfirst($controller_name) .'.new_customer') ?>">
                             <i class="bi bi-person-add me-2"></i><?= lang(ucfirst($controller_name) .'.new_customer') ?>
                         </button>
-                        <button class="btn btn-secondary" id="show_keyboard_help" data-href="<?= esc('$controller_name/salesKeyboardHelp') ?>" title="<?= lang(ucfirst($controller_name) .'.key_title') ?>">
+                        <button class="btn btn-secondary modal-dlg" id="show_keyboard_help" data-href="<?= esc("$controller_name/salesKeyboardHelp") ?>" title="<?= lang(ucfirst($controller_name) .'.key_title') ?>">
                             <i class="bi bi-keyboard me-2"></i><?= lang(ucfirst($controller_name) .'.key_help') ?>
                         </button>
                     </div>
diff --git a/app/Views/taxes/tax_rates.php b/app/Views/taxes/tax_rates.php
index 0524fc1ae..2e8abf7d0 100644
--- a/app/Views/taxes/tax_rates.php
+++ b/app/Views/taxes/tax_rates.php
@@ -19,7 +19,7 @@
 </script>
 
 <div class="d-flex gap-2 justify-content-end">
-    <button type="button" class="btn btn-primary" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc("$controller_name/view") ?>" title="<?= lang(ucfirst($controller_name). '.new') ?>">
+    <button type="button" class="btn btn-primary modal-dlg" data-btn-submit="<?= lang('Common.submit') ?>" data-href="<?= esc("$controller_name/view") ?>" title="<?= lang(ucfirst($controller_name). '.new') ?>">
         <i class="bi bi-piggy-bank me-2"></i><?= lang(ucfirst($controller_name) .'.new') ?>
     </button>
 </div>
diff --git a/public/js/bs-tab_anchor_linking.js b/public/js/bs-tab_anchor_linking.js
index 6b9f12083..c574cbb85 100644
--- a/public/js/bs-tab_anchor_linking.js
+++ b/public/js/bs-tab_anchor_linking.js
@@ -2,15 +2,18 @@
 let url = location.href.replace(/\/$/, "");
 if (location.hash) {
     const hash = url.split("#");
-    const currentTab = document.querySelector('#configs-list-tab button[href="#' + hash[1] + '"]' || '#configs-dropdown a[href="#' + hash[1] + '"]');
-    const curTab = new bootstrap.Tab(currentTab);
-    curTab.show();
+    const selector = '#configs-list-tab button[data-bs-target="#' + hash[1] + '"], #configs-dropdown a[href="#' + hash[1] + '"]';
+    const currentTab = document.querySelector(selector);
+    if (currentTab) {
+        const curTab = new bootstrap.Tab(currentTab);
+        curTab.show();
+    }
     url = location.href.replace(/\/#/, "#");
     history.replaceState(null, null, url);
 }
 
 // Change url based on selected tab
-const selectableTabList = [].slice.call(document.querySelectorAll('button[data-bs-toggle="tab"]' || 'a[data-bs-toggle="tab"]'));
+const selectableTabList = [].slice.call(document.querySelectorAll('button[data-bs-toggle="tab"], a[data-bs-toggle="tab"]'));
 selectableTabList.forEach((selectableTab) => {
     const selTab = new bootstrap.Tab(selectableTab);
     selectableTab.addEventListener("click", function () {
diff --git a/public/js/bs-tooltips.js b/public/js/bs-tooltips.js
index 638371369..965e698a6 100644
--- a/public/js/bs-tooltips.js
+++ b/public/js/bs-tooltips.js
@@ -1,3 +1,6 @@
 // Bootstrap 5 - Initialize all tooltips on a page - from https://getbootstrap.com/docs/5.3/components/tooltips/#enable-tooltips
-const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
-const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
+if (window.bootstrap && typeof window.bootstrap.Tooltip === 'function') {
+    document.querySelectorAll('[data-bs-toggle="tooltip"]').forEach((tooltipTriggerEl) => {
+        new bootstrap.Tooltip(tooltipTriggerEl);
+    });
+}