diff --git a/ajax/ajax_contact_edit.php b/ajax/ajax_contact_edit.php
index b0286cba..5a95d34f 100644
--- a/ajax/ajax_contact_edit.php
+++ b/ajax/ajax_contact_edit.php
@@ -1,14 +1,6 @@
 <?php
 
-require_once '../includes/inc_all_ajax.php';
-
-// ajax_contact_edit.php
-
-// Check for the 'id' parameter
-if (!isset($_GET['id'])) {
-    echo json_encode(['error' => 'Contact ID missing.']);
-    exit;
-}
+require_once '../includes/ajax_header.php';
 
 $contact_id = intval($_GET['id']);
 
@@ -332,12 +324,6 @@ ob_start();
     </div>
 </form>
 
-<script>// Initialize Select2 Elements
-$('.select2').select2({
-  theme: 'bootstrap4',
-});
-</script>
-
 <!-- JavaScript to Show/Hide Password Form Group -->
 <script>
 
@@ -376,9 +362,8 @@ $(document).ready(function() {
 </script>
 
 <?php
-    $content = ob_get_clean();
 
-    // Return the title and content as a JSON response
-    echo json_encode(['title' => $title, 'content' => $content]);
+require_once "../includes/ajax_footer.php";
+
 ?>
 
diff --git a/client_contact_details.php b/client_contact_details.php
index 3b991a13..b741150f 100644
--- a/client_contact_details.php
+++ b/client_contact_details.php
@@ -156,7 +156,10 @@ if (isset($_GET['contact_id'])) {
 
             <div class="card card-dark">
                 <div class="card-body">
-                    <button type="button" class="btn btn-default float-right" data-toggle="modal" data-target="#editContactModal<?php echo $contact_id; ?>">
+                    <button type="button" class="btn btn-default float-right"
+                        data-toggle="ajax-modal"
+                        data-ajax-url="ajax/ajax_contact_edit.php"
+                        data-ajax-id="<?php echo $contact_id; ?>">
                         <i class="fas fa-fw fa-user-edit"></i>
                     </button>
                     <h3 class="text-bold"><?php echo $contact_name; ?></h3>
@@ -213,7 +216,6 @@ if (isset($_GET['contact_id'])) {
                     <?php } ?>
                     <div class="mt-2"><i class="fa fa-fw fa-clock text-secondary mr-2"></i><?php echo date('Y-m-d', strtotime($contact_created_at)); ?></div>
 
-                    <?php require_once "modals/client_contact_edit_modal.php";
  ?>
 
                 </div>
diff --git a/client_contacts.php b/client_contacts.php
index 3bff2bc5..dd010b2a 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -383,7 +383,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                             <a class="dropdown-item" href="#" data-toggle="modal" data-target="#createContactNoteModal<?php echo $contact_id; ?>">
                                                 <i class="fas fa-fw fa-sticky-note mr-2"></i>Make Note
                                             </a>
-                                            <a class="dropdown-item ajax-trigger" href="#"
+                                            <a class="dropdown-item" href="#"
+                                                data-toggle="ajax-modal"
                                                 data-ajax-url="ajax/ajax_contact_edit.php"
                                                 data-ajax-id="<?php echo $contact_id; ?>">
                                                 <i class="fas fa-fw fa-edit mr-2"></i>Edit
diff --git a/includes/ajax_footer.php b/includes/ajax_footer.php
new file mode 100644
index 00000000..ec7400cc
--- /dev/null
+++ b/includes/ajax_footer.php
@@ -0,0 +1,12 @@
+<script>// Initialize Select2 Elements
+$('.select2').select2({
+  theme: 'bootstrap4',
+});
+</script>
+
+<?php
+    $content = ob_get_clean();
+
+    // Return the title and content as a JSON response
+    echo json_encode(['title' => $title, 'content' => $content]);
+?>
\ No newline at end of file
diff --git a/includes/inc_all_ajax.php b/includes/ajax_header.php
similarity index 54%
rename from includes/inc_all_ajax.php
rename to includes/ajax_header.php
index a70a7c1d..a4fb4e94 100644
--- a/includes/inc_all_ajax.php
+++ b/includes/ajax_header.php
@@ -5,3 +5,9 @@ require_once "../functions.php";
 require_once "../check_login.php";
 
 header('Content-Type: application/json');
+
+// Check for the 'id' parameter
+if (!isset($_GET['id'])) {
+    echo json_encode(['error' => 'ID missing.']);
+    exit;
+}
diff --git a/js/generic_modal_loader.js b/js/generic_modal_loader.js
index e73d7dba..6643abe0 100644
--- a/js/generic_modal_loader.js
+++ b/js/generic_modal_loader.js
@@ -8,7 +8,7 @@
             Edit Contact
         </button>
 */
-$(document).on('click', '.ajax-trigger', function (e) {
+$(document).on('click', '[data-toggle="ajax-modal"]', function (e) {
     e.preventDefault();
     
     // Get the URL and ID from the element's data attributes.
@@ -65,4 +65,4 @@ $(document).on('click', '.ajax-trigger', function (e) {
             alert('Error loading modal content.');
         }
     });
-});
\ No newline at end of file
+});