diff --git a/agent/accounts.php b/agent/accounts.php
index bac7010b..56b62356 100644
--- a/agent/accounts.php
+++ b/agent/accounts.php
@@ -25,7 +25,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <div class="card-header py-2">
             <h3 class="card-title mt-2"><i class="fa fa-fw fa-piggy-bank mr-2"></i>Accounts</h3>
             <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAccountModal"><i class="fas fa-plus mr-2"></i>New Account</button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/account/account_add.php"><i class="fas fa-plus mr-2"></i>New Account</button>
             </div>
         </div>
         <div class="card-body">
@@ -123,6 +123,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-
-require_once "modals/account/account_add.php";
 require_once "../includes/footer.php";
diff --git a/agent/asset_details.php b/agent/asset_details.php
index 11237c9b..8a5848ca 100644
--- a/agent/asset_details.php
+++ b/agent/asset_details.php
@@ -373,11 +373,11 @@ if (isset($_GET['asset_id'])) {
                                 <i class="fa fa-fw fa-key mr-2"></i>New Credential
                             </a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addDocumentModal">
+                            <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/document/document_add.php?<?= $client_url ?>&asset_id=<?= $asset_id ?>" data-modal-size="lg">
                                 <i class="fa fa-fw fa-file-alt mr-2"></i>New Document
                             </a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#uploadFilesModal">
+                            <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/file/file_upload.php?<?= $client_url ?>&asset_id=<?= $asset_id ?>">
                                 <i class="fa fa-fw fa-upload mr-2"></i>Upload file(s)
                             </a>
                         </div>
@@ -419,7 +419,7 @@ if (isset($_GET['asset_id'])) {
                         <h3 class="card-title mt-2"><i class="fa fa-fw fa-ethernet mr-2"></i>Interfaces</h3>
                         <div class="card-tools">
                             <div class="btn-group">
-                                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAssetInterfaceModal">
+                                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/asset/asset_interface_add.php?&asset_id=<?= $asset_id ?>">
                                     <i class="fas fa-plus mr-2"></i>New Interface
                                 </button>
                                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
@@ -1220,13 +1220,9 @@ if (isset($_GET['asset_id'])) {
     <script src="../js/bulk_actions.js"></script>
 
     <?php
-
-    require_once "modals/asset/asset_interface_add.php";
     require_once "modals/asset/asset_interface_multiple_add.php";
     require_once "modals/asset/asset_interface_import.php";
     require_once "modals/asset/asset_interface_export.php";
-    require_once "modals/document/document_add.php";
-    require_once "modals/file/file_upload.php";
 
 }
 
diff --git a/agent/contact_details.php b/agent/contact_details.php
index b9b1e39d..503f319c 100644
--- a/agent/contact_details.php
+++ b/agent/contact_details.php
@@ -278,11 +278,11 @@ if (isset($_GET['contact_id'])) {
                             <i class="fa fa-fw fa-key mr-2"></i>New Credential
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#addDocumentModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/document/document_add.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>" data-modal-size="lg">
                             <i class="fa fa-fw fa-file-alt mr-2"></i>New Document
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#uploadFilesModal">
+                        <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/file/file_upload.php?<?= $client_url ?>&contact_id=<?= $contact_id ?>">
                             <i class="fa fa-fw fa-upload mr-2"></i>Upload file(s)
                         </a>
                         <div class="dropdown-divider"></div>
@@ -1179,8 +1179,4 @@ if (isset($_GET['contact_id'])) {
     <script src="js/credential_show_otp_via_id.js"></script>
 
 <?php
-
-require_once "modals/document/document_add.php";
-require_once "modals/file/file_upload.php";
-
 require_once "../includes/footer.php";
diff --git a/agent/documents.php b/agent/documents.php
index e6f0e2f4..dd8b9355 100644
--- a/agent/documents.php
+++ b/agent/documents.php
@@ -92,12 +92,12 @@ while ($folder_id > 0) {
         <div class="card-tools">
 
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDocumentModal">
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/document/document_add.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>" data-modal-size="lg">
                     <i class="fas fa-plus mr-2"></i>New Document
                 </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
-                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#createFolderModal">
+                    <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/folder/folder_add.php?client_id=<?= $client_id ?>&folder_location=0&current_folder_id=<?= $get_folder_id ?>">
                         <i class="fa fa-fw fa-folder-plus mr-2"></i>New Folder
                     </a>
                     <div class="dropdown-divider"></div>
@@ -276,7 +276,6 @@ while ($folder_id > 0) {
                     display_folders(0, $client_id);
                     ?>
                 </ul>
-                <?php require_once "modals/folder/folder_add.php"; ?>
             </div>
 
             <div class="col-md-9">
@@ -479,6 +478,5 @@ while ($folder_id > 0) {
 
 <?php
 require_once "modals/share_modal.php";
-require_once "modals/document/document_add.php";
 require_once "modals/document/document_add_from_template.php";
 require_once "../includes/footer.php";
diff --git a/agent/expenses.php b/agent/expenses.php
index 8c07f446..6fd1688d 100644
--- a/agent/expenses.php
+++ b/agent/expenses.php
@@ -64,7 +64,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <h3 class="card-title mt-2"><i class="fas fa-fw fa-shopping-cart mr-2"></i>Expenses</h3>
             <div class="card-tools">
                 <div class="btn-group">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addExpenseModal"><i class="fas fa-plus mr-2"></i>New Expense</button>
+                    <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/expense/expense_add.php" data-modal-size="lg"><i class="fas fa-plus mr-2"></i>New Expense</button>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu">
                         <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportExpensesModal">
@@ -357,7 +357,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/expense/expense_add.php";
 require_once "modals/expense/expense_export.php";
 
 require_once "../includes/footer.php";
diff --git a/agent/files.php b/agent/files.php
index 8987e51b..9bf77b44 100644
--- a/agent/files.php
+++ b/agent/files.php
@@ -99,12 +99,12 @@ while ($folder_id > 0) {
 
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#uploadFilesModal">
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/file/file_upload.php?client_id=<?= $client_id ?>&folder_id=<?= $get_folder_id ?>">
                     <i class="fas fa-fw fa-cloud-upload-alt mr-2"></i>Upload
                 </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
-                    <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#createFolderModal">
+                    <a class="dropdown-item text-dark ajax-modal" href="#" data-modal-url="modals/folder/folder_add.php?client_id=<?= $client_id ?>&folder_location=1&current_folder_id=<?= $get_folder_id ?>">
                         <i class="fa fa-fw fa-folder-plus mr-2"></i>New Folder
                     </a>
                 </div>
@@ -228,7 +228,7 @@ while ($folder_id > 0) {
                     display_folders(0, $client_id);
                     ?>
                 </ul>
-                <?php require_once "modals/folder/folder_add.php"; ?>
+                <?php //require_once "modals/folder/folder_add.php"; ?>
             </div>
 
 
@@ -620,7 +620,6 @@ function prevFile() {
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/file/file_upload.php";
 require_once "modals/share_modal.php";
 require_once "modals/file/file_delete.php";
 require_once "../includes/footer.php";
diff --git a/agent/invoices.php b/agent/invoices.php
index 9423c58d..826fb19c 100644
--- a/agent/invoices.php
+++ b/agent/invoices.php
@@ -162,7 +162,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <h3 class="card-title mt-2"><i class="fa fa-fw fa-file-invoice mr-2"></i>Invoices</h3>
         <div class="card-tools">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addInvoiceModal"><i class="fas fa-plus mr-2"></i>New Invoice</button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/invoice/invoice_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Invoice</button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
                     <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportInvoicesModal">
@@ -447,7 +447,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/invoice/invoice_add.php";
 if ($client_url) { require_once "modals/payment/payment_bulk_add.php"; }
 require_once "modals/invoice/invoice_export.php";
 require_once "../includes/footer.php";
diff --git a/agent/modals/account/account_add.php b/agent/modals/account/account_add.php
index c2271d00..2796fc52 100644
--- a/agent/modals/account/account_add.php
+++ b/agent/modals/account/account_add.php
@@ -1,63 +1,67 @@
-<div class="modal" id="addAccountModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-piggy-bank mr-2"></i>New Account</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+<?php
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
-                        <label>Account Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Account name" maxlength="200" required autofocus>
-                        </div>
-                    </div>
+ob_start();
 
-                    <div class="form-group">
-                        <label>Opening Balance <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
-                            </div>
-                            <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="opening_balance" placeholder="0.00" required>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Currency <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
-                            </div>
-                            <select class="form-control select2" name="currency_code" required>
-                                <option value="">- Currency -</option>
-                                <?php foreach ($currencies_array as $currency_code => $currency_name) { ?>
-                                    <option <?php if ($session_company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Notes</label>
-                        <textarea class="form-control" rows="5" placeholder="Enter some notes" name="notes"></textarea>
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_account" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-piggy-bank mr-2"></i>New Account</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Account Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Account name" maxlength="200" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Opening Balance <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
+                </div>
+                <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="opening_balance" placeholder="0.00" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Currency <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
+                </div>
+                <select class="form-control select2" name="currency_code" required>
+                    <option value="">- Currency -</option>
+                    <?php foreach ($currencies_array as $currency_code => $currency_name) { ?>
+                        <option <?php if ($session_company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Notes</label>
+            <textarea class="form-control" rows="5" placeholder="Enter some notes" name="notes"></textarea>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_account" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/asset/asset_interface_add.php b/agent/modals/asset/asset_interface_add.php
index 6016ca32..3548dadf 100644
--- a/agent/modals/asset/asset_interface_add.php
+++ b/agent/modals/asset/asset_interface_add.php
@@ -1,224 +1,231 @@
-<div class="modal" id="addAssetInterfaceModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-ethernet mr-2"></i>New Network Interface</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$asset_id = intval($_GET['asset_id'] ?? 0);
+$client_id = intval(getFieldById('assets', $asset_id, 'asset_client_id') ?? 0);
+
+ob_start();
+
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-ethernet mr-2"></i>New Network Interface</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
+    <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+    <div class="modal-body">
+
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-interface-details">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-interface-network">Network</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-interface-notes">Notes</a>
+            </li>
+        </ul>
+
+        <hr>
+
+        <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pills-interface-details">
+
+                <!-- Interface Name -->
+                <div class="form-group">
+                    <label>Interface Name or Port / <span class="text-secondary">Primary</span></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name" placeholder="Interface name or port number" maxlength="200" required>
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <input type="checkbox" name="primary_interface" value="1" title="Mark Interface as primary">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- Type -->
+                <div class="form-group">
+                    <label for="network">Type</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-plug"></i></span>
+                        </div>
+                        <select class="form-control select2" name="type">
+                            <option value="">- Select Type -</option>
+                            <?php foreach($interface_types_array as $interface_type) { ?>
+                                <option><?php echo $interface_type; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+                <!-- Interface Description -->
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                        </div>
+                        <input 
+                            type="text" 
+                            class="form-control" 
+                            name="description"
+                            placeholder="Short Description" 
+                            maxlength="200"
+                        >
+                    </div>
+                </div>
+
             </div>
 
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-
-                <div class="modal-body">
-
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-interface-details">Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-interface-network">Network</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-interface-notes">Notes</a>
-                        </li>
-                    </ul>
-
-                    <hr>
-
-                    <div class="tab-content">
-
-                        <div class="tab-pane fade show active" id="pills-interface-details">
-
-                            <!-- Interface Name -->
-                            <div class="form-group">
-                                <label>Interface Name or Port / <span class="text-secondary">Primary</span></label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Interface name or port number" maxlength="200" required>
-                                    <div class="input-group-append">
-                                        <div class="input-group-text">
-                                            <input type="checkbox" name="primary_interface" value="1" title="Mark Interface as primary">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- Type -->
-                            <div class="form-group">
-                                <label for="network">Type</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-plug"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="type">
-                                        <option value="">- Select Type -</option>
-                                        <?php foreach($interface_types_array as $interface_type) { ?>
-                                            <option><?php echo $interface_type; ?></option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                            <!-- Interface Description -->
-                            <div class="form-group">
-                                <label>Description</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-                                    </div>
-                                    <input 
-                                        type="text" 
-                                        class="form-control" 
-                                        name="description"
-                                        placeholder="Short Description" 
-                                        maxlength="200"
-                                    >
-                                </div>
-                            </div>
+            <div class="tab-pane fade" id="pills-interface-network">
 
+                <!-- MAC Address -->
+                <div class="form-group">
+                    <label>MAC Address</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
                         </div>
-
-                        <div class="tab-pane fade" id="pills-interface-network">
-
-                            <!-- MAC Address -->
-                            <div class="form-group">
-                                <label>MAC Address</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
-                                </div>
-                            </div>
-
-                            <!-- IP (with optional DHCP checkbox) -->
-                            <div class="form-group">
-                                <label>IP or DHCP</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="ip" placeholder="IP Address" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
-                                    <div class="input-group-append">
-                                        <div class="input-group-text">
-                                            <input type="checkbox" name="dhcp" value="1" title="Check to mark address as DHCP controlled">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <!-- NAT IP -->
-                            <div class="form-group">
-                                <label>NAT IP</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                                    </div>
-                                    <input
-                                        type="text"
-                                        class="form-control"
-                                        name="nat_ip"
-                                        placeholder="Nat IP"
-                                        maxlength="200"
-                                        data-inputmask="'alias': 'ip'"
-                                        data-mask
-                                    >
-                                </div>
-                            </div>
-
-                            <!-- IPv6 -->
-                            <div class="form-group">
-                                <label>IPv6</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="ipv6" placeholder="IPv6 Address" maxlength="200">
-                                </div>
-                            </div>
-
-                            <!-- Network -->
-                            <div class="form-group">
-                                <label>Network</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="network">
-                                        <option value="">- Select Network -</option>
-                                        <?php
-                                        $sql_network_select = mysqli_query($mysqli, "SELECT * FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC");
-                                        while ($row = mysqli_fetch_array($sql_network_select)) {
-                                            $network_id = $row['network_id'];
-                                            $network_name = nullable_htmlentities($row['network_name']);
-                                            $network = nullable_htmlentities($row['network']);
-                                            ?>
-                                            <option value="<?php echo $network_id; ?>">
-                                                <?php echo "$network_name - $network"; ?>
-                                            </option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Connected to</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="connected_to">
-                                        <option value="">- NSelect Asset and Interface -</option>
-                                        <?php
-                                        $sql_interfaces_select = mysqli_query($mysqli, "
-                                            SELECT i.interface_id, i.interface_name, a.asset_name
-                                            FROM asset_interfaces i
-                                            LEFT JOIN assets a ON a.asset_id = i.interface_asset_id
-                                            WHERE a.asset_archived_at IS NULL
-                                              AND a.asset_client_id = $client_id
-                                              AND a.asset_id != $asset_id
-                                              AND i.interface_id NOT IN (SELECT interface_a_id FROM asset_interface_links)
-                                              AND i.interface_id NOT IN (SELECT interface_b_id FROM asset_interface_links)
-                                            ORDER BY a.asset_name ASC, i.interface_name ASC
-                                        ");
-
-                                        while ($row = mysqli_fetch_array($sql_interfaces_select)) {
-                                            $interface_id_select = intval($row['interface_id']);
-                                            $interface_name_select = nullable_htmlentities($row['interface_name']);
-                                            $asset_name_select = nullable_htmlentities($row['asset_name']);
-                                            ?>
-                                            <option value="<?php echo $interface_id_select; ?>">
-                                                <?php echo "$asset_name_select - $interface_name_select"; ?>
-                                            </option>
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-interface-notes">
-                            <!-- Notes -->
-                            <div class="form-group">
-                                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
-                            </div>
-                        </div>
-
+                        <input type="text" class="form-control" name="mac" placeholder="MAC Address" data-inputmask="'alias': 'mac'" maxlength="200" data-mask>
                     </div>
+                </div>
 
+                <!-- IP (with optional DHCP checkbox) -->
+                <div class="form-group">
+                    <label>IP or DHCP</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="ip" placeholder="IP Address" data-inputmask="'alias': 'ip'" maxlength="200" data-mask>
+                        <div class="input-group-append">
+                            <div class="input-group-text">
+                                <input type="checkbox" name="dhcp" value="1" title="Check to mark address as DHCP controlled">
+                            </div>
+                        </div>
+                    </div>
                 </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_asset_interface" class="btn btn-primary text-bold">
-                        <i class="fas fa-check mr-2"></i>Create
-                    </button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Close</button>
+
+                <!-- NAT IP -->
+                <div class="form-group">
+                    <label>NAT IP</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                        </div>
+                        <input
+                            type="text"
+                            class="form-control"
+                            name="nat_ip"
+                            placeholder="Nat IP"
+                            maxlength="200"
+                            data-inputmask="'alias': 'ip'"
+                            data-mask
+                        >
+                    </div>
                 </div>
-            </form>
+
+                <!-- IPv6 -->
+                <div class="form-group">
+                    <label>IPv6</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-ethernet"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="ipv6" placeholder="IPv6 Address" maxlength="200">
+                    </div>
+                </div>
+
+                <!-- Network -->
+                <div class="form-group">
+                    <label>Network</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
+                        </div>
+                        <select class="form-control select2" name="network">
+                            <option value="">- Select Network -</option>
+                            <?php
+                            $sql_network_select = mysqli_query($mysqli, "SELECT * FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC");
+                            while ($row = mysqli_fetch_array($sql_network_select)) {
+                                $network_id = $row['network_id'];
+                                $network_name = nullable_htmlentities($row['network_name']);
+                                $network = nullable_htmlentities($row['network']);
+                                ?>
+                                <option value="<?php echo $network_id; ?>">
+                                    <?php echo "$network_name - $network"; ?>
+                                </option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Connected to</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
+                        </div>
+                        <select class="form-control select2" name="connected_to">
+                            <option value="">- Select Asset and Interface -</option>
+                            <?php
+                            $sql_interfaces_select = mysqli_query($mysqli, "
+                                SELECT interface_id, interface_name, asset_name
+                                FROM asset_interfaces
+                                LEFT JOIN assets ON asset_id = interface_asset_id
+                                WHERE asset_archived_at IS NULL
+                                  AND asset_client_id = $client_id
+                                  AND asset_id != $asset_id
+                                  AND interface_id NOT IN (SELECT interface_a_id FROM asset_interface_links)
+                                  AND interface_id NOT IN (SELECT interface_b_id FROM asset_interface_links)
+                                ORDER BY asset_name ASC, interface_name ASC
+                            ");
+
+                            while ($row = mysqli_fetch_array($sql_interfaces_select)) {
+                                $interface_id_select = intval($row['interface_id']);
+                                $interface_name_select = nullable_htmlentities($row['interface_name']);
+                                $asset_name_select = nullable_htmlentities($row['asset_name']);
+                                ?>
+                                <option value="<?php echo $interface_id_select; ?>">
+                                    <?php echo "$asset_name_select - $interface_name_select"; ?>
+                                </option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-interface-notes">
+                <!-- Notes -->
+                <div class="form-group">
+                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
+                </div>
+            </div>
+
         </div>
+
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_asset_interface" class="btn btn-primary text-bold">
+            <i class="fas fa-check mr-2"></i>Create
+        </button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Close</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/document/document_add.php b/agent/modals/document/document_add.php
index 386cfebc..61e90e07 100644
--- a/agent/modals/document/document_add.php
+++ b/agent/modals/document/document_add.php
@@ -1,61 +1,66 @@
-<div class="modal" id="addDocumentModal" tabindex="-1">
-    <div class="modal-dialog modal-xl">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>New Document</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+$contact_id = intval($_GET['contact_id'] ?? 0);
+$asset_id = intval($_GET['asset_id'] ?? 0);
+intval($_GET['folder_id'] ?? 0);
+
+ob_start();
+
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>New Document</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+    <input type="hidden" name="contact" value="<?= $contact_id ?>">
+    <input type="hidden" name="asset" value="<?= $asset_id ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <input type="text" class="form-control" name="name" placeholder="Name" maxlength="200" required autofocus>
+        </div>
+
+        <div class="form-group">
+            <textarea class="form-control tinymce" name="content"></textarea>
+        </div>
+
+        <div class="form-group">
+            <label>Select Folder</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
+                </div>
+                <select class="form-control select2" name="folder">
+                    <option value="0">/</option>
+                    <?php
+                    // Start displaying folder options from the root (parent_folder = 0)
+                    display_folder_options(0, $client_id);
+                    ?>
+                </select>
             </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php if (isset($_GET['contact_id'])) { ?>
-                <input type="hidden" name="contact" value="<?php echo intval($_GET['contact_id']); ?>">
-                <?php } ?>
-                <?php if (isset($_GET['asset_id'])) { ?>
-                <input type="hidden" name="asset" value="<?php echo intval($_GET['asset_id']); ?>">
-                <?php } ?>
-                <div class="modal-body">
+        </div>
 
-                    <div class="form-group">
-                        <input type="text" class="form-control" name="name" placeholder="Name" maxlength="200" required autofocus>
-                    </div>
-
-                    <div class="form-group">
-                        <textarea class="form-control tinymce" name="content"></textarea>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Select Folder</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
-                            </div>
-                            <select class="form-control select2" name="folder">
-                                <option value="0">/</option>
-                                <?php
-                                // Start displaying folder options from the root (parent_folder = 0)
-                                display_folder_options(0, $client_id);
-                                ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Description</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="description" placeholder="Short summary of the document">
-                        </div>
-                    </div>
+        <div class="form-group">
+            <label>Description</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
                 </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
+                <input type="text" class="form-control" name="description" placeholder="Short summary of the document">
+            </div>
         </div>
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/expense/expense_add.php b/agent/modals/expense/expense_add.php
index dee8f8f6..97e21f7b 100644
--- a/agent/modals/expense/expense_add.php
+++ b/agent/modals/expense/expense_add.php
@@ -1,198 +1,204 @@
-<div class="modal" id="addExpenseModal" tabindex="-1">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-cart-plus mr-2"></i>New Expense</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-                <div class="modal-body">
+<?php
 
-                    <div class="form-row">
-                        <div class="form-group col-md">
-                            <label>Date <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                                </div>
-                                <input type="date" class="form-control" name="date" max="2999-12-31" required>
-                            </div>
-                        </div>
+require_once '../../../includes/modal_header.php';
 
-                        <div class="form-group col-md">
-                            <label>Amount <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
-                                </div>
-                                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" required>
-                            </div>
-                        </div>
-                    </div>
+$client_id = intval($_GET['client_id'] ?? 0);
 
-                    <div class="form-row">
-                        <div class="form-group col-md">
-                            <label>Account <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
-                                </div>
-                                <select class="form-control select2" name="account" required>
-                                    <option value="">- Account -</option>
-                                    <?php
+ob_start();
 
-                                    $sql = mysqli_query($mysqli, "SELECT account_id, account_name, opening_balance FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $account_id = intval($row['account_id']);
-                                        $account_name = nullable_htmlentities($row['account_name']);
-                                        $opening_balance = floatval($row['opening_balance']);
-
-                                        $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
-                                        $row = mysqli_fetch_array($sql_payments);
-                                        $total_payments = floatval($row['total_payments']);
-
-                                        $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
-                                        $row = mysqli_fetch_array($sql_revenues);
-                                        $total_revenues = floatval($row['total_revenues']);
-
-                                        $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
-                                        $row = mysqli_fetch_array($sql_expenses);
-                                        $total_expenses = floatval($row['total_expenses']);
-
-                                        $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
-
-                                        ?>
-                                        <option <?php if ($config_default_expense_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><div class="float-left"><?php echo $account_name; ?></div><div class="float-right"> [$<?php echo number_format($balance, 2); ?>]</div></option>
-
-                                        <?php
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-                        </div>
-
-                        <div class="form-group col-md">
-                            <label>Vendor <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-                                </div>
-                                <select class="form-control select2" name="vendor" required>
-                                    <option value="">- Vendor -</option>
-                                    <?php
-
-                                    $sql = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = 0 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $vendor_id = intval($row['vendor_id']);
-                                        $vendor_name = nullable_htmlentities($row['vendor_name']);
-                                        ?>
-                                        <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
-
-                                        <?php
-                                    }
-                                    ?>
-                                </select>
-                                <div class="input-group-append">
-                                    <a class="btn btn-secondary" href="vendors.php" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Description <strong class="text-danger">*</strong></label>
-                        <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required></textarea>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Reference</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="reference" placeholder="Enter a reference" maxlength="200">
-                        </div>
-                    </div>
-
-                    <div class="form-row">
-
-                        <div class="form-group col-md">
-                            <label>Category <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
-                                </div>
-                                <select class="form-control select2" name="category" required>
-                                    <option value="">- Category -</option>
-                                    <?php
-
-                                    $sql = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Expense' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $category_id = intval($row['category_id']);
-                                        $category_name = nullable_htmlentities($row['category_name']);
-                                        ?>
-                                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-
-                                        <?php
-                                    }
-                                    ?>
-                                </select>
-                                <div class="input-group-append">
-                                    <button class="btn btn-secondary ajax-modal" type="button"
-                                        data-modal-url="../admin/modals/category/category_add.php?category=Expense">
-                                        <i class="fas fa-plus"></i>
-                                    </button>
-                                </div>
-                            </div>
-
-
-                        </div>
-
-                        <?php if (isset($_GET['client_id'])) { ?>
-                            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-                        <?php } else { ?>
-
-                            <div class="form-group col-md">
-                                <label>Client</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="client" required>
-                                        <option value="0">- Client (Optional) -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients ORDER BY client_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $client_id = intval($row['client_id']);
-                                            $client_name = nullable_htmlentities($row['client_name']);
-                                            ?>
-                                            <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
-
-                                            <?php
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                        <?php } ?>
-
-                    </div>
-
-                    <div class="form-group col-md">
-                        <label>Receipt</label>
-                        <input type="file" class="form-control-file" name="file" accept="image/*, application/pdf">
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-cart-plus mr-2"></i>New Expense</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+    <div class="modal-body">
+
+        <div class="form-row">
+            <div class="form-group col-md">
+                <label>Date <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                    </div>
+                    <input type="date" class="form-control" name="date" max="2999-12-31" required>
+                </div>
+            </div>
+
+            <div class="form-group col-md">
+                <label>Amount <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
+                    </div>
+                    <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" required>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-row">
+            <div class="form-group col-md">
+                <label>Account <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
+                    </div>
+                    <select class="form-control select2" name="account" required>
+                        <option value="">- Account -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT account_id, account_name, opening_balance FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $account_id = intval($row['account_id']);
+                            $account_name = nullable_htmlentities($row['account_name']);
+                            $opening_balance = floatval($row['opening_balance']);
+
+                            $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
+                            $row = mysqli_fetch_array($sql_payments);
+                            $total_payments = floatval($row['total_payments']);
+
+                            $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
+                            $row = mysqli_fetch_array($sql_revenues);
+                            $total_revenues = floatval($row['total_revenues']);
+
+                            $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
+                            $row = mysqli_fetch_array($sql_expenses);
+                            $total_expenses = floatval($row['total_expenses']);
+
+                            $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
+
+                            ?>
+                            <option <?php if ($config_default_expense_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><div class="float-left"><?php echo $account_name; ?></div><div class="float-right"> [$<?php echo number_format($balance, 2); ?>]</div></option>
+
+                            <?php
+                        }
+                        ?>
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group col-md">
+                <label>Vendor <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                    </div>
+                    <select class="form-control select2" name="vendor" required>
+                        <option value="">- Vendor -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = 0 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $vendor_id = intval($row['vendor_id']);
+                            $vendor_name = nullable_htmlentities($row['vendor_name']);
+                            ?>
+                            <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+
+                            <?php
+                        }
+                        ?>
+                    </select>
+                    <div class="input-group-append">
+                        <a class="btn btn-secondary" href="vendors.php" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Description <strong class="text-danger">*</strong></label>
+            <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required></textarea>
+        </div>
+
+        <div class="form-group">
+            <label>Reference</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
+                </div>
+                <input type="text" class="form-control" name="reference" placeholder="Enter a reference" maxlength="200">
+            </div>
+        </div>
+
+        <div class="form-row">
+
+            <div class="form-group col-md">
+                <label>Category <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                    </div>
+                    <select class="form-control select2" name="category" required>
+                        <option value="">- Category -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Expense' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $category_id = intval($row['category_id']);
+                            $category_name = nullable_htmlentities($row['category_name']);
+                            ?>
+                            <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+
+                            <?php
+                        }
+                        ?>
+                    </select>
+                    <div class="input-group-append">
+                        <button class="btn btn-secondary ajax-modal" type="button"
+                            data-modal-url="../admin/modals/category/category_add.php?category=Expense">
+                            <i class="fas fa-plus"></i>
+                        </button>
+                    </div>
+                </div>
+
+
+            </div>
+
+            <?php if ($client_id) { ?>
+                <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+            <?php } else { ?>
+
+                <div class="form-group col-md">
+                    <label>Client</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                        </div>
+                        <select class="form-control select2" name="client" required>
+                            <option value="0">- Client (Optional) -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients ORDER BY client_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $client_id_select = intval($row['client_id']);
+                                $client_name = nullable_htmlentities($row['client_name']);
+                                ?>
+                                <option value="<?= $client_id_select ?>"><?= $client_name ?></option>
+
+                                <?php
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+
+            <?php } ?>
+
+        </div>
+
+        <div class="form-group col-md">
+            <label>Receipt</label>
+            <input type="file" class="form-control-file" name="file" accept="image/*, application/pdf">
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/file/file_upload.php b/agent/modals/file/file_upload.php
index 8f1dab72..db8f2bc6 100644
--- a/agent/modals/file/file_upload.php
+++ b/agent/modals/file/file_upload.php
@@ -1,62 +1,64 @@
-<div class="modal" id="uploadFilesModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-cloud-upload-alt mr-2"></i>Upload File(s)</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <?php if (isset($_GET['contact_id'])) { ?>
-                <input type="hidden" name="contact" value="<?php echo intval($_GET['contact_id']); ?>">
-                <?php } ?>
-                <?php if (isset($_GET['asset_id'])) { ?>
-                <input type="hidden" name="asset" value="<?php echo intval($_GET['asset_id']); ?>">
-                <?php } ?>
-                <div class="modal-body">
+<?php
 
-                    <div class="form-group">
-                        <label>Description</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="description" maxlength="250" placeholder="Description of the file(s)">
-                        </div>
-                    </div>
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group mb-4">
-                        <label>Folder</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
-                            </div>
-                            <select class="form-control select2" name="folder_id">
-                                <option value="0">/</option>
-                                <?php
-                                // Start displaying folder options from the root (parent_folder = 0)
-                                display_folder_options(0, $client_id, 1);
-                                ?>
-                            </select>
-                        </div>
-                    </div>
+$client_id = intval($_GET['client_id'] ?? 0);
+$contact_id = intval($_GET['contact_id'] ?? 0);
+$asset_id = intval($_GET['asset_id'] ?? 0);
+intval($_GET['folder_id'] ?? 0);
 
-                    <div class="form-group">
-                        <input type="file" class="form-control-file" name="file[]" multiple id="fileInput" accept=".jpg, .jpeg, .gif, .png, .webp, .pdf, .txt, .md, .doc, .docx, .odt, .csv, .xls, .xlsx, .ods, .pptx, .odp, .zip, .tar, .gz, .msg, .json, .wav, .mp3, .ogg, .mov, .mp4, .av1, .ovpn, .cfg, .ps1, .vsdx, .drawio, .pfx, .unf, .key, .stk, .bat">
-                    </div>
-                    <small class="text-secondary">Up to 20 files can be uploaded at once by holding down CTRL and selecting files</small>
+ob_start();
 
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="upload_files" class="btn btn-primary text-bold"><i class="fa fa-upload mr-2"></i>Upload</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-cloud-upload-alt mr-2"></i>Upload File(s)</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+    <input type="hidden" name="contact" value="<?php echo $contact_id; ?>">
+    <input type="hidden" name="asset" value="<?php echo $asset_id; ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Description</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                </div>
+                <input type="text" class="form-control" name="description" maxlength="250" placeholder="Description of the file(s)">
+            </div>
+        </div>
+
+        <div class="form-group mb-4">
+            <label>Folder</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
+                </div>
+                <select class="form-control select2" name="folder_id">
+                    <option value="0">/</option>
+                    <?php
+                    // Start displaying folder options from the root (parent_folder = 0)
+                    display_folder_options(0, $client_id, 1);
+                    ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <input type="file" class="form-control-file" name="file[]" multiple id="fileInput" accept=".jpg, .jpeg, .gif, .png, .webp, .pdf, .txt, .md, .doc, .docx, .odt, .csv, .xls, .xlsx, .ods, .pptx, .odp, .zip, .tar, .gz, .msg, .json, .wav, .mp3, .ogg, .mov, .mp4, .av1, .ovpn, .cfg, .ps1, .vsdx, .drawio, .pfx, .unf, .key, .stk, .bat">
+        </div>
+        <small class="text-secondary">Up to 20 files can be uploaded at once by holding down CTRL and selecting files</small>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="upload_files" class="btn btn-primary text-bold"><i class="fa fa-upload mr-2"></i>Upload</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
 
 <script>
     const maxFiles = 20; // Set the maximum number of allowed files
@@ -94,3 +96,6 @@
         fileInput.value = ''; // Clear the selected files
     }
 </script>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/folder/folder_add.php b/agent/modals/folder/folder_add.php
index cc532b31..39acdda4 100644
--- a/agent/modals/folder/folder_add.php
+++ b/agent/modals/folder/folder_add.php
@@ -1,34 +1,43 @@
-<div class="modal" id="createFolderModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-folder-plus mr-2"></i>Creating folder in <strong><?php if($get_folder_id > 0) { echo $folder_path[count($folder_path)-1]['folder_name']; } else { echo "/"; } ?></strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <input type="hidden" name="folder_location" value="<?php echo $folder_location; ?>">
-                <input type="hidden" name="parent_folder" value="<?php echo $get_folder_id; ?>">
-                <div class="modal-body">
+<?php
 
-                    <div class="form-group">
-                        <label>Folder Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="folder_name" placeholder="Folder Name" maxlength="200" required>
-                        </div>
-                    </div>
+require_once '../../../includes/modal_header.php';
 
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="create_folder" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+$client_id = intval($_GET['client_id'] ?? 0);
+$folder_location = intval($_GET['folder_location'] ?? 0);
+$current_folder_id = intval($_GET['current_folder_id'] ?? 0);
+$folder_name = nullable_htmlentities(getFieldByID('folders', $current_folder_id, 'folder_name') ?? '/');
+
+ob_start();
+
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-folder-plus mr-2"></i>Creating folder in <strong><?= $folder_name ?></strong></h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="client_id" value="<?= $client_id ?>">
+    <input type="hidden" name="folder_location" value="<?= $folder_location ?>">
+    <input type="hidden" name="parent_folder" value="<?= $current_folder_id ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Folder Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
+                </div>
+                <input type="text" class="form-control" name="folder_name" placeholder="Folder Name" maxlength="200" required>
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="create_folder" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/folder/folder_rename.php b/agent/modals/folder/folder_rename.php
index 917b551b..939bea47 100644
--- a/agent/modals/folder/folder_rename.php
+++ b/agent/modals/folder/folder_rename.php
@@ -42,4 +42,3 @@ ob_start();
 
 <?php
 require_once '../../../includes/modal_footer.php';
-
diff --git a/agent/modals/invoice/invoice_add.php b/agent/modals/invoice/invoice_add.php
index 5339907a..6c659798 100644
--- a/agent/modals/invoice/invoice_add.php
+++ b/agent/modals/invoice/invoice_add.php
@@ -1,102 +1,108 @@
-<div class="modal" id="addInvoiceModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-file-invoice mr-2"></i>New Invoice</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
+<?php
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
-                        <label>Scope</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="scope" placeholder="Quick description" maxlength="255">
-                        </div>
-                    </div>
+$client_id = intval($_GET['client_id'] ?? 0);
 
-                    <?php if (isset($_GET['client_id'])) { ?>
-                        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-                    <?php }else{ ?>
+ob_start();
 
-                        <div class="form-group">
-                            <label>Client <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                </div>
-                                <select class="form-control select2" name="client" required>
-                                    <option value="">- Client -</option>
-                                    <?php
-                                    //select unarchived clients
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $client_id = intval($row['client_id']);
-                                        $client_name = nullable_htmlentities($row['client_name']);
-                                        ?>
-                                        <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
-
-                                        <?php
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-                        </div>
-
-                    <?php } ?>
-
-                    <div class="form-group">
-                        <label>Category <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-                            </div>
-                            <select class="form-control select2" name="category" required>
-                                <option value="">- Category -</option>
-                                <?php
-
-                                $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                                while ($row = mysqli_fetch_array($sql)) {
-                                    $category_id = intval($row['category_id']);
-                                    $category_name = nullable_htmlentities($row['category_name']);
-                                    ?>
-                                    <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-
-                                    <?php
-                                }
-                                ?>
-                            </select>
-                            <div class="input-group-append">
-                                <button class="btn btn-secondary ajax-modal" type="button"
-                                    data-modal-url="../admin/modals/category/category_add.php?category=Income">
-                                    <i class="fas fa-fw fa-plus"></i>
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Invoice Date <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                            </div>
-                            <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_invoice" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-file-invoice mr-2"></i>New Invoice</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Scope</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
+                </div>
+                <input type="text" class="form-control" name="scope" placeholder="Quick description" maxlength="255">
+            </div>
+        </div>
+
+        <?php if ($client_id) { ?>
+            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+        <?php }else{ ?>
+
+            <div class="form-group">
+                <label>Client <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                    </div>
+                    <select class="form-control select2" name="client" required>
+                        <option value="">- Client -</option>
+                        <?php
+                        //select unarchived clients
+                        $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $client_id_select = intval($row['client_id']);
+                            $client_name = nullable_htmlentities($row['client_name']);
+                            ?>
+                            <option value="<?php echo $client_id_select; ?>"><?php echo "$client_name"; ?></option>
+
+                            <?php
+                        }
+                        ?>
+                    </select>
+                </div>
+            </div>
+
+        <?php } ?>
+
+        <div class="form-group">
+            <label>Category <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                </div>
+                <select class="form-control select2" name="category" required>
+                    <option value="">- Category -</option>
+                    <?php
+
+                    $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $category_id = intval($row['category_id']);
+                        $category_name = nullable_htmlentities($row['category_name']);
+                        ?>
+                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+
+                        <?php
+                    }
+                    ?>
+                </select>
+                <div class="input-group-append">
+                    <button class="btn btn-secondary ajax-modal" type="button"
+                        data-modal-url="../admin/modals/category/category_add.php?category=Income">
+                        <i class="fas fa-fw fa-plus"></i>
+                    </button>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Invoice Date <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                </div>
+                <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_invoice" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/quote/quote_add.php b/agent/modals/quote/quote_add.php
index 6860cd12..eae09490 100644
--- a/agent/modals/quote/quote_add.php
+++ b/agent/modals/quote/quote_add.php
@@ -1,110 +1,116 @@
-<div class="modal" id="addQuoteModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-comment-dollar mr-2"></i>New Quote</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-comment-dollar mr-2"></i>New Quote</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Scope</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
+                </div>
+                <input type="text" class="form-control" name="scope" placeholder="Quick description" maxlength="255">
             </div>
-            <form action="post.php" method="post" autocomplete="off">
+        </div>
 
-                <div class="modal-body">
+        <?php if ($client_id) { ?>
+            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+        <?php } else { ?>
 
-                    <div class="form-group">
-                        <label>Scope</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="scope" placeholder="Quick description" maxlength="255">
-                        </div>
+            <div class="form-group">
+                <label>Client <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                     </div>
+                    <select class="form-control select2" name="client" required>
+                        <option value="">- Client -</option>
+                        <?php
 
-                    <?php if (isset($_GET['client_id'])) { ?>
-                        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-                    <?php } else { ?>
+                        //select unarchived clients
+                        $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $client_id_select = intval($row['client_id']);
+                            $client_name = nullable_htmlentities($row['client_name']);
+                            ?>
+                            <option value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
+                        <?php } ?>
 
-                        <div class="form-group">
-                            <label>Client <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                </div>
-                                <select class="form-control select2" name="client" required>
-                                    <option value="">- Client -</option>
-                                    <?php
+                    </select>
+                </div>
+            </div>
 
-                                    //select unarchived clients
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $client_id = intval($row['client_id']);
-                                        $client_name = nullable_htmlentities($row['client_name']);
-                                        ?>
-                                        <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
-                                    <?php } ?>
+        <?php } ?>
 
-                                </select>
-                            </div>
-                        </div>
+        <div class="form-group">
+            <label>Category <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                </div>
+                <select class="form-control select2" name="category" required>
+                    <option value="">- Category -</option>
+                    <?php
+
+                    $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $category_id = intval($row['category_id']);
+                        $category_name = nullable_htmlentities($row['category_name']);
+                        ?>
+                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
 
                     <?php } ?>
 
-                    <div class="form-group">
-                        <label>Category <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-                            </div>
-                            <select class="form-control select2" name="category" required>
-                                <option value="">- Category -</option>
-                                <?php
-
-                                $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                                while ($row = mysqli_fetch_array($sql)) {
-                                    $category_id = intval($row['category_id']);
-                                    $category_name = nullable_htmlentities($row['category_name']);
-                                    ?>
-                                    <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-
-                                <?php } ?>
-
-                            </select>
-                            <div class="input-group-append">
-                                <button class="btn btn-secondary ajax-modal" type="button"
-                                    data-modal-url="../admin/modals/category/category_add.php?category=Income">
-                                    <i class="fas fa-fw fa-plus"></i>
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Date <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                            </div>
-                            <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Expire <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                            </div>
-                            <input type="date" class="form-control" name="expire" min="<?php echo date("Y-m-d"); ?>" max="2999-12-31" value="<?php echo date("Y-m-d", strtotime("+30 days")); ?>" required>
-                        </div>
-                    </div>
-
+                </select>
+                <div class="input-group-append">
+                    <button class="btn btn-secondary ajax-modal" type="button"
+                        data-modal-url="../admin/modals/category/category_add.php?category=Income">
+                        <i class="fas fa-fw fa-plus"></i>
+                    </button>
                 </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_quote" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
+            </div>
         </div>
+
+        <div class="form-group">
+            <label>Date <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                </div>
+                <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Expire <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                </div>
+                <input type="date" class="form-control" name="expire" min="<?php echo date("Y-m-d"); ?>" max="2999-12-31" value="<?php echo date("Y-m-d", strtotime("+30 days")); ?>" required>
+            </div>
+        </div>
+
     </div>
-</div>
+    <div class="modal-footer">
+        <button type="submit" name="add_quote" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/recurring_expense/recurring_expense_add.php b/agent/modals/recurring_expense/recurring_expense_add.php
index 5fe8e732..ee404d19 100644
--- a/agent/modals/recurring_expense/recurring_expense_add.php
+++ b/agent/modals/recurring_expense/recurring_expense_add.php
@@ -1,235 +1,241 @@
-<div class="modal" id="createRecurringExpenseModal" tabindex="-1">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-clock mr-2"></i>Create Recurring Expense</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <div class="modal-body">
+<?php
 
-                    <div class="form-row">
+require_once '../../../includes/modal_header.php';
 
-                        <div class="form-group col-md">
-                            <label>Frequency <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-sync-alt"></i></span>
-                                </div>
-                                <select class="form-control select2" name="frequency" required>
-                                    <option value="1">Monthly</option>
-                                    <option value="2">Annually</option>
-                                </select>
-                            </div>
-                        </div>
+$client_id = intval($_GET['client_id'] ?? 0);
 
-                        <div class="form-group col-md">
-                            <label>Month <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                                </div>
-                                <select class="form-control select2" name="month" required>
-                                    <option value="">- Select a Month -</option>
-                                    <option value="1">01 - January</option>
-                                    <option value="2">02 - February</option>
-                                    <option value="3">03 - March</option>
-                                    <option value="4">04 - April</option>
-                                    <option value="5">05 - May</option>
-                                    <option value="6">06 - June</option>
-                                    <option value="7">07 - July</option>
-                                    <option value="8">08 - August</option>
-                                    <option value="9">09 - September</option>
-                                    <option value="10">10 - October</option>
-                                    <option value="11">11 - November</option>
-                                    <option value="12">12 - December</option>
-                                </select>
-                            </div>
-                        </div>
+ob_start();
 
-                        <div class="form-group col-md">
-                            <label>Day <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                                </div>
-                                <input type="text" class="form-control" inputmode="numeric" pattern="(1[0-9]|2[0-8]|[1-9])" name="day" placeholder="Enter a day (1-28)" required>
-                            </div>
-                        </div>
-
-                    </div>
-
-                    <div class="form-row">
-                        <div class="form-group col-md">
-                            <label>Amount <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
-                                </div>
-                                <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" required>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-row">
-
-                        <div class="form-group col-md">
-                            <label>Account <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
-                                </div>
-                                <select class="form-control select2" name="account" required>
-                                    <option value="">- Account -</option>
-                                    <?php
-
-                                    $sql = mysqli_query($mysqli, "SELECT account_id, account_name, opening_balance FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $account_id = intval($row['account_id']);
-                                        $account_name = nullable_htmlentities($row['account_name']);
-                                        $opening_balance = floatval($row['opening_balance']);
-
-                                        $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
-                                        $row = mysqli_fetch_array($sql_payments);
-                                        $total_payments = floatval($row['total_payments']);
-
-                                        $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
-                                        $row = mysqli_fetch_array($sql_revenues);
-                                        $total_revenues = floatval($row['total_revenues']);
-
-                                        $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
-                                        $row = mysqli_fetch_array($sql_expenses);
-                                        $total_expenses = floatval($row['total_expenses']);
-
-                                        $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
-
-                                        ?>
-                                        <option <?php if ($config_default_expense_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><div class="float-left"><?php echo $account_name; ?></div><div class="float-right"> [$<?php echo number_format($balance, 2); ?>]</div></option>
-
-                                        <?php
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-                        </div>
-
-                        <div class="form-group col-md">
-                            <label>Vendor <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-                                </div>
-                                <select class="form-control select2" name="vendor" required>
-                                    <option value="">- Vendor -</option>
-                                    <?php
-
-                                    $sql = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = 0 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $vendor_id = intval($row['vendor_id']);
-                                        $vendor_name = nullable_htmlentities($row['vendor_name']);
-                                        ?>
-                                        <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
-
-                                        <?php
-                                    }
-                                    ?>
-                                </select>
-                                <div class="input-group-append">
-                                    <a class="btn btn-secondary" href="vendors.php" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Description <strong class="text-danger">*</strong></label>
-                        <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required></textarea>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Reference</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="reference" placeholder="Enter a reference" maxlength="200">
-                        </div>
-                    </div>
-
-                    <div class="form-row">
-
-                        <div class="form-group col-md">
-                            <label>Category <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
-                                </div>
-                                <select class="form-control select2" name="category" required>
-                                    <option value="">- Category -</option>
-                                    <?php
-
-                                    $sql = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Expense' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $category_id = intval($row['category_id']);
-                                        $category_name = nullable_htmlentities($row['category_name']);
-                                        ?>
-                                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-
-                                        <?php
-                                    }
-                                    ?>
-                                </select>
-                                <div class="input-group-append">
-                                    <button class="btn btn-secondary ajax-modal" type="button"
-                                        data-modal-url="../admin/modals/category/category_add.php?category=Expense">
-                                        <i class="fas fa-plus"></i>
-                                    </button>
-                                </div>
-                            </div>
-
-
-                        </div>
-
-                        <?php if (isset($_GET['client_id'])) { ?>
-                            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-                        <?php } else { ?>
-
-                            <div class="form-group col-md">
-                                <label>Client</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="client" required>
-                                        <option value="0">- Client (Optional) -</option>
-                                        <?php
-
-                                        $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients ORDER BY client_name ASC");
-                                        while ($row = mysqli_fetch_array($sql)) {
-                                            $client_id = intval($row['client_id']);
-                                            $client_name = nullable_htmlentities($row['client_name']);
-                                            ?>
-                                            <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
-
-                                            <?php
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                        <?php } ?>
-
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="create_recurring_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-clock mr-2"></i>Create Recurring Expense</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <div class="modal-body">
+
+        <div class="form-row">
+
+            <div class="form-group col-md">
+                <label>Frequency <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-sync-alt"></i></span>
+                    </div>
+                    <select class="form-control select2" name="frequency" required>
+                        <option value="1">Monthly</option>
+                        <option value="2">Annually</option>
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group col-md">
+                <label>Month <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                    </div>
+                    <select class="form-control select2" name="month" required>
+                        <option value="">- Select a Month -</option>
+                        <option value="1">01 - January</option>
+                        <option value="2">02 - February</option>
+                        <option value="3">03 - March</option>
+                        <option value="4">04 - April</option>
+                        <option value="5">05 - May</option>
+                        <option value="6">06 - June</option>
+                        <option value="7">07 - July</option>
+                        <option value="8">08 - August</option>
+                        <option value="9">09 - September</option>
+                        <option value="10">10 - October</option>
+                        <option value="11">11 - November</option>
+                        <option value="12">12 - December</option>
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group col-md">
+                <label>Day <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                    </div>
+                    <input type="text" class="form-control" inputmode="numeric" pattern="(1[0-9]|2[0-8]|[1-9])" name="day" placeholder="Enter a day (1-28)" required>
+                </div>
+            </div>
+
+        </div>
+
+        <div class="form-row">
+            <div class="form-group col-md">
+                <label>Amount <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
+                    </div>
+                    <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" required>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-row">
+
+            <div class="form-group col-md">
+                <label>Account <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
+                    </div>
+                    <select class="form-control select2" name="account" required>
+                        <option value="">- Account -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT account_id, account_name, opening_balance FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $account_id = intval($row['account_id']);
+                            $account_name = nullable_htmlentities($row['account_name']);
+                            $opening_balance = floatval($row['opening_balance']);
+
+                            $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
+                            $row = mysqli_fetch_array($sql_payments);
+                            $total_payments = floatval($row['total_payments']);
+
+                            $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
+                            $row = mysqli_fetch_array($sql_revenues);
+                            $total_revenues = floatval($row['total_revenues']);
+
+                            $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
+                            $row = mysqli_fetch_array($sql_expenses);
+                            $total_expenses = floatval($row['total_expenses']);
+
+                            $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
+
+                            ?>
+                            <option <?php if ($config_default_expense_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><div class="float-left"><?php echo $account_name; ?></div><div class="float-right"> [$<?php echo number_format($balance, 2); ?>]</div></option>
+
+                            <?php
+                        }
+                        ?>
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group col-md">
+                <label>Vendor <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
+                    </div>
+                    <select class="form-control select2" name="vendor" required>
+                        <option value="">- Vendor -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT vendor_id, vendor_name FROM vendors WHERE vendor_client_id = 0 AND vendor_archived_at IS NULL ORDER BY vendor_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $vendor_id = intval($row['vendor_id']);
+                            $vendor_name = nullable_htmlentities($row['vendor_name']);
+                            ?>
+                            <option value="<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></option>
+
+                            <?php
+                        }
+                        ?>
+                    </select>
+                    <div class="input-group-append">
+                        <a class="btn btn-secondary" href="vendors.php" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Description <strong class="text-danger">*</strong></label>
+            <textarea class="form-control" rows="6" name="description" placeholder="Enter a description" required></textarea>
+        </div>
+
+        <div class="form-group">
+            <label>Reference</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
+                </div>
+                <input type="text" class="form-control" name="reference" placeholder="Enter a reference" maxlength="200">
+            </div>
+        </div>
+
+        <div class="form-row">
+
+            <div class="form-group col-md">
+                <label>Category <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                    </div>
+                    <select class="form-control select2" name="category" required>
+                        <option value="">- Category -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT category_id, category_name FROM categories WHERE category_type = 'Expense' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $category_id = intval($row['category_id']);
+                            $category_name = nullable_htmlentities($row['category_name']);
+                            ?>
+                            <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+
+                            <?php
+                        }
+                        ?>
+                    </select>
+                    <div class="input-group-append">
+                        <button class="btn btn-secondary ajax-modal" type="button"
+                            data-modal-url="../admin/modals/category/category_add.php?category=Expense">
+                            <i class="fas fa-plus"></i>
+                        </button>
+                    </div>
+                </div>
+
+
+            </div>
+
+            <?php if ($client_id) { ?>
+                <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+            <?php } else { ?>
+
+                <div class="form-group col-md">
+                    <label>Client</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                        </div>
+                        <select class="form-control select2" name="client" required>
+                            <option value="0">- Client (Optional) -</option>
+                            <?php
+
+                            $sql = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients ORDER BY client_name ASC");
+                            while ($row = mysqli_fetch_array($sql)) {
+                                $client_id_select = intval($row['client_id']);
+                                $client_name = nullable_htmlentities($row['client_name']);
+                                ?>
+                                <option value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
+
+                                <?php
+                            }
+                            ?>
+                        </select>
+                    </div>
+                </div>
+
+            <?php } ?>
+
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="create_recurring_expense" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/recurring_invoice/recurring_invoice_add.php b/agent/modals/recurring_invoice/recurring_invoice_add.php
index cf9f9a43..f2b93613 100644
--- a/agent/modals/recurring_invoice/recurring_invoice_add.php
+++ b/agent/modals/recurring_invoice/recurring_invoice_add.php
@@ -1,116 +1,122 @@
-<div class="modal" id="addRecurringInvoiceModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-redo-alt mr-2"></i>New Recurring Invoice</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
+<?php
 
-                <div class="modal-body">
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
-                        <label>Scope</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="scope" placeholder="Quick description" maxlength="255">
-                        </div>
-                    </div>
+$client_id = intval($_GET['client_id'] ?? 0);
 
-                    <?php if (isset($_GET['client_id'])) { ?>
-                        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-                    <?php } else { ?>
+ob_start();
 
-                        <div class="form-group">
-                            <label>Client <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                </div>
-                                <select class="form-control select2" name="client" required>
-                                    <option value="">- Client -</option>
-                                    <?php
-                                    //select unarchived clients
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $client_id = intval($row['client_id']);
-                                        $client_name = nullable_htmlentities($row['client_name']);
-                                    ?>
-                                        <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
-
-                                    <?php
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-                        </div>
-
-                    <?php } ?>
-
-                    <div class="form-group">
-                        <label>Start Date <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                            </div>
-                            <input type="date" class="form-control" name="start_date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Frequency <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
-                            </div>
-                            <select class="form-control select2" name="frequency" required>
-                                <option value="">- Frequency -</option>
-                                <option value="month">Monthly</option>
-                                <option value="year">Yearly</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Category <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-                            </div>
-                            <select class="form-control select2" name="category" required>
-                                <option value="">- Category -</option>
-                                <?php
-
-                                $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                                while ($row = mysqli_fetch_array($sql)) {
-                                    $category_id = intval($row['category_id']);
-                                    $category_name = nullable_htmlentities($row['category_name']);
-                                ?>
-                                    <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-
-                                <?php
-                                }
-                                ?>
-                            </select>
-                            <div class="input-group-append">
-                                <button class="btn btn-secondary ajax-modal" type="button"
-                                    data-modal-url="../admin/modals/category/category_add.php?category=Income">
-                                    <i class="fas fa-fw fa-plus"></i>
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_recurring_invoice" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-redo-alt mr-2"></i>New Recurring Invoice</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Scope</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
+                </div>
+                <input type="text" class="form-control" name="scope" placeholder="Quick description" maxlength="255">
+            </div>
+        </div>
+
+        <?php if ($client_id) { ?>
+            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+        <?php } else { ?>
+
+            <div class="form-group">
+                <label>Client <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                    </div>
+                    <select class="form-control select2" name="client" required>
+                        <option value="">- Client -</option>
+                        <?php
+                        //select unarchived clients
+                        $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL ORDER BY client_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $client_id = intval($row['client_id']);
+                            $client_name = nullable_htmlentities($row['client_name']);
+                        ?>
+                            <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
+
+                        <?php
+                        }
+                        ?>
+                    </select>
+                </div>
+            </div>
+
+        <?php } ?>
+
+        <div class="form-group">
+            <label>Start Date <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                </div>
+                <input type="date" class="form-control" name="start_date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Frequency <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                </div>
+                <select class="form-control select2" name="frequency" required>
+                    <option value="">- Frequency -</option>
+                    <option value="month">Monthly</option>
+                    <option value="year">Yearly</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Category <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                </div>
+                <select class="form-control select2" name="category" required>
+                    <option value="">- Category -</option>
+                    <?php
+
+                    $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $category_id = intval($row['category_id']);
+                        $category_name = nullable_htmlentities($row['category_name']);
+                    ?>
+                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+
+                    <?php
+                    }
+                    ?>
+                </select>
+                <div class="input-group-append">
+                    <button class="btn btn-secondary ajax-modal" type="button"
+                        data-modal-url="../admin/modals/category/category_add.php?category=Income">
+                        <i class="fas fa-fw fa-plus"></i>
+                    </button>
+                </div>
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_recurring_invoice" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/revenue/revenue_add.php b/agent/modals/revenue/revenue_add.php
index a2b94ade..c0e867d2 100644
--- a/agent/modals/revenue/revenue_add.php
+++ b/agent/modals/revenue/revenue_add.php
@@ -1,162 +1,166 @@
-<div class="modal" id="addRevenueModal" tabindex="-1">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-hand-holding-usd mr-2"></i>New Revenue</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <div class="modal-body">
+<?php
 
-                    <div class="form-row">
+require_once '../../../includes/modal_header.php';
 
-                        <div class="form-group col-md">
-                            <label>Date <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                                </div>
-                                <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
-                            </div>
-                        </div>
+ob_start();
 
-                        <div class="form-group col-md">
-                            <label>Amount <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
-                                </div>
-                                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" required>
-                            </div>
-                        </div>
-
-                    </div>
-
-                    <div class="form-row">
-
-                        <div class="form-group col-md">
-                            <label>Account <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
-                                </div>
-                                <select class="form-control select2" name="account" required>
-                                    <option value="">- Account -</option>
-                                    <?php
-
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $account_id = intval($row['account_id']);
-                                        $account_name = nullable_htmlentities($row['account_name']);
-                                        $account_currency_code = nullable_htmlentities($row['account_currency_code']);
-                                        $opening_balance = floatval($row['opening_balance']);
-
-                                        $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
-                                        $row = mysqli_fetch_array($sql_payments);
-                                        $total_payments = floatval($row['total_payments']);
-
-                                        $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
-                                        $row = mysqli_fetch_array($sql_revenues);
-                                        $total_revenues = floatval($row['total_revenues']);
-
-                                        $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
-                                        $row = mysqli_fetch_array($sql_expenses);
-                                        $total_expenses = floatval($row['total_expenses']);
-
-                                        $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
-
-                                        ?>
-                                        <option <?php if ($config_default_payment_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [ <?php echo numfmt_format_currency($currency_format, $balance, $account_currency_code); ?> ]</option>
-
-                                        <?php
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-                        </div>
-
-                        <div class="form-group col-md">
-                            <label>Category <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
-                                </div>
-                                <select class="form-control select2" name="category" required>
-                                    <option value="">- Category -</option>
-                                    <?php
-
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL ORDER BY category_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $category_id = intval($row['category_id']);
-                                        $category_name = nullable_htmlentities($row['category_name']);
-                                        ?>
-                                        <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
-
-                                        <?php
-                                    }
-                                    ?>
-                                </select>
-                                <div class="input-group-append">
-                                    <button class="btn btn-secondary ajax-modal" type="button"
-                                        data-modal-url="../admin/modals/category/category_add.php?category=Income">
-                                        <i class="fas fa-fw fa-plus"></i>
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-
-                    <div class="form-group">
-                        <label>Description</label>
-                        <textarea class="form-control" rows="5" name="description" placeholder="Enter a description"></textarea>
-                    </div>
-
-                    <div class="form-row">
-
-                        <div class="form-group col-md">
-                            <label>Payment Method <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
-                                </div>
-                                <select class="form-control select2" name="payment_method" required>
-                                    <option value="">- Method of Payment -</option>
-                                    <?php
-
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM payment_methods ORDER BY payment_method_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $payment_method_name = nullable_htmlentities($row['payment_method_name']);
-                                        ?>
-                                        <option><?php echo $payment_method_name; ?></option>
-
-                                        <?php
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-                        </div>
-
-                        <div class="form-group col-md">
-                            <label>Reference</label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
-                                </div>
-                                <input type="text" class="form-control" name="reference" placeholder="Check #, trans #, etc" maxlength="200">
-                            </div>
-                        </div>
-
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_revenue" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Add Revenue</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-hand-holding-usd mr-2"></i>New Revenue</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <div class="modal-body">
+
+        <div class="form-row">
+
+            <div class="form-group col-md">
+                <label>Date <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                    </div>
+                    <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
+                </div>
+            </div>
+
+            <div class="form-group col-md">
+                <label>Amount <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
+                    </div>
+                    <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" required>
+                </div>
+            </div>
+
+        </div>
+
+        <div class="form-row">
+
+            <div class="form-group col-md">
+                <label>Account <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
+                    </div>
+                    <select class="form-control select2" name="account" required>
+                        <option value="">- Account -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $account_id = intval($row['account_id']);
+                            $account_name = nullable_htmlentities($row['account_name']);
+                            $account_currency_code = nullable_htmlentities($row['account_currency_code']);
+                            $opening_balance = floatval($row['opening_balance']);
+
+                            $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
+                            $row = mysqli_fetch_array($sql_payments);
+                            $total_payments = floatval($row['total_payments']);
+
+                            $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
+                            $row = mysqli_fetch_array($sql_revenues);
+                            $total_revenues = floatval($row['total_revenues']);
+
+                            $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
+                            $row = mysqli_fetch_array($sql_expenses);
+                            $total_expenses = floatval($row['total_expenses']);
+
+                            $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
+
+                            ?>
+                            <option <?php if ($config_default_payment_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [ <?php echo numfmt_format_currency($currency_format, $balance, $account_currency_code); ?> ]</option>
+
+                            <?php
+                        }
+                        ?>
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group col-md">
+                <label>Category <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
+                    </div>
+                    <select class="form-control select2" name="category" required>
+                        <option value="">- Category -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $category_id = intval($row['category_id']);
+                            $category_name = nullable_htmlentities($row['category_name']);
+                            ?>
+                            <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+
+                            <?php
+                        }
+                        ?>
+                    </select>
+                    <div class="input-group-append">
+                        <button class="btn btn-secondary ajax-modal" type="button"
+                            data-modal-url="../admin/modals/category/category_add.php?category=Income">
+                            <i class="fas fa-fw fa-plus"></i>
+                        </button>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+        <div class="form-group">
+            <label>Description</label>
+            <textarea class="form-control" rows="5" name="description" placeholder="Enter a description"></textarea>
+        </div>
+
+        <div class="form-row">
+
+            <div class="form-group col-md">
+                <label>Payment Method <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
+                    </div>
+                    <select class="form-control select2" name="payment_method" required>
+                        <option value="">- Method of Payment -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT * FROM payment_methods ORDER BY payment_method_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $payment_method_name = nullable_htmlentities($row['payment_method_name']);
+                            ?>
+                            <option><?php echo $payment_method_name; ?></option>
+
+                            <?php
+                        }
+                        ?>
+                    </select>
+                </div>
+            </div>
+
+            <div class="form-group col-md">
+                <label>Reference</label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
+                    </div>
+                    <input type="text" class="form-control" name="reference" placeholder="Check #, trans #, etc" maxlength="200">
+                </div>
+            </div>
+
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_revenue" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Add Revenue</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/transfer/transfer_add.php b/agent/modals/transfer/transfer_add.php
index 4bdd4906..288a7ff6 100644
--- a/agent/modals/transfer/transfer_add.php
+++ b/agent/modals/transfer/transfer_add.php
@@ -1,181 +1,182 @@
-<div class="modal" id="addTransferModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-exchange-alt mr-2"></i>Transfering Funds</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <div class="modal-body">
+<?php
 
-                    <div class="form-row">
+require_once '../../../includes/modal_header.php';
 
-                        <div class="form-group col">
-                            <label>Date <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                                </div>
-                                <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
-                            </div>
-                        </div>
+ob_start();
 
-                        <div class="form-group col">
-                            <label>Amount <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
-                                </div>
-                                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" required>
-                            </div>
-                        </div>
-
-                    </div>
-
-                    <div class="form-group">
-                        <label>Transfer <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
-                            </div>
-                            <select class="form-control select2" name="account_from" required>
-                                <option value="">- Account From -</option>
-                                <?php
-
-                                $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
-                                while ($row = mysqli_fetch_array($sql)) {
-                                    $account_id = intval($row['account_id']);
-                                    $account_name = nullable_htmlentities($row['account_name']);
-                                    $opening_balance = floatval($row['opening_balance']);
-
-                                    $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
-                                    $row = mysqli_fetch_array($sql_payments);
-                                    $total_payments = floatval($row['total_payments']);
-
-                                    $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
-                                    $row = mysqli_fetch_array($sql_revenues);
-                                    $total_revenues = floatval($row['total_revenues']);
-
-                                    $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
-                                    $row = mysqli_fetch_array($sql_expenses);
-                                    $total_expenses = floatval($row['total_expenses']);
-
-                                    $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
-
-                                    ?>
-                                    <option <?php if ($config_default_transfer_from_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance, 2); ?>]</option>
-
-                                <?php } ?>
-
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-arrow-right"></i></span>
-                            </div>
-                            <select class="form-control select2" name="account_to" required>
-                                <option value="">- Account To -</option>
-                                <?php
-
-                                $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
-                                while ($row = mysqli_fetch_array($sql)) {
-                                    $account_id = intval($row['account_id']);
-                                    $account_name = nullable_htmlentities($row['account_name']);
-                                    $opening_balance = floatval($row['opening_balance']);
-
-                                    $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
-                                    $row = mysqli_fetch_array($sql_payments);
-                                    $total_payments = floatval($row['total_payments']);
-
-                                    $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
-                                    $row = mysqli_fetch_array($sql_revenues);
-                                    $total_revenues = floatval($row['total_revenues']);
-
-                                    $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
-                                    $row = mysqli_fetch_array($sql_expenses);
-                                    $total_expenses = floatval($row['total_expenses']);
-
-                                    $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
-
-                                    ?>
-                                    <option <?php if ($config_default_transfer_to_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance, 2); ?>]</option>
-
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <textarea class="form-control" rows="5" name="notes" id="transferNotes" placeholder="Enter some notes"></textarea>
-                    </div>
-
-                    <div class="form-group">
-                        <div class="input-group">
-                            <select class="form-control" id="paymentSelect">
-                                <option value="">Select a Payment to Add to Notes</option>
-                                <?php
-
-                                $sql = mysqli_query($mysqli, "SELECT client_name, payment_method, payment_reference, payment_amount FROM payments
-                                    LEFT JOIN invoices ON payment_invoice_id = invoice_id
-                                    LEFT JOIN clients ON invoice_client_id = client_id
-                                    ORDER BY payment_id DESC LIMIT 25
-                                ");
-                                while ($row = mysqli_fetch_array($sql)) {
-                                    $client_name = nullable_htmlentities($row['client_name']);
-                                    $payment_method = nullable_htmlentities($row['payment_method']);
-                                    $payment_reference = nullable_htmlentities($row['payment_reference']);
-                                    $payment_amount = floatval($row['payment_amount']);
-
-                                    ?>
-                                    <option><?php echo "$client_name - $payment_method $payment_reference - " . numfmt_format_currency($currency_format, $payment_amount, $session_company_currency); ?></option>
-
-                                <?php } ?>
-
-                            </select>
-                            <div class="input-group-append">
-                                <button type="button" class="btn btn-secondary" onclick="addOptionToTextbox()"><i class="fas fa-fw fa-plus"></i></button>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Transfer Method</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
-                            </div>
-                            <select class="form-control select2" name="transfer_method">
-                                <option value="">- Method of Transfer -</option>
-                                <?php
-
-                                $sql = mysqli_query($mysqli, "SELECT * FROM payment_methods ORDER BY payment_method_name ASC");
-                                while ($row = mysqli_fetch_array($sql)) {
-                                    $payment_method_name = nullable_htmlentities($row['payment_method_name']);
-                                ?>
-                                    <option><?php echo $payment_method_name; ?></option>
-
-                                <?php
-                                }
-                                ?>
-                            </select>
-                        </div>
-                    </div>
-
-                </div>
-
-                <div class="modal-footer">
-                    <button type="submit" name="add_transfer" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Transfer</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-exchange-alt mr-2"></i>Transfering Funds</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
 </div>
+<form action="post.php" method="post" autocomplete="off">
+    <div class="modal-body">
+
+        <div class="form-row">
+
+            <div class="form-group col">
+                <label>Date <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                    </div>
+                    <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
+                </div>
+            </div>
+
+            <div class="form-group col">
+                <label>Amount <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
+                    </div>
+                    <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" required>
+                </div>
+            </div>
+
+        </div>
+
+        <div class="form-group">
+            <label>Transfer <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
+                </div>
+                <select class="form-control select2" name="account_from" required>
+                    <option value="">- Account From -</option>
+                    <?php
+
+                    $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $account_id = intval($row['account_id']);
+                        $account_name = nullable_htmlentities($row['account_name']);
+                        $opening_balance = floatval($row['opening_balance']);
+
+                        $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
+                        $row = mysqli_fetch_array($sql_payments);
+                        $total_payments = floatval($row['total_payments']);
+
+                        $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
+                        $row = mysqli_fetch_array($sql_revenues);
+                        $total_revenues = floatval($row['total_revenues']);
+
+                        $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
+                        $row = mysqli_fetch_array($sql_expenses);
+                        $total_expenses = floatval($row['total_expenses']);
+
+                        $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
+
+                        ?>
+                        <option <?php if ($config_default_transfer_from_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance, 2); ?>]</option>
+
+                    <?php } ?>
+
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-arrow-right"></i></span>
+                </div>
+                <select class="form-control select2" name="account_to" required>
+                    <option value="">- Account To -</option>
+                    <?php
+
+                    $sql = mysqli_query($mysqli, "SELECT * FROM accounts WHERE account_archived_at IS NULL ORDER BY account_name ASC");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $account_id = intval($row['account_id']);
+                        $account_name = nullable_htmlentities($row['account_name']);
+                        $opening_balance = floatval($row['opening_balance']);
+
+                        $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
+                        $row = mysqli_fetch_array($sql_payments);
+                        $total_payments = floatval($row['total_payments']);
+
+                        $sql_revenues = mysqli_query($mysqli, "SELECT SUM(revenue_amount) AS total_revenues FROM revenues WHERE revenue_account_id = $account_id");
+                        $row = mysqli_fetch_array($sql_revenues);
+                        $total_revenues = floatval($row['total_revenues']);
+
+                        $sql_expenses = mysqli_query($mysqli, "SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE expense_account_id = $account_id");
+                        $row = mysqli_fetch_array($sql_expenses);
+                        $total_expenses = floatval($row['total_expenses']);
+
+                        $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
+
+                        ?>
+                        <option <?php if ($config_default_transfer_to_account == $account_id) { echo "selected"; } ?> value="<?php echo $account_id; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance, 2); ?>]</option>
+
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <textarea class="form-control" rows="5" name="notes" id="transferNotes" placeholder="Enter some notes"></textarea>
+        </div>
+
+        <div class="form-group">
+            <div class="input-group">
+                <select class="form-control" id="paymentSelect">
+                    <option value="">Select a Payment to Add to Notes</option>
+                    <?php
+
+                    $sql = mysqli_query($mysqli, "SELECT client_name, payment_method, payment_reference, payment_amount FROM payments
+                        LEFT JOIN invoices ON payment_invoice_id = invoice_id
+                        LEFT JOIN clients ON invoice_client_id = client_id
+                        ORDER BY payment_id DESC LIMIT 25
+                    ");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $client_name = nullable_htmlentities($row['client_name']);
+                        $payment_method = nullable_htmlentities($row['payment_method']);
+                        $payment_reference = nullable_htmlentities($row['payment_reference']);
+                        $payment_amount = floatval($row['payment_amount']);
+
+                        ?>
+                        <option><?php echo "$client_name - $payment_method $payment_reference - " . numfmt_format_currency($currency_format, $payment_amount, $session_company_currency); ?></option>
+
+                    <?php } ?>
+
+                </select>
+                <div class="input-group-append">
+                    <button type="button" class="btn btn-secondary" onclick="addOptionToTextbox()"><i class="fas fa-fw fa-plus"></i></button>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Transfer Method</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
+                </div>
+                <select class="form-control select2" name="transfer_method">
+                    <option value="">- Method of Transfer -</option>
+                    <?php
+
+                    $sql = mysqli_query($mysqli, "SELECT * FROM payment_methods ORDER BY payment_method_name ASC");
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $payment_method_name = nullable_htmlentities($row['payment_method_name']);
+                    ?>
+                        <option><?php echo $payment_method_name; ?></option>
+
+                    <?php
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="add_transfer" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Transfer</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
 
 <script>
     function addOptionToTextbox() {
@@ -186,3 +187,6 @@
       textboxElement.value += selectedOption.value + "\n";
     }
 </script>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/modals/trip/trip_add.php b/agent/modals/trip/trip_add.php
index e81eb15b..f039f54e 100644
--- a/agent/modals/trip/trip_add.php
+++ b/agent/modals/trip/trip_add.php
@@ -1,147 +1,152 @@
-<div class="modal" id="addTripModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-route mr-2"></i>New Trip</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$client_id = intval($_GET['client_id'] ?? 0);
+
+ob_start();
+
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-route mr-2"></i>New Trip</h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    
+    <div class="modal-body">
+
+        <div class="form-row">
+            <div class="form-group col">
+                <label>Date <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                    </div>
+                    <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
+                </div>
             </div>
-            <form action="post.php" method="post" autocomplete="off">
-                
-                <div class="modal-body">
 
-                    <div class="form-row">
-                        <div class="form-group col">
-                            <label>Date <strong class="text-danger">*</strong></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                                </div>
-                                <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>" required>
-                            </div>
-                        </div>
-
-                        <div class="form-group col">
-                            <label>Miles <strong class="text-danger">*</strong> / <span class="text-secondary">Roundtrip</span></label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
-                                </div>
-                                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,1}" name="miles" placeholder="0.0" required autofocus>
-                                <div class="input-group-append">
-                                    <div class="input-group-text">
-                                        <input type="checkbox" name="roundtrip" value="1">
-                                    </div>
-                                </div>
-                            </div>
+            <div class="form-group col">
+                <label>Miles <strong class="text-danger">*</strong> / <span class="text-secondary">Roundtrip</span></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
+                    </div>
+                    <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,1}" name="miles" placeholder="0.0" required autofocus>
+                    <div class="input-group-append">
+                        <div class="input-group-text">
+                            <input type="checkbox" name="roundtrip" value="1">
                         </div>
                     </div>
-
-                    <div class="form-group">
-                        <label>Location <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="source" placeholder="Enter your starting location" maxlength="200" required>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-arrow-right"></i></span>
-                            </div>
-                            <select class="form-control select2" name="destination" data-tags="true" data-placeholder="- Select / Input Destination -" required>
-                                <option value=""></option>
-                                <?php
-                                if (isset($_GET['client_id'])) {
-                                    $client_id = intval($_GET['client_id']);
-                                    $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
-                                while ($row = mysqli_fetch_array($sql_locations)) {
-                                    $location_name = nullable_htmlentities($row['location_name']);
-                                    $location_address = nullable_htmlentities($row['location_address']);
-                                    $location_city = nullable_htmlentities($row['location_city']);
-                                    $location_state = nullable_htmlentities($row['location_state']);
-                                    $location_zip = nullable_htmlentities($row['location_zip']);
-                                    ?>
-                                    <option><?php echo "$location_address $location_city $location_state $location_zip"; ?></option>
-                                    <?php
-                                }
-                            } ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Purpose <strong class="text-danger">*</strong></label>
-                        <textarea rows="4" class="form-control" placeholder="Enter a purpose" name="purpose" maxlength="200" required></textarea>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Driver</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                            </div>
-                            <select class="form-control select2" name="user" required>
-                                <option value="">- Driver -</option>
-                                <?php
-
-                                $sql = mysqli_query($mysqli, "SELECT user_id, user_name FROM users
-                                    WHERE user_role_id > 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
-                                );
-                                while ($row = mysqli_fetch_array($sql)) {
-                                    $user_id = intval($row['user_id']);
-                                    $user_name = nullable_htmlentities($row['user_name']);
-                                    ?>
-                                    <option <?php if ($session_user_id == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
-
-                                    <?php
-                                }
-                                ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <?php if (isset($_GET['client_id'])) { ?>
-                        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-                    <?php }else{ ?>
-
-                        <div class="form-group">
-                            <label>Client</label>
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                                </div>
-                                <select class="form-control select2" name="client" required>
-                                    <option value="0">- Client (Optional) -</option>
-                                    <?php
-
-                                    $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at is NULL ORDER BY client_name ASC");
-                                    while ($row = mysqli_fetch_array($sql)) {
-                                        $client_id = intval($row['client_id']);
-                                        $client_name = nullable_htmlentities($row['client_name']);
-                                        ?>
-                                        <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
-
-                                        <?php
-                                    }
-                                    ?>
-                                </select>
-                            </div>
-                        </div>
-
-                    <?php } ?>
-
                 </div>
+            </div>
+        </div>
 
-                <div class="modal-footer">
-                    <button type="submit" name="add_trip" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+        <div class="form-group">
+            <label>Location <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                 </div>
-            </form>
-        </div> <!-- Modal Content -->
-    </div> <!-- Modal Dialog -->
-</div> <!-- Modal -->
+                <input type="text" class="form-control" name="source" placeholder="Enter your starting location" maxlength="200" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-arrow-right"></i></span>
+                </div>
+                <select class="form-control select2" name="destination" data-tags="true" data-placeholder="- Select / Input Destination -" required>
+                    <option value=""></option>
+                    <?php
+                    if ($client_id) {
+                        $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
+                    while ($row = mysqli_fetch_array($sql_locations)) {
+                        $location_name = nullable_htmlentities($row['location_name']);
+                        $location_address = nullable_htmlentities($row['location_address']);
+                        $location_city = nullable_htmlentities($row['location_city']);
+                        $location_state = nullable_htmlentities($row['location_state']);
+                        $location_zip = nullable_htmlentities($row['location_zip']);
+                        ?>
+                        <option><?php echo "$location_address $location_city $location_state $location_zip"; ?></option>
+                        <?php
+                    }
+                } ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Purpose <strong class="text-danger">*</strong></label>
+            <textarea rows="4" class="form-control" placeholder="Enter a purpose" name="purpose" maxlength="200" required></textarea>
+        </div>
+
+        <div class="form-group">
+            <label>Driver</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                </div>
+                <select class="form-control select2" name="user" required>
+                    <option value="">- Driver -</option>
+                    <?php
+
+                    $sql = mysqli_query($mysqli, "SELECT user_id, user_name FROM users
+                        WHERE user_type = 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
+                    );
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $user_id = intval($row['user_id']);
+                        $user_name = nullable_htmlentities($row['user_name']);
+                        ?>
+                        <option <?php if ($session_user_id == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
+
+                        <?php
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+
+        <?php if ($client_id) { ?>
+            <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+        <?php }else{ ?>
+
+            <div class="form-group">
+                <label>Client</label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                    </div>
+                    <select class="form-control select2" name="client" required>
+                        <option value="0">- Client (Optional) -</option>
+                        <?php
+
+                        $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at is NULL ORDER BY client_name ASC");
+                        while ($row = mysqli_fetch_array($sql)) {
+                            $client_id_select = intval($row['client_id']);
+                            $client_name = nullable_htmlentities($row['client_name']);
+                            ?>
+                            <option value="<?php echo $client_id_select; ?>"><?php echo $client_name; ?></option>
+
+                            <?php
+                        }
+                        ?>
+                    </select>
+                </div>
+            </div>
+
+        <?php } ?>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="add_trip" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/quotes.php b/agent/quotes.php
index dee85a2e..7819a531 100644
--- a/agent/quotes.php
+++ b/agent/quotes.php
@@ -40,7 +40,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <div class="card-tools">
         <?php if (lookupUserPermission("module_sales") >= 2) { ?>
             <div class="btn-group">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addQuoteModal"><i class="fas fa-plus mr-2"></i>New Quote</button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/quote/quote_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Quote</button>
                 <?php if ($num_rows[0] > 0) { ?>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu">
@@ -254,7 +254,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-
-require_once "modals/quote/quote_add.php";
 require_once "modals/quote/quote_export.php";
 require_once "../includes/footer.php";
diff --git a/agent/recurring_expenses.php b/agent/recurring_expenses.php
index 2aee8993..5ed37c00 100644
--- a/agent/recurring_expenses.php
+++ b/agent/recurring_expenses.php
@@ -32,7 +32,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <div class="card-header py-2">
             <h3 class="card-title mt-2"><i class="fas fa-fw fa-redo-alt mr-2"></i>Recurring Expenses</h3>
             <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#createRecurringExpenseModal"><i class="fas fa-plus"></i><span class="d-none d-lg-inline ml-2">New Recurring Expense</span></button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/recurring_expense/recurring_expense_add.php" data-modal-size="lg"><i class="fas fa-plus"></i><span class="d-none d-lg-inline ml-2">New Recurring Expense</span></button>
             </div>
         </div>
 
@@ -214,7 +214,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "modals/recurring_expense/recurring_expense_add.php";
-
 require_once "../includes/footer.php";
-
diff --git a/agent/recurring_invoices.php b/agent/recurring_invoices.php
index 633644a0..33ea95cc 100644
--- a/agent/recurring_invoices.php
+++ b/agent/recurring_invoices.php
@@ -47,7 +47,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fa fa-redo-alt mr-2"></i>Recurring Invoices</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRecurringInvoiceModal"><i class="fas fa-plus"></i><span class="d-none d-lg-inline ml-2">New Recurring Invoice</span></button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/recurring_invoice/recurring_invoice_add.php?<?= $client_url ?>"><i class="fas fa-plus"></i><span class="d-none d-lg-inline ml-2">New Recurring Invoice</span></button>
         </div>
     </div>
 
@@ -264,6 +264,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-
-require_once "modals/recurring_invoice/recurring_invoice_add.php";
 require_once "../includes/footer.php";
diff --git a/agent/revenues.php b/agent/revenues.php
index a48ce8a2..a5170eea 100644
--- a/agent/revenues.php
+++ b/agent/revenues.php
@@ -29,7 +29,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-hand-holding-usd mr-2"></i>Revenues</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRevenueModal"><i class="fas fa-plus mr-2"></i>New Revenue</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/revenue/revenue_add.php" data-modal-size="lg"><i class="fas fa-plus mr-2"></i>New Revenue</button>
         </div>
     </div>
 
@@ -167,6 +167,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-
-require_once "modals/revenue/revenue_add.php";
 require_once "../includes/footer.php";
diff --git a/agent/transfers.php b/agent/transfers.php
index 0f780142..90d00b0c 100644
--- a/agent/transfers.php
+++ b/agent/transfers.php
@@ -52,7 +52,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         <div class="card-header py-2">
             <h3 class="card-title mt-2"><i class="fas fa-fw fa-exchange-alt mr-2"></i>Transfers</h3>
             <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTransferModal"><i class="fas fa-plus mr-2"></i>New Transfer</button>
+                <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/transfer/transfer_add.php"><i class="fas fa-plus mr-2"></i>New Transfer</button>
             </div>
         </div>
 
@@ -253,7 +253,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "modals/transfer/transfer_add.php";
-
 require_once "../includes/footer.php";
-
diff --git a/agent/trips.php b/agent/trips.php
index 40f6ea23..75b9a30c 100644
--- a/agent/trips.php
+++ b/agent/trips.php
@@ -39,7 +39,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <h3 class="card-title mt-2"><i class="fa fa-route mr-2"></i>Trips</h3>
             <div class="card-tools">
                 <div class="btn-group">
-                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTripModal"><i class="fas fa-plus mr-2"></i>New Trip</button>
+                    <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/trip/trip_add.php?<?= $client_url ?>"><i class="fas fa-plus mr-2"></i>New Trip</button>
                     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu">
                         <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportTripsModal">
@@ -218,6 +218,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 
 <?php
-require_once "modals/trip/trip_add.php";
 require_once "modals/trip/trip_export.php";
 require_once "../includes/footer.php";