diff --git a/admin_custom_link.php b/admin_custom_link.php
index 6ade1314..b5e1ebf6 100644
--- a/admin_custom_link.php
+++ b/admin_custom_link.php
@@ -105,9 +105,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         ?>
                         <tr>
                             <td>
-                                <a href="#" data-toggle="modal" data-target="#editLinkModal<?php echo $custom_link_id; ?>">
-                                    <i class="fa fa-fw fa-<?php echo $custom_link_icon; ?> mr-2"></i>
-                                    <?php echo $custom_link_name;?>
+                                <a href="#"
+                                    data-toggle="ajax-modal"
+                                    data-ajax-url="ajax/ajax_custom_link_edit.php"
+                                    data-ajax-id="<?php echo $custom_link_id; ?>"
+                                    >
+                                    <i class="fa fa-fw fa-<?php echo $custom_link_icon; ?> mr-2"></i><?php echo $custom_link_name;?>
                                 </a>
                             </td>
                             <td><?php echo $custom_link_order_display; ?></td>
@@ -119,7 +122,7 @@ $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="#editLinkModal<?php echo $custom_link_id; ?>">
+                                        <a class="dropdown-item" href="#" data-toggle="ajax-modal" data-ajax-url="ajax/ajax_custom_link_edit.php" data-ajax-id="<?php echo $custom_link_id; ?>">
                                             <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                         </a>
                                         <div class="dropdown-divider"></div>
@@ -132,10 +135,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         </tr>
 
                         <?php
-
-                        require "modals/admin_custom_link_edit_modal.php";
-
-
                     }
 
                     ?>
@@ -150,6 +149,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 require_once "modals/admin_custom_link_add_modal.php";
-
 require_once "includes/footer.php";
-
diff --git a/admin_tax.php b/admin_tax.php
index e7cc1788..bf8acbc5 100644
--- a/admin_tax.php
+++ b/admin_tax.php
@@ -56,7 +56,15 @@ $num_rows = mysqli_num_rows($sql);
 
                         ?>
                         <tr>
-                            <td><a class="text-dark text-bold" href="#" data-toggle="modal" data-target="#editTaxModal<?php echo $tax_id; ?>"><?php echo $tax_name; ?></a></td>
+                            <td>
+                                <a class="text-dark text-bold" href="#"
+                                    data-toggle="ajax-modal"
+                                    data-ajax-url="ajax/ajax_tax_edit.php"
+                                    data-ajax-id="<?php echo $tax_id; ?>"
+                                    >
+                                    <?php echo $tax_name; ?>
+                                </a>
+                            </td>
                             <td><?php echo "$tax_percent%"; ?></td>
                             <td>
                                 <div class="dropdown dropleft text-center">
@@ -64,7 +72,11 @@ $num_rows = mysqli_num_rows($sql);
                                         <i class="fas fa-ellipsis-h"></i>
                                     </button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTaxModal<?php echo $tax_id; ?>">
+                                        <a class="dropdown-item" href="#"
+                                            data-toggle="ajax-modal"
+                                            data-ajax-url="ajax/ajax_tax_edit.php"
+                                            data-ajax-id="<?php echo $tax_id; ?>"
+                                            >
                                             <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                         </a>
                                         <div class="dropdown-divider"></div>
@@ -78,8 +90,6 @@ $num_rows = mysqli_num_rows($sql);
 
                         <?php
 
-                        require "modals/admin_tax_edit_modal.php";
-
                     }
 
                     if ($num_rows == 0) {
diff --git a/ajax/ajax_custom_link_edit.php b/ajax/ajax_custom_link_edit.php
new file mode 100644
index 00000000..6e43bb13
--- /dev/null
+++ b/ajax/ajax_custom_link_edit.php
@@ -0,0 +1,99 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$custom_link_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM custom_links WHERE custom_link_id = $custom_link_id");
+$row = mysqli_fetch_array($sql);
+$custom_link_name = nullable_htmlentities($row['custom_link_name']);
+$custom_link_uri = nullable_htmlentities($row['custom_link_uri']);
+$custom_link_icon = nullable_htmlentities($row['custom_link_icon']);
+$custom_link_new_tab = intval($row['custom_link_new_tab']);
+$custom_link_order = intval($row['custom_link_order']);
+$custom_link_location = intval($row['custom_link_location']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fas fa-fw fa-external-link-alt mr-2"></i>Editing link: <strong><?php echo $custom_link_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="custom_link_id" value="<?php echo $custom_link_id; ?>">
+    
+    <div class="modal-body bg-white">
+
+        <div class="form-group">
+            <label>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-list-ul"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" value="<?php echo $custom_link_name; ?>" maxlength="200" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Order</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-down"></i></span>
+                </div>
+                <input type="number" class="form-control" name="order" placeholder="Leave blank for no order" value="<?php echo $custom_link_order; ?>">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>URI <strong class="text-danger">*</strong></label> / <span class="text-secondary">Open New Tab</span>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-external-link-alt"></i></span>
+                </div>
+                <input type="text" class="form-control" name="uri" placeholder="Enter Link" maxlength="500" value="<?php echo $custom_link_uri; ?>" required>
+                <div class="input-group-append">
+                    <div class="input-group-text">
+                        <input type="checkbox" name="new_tab" value="1" <?php if ($custom_link_new_tab == 1) { echo "checked"; } ?>>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Icon</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-image"></i></span>
+                </div>
+                <input type="text" class="form-control" name="icon" placeholder="Icon ex handshake" maxlength="200" value="<?php echo $custom_link_icon; ?>">
+            </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-home"></i></span>
+                </div>
+                <select class="form-control select2" name="location" required>
+                    <option value="1" <?php if ($custom_link_location == 1) { echo "selected"; } ?> >Main Side Nav</option>
+                    <option value="2" <?php if ($custom_link_location == 2) { echo "selected"; } ?> >Top Nav (Icon Required)</option>
+                    <option value="3" <?php if ($custom_link_location == 3) { echo "selected"; } ?> >Client Portal Nav</option>
+                </select>
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_custom_link" 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_tax_edit.php b/ajax/ajax_tax_edit.php
new file mode 100644
index 00000000..9bc05290
--- /dev/null
+++ b/ajax/ajax_tax_edit.php
@@ -0,0 +1,46 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$tax_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM taxes WHERE tax_id = $tax_id");
+$row = mysqli_fetch_array($sql);
+$tax_name = nullable_htmlentities($row['tax_name']);
+$tax_percent = floatval($row['tax_percent']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fas fa-fw fa-balance-scale mr-2"></i>Editing tax: <strong><?php echo $tax_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="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+    <input type="hidden" name="tax_id" value="<?php echo $tax_id; ?>">
+
+    <div class="modal-body bg-white">
+
+        <div class="form-group">
+            <label>Name <strong class="text-danger">*</strong></label>
+            <input type="text" class="form-control" name="name" maxlength="200" value="<?php echo $tax_name; ?>" required>
+        </div>
+
+        <div class="form-group">
+            <label>Percent <strong class="text-danger">*</strong></label>
+            <input type="number" min="0" step="any" class="form-control col-md-4" name="percent" value="<?php echo $tax_percent; ?>">
+        </div>
+
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_tax" 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/includes/filter_footer.php b/includes/filter_footer.php
index 028a72d4..4a4d821c 100644
--- a/includes/filter_footer.php
+++ b/includes/filter_footer.php
@@ -27,7 +27,6 @@ if ($total_found_rows > 5) {
                     <option <?php if ($user_config_records_per_page == 50) { echo "selected"; } ?> >50</option>
                     <option <?php if ($user_config_records_per_page == 100) { echo "selected"; } ?> >100</option>
                     <option <?php if ($user_config_records_per_page == 500) { echo "selected"; } ?> >500</option>
-                    <option <?php if ($user_config_records_per_page == 1000) { echo "selected"; } ?> >1000</option>
                 </select>
             </form>
         </div>
diff --git a/modals/admin_custom_link_edit_modal.php b/modals/admin_custom_link_edit_modal.php
deleted file mode 100644
index 3404810b..00000000
--- a/modals/admin_custom_link_edit_modal.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<div class="modal" id="editLinkModal<?php echo $custom_link_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-external-link-alt mr-2"></i>Editing link: <strong><?php echo $custom_link_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="custom_link_id" value="<?php echo $custom_link_id; ?>">
-                
-                <div class="modal-body bg-white">
-
-                    <div class="form-group">
-                        <label>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-list-ul"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" value="<?php echo $custom_link_name; ?>" maxlength="200" required>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Order</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-down"></i></span>
-                            </div>
-                            <input type="number" class="form-control" name="order" placeholder="Leave blank for no order" value="<?php echo $custom_link_order; ?>">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>URI <strong class="text-danger">*</strong></label> / <span class="text-secondary">Open New Tab</span>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-external-link-alt"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="uri" placeholder="Enter Link" maxlength="500" value="<?php echo $custom_link_uri; ?>" required>
-                            <div class="input-group-append">
-                                <div class="input-group-text">
-                                    <input type="checkbox" name="new_tab" value="1" <?php if ($custom_link_new_tab == 1) { echo "checked"; } ?>>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Icon</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-image"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="icon" placeholder="Icon ex handshake" maxlength="200" value="<?php echo $custom_link_icon; ?>">
-                        </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-home"></i></span>
-                            </div>
-                            <select class="form-control select2" name="location" required>
-                                <option value="1" <?php if ($custom_link_location == 1) { echo "selected"; } ?> >Main Side Nav</option>
-                                <option value="2" <?php if ($custom_link_location == 2) { echo "selected"; } ?> >Top Nav (Icon Required)</option>
-                                <option value="3" <?php if ($custom_link_location == 3) { echo "selected"; } ?> >Client Portal Nav</option>
-                            </select>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="edit_custom_link" 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/admin_tax_edit_modal.php b/modals/admin_tax_edit_modal.php
deleted file mode 100644
index 198ac661..00000000
--- a/modals/admin_tax_edit_modal.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="modal" id="editTaxModal<?php echo $tax_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-balance-scale mr-2"></i>Editing tax: <strong><?php echo $tax_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="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-        <input type="hidden" name="tax_id" value="<?php echo $tax_id; ?>">
-
-        <div class="modal-body bg-white">
-
-          <div class="form-group">
-            <label>Name <strong class="text-danger">*</strong></label>
-            <input type="text" class="form-control" name="name" maxlength="200" value="<?php echo $tax_name; ?>" required>
-          </div>
-
-          <div class="form-group">
-            <label>Percent <strong class="text-danger">*</strong></label>
-            <input type="number" min="0" step="any" class="form-control col-md-4" name="percent" value="<?php echo $tax_percent; ?>">
-
-          </div>
-
-        </div>
-        <div class="modal-footer bg-white">
-          <button type="submit" name="edit_tax" 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>