From 557ec66061a8c3f93e84b6bb7ffe3fe0a068872c Mon Sep 17 00:00:00 2001
From: Jerry Padgett <sjpadgett@gmail.com>
Date: Wed, 9 Oct 2024 13:20:25 -0400
Subject: [PATCH] More Changes and Fixes Modules (#7755)

* More Changes and Fixes Modules
- add update to log sync for erx changes
- rename Weno Provider ID to  Weno User ID in Users

* tune up demographics styling
track sync status

* ensure fetchEncounterQuestionnaireForm form is enabled.

* fix questionnaire assessment to handle actions from document module
ensure clear encounter for save from documents
fix edit list feesheet limit of 40 codes on save
add save alert to lists edit
fix demographics patient documents calling templates directly, activity history and restyle
fix portal patient ledger and restyle

* add delete per row to portal audit table
add password show toggle to portal and core login

* validate repsponsible party
---
 .../questionnaire_assessments.php             |  29 +-
 .../forms/questionnaire_assessments/save.php  |   4 +
 .../library/rc_sms_notification.php           |  29 +-
 .../src/Controller/AppDispatch.php            |   8 +-
 .../src/Controller/RCFaxClient.php            |   6 +-
 .../src/Services/LogDataInsert.php            |  37 +
 .../src/Services/LogImportBuild.php           |  25 +-
 .../src/Services/TransmitProperties.php       |   3 +
 .../templates/weno_fragment.php               |   4 +-
 .../oe-module-weno/templates/weno_users.php   |   4 +-
 .../patient_file/summary/demographics.php     |   6 +-
 interface/super/edit_list.php                 | 992 +++++++++---------
 interface/usergroup/user_admin.php            |   2 +-
 portal/import_template.php                    |   3 -
 portal/index.php                              | 165 +--
 portal/lib/doc_lib.php                        |  41 +-
 portal/lib/download_template.php              |   2 +-
 .../Controller/AppBasePortalController.php    |   2 +-
 .../Controller/OnsiteDocumentController.php   |   8 +
 .../scripts/app/onsiteactivityviews.js        |  84 +-
 portal/patient/scripts/app/onsitedocuments.js | 114 +-
 portal/patient/scripts/view.js                |  47 +-
 .../OnsiteActivityViewListView.tpl.php        |  32 +-
 .../templates/OnsiteDocumentListView.tpl.php  |  70 +-
 .../patient/templates/PatientListView.tpl.php |   2 +-
 portal/report/pat_ledger.php                  | 705 +++++++------
 .../DocumentTemplateService.php               |   9 +-
 src/Services/QuestionnaireService.php         |   2 +-
 templates/login/base.html.twig                |  12 +
 .../login/partials/input/password.html.twig   |   7 +-
 30 files changed, 1361 insertions(+), 1093 deletions(-)

diff --git a/interface/forms/questionnaire_assessments/questionnaire_assessments.php b/interface/forms/questionnaire_assessments/questionnaire_assessments.php
index 50dd1d15abe..fcd65fd3b1f 100644
--- a/interface/forms/questionnaire_assessments/questionnaire_assessments.php
+++ b/interface/forms/questionnaire_assessments/questionnaire_assessments.php
@@ -38,6 +38,11 @@
 $questionnaire_form = $_GET['questionnaire_form'] ?? null;
 $repository_item = $_POST['select_item'] ?? null;
 
+$isModule = ($_REQUEST['formOrigin'] ?? null) == 2;
+$isDashboard = ($_REQUEST['formOrigin'] ?? null) == 1;
+if ($isModule) {
+    $questionnaire_form = $_GET['formname'] ?? null;
+}
 if ($isPortal) {
     $questionnaire_form = $_GET['formname'] ?? null;
 }
@@ -74,10 +79,11 @@
     $q_json = '';
     $lform = '';
     $form_name = '';
+    // By name is for new form from repository.
     if (empty($formid) && !empty($questionnaire_form) && $questionnaire_form != 'New Questionnaire') {
         // since we are here then user is authorized for a pre-approved questionnaire form.
         $is_authorized = true;
-        if ($isPortal) {
+        if ($isPortal || $isModule) {
             if (is_numeric($questionnaire_form)) {
                 $q = $service->fetchQuestionnaireById((int)$questionnaire_form);
             } else {
@@ -90,6 +96,9 @@
         $lform = $q['lform'] ?: '';
         $mode = 'new_form';
         $form_name = $q['name'] ?: '';
+        if (empty($q_json) && empty($lform)) {
+            throw (new Exception(xl("Unable to find questionnaire form" . ' ' . $questionnaire_form)));
+        }
     }
 // This is for newly selected questionnaire from repository dropdown.
     if (!empty($repository_item) && $questionnaire_form == 'New Questionnaire') {
@@ -99,7 +108,6 @@
         $form_name = $q['name'] ?: '';
         $mode = 'new_repository_form';
     }
-
     if (!$isPortal) {
         $do_warning = checkUserSetting('disable_form_disclaimer', '1') === true ? 0 : 1;
     }
@@ -107,7 +115,8 @@
         $q_list = $service->getQuestionnaireList(true);
     }
 } catch (Exception $e) {
-    die(xlt("Can not continue with reason.") . '<br />' . text($e->getMessage()));
+    $msg = "<p style='color: red; font-size: 1.25rem;'>" . xlt("Can not continue") . ": " . text($e->getMessage()) . "</p>";
+    die($msg);
 }
 /* where to put the LOINC statement , and the statement itself */
 $top_note = true; // default to top if not set in configuration
@@ -153,9 +162,12 @@
     $theme = 'dark';
 }
 
-$container = 'container-fluid';
-if (!empty($GLOBALS['questionnaire_display_fullscreen'] ?? 0)) {
+if ($isModule || $isDashboard || $isPortal) {
+    $container = 'container-fluid';
+} elseif (!empty($GLOBALS['questionnaire_display_fullscreen'] ?? 0)) {
     $container = 'container';
+} else {
+    $container = 'container-fluid';
 }
 
 ?>
@@ -166,6 +178,11 @@
     <title id="main_title"><?php echo xlt('Questionnaire'); ?></title>
     <?php Header::setupHeader(); ?>
     <!-- TODO remove next release -->
+    <style>
+        .lhc-form-title {
+            padding: .25rem !important;
+        }
+    </style>
     <script>
         let isPortal = <?php echo js_escape($isPortal); ?>;
         let portalOther = <?php echo js_escape($patientPortalOther); ?>;
@@ -423,7 +440,7 @@ function initSearchForm() {
 </head>
 <body class="bg-light" data-theme="<?php echo attr($theme); ?>">
     <div class="<?php echo attr($container); ?>">
-        <?php if (!$isPortal) { ?>
+        <?php if (!$isPortal && !$isModule && !$isDashboard) { ?>
             <div class="title bg-light text-dark">
                 <h4><?php if ($mode != 'new_form' && $mode != 'update') {
                         echo xlt("Create Encounter Questionnaires");
diff --git a/interface/forms/questionnaire_assessments/save.php b/interface/forms/questionnaire_assessments/save.php
index 56fb20d9993..765467235ce 100644
--- a/interface/forms/questionnaire_assessments/save.php
+++ b/interface/forms/questionnaire_assessments/save.php
@@ -50,6 +50,10 @@
 if ($isPortal && $mode == 'update' && !empty($formid)) {
     CoreFormToPortalUtility::confirmFormBootstrapPatient($isPortal, $formid, 'questionnaire_assessments', $_SESSION['pid']);
 }
+if (($_REQUEST['formOrigin'] ?? null) == 2) {
+    $encounter = 0;
+}
+
 if ($mode !== 'new' && $mode !== 'new_repository_form') {
     $service = new QuestionnaireService();
     $responseService = new QuestionnaireResponseService();
diff --git a/interface/modules/custom_modules/oe-module-faxsms/library/rc_sms_notification.php b/interface/modules/custom_modules/oe-module-faxsms/library/rc_sms_notification.php
index 0227c947fb4..6b0b56fcdb8 100644
--- a/interface/modules/custom_modules/oe-module-faxsms/library/rc_sms_notification.php
+++ b/interface/modules/custom_modules/oe-module-faxsms/library/rc_sms_notification.php
@@ -117,21 +117,20 @@
 $db_sms_msg['sms_gateway_type'] = "SMS";
 $db_sms_msg['message'] = $MESSAGE;
 ?>
-<!DOCTYPE html>
-<html lang="eng">
-<head>
-    <title><?php echo xlt("Notifications") ?></title>
-    <?php Header::setupHeader(); ?>
-</head>
-<style>
-  html {
-    font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;
-    font-size: 14px;
-  }
-</style>
-<body>
+    <!DOCTYPE html>
+    <html lang="eng">
+    <head>
+        <title><?php echo xlt("Notifications") ?></title>
+        <?php Header::setupHeader(); ?>
+    </head>
+    <style>
+        html {
+            font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;
+            font-size: 14px;
+        }
+    </style>
     <body>
-        <div>
+        <div class="container-fluid">
             <div>
                 <div class="text-center mt-2"><h2><?php echo xlt("Working and may take a few minutes to finish.") ?></h2></div>
             </div>
@@ -253,7 +252,7 @@
             ?>
         </div>
     </body>
-</html>
+    </html>
 
 <?php
 function isValidPhone($phone): array|bool|string|null
diff --git a/interface/modules/custom_modules/oe-module-faxsms/src/Controller/AppDispatch.php b/interface/modules/custom_modules/oe-module-faxsms/src/Controller/AppDispatch.php
index 33c8f72ee30..fe4601dd623 100644
--- a/interface/modules/custom_modules/oe-module-faxsms/src/Controller/AppDispatch.php
+++ b/interface/modules/custom_modules/oe-module-faxsms/src/Controller/AppDispatch.php
@@ -98,7 +98,7 @@ private function dispatchActions(): void
     public function getSession($param = null, $default = null): mixed
     {
         if ($param) {
-            return $_SESSION[$param] ?: $default;
+            return $_SESSION[$param] ?? $default;
         }
 
         return $this->_session;
@@ -112,7 +112,7 @@ public function getSession($param = null, $default = null): mixed
     public function getQuery($param = null, $default = null): mixed
     {
         if ($param) {
-            return $this->_query[$param] ?: $default;
+            return $this->_query[$param] ?? $default;
         }
 
         return $this->_query;
@@ -313,7 +313,7 @@ abstract function fetchReminderCount(): string|bool;
     public function getPost($param = null, $default = null): mixed
     {
         if ($param) {
-            return $this->_post[$param] ?: $default;
+            return $this->_post[$param] ?? $default;
         }
 
         return $this->_post;
@@ -408,7 +408,7 @@ protected function saveSetup(array $setup = []): string
     public function getRequest($param = null, $default = null): mixed
     {
         if ($param) {
-            return $this->_request[$param] ?: $default;
+            return $this->_request[$param] ?? $default;
         }
 
         return $this->_request;
diff --git a/interface/modules/custom_modules/oe-module-faxsms/src/Controller/RCFaxClient.php b/interface/modules/custom_modules/oe-module-faxsms/src/Controller/RCFaxClient.php
index 743fda4a2c0..0c2c9e96882 100644
--- a/interface/modules/custom_modules/oe-module-faxsms/src/Controller/RCFaxClient.php
+++ b/interface/modules/custom_modules/oe-module-faxsms/src/Controller/RCFaxClient.php
@@ -41,9 +41,9 @@ public function __construct()
         $this->uriDir = $GLOBALS['OE_SITE_WEBROOT'];
         $this->cacheDir = $GLOBALS['OE_SITE_DIR'] . '/documents/logs_and_misc/_cache';
         $this->credentials = $this->getCredentials();
-        $this->portalUrl = $this->credentials['production'] ? "https://service.ringcentral.com/" : "https://service.devtest.ringcentral.com/";
-        $this->serverUrl = $this->credentials['production'] ? "https://platform.ringcentral.com" : "https://platform.devtest.ringcentral.com";
-        $this->redirectUrl = $this->credentials['redirect_url'];
+        $this->portalUrl = $this->credentials['production'] ?? null ? "https://service.ringcentral.com/" : "https://service.devtest.ringcentral.com/";
+        $this->serverUrl = $this->credentials['production'] ?? null ? "https://platform.ringcentral.com" : "https://platform.devtest.ringcentral.com";
+        $this->redirectUrl = $this->credentials['redirect_url'] ?? null;
         $this->initializeSDK();
         parent::__construct();
     }
diff --git a/interface/modules/custom_modules/oe-module-weno/src/Services/LogDataInsert.php b/interface/modules/custom_modules/oe-module-weno/src/Services/LogDataInsert.php
index c1e2d68c084..b8156b8e51c 100644
--- a/interface/modules/custom_modules/oe-module-weno/src/Services/LogDataInsert.php
+++ b/interface/modules/custom_modules/oe-module-weno/src/Services/LogDataInsert.php
@@ -55,4 +55,41 @@ public function insertPrescriptions($insertdata)
             return $e->getMessage();
         }
     }
+
+    public function updatePrescriptions($updatedata)
+    {
+        $sql = "UPDATE prescriptions SET ";
+        $sql .= "active = ?, ";
+        $sql .= "date_added = ?, ";
+        $sql .= "datetime = NOW(), ";
+        $sql .= "patient_id = ?, ";
+        $sql .= "provider_id = ?, ";
+        $sql .= "drug = ?, ";
+        $sql .= "quantity = ?, ";
+        $sql .= "refills = ?, ";
+        $sql .= "substitute = ?, ";
+        $sql .= "note = ?, ";
+        $sql .= "rxnorm_drugcode = ?, ";
+        $sql .= "external_id = ? ";
+        $sql .= "WHERE indication = ?";
+
+        try {
+            sqlQuery($sql, [
+                $updatedata['active'],
+                $updatedata['date_added'],
+                $updatedata['patient_id'],
+                $updatedata['user_id'],
+                $updatedata['drug'],
+                $updatedata['quantity'],
+                $updatedata['refills'],
+                $updatedata['substitute'],
+                $updatedata['note'],
+                $updatedata['rxnorm_drugcode'],
+                $updatedata['provider_id'],
+                $updatedata['prescriptionguid']
+            ]);
+        } catch (Exception $e) {
+            return $e->getMessage();
+        }
+    }
 }
diff --git a/interface/modules/custom_modules/oe-module-weno/src/Services/LogImportBuild.php b/interface/modules/custom_modules/oe-module-weno/src/Services/LogImportBuild.php
index d4876db57b9..4b6562d8c52 100644
--- a/interface/modules/custom_modules/oe-module-weno/src/Services/LogImportBuild.php
+++ b/interface/modules/custom_modules/oe-module-weno/src/Services/LogImportBuild.php
@@ -59,7 +59,7 @@ public function checkMessageId()
     {
         $sql = "select count(*) as count from prescriptions where indication = ?";
         $entry = sqlQuery($sql, [$this->messageid]);
-        return $entry['count'];
+        return $entry['count'] ?? 0;
     }
 
     function convertToUTC($dateString)
@@ -76,6 +76,7 @@ public function buildPrescriptionInserts(): bool|string
         $wenoLog = new WenoLogService();
         $l = 0;
         $rxCnt = 0;
+        $updateCnt = 0;
         if (file_exists($this->rxsynclog)) {
             $records = fopen($this->rxsynclog, "r");
 
@@ -92,9 +93,6 @@ public function buildPrescriptionInserts(): bool|string
                 if (isset($line[4])) {
                     $this->messageid = $line[4];
                     $is_saved = $this->checkMessageId();
-                    if ($is_saved > 0) {
-                        continue;
-                    }
                 }
                 if (!empty($line)) {
                     $pr = $line[2] ?? '';
@@ -119,7 +117,9 @@ public function buildPrescriptionInserts(): bool|string
                     $insertdata['date_added'] = $ida;
                     $insertdata['patient_id'] = $pid;
                     $insertdata['attached_user_id'] = $uid;
-                    $drug = isset($line[11]) ? str_replace('"', '', $line[11]) : xlt("Incomplete");
+                    $insertdata['sync_type'] = trim($line[3] ?? '');
+                    $insertdata['status'] = trim($line[6] ?? '');
+                    $drug = isset($line[11]) ? str_replace('"', '', $line[11]) : ($insertdata['sync_type'] . " " . $insertdata['status'] . " " . xl("Use RxLog"));
                     $insertdata['drug'] = $drug;
                     $insertdata['quantity'] = $line[18] ?? '';
                     $insertdata['refills'] = $refills;
@@ -132,8 +132,15 @@ public function buildPrescriptionInserts(): bool|string
                     $insertdata['prescriptionguid'] = $line[4] ?? '';
                     $insertdata['txDate'] = $ida;
                     $loginsert = new LogDataInsert();
-                    $loginsert->insertPrescriptions($insertdata);
-                    ++$rxCnt;
+                    if ($is_saved > 0) {
+                        $loginsert->updatePrescriptions($insertdata);
+                        if (trim($line[7] ?? '') == 'True') {
+                            ++$updateCnt;
+                        }
+                    } else {
+                        $loginsert->insertPrescriptions($insertdata);
+                        ++$rxCnt;
+                    }
                     ++$l;
                 }
             }
@@ -143,10 +150,10 @@ public function buildPrescriptionInserts(): bool|string
             return false;
         }
 
-        if ($rxCnt == 0) {
+        if ($rxCnt == 0 && $updateCnt == 0) {
             $status = xl("No new prescriptions to sync.");
         } else {
-            $status = xl("Synced") . " " . text($rxCnt) . " " . xl("prescriptions.");
+            $status = xl("Synced") . " " . text($rxCnt) . " new " . text($updateCnt) . " " . xl("updated")  . " " . xl("prescriptions.");
         }
         $wenoLog->insertWenoLog("Sync Report", $status);
         return true;
diff --git a/interface/modules/custom_modules/oe-module-weno/src/Services/TransmitProperties.php b/interface/modules/custom_modules/oe-module-weno/src/Services/TransmitProperties.php
index 1df044fe6ae..ea79f195c57 100644
--- a/interface/modules/custom_modules/oe-module-weno/src/Services/TransmitProperties.php
+++ b/interface/modules/custom_modules/oe-module-weno/src/Services/TransmitProperties.php
@@ -286,6 +286,9 @@ private function getResponsibleParty(): mixed
         if (empty($relation)) {
             return 'REQED:{demographics}' . xlt("Patient is under 19 years old. A Responsible Party is required. From the Patient Chart select Demographics Primary Insurance or Guardian to add a person.");
         }
+        if (empty($relation['ResponsiblePartyZip']) || empty($relation['ResponsiblePartyAddressLine1']) || empty($relation['ResponsiblePartyCity'])) {
+            return 'REQED:{demographics}' . xlt("Responsible Party Zip, Street and or City Missing, From the Patient Chart select Demographics Primary Insurance or Guardian to add or edit a person.");
+        }
 
         return $relation;
     }
diff --git a/interface/modules/custom_modules/oe-module-weno/templates/weno_fragment.php b/interface/modules/custom_modules/oe-module-weno/templates/weno_fragment.php
index 3e833536810..45f22fe7919 100644
--- a/interface/modules/custom_modules/oe-module-weno/templates/weno_fragment.php
+++ b/interface/modules/custom_modules/oe-module-weno/templates/weno_fragment.php
@@ -18,7 +18,7 @@
 use OpenEMR\Modules\WenoModule\Services\TransmitProperties;
 use OpenEMR\Modules\WenoModule\Services\WenoLogService;
 
-if (!AclMain::aclCheckCore('patients', 'rx', '', 'write')) {
+if (!AclMain::aclCheckCore('patients', 'rx')) {
     echo xlt("Not Authorized to use this widget.");
     return;
 }
@@ -93,7 +93,7 @@ function getProviderByWenoId($external_id, $provider_id = ''): string
     }
 }
 
-$defaultUserFacility = sqlQuery("SELECT id,username,lname,fname,weno_prov_id,facility,facility_id FROM `users` WHERE active = 1 and authorized = 1 and id = ?", array($_SESSION['authUserID'] ?? 0));
+$defaultUserFacility = sqlQuery("SELECT id,username,lname,fname,weno_prov_id,facility,facility_id FROM `users` WHERE active = 1 AND `username` > '' and id = ?", array($_SESSION['authUserID'] ?? 0));
 $list = sqlStatement("SELECT id, name, street, city, weno_id FROM facility WHERE inactive != 1 AND weno_id IS NOT NULL ORDER BY name");
 $facilities = [];
 while ($row = sqlFetchArray($list)) {
diff --git a/interface/modules/custom_modules/oe-module-weno/templates/weno_users.php b/interface/modules/custom_modules/oe-module-weno/templates/weno_users.php
index baf648cf41c..c3cb877a1be 100644
--- a/interface/modules/custom_modules/oe-module-weno/templates/weno_users.php
+++ b/interface/modules/custom_modules/oe-module-weno/templates/weno_users.php
@@ -32,12 +32,12 @@
 
 $wenoLog = new WenoLogService();
 
-$fetch = sqlStatement("SELECT id,username,lname,fname,weno_prov_id,facility,facility_id FROM `users` WHERE active = 1 and authorized = 1");
+$fetch = sqlStatement("SELECT id,username,lname,fname,weno_prov_id,facility,facility_id FROM `users` WHERE active = 1 AND `username` > ''");
 while ($row = sqlFetchArray($fetch)) {
     $usersData[] = $row;
 }
 
-$defaultUserFacility = sqlQuery("SELECT id,username,lname,fname,weno_prov_id,facility,facility_id FROM `users` WHERE active = 1 and authorized = 1 and id = ?", array($_SESSION['authUserID'] ?? 0));
+$defaultUserFacility = sqlQuery("SELECT id,username,lname,fname,weno_prov_id,facility,facility_id FROM `users` WHERE active = 1 AND `username` > '' and id = ?", array($_SESSION['authUserID'] ?? 0));
 $list = sqlStatement("SELECT id, name, street, city, weno_id FROM facility WHERE inactive != 1 AND weno_id IS NOT NULL ORDER BY name");
 $facilities = [];
 while ($row = sqlFetchArray($list)) {
diff --git a/interface/patient_file/summary/demographics.php b/interface/patient_file/summary/demographics.php
index 2c740d277a9..0770ecfa0fa 100644
--- a/interface/patient_file/summary/demographics.php
+++ b/interface/patient_file/summary/demographics.php
@@ -1161,14 +1161,14 @@ function filterActiveIssues(array $i): array
                     $viewArgs['content'] = ob_get_contents();
                     ob_end_clean();
 
-                    echo "<div class=\"col\">";
+                    echo "<div class='col m-0 p-0 mx-1'>";
                     echo $t->render('patient/card/rx.html.twig', $viewArgs); // render core prescription card
                     echo "</div>";
                 endif;
                 ?>
             </div>
             <div class="row">
-                <div class="col-md-8">
+                <div class="col-md-8 px-2">
                     <?php
                     if ($deceased > 0) :
                         echo $twig->getTwig()->render('patient/partials/deceased.html.twig', [
@@ -1412,7 +1412,7 @@ function filterActiveIssues(array $i): array
                     endwhile; // end while
                     ?>
                 </div> <!-- end left column div -->
-                <div class="col-md-4">
+                <div class="col-md-4 px-2">
                     <!-- start right column div -->
                     <?php
                     $_extAccess = [
diff --git a/interface/super/edit_list.php b/interface/super/edit_list.php
index 4a2cc179628..657e2babcff 100644
--- a/interface/super/edit_list.php
+++ b/interface/super/edit_list.php
@@ -89,11 +89,10 @@ function listChecksum($list_id)
 
 //Limit variables for filter
 $records_per_page = 40;
-$list_from = ( isset($_REQUEST["list_from"]) ? intval($_REQUEST["list_from"]) : 1 );
-$list_to   = ( isset($_REQUEST["list_to"])   ? intval($_REQUEST["list_to"]) : 0);
+$list_from = (isset($_REQUEST["list_from"]) ? intval($_REQUEST["list_from"]) : 1);
+$list_to = (isset($_REQUEST["list_to"]) ? intval($_REQUEST["list_to"]) : 0);
 
 // If we are saving, then save.
-//
 if ((($_POST['formaction'] ?? '') == 'save') && $list_id && $alertmsg == '') {
     $opt = $_POST['opt'];
     if ($list_id == 'feesheet') {
@@ -366,7 +365,7 @@ function getCodeDescriptions($codes)
         } else {
             $row = sqlQuery("SELECT code_text FROM codes WHERE " .
                 "code_type = ? AND " .
-                "code = ? ORDER BY modifier LIMIT 1", array($code_types[$code_type]['id'], $code ));
+                "code = ? ORDER BY modifier LIMIT 1", array($code_types[$code_type]['id'], $code));
             $desc = "$code_type:$code " . ucfirst(strtolower($row['code_text'] ?? ''));
         }
         $desc = str_replace('~', ' ', $desc);
@@ -426,9 +425,9 @@ function writeOptionLine($option_id, $title, $seq, $default, $value, $mapping =
         echo "<select name='opt[" . attr($opt_line_no) . "][activity]' class='optin'>";
         foreach (
             array(
-                     1 => xl('Replace'),
-                     2 => xl('Append')
-                 ) as $key => $desc
+                1 => xl('Replace'),
+                2 => xl('Append')
+            ) as $key => $desc
         ) {
             echo "<option value='" . attr($key) . "'";
             if ($key == $active) {
@@ -459,12 +458,12 @@ function writeOptionLine($option_id, $title, $seq, $default, $value, $mapping =
         echo "<select name='opt[" . attr($opt_line_no) . "][value]' class='optin'>";
         foreach (
             array(
-                     1 => xl('Charge adjustment'),
-                     2 => xl('Coinsurance'),
-                     3 => xl('Deductible'),
-                     4 => xl('Other pt resp'),
-                     5 => xl('Comment'),
-                 ) as $key => $desc
+                1 => xl('Charge adjustment'),
+                2 => xl('Coinsurance'),
+                3 => xl('Deductible'),
+                4 => xl('Other pt resp'),
+                5 => xl('Comment'),
+            ) as $key => $desc
         ) {
             echo "<option value='" . attr($key) . "'";
             if ($key == $value) {
@@ -497,10 +496,10 @@ function writeOptionLine($option_id, $title, $seq, $default, $value, $mapping =
         echo "<select name='opt[" . attr($opt_line_no) . "][value]' class='optin'>";
         foreach (
             array(
-                     1 => xl('Unassigned'),
-                     2 => xl('Person'),
-                     3 => xl('Company'),
-                 ) as $key => $desc
+                1 => xl('Unassigned'),
+                2 => xl('Person'),
+                3 => xl('Company'),
+            ) as $key => $desc
         ) {
             echo "<option value='" . attr($key) . "'";
             if ($key == $value) {
@@ -854,8 +853,8 @@ function writeITLine($it_array)
 }
 
 ?>
+<!DOCTYPE html>
 <html>
-
 <head>
     <?php echo Header::setupHeader(['select2', 'jscolor']); ?>
     <title><?php echo xlt('List Editor'); ?></title>
@@ -871,6 +870,7 @@ function writeITLine($it_array)
         .translation {
             color: var(--success);
         }
+
         #theform input[type=text],
         .optin {
             color: var(--black);
@@ -903,8 +903,7 @@ function setDivContent(id, content) {
                 var x = document.getElementById(id);
                 x.innerHTML = '';
                 x.innerHTML = content;
-            }
-            else if (document.all) {
+            } else if (document.all) {
                 var x = document.all[id];
                 x.innerHTML = content;
             }
@@ -932,8 +931,7 @@ function dc_substring(s, i) {
             var j = s.indexOf('~', i);
             if (j < 0) { // deleting last segment
                 if (i > 0) r = s.substring(0, i - 1); // omits trailing ~
-            }
-            else { // not last segment
+            } else { // not last segment
                 r = s.substring(0, i) + s.substring(j + 1);
             }
             return r;
@@ -993,31 +991,27 @@ function set_related(codetype, code, selector, codedesc, modifier = '') {
                         s += ';';
                     }
                     s += codetype + ':' + code;
-                }
-                else {
+                } else {
                     s = '';
                 }
                 e.value = s;
-            }
-            else if (current_sel_name) {
+            } else if (current_sel_name) {
                 // Coming from Immunizations edit
                 var e = f[current_sel_name];
                 var s = e.value;
                 if (code) {
                     s = code;
-                }
-                else {
+                } else {
                     s = '0';
                 }
                 e.value = s;
-            }
-            else {
+            } else {
                 // Coming from Fee Sheet edit
                 var celem = f['opt[' + current_lino + '][codes]'];
                 var delem = f['opt[' + current_lino + '][descs]'];
                 var i = 0;
                 while ((i = codedesc.indexOf('~')) >= 0) {
-                    codedesc = codedesc.substring(0, i) + ' ' + codedesc.substring(i+1);
+                    codedesc = codedesc.substring(0, i) + ' ' + codedesc.substring(i + 1);
                 }
                 if (code) {
                     if (modifier) {
@@ -1048,12 +1042,10 @@ function del_related(s) {
             if (current_sel_clin_term) {
                 // Coming from the Clinical Terms Code(s) edit
                 my_del_related(s, f[current_sel_clin_term], false);
-            }
-            else if (current_sel_name) {
+            } else if (current_sel_name) {
                 // Coming from Immunizations edit
                 f[current_sel_name].value = '0';
-            }
-            else {
+            } else {
                 // Coming from Fee Sheet edit
                 f['opt[' + current_lino + '][codes]'].value = '';
                 f['opt[' + current_lino + '][descs]'].value = '';
@@ -1089,25 +1081,24 @@ function mysubmit() {
                     for (var j = i + 1; f['opt[' + j + '][ct_key]'].value; ++j) {
                         var jkey = 'opt[' + j + ']';
                         if (f[ikey + '[ct_key]'].value == f[jkey + '[ct_key]'].value) {
-                            alert(<?php echo xlj('Error: duplicated name on line') ?> + ' ' + j);
+                            alert(<?php echo xlj('Error: duplicated name on line') ?> +' ' + j);
                             return;
                         }
                         if (parseInt(f[ikey + '[ct_id]'].value) == parseInt(f[jkey + '[ct_id]'].value)) {
-                            alert(<?php echo xlj('Error: duplicated ID on line') ?> + ' ' + j);
+                            alert(<?php echo xlj('Error: duplicated ID on line') ?> +' ' + j);
                             return;
                         }
                     }
                 }
-            }
-            else if (f['opt[1][id]']) {
+            } else if (f['opt[1][id]']) {
                 // Check for duplicate IDs.
                 for (var i = 1; f['opt[' + i + '][id]']; ++i) {
                     var ikey = 'opt[' + i + '][id]';
                     if (f[ikey].value == '') continue;
-                    for (var j = i+1; f['opt[' + j + '][id]']; ++j) {
+                    for (var j = i + 1; f['opt[' + j + '][id]']; ++j) {
                         var jkey = 'opt[' + j + '][id]';
                         if (f[ikey].value.toUpperCase() == f[jkey].value.toUpperCase()) {
-                            alert(<?php echo xlj('Error: duplicated ID') ?> + ': ' + f[jkey].value);
+                            alert(<?php echo xlj('Error: duplicated ID') ?> +': ' + f[jkey].value);
                             f[jkey].scrollIntoView();
                             f[jkey].focus();
                             f[jkey].select();
@@ -1132,502 +1123,515 @@ function listSelected() {
     </script>
 
 </head>
-
 <body class="body_top">
-<form method='post' name='theform' id='theform' action='edit_list.php'>
-    <input type="hidden" name="csrf_token_form" value="<?php echo attr(CsrfUtils::collectCsrfToken()); ?>" />
-    <input type="hidden" id="list_from" name="list_from" value="<?php echo attr($list_from);?>"/>
-    <input type="hidden" id="list_to" name="list_to" value="<?php echo attr($list_to);?>"/>
-    <nav class="navbar navbar-light bg-light navbar-expand-md fixed-top">
-        <div class="container-fluid">
-              <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-list" aria-controls="navbar-list" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
+    <form method='post' name='theform' id='theform' action='edit_list.php'>
+        <input type="hidden" name="csrf_token_form" value="<?php echo attr(CsrfUtils::collectCsrfToken()); ?>" />
+        <input type="hidden" id="list_from" name="list_from" value="<?php echo attr($list_from); ?>" />
+        <input type="hidden" id="list_to" name="list_to" value="<?php echo attr($list_to); ?>" />
+        <nav class="navbar navbar-light bg-light navbar-expand-md fixed-top">
+            <div class="container-fluid">
+                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-list" aria-controls="navbar-list" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
                 <a class="navbar-brand" href="#"><?php echo xlt('Manage Lists'); ?></a>
 
-            <!-- Collect the nav links, forms, and other content for toggling -->
-            <div class="collapse navbar-collapse" id="navbar-list">
-                <ul class="nav navbar-nav">
-                    <li class="nav-item"><a class="nav-link" href="#" data-toggle="modal" data-target="#modal-new-list"><i class="fa fa-plus"></i>&nbsp;<?php echo xlt('New List'); ?></a></li>
-                    <li class="nav-item"><a class="nav-link deletelist" href="#" id="<?php echo attr($list_id); ?>"><i class="fa fa-trash"></i>&nbsp;<?php echo xlt('Delete List'); ?></a></li>
-                </ul>
-                <input type="hidden" name="formaction" id="formaction" />
-                <div class="form-inline my-2 my-lg-0 navbar-left">
-                    <select name='list_id' class="form-control select-dropdown" id="list_id">
-                        <?php
-                        /*
-                         * Keep proper list name (otherwise list name changes according to
-                         * the options shown on the screen).
-                         */
-                        $list_id_container = $_GET["list_id_container"] ?? null;
-                        if (isset($_GET["list_id_container"]) && strlen($list_id_container) > 0) {
-                            $list_id = $list_id_container;
-                        }
-
-                        // List order depends on language translation options.
-                        $lang_id = empty($_SESSION['language_choice']) ? '1' : $_SESSION['language_choice'];
-
-                        if (!$GLOBALS['translate_lists']) {
-                            $res = sqlStatement("SELECT option_id, title FROM list_options WHERE " .
-                                "list_id = 'lists' ORDER BY title, seq");
-                        } else {
-                            // Use and sort by the translated list name.
-                            $res = sqlStatement(
-                                "SELECT lo.option_id, " .
-                                "COALESCE((SELECT ld.definition FROM lang_constants AS lc, lang_definitions AS ld " .
-                                "WHERE lc.constant_name = lo.title AND ld.cons_id = lc.cons_id AND ld.lang_id = ? " .
-                                "AND ld.definition IS NOT NULL AND ld.definition != '' LIMIT 1), lo.title) AS title " .
-                                "FROM list_options AS lo " .
-                                "WHERE lo.list_id = 'lists' AND lo.edit_options = 1 " .
-                                "ORDER BY title, lo.seq",
-                                array($lang_id)
-                            );
-                        }
+                <!-- Collect the nav links, forms, and other content for toggling -->
+                <div class="collapse navbar-collapse" id="navbar-list">
+                    <ul class="nav navbar-nav">
+                        <li class="nav-item"><a class="nav-link" href="#" data-toggle="modal" data-target="#modal-new-list"><i class="fa fa-plus"></i>&nbsp;<?php echo xlt('New List'); ?></a></li>
+                        <li class="nav-item"><a class="nav-link deletelist" href="#" id="<?php echo attr($list_id); ?>"><i class="fa fa-trash"></i>&nbsp;<?php echo xlt('Delete List'); ?></a></li>
+                    </ul>
+                    <input type="hidden" name="formaction" id="formaction" />
+                    <div class="form-inline my-2 my-lg-0 navbar-left">
+                        <select name='list_id' class="form-control select-dropdown" id="list_id">
+                            <?php
+                            /*
+                             * Keep proper list name (otherwise list name changes according to
+                             * the options shown on the screen).
+                             */
+                            $list_id_container = $_GET["list_id_container"] ?? null;
+                            if (isset($_GET["list_id_container"]) && strlen($list_id_container) > 0) {
+                                $list_id = $list_id_container;
+                            }
 
-                        while ($row = sqlFetchArray($res)) {
-                            // This allows the list to default to the first item on the list
-                            //   when the list_id request parameter is blank.
-                            if (($blank_list_id) && ($list_id == 'language')) {
-                                $list_id = $row['option_id'];
-                                $blank_list_id = false;
+                            // List order depends on language translation options.
+                            $lang_id = empty($_SESSION['language_choice']) ? '1' : $_SESSION['language_choice'];
+
+                            if (!$GLOBALS['translate_lists']) {
+                                $res = sqlStatement("SELECT option_id, title FROM list_options WHERE " .
+                                    "list_id = 'lists' ORDER BY title, seq");
+                            } else {
+                                // Use and sort by the translated list name.
+                                $res = sqlStatement(
+                                    "SELECT lo.option_id, " .
+                                    "COALESCE((SELECT ld.definition FROM lang_constants AS lc, lang_definitions AS ld " .
+                                    "WHERE lc.constant_name = lo.title AND ld.cons_id = lc.cons_id AND ld.lang_id = ? " .
+                                    "AND ld.definition IS NOT NULL AND ld.definition != '' LIMIT 1), lo.title) AS title " .
+                                    "FROM list_options AS lo " .
+                                    "WHERE lo.list_id = 'lists' AND lo.edit_options = 1 " .
+                                    "ORDER BY title, lo.seq",
+                                    array($lang_id)
+                                );
                             }
 
-                            $key = $row['option_id'];
-                            echo "<option value='" . attr($key) . "'";
-                            if ($key == $list_id) {
-                                echo " selected";
+                            while ($row = sqlFetchArray($res)) {
+                                // This allows the list to default to the first item on the list
+                                //   when the list_id request parameter is blank.
+                                if (($blank_list_id) && ($list_id == 'language')) {
+                                    $list_id = $row['option_id'];
+                                    $blank_list_id = false;
+                                }
+
+                                $key = $row['option_id'];
+                                echo "<option value='" . attr($key) . "'";
+                                if ($key == $list_id) {
+                                    echo " selected";
+                                }
+                                echo ">" . text($row['title']) . "</option>\n";
                             }
-                            echo ">" . text($row['title']) . "</option>\n";
-                        }
 
-                        ?>
-                    </select>
-                </div>
-
-                <!--Added filter-->
-                <script>
-                    function lister() {
-                        var queryParams = getQueryStringAsObject();
-                        var list_from = parseInt($("#list-from").val());
-                        var list_to   = parseInt($("#list-to").val());
-                        var list_id_container = $("#list_id").val();
-
-                        if( list_from > list_to ){
-                            alert(<?php echo xlj("Please enter a enter valid range"); ?>);
-                            return false;
-                        }
-                        if( list_from >= 0 ){
-                            queryParams['list_from'] = list_from;
-                        }
+                            ?>
+                        </select>
+                    </div>
 
-                        if( list_to >= 0 ){
-                            queryParams['list_to'] = list_to;
-                        }
-                        if( list_id_container.length > 0 ){
-                            queryParams['list_id_container'] = list_id_container;
+                    <!--Added filter-->
+                    <script>
+                        function lister() {
+                            var queryParams = getQueryStringAsObject();
+                            var list_from = parseInt($("#list-from").val());
+                            var list_to = parseInt($("#list-to").val());
+                            var list_id_container = $("#list_id").val();
+
+                            if (list_from > list_to) {
+                                alert(<?php echo xlj("Please enter a enter valid range"); ?>);
+                                return false;
+                            }
+                            if (list_from >= 0) {
+                                queryParams['list_from'] = list_from;
+                            }
+
+                            if (list_to >= 0) {
+                                queryParams['list_to'] = list_to;
+                            }
+                            if (list_id_container.length > 0) {
+                                queryParams['list_id_container'] = list_id_container;
+                            }
+                            var urlParts = document.URL.split('?');
+                            var newUrl = urlParts[0] + '?' + $.param(queryParams);
+                            window.location.replace(newUrl);
                         }
-                        var urlParts = document.URL.split('?');
-                        var newUrl = urlParts[0] + '?' + $.param(queryParams);
-                        window.location.replace(newUrl);
+                    </script>
+                    <?php
+                    if ($list_id == 'feesheet') {
+                        $records_per_page = 150;
                     }
-                </script>
-                <?php
-                $urlFrom   = ($list_from > 0 ? $list_from : 1);
-                $urlTo     = ($list_to > 0 ? $list_to : $records_per_page);
-                ?>
-                <div class="blck-filter float-left w-auto my-2 my-lg-0" style="display: none;">
-                    <div id="input-type-from" class="float-left"><?php echo xlt("From"); ?>&nbsp;<input autocomplete="off" id="list-from" value="<?php echo attr($urlFrom);?>" style="margin-right: 10px; width: 40px;">
-                        <?php echo xlt("To{{Range}}"); ?>&nbsp;<input autocomplete="off" id="list-to" value="<?php echo attr($urlTo); ?>" style=" margin-right: 10px; width: 40px;">
+                    $urlFrom = ($list_from > 0 ? $list_from : 1);
+                    $urlTo = ($list_to > 0 ? $list_to : $records_per_page);
+                    ?>
+                    <div class="blck-filter float-left w-auto my-2 my-lg-0" style="display: none;">
+                        <div id="input-type-from" class="float-left"><?php echo xlt("From"); ?>&nbsp;<input autocomplete="off" id="list-from" value="<?php echo attr($urlFrom); ?>" style="margin-right: 10px; width: 40px;">
+                            <?php echo xlt("To{{Range}}"); ?>&nbsp;<input autocomplete="off" id="list-to" value="<?php echo attr($urlTo); ?>" style=" margin-right: 10px; width: 40px;">
+                        </div>
+                        <div class="float-left"><input type="button" value="<?php echo xla('Show records'); ?>" onclick="lister()"></div>
                     </div>
-                    <div class="float-left"><input type="button" value="<?php echo xla('Show records'); ?>" onclick="lister()"></div>
-                </div>
-                <!--Happy end-->
-                <div class="float-left ml-2 my-2 my-lg-0" id="total-record"></div>
-        </div><!-- /.navbar-collapse -->
-    </div>
-</nav>
-
-<table class="table table-striped table-sm" style="margin-top: 55px;">
-    <thead>
-    <tr>
-        <?php if ($list_id == 'feesheet') : ?>
-            <th><?php echo xlt('Group'); ?></th>
-            <th><?php echo xlt('Option'); ?></th>
-            <th><?php echo xlt('Generates'); ?></th>
-        <?php elseif ($list_id == 'code_types') : ?>
-            <th><?php echo xlt('Active{{Code}}'); ?></th>
-            <th><?php echo xlt('Key'); ?></th>
-            <th><?php echo xlt('ID'); ?></th>
-            <th><?php echo xlt('Label'); ?></th>
-            <?php //show translation column if not english and the translation lists flag is set
-            if ($GLOBALS['translate_lists'] && $_SESSION['language_choice'] > 1) {
-                echo "<th class='font-weight-bold'>" . xlt('Translation') . "<span class='help' title='" . xla('The translated Title that will appear in current language') . "'> (?)</span></th>";
-            } ?>
-            <th><?php echo xlt('Seq'); ?></th>
-            <th><?php echo xlt('ModLength'); ?></th>
-            <th><?php echo xlt('Justify'); ?></th>
-            <th><?php echo xlt('Mask'); ?></th>
-            <th><?php echo xlt('Claims'); ?></th>
-            <th><?php echo xlt('Fees'); ?></th>
-            <th><?php echo xlt('Relations'); ?></th>
-            <th><?php echo xlt('Hide'); ?></th>
-            <th><?php echo xlt('Procedure'); ?></th>
-            <th><?php echo xlt('Diagnosis'); ?></th>
-            <th><?php echo xlt('Clinical Term'); ?></th>
-            <th><?php echo xlt('Medical Problem'); ?></th>
-            <th><?php echo xlt('Drug'); ?></th>
-            <th><?php echo xlt('External'); ?></th>
-        <?php elseif ($list_id == 'apptstat' || $list_id == 'groupstat') : ?>
-            <th><?php echo xlt('ID'); ?></th>
-            <th><?php echo xlt('Title'); ?></th>
-            <th><?php echo xlt('Order{{Sequence}}'); ?></th>
-            <th><?php echo xlt('Default'); ?></th>
-            <th><?php echo xlt('Active{{Appointment}}'); ?></th>
-            <th><?php echo xlt('Color'); ?></th>
-            <th><?php echo xlt('Alert Time'); ?></th>
-            <th><?php echo xlt('Check In'); ?>&nbsp;&nbsp;&nbsp;&nbsp;</th>
-            <th><?php echo xlt('Check Out'); ?></th>
-            <th><?php echo xlt('Code(s)'); ?></th>
-        <?php elseif ($list_id == 'issue_types') : ?>
-            <th><?php echo xlt('OpenEMR Application Category'); ?></th>
-            <th><?php echo xlt('Active{{Issue}}'); ?></th>
-            <th><?php echo xlt('Order{{Sequence}}'); ?></th>
-            <th><?php echo xlt('Type'); ?></th>
-            <th><?php echo xlt('Plural'); ?></th>
-            <?php //show translation column if not english and the translation lists flag is set
-            if ($GLOBALS['translate_lists'] && $_SESSION['language_choice'] > 1) {
-                echo "<th>" . xlt('Translation') . "<span class='help' title='" . xla('The translated Title that will appear in current language') . "'> (?)</span></th>";
-            } ?>
-            <th><?php echo xlt('Singular'); ?></th>
-            <?php //show translation column if not english and the translation lists flag is set
-            if ($GLOBALS['translate_lists'] && $_SESSION['language_choice'] > 1) {
-                echo "<th>" . xlt('Translation') . "<span class='help' title='" . xla('The translated Title that will appear in current language') . "'> (?)</span></th>";
-            } ?>
-            <th><?php echo xlt('Mini'); ?></th>
-            <?php //show translation column if not english and the translation lists flag is set
-            if ($GLOBALS['translate_lists'] && $_SESSION['language_choice'] > 1) {
-                echo "<th>" . xlt('Translation') . "<span class='help' title='" . xla('The translated Title that will appear in current language') . "'> (?)</span></th>";
-            } ?>
-            <th><?php echo xlt('Style'); ?></th>
-            <th><?php echo xlt('Force Show'); ?></th>
-            <th><?php echo xlt('Access Control'); ?></th>
-        <?php else : ?>
-            <th title='<?php echo xla('Click to edit'); ?>'><?php echo xlt('ID'); ?></th>
-            <th><?php echo xlt('Title'); ?></th>
-            <?php //show translation column if not english and the translation lists flag is set
-            if ($GLOBALS['translate_lists'] && $_SESSION['language_choice'] > 1) {
-                echo "<th>" . xlt('Translation') . "<span class='help' title='" . xla('The translated Title that will appear in current language') . "'> (?)</span></th>";
-            } ?>
-            <th><?php echo xlt('Order{{Sequence}}'); ?></th>
-            <th><?php echo xlt('Default'); ?></th>
-            <th><?php echo xlt('Active'); ?></th>
-            <?php if ($list_id == 'taxrate') { ?>
-                <th><?php echo xlt('Rate'); ?></th>
-            <?php } elseif ($list_id == 'contrameth') { ?>
-                <th><?php echo xlt('Effectiveness'); ?></th>
-            <?php } elseif ($list_id == 'lbfnames' || $list_id == 'transactions') { ?>
-                <th title='<?php echo xla('Number of past history columns'); ?>'><?php echo xlt('Repeats'); ?></th>
-            <?php } elseif ($list_id == 'fitness') { ?>
-                <th><?php echo xlt('Color:Abbr'); ?></th>
-            <?php } elseif ($list_id == 'adjreason' || $list_id == 'abook_type') { ?>
-                <th><?php echo xlt('Type'); ?></th>
-            <?php } elseif ($list_id == 'warehouse') { ?>
-                <th><?php echo xlt('Facility'); ?></th>
-            <?php } elseif ($list_id == 'immunizations') { ?>
-                <th>&nbsp;&nbsp;&nbsp;&nbsp;<?php echo xlt('CVX Code Mapping'); ?></th>
-            <?php } elseif ($list_id == 'ptlistcols') { ?>
-                <th>&nbsp;&nbsp;&nbsp;&nbsp;<?php echo xlt('Default Sort Direction'); ?></th>
-            <?php }
-            if ($GLOBALS['ippf_specific']) { ?>
-                <th><?php echo xlt('Global ID'); ?></th>
-            <?php } ?>
-            <th><?php
-            if ($list_id == 'language') {
-                echo xlt('ISO 639 Code');
-            } elseif ($list_id == 'personal_relationship' || $list_id == 'religious_affiliation' || $list_id == 'ethnicity' || $list_id == 'race' || $list_id == 'drug_route') {
-                echo xlt('HL7-V3 Concept Code');
-            } elseif ($list_id == 'Immunization_Completion_Status') {
-                echo xlt('Treatment Completion Status');
-            } elseif ($list_id == 'race') {
-                echo xlt('CDC Code');
-            } elseif ($list_id == 'Immunization_Manufacturer') {
-                echo xlt('MVX Code');
-            } elseif ($list_id == 'marital') {
-                echo xlt('Marital Status');
-            } elseif ($list_id == 'county') {
-                echo xlt('INCITS Code'); //International Committee for Information Technology Standards
-            } elseif ($list_id == 'immunization_registry_status' || $list_id == 'imm_vac_eligibility_results') {
-                echo xlt('IIS Code');
-            } elseif ($list_id == 'publicity_code') {
-                echo xlt('CDC Code');
-            } elseif ($list_id == 'immunization_refusal_reason' || $list_id == 'immunization_informationsource') {
-                echo xlt('CDC-NIP Code');
-            } elseif ($list_id == 'next_of_kin_relationship' || $list_id == 'immunization_administered_site') {
-                echo xlt('HL7 Code');
-            } elseif ($list_id == 'immunization_observation') {
-                echo xlt('LOINC Code');
-            } elseif ($list_id == 'page_validation') {
-                echo xlt('Page Validation');
-            } elseif ($list_id == 'lbfnames') {
-                echo xlt('Attributes');
-            } elseif ($list_id == "external_patient_education") {
-                echo xlt('External URL');
-            } elseif ($list_id == "default_open_tabs") {
-                echo xlt("URL");
-            } else {
-                echo xlt('Notes');
-            } ?></th>
+                    <!--Happy end-->
+                    <div class="float-left ml-2 my-2 my-lg-0" id="total-record"></div>
+                </div><!-- /.navbar-collapse -->
+            </div>
+        </nav>
+
+        <table class="table table-striped table-sm" style="margin-top: 55px;">
+            <thead>
+            <tr>
+                <?php if ($list_id == 'feesheet') : ?>
+                    <th><?php echo xlt('Group'); ?></th>
+                    <th><?php echo xlt('Option'); ?></th>
+                    <th><?php echo xlt('Generates'); ?></th>
+                <?php elseif ($list_id == 'code_types') : ?>
+                    <th><?php echo xlt('Active{{Code}}'); ?></th>
+                    <th><?php echo xlt('Key'); ?></th>
+                    <th><?php echo xlt('ID'); ?></th>
+                    <th><?php echo xlt('Label'); ?></th>
+                    <?php //show translation column if not english and the translation lists flag is set
+                    if ($GLOBALS['translate_lists'] && $_SESSION['language_choice'] > 1) {
+                        echo "<th class='font-weight-bold'>" . xlt('Translation') . "<span class='help' title='" . xla('The translated Title that will appear in current language') . "'> (?)</span></th>";
+                    } ?>
+                    <th><?php echo xlt('Seq'); ?></th>
+                    <th><?php echo xlt('ModLength'); ?></th>
+                    <th><?php echo xlt('Justify'); ?></th>
+                    <th><?php echo xlt('Mask'); ?></th>
+                    <th><?php echo xlt('Claims'); ?></th>
+                    <th><?php echo xlt('Fees'); ?></th>
+                    <th><?php echo xlt('Relations'); ?></th>
+                    <th><?php echo xlt('Hide'); ?></th>
+                    <th><?php echo xlt('Procedure'); ?></th>
+                    <th><?php echo xlt('Diagnosis'); ?></th>
+                    <th><?php echo xlt('Clinical Term'); ?></th>
+                    <th><?php echo xlt('Medical Problem'); ?></th>
+                    <th><?php echo xlt('Drug'); ?></th>
+                    <th><?php echo xlt('External'); ?></th>
+                <?php elseif ($list_id == 'apptstat' || $list_id == 'groupstat') : ?>
+                    <th><?php echo xlt('ID'); ?></th>
+                    <th><?php echo xlt('Title'); ?></th>
+                    <th><?php echo xlt('Order{{Sequence}}'); ?></th>
+                    <th><?php echo xlt('Default'); ?></th>
+                    <th><?php echo xlt('Active{{Appointment}}'); ?></th>
+                    <th><?php echo xlt('Color'); ?></th>
+                    <th><?php echo xlt('Alert Time'); ?></th>
+                    <th><?php echo xlt('Check In'); ?>&nbsp;&nbsp;&nbsp;&nbsp;</th>
+                    <th><?php echo xlt('Check Out'); ?></th>
+                    <th><?php echo xlt('Code(s)'); ?></th>
+                <?php elseif ($list_id == 'issue_types') : ?>
+                    <th><?php echo xlt('OpenEMR Application Category'); ?></th>
+                    <th><?php echo xlt('Active{{Issue}}'); ?></th>
+                    <th><?php echo xlt('Order{{Sequence}}'); ?></th>
+                    <th><?php echo xlt('Type'); ?></th>
+                    <th><?php echo xlt('Plural'); ?></th>
+                    <?php //show translation column if not english and the translation lists flag is set
+                    if ($GLOBALS['translate_lists'] && $_SESSION['language_choice'] > 1) {
+                        echo "<th>" . xlt('Translation') . "<span class='help' title='" . xla('The translated Title that will appear in current language') . "'> (?)</span></th>";
+                    } ?>
+                    <th><?php echo xlt('Singular'); ?></th>
+                    <?php //show translation column if not english and the translation lists flag is set
+                    if ($GLOBALS['translate_lists'] && $_SESSION['language_choice'] > 1) {
+                        echo "<th>" . xlt('Translation') . "<span class='help' title='" . xla('The translated Title that will appear in current language') . "'> (?)</span></th>";
+                    } ?>
+                    <th><?php echo xlt('Mini'); ?></th>
+                    <?php //show translation column if not english and the translation lists flag is set
+                    if ($GLOBALS['translate_lists'] && $_SESSION['language_choice'] > 1) {
+                        echo "<th>" . xlt('Translation') . "<span class='help' title='" . xla('The translated Title that will appear in current language') . "'> (?)</span></th>";
+                    } ?>
+                    <th><?php echo xlt('Style'); ?></th>
+                    <th><?php echo xlt('Force Show'); ?></th>
+                    <th><?php echo xlt('Access Control'); ?></th>
+                <?php else : ?>
+                    <th title='<?php echo xla('Click to edit'); ?>'><?php echo xlt('ID'); ?></th>
+                    <th><?php echo xlt('Title'); ?></th>
+                    <?php //show translation column if not english and the translation lists flag is set
+                    if ($GLOBALS['translate_lists'] && $_SESSION['language_choice'] > 1) {
+                        echo "<th>" . xlt('Translation') . "<span class='help' title='" . xla('The translated Title that will appear in current language') . "'> (?)</span></th>";
+                    } ?>
+                    <th><?php echo xlt('Order{{Sequence}}'); ?></th>
+                    <th><?php echo xlt('Default'); ?></th>
+                    <th><?php echo xlt('Active'); ?></th>
+                    <?php if ($list_id == 'taxrate') { ?>
+                        <th><?php echo xlt('Rate'); ?></th>
+                    <?php } elseif ($list_id == 'contrameth') { ?>
+                        <th><?php echo xlt('Effectiveness'); ?></th>
+                    <?php } elseif ($list_id == 'lbfnames' || $list_id == 'transactions') { ?>
+                        <th title='<?php echo xla('Number of past history columns'); ?>'><?php echo xlt('Repeats'); ?></th>
+                    <?php } elseif ($list_id == 'fitness') { ?>
+                        <th><?php echo xlt('Color:Abbr'); ?></th>
+                    <?php } elseif ($list_id == 'adjreason' || $list_id == 'abook_type') { ?>
+                        <th><?php echo xlt('Type'); ?></th>
+                    <?php } elseif ($list_id == 'warehouse') { ?>
+                        <th><?php echo xlt('Facility'); ?></th>
+                    <?php } elseif ($list_id == 'immunizations') { ?>
+                        <th>&nbsp;&nbsp;&nbsp;&nbsp;<?php echo xlt('CVX Code Mapping'); ?></th>
+                    <?php } elseif ($list_id == 'ptlistcols') { ?>
+                        <th>&nbsp;&nbsp;&nbsp;&nbsp;<?php echo xlt('Default Sort Direction'); ?></th>
+                    <?php }
+                    if ($GLOBALS['ippf_specific']) { ?>
+                        <th><?php echo xlt('Global ID'); ?></th>
+                    <?php } ?>
+                    <th><?php
+                    if ($list_id == 'language') {
+                        echo xlt('ISO 639 Code');
+                    } elseif ($list_id == 'personal_relationship' || $list_id == 'religious_affiliation' || $list_id == 'ethnicity' || $list_id == 'race' || $list_id == 'drug_route') {
+                        echo xlt('HL7-V3 Concept Code');
+                    } elseif ($list_id == 'Immunization_Completion_Status') {
+                        echo xlt('Treatment Completion Status');
+                    } elseif ($list_id == 'race') {
+                        echo xlt('CDC Code');
+                    } elseif ($list_id == 'Immunization_Manufacturer') {
+                        echo xlt('MVX Code');
+                    } elseif ($list_id == 'marital') {
+                        echo xlt('Marital Status');
+                    } elseif ($list_id == 'county') {
+                        echo xlt('INCITS Code'); //International Committee for Information Technology Standards
+                    } elseif ($list_id == 'immunization_registry_status' || $list_id == 'imm_vac_eligibility_results') {
+                        echo xlt('IIS Code');
+                    } elseif ($list_id == 'publicity_code') {
+                        echo xlt('CDC Code');
+                    } elseif ($list_id == 'immunization_refusal_reason' || $list_id == 'immunization_informationsource') {
+                        echo xlt('CDC-NIP Code');
+                    } elseif ($list_id == 'next_of_kin_relationship' || $list_id == 'immunization_administered_site') {
+                        echo xlt('HL7 Code');
+                    } elseif ($list_id == 'immunization_observation') {
+                        echo xlt('LOINC Code');
+                    } elseif ($list_id == 'page_validation') {
+                        echo xlt('Page Validation');
+                    } elseif ($list_id == 'lbfnames') {
+                        echo xlt('Attributes');
+                    } elseif ($list_id == "external_patient_education") {
+                        echo xlt('External URL');
+                    } elseif ($list_id == "default_open_tabs") {
+                        echo xlt("URL");
+                    } else {
+                        echo xlt('Notes');
+                    } ?></th>
 
-            <th><?php echo xlt('Code(s)'); ?></th>
+                    <th><?php echo xlt('Code(s)'); ?></th>
+                    <?php
+                    if (preg_match('/_issue_list$/', $list_id)) { ?>
+                        <th><?php echo xlt('Subtype'); ?></th>
+                        <?php
+                    }
+                endif; // end not fee sheet ?>
+            </tr>
+            </thead>
+            <tbody>
             <?php
-            if (preg_match('/_issue_list$/', $list_id)) { ?>
-                <th><?php echo xlt('Subtype'); ?></th>
-                <?php
-            }
-        endif; // end not fee sheet ?>
-    </tr>
-    </thead>
-    <tbody>
-    <?php
-    // Get the selected list's elements.
-    if ($list_id) {
-        $sql_limits = 'ASC LIMIT 0, ' . escape_limit($records_per_page);
-        $total_rows = 0;
-        if ($list_from > 0) {
-            $list_from--;
-        }
-        if ($list_to > 0) {
-            $sql_limits = " ASC LIMIT " . escape_limit($list_from) . (intval($list_to) > 0 ? ", " . escape_limit($list_to - $list_from) : "");
-        }
+            // Get the selected list's elements.
+            if ($list_id) {
+                $sql_limits = 'ASC LIMIT 0, ' . escape_limit($records_per_page);
+                $total_rows = 0;
+                if ($list_from > 0) {
+                    $list_from--;
+                }
+                if ($list_to > 0) {
+                    $sql_limits = " ASC LIMIT " . escape_limit($list_from) . (intval($list_to) > 0 ? ", " . escape_limit($list_to - $list_from) : "");
+                }
 
-        if ($list_id == 'feesheet') {
-            $res = sqlStatement("SELECT count(*) as total_rows FROM fee_sheet_options ORDER BY fs_category, fs_option");
-            $total_rows = sqlFetchArray($res)["total_rows"];
+                if ($list_id == 'feesheet') {
+                    $res = sqlStatement("SELECT count(*) as total_rows FROM fee_sheet_options ORDER BY fs_category, fs_option");
+                    $total_rows = sqlFetchArray($res)["total_rows"];
 
-            $res = sqlStatement("SELECT * FROM fee_sheet_options " .
-                "ORDER BY fs_category, fs_option " . $sql_limits);
-            while ($row = sqlFetchArray($res)) {
-                writeFSLine($row['fs_category'], $row['fs_option'], $row['fs_codes']);
-            }
-            for ($i = 0; $i < 3; ++$i) {
-                writeFSLine('', '', '');
-            }
-        } elseif ($list_id == 'code_types') {
-            $res = sqlStatement("SELECT count(*) as total_rows FROM code_types ORDER BY ct_seq, ct_key");
-            $total_rows = sqlFetchArray($res)["total_rows"];
-
-            $res = sqlStatement("SELECT * FROM code_types " .
-                "ORDER BY ct_seq, ct_key " . $sql_limits);
-            while ($row = sqlFetchArray($res)) {
-                writeCTLine($row);
-            }
-            for ($i = 0; $i < 3; ++$i) {
-                writeCTLine(array());
-            }
-        } elseif ($list_id == 'issue_types') {
-            $res = sqlStatement("SELECT count(*) as total_rows FROM issue_types ORDER BY category, ordering");
-            $total_rows = sqlFetchArray($res)["total_rows"];
-
-            $res = sqlStatement("SELECT * FROM issue_types " .
-                "ORDER BY category, ordering " . $sql_limits);
-            while ($row = sqlFetchArray($res)) {
-                writeITLine($row);
-            }
-            for ($i = 0; $i < 3; ++$i) {
-                writeITLine(array());
-            }
-        } else {
-            $res = sqlStatement("SELECT count(*) as total_rows
+                    $res = sqlStatement("SELECT * FROM fee_sheet_options " .
+                        "ORDER BY fs_category, fs_option " . $sql_limits);
+                    while ($row = sqlFetchArray($res)) {
+                        writeFSLine($row['fs_category'], $row['fs_option'], $row['fs_codes']);
+                    }
+                    for ($i = 0; $i < 3; ++$i) {
+                        writeFSLine('', '', '');
+                    }
+                } elseif ($list_id == 'code_types') {
+                    $res = sqlStatement("SELECT count(*) as total_rows FROM code_types ORDER BY ct_seq, ct_key");
+                    $total_rows = sqlFetchArray($res)["total_rows"];
+
+                    $res = sqlStatement("SELECT * FROM code_types " .
+                        "ORDER BY ct_seq, ct_key " . $sql_limits);
+                    while ($row = sqlFetchArray($res)) {
+                        writeCTLine($row);
+                    }
+                    for ($i = 0; $i < 3; ++$i) {
+                        writeCTLine(array());
+                    }
+                } elseif ($list_id == 'issue_types') {
+                    $res = sqlStatement("SELECT count(*) as total_rows FROM issue_types ORDER BY category, ordering");
+                    $total_rows = sqlFetchArray($res)["total_rows"];
+
+                    $res = sqlStatement("SELECT * FROM issue_types " .
+                        "ORDER BY category, ordering " . $sql_limits);
+                    while ($row = sqlFetchArray($res)) {
+                        writeITLine($row);
+                    }
+                    for ($i = 0; $i < 3; ++$i) {
+                        writeITLine(array());
+                    }
+                } else {
+                    $res = sqlStatement("SELECT count(*) as total_rows
                          FROM list_options AS lo
                          RIGHT JOIN list_options as lo2 on lo2.option_id = lo.list_id AND lo2.list_id = 'lists' AND lo2.edit_options = 1
                          WHERE lo.list_id = ? AND lo.edit_options = 1", array($list_id));
-            $total_rows = sqlFetchArray($res)["total_rows"];
+                    $total_rows = sqlFetchArray($res)["total_rows"];
 
 
-            $res = sqlStatement("SELECT lo.*
+                    $res = sqlStatement("SELECT lo.*
                          FROM list_options AS lo
                          RIGHT JOIN list_options as lo2 on lo2.option_id = lo.list_id AND lo2.list_id = 'lists' AND lo2.edit_options = 1
                          WHERE lo.list_id = ? AND lo.edit_options = 1
                          ORDER BY seq,title " . $sql_limits, array($list_id));
 
-            while ($row = sqlFetchArray($res)) {
-                writeOptionLine(
-                    $row['option_id'],
-                    $row['title'],
-                    $row['seq'],
-                    $row['is_default'],
-                    $row['option_value'],
-                    $row['mapping'],
-                    $row['notes'],
-                    $row['codes'],
-                    $row['toggle_setting_1'],
-                    $row['toggle_setting_2'],
-                    $row['activity'],
-                    $row['subtype']
-                );
-            }
-            for ($i = 0; $i < 3; ++$i) {
-                writeOptionLine('', '', '', '', 0);
+                    while ($row = sqlFetchArray($res)) {
+                        writeOptionLine(
+                            $row['option_id'],
+                            $row['title'],
+                            $row['seq'],
+                            $row['is_default'],
+                            $row['option_value'],
+                            $row['mapping'],
+                            $row['notes'],
+                            $row['codes'],
+                            $row['toggle_setting_1'],
+                            $row['toggle_setting_2'],
+                            $row['activity'],
+                            $row['subtype']
+                        );
+                    }
+                    for ($i = 0; $i < 3; ++$i) {
+                        writeOptionLine('', '', '', '', 0);
+                    }
+                }
             }
-        }
-    }
-    ?>
-    </tbody>
-</table>
-
-<?php if ($list_id == 'immunizations') { ?>
-    <p> <?php echo xlt('Is it ok to map these CVX codes to already existent immunizations?') ?>
-        <input type='checkbox' name='ok_map_cvx_codes' id='ok_map_cvx_codes' value='1'/>
-    </p>
-<?php } // end if($list_id == 'immunizations') ?>
-
-<p>
-    <button type="submit" name='form_save' id='form_save' class="btn btn-secondary btn-save"><?php echo xlt('Save'); ?></button>
-</p>
-
-<input type='hidden' name='form_checksum' value='<?php echo listChecksum($list_id); ?>' />
-
-</form>
-
-<div class="modal fade" id="modal-new-list" tabindex="-1" role="dialog">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <form action="edit_list.php" method="post" class="form">
-                <input type="hidden" name="csrf_token_form" value="<?php echo attr(CsrfUtils::collectCsrfToken()); ?>" />
-                <div class="modal-header">
-                    <h4 class="modal-title"><?php echo xlt('New List'); ?></h4>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="<?php echo xla('Close'); ?>"><i class="fa fa-times" aria-hidden="true"></i></button>
-                </div>
-                <div class="modal-body">
-                    <label for="newlistname" class="control-label"><?php echo xlt('List Name'); ?></label>
-                    <input type="text" size="20" class="form-control" maxlength="100" name="newlistname" id="newlistname" />
-                    <input type="hidden" name="formaction" value="addlist">
-
-                </div>
-                <div class="modal-footer text-right">
-                    <button type="submit" class="btn btn-secondary btn-save"><?php echo xlt('Save'); ?></button>
-                    <button type="button" class="btn btn-link btn-cancel" data-dismiss="modal"><?php echo xlt('Cancel'); ?></button>
-                </div>
-            </form>
-        </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-</div><!-- /.modal #modal-new-list -->
-
-<script>
-    // jQuery stuff to make the page a little easier to use
-
-    $(function () {
-        $("#form_save").click(function (e) {
-            e.preventDefault();
-            SaveChanges();
-        });
-        $("#list_id").change(function () {
-            $("#list_from").val(1);
-            $("#list_to").val('');
-
-            $('#theform').submit();
-        });
+            ?>
+            </tbody>
+        </table>
+
+        <?php if ($list_id == 'immunizations') { ?>
+            <p> <?php echo xlt('Is it ok to map these CVX codes to already existent immunizations?') ?>
+                <input type='checkbox' name='ok_map_cvx_codes' id='ok_map_cvx_codes' value='1' />
+            </p>
+        <?php } // end if($list_id == 'immunizations') ?>
+
+        <p>
+            <button type="submit" name='form_save' id='form_save' class="btn btn-secondary btn-save"><?php echo xlt('Save'); ?></button>
+        </p>
+
+        <input type='hidden' name='form_checksum' value='<?php echo listChecksum($list_id); ?>' />
+        <input type='hidden' name='form_submitted' id='form_submitted' value='false'>
+    </form>
+    <div class="modal fade" id="modal-new-list" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <form action="edit_list.php" method="post" class="form">
+                    <input type="hidden" name="csrf_token_form" value="<?php echo attr(CsrfUtils::collectCsrfToken()); ?>" />
+                    <div class="modal-header">
+                        <h4 class="modal-title"><?php echo xlt('New List'); ?></h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="<?php echo xla('Close'); ?>"><i class="fa fa-times" aria-hidden="true"></i></button>
+                    </div>
+                    <div class="modal-body">
+                        <label for="newlistname" class="control-label"><?php echo xlt('List Name'); ?></label>
+                        <input type="text" size="20" class="form-control" maxlength="100" name="newlistname" id="newlistname" />
+                        <input type="hidden" name="formaction" value="addlist">
 
-        $(".newlist").click(function () {
-            NewList(this);
-        });
-        $(".savenewlist").click(function () {
-            SaveNewList(this);
-        });
-        $(".deletelist").click(function () {
-            DeleteList(this);
-        });
+                    </div>
+                    <div class="modal-footer text-right">
+                        <button type="submit" class="btn btn-secondary btn-save"><?php echo xlt('Save'); ?></button>
+                        <button type="button" class="btn btn-link btn-cancel" data-dismiss="modal"><?php echo xlt('Cancel'); ?></button>
+                    </div>
+                </form>
+            </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+    </div><!-- /.modal #modal-new-list -->
+    <script>
+        // jQuery stuff to make the page a little easier to use
 
-        var totalRecords = '<?php echo attr($res->_numOfRows);?>';
-        var totalRecordDiv = $('#total-record');
-        if( totalRecordDiv ){
-            totalRecordDiv.text("<?php echo xlt("Showing items"); ?>: <?php echo ( $list_to > 0 ? attr($list_from + 1) . " - " . attr($list_to) : attr($res->_numOfRows) );?> of <?php echo attr($total_rows);?>");
-        }
+        $(function () {
+            $("#form_save").click(function (e) {
+                e.preventDefault();
+                SaveChanges();
+            });
+            $("#list_id").change(function () {
+                $("#list_from").val(1);
+                $("#list_to").val('');
 
-        var queryParams = getQueryStringAsObject();
-        var listIdCont = null;
-        if (typeof queryParams['list_id_container'] !== 'undefined') {
-            listIdCont = queryParams['list_id_container'];
-        }
+                $('#theform').submit();
+            });
 
+            $(".newlist").click(function () {
+                NewList(this);
+            });
+            $(".savenewlist").click(function () {
+                SaveNewList(this);
+            });
+            $(".deletelist").click(function () {
+                DeleteList(this);
+            });
 
-        if( totalRecords >= <?php echo attr($records_per_page);?> || listIdCont != null || $("#list_to").val() > 0) {
-            $(".blck-filter").show();
-        }
+            var totalRecords = '<?php echo attr($res->_numOfRows);?>';
+            var totalRecordDiv = $('#total-record');
+            if (totalRecordDiv) {
+                totalRecordDiv.text("<?php echo xlt("Showing items"); ?>: <?php echo($list_to > 0 ? attr($list_from + 1) . " - " . attr($list_to) : attr($res->_numOfRows));?> of <?php echo attr($total_rows);?>");
+            }
 
-        //prevent Enter button press on filter
-        $('.blck-filter').on('keyup keypress', function(e)
-        {
-            var keyCode = e.keyCode || e.which;
-            if(keyCode == 13)
-            {
-                return false;
+            var queryParams = getQueryStringAsObject();
+            var listIdCont = null;
+            if (typeof queryParams['list_id_container'] !== 'undefined') {
+                listIdCont = queryParams['list_id_container'];
             }
-        });
 
-        var SaveChanges = function () {
-            $("#formaction").val("save");
-            // $('#theform').submit();
-            mysubmit();
-        };
-
-        // show the DIV to create a new list
-        var NewList = function (btnObj) {
-            // show the field details DIV
-            $('#newlistdetail').css('visibility', 'visible');
-            $('#newlistdetail').css('display', 'block');
-            $(btnObj).parent().append($("#newlistdetail"));
-            $('#newlistdetail > #newlistname').focus();
-        };
-        // save the new list
-        var SaveNewList = function () {
-            // the list name can only have letters, numbers, spaces and underscores
-            // AND it cannot start with a number
-            if ($("#newlistname").val().match(/^\d+/)) {
-                alert(<?php echo xlj('List names cannot start with numbers.'); ?>);
-                return false;
+
+            if (totalRecords >= <?php echo attr($records_per_page);?> || listIdCont != null || $("#list_to").val() > 0) {
+                $(".blck-filter").show();
             }
-            var validname = $("#newlistname").val().replace(/[^A-za-z0-9 -]/g, "_"); // match any non-word characters and replace them
-            if (validname != $("#newlistname").val()) {
-                if (!confirm(<?php echo xlj('Your list name has been changed to meet naming requirements.'); ?> + '\n' + <?php echo xlj('Please compare the new name'); ?> + ', \'' + validname + '\' ' + <?php echo xlj('with the old name'); ?> + ', \'' + $("#newlistname").val() + '\'.\n' + <?php echo xlj('Do you wish to continue with the new name?'); ?>)) {
+
+            //prevent Enter button press on filter
+            $('.blck-filter').on('keyup keypress', function (e) {
+                var keyCode = e.keyCode || e.which;
+                if (keyCode == 13) {
                     return false;
                 }
-            }
-            $("#newlistname").val(validname);
-
-            // submit the form to add a new field to a specific group
-            $("#formaction").val("addlist");
-            $("#theform").submit();
-        };
-        // actually delete an entire list from the database
-        var DeleteList = function (btnObj) {
-            var listid = $(btnObj).attr("id");
-            if (confirm(<?php echo xlj('WARNING'); ?> + ' - ' + <?php echo xlj('This action cannot be undone.'); ?> + '\n' + <?php echo xlj('Are you sure you wish to delete the entire list'); ?> + '(' + listid + ")?")) {
+            });
+
+            var SaveChanges = function () {
+                $("#formaction").val("save");
+                // $('#theform').submit();
+                mysubmit();
+            };
+
+            // show the DIV to create a new list
+            var NewList = function (btnObj) {
+                // show the field details DIV
+                $('#newlistdetail').css('visibility', 'visible');
+                $('#newlistdetail').css('display', 'block');
+                $(btnObj).parent().append($("#newlistdetail"));
+                $('#newlistdetail > #newlistname').focus();
+            };
+            // save the new list
+            var SaveNewList = function () {
+                // the list name can only have letters, numbers, spaces and underscores
+                // AND it cannot start with a number
+                if ($("#newlistname").val().match(/^\d+/)) {
+                    alert(<?php echo xlj('List names cannot start with numbers.'); ?>);
+                    return false;
+                }
+                var validname = $("#newlistname").val().replace(/[^A-za-z0-9 -]/g, "_"); // match any non-word characters and replace them
+                if (validname != $("#newlistname").val()) {
+                    if (!confirm(<?php echo xlj('Your list name has been changed to meet naming requirements.'); ?> +'\n' + <?php echo xlj('Please compare the new name'); ?> +', \'' + validname + '\' ' + <?php echo xlj('with the old name'); ?> +', \'' + $("#newlistname").val() + '\'.\n' + <?php echo xlj('Do you wish to continue with the new name?'); ?>)) {
+                        return false;
+                    }
+                }
+                $("#newlistname").val(validname);
+
                 // submit the form to add a new field to a specific group
-                $("#formaction").val("deletelist");
-                $("#deletelistname").val(listid);
+                $("#formaction").val("addlist");
                 $("#theform").submit();
+            };
+            // actually delete an entire list from the database
+            var DeleteList = function (btnObj) {
+                var listid = $(btnObj).attr("id");
+                if (confirm(<?php echo xlj('WARNING'); ?> +' - ' + <?php echo xlj('This action cannot be undone.'); ?> +'\n' + <?php echo xlj('Are you sure you wish to delete the entire list'); ?> +'(' + listid + ")?")) {
+                    // submit the form to add a new field to a specific group
+                    $("#formaction").val("deletelist");
+                    $("#deletelistname").val(listid);
+                    $("#theform").submit();
+                }
+            };
+            // save was successful, so show the success alert
+            let formSubmittedElement = document.getElementById('form_submitted');
+            if (formSubmittedElement) {
+                // Check if the form was successfully submitted
+                if (formSubmittedElement.value === 'true') {
+                    let msg = jsText('List submitted and saved successfully!');
+                    asyncAlertMsg(msg, 5000, 'success');
+                }
+            } else {
+                console.error("The element with id 'form_submitted' does not exist.");
             }
-        };
-    });
-
-    function getQueryStringAsObject() {
-        var paramsString = document.URL.split('?');
-        var paramsFull = (paramsString.length > 1) ? paramsString[1].split('&') : [];
-        var listIdCont = null;
-        var queryParameter;
-        var resObject = {};
-        for (var i = 0; i < paramsFull.length; i++ ) {
-            queryParameter = paramsFull[i].split('=');
-            resObject[queryParameter[0]] = queryParameter[1];
+        });
+
+        function getQueryStringAsObject() {
+            var paramsString = document.URL.split('?');
+            var paramsFull = (paramsString.length > 1) ? paramsString[1].split('&') : [];
+            var listIdCont = null;
+            var queryParameter;
+            var resObject = {};
+            for (var i = 0; i < paramsFull.length; i++) {
+                queryParameter = paramsFull[i].split('=');
+                resObject[queryParameter[0]] = queryParameter[1];
+            }
+            return resObject;
         }
-        return resObject;
-    }
 
-<?php
-if ($alertmsg) {
-    echo "    alert(" . js_escape($alertmsg) . ");\n";
-}
-?>
+        <?php
+        if (!empty($_POST['formaction']) && !$alertmsg) {
+            echo "document.getElementById('form_submitted').value = 'true';";
+            $savedFlag = false;
+        }
 
-</script>
+        if ($alertmsg) {
+            echo "alert(" . js_escape($alertmsg) . ");\n";
+        }
+        ?>
+    </script>
 </body>
 </html>
diff --git a/interface/usergroup/user_admin.php b/interface/usergroup/user_admin.php
index 950dbf8d050..1855918f24e 100644
--- a/interface/usergroup/user_admin.php
+++ b/interface/usergroup/user_admin.php
@@ -474,7 +474,7 @@ class="form-control" value="<?php echo attr($frow['id']); ?>"><?php echo text($f
 </td>
 </tr>
 <tr>
-<td><span class="text"><?php echo xlt('Weno Provider ID'); ?>: </span></td><td><input type="text" name="erxprid" style="width:150px;" class="form-control" value="<?php echo attr($iter["weno_prov_id"]); ?>"></td>
+<td><span class="text"><?php echo xlt('Weno User ID'); ?>: </span></td><td><input type="text" name="erxprid" style="width:150px;" class="form-control" value="<?php echo attr($iter["weno_prov_id"]); ?>"></td>
 <td><span class="text"><?php echo xlt('Google Email for Login'); ?>: </span></td><td><input type="text" name="google_signin_email" style="width:150px;" class="form-control" value="<?php echo attr($iter["google_signin_email"]); ?>"></td>
 </tr>
 
diff --git a/portal/import_template.php b/portal/import_template.php
index 557d21abf92..2a2ed145c78 100644
--- a/portal/import_template.php
+++ b/portal/import_template.php
@@ -24,11 +24,8 @@
 }
 
 $authUploadTemplates = AclMain::aclCheckCore('admin', 'forms');
-
 $templateService = new DocumentTemplateService();
-
 $patient = json_decode($_POST['upload_pid'] ?? '');
-
 $template_content = null;
 
 if (($_POST['mode'] ?? null) === 'save_profiles') {
diff --git a/portal/index.php b/portal/index.php
index 95438facdf2..bd9a9a70820 100644
--- a/portal/index.php
+++ b/portal/index.php
@@ -400,6 +400,17 @@ function validate_new_pass() {
             }
             return pass;
         }
+
+        document.addEventListener('DOMContentLoaded', function () {
+            const passInput = document.getElementById('pass');
+            const toggle = document.getElementById('password-icon');
+            toggle.addEventListener('click', function () {
+                const isPassword = passInput.getAttribute('type') === 'password';
+                passInput.setAttribute('type', isPassword ? 'text' : 'password');
+                this.classList.toggle('fa-eye');
+                this.classList.toggle('fa-eye-slash');
+            });
+        });
     </script>
 
     <?php if (!empty($GLOBALS['portal_two_pass_reset']) && !empty($GLOBALS['google_recaptcha_site_key']) && !empty($GLOBALS['google_recaptcha_secret_key']) && isset($_GET['requestNew'])) { ?>
@@ -414,30 +425,33 @@ function enableVerifyBtn() {
         ?>
     <?php } ?>
     <style>
-      body {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        height: 100vh;
-        margin: 0;
-      }
-      .login-wrapper {
-        width: 100%;
-        max-width: 800px;
-        margin: 30px 0px auto;
-        padding: 10px;
-        box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
-        border-radius: 10px;
-      }
-      .login-logo {
-        max-width: 60%;
-        height: auto;
-        text-align: center;
-      }
-      .login-title {
-        margin-bottom: 20px;
-        text-align: center;
-      }
+        body {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            margin: 0;
+        }
+
+        .login-wrapper {
+            width: 100%;
+            max-width: 800px;
+            margin: 30px 0px auto;
+            padding: 10px;
+            box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
+            border-radius: 10px;
+        }
+
+        .login-logo {
+            max-width: 60%;
+            height: auto;
+            text-align: center;
+        }
+
+        .login-title {
+            margin-bottom: 20px;
+            text-align: center;
+        }
     </style>
 </head>
 <body class="login">
@@ -551,24 +565,24 @@ function enableVerifyBtn() {
         <?php } else {
             ?> <!-- Main logon -->
         <div class="container-xl p-1">
-        <!-- Optionally show two logos, and in either order -->
+            <!-- Optionally show two logos, and in either order -->
             <?php if (($GLOBALS['secondary_portal_logo_position'] ?? null) == 'second') { ?>
                 <?php if ($GLOBALS['show_portal_primary_logo'] ?? null) { ?>
-                  <div class="img-fluid text-center"><img class="login-logo" src='<?php echo $logoSrc; ?>'></div>
+                    <div class="img-fluid text-center"><img class="login-logo" src='<?php echo $logoSrc; ?>'></div>
                 <?php } ?>
                 <?php if ($GLOBALS['extra_portal_logo_login'] ?? null) { ?>
-                  <div class="img-fluid text-center"><img class="login-logo" src='<?php echo $logo2ndSrc; ?>'></div>
+                    <div class="img-fluid text-center"><img class="login-logo" src='<?php echo $logo2ndSrc; ?>'></div>
                 <?php } ?>
-           <?php } else {
+            <?php } else {
                 if (($GLOBALS['secondary_portal_logo_position'] ?? null) == 'first') { ?>
                     <?php if ($GLOBALS['extra_portal_logo_login']) { ?>
                         <div class="img-fluid text-center"><img class="login-logo" src='<?php echo $logo2ndSrc; ?>'></div>
                     <?php } ?>
                     <?php if ($GLOBALS['show_portal_primary_logo'] ?? null) { ?>
-                       <div class="img-fluid text-center"><img class="login-logo" src='<?php echo $logoSrc; ?>'></div>
+                        <div class="img-fluid text-center"><img class="login-logo" src='<?php echo $logoSrc; ?>'></div>
                     <?php } ?>
-               <?php  } ?>
-           <?php } ?>
+                <?php } ?>
+            <?php } ?>
             <legend class="text-center bg-light text-dark pt-2 py-1"><h2><?php echo $GLOBALS['openemr_name'] . ' ' . xlt('Portal Login'); ?></h2></legend>
             <form class="mx-1" action="get_patient_info.php" method="POST" onsubmit="return process()">
                 <?php if (isset($redirectUrl)) { ?>
@@ -576,58 +590,65 @@ function enableVerifyBtn() {
                 <?php } ?>
                 <div class="form-group">
                     <label for="uname"><?php echo xlt('Username') ?></label>
-                        <input type="text" class="form-control" name="uname" id="uname" autocomplete="none" required />
-                    </div>
-                <div class="form-group">
-                    <label for="pass"><?php echo xlt('Password') ?></label>
-                        <input class="form-control" name="pass" id="pass" type="password" required autocomplete="none" />
+                    <input type="text" class="form-control" name="uname" id="uname" autocomplete="none" required />
+                </div>
+                    <div id="standard-auth-password" class="form-group">
+                        <label for="pass"><?php echo xlt('Password') ?></label>
+                        <div class="input-group">
+                            <input class="form-control" name="pass" id="pass" type="password" required autocomplete="none" />
+                            <div class="input-group-append">
+                                <span class="input-group-text">
+                                    <i class="fa fa-eye" id="password-icon" style="cursor: pointer;"></i>
+                                </span>
+                            </div>
+                        </div>
                     </div>
-                    <?php if ($GLOBALS['enforce_signin_email']) { ?>
+                <?php if ($GLOBALS['enforce_signin_email']) { ?>
                     <div class="form-group">
                         <label for="passaddon"><?php echo xlt('E-Mail Address') ?></label>
-                            <input class="form-control" name="passaddon" id="passaddon" type="email" autocomplete="none" />
-                        </div>
-                    <?php } ?>
-                    <?php if ($GLOBALS['language_menu_login']) { ?>
-                        <?php if (count($result3) != 1) { ?>
-                        <div class="form-group">
-                            <label for="selLanguage"><?php echo xlt('Language'); ?></label>
-                        <select class="form-control" id="selLanguage" name="languageChoice">
-                            <?php
-                            echo "<option selected='selected' value='" . attr($defaultLangID) . "'>" .
-                                text(xl('Default') . " - " . xl($defaultLangName)) . "</option>\n";
-                            foreach ($result3 as $iter) {
-                                if ($GLOBALS['language_menu_showall']) {
+                        <input class="form-control" name="passaddon" id="passaddon" type="email" autocomplete="none" />
+                    </div>
+                <?php } ?>
+                <?php if ($GLOBALS['language_menu_login']) { ?>
+                    <?php if (count($result3) != 1) { ?>
+                <div class="form-group">
+                    <label for="selLanguage"><?php echo xlt('Language'); ?></label>
+                    <select class="form-control" id="selLanguage" name="languageChoice">
+                        <?php
+                        echo "<option selected='selected' value='" . attr($defaultLangID) . "'>" .
+                            text(xl('Default') . " - " . xl($defaultLangName)) . "</option>\n";
+                        foreach ($result3 as $iter) {
+                            if ($GLOBALS['language_menu_showall']) {
+                                if (!$GLOBALS['allow_debug_language'] && $iter['lang_description'] == 'dummy') {
+                                    continue; // skip the dummy language
+                                }
+                                echo "<option value='" . attr($iter['lang_id']) . "'>" .
+                                    text($iter['trans_lang_description']) . "</option>\n";
+                            } else {
+                                if (in_array($iter['lang_description'], $GLOBALS['language_menu_show'])) {
                                     if (!$GLOBALS['allow_debug_language'] && $iter['lang_description'] == 'dummy') {
                                         continue; // skip the dummy language
                                     }
                                     echo "<option value='" . attr($iter['lang_id']) . "'>" .
                                         text($iter['trans_lang_description']) . "</option>\n";
-                                } else {
-                                    if (in_array($iter['lang_description'], $GLOBALS['language_menu_show'])) {
-                                        if (!$GLOBALS['allow_debug_language'] && $iter['lang_description'] == 'dummy') {
-                                            continue; // skip the dummy language
-                                        }
-                                        echo "<option value='" . attr($iter['lang_id']) . "'>" .
-                                            text($iter['trans_lang_description']) . "</option>\n";
-                                    }
                                 }
                             }
-                            ?>
-                        </select>
-                        <?php }
-                    } ?>
-                    </div>
-                    <div class="col col-md col-sm">
-                        <button class="btn btn-success btn-block" type="submit"><?php echo xlt('Log In'); ?></button>
-                        <?php if (!empty($GLOBALS['portal_onsite_two_register']) && !empty($GLOBALS['google_recaptcha_site_key']) && !empty($GLOBALS['google_recaptcha_secret_key'])) { ?>
-                            <button class="btn btn-secondary btn-block" onclick="location.replace('./account/verify.php?site=<?php echo attr_url($_SESSION['site_id']); ?>')"><?php echo xlt('Register'); ?></button>
-                        <?php } ?>
-                        <?php if (!empty($GLOBALS['portal_two_pass_reset']) && !empty($GLOBALS['google_recaptcha_site_key']) && !empty($GLOBALS['google_recaptcha_secret_key']) && isset($_GET['w']) && (isset($_GET['u']) || isset($_GET['p']))) { ?>
-                            <button class="btn btn-danger btn-block" onclick="location.replace('./index.php?requestNew=1&site=<?php echo attr_url($_SESSION['site_id']); ?><?php if (!empty($redirectUrl)) {
+                        }
+                        ?>
+                    </select>
+                    <?php }
+                } ?>
+                </div>
+                <div class="col col-md col-sm">
+                    <button class="btn btn-success btn-block" type="submit"><?php echo xlt('Log In'); ?></button>
+                    <?php if (!empty($GLOBALS['portal_onsite_two_register']) && !empty($GLOBALS['google_recaptcha_site_key']) && !empty($GLOBALS['google_recaptcha_secret_key'])) { ?>
+                        <button class="btn btn-secondary btn-block" onclick="location.replace('./account/verify.php?site=<?php echo attr_url($_SESSION['site_id']); ?>')"><?php echo xlt('Register'); ?></button>
+                    <?php } ?>
+                    <?php if (!empty($GLOBALS['portal_two_pass_reset']) && !empty($GLOBALS['google_recaptcha_site_key']) && !empty($GLOBALS['google_recaptcha_secret_key']) && isset($_GET['w']) && (isset($_GET['u']) || isset($_GET['p']))) { ?>
+                        <button class="btn btn-danger btn-block" onclick="location.replace('./index.php?requestNew=1&site=<?php echo attr_url($_SESSION['site_id']); ?><?php if (!empty($redirectUrl)) {
                                 echo "&redirect=" . attr_url($redirectUrl); } ?>')"><?php echo xlt('Reset Credentials'); ?></button>
-                        <?php } ?>
-                    </div>
+                    <?php } ?>
+                </div>
                 </fieldset>
                 <?php if (!(empty($hiddenLanguageField))) {
                     echo $hiddenLanguageField;
diff --git a/portal/lib/doc_lib.php b/portal/lib/doc_lib.php
index d757923c1e4..cc16962277b 100644
--- a/portal/lib/doc_lib.php
+++ b/portal/lib/doc_lib.php
@@ -51,11 +51,14 @@
 
 use Mpdf\Mpdf;
 use OpenEMR\Common\Csrf\CsrfUtils;
+use OpenEMR\Common\Database\QueryUtils;
 use OpenEMR\Pdf\PatientPortalPDFDocumentCreator;
 
+// portal doesn't need to be enabled to chart from documents
 if (!(isset($GLOBALS['portal_onsite_two_enable'])) || !($GLOBALS['portal_onsite_two_enable'])) {
-    echo xlt('Patient Portal is turned off');
-    exit;
+    $msg = xlt('Patient Portal is turned off');
+    error_log($msg);
+    echo $msg;
 }
 // confirm csrf (from both portal and core)
 if (!CsrfUtils::verifyCsrfToken($_POST["csrf_token_form"], 'doc-lib')) {
@@ -68,6 +71,40 @@
 $cpid = $_POST['cpid'] ?: $GLOBALS['pid'];
 $category = $_POST['catid'] ?? 0;
 
+
+if ($dispose == $_POST['audit_delete'] ?? null) {
+    if (!empty($_POST['delete_id']) && !empty($_POST['update_id'])) {
+        $deleteId = intval($_POST['delete_id']);
+        $updateId = intval($_POST['update_id']);
+        // Start a transaction
+        QueryUtils::startTransaction();
+        try {
+            // Update table_action to 'delete' and narrative to user deleted msg
+            $msg = xl("User deleted document");
+            $updateActivity = sqlQuery("UPDATE onsite_portal_activity SET action_taken_time = NOW(), table_action = 'delete', status = 'deleted', narrative = ? WHERE id = ?", [$msg, $updateId]);
+            $deleteDocument = sqlQuery("DELETE FROM onsite_documents WHERE id = ?", [$deleteId]);
+
+            if (!$updateActivity && !$deleteDocument) {
+                // Commit the transaction if both successful
+                QueryUtils::commitTransaction();
+                echo js_escape(['success' => true]);
+            } else {
+                // Rollback transaction on failure
+                QueryUtils::rollbackTransaction();
+                ;
+                echo js_escape(['success' => false, 'message' => 'Failed to update or delete record.']);
+            }
+        } catch (Exception $e) {
+            // Rollback on error
+            QueryUtils::rollbackTransaction();
+            echo js_escape(['success' => false, 'message' => $e->getMessage()]);
+        }
+    } else {
+        echo js_escape(['success' => false, 'message' => 'Failed Action']);
+    }
+    exit;
+}
+
 try {
     if (!$category) {
         $result = sqlQuery("SELECT id FROM categories WHERE name LIKE ?", array("Reviewed"));
diff --git a/portal/lib/download_template.php b/portal/lib/download_template.php
index 02e728603d6..2362a81d31a 100644
--- a/portal/lib/download_template.php
+++ b/portal/lib/download_template.php
@@ -5,7 +5,7 @@
  *
  * @package OpenEMR
  * @author  Jerry Padgett <sjpadgett@gmail.com>
- * Copyright (C) 2023 Jerry Padgett <sjpadgett@gmail.com>
+ * Copyright (C) 2023-2024 Jerry Padgett <sjpadgett@gmail.com>
  * @link    http://www.open-emr.org
  */
 
diff --git a/portal/patient/libs/Controller/AppBasePortalController.php b/portal/patient/libs/Controller/AppBasePortalController.php
index 374ee803206..c8efffe2ff3 100644
--- a/portal/patient/libs/Controller/AppBasePortalController.php
+++ b/portal/patient/libs/Controller/AppBasePortalController.php
@@ -20,7 +20,7 @@
  */
 class AppBasePortalController extends PortalController
 {
-    static $DEFAULT_PAGE_SIZE = 20;
+    static $DEFAULT_PAGE_SIZE = 25;
 
     /**
      * Init is called by the base controller before the action method
diff --git a/portal/patient/libs/Controller/OnsiteDocumentController.php b/portal/patient/libs/Controller/OnsiteDocumentController.php
index 972976ed0b5..5ccee270993 100644
--- a/portal/patient/libs/Controller/OnsiteDocumentController.php
+++ b/portal/patient/libs/Controller/OnsiteDocumentController.php
@@ -118,6 +118,11 @@ public function Query()
                 $criteria->Id_Equals = $recid;
             }
 
+            $exc = RequestUtil::Get('showActive');
+            if ($exc != 'true') {
+                $criteria->DenialReason_IsNotLike = 'Locked';
+            }
+
             $filter = RequestUtil::Get('filter');
             if ($filter) {
                 $criteria->AddFilter(
@@ -143,9 +148,12 @@ public function Query()
 
             // if a sort order was specified then specify in the criteria
             $output->orderBy = RequestUtil::Get('orderBy');
+            $output->orderBy = $output->orderBy ? $output->orderBy : 'DenialReason';
             $output->orderDesc = RequestUtil::Get('orderDesc') != '';
             if ($output->orderBy) {
                 $criteria->SetOrder($output->orderBy, $output->orderDesc);
+                $output->orderBy = 'ReviewDate';
+                $criteria->SetOrder($output->orderBy, $output->orderDesc);
             }
 
             $page = RequestUtil::Get('page');
diff --git a/portal/patient/scripts/app/onsiteactivityviews.js b/portal/patient/scripts/app/onsiteactivityviews.js
index 20cf6f1657f..2fe2c8dab77 100644
--- a/portal/patient/scripts/app/onsiteactivityviews.js
+++ b/portal/patient/scripts/app/onsiteactivityviews.js
@@ -9,8 +9,7 @@
  * @copyright Copyright (c) 2016-2017 Jerry Padgett <sjpadgett@gmail.com>
  * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
  */
-var actpage = {
-
+const actpage = {
     onsiteActivityViews: new model.OnsiteActivityViewCollection(),
     collectionView: null,
     onsiteActivityView: null,
@@ -26,7 +25,9 @@ var actpage = {
         if (actpage.isInitialized || actpage.isInitializing) return;
         actpage.isInitializing = true;
 
-        if (!$.isReady && console) console.warn('page was initialized before dom is ready.  views may not render properly.');
+        if (!$.isReady && console) {
+            console.warn('page was initialized before dom is ready.  views may not render properly.');
+        }
 
         // make the return button clickable
         $("#returnHome").click(function (e) {
@@ -35,11 +36,10 @@ var actpage = {
         });
 
         function showPaymentModal(cpid, recid) {
-            var title = 'Patient Online Payment';
-            var params = {
+            let title = 'Patient Online Payment';
+            let params = {
                 buttons: [
                     {text: 'Help', close: false, style: 'info btn-sm', id: 'formHelp'},
-                    {text: 'Cancel', close: true, style: 'secondary btn-sm'},
                     {text: 'Done', style: 'danger btn-sm', close: true}],
                 onClosed: 'reload',
                 type: 'GET',
@@ -49,8 +49,8 @@ var actpage = {
         }
 
         function showProfileModal(cpid) {
-            var title = 'Profile Edits' + ' ';
-            var params = {
+            let title = 'Profile Edits' + ' ';
+            let params = {
                 buttons: [
                     {text: 'Help', close: false, style: 'info btn-sm', id: 'formHelp'},
                     {text: 'Cancel', close: true, style: 'default btn-sm'},
@@ -66,11 +66,10 @@ var actpage = {
         }
 
         function showDocumentModal(cpid, recid) {
-            var title = 'Audit Document';
-            var params = {
+            let title = 'Audit Document';
+            let params = {
                 buttons: [
                     {text: 'Help', close: false, style: 'info btn-sm', id: 'formHelp'},
-                    {text: 'Cancel', close: true, style: 'default btn-sm'},
                     {text: 'Done', style: 'danger btn-sm', close: true}],
                 sizeHeight: 'full',
                 onClosed: 'reload',
@@ -95,17 +94,61 @@ var actpage = {
 
         // make the rows clickable ('rendered' is a custom event, not a standard backbone event)
         this.collectionView.on('rendered', function () {
+            document.querySelectorAll('.delete-button').forEach(function (button) {
+                button.addEventListener('click', function (event) {
+                    event.preventDefault();
+                    const updateId = this.getAttribute('data-update-id');
+                    const deleteId = this.getAttribute('data-delete-id');
+                    const url = '../lib/doc_lib.php';
+
+                    if (confirm(jsText('Are you sure you want to delete this audit?\nThis action cannot be undone.'))) {
+                        // Create a FormData object to hold POST data
+                        let formData = new FormData();
+                        formData.append('dispose', 'audit_delete');
+                        formData.append('update_id', updateId);
+                        formData.append('delete_id', deleteId);
+                        formData.append('csrf_token_form', csrfToken);
+
+                        fetch(url, {
+                            method: 'POST',
+                            body: formData
+                        })
+                        .then(response => response.json())
+                        .then(data => {
+                            if (data.success) {
+                                this.closest('tr').remove();
+                            } else {
+                                alert('Error deleting document: ' + jsText(data.message));
+                            }
+                        })
+                        .catch(error => {
+                            alert('An error occurred: ' + jsText(error.message));
+                        });
+
+                        return false; // Stop the event propagation
+                    }
+                    return false;
+                });
+            });
+
             // attach click handler to the table rows for selection
             $('table.collection tbody tr').click(function (e) {
                 e.preventDefault();
-                var m = actpage.onsiteActivityViews.get(this.id);
-                var cpid = m.get('patientId');
-                var activity = m.get('activity');
+                // ignore event on the last cell (the delete button)
+                if ($(e.target).closest('td').is($(this).find('td').last())) {
+                    return;
+                }
+
+                let m = actpage.onsiteActivityViews.get(this.id);
+                let cpid = m.get('patientId');
+                let activity = m.get('activity');
                 let eventData = {
                     activity: activity
                     , cpid: cpid
                     , modelAttributes: m.attributes
                 };
+
+                // this is a custom event that will bubble up to the window
                 let node = document.createElement("tr");
                 // note this is a synchronous operation! event consumers should not do anything that takes a long time
                 // or they should fire off async work and return immediately
@@ -116,29 +159,26 @@ var actpage = {
                     return;
                 }
 
-                if (activity == 'document') {
+                if (activity === 'document') {
                     let recid = m.get('tableArgs');
                     showDocumentModal(cpid, recid);
-                } else if (activity == 'profile') {
+                } else if (activity === 'profile') {
                     showProfileModal(cpid);
-                } else if (activity == 'payment') {
+                } else if (activity === 'payment') {
                     let recid = m.get('id');
                     showPaymentModal(cpid, recid);
                 }
             });
-
             // make the headers clickable for sorting
             $('table.collection thead tr th').click(function (e) {
                 e.preventDefault();
-                var prop = this.id.replace('header_', '');
-
+                let prop = this.id.replace('header_', '');
                 // toggle the ascending/descending before we change the sort prop
                 actpage.fetchParams.orderDesc = (prop == actpage.fetchParams.orderBy && !actpage.fetchParams.orderDesc) ? '1' : '';
                 actpage.fetchParams.orderBy = prop;
                 actpage.fetchParams.page = 1;
                 actpage.fetchOnsiteActivityViews(actpage.fetchParams);
             });
-
             // attach click handlers to the pagination controls
             $('.pageButton').click(function (e) {
                 e.preventDefault();
@@ -158,7 +198,6 @@ var actpage = {
         });
 
         this.modelView.templateEl = $("#onsiteActivityViewModelTemplate");
-
         if (model.longPollDuration > 0) {
             setInterval(function () {
 
@@ -285,6 +324,5 @@ var actpage = {
             $('#deleteOnsiteActivityViewButtonContainer').hide();
         }
     },
-
 };
 
diff --git a/portal/patient/scripts/app/onsitedocuments.js b/portal/patient/scripts/app/onsitedocuments.js
index 50933d9095e..6f436018b68 100644
--- a/portal/patient/scripts/app/onsitedocuments.js
+++ b/portal/patient/scripts/app/onsitedocuments.js
@@ -19,7 +19,7 @@ var page = {
     isInitializing: false,
     isSaved: true,
     isNewDoc: false,
-    fetchParams: {filter: '', orderBy: '', orderDesc: '', page: 1, patientId: cpid, recid: recid},
+    fetchParams: {filter: '', orderBy: '', orderDesc: '', page: 1, patientId: cpid, recid: 0, showActive: false},
     fetchInProgress: false,
     dialogIsOpen: false,
     isLocked: false,
@@ -43,11 +43,20 @@ var page = {
             return;
         }
         page.isInitializing = true;
+        localStorage.setItem('showActive', 'false');
+
+        if (page.isDashboard) {
+            page.fetchParams.recid = recid;
+        }
 
         if (!$.isReady && console) {
             console.warn('page was initialized before dom is ready.  views may not render properly.');
         }
 
+        if (isModule) {
+            $("#sendTemplate").hide();
+            $("#saveTemplate").hide();
+        }
         // make the new button clickable
         $("#newOnsiteDocumentButton").click(function (e) {
             e.preventDefault();
@@ -104,6 +113,17 @@ var page = {
                     parent.document.getElementById('topNav').classList.add('collapse');
                 }
             });
+            $(document).ready(function () {
+                const showActive = localStorage.getItem('showActive') === 'true';
+                $('#active-checkbox').prop('checked', showActive);
+                page.fetchParams.showActive = showActive;
+                $('#active-checkbox').unbind().on('click', '', function (e) {
+                    const showActive = $(this).is(':checked');
+                    localStorage.setItem('showActive', showActive);
+                    page.fetchParams.showActive = showActive;
+                    page.fetchOnsiteDocuments(page.fetchParams);
+                });
+            });
             page.isInitialized = true;
             page.isInitializing = false;
             // if dashboard let's open first doc for review.
@@ -112,6 +132,9 @@ var page = {
             }
         });
 // ---------  Get Collection ------------------------//
+        const showActive = localStorage.getItem('showActive') === 'true';
+        $('#active-checkbox').prop('checked', showActive);
+        page.fetchParams.showActive = showActive;
         this.fetchOnsiteDocuments(page.fetchParams);
 
         // initialize the model view
@@ -209,7 +232,14 @@ var page = {
                 $("#sendTemplate").hide();
                 $("#downloadTemplate").hide();
                 isModule ? $(".dismissOnsiteDocumentButton").show() : $(".dismissOnsiteDocumentButton").hide();
-                ((isModule || page.isFrameForm) && !page.isLocked) ? $("#saveTemplate").show() : $("#saveTemplate").hide();
+                if ((isModule || page.isFrameForm || page.isDashboard) && !page.isLocked && page.currentName !== 'Help') {
+                    $("#saveTemplate").show()
+                    $("#chartTemplate").show();
+                } else {
+                    $("#chartTemplate").hide();
+                    $("#saveTemplate").hide();
+
+                }
                 isModule ? $("#homeTemplate").show() : $("#homeTemplate").hide();
                 (page.encounterFormName === 'HIS' && !page.isLocked) ? $("#chartHistory").show() : $("#chartHistory").hide();
 
@@ -219,7 +249,7 @@ var page = {
                         let formFrame = document.getElementById('encounterForm');
                         $(window).one("message onmessage", (e) => {
                             if (event.origin !== window.location.origin) {
-                                signerAlertMsg("Remote is not same origin!", 15000);
+                                asyncAlertMsg("Remote is not same origin!", 15000);
                                 return false;
                             }
                             if (isModule || page.isFrameForm) {
@@ -237,7 +267,7 @@ var page = {
                             } else {
                                 // first, ensure form name is valid
                                 if (!page.verifyValidEncounterForm(page.encounterFormName)) {
-                                    signerAlertMsg("There is an issue loading form. Form does not exist.");
+                                    asyncAlertMsg("There is an issue loading form. Form does not exist.");
                                     return false;
                                 }
                                 url = webroot_url +
@@ -289,7 +319,7 @@ var page = {
                         // we don't want events piling up so this is a one shot.
                         $(window).one("message onmessage", (e) => {
                             if (event.origin !== window.location.origin) {
-                                signerAlertMsg("Remote is not same origin!)", 15000);
+                                asyncAlertMsg("Remote is not same origin!)", 15000);
                                 return false;
                             }
                             if (isModule || page.isFrameForm) {
@@ -307,7 +337,7 @@ var page = {
                             } else {
                                 // first, ensure form name is valid
                                 if (!page.verifyValidEncounterForm(page.encounterFormName)) {
-                                    signerAlertMsg("There is an issue loading form. Form does not exist.");
+                                    asyncAlertMsg("There is an issue loading form. Form does not exist.");
                                     return false;
                                 }
                                 url = webroot_url +
@@ -338,7 +368,7 @@ var page = {
                                     templateContents = templateContents.replace(/(<\/iframe>)/g, '')
                                     documentContents = templateContents.replace(/(<iframe[^>]+>)/g, documentContents);
                                     $("#content").val(documentContents);
-                                    signerAlertMsg("Waiting for Download.", 6500, "info");
+                                    asyncAlertMsg("Waiting for Download.", 6500, "info");
                                     $("#template").submit();
                                     page.renderModelView(false);
                                 }
@@ -356,7 +386,7 @@ var page = {
                         let documentContents = document.getElementById('templatecontent').innerHTML;
                         $("#content").val(documentContents);
                         $("#template").submit();
-                        signerAlertMsg('Downloading Document!', 1000, 'success', 'lg');
+                        asyncAlertMsg('Downloading Document!', 1000, 'success', 'lg');
                         page.renderModelView(false);
                     }
                 });
@@ -381,7 +411,7 @@ var page = {
                     page.encounterFormId = 0;
                     $(window).one("message onmessage", (e) => {
                         if (event.origin !== window.location.origin) {
-                            signerAlertMsg("Remote is not same origin!)", 15000);
+                            asyncAlertMsg("Remote is not same origin!)", 15000);
                             return false;
                         }
                         model.reloadCollectionOnModelUpdate = false;
@@ -418,7 +448,7 @@ var page = {
                     let frameDocument = formFrame.contentDocument || formFrame.contentWindow.document;
                     $(window).one("message onmessage", (e) => {
                         if (event.origin !== window.location.origin) {
-                            signerAlertMsg("Remote is not same origin!)", 15000);
+                            asyncAlertMsg("Remote is not same origin!)", 15000);
                             return false;
                         }
                         model.reloadCollectionOnModelUpdate = false;
@@ -474,7 +504,7 @@ var page = {
                     page.encounterFormId = 0;
                     $(window).one("message onmessage", (e) => {
                         if (event.origin !== window.location.origin) {
-                            signerAlertMsg("Remote is not same origin!)", 15000);
+                            asyncAlertMsg("Remote is not same origin!)", 15000);
                             return false;
                         }
                         // cool it just in case then save history to chart.
@@ -500,14 +530,17 @@ var page = {
         // These are set on init for save alerts
         page.isFlattened = false;
         page.isSaved = true;
-         $(window).bind('beforeunload', function () {
-             if (!page.isSaved) {
-                 // You have unsaved changes auto browser popup
-                 event.preventDefault();
-                 event.returnValue = '';
-             }
-         });
+
         page.formOrigin = isPortal ? 0 : isModule ? 2 : 1;
+
+       /* Broke in FF!
+       $(window).bind('beforeunload', function () {
+            if (!page.isSaved) {
+                // You have unsaved changes auto browser popup
+                event.preventDefault();
+                event.returnValue = '';
+            }
+        });*/
     },
 // page scoped functions
     verifyValidEncounterForm: function (form) {
@@ -527,7 +560,6 @@ var page = {
         historyHide.toggleClass('d-none');
         if (historyHide.hasClass('d-none')) {
             $('.modelContainer').removeClass("d-none");
-            //document.getElementById('verytop').scrollIntoView({behavior: 'smooth'})
         } else {
             $('.modelContainer').addClass("d-none");
         }
@@ -535,8 +567,11 @@ var page = {
     /**
      * Fetch the passed in document id in editing status
      * @param id the document id in edit mode from history
+     * @param pid
+     * @param user
+     * @param templateName
      */
-    editHistoryDocument: function (id) {
+    editHistoryDocument: function (id, pid, user, templateName) {
         let m = page.onsiteDocuments.get(id);
         page.showDetailDialog(m);
     },
@@ -548,7 +583,7 @@ var page = {
         $("#docid").val(docid);
         $("#handler").val('chart');
         $("#status").val('charted');
-        signerAlertMsg(alertMsg1, 3000, "warning");
+        asyncAlertMsg(alertMsg1, 3000, "warning");
         let posting = $.post("./../lib/doc_lib.php", {
             csrf_token_form: csrfTokenDoclib,
             cpid: cpid,
@@ -586,7 +621,6 @@ var page = {
         } else {
             page.postTemplate(documentContents);
         }
-
     },
     /**
      * Fetch the collection data from the server
@@ -654,7 +688,11 @@ var page = {
             $("#saveTemplate").hide();
             $("#sendTemplate").hide();
             $("#submitTemplate").hide();
-            $('#idShow').removeClass('d-none');
+            if (isPortal) {
+                $('#idShow').removeClass('d-none');
+            } else {
+                $('#idShow').addClass('d-none');
+            }
             $(".dismissOnsiteDocumentButton").addClass("d-none");
         } else {
             $('#idShow').addClass('d-none');
@@ -681,7 +719,7 @@ var page = {
                 if ((m = regex.exec(templateContents)) !== null) {
                     page.encounterFormName = m[2];
                 } else {
-                    signerAlertMsg("There is an issue loading document. Missing Name Error.");
+                    asyncAlertMsg("There is an issue loading document. Missing Name Error.");
                     return false;
                 }
                 templateContents = templateContents.replace(/(isPortal=)\d/, "isPortal=" + isPortal);
@@ -706,7 +744,7 @@ var page = {
             });
             if (page.onsiteDocument.get('denialReason') === 'Locked') {
                 $("#sendTemplate").hide();
-                signerAlertMsg("History Document. Edits unavailable", 2000, 'warning');
+                asyncAlertMsg("History Document. Edits unavailable", 2000, 'warning');
             }
             initSignerApi();
         } else { // this makes it a new template
@@ -724,8 +762,16 @@ var page = {
                     $('#templatecontent').html(templateHtml);
                     if (templateHtml.includes('Error') && (autoRender + auditRender) > 0) {
                         autoRender = auditRender = 0;
-                        $("#Help").click();
-                        signerAlertMsg("Onetime document is no longer available!" + "<br />" +templateHtml, 5000, 'warning');
+                        asyncAlertMsg("Onetime document is no longer available!" + "<br />" + templateHtml, 5000, 'warning')
+                        .then(r => {
+                            $("#Help").click();
+                        });
+                        return false;
+                    } else if (templateHtml.includes('Error')) {
+                        asyncAlertMsg(jsText("Sorry!") + " " + jsText(templateHtml) + "<br />" + jsText("Try to uncheck Activity table Show All."), 5000, 'danger')
+                        .then(r => {
+                            $("#Help").click();
+                        });
                         return false;
                     }
                     page.version = $("#portal_version").val() ? $("#portal_version").val() : 'Legacy';
@@ -762,7 +808,7 @@ var page = {
                                         // iframe from template directive {EncounterDocument:xxxxx} for a native form
                                         // first, ensure form name is valid
                                         if (!page.verifyValidEncounterForm(page.encounterFormName)) {
-                                            signerAlertMsg("There is an issue loading form. Form does not exist.");
+                                            asyncAlertMsg("There is an issue loading form. Form does not exist.");
                                             return false;
                                         }
                                         url = webRoot + "/interface/forms/" + encodeURIComponent(page.encounterFormName) + "/new.php" +
@@ -796,9 +842,9 @@ var page = {
         if (cnt !== -1) {
             cdate = cdate.toString().substring(0, cnt);
         }
-        $(document).one('change','body *',function(){
+        $(document).one('change', 'body *', function () {
             page.isSaved = false;
-            $(document).off('change','body *');
+            $(document).off('change', 'body *');
         });
         if (page.currentName !== 'Help') {
             $('#docPanelHeader').append('<span class="bg-light text-dark px-1">' + jsText(currentNameStyled) + '</span>' +
@@ -819,7 +865,7 @@ var page = {
             page.onsiteDocument.fetch({
                 success: function () {
                     if (page.isDashboard || page.onsiteDocument.get('denialReason') === 'Locked') {
-                        if (page.isDashboard) {
+                        if (page.isDashboard || isModule) {
                             page.renderModelView(true); // allow admin to delete
                         } else {
                             page.renderModelView(false);
@@ -896,7 +942,7 @@ var page = {
         let ptsignature = $('#patientSignature').attr('src');
         if (ptsignature == signhere) {
             if (page.signaturesRequired && page.presentPatientSignature) {
-                signerAlertMsg(signMsg, 6000, 'danger');
+                asyncAlertMsg(signMsg, 6000, 'danger');
                 return false;
             }
             ptsignature = "";
@@ -977,7 +1023,7 @@ var page = {
                     page.fetchOnsiteDocuments(page.fetchParams, true);
                     page.showDetailDialog(page.onsiteDocument);
                 }
-                signerAlertMsg(msgSuccess, 2000, 'success');
+                asyncAlertMsg(msgSuccess, 2000, 'success');
                 if (page.isCharted && isModule) {
                     $("#a_docReturn").click();
                     return;
@@ -1005,7 +1051,7 @@ var page = {
         page.onsiteDocument.destroy({
             wait: true,
             success: function () {
-                signerAlertMsg(msgDelete, 2000, 'success');
+                asyncAlertMsg(msgDelete, 2000, 'success');
                 app.hideProgress('modelLoader');
                 pageAudit.onsitePortalActivity.set('status', 'deleted');
                 pageAudit.onsitePortalActivity.set('pendingAction', 'none');
diff --git a/portal/patient/scripts/view.js b/portal/patient/scripts/view.js
index 402a32cd8b9..a80567be318 100644
--- a/portal/patient/scripts/view.js
+++ b/portal/patient/scripts/view.js
@@ -13,17 +13,22 @@ var view = {
 
 	/**
 	 * Given an object with properties totalPages and currentPage, return
-	 * HTML page navigator
+	 * HTML page
 	 */
-	getPaginationHtml: function(page)
+	getPaginationHtml: function(page, top=false)
 	{
-		var html = '';
+		let html = '';
 		if (page.totalPages > 1) {
-			html += '<div class="pagination"><ul>';
-
-			var first = 1;
-			var last = (1 * page.totalPages);
+			if (top) {
+				html += `<span aria-label="Page navigation">
+                    <span class="pagination float-left m-0 mb-1">`;
+			} else {
+				html += `<span aria-label="Page navigation">
+                    <span class="pagination float-right">`;
+			}
 
+			let first = 1;
+			let last = page.totalPages;
 			if (last > 10) {
 				first = (1 * page.currentPage) - 5;
 				first = first > 1 ? first : 1;
@@ -32,24 +37,40 @@ var view = {
 			}
 
 			if (first > 1) {
-				html += '<li><a class="pageButton" id="page-' + (first - 1) + '" href="#">&laquo;</a></li>';
+				html += '<li><a class="pageButton btn btn-sm btn-outline-secondary" id="page-' + (first - 1) + '" href="#">&laquo;</a></li>';
 			}
-
-			for (var i = first; i <= last; i++) {
+			for (let i = first; i <= last; i++) {
 				html += '<li' + (page.currentPage == i ? ' class="active"' : '') + '>'
-					+ '<a class="pageButton" id="page-' + i + '" href="#">'
+					+ '<a class="pageButton btn btn-sm btn-outline-secondary" id="page-' + i + '" href="#">'
 					+ i + '</a></li>';
 			}
 
 			if (last < (1 * page.totalPages) ) {
-				html += '<li><a class="pageButton" id="page-' + (last+1) + '" href="#">&raquo;</a></li>';
+				html += '<li><a class="pageButton btn btn-sm btn-outline-secondary" id="page-' + (last+1) + '" href="#">&raquo;</a></li>';
 			}
-			html += '</ul></div>';
+
+			html += `</span></span>`;
 		}
 
 		return html;
 	},
 
+	sortTableWithActiveFilterHtml: (isActiveOnly) => {
+		const generateActiveCheckbox = () => {
+			const showActive = localStorage.getItem('showActive') === 'true';
+			return `<span class="show-active-filter">
+                <label>
+                    <input type="checkbox" id="active-checkbox" class="active-only-checkbox" ${isActiveOnly ? 'checked' : ''}>
+                    ${showActive ? '(' + jsText("Show Active Status") + ')' : '(' + jsText("Show All") + ')'}
+                </label>
+            </span>`;
+		};
+
+		return `<span class="table-active-filter float-right">
+            ${generateActiveCheckbox()}
+    </span>`;
+	},
+
 	/**
 	 * CollectionView implements a generic view for rendering collections
 	 * Note that the property templateEl must be set after instantiation
diff --git a/portal/patient/templates/OnsiteActivityViewListView.tpl.php b/portal/patient/templates/OnsiteActivityViewListView.tpl.php
index 5d633a80fdb..e5b24f32e7f 100644
--- a/portal/patient/templates/OnsiteActivityViewListView.tpl.php
+++ b/portal/patient/templates/OnsiteActivityViewListView.tpl.php
@@ -6,7 +6,7 @@
  * @package   OpenEMR
  * @link      https://www.open-emr.org
  * @author    Jerry Padgett <sjpadgett@gmail.com>
- * @copyright Copyright (c) 2016-2023 Jerry Padgett <sjpadgett@gmail.com>
+ * @copyright Copyright (c) 2016-2024 Jerry Padgett <sjpadgett@gmail.com>
  * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
  */
 
@@ -14,6 +14,7 @@
 $this->assign('nav', 'onsiteactivityviews');
 
 use OpenEMR\Common\Acl\AclMain;
+use OpenEMR\Common\Csrf\CsrfUtils;
 
 if (!AclMain::aclCheckCore('patientportal', 'portal')) {
     die(xlt("Unauthorized"));
@@ -23,12 +24,15 @@
 echo "<script>var cuser='" . $this->cuser . "';</script>";
 ?>
 <script>
+    let csrfToken = <?php echo js_url(CsrfUtils::collectCsrfToken()); ?>;
     $LAB.script("<?php echo $GLOBALS['web_root']; ?>/portal/patient/scripts/app/onsiteactivityviews.js?v=<?php echo $GLOBALS['v_js_includes']; ?>").wait(function(){
         $(function () {
             actpage.init();
         });
         setTimeout(function(){
-            if (!actpage.isInitialized) actpage.init();
+            if (!actpage.isInitialized) {
+                actpage.init();
+            }
         },1000);
     });
 </script>
@@ -54,17 +58,21 @@
         <table class="collection table table-sm table-bordered table-hover">
         <thead>
             <tr>
+                <th id="header_Id"><?php echo xlt('Id') ?><% if (actpage.orderBy == 'Id') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
                 <th id="header_Date"><?php echo xlt('Date')?><% if (actpage.orderBy == 'Date') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
                 <th id="header_PatientId"><?php echo xlt('Patient Id')?><% if (actpage.orderBy == 'PatientId') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
-                <th id="header_Fname"><?php echo xlt('First{{Name}}')?><% if (actpage.orderBy == 'Fname') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
-                <th id="header_Mname"><?php echo xlt('Middle{{Name}}')?><% if (actpage.orderBy == 'Mname') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
-                <th id="header_Lname"><?php echo xlt('Last{{Name}}')?><% if (actpage.orderBy == 'Lname') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
-                <th id="header_Narrative"><?php echo xlt('Narrative')?><% if (actpage.orderBy == 'Narrative') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
-                <th id="header_Activity"><?php echo xlt('Activity')?><% if (actpage.orderBy == 'Activity') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
-                <th id="header_RequireAudit"><?php echo xlt('Require Audit')?><% if (actpage.orderBy == 'RequireAudit') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
-                <th id="header_PendingAction"><?php echo xlt('Pending Action')?><% if (actpage.orderBy == 'PendingAction') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
+                <th id="header_Fname"><?php echo xlt('First{{Name}}') ?><% if (actpage.orderBy == 'Fname') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
+                <th id="header_Mname"><?php echo xlt('Middle{{Name}}') ?><% if (actpage.orderBy == 'Mname') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
+                <th id="header_Lname"><?php echo xlt('Last{{Name}}') ?><% if (actpage.orderBy == 'Lname') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
+                <th id="header_Narrative"><?php echo xlt('Narrative') ?><% if (actpage.orderBy == 'Narrative') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
+                <th id="header_Activity"><?php echo xlt('Activity') ?><% if (actpage.orderBy == 'Activity') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
+                <th id="header_TableArgs"><?php echo xlt('RecId') ?><% if (actpage.orderBy == 'TableArgs') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
+                <th id="header_PendingAction"><?php echo xlt('Pending Action') ?><% if (actpage.orderBy == 'PendingAction') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
                 <th id="header_Status"><?php echo xlt('Status')?><% if (actpage.orderBy == 'Status') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
-<!-- UNCOMMENT TO SHOW ADDITIONAL COLUMNS - Leave in place for future use
+                <th><?php echo xlt('Action') ?></th>
+
+                <!-- UNCOMMENT TO SHOW ADDITIONAL COLUMNS - Leave in place for future use
+                <th id="header_RequireAudit"><?php //echo xlt('Require Audit') ?><% if (actpage.orderBy == 'RequireAudit') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
                 <th id="header_Id">Id<% if (actpage.orderBy == 'Id') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
                 <th id="header_ActionTaken">Action Taken<% if (actpage.orderBy == 'ActionTaken') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
                 <th id="header_TableAction">Table Action<% if (actpage.orderBy == 'TableAction') { %> <i class='icon-arrow-<%= actpage.orderDesc ? 'up' : 'down' %>' /><% } %></th>
@@ -99,6 +107,7 @@
         <tbody>
         <% items.each(function(item) { %>
             <tr id="<%= _.escape(item.get('id')) %>">
+                <td><%= _.escape(item.get('id') || '') %></td>
                 <td><%if (item.get('date')) { %><%= moment(app.parseDate(item.get('date'))).format('MMM D, YYYY h:mm A') %><% } else { %>NULL<% } %></td>
                 <td><%= _.escape(item.get('patientId') || '') %></td>
                 <td><%= _.escape(item.get('fname') || '') %></td>
@@ -106,9 +115,10 @@
                 <td><%= _.escape(item.get('lname') || '') %></td>
                 <td><%= _.escape(item.get('narrative') || '') %></td>
                 <td><%= _.escape(item.get('activity') || '') %></td>
-                <td><%= _.escape(item.get('requireAudit') || '') %></td>
+                <td><%= _.escape(item.get('tableArgs') || '') %></td>
                 <td><%= _.escape(item.get('pendingAction') || '') %></td>
                 <td><%= _.escape(item.get('status') || '') %></td>
+                <td><button class="delete-button btn btn-sm btn-link" data-update-id=<%= _.escape(item.get('id') || '') %> data-delete-id=<%= _.escape(item.get('tableArgs') || '') %>><i class="fa fa-trash text-danger"></i></button></td>
 <!-- UNCOMMENT TO SHOW ADDITIONAL COLUMNS - Leave in place for future use
                 <td><%= _.escape(item.get('id') || '') %></td>
                 <td><%= _.escape(item.get('actionTaken') || '') %></td>
diff --git a/portal/patient/templates/OnsiteDocumentListView.tpl.php b/portal/patient/templates/OnsiteDocumentListView.tpl.php
index e0232d6ea76..9a15af348ac 100644
--- a/portal/patient/templates/OnsiteDocumentListView.tpl.php
+++ b/portal/patient/templates/OnsiteDocumentListView.tpl.php
@@ -82,8 +82,10 @@
     echo "<script>var cpid=" . js_escape($pid) . ";var cuser=" . js_escape($cuser) . ";var ptName=" . js_escape($ptName) .
         ";var autoRender=" . js_escape($auto_render) . ";var auditRender=" . js_escape($audit_render) . ";var renderDocumentName=" . js_escape($auto_render_name) .
         ";var catid=" . js_escape($category) . ";var catname=" . js_escape($catname) . ";</script>";
-    echo "<script>var recid=" . js_escape($recid) . ";var docid=" . js_escape($docid) . ";var isNewDoc=" . js_escape($isnew) . ";var newFilename=" . js_escape($new_filename) . ";var help_id=" . js_escape($help_id) . ";</script>";
-    echo "<script>var isPortal=" . js_escape($is_portal) . ";var isModule=" . js_escape($is_module) . ";var webRoot=" . js_escape($webroot) . ";var doc_edit=" . js_escape($doc_edit) . ";var webroot_url = webRoot;</script>";
+    echo "<script>var recid=" . js_escape($recid) . ";var docid=" . js_escape($docid) . ";var isNewDoc=" . js_escape($isnew) . ";var newFilename=" . js_escape($new_filename) .
+        ";var help_id=" . js_escape($help_id) . ";</script>";
+    echo "<script>var isPortal=" . js_escape($is_portal) . ";var isModule=" . js_escape($is_module) . ";var isDashboard=" . js_escape($is_dashboard) .
+        ";var webRoot=" . js_escape($webroot) . ";var doc_edit=" . js_escape($doc_edit) . ";var webroot_url = webRoot;</script>";
     echo "<script>var csrfTokenDoclib=" . $csrf_php . ";</script>";
     // translations
     echo "<script>var alertMsg1='" . xlt("Saved to Patient Documents") . '->' . xlt("Category") . ": " . attr($catname) . "';</script>";
@@ -148,7 +150,6 @@
       }
     </style>
 </head>
-
 <body class="p-0 m-0 mt-1">
     <script>
         <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4-alternate.js.php'); ?>
@@ -157,7 +158,7 @@
         wait(function () {
             page.init();
             pageAudit.init();
-            if (isPortal) {
+            if ((isPortal || !newFilename) && !isDashboard) {
                 $(".template-body").addClass("bg-light");
                 $(".template-body").addClass("text-dark");
                 $('#Help').on('click', function (e) {
@@ -179,11 +180,11 @@
                     }
                 }
                 if (isPortal) {
-                    /* Render may start as a new document onetime request however for the sake
-                    *  of allowing patient to stay in portal after doc edit or patient uses
-                    *  same onetime that started as a new doc to come back and
-                    *  continue an edit of a saved/submitted doc.
-                    *  auditRender is a history doc.
+                    /* Render may start a new document onetime request however, for the sake
+                    *  of allowing the patient to stay in portal when finished of edit or the patient uses
+                    *  same onetime access code that started as a new doc and saved as draft to come back and
+                    *  continue the form edit and then submit for review. i.e. persisting the docid.
+                    *  auditRender is the history doc id for a previous edit or submission.
                     *
                     *  CONFUSED! Welcome.
                     * */
@@ -208,15 +209,17 @@
                 }
                 if (newFilename) {
                     console.log('Call template from module');
-                    if (doc_edit == '0' && recid > 0) {
-                        page.newDocument(cpid, cuser, newFilename, recid);
-                        newFilename = '';
-                    } else if (doc_edit == '1' && recid > 0) {
-                        // For now will ignore editing documents from module.
-                        // I don't feel like it's stable.
-                        //page.editHistoryDocument(recid);
-                        page.newDocument(cpid, cuser, newFilename, recid);
-                        newFilename = '';
+                    if ((doc_edit === '0' || doc_edit === '1') && recid > 0) {
+                        // is it in menu?
+                        if ($("#" + recid).data('history_id') > 0) {
+                            // has it been submitted?
+                            let historyId = $("#" + recid).data('history_id');
+                            console.log('Module history template id = ' + newFilename);
+                            page.editHistoryDocument(historyId);
+                        } else {
+                            console.log('Module new template init id = ' + newFilename);
+                            page.newDocument(cpid, "-patient-", newFilename, recid);
+                        }
                     }
                 }
             }, 1000);
@@ -493,7 +496,10 @@ function restoreDocumentEdits() {
     </script>
     <div class="container-xl px-1">
         <div class="text-center"> <span class="h3 mt-1 mr-1"><?php echo xlt("Documents and Forms") ?></span>
-                        <a class="btn btn-outline-primary mb-1" id="a_docReturn" href="#" onclick='window.location.replace(<?php echo attr_js($referer_portal) ?>)'><?php echo xlt('Exit to Dashboard'); ?></a></div>
+        <?php if (!empty($is_portal)) { ?>
+            <a class="btn btn-outline-primary mb-1" id="a_docReturn" href="#" onclick='window.location.replace(<?php echo attr_js($referer_portal) ?>)'><?php echo xlt('Exit to Dashboard'); ?></a>
+        <?php } ?>
+        </div>
         <nav id="verytop" class="navbar navbar-expand-lg navbar-light bg-light px-1 pt-3 pb-1 m-0 sticky-top" style="z-index:1030;">
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topmenu" aria-controls="topmenu" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
@@ -504,7 +510,7 @@ function restoreDocumentEdits() {
                     <div class='helpHide d-none'>
                         <ul class="navbar-nav">
                             <li class="nav-item"><a class="nav-link btn btn-outline-primary" id="signTemplate" href="#openSignModal" data-toggle="modal" data-backdrop="true" data-target="#openSignModal" data-type="patient-signature"><?php echo xlt('Signature'); ?></a></li>
-                            <li class="nav-item"><a class="nav-link btn btn-outline-primary" id="printTemplate" href="javascript:" onclick="printaDoc('templatecontent');"><?php echo xlt('Print'); ?></a></li>
+                            <li class="nav-item"><a class="nav-link btn btn-outline-primary" id="printTemplate" href="#" onclick="printaDoc('templatecontent');"><?php echo xlt('Print'); ?></a></li>
                             <li class="nav-item"><a class="nav-link btn btn-outline-primary" id="submitTemplate" href="#"><?php echo xlt('Download'); ?></a></li>
                             <li class="nav-item"><a class="nav-link btn btn-outline-primary" id="chartTemplate" href="#"><?php echo xlt('Chart to') . ' ' . text($catname); ?></a></li>
                             <li class="nav-item"><a class="nav-link btn btn-outline-primary" id="downloadTemplate" href="#"><?php echo xlt('Download'); ?></a></li>
@@ -530,19 +536,15 @@ function restoreDocumentEdits() {
                             <?php echo xlt('Activities') ?>
                         </a>
                     </li>
-                    <?php if (empty($is_module)) { ?>
+                    <?php if (empty($is_dashboard)) { ?>
                         <li class="nav-item mb-1">
                             <a id="Help" class="nav-link text-primary btn btn-outline-primary d-none" onclick='page.newDocument(cpid, cuser, "Help", help_id);'><?php echo xlt('Help'); ?></a>
                         </li>
-                    <?php } else { ?>
-                        <li class="nav-item mb-1">
-                            <a class="nav-link text-danger btn btn-outline-secondary" id="a_docReturn" href="#" onclick='window.location.replace("<?php echo $referer ?>")'><?php echo xlt('Return'); ?></a>
-                        </li>
                     <?php } ?>
                 </ul>
-                <a class='btn btn-outline-primary btn-refresh mr-0 mb-1' data-toggle='tooltip' title='Refresh' id='refreshPage' href='javascript:' onclick='window.location.reload()'><?php echo xlt('Reload'); ?></a>
+                <a class='btn btn-outline-primary btn-refresh mr-0 mb-1' title='Refresh' id='refreshPage' href='#' onclick='window.location.reload()'><?php echo xlt('Reload'); ?></a>
                 <?php if ($GLOBALS['allow_portal_uploads'] ?? 1) { ?>
-                    <a id="idShow" class="btn btn-outline-primary float-right  mr-0 mb-1" href='javascript:' onclick="$('#hideUpload').toggle();"><i class='fa fa-upload mr-1' aria-hidden='true'></i><?php echo xlt('Upload') ?></a>
+                    <a id="idShow" class="btn btn-outline-primary float-right  mr-0 mb-1" href='' onclick="$('#hideUpload').toggle();"><i class='fa fa-upload mr-1' aria-hidden='true'></i><?php echo xlt('Upload') ?></a>
                 <?php } ?>
                 <?php if (!empty($is_portal) && empty($auto_render)) { ?>
                     <a class="btn btn-outline-primary mb-1" id="a_docReturn" href="#" onclick='window.location.replace(<?php echo attr_js($referer_portal) ?>)'><?php echo xlt('Exit to Dashboard'); ?></a>
@@ -550,6 +552,9 @@ function restoreDocumentEdits() {
                     $referer_portal = "../home.php?site=" . (urlencode($_SESSION['site_id']) ?? null) ?: 'default';
                     ?>
                     <a class="btn btn-outline-primary mb-1" id="a_docReturn" href="#" onclick='window.location.replace(<?php echo attr_js($referer_portal) ?>)'><?php echo xlt('Exit'); ?></a>
+                <?php }
+                if (!empty($is_module)) { ?>
+                    <a class="text-danger btn btn-outline-secondary mb-1" id="a_docReturn" href="#" onclick='window.location.replace("<?php echo $referer ?>")'><?php echo xlt('Return'); ?></a>
                 <?php } ?>
             </div>
         </nav>
@@ -629,26 +634,26 @@ function restoreDocumentEdits() {
                 </div>
             </div><!-- close flex right-->
         </div><!-- close flex row -->
-
         <!-- Now history table container template -->
         <script type="text/template" id="onsiteDocumentCollectionTemplate">
             <div class="table-responsive pt-3">
-                <h4 class="text-sm-center"><?php echo xlt('Document and Forms Activity') ?><small><cite> (Current and Past Status.)</cite></small></h4>
+                <h4 class="text-sm-center"><?php echo xlt('Document and Forms Activity') ?></h4><small><%= view.getPaginationHtml(page, true) %></small><cite><%= view.sortTableWithActiveFilterHtml(false) %></cite>
+
                 <table class="collection table table-sm table-hover">
                     <thead class='thead-dark'>
-                    <tr class='cursor-pointer'>
+                    <tr class='cursor-pointer' role="button">
                         <th scope="col" id="header_Id"><?php echo xlt('Id'); ?><% if (page.orderBy == 'Id') { %> <i class='icon-arrow-<%= page.orderDesc ? ' up' : 'down' %>' /><% } %></th>
                         <th scope="col" id="header_DocType"><?php echo xlt('Document'); ?><% if (page.orderBy == 'DocType') { %> <i class='fa fa-arrow-<%= page.orderDesc ? ' up' : 'down' %>' /><% } %></th>
                         <th scope="col" id="header_CreateDate"><?php echo xlt('Create Date'); ?><% if (page.orderBy == 'CreateDate') { %> <i class='fa fa-arrow-<%= page.orderDesc ? ' up' : 'down' %>' /><% } %></th>
                         <th scope="col" id="header_ReviewDate"><?php echo xlt('Reviewed Date'); ?><% if (page.orderBy == 'ReviewDate') { %> <i class='fa fa-arrow-<%= page.orderDesc ? ' up' : 'down' %>' /><% } %></th>
-                        <th scope="col" id="header_DenialReason"><?php echo xlt('Review Status'); ?><% if (page.orderBy == 'DenialReason') { %> <i class='fa fa-arrow-<%= page.orderDesc ? ' up' : 'down' %>' /><% } %></th>
+                        <th scope="col" id="header_DenialReason"><?php echo xlt('Status'); ?><% if (page.orderBy == 'DenialReason') { %> <i class='fa fa-arrow-<%= page.orderDesc ? ' up' : 'down' %>' /><% } %></th>
                         <th scope="col" id="header_PatientSignedStatus"><?php echo xlt('Signed'); ?><% if (page.orderBy == 'PatientSignedStatus') { %> <i class='fa fa-arrow-<%= page.orderDesc ? ' up' : 'down' %>' /><% } %></th>
                         <th scope="col" id="header_PatientSignedTime"><?php echo xlt('Signed Date'); ?><% if (page.orderBy == 'PatientSignedTime') { %> <i class='fa fa-arrow-<%= page.orderDesc ? ' up' : 'down' %>' /><% } %></th>
                     </tr>
                     </thead>
                     <tbody>
                     <% items.each(function(item) { %>
-                    <tr id="<%= _.escape(item.get('id')) %>">
+                    <tr id="<%= _.escape(item.get('id')) %>" role="button">
                         <th scope="row"><%= _.escape(item.get('id') || '') %></th>
                         <td>
                             <button type="button" class='btn btn-sm btn-outline-success history-btn'><%= _.escape(item.get('docType') || '') %></button>
@@ -664,7 +669,6 @@ function restoreDocumentEdits() {
                 </table>
                 <%= view.getPaginationHtml(page) %>
             </div>
-            </div>
         </script>
         <div class="container-lg px-3 pt-3 historyHide d-none" id="historyTable">
             <div id="onsiteDocumentCollectionContainer" class="collectionContainer"><!-- rendered history template --></div>
diff --git a/portal/patient/templates/PatientListView.tpl.php b/portal/patient/templates/PatientListView.tpl.php
index 152958f6b94..1879e40b757 100644
--- a/portal/patient/templates/PatientListView.tpl.php
+++ b/portal/patient/templates/PatientListView.tpl.php
@@ -16,7 +16,7 @@
     $this->assign('title', xlt("Patient Portal") . " | " . xlt("Patient Data"));
     $this->assign('nav', 'patientdata');
     /*
-     *  row keys are js underscore camelcase and follow the underscores varables used in this template
+     *  row keys are js underscore camelcase and follow the underscores variables used in this template
      *  $row['city'] or $row['postalCode'] e.t.c.. The keys do not match table columns ie postalCode here is postal_code in table.
      *  */
     $row = array();
diff --git a/portal/report/pat_ledger.php b/portal/report/pat_ledger.php
index 6e302632d58..679a2690d7e 100644
--- a/portal/report/pat_ledger.php
+++ b/portal/report/pat_ledger.php
@@ -8,8 +8,10 @@
  * @link      https://www.open-emr.org
  * @author    WMT
  * @author    Terry Hill <terry@lillysystems.com>
+ * @author    Jerry Padgett <sjpadgett@gmail.com>
  * @author    Brady Miller <brady.g.miller@gmail.com>
  * @copyright Copyright (c) 2015 Rich Genandt <rgenandt@gmail.com>
+ * @copyright Copyright (C) 2016-2024 Jerry Padgett <sjpadgett@gmail.com>
  * @copyright Copyright (c) 2019 Brady Miller <brady.g.miller@gmail.com>
  * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
  */
@@ -38,19 +40,19 @@ function GetAllUnapplied($pat = '', $from_dt = '', $to_dt = '')
 {
     $all = array();
     if (!$pat) {
-        return($all);
+        return ($all);
     }
 
     $sql = "SELECT ar_session.*, ins.name, " .
-      "pat.lname, pat.fname, pat.mname, " .
-      "(SELECT SUM(ar_activity.pay_amount) FROM ar_activity WHERE " .
-      "ar_activity.deleted IS NULL AND ar_activity.session_id = ar_session.session_id) AS applied " .
-      "FROM ar_session " .
-      "LEFT JOIN insurance_companies AS ins on ar_session.payer_id = ins.id " .
-      "LEFT JOIN patient_data AS pat on ar_session.patient_id = pat.pid " .
-      "WHERE " .
-      "ar_session.created_time >= ? AND ar_session.created_time <= ? " .
-      "AND ar_session.patient_id=?";
+        "pat.lname, pat.fname, pat.mname, " .
+        "(SELECT SUM(ar_activity.pay_amount) FROM ar_activity WHERE " .
+        "ar_activity.deleted IS NULL AND ar_activity.session_id = ar_session.session_id) AS applied " .
+        "FROM ar_session " .
+        "LEFT JOIN insurance_companies AS ins on ar_session.payer_id = ins.id " .
+        "LEFT JOIN patient_data AS pat on ar_session.patient_id = pat.pid " .
+        "WHERE " .
+        "ar_session.created_time >= ? AND ar_session.created_time <= ? " .
+        "AND ar_session.patient_id=?";
     $result = sqlStatement($sql, array($from_dt, $to_dt, $pat));
     $iter = 0;
     while ($row = sqlFetchArray($result)) {
@@ -58,7 +60,7 @@ function GetAllUnapplied($pat = '', $from_dt = '', $to_dt = '')
         $iter++;
     }
 
-    return($all);
+    return ($all);
 }
 
 function User_Id_Look($thisField)
@@ -108,14 +110,14 @@ function GetAllCredits($enc = '', $pat = '')
 {
     $all = array();
     if (!$enc || !$pat) {
-        return($all);
+        return ($all);
     }
 
     $sql = "SELECT activity.*, session.*, ins.name FROM ar_activity AS " .
-    "activity LEFT JOIN ar_session AS session USING (session_id) " .
-    "LEFT JOIN insurance_companies AS ins ON session.payer_id = " .
-    "ins.id WHERE deleted IS NULL AND encounter = ? AND pid = ? " .
-    "ORDER BY sequence_no";
+        "activity LEFT JOIN ar_session AS session USING (session_id) " .
+        "LEFT JOIN insurance_companies AS ins ON session.payer_id = " .
+        "ins.id WHERE deleted IS NULL AND encounter = ? AND pid = ? " .
+        "ORDER BY sequence_no";
     $result = sqlStatement($sql, array($enc, $pat));
     $iter = 0;
     while ($row = sqlFetchArray($result)) {
@@ -123,8 +125,9 @@ function GetAllCredits($enc = '', $pat = '')
         $iter++;
     }
 
-    return($all);
+    return ($all);
 }
+
 function PrintEncHeader($dt, $rsn, $dr)
 {
     global $bgcolor, $orow;
@@ -139,11 +142,12 @@ function PrintEncHeader($dt, $rsn, $dr)
     echo "</tr>\n";
     $orow++;
 }
+
 function PrintEncFooter()
 {
     global $enc_units, $enc_chg, $enc_pmt, $enc_adj, $enc_bal;
     echo "<tr bgcolor='#DDFFFF'>";
-    echo "<td colspan='3'>&nbsp;</td>";
+    echo "<td colspan='3'></td>";
     echo "<td class='detail'>" . xlt('Encounter Balance') . ":</td>";
     echo "<td class='detail text-right'>" . text($enc_units) . "</td>";
     echo "<td class='detail text-right'>" . text(oeFormatMoney($enc_chg)) . "</td>";
@@ -152,6 +156,7 @@ function PrintEncFooter()
     echo "<td class='detail text-right'>" . text(oeFormatMoney($enc_bal)) . "</td>";
     echo "</tr>\n";
 }
+
 function PrintCreditDetail($detail, $pat, $unassigned = false)
 {
     global $enc_pmt, $total_pmt, $enc_adj, $total_adj, $enc_bal, $total_bal;
@@ -165,14 +170,14 @@ function PrintCreditDetail($detail, $pat, $unassigned = false)
 
         $bgcolor = (($bgcolor == "#FFFFDD") ? "#FFDDDD" : "#FFFFDD");
         $print = "<tr bgcolor='" . attr($bgcolor) . "'>";
-        $print .= "<td class='detail'>&nbsp;</td>";
+        $print .= "<td class='detail'></td>";
         $method = List_Look($pmt['payment_method'], 'payment_method');
         $desc = $pmt['description'];
         $ref = $pmt['reference'];
         if ($unassigned) {
-              $memo = List_Look($pmt['adjustment_code'], 'payment_adjustment_code');
+            $memo = List_Look($pmt['adjustment_code'], 'payment_adjustment_code');
         } else {
-              $memo = $pmt['memo'];
+            $memo = $pmt['memo'];
         }
 
         $description = $method;
@@ -201,35 +206,35 @@ function PrintCreditDetail($detail, $pat, $unassigned = false)
         }
 
         $print .= "<td class='detail' colspan='2'>" .
-                                      text($description) . "&nbsp;</td>";
+            text($description) . "</td>";
         $payer = ($pmt['name'] == '') ? xl('Patient') : $pmt['name'];
         if ($unassigned) {
-              $pmt_date = substr($pmt['post_to_date'], 0, 10);
+            $pmt_date = substr($pmt['post_to_date'], 0, 10);
         } else {
-              $pmt_date = substr($pmt['post_time'], 0, 10);
+            $pmt_date = substr($pmt['post_time'], 0, 10);
         }
 
         $print .= "<td class='detail'>" .
-        text($pmt_date) . "&nbsp;/&nbsp;" . text($payer) . "</td>";
+            text($pmt_date) . "/" . text($payer) . "</td>";
         $type = List_Look($pmt['payment_type'], 'payment_type');
-        $print .= "<td class='detail'>" . text($type) . "&nbsp;</td>";
+        $print .= "<td class='detail'>" . text($type) . "</td>";
         if ($unassigned) {
-              $pmt_amt = $pmt['pay_total'] - $pmt['applied'];
-              $uac_bal = oeFormatMoney($pmt_amt * -1);
-              $uac_appl = oeFormatMoney($pmt['applied']);
-              $uac_total = oeFormatMoney($pmt['pay_total']);
-              $pmt_amt = $pmt['pay_total'];
-              $total_pmt = $total_pmt - $uac_bal;
+            $pmt_amt = $pmt['pay_total'] - $pmt['applied'];
+            $uac_bal = oeFormatMoney($pmt_amt * -1);
+            $uac_appl = oeFormatMoney($pmt['applied']);
+            $uac_total = oeFormatMoney($pmt['pay_total']);
+            $pmt_amt = $pmt['pay_total'];
+            $total_pmt = $total_pmt - $uac_bal;
         } else {
-              $uac_total = '';
-              $uac_bal = '';
-              $uac_appl = '';
-              $pmt_amt = $pmt['pay_amount'];
-              $adj_amt = $pmt['adj_amount'];
-              $enc_pmt = $enc_pmt + $pmt['pay_amount'];
-              $total_pmt = $total_pmt + $pmt['pay_amount'];
-              $enc_adj = $enc_adj + $pmt['adj_amount'];
-              $total_adj = $total_adj + $pmt['adj_amount'];
+            $uac_total = '';
+            $uac_bal = '';
+            $uac_appl = '';
+            $pmt_amt = $pmt['pay_amount'];
+            $adj_amt = $pmt['adj_amount'];
+            $enc_pmt = $enc_pmt + $pmt['pay_amount'];
+            $total_pmt = $total_pmt + $pmt['pay_amount'];
+            $enc_adj = $enc_adj + $pmt['adj_amount'];
+            $total_adj = $total_adj + $pmt['adj_amount'];
         }
 
         $print_pmt = '';
@@ -242,16 +247,16 @@ function PrintCreditDetail($detail, $pat, $unassigned = false)
             $print_adj = oeFormatMoney($adj_amt);
         }
 
-        $print .= "<td class='detail text-right'>" . text($uac_appl) . "&nbsp;</td>";
-        $print .= "<td class='detail text-right'>" . text($print_pmt) . "&nbsp;</td>";
-        $print .= "<td class='detail text-right'>" . text($print_adj) . "&nbsp;</td>";
-        $print .= "<td class='detail text-right'>" . text($uac_bal) . "&nbsp;</td>";
+        $print .= "<td class='detail text-right'>" . text($uac_appl) . "</td>";
+        $print .= "<td class='detail text-right'>" . text($print_pmt) . "</td>";
+        $print .= "<td class='detail text-right'>" . text($print_adj) . "</td>";
+        $print .= "<td class='detail text-right'>" . text($uac_bal) . "</td>";
         $print .= "</tr>\n";
         echo $print;
         if ($pmt['follow_up_note'] != '') {
             $bgcolor = (($bgcolor == "#FFFFDD") ? "#FFDDDD" : "#FFFFDD");
             $print = "<tr bgcolor='" . attr($bgcolor) . "'>";
-            $print .= "<td class='detail' colspan='2'>&nbsp;</td>";
+            $print .= "<td class='detail' colspan='2'></td>";
             $print .= "<td colspan='7'>" . xlt('Follow Up Note') . ": ";
             $print .= text($pmt['follow_up_note']);
             $print .= "</td></tr>\n";
@@ -270,6 +275,7 @@ function PrintCreditDetail($detail, $pat, $unassigned = false)
 
     $bgcolor = (($bgcolor == "#FFFFDD") ? "#FFDDDD" : "#FFFFDD");
 }
+
 if (!isset($_REQUEST['form_from_date'])) {
     $_REQUEST['form_from_date'] = '';
 }
@@ -297,127 +303,120 @@ function PrintCreditDetail($detail, $pat, $unassigned = false)
 if ($_REQUEST['form_from_date']) {
     $form_from_date = fixDate($_REQUEST['form_from_date'], $last_year);
 }
+$form_to_date = fixDate($_REQUEST['form_to_date'], date('Y-m-d'));
+?>
 
-$form_to_date   = fixDate($_REQUEST['form_to_date'], date('Y-m-d')); ?>
+<!DOCTYPE html>
 <html>
 <head>
-
     <?php Header::setupHeader(['no_main-theme', 'portal-theme', 'datetime-picker']); ?>
     <script src="<?php echo $GLOBALS['webroot'] ?>/library/js/common.js?v=<?php echo $v_js_includes; ?>"></script>
+    <script>
+        function checkSubmit() {
+            document.forms[0].elements['form_refresh'].value = true;
+            document.forms[0].submit();
+        }
+    </script>
+    <style>
+        /* specifically include & exclude from printing */
+        @media print {
+            #report_parameters {
+                visibility: hidden;
+                display: none;
+            }
 
-<script>
-function checkSubmit() {
-    document.forms[0].elements['form_refresh'].value = true;
-    document.forms[0].submit();
-}
+            #report_parameters_daterange {
+                visibility: visible;
+                display: inline;
+            }
 
-</script>
-
-<style>
-
-/* specifically include & exclude from printing */
-@media print {
-  #report_parameters {
-    visibility: hidden;
-    display: none;
-  }
-  #report_parameters_daterange {
-    visibility: visible;
-    display: inline;
-  }
-  #report_results {
-     margin-top: 30px;
-  }
-  #report_header {
-    visibility: visible;
-    display: inline;
-  }
-  #title {
-    visibility: hidden;
-    display: none;
-  }
-}
-/* specifically exclude some from the screen */
-@media screen {
-  #report_parameters_daterange {
-    visibility: hidden;
-    display: none;
-  }
-  #report_header {
-    visibility: hidden;
-    display: none;
-  }
-  #title {
-    visibility: visible;
-    display: inline;
-  }
-}
-</style>
+            #report_results {
+                margin-top: 30px;
+            }
 
-<title><?php echo xlt('Patient Billing Summary by Date') ?></title>
+            #report_header {
+                visibility: visible;
+                display: inline;
+            }
+
+            #title {
+                visibility: hidden;
+                display: none;
+            }
+        }
 
-<script>
-  $(function () {
-    $('.datepicker').datetimepicker({
-        <?php $datetimepicker_timepicker = false; ?>
-        <?php $datetimepicker_formatInput = false; ?>
-        <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
-        <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
-    });
-  });
-</script>
+        /* specifically exclude some from the screen */
+        @media screen {
+            #report_parameters_daterange {
+                visibility: hidden;
+                display: none;
+            }
 
+            #report_header {
+                visibility: hidden;
+                display: none;
+            }
+
+            #title {
+                visibility: visible;
+                display: inline;
+            }
+        }
+    </style>
+    <title><?php echo xlt('Patient Billing Summary by Date') ?></title>
+    <script>
+        $(function () {
+            $('.datepicker').datetimepicker({
+                <?php $datetimepicker_timepicker = false; ?>
+                <?php $datetimepicker_formatInput = false; ?>
+                <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
+                <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
+            });
+        });
+    </script>
 </head>
-<body class="skin-blue">
-<h2><?php echo xlt('Patient Billing Summary'); ?></h2>
-<form method='post' action='./pat_ledger.php' id='theform'>
-<div id="report_parameters">
-<input type='hidden' name='form_refresh' id='form_refresh' value=''/>
-<table>
- <tr>
-    <td width='35%'>
-    <div class="float-left">
-    <table class='text'>
-        <tr>
-      <td class='col-form-label'>
-        <?php echo xlt('From'); ?>:
-      </td>
-      <td>
-        <input type='text' class='datepicker form-control' name='form_from_date' id="form_from_date" size='10' value='<?php echo attr($form_from_date) ?>' title='yyyy-mm-dd'>
-      </td>
-      <td class='col-form-label'>
-          &nbsp;&nbsp;&nbsp;&nbsp;<?php echo xlt('To{{Range}}'); ?>:
-      </td>
-      <td>
-        <input type='text' class='datepicker form-control' name='form_to_date' id="form_to_date" size='10' value='<?php echo attr($form_to_date) ?>' title='yyyy-mm-dd'>
-      </td>
-      </td>
-        </tr>
-    </table>
-    </div>
-  </td>
-  <td align='left' class='align-middle h-100'>
-    <table class="w-100 h-100">
-        <tr>
-            <td>
-                <div style='margin-left: 15px'>
-                    <a href='#' class='btn btn-primary' onclick="checkSubmit();" ><?php echo xlt('Submit'); ?></a>
-                </div>
-            </td>
-        </tr>
-    </table>
-  </td>
- </tr>
-</table>
-</div> <!-- end of parameters -->
-
-    <?php
-    $from_date = $form_from_date . ' 00:00:00';
-    $to_date = $form_to_date . ' 23:59:59';
-    if ($_REQUEST['form_refresh']) {
-        $rows = array();
-        $sqlBindArray = array();
-        $query = "select b.code_type, b.code, b.code_text, b.pid, b.provider_id, " .
+<body class="container-fluid">
+    <h2><?php echo xlt('Patient Billing Summary'); ?></h2>
+    <form method='post' action='./pat_ledger.php' id='theform'>
+        <div id="report_parameters">
+            <input type='hidden' name='form_refresh' id='form_refresh' value='' />
+            <table>
+                <tr>
+                    <td width='35%'>
+                        <div class="float-left">
+                            <table class='text'>
+                                <div>
+                                    <td class='col-form-label'>
+                                        <?php echo xlt('From'); ?>:
+                                    </td>
+                                    <td>
+                                        <input type='text' class='datepicker form-control' name='form_from_date' id="form_from_date" size='10' value='<?php echo attr($form_from_date) ?>' title='yyyy-mm-dd'>
+                                    </td>
+                                    <td class='col-form-label'>
+                                        <?php echo xlt('To{{Range}}'); ?>:
+                                    </td>
+                                    <td>
+                                        <input type='text' class='datepicker form-control' name='form_to_date' id="form_to_date" size='10' value='<?php echo attr($form_to_date) ?>' title='yyyy-mm-dd'>
+                                    </td>
+                                    <td>
+                                        <div style='margin-left: 15px'>
+                                            <a href='#' class='btn btn-primary' onclick="checkSubmit();"><?php echo xlt('Submit'); ?></a>
+                                        </div>
+                                    </td>
+                                </div>
+                            </table>
+                        </div>
+                    </td>
+                </tr>
+            </table>
+        </div> <!-- end of parameters -->
+        <?php
+        $from_date = $form_from_date . ' 00:00:00';
+        $to_date = $form_to_date . ' 23:59:59';
+        if ($_REQUEST['form_refresh']) {
+            $rows = array();
+            $sqlBindArray = array();
+            $query = "select b.code_type, b.code, b.code_text, b.pid, b.provider_id, " .
             "b.billed, b.payer_id, b.units, b.fee, b.bill_date, b.id, " .
             "ins.name, " .
             "fe.encounter, fe.date, fe.reason, fe.provider_id " .
@@ -426,76 +425,147 @@ function checkSubmit() {
             "LEFT JOIN insurance_companies AS ins ON b.payer_id = ins.id " .
             "LEFT OUTER JOIN code_types AS c ON c.ct_key = b.code_type " .
             "WHERE fe.date >= ? AND fe.date <= ? AND fe.pid = ? ";
-        array_push($sqlBindArray, $from_date, $to_date, $pid);
-
-        $query .= "AND c.ct_proc = '1' ";
-        $query .= "AND activity > 0 ORDER BY fe.date, fe.id ";
-        $res = sqlStatement($query, $sqlBindArray);
-
-        $patient = sqlQuery("SELECT * from patient_data WHERE pid=?", array($pid));
-        $pat_dob = $patient['DOB'];
-        $pat_name = $patient['fname'] . ' ' . $patient['lname'];
-        ?>
-<div id="report_header">
-<table width="98%" class="border-0" cellspacing="0" cellpadding="0">
-  <tr>
-    <td class="title"><?php echo xlt('Patient Billing Summary'); ?></td>
-  </tr>
-    <tr>
-        <?php
-        $title = xl('All Providers');
-        ?>
-    <td class="title" ><?php echo text($title); ?></td>
-    </tr>
-    <tr>
-        <?php
-            $title = xl('For Dates') . ': ' . $form_from_date . ' - ' . $form_to_date;
-        ?>
-    <td class="title"><?php echo text($title); ?></td>
-    </tr>
-</table>
-<br/>
-<table class="w-100 border-0" cellspacing="0" cellpadding="0">
-  <tr>
-    <td class='font-weight-bold'><?php echo xlt('Date')?>: <?php echo text(date('Y-m-d')); ?></td>
-    <td class='font-weight-bold'><?php echo xlt('Patient')?>: <?php echo text($pat_name); ?></td>
-    <td class='font-weight-bold'><?php echo xlt('DOB')?>: <?php echo text($pat_dob);?></td>
-    <td class='font-weight-bold'> <?php echo xlt('ID')?>: <?php echo text($pid);?></td>
-  </tr>
-</table>
-</div>
-<div id="report_results">
-<table class="table">
- <tr>
-    <td class='font-weight-bold'><?php echo xlt('Code'); ?></td>
-    <td colspan="2" class='font-weight-bold'><?php echo xlt('Description'); ?></td>
-    <td class='font-weight-bold'><?php echo xlt('Billed Date'); ?> / <?php echo xlt('Payor'); ?></td>
-    <td class='font-weight-bold'><?php echo xlt('Type'); ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        <?php echo xlt('Units'); ?></td>
-    <td class='font-weight-bold'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo xlt('Charge'); ?></td>
-    <td class='text-right font-weight-bold'>&nbsp;&nbsp;<?php echo xlt('Payment'); ?></td>
-    <td class='text-right font-weight-bold'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo xlt('Adjustment'); ?></td>
-    <td class='text-right font-weight-bold'>&nbsp;&nbsp;&nbsp;<?php echo xlt('Balance'); ?></td>
- </tr>
- <tr>
-    <td>&nbsp;&nbsp;&nbsp;</td>
-    <td colspan="2">&nbsp;&nbsp;&nbsp;</td>
-    <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-    <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-    <td class='font-weight-bold'>&nbsp;&nbsp;&nbsp;<?php echo xlt('UAC Appl'); ?></td>
-    <td class='text-right font-weight-bold'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo xlt('UAC Tot'); ?></td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
- </tr>
-        <?php
-        $orow = 0;
-        $prev_encounter_id = -1;
-        $hdr_printed = false;
-        $prev_row = array();
-        while ($erow = sqlFetchArray($res)) {
-            $print = '';
-            $csv = '';
-            if ($erow['encounter'] != $prev_encounter_id) {
+            array_push($sqlBindArray, $from_date, $to_date, $pid);
+
+            $query .= "AND c.ct_proc = '1' ";
+            $query .= "AND activity > 0 ORDER BY fe.date, fe.id ";
+            $res = sqlStatement($query, $sqlBindArray);
+
+            $patient = sqlQuery("SELECT * from patient_data WHERE pid=?", array($pid));
+            $pat_dob = $patient['DOB'];
+            $pat_name = $patient['fname'] . ' ' . $patient['lname'];
+            ?>
+        <div id="report_header">
+            <table width="98%" class="border-0" cellspacing="0" cellpadding="0">
+                <tr>
+                    <td class="title"><?php echo xlt('Patient Billing Summary'); ?></td>
+                </tr>
+                <tr>
+                    <?php
+                    $title = xl('All Providers');
+                    ?>
+                    <td class="title"><?php echo text($title); ?></td>
+                </tr>
+                <tr>
+                    <?php
+                    $title = xl('For Dates') . ': ' . $form_from_date . ' - ' . $form_to_date;
+                    ?>
+                    <td class="title"><?php echo text($title); ?></td>
+                </tr>
+            </table>
+            <br />
+            <table class="w-100 border-0" cellspacing="0" cellpadding="0">
+                <tr>
+                    <td class='font-weight-bold'><?php echo xlt('Date') ?>: <?php echo text(date('Y-m-d')); ?></td>
+                    <td class='font-weight-bold'><?php echo xlt('Patient') ?>: <?php echo text($pat_name); ?></td>
+                    <td class='font-weight-bold'><?php echo xlt('DOB') ?>: <?php echo text($pat_dob); ?></td>
+                    <td class='font-weight-bold'> <?php echo xlt('ID') ?>: <?php echo text($pid); ?></td>
+                </tr>
+            </table>
+        </div>
+        <div id="report_results">
+            <table class="table table-bordered">
+                <tr>
+                    <td class='font-weight-bold'><?php echo xlt('Code'); ?></td>
+                    <td colspan="2" class='font-weight-bold'><?php echo xlt('Description'); ?></td>
+                    <td class='font-weight-bold'><?php echo xlt('Billed Date'); ?> / <?php echo xlt('Payor'); ?></td>
+                    <td class='font-weight-bold'><?php echo xlt('Type'); ?>
+                        <?php echo xlt('Units'); ?></td>
+                    <td class='font-weight-bold'><?php echo xlt('Charge'); ?></td>
+                    <td class='text-right font-weight-bold'><?php echo xlt('Payment'); ?></td>
+                    <td class='text-right font-weight-bold'><?php echo xlt('Adjustment'); ?></td>
+                    <td class='text-right font-weight-bold'><?php echo xlt('Balance'); ?></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td colspan="2"></td>
+                    <td></td>
+                    <td></td>
+                    <td class='font-weight-bold'><?php echo xlt('UAC Appl'); ?></td>
+                    <td class='text-right font-weight-bold'><?php echo xlt('UAC Tot'); ?></td>
+                    <td></td>
+                    <td></td>
+                </tr>
+                <?php
+                $orow = 0;
+                $prev_encounter_id = -1;
+                $hdr_printed = false;
+                $prev_row = array();
+                while ($erow = sqlFetchArray($res)) {
+                    $print = '';
+                    $csv = '';
+                    if ($erow['encounter'] != $prev_encounter_id) {
+                        if ($prev_encounter_id != -1) {
+                            $credits = GetAllCredits($prev_encounter_id, $pid);
+                            if (count($credits) > 0) {
+                                if (!$hdr_printed) {
+                                    PrintEncHeader(
+                                        $prev_row['date'],
+                                        $prev_row['reason'],
+                                        $prev_row['provider_id']
+                                    );
+                                }
+
+                                PrintCreditDetail($credits, $pid);
+                            }
+
+                            if ($hdr_printed) {
+                                PrintEncFooter();
+                            }
+
+                            $hdr_printed = false;
+                        }
+
+                        $enc_units = $enc_chg = $enc_pmt = $enc_adj = $enc_bal = 0;
+                    }
+
+                    if ($erow['id']) {
+// Now print an encounter heading line -
+                        if (!$hdr_printed) {
+                            PrintEncHeader(
+                                $erow['date'],
+                                $erow['reason'],
+                                $erow['provider_id']
+                            );
+                            $hdr_printed = true;
+                        }
+
+                        $code_desc = $erow['code_text'];
+                        if (strlen($code_desc) > 50) {
+                            $code_desc = substr($code_desc, 0, 50) . '...';
+                        }
+
+                        $bgcolor = (($bgcolor == "#FFFFDD") ? "#FFDDDD" : "#FFFFDD");
+                        $print = "<tr bgcolor='" . attr($bgcolor) . "'>";
+                        $print .= "<td class='detail'>" . text($erow['code']) . "</td>";
+                        $print .= "<td class='detail' colspan='2'>" . text($code_desc) . "</td>";
+                        $who = ($erow['name'] == '') ? xl('Self') : $erow['name'];
+                        $bill = substr($erow['bill_date'], 0, 10);
+                        if ($bill == '') {
+                            $bill = 'unbilled';
+                        }
+
+                        $print .= "<td class='detail'>" . text($bill) . "/" . text($who) . "</td>";
+                        $print .= "<td class='detail text-right'>" . text($erow['units']) . "</td>";
+                        $print .= "<td class='detail text-right'>" . text(oeFormatMoney($erow['fee'])) . "</td>";
+                        $print .= "<td></td><td></td><td></td>";
+                        $print .= "</tr>\n";
+
+                        $total_units += $erow['units'];
+                        $total_chg += $erow['fee'];
+                        $total_bal += $erow['fee'];
+                        $enc_units += $erow['units'];
+                        $enc_chg += $erow['fee'];
+                        $enc_bal += $erow['fee'];
+                        $orow++;
+
+                        echo $print;
+                    }
+
+                    $prev_encounter_id = $erow['encounter'];
+                    $prev_row = $erow;
+                }
+
                 if ($prev_encounter_id != -1) {
                     $credits = GetAllCredits($prev_encounter_id, $pid);
                     if (count($credits) > 0) {
@@ -513,146 +583,73 @@ function checkSubmit() {
                     if ($hdr_printed) {
                         PrintEncFooter();
                     }
-
-                    $hdr_printed = false;
-                }
-
-                $enc_units = $enc_chg = $enc_pmt = $enc_adj = $enc_bal = 0;
-            }
-
-            if ($erow['id']) {
-                // Now print an encounter heading line -
-                if (!$hdr_printed) {
-                    PrintEncHeader(
-                        $erow['date'],
-                        $erow['reason'],
-                        $erow['provider_id']
-                    );
-                    $hdr_printed = true;
-                }
-
-                $code_desc = $erow['code_text'];
-                if (strlen($code_desc) > 50) {
-                    $code_desc = substr($code_desc, 0, 50) . '...';
                 }
 
-                $bgcolor = (($bgcolor == "#FFFFDD") ? "#FFDDDD" : "#FFFFDD");
-                $print = "<tr bgcolor='" . attr($bgcolor) . "'>";
-                $print .= "<td class='detail'>" . text($erow['code']) . "</td>";
-                $print .= "<td class='detail' colspan='2'>" . text($code_desc) . "</td>";
-                $who = ($erow['name'] == '') ? xl('Self') : $erow['name'];
-                $bill = substr($erow['bill_date'], 0, 10);
-                if ($bill == '') {
-                    $bill = 'unbilled';
-                }
-
-                $print .= "<td class='detail'>" . text($bill) . "&nbsp;/&nbsp;" . text($who) . "</td>";
-                $print .= "<td class='detail text-right'>" . text($erow['units']) . "</td>";
-                $print .= "<td class='detail text-right'>" . text(oeFormatMoney($erow['fee'])) . "</td>";
-                $print .= "<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>";
-                $print .= "</tr>\n";
-
-                $total_units  += $erow['units'];
-                $total_chg += $erow['fee'];
-                $total_bal += $erow['fee'];
-                $enc_units  += $erow['units'];
-                $enc_chg += $erow['fee'];
-                $enc_bal += $erow['fee'];
-                $orow++;
-
-                echo $print;
-            }
-
-            $prev_encounter_id = $erow['encounter'];
-            $prev_row = $erow;
-        }
+                // This is the end of the encounter/charge loop -
+                $uac = GetAllUnapplied($pid, $from_date, $to_date);
+                if (count($uac) > 0) {
+                    if ($orow) {
+                        $bgcolor = (($bgcolor == "#FFFFDD") ? "#FFDDDD" : "#FFFFDD");
+                        echo "<tr class='bg-white'><td colspan='9'></td></tr>\n";
+                    }
 
-        if ($prev_encounter_id != -1) {
-            $credits = GetAllCredits($prev_encounter_id, $pid);
-            if (count($credits) > 0) {
-                if (!$hdr_printed) {
-                    PrintEncHeader(
-                        $prev_row['date'],
-                        $prev_row['reason'],
-                        $prev_row['provider_id']
-                    );
+                    PrintCreditDetail($uac, $pid, true);
                 }
 
-                PrintCreditDetail($credits, $pid);
-            }
-
-            if ($hdr_printed) {
-                PrintEncFooter();
-            }
-        }
-
-        // This is the end of the encounter/charge loop -
-            $uac = GetAllUnapplied($pid, $from_date, $to_date);
-        if (count($uac) > 0) {
-            if ($orow) {
-                $bgcolor = (($bgcolor == "#FFFFDD") ? "#FFDDDD" : "#FFFFDD");
-                echo "<tr class='bg-white'><td colspan='9'>&nbsp;</td></tr>\n";
-            }
-
-            PrintCreditDetail($uac, $pid, true);
-        }
-
-        if ($orow) {
-            echo "<tr bgcolor='#DDFFFF'>\n";
-            echo " <td colspan='2'>&nbsp;</td>";
-            echo " <td class='font-weight-bold' colspan='2'>" . xlt("Grand Total") . "</td>\n";
-            echo " <td class='font-weight-bold text-right'>" . text($total_units) . "</td>\n";
-            echo " <td class='font-weight-bold text-right'>" . text(oeFormatMoney($total_chg)) . "</td>\n";
-            echo " <td class='font-weight-bold text-right'>" . text(oeFormatMoney($total_pmt)) . "</td>\n";
-            echo " <td class='font-weight-bold text-right'>" . text(oeFormatMoney($total_adj)) . "</td>\n";
-            echo " <td class='font-weight-bold text-right'>" . text(oeFormatMoney($total_bal)) . "</td>\n";
-            echo " </tr>\n";
-            ?>
-        </table>
-      <tr><td>&nbsp;</td></tr><br /><br />
-            <?php if ($GLOBALS['print_next_appointment_on_ledger'] == 1) {
+                if ($orow) {
+                    echo "<tr bgcolor='#DDFFFF'>\n";
+                    echo " <td colspan='2'></td>";
+                    echo " <td class='font-weight-bold' colspan='2'>" . xlt("Grand Total") . "</td>\n";
+                    echo " <td class='font-weight-bold text-right'>" . text($total_units) . "</td>\n";
+                    echo " <td class='font-weight-bold text-right'>" . text(oeFormatMoney($total_chg)) . "</td>\n";
+                    echo " <td class='font-weight-bold text-right'>" . text(oeFormatMoney($total_pmt)) . "</td>\n";
+                    echo " <td class='font-weight-bold text-right'>" . text(oeFormatMoney($total_adj)) . "</td>\n";
+                    echo " <td class='font-weight-bold text-right'>" . text(oeFormatMoney($total_bal)) . "</td>\n";
+                    echo " </tr>\n";
+                    ?>
+            </table>
+            <tr>
+                <td></td>
+            </tr>
+            <br /><br />
+                    <?php if ($GLOBALS['print_next_appointment_on_ledger'] == 1) {
                         $next_day = mktime(0, 0, 0, date('m'), date('d') + 1, date('Y'));
-                        # add one day to date so it will not get todays appointment
+# add one day to date so it will not get todays appointment
                         $current_date2 = date('Y-m-d', $next_day);
                         $events = fetchNextXAppts($current_date2, $pid);
                         $next_appoint_date = oeFormatShortDate($events[0]['pc_eventDate']);
                         $next_appoint_time = substr($events[0]['pc_startTime'], 0, 5);
-                if (strlen($events[0]['umname']) != 0) {
-                    $next_appoint_provider = $events[0]['ufname'] . ' ' . $events[0]['umname'] . ' ' .  $events[0]['ulname'];
-                } else {
-                    $next_appoint_provider = $events[0]['ufname'] . ' ' .  $events[0]['ulname'];
-                }
-
-                if (strlen($next_appoint_time) != 0) {
-                    ?>
-      <tr>
-        <td class="title"><?php echo xlt('Next Appointment Date') . ': ' . text($next_appoint_date) . ' ' . xlt('Time') . ' ' . text($next_appoint_time) . ' ' . xlt('Provider') . ' ' . text($next_appoint_provider); ?></td>
-      </tr>
-
-                    <?php
-                }
-            } // end ($GLOBALS['print_next_appointment_on_ledger'] == 1)
-        } // end ($orow)
-          echo "</div>\n";
-    }
+                        if (strlen($events[0]['umname']) != 0) {
+                            $next_appoint_provider = $events[0]['ufname'] . ' ' . $events[0]['umname'] . ' ' . $events[0]['ulname'];
+                        } else {
+                            $next_appoint_provider = $events[0]['ufname'] . ' ' . $events[0]['ulname'];
+                        }
 
+                        if (strlen($next_appoint_time) != 0) {
+                            ?>
+                    <tr>
+                        <td class="title"><?php echo xlt('Next Appointment Date') . ': ' . text($next_appoint_date) . ' ' . xlt('Time') . ' ' . text($next_appoint_time) . ' ' . xlt('Provider') . ' ' . text($next_appoint_provider); ?></td>
+                    </tr>
 
-    if ($_REQUEST['form_refresh'] && $orow <= 0) {
-        echo "<span style='font-size: 0.8125rem;'>";
-        echo xlt('No matches found. Try search again.');
-        echo "</span>";
-        echo '<script>document.getElementById("report_results").style.display="none";</script>';
-        echo '<script>document.getElementById("controls").style.display="none";</script>';
-    }
+                            <?php
+                        }
+                    } // end ($GLOBALS['print_next_appointment_on_ledger'] == 1)
+                } // end ($orow)
+                echo "</div>\n";
+        }
 
-    if (!$_REQUEST['form_refresh']) { ?>
-    <div class='text'>
-            <?php echo xlt('Please input search criteria above, and click Submit to view results.'); ?>
-    </div>
-        <?php
-    }
-    ?>
-</form>
+        if ($_REQUEST['form_refresh'] && $orow <= 0) {
+            echo "<span style='font-size: 0.8125rem;'>";
+            echo xlt('No matches found. Try search again.');
+            echo "</span>";
+            echo '<script>document.getElementById("report_results").style.display="none";</script>';
+            echo '<script>document.getElementById("controls").style.display="none";</script>';
+        }
+        if ($_REQUEST['form_refresh'] != 'true') { ?>
+                <div class='text'>
+                    <?php echo xlt('Please input search criteria above, and click Submit to view results.'); ?>
+                </div>
+            <?php } ?>
+    </form>
 </body>
-
 </html>
diff --git a/src/Services/DocumentTemplates/DocumentTemplateService.php b/src/Services/DocumentTemplates/DocumentTemplateService.php
index 8e980812a70..eaea18e8b27 100644
--- a/src/Services/DocumentTemplates/DocumentTemplateService.php
+++ b/src/Services/DocumentTemplates/DocumentTemplateService.php
@@ -885,8 +885,8 @@ public function renderPortalTemplateMenu($current_patient, $current_user, $porta
         foreach ($all_templates as $category => $templates) {
             if (is_array($templates)) {
                 $is_category = $category_list[$category]['title'] ?? $category;
-                if ($is_category === 'default') {
-                    $is_category = '';
+                if ($is_category === 'default' || !$is_category) {
+                    $is_category = 'General';
                 }
                 $cat_name = text($is_category);
 
@@ -911,14 +911,15 @@ public function renderPortalTemplateMenu($current_patient, $current_user, $porta
                     }
                     if (!$flag) {
                         $flag = true;
-                        $menu .= "<div class='h6 text-center'>$cat_name</div>\n";
+                        $menu .= "<div class='h6 bg-dark text-light text-center m-0 font-weight-bolder'>$cat_name</div>\n";
                     }
                     $id = $template['id'];
                     $btnname = $template['template_name'];
                     if ($portal) {
                         if (!empty($in_edit)) {
                             $menu .= '<a class="dropdown-item template-item text-primary btn btn-link font-weight-bold" id="' . attr($id) . '"' .
-                                ' data-history_id="' . attr($in_edit['id']) . '"' . ' href="#" onclick="page.editHistoryDocument(' . attr_js($in_edit['id']) . ')">' . text($btnname) . "</a>\n";
+                                ' data-history_id=' . attr($in_edit['id']) . ' href="#" 
+                                onclick="page.editHistoryDocument(' . attr_js($in_edit['id']) . ', ' . attr_js($current_patient) . ', ' . attr_js($current_user) . ', ' . attr_js($btnname) . ')">' . text($btnname) . "</a>\n";
                         } else {
                             $menu .= '<a class="dropdown-item template-item text-success btn btn-link" id="' . attr($id) . '"' . ' href="#" onclick="page.newDocument(' . attr_js($current_patient) . ', ' . attr_js($current_user) . ', ' . attr_js($btnname) . ', ' . attr_js($id) . ')">' . text($btnname) . "</a>\n";
                         }
diff --git a/src/Services/QuestionnaireService.php b/src/Services/QuestionnaireService.php
index 4b352a69a31..fea62dd9288 100644
--- a/src/Services/QuestionnaireService.php
+++ b/src/Services/QuestionnaireService.php
@@ -198,7 +198,7 @@ public function saveQuestionnaireResource($q, $name = null, $q_record_id = null,
      */
     public function fetchEncounterQuestionnaireForm($name): array
     {
-        $sql = "Select `form_foreign_id` From `registry` Where `name` = ?";
+        $sql = "Select `form_foreign_id` From `registry` Where `state` = 1 And `name` = ?";
         $q_id = sqlQuery($sql, array($name))['form_foreign_id'];
 
         return $this->fetchQuestionnaireById($q_id) ?: [];
diff --git a/templates/login/base.html.twig b/templates/login/base.html.twig
index 414868519e1..95f44118101 100644
--- a/templates/login/base.html.twig
+++ b/templates/login/base.html.twig
@@ -36,6 +36,18 @@ and semantic choices
         }
     </style>
     {% endblock %}
+    <script>
+        document.addEventListener('DOMContentLoaded', function () {
+            const passInput = document.getElementById('clearPass');
+            const toggle = document.getElementById('password-icon');
+            toggle.addEventListener('click', function () {
+                const isPassword = passInput.getAttribute('type') === 'password';
+                passInput.setAttribute('type', isPassword ? 'text' : 'password');
+                this.classList.toggle('fa-eye');
+                this.classList.toggle('fa-eye-slash');
+            });
+        });
+    </script>
 </head>
 <body>
 
diff --git a/templates/login/partials/input/password.html.twig b/templates/login/partials/input/password.html.twig
index d805f4e7a9d..f91768b999f 100644
--- a/templates/login/partials/input/password.html.twig
+++ b/templates/login/partials/input/password.html.twig
@@ -15,8 +15,13 @@ Render the password row
 {% block password %}
 <div id="standard-auth-password" class="{{ password_container_class_list|default(['form-group', 'row'])|join(' ') }}">
     <label for="clearPass" class="{{ srOnly }} {{ password_label_class_list|default(['col-form-label', 'col-sm-4'])|join(' ') }}">{{ "Password"|xlt }}</label>
-    <div class="{{ password_input_container_class_list|default(['col'])|join(' ') }}">
+    <div class="{{ password_input_container_class_list|default(['col'])|join(' ') }} input-group">
         <input type="password" class="form-control" id="clearPass" name="clearPass" placeholder="{{ "Password"|xla }}">
+        <div class="input-group-append">
+            <span class="input-group-text">
+                <i class="fa fa-eye" id="password-icon" style="cursor: pointer;"></i>
+            </span>
+        </div>
     </div>
 </div>
 {% endblock %}