diff --git a/ajax/ajax_invoice_copy.php b/ajax/ajax_invoice_copy.php
new file mode 100644
index 00000000..6a281d48
--- /dev/null
+++ b/ajax/ajax_invoice_copy.php
@@ -0,0 +1,48 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$invoice_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id WHERE invoice_id = $invoice_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$invoice_prefix = nullable_htmlentities($row['invoice_prefix']);
+$invoice_number = intval($row['invoice_number']);
+$client_name = nullable_htmlentities($row['client_name']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fas fa-fw fa-copy mr-2"></i>Copying invoice: <strong><?php echo "$invoice_prefix$invoice_number"; ?></strong> - <?php echo $client_name; ?></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="invoice_id" value="<?php echo $invoice_id; ?>">
+    
+    <div class="modal-body bg-white">
+
+        <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 bg-white">
+        <button type="submit" name="add_invoice_copy" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Copy</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/ajax_footer.php";
diff --git a/ajax/ajax_invoice_edit.php b/ajax/ajax_invoice_edit.php
new file mode 100644
index 00000000..87530848
--- /dev/null
+++ b/ajax/ajax_invoice_edit.php
@@ -0,0 +1,114 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$invoice_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM invoices LEFT JOIN clients ON invoice_client_id = client_id WHERE invoice_id = $invoice_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$invoice_prefix = nullable_htmlentities($row['invoice_prefix']);
+$invoice_number = intval($row['invoice_number']);
+$invoice_scope = nullable_htmlentities($row['invoice_scope']);
+$invoice_date = nullable_htmlentities($row['invoice_date']);
+$invoice_due = nullable_htmlentities($row['invoice_due']);
+$invoice_discount = floatval($row['invoice_discount_amount']);
+$invoice_created_at = nullable_htmlentities($row['invoice_created_at']);
+$category_id = intval($row['invoice_category_id']);
+$client_id = intval($row['client_id']);
+$client_name = nullable_htmlentities($row['client_name']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fas fa-fw fa-file-invoice mr-2"></i>Editing invoice: <strong><?php echo "$invoice_prefix$invoice_number"; ?></strong> - <?php echo $client_name; ?></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="invoice_id" value="<?php echo $invoice_id; ?>">
+
+    <div class="modal-body bg-white" <?php if (lookupUserPermission('module_sales') <= 1) { echo 'inert'; } ?>>
+
+        <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 $invoice_date; ?>" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Invoice Due <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-alt"></i></span>
+                </div>
+                <input type="date" class="form-control" name="due" max="2999-12-31" value="<?php echo $invoice_due; ?>" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Income 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_income_category = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$invoice_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC");
+                    while ($row = mysqli_fetch_array($sql_income_category)) {
+                        $category_id_select = intval($row['category_id']);
+                        $category_name_select = nullable_htmlentities($row['category_name']);
+                    ?>
+                        <option <?php if ($category_id == $category_id_select) {
+                                    echo "selected";
+                                } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name_select; ?></option>
+
+                    <?php
+                    }
+                    ?>
+                </select>
+                <div class="input-group-append">
+                    <a class="btn btn-secondary" href="admin_category.php?category=Income" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
+                </div>
+            </div>
+        </div>
+
+        <div class='form-group'>
+            <label>Discount Amount</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='invoice_discount' placeholder='0.00' value="<?php echo number_format($invoice_discount, 2, '.', ''); ?>">
+            </div>
+        </div>
+
+        <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" value="<?php echo $invoice_scope; ?>">
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_invoice" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</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/ajax_footer.php";
diff --git a/ajax/ajax_recurring_invoice_edit.php b/ajax/ajax_recurring_invoice_edit.php
new file mode 100644
index 00000000..7d454b20
--- /dev/null
+++ b/ajax/ajax_recurring_invoice_edit.php
@@ -0,0 +1,132 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$recurring_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM recurring WHERE recurring_id = $recurring_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$recurring_prefix = nullable_htmlentities($row['recurring_prefix']);
+$recurring_number = intval($row['recurring_number']);
+$recurring_scope = nullable_htmlentities($row['recurring_scope']);
+$recurring_frequency = nullable_htmlentities($row['recurring_frequency']);
+$recurring_status = nullable_htmlentities($row['recurring_status']);
+$recurring_created_at = date('Y-m-d', strtotime($row['recurring_created_at']));
+$recurring_next_date = nullable_htmlentities($row['recurring_next_date']);
+$recurring_discount = floatval($row['recurring_discount_amount']);
+$category_id = intval($row['recurring_category_id']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fas fa-fw fa-redo-alt mr-2"></i>Editing Recur Invoice: <strong><?php echo "$recurring_prefix$recurring_number"; ?></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="recurring_id" value="<?php echo $recurring_id; ?>">
+
+    <div class="modal-body bg-white">
+
+        <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" value="<?php echo $recurring_scope; ?>">
+            </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 <?php if ($recurring_frequency == 'month') { echo "selected"; } ?> value="month">Monthly</option>
+                    <option <?php if ($recurring_frequency == 'year') { echo "selected"; } ?> value="year">Yearly</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Next 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="next_date" max="2999-12-31" value="<?php echo $recurring_next_date; ?>" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Income 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_income_category = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$recurring_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC");
+                    while ($row = mysqli_fetch_array($sql_income_category)) {
+                        $category_id_select = intval($row['category_id']);
+                        $category_name_select = nullable_htmlentities($row['category_name']);
+                    ?>
+                        <option <?php if ($category_id == $category_id_select) { ?> selected <?php } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name_select; ?></option>
+
+                    <?php
+                    }
+                    ?>
+                </select>
+                <div class="input-group-append">
+                    <a class="btn btn-secondary" href="admin_category.php?category=Income" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
+                </div>
+            </div>
+        </div>
+
+        <div class='form-group'>
+            <label>Discount Amount</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='recurring_discount' placeholder='0.00' value="<?php echo number_format($recurring_discount, 2, '.', ''); ?>">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Status <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="status" required>
+                    <option <?php if ($recurring_status == 1) {
+                                echo "selected";
+                            } ?> value="1">Active</option>
+                    <option <?php if ($recurring_status == 0) {
+                                echo "selected";
+                            } ?> value="0">InActive</option>
+                </select>
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_recurring" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</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/ajax_footer.php";
diff --git a/ajax/ajax_revenue_edit.php b/ajax/ajax_revenue_edit.php
new file mode 100644
index 00000000..a97b7faa
--- /dev/null
+++ b/ajax/ajax_revenue_edit.php
@@ -0,0 +1,201 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$revenue_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM revenues WHERE revenue_id = $revenue_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$revenue_description = nullable_htmlentities($row['revenue_description']);
+$revenue_reference = nullable_htmlentities($row['revenue_reference']);
+$revenue_date = nullable_htmlentities($row['revenue_date']);
+$revenue_payment_method = nullable_htmlentities($row['revenue_payment_method']);
+$revenue_amount = floatval($row['revenue_amount']);
+$revenue_currency_code = nullable_htmlentities($row['revenue_currency_code']);
+$revenue_created_at = nullable_htmlentities($row['revenue_created_at']);
+$account_id = intval($row['account_id']);
+$category_id = intval($row['category_id']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fas fa-fw fa-hand-holding-usd mr-2"></i>Edit 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">
+    <input type="hidden" name="revenue_id" value="<?php echo $revenue_id; ?>">
+    <div class="modal-body bg-white">
+
+        <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 $revenue_date; ?>" required>
+                </div>
+            </div>
+
+            <div class="form-group col-md">
+                <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="">- Select Currency -</option>
+                        <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
+                            <option <?php if ($revenue_currency_code == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
+                        <?php } ?>
+                    </select>
+                </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" value="<?php echo number_format($revenue_amount, 2, '.', ''); ?>" 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="">- Select Account -</option>
+                        <?php
+
+                        $sql_accounts = mysqli_query($mysqli, "SELECT * FROM accounts WHERE (account_archived_at > '$revenue_created_at' OR account_archived_at IS NULL) ORDER BY account_archived_at ASC, account_name ASC");
+                        while ($row = mysqli_fetch_array($sql_accounts)) {
+                            $account_id_select = intval($row['account_id']);
+                            $account_name_select = nullable_htmlentities($row['account_name']);
+                            $account_currency_code_select = nullable_htmlentities($row['account_currency_code']);
+                            $opening_balance = floatval($row['opening_balance']);
+                            $account_archived_at = nullable_htmlentities($row['account_archived_at']);
+                            if (empty($account_archived_at)) {
+                                $account_archived_display = "";
+                            } else {
+                                $account_archived_display = "Archived - ";
+                            }
+                            $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select");
+                            $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_select");
+                            $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_select");
+                            $row = mysqli_fetch_array($sql_expenses);
+                            $total_expenses = floatval($row['total_expenses']);
+
+                            $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
+
+                            ?>
+                            <option <?php if ($account_id == $account_id_select) { echo "selected"; } ?> value="<?php echo $account_id_select; ?>"><?php echo $account_archived_display; ?> <?php echo $account_name_select; ?> [ <?php echo numfmt_format_currency($currency_format, $balance, $account_currency_code_select); ?> ]</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="">- Select Category -</option>
+                        <?php
+
+                        $sql_category = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$revenue_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC");
+                        while ($row = mysqli_fetch_array($sql_category)) {
+                            $category_id_select = intval($row['category_id']);
+                            $category_name = nullable_htmlentities($row['category_name']);
+                            ?>
+                            <option <?php if ($category_id_select == $category_id) { echo "selected"; } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name; ?></option>
+
+                            <?php
+                        }
+                        ?>
+                    </select>
+                    <div class="input-group-append">
+                        <a class="btn btn-secondary" href="admin_category.php?category=Income" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+        <div class="form-group">
+            <label>Description</label>
+            <textarea class="form-control" rows="8" name="description"><?php echo $revenue_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="">- Select Method of Payment -</option>
+                        <?php
+
+                        $sql_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' AND (category_archived_at > '$revenue_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC");
+                        while ($row = mysqli_fetch_array($sql_categories)) {
+                            $category_name_select = nullable_htmlentities($row['category_name']);
+                            ?>
+                            <option <?php if ($revenue_payment_method == $category_name_select) { echo "selected"; } ?>><?php echo "$category_name_select"; ?></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" value="<?php echo $revenue_reference; ?>">
+                </div>
+            </div>
+
+        </div>
+
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_revenue" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</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/ajax_footer.php";
diff --git a/client_invoices.php b/client_invoices.php
index 03647111..be3c5cc0 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -186,10 +186,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                             </a>
                                             <div class="dropdown-divider"></div>
                                         <?php } ?>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editInvoiceModal<?php echo $invoice_id; ?>">
+                                        <a class="dropdown-item" href="#"
+                                            data-toggle = "ajax-modal"
+                                            data-ajax-url = "ajax/ajax_invoice_edit.php"
+                                            data-ajax-id = "<?php echo $invoice_id; ?>"
+                                            >
                                             <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                         </a>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoiceCopyModal<?php echo $invoice_id; ?>">
+                                        <a class="dropdown-item" href="#"
+                                            data-toggle = "ajax-modal"
+                                            data-ajax-url = "ajax/ajax_invoice_copy.php"
+                                            data-ajax-id = "<?php echo $invoice_id; ?>"
+                                            >
                                             <i class="fas fa-fw fa-copy mr-2"></i>Copy
                                         </a>
                                         <div class="dropdown-divider"></div>
@@ -203,8 +211,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     <?php
 
-                        require "modals/invoice_copy_modal.php";
-                        require "modals/invoice_edit_modal.php";
                     }
 
                     ?>
diff --git a/client_recurring_invoices.php b/client_recurring_invoices.php
index 8b8da97f..d9d1453e 100644
--- a/client_recurring_invoices.php
+++ b/client_recurring_invoices.php
@@ -186,7 +186,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-ellipsis-h"></i>
                                 </button>
                                 <div class="dropdown-menu">
-                                    <a class="dropdown-item" href="recurring_invoice.php?client_id=<?php echo $client_id; ?>&recurring_id=<?php echo $recurring_id; ?>">
+                                    <a class="dropdown-item" href="#"
+                                        data-toggle = "ajax-modal"
+                                        data-ajax-url = "ajax/ajax_recurring_invoice_edit.php"
+                                        data-ajax-id = "<?php echo $recurring_id; ?>"
+                                        >
                                         <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                     </a>
                                     <?php if ($status !== 'Active') { ?>
@@ -200,9 +204,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </td>
                     </tr>
 
-                    <?php
-                    //require "recurring_invoice_edit_modal.php";
-                    
+                    <?php                    
 
                 }
 
diff --git a/invoice.php b/invoice.php
index 10e34ca3..7a787267 100644
--- a/invoice.php
+++ b/invoice.php
@@ -230,10 +230,18 @@ if (isset($_GET['invoice_id'])) {
                             <i class="fas fa-ellipsis-v"></i>
                         </button>
                         <div class="dropdown-menu">
-                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editInvoiceModal<?php echo $invoice_id; ?>">
+                            <a class="dropdown-item" href="#"
+                                data-toggle = "ajax-modal"
+                                data-ajax-url = "ajax/ajax_invoice_edit.php"
+                                data-ajax-id = "<?php echo $invoice_id; ?>"
+                                >
                                 <i class="fa fa-fw fa-edit text-secondary mr-2"></i>Edit
                             </a>
-                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoiceCopyModal<?php echo $invoice_id; ?>">
+                            <a class="dropdown-item" href="#"
+                                data-toggle = "ajax-modal"
+                                data-ajax-url = "ajax/ajax_invoice_copy.php"
+                                data-ajax-id = "<?php echo $invoice_id; ?>"
+                                >
                                 <i class="fa fa-fw fa-copy text-secondary mr-2"></i>Copy
                             </a>
                             <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoiceRecurringModal<?php echo $invoice_id; ?>">
@@ -681,15 +689,9 @@ if (isset($_GET['invoice_id'])) {
             </div>
     <?php
     include_once "modals/invoice_add_ticket_modal.php";
-
     include_once "modals/invoice_payment_add_modal.php";
-
     include_once "modals/invoice_copy_modal.php";
-
     include_once "modals/invoice_recurring_add_modal.php";
-
-    include_once "modals/invoice_edit_modal.php";
-
     include_once "modals/invoice_note_modal.php";
 
 }
diff --git a/invoices.php b/invoices.php
index b93a7d09..03e3dc89 100644
--- a/invoices.php
+++ b/invoices.php
@@ -313,10 +313,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         <i class="fas fa-ellipsis-h"></i>
                                     </button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editInvoiceModal<?php echo $invoice_id; ?>">
+                                        <a class="dropdown-item" href="#"
+                                            data-toggle = "ajax-modal"
+                                            data-ajax-url = "ajax/ajax_invoice_edit.php"
+                                            data-ajax-id = "<?php echo $invoice_id; ?>"
+                                            >
                                             <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                         </a>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#addInvoiceCopyModal<?php echo $invoice_id; ?>">
+                                        <a class="dropdown-item" href="#"
+                                            data-toggle = "ajax-modal"
+                                            data-ajax-url = "ajax/ajax_invoice_copy.php"
+                                            data-ajax-id = "<?php echo $invoice_id; ?>"
+                                            >
                                             <i class="fas fa-fw fa-copy mr-2"></i>Copy
                                         </a>
                                         <div class="dropdown-divider"></div>
@@ -336,12 +344,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <?php
 
-
-                        require "modals/invoice_edit_modal.php";
-
-                        require "modals/invoice_copy_modal.php";
-
-
                     }
 
                     ?>
diff --git a/modals/invoice_copy_modal.php b/modals/invoice_copy_modal.php
deleted file mode 100644
index 4f6427cb..00000000
--- a/modals/invoice_copy_modal.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="modal" id="addInvoiceCopyModal<?php echo $invoice_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fas fa-fw fa-copy mr-2"></i>Copying invoice: <strong><?php echo "$invoice_prefix$invoice_number"; ?></strong> - <?php echo $client_name; ?></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="invoice_id" value="<?php echo $invoice_id; ?>">
-        
-        <div class="modal-body bg-white">
-
-          <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 bg-white">
-          <button type="submit" name="add_invoice_copy" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Copy</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>
\ No newline at end of file
diff --git a/modals/invoice_edit_modal.php b/modals/invoice_edit_modal.php
deleted file mode 100644
index 82dbae9b..00000000
--- a/modals/invoice_edit_modal.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<div class="modal" id="editInvoiceModal<?php echo $invoice_id; ?>" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fas fa-fw fa-file-invoice mr-2"></i>Editing invoice: <strong><?php echo "$invoice_prefix$invoice_number"; ?></strong> - <?php echo $client_name; ?></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="invoice_id" value="<?php echo $invoice_id; ?>">
-
-                <div class="modal-body bg-white" <?php if (lookupUserPermission('module_sales') <= 1) { echo 'inert'; } ?>>
-
-                    <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 $invoice_date; ?>" required>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Invoice Due <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-alt"></i></span>
-                            </div>
-                            <input type="date" class="form-control" name="due" max="2999-12-31" value="<?php echo $invoice_due; ?>" required>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Income 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_income_category = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$invoice_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC");
-                                while ($row = mysqli_fetch_array($sql_income_category)) {
-                                    $category_id_select = intval($row['category_id']);
-                                    $category_name_select = nullable_htmlentities($row['category_name']);
-                                ?>
-                                    <option <?php if ($category_id == $category_id_select) {
-                                                echo "selected";
-                                            } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name_select; ?></option>
-
-                                <?php
-                                }
-                                ?>
-                            </select>
-                            <div class="input-group-append">
-                                <a class="btn btn-secondary" href="admin_category.php?category=Income" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class='form-group'>
-                        <label>Discount Amount</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='invoice_discount' placeholder='0.00' value="<?php echo number_format($invoice_discount, 2, '.', ''); ?>">
-                        </div>
-                    </div>
-
-                    <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" value="<?php echo $invoice_scope; ?>">
-                        </div>
-                    </div>
-
-                </div>
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="edit_invoice" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</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>
diff --git a/modals/recurring_invoice_edit_modal.php b/modals/recurring_invoice_edit_modal.php
deleted file mode 100644
index 8a8bf31c..00000000
--- a/modals/recurring_invoice_edit_modal.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<div class="modal" id="editRecurringModal<?php echo $recurring_id; ?>" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fas fa-fw fa-redo-alt mr-2"></i>Editing Recur Invoice: <strong><?php echo "$recurring_prefix$recurring_number"; ?></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="recurring_id" value="<?php echo $recurring_id; ?>">
-
-                <div class="modal-body bg-white">
-
-                    <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" value="<?php echo $recurring_scope; ?>">
-                        </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 <?php if ($recurring_frequency == 'month') { echo "selected"; } ?> value="month">Monthly</option>
-                                <option <?php if ($recurring_frequency == 'year') { echo "selected"; } ?> value="year">Yearly</option>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Next 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="next_date" max="2999-12-31" value="<?php echo $recurring_next_date; ?>" required>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Income 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_income_category = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$recurring_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC");
-                                while ($row = mysqli_fetch_array($sql_income_category)) {
-                                    $category_id_select = intval($row['category_id']);
-                                    $category_name_select = nullable_htmlentities($row['category_name']);
-                                ?>
-                                    <option <?php if ($category_id == $category_id_select) { ?> selected <?php } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name_select; ?></option>
-
-                                <?php
-                                }
-                                ?>
-                            </select>
-                            <div class="input-group-append">
-                                <a class="btn btn-secondary" href="admin_category.php?category=Income" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class='form-group'>
-                        <label>Discount Amount</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='recurring_discount' placeholder='0.00' value="<?php echo number_format($recurring_discount, 2, '.', ''); ?>">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Status <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="status" required>
-                                <option <?php if ($recurring_status == 1) {
-                                            echo "selected";
-                                        } ?> value="1">Active</option>
-                                <option <?php if ($recurring_status == 0) {
-                                            echo "selected";
-                                        } ?> value="0">InActive</option>
-                            </select>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="edit_recurring" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i> Save</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>
diff --git a/modals/revenue_edit_modal.php b/modals/revenue_edit_modal.php
deleted file mode 100644
index 41f616f4..00000000
--- a/modals/revenue_edit_modal.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<div class="modal" id="editRevenueModal<?php echo $revenue_id; ?>" tabindex="-1">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fas fa-fw fa-hand-holding-usd mr-2"></i>Edit 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">
-                <input type="hidden" name="revenue_id" value="<?php echo $revenue_id; ?>">
-                <div class="modal-body bg-white">
-
-                    <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 $revenue_date; ?>" required>
-                            </div>
-                        </div>
-
-                        <div class="form-group col-md">
-                            <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 ($revenue_currency_code == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
-                                    <?php } ?>
-                                </select>
-                            </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" value="<?php echo number_format($revenue_amount, 2, '.', ''); ?>" 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_accounts = mysqli_query($mysqli, "SELECT * FROM accounts WHERE (account_archived_at > '$revenue_created_at' OR account_archived_at IS NULL) ORDER BY account_archived_at ASC, account_name ASC");
-                                    while ($row = mysqli_fetch_array($sql_accounts)) {
-                                        $account_id_select = intval($row['account_id']);
-                                        $account_name_select = nullable_htmlentities($row['account_name']);
-                                        $account_currency_code_select = nullable_htmlentities($row['account_currency_code']);
-                                        $opening_balance = floatval($row['opening_balance']);
-                                        $account_archived_at = nullable_htmlentities($row['account_archived_at']);
-                                        if (empty($account_archived_at)) {
-                                            $account_archived_display = "";
-                                        } else {
-                                            $account_archived_display = "Archived - ";
-                                        }
-                                        $sql_payments = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select");
-                                        $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_select");
-                                        $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_select");
-                                        $row = mysqli_fetch_array($sql_expenses);
-                                        $total_expenses = floatval($row['total_expenses']);
-
-                                        $balance = $opening_balance + $total_payments + $total_revenues - $total_expenses;
-
-                                        ?>
-                                        <option <?php if ($account_id == $account_id_select) { echo "selected"; } ?> value="<?php echo $account_id_select; ?>"><?php echo $account_archived_display; ?> <?php echo $account_name_select; ?> [ <?php echo numfmt_format_currency($currency_format, $balance, $account_currency_code_select); ?> ]</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_category = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND (category_archived_at > '$revenue_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC");
-                                    while ($row = mysqli_fetch_array($sql_category)) {
-                                        $category_id_select = intval($row['category_id']);
-                                        $category_name = nullable_htmlentities($row['category_name']);
-                                        ?>
-                                        <option <?php if ($category_id_select == $category_id) { echo "selected"; } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name; ?></option>
-
-                                        <?php
-                                    }
-                                    ?>
-                                </select>
-                                <div class="input-group-append">
-                                    <a class="btn btn-secondary" href="admin_category.php?category=Income" target="_blank"><i class="fas fa-fw fa-plus"></i></a>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-
-                    <div class="form-group">
-                        <label>Description</label>
-                        <textarea class="form-control" rows="4" name="description"><?php echo $revenue_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_categories = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Payment Method' AND (category_archived_at > '$revenue_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC");
-                                    while ($row = mysqli_fetch_array($sql_categories)) {
-                                        $category_name_select = nullable_htmlentities($row['category_name']);
-                                        ?>
-                                        <option <?php if ($revenue_payment_method == $category_name_select) { echo "selected"; } ?>><?php echo "$category_name_select"; ?></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" value="<?php echo $revenue_reference; ?>">
-                            </div>
-                        </div>
-
-                    </div>
-
-                </div>
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="edit_revenue" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</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>
diff --git a/recurring_invoice.php b/recurring_invoice.php
index 49b14aea..2a66a1f9 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -149,7 +149,11 @@ if (isset($_GET['recurring_id'])) {
                             <i class="fas fa-ellipsis-v"></i>
                         </button>
                         <div class="dropdown-menu">
-                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editRecurringModal<?php echo $recurring_id; ?>">
+                            <a class="dropdown-item" href="#"
+                                data-toggle = "ajax-modal"
+                                data-ajax-url = "ajax/ajax_recurring_invoice_edit.php"
+                                data-ajax-id = "<?php echo $recurring_id; ?>"
+                                >
                                 <i class="fa fa-fw fa-edit text-secondary mr-2"></i>Edit
                             </a>
                             <div class="dropdown-divider"></div>
@@ -475,15 +479,12 @@ if (isset($_GET['recurring_id'])) {
 
     <?php
 
-    require_once "modals/recurring_invoice_edit_modal.php";
-
     require_once "modals/recurring_invoice_note_modal.php";
 
 }
 
 require_once "includes/footer.php";
 
-
 ?>
 
 <!-- JSON Autocomplete / type ahead -->
diff --git a/recurring_invoices.php b/recurring_invoices.php
index 9a25d5e5..0cf05b3a 100644
--- a/recurring_invoices.php
+++ b/recurring_invoices.php
@@ -217,7 +217,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-ellipsis-h"></i>
                                 </button>
                                 <div class="dropdown-menu">
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editRecurringModal<?php echo $recurring_id; ?>">
+                                    <a class="dropdown-item" href="#"
+                                        data-toggle = "ajax-modal"
+                                        data-ajax-url = "ajax/ajax_recurring_invoice_edit.php"
+                                        data-ajax-id = "<?php echo $recurring_id; ?>"
+                                        >
                                         <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                     </a>
                                     <?php if ($status !== 'Active') { ?>
@@ -232,9 +236,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tr>
 
                     <?php
-                    require "modals/recurring_invoice_edit_modal.php";
-
-
                     }
                     ?>
 
@@ -249,5 +250,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <?php
 
 require_once "modals/recurring_invoice_add_modal.php";
-
 require_once "includes/footer.php";
diff --git a/revenues.php b/revenues.php
index 367a6709..3ddfe322 100644
--- a/revenues.php
+++ b/revenues.php
@@ -142,7 +142,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     ?>
 
                     <tr>
-                        <td><a href="#" data-toggle="modal" data-target="#editRevenueModal<?php echo $revenue_id; ?>"><?php echo $revenue_date; ?></a></td>
+                        <td>
+                            <a href="#"
+                                data-toggle = "ajax-modal"
+                                data-modal-size = "lg"
+                                data-ajax-url = "ajax/ajax_revenue_edit.php"
+                                data-ajax-id = "<?php echo $revenue_id; ?>"
+                                >
+                                <?php echo $revenue_date; ?>
+                            </a>
+                        </td>
                         <td><?php echo $category_name; ?></td>
                         <td class="text-bold text-right"><?php echo numfmt_format_currency($currency_format, $revenue_amount, $revenue_currency_code); ?></td>
                         <td><?php echo $revenue_payment_method; ?></td>
@@ -154,7 +163,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fas fa-ellipsis-h"></i>
                                 </button>
                                 <div class="dropdown-menu">
-                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editRevenueModal<?php echo $revenue_id; ?>">
+                                    <a class="dropdown-item" href="#"
+                                        data-toggle = "ajax-modal"
+                                        data-modal-size = "lg"
+                                        data-ajax-url = "ajax/ajax_revenue_edit.php"
+                                        data-ajax-id = "<?php echo $revenue_id; ?>"
+                                        >
                                         <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                     </a>
                                     <div class="dropdown-divider"></div>
@@ -163,18 +177,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     </a>
                                 </div>
                             </div>
-                            <?php
-
-                            require "modals/revenue_edit_modal.php";
-
-
-                            ?>
                         </td>
                     </tr>
 
                 <?php } ?>
 
-
                 </tbody>
             </table>
         </div>
@@ -186,5 +193,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <?php
 
 require_once "modals/revenue_add_modal.php";
-
 require_once "includes/footer.php";