diff --git a/includes/top_nav.php b/includes/top_nav.php
index c392ecdf..259a2beb 100644
--- a/includes/top_nav.php
+++ b/includes/top_nav.php
@@ -64,10 +64,7 @@
         ?>
 
         <li class="nav-item">
-            <a class="nav-link" href="#"
-                data-toggle="ajax-modal"
-                data-ajax-url="../modals/notifications.php"
-                >
+            <a class="nav-link ajax-modal" href="#" data-modal-url="../modals/notifications.php">
                 <i class="fas fa-bell"></i>
                 <?php if ($num_notifications) { ?>
                 <span class="badge badge-light badge-pill navbar-badge position-absolute" style="top: 1px; right: 3px;">
diff --git a/user/assets.php b/user/assets.php
index a06e29be..3bb26cb0 100644
--- a/user/assets.php
+++ b/user/assets.php
@@ -548,13 +548,7 @@ if (mysqli_num_rows($os_sql) > 0) {
                         }
                         $contact_name = nullable_htmlentities($row['contact_name']);
                         if ($contact_name) {
-                            $contact_name_display = "<a href='#' 
-                                data-toggle='ajax-modal'
-                                data-modal-size='lg'
-                                data-ajax-url='ajax/ajax_contact_details.php'
-                                data-ajax-id='$asset_contact_id'>
-                                $contact_name $contact_archive_display
-                            ";
+                            $contact_name_display = "<a class='ajax-modal' href='#' data-modal-url='ajax/ajax_contact_details.php?id=" . $asset_contact_id . "' data-modal-size='lg'>$contact_name $contact_archive_display</a>";    
                         } else {
                             $contact_name_display = "-";
                         }
@@ -666,16 +660,10 @@ if (mysqli_num_rows($os_sql) > 0) {
                                     <div class="dropdown dropleft text-center">
                                         <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown"><i class="fas fa-ellipsis-h"></i></button>
                                         <div class="dropdown-menu">
-                                            <a class="dropdown-item" href="#"
-                                                data-toggle="ajax-modal"
-                                                data-ajax-url="ajax/ajax_asset_edit.php"
-                                                data-ajax-id="<?php echo $asset_id; ?>">
+                                            <a class="dropdown-item ajax-modal" href="#" data-modal-url="ajax/ajax_asset_edit.php?id=<?= $asset_id ?>">
                                                 <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                             </a>
-                                            <a class="dropdown-item" href="#"
-                                                data-toggle="ajax-modal"
-                                                data-ajax-url="ajax/ajax_asset_copy.php"
-                                                data-ajax-id="<?php echo $asset_id; ?>">
+                                            <a class="dropdown-item ajax-modal" href="#" data-modal-url="ajax/ajax_asset_copy.php?id=<?= $asset_id ?>">
                                                 <i class="fas fa-fw fa-copy mr-2"></i>Copy
                                             </a>
                                             <?php if ($session_user_role > 2) { ?>
diff --git a/user/contacts.php b/user/contacts.php
index fb30f013..46bd7743 100644
--- a/user/contacts.php
+++ b/user/contacts.php
@@ -499,19 +499,13 @@ $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="contact_details.php?<?php echo $client_url; ?>contact_id=<?php echo $contact_id; ?>">
+                                        <a class="dropdown-item" href="contact_details.php?<?= $client_url ?>contact_id=<?= $contact_id ?>">
                                             <i class="fas fa-fw fa-eye mr-2"></i>Details
                                         </a>
-                                        <a class="dropdown-item" href="#"
-                                            data-toggle="ajax-modal"
-                                            data-ajax-url="ajax/ajax_contact_note_create.php"
-                                            data-ajax-id="<?php echo $contact_id; ?>">
+                                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="ajax/ajax_contact_note_create.php?id=<?= $contact_id ?>">
                                             <i class="fas fa-fw fa-sticky-note mr-2"></i>Make Note
                                         </a>
-                                        <a class="dropdown-item" href="#"
-                                            data-toggle="ajax-modal"
-                                            data-ajax-url="ajax/ajax_contact_edit.php"
-                                            data-ajax-id="<?php echo $contact_id; ?>">
+                                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="ajax/ajax_contact_edit.php?id=<?= $contact_id ?>">
                                             <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                         </a>
                                         <?php if ($session_user_role == 3 && $contact_primary == 0) { ?>
diff --git a/user/locations.php b/user/locations.php
index 31156530..084cd338 100644
--- a/user/locations.php
+++ b/user/locations.php
@@ -328,11 +328,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 </div>
                             </td>
                             <td>
-                                <a class="text-dark" href="#"
-                                    data-toggle="ajax-modal"
-                                    data-ajax-url="ajax/ajax_location_edit.php"
-                                    data-ajax-id="<?php echo $location_id; ?>"
-                                    >
+                                <a class="text-dark ajax-modal" href="#" data-modal-url="ajax/ajax_location_edit.php?id=<?= $location_id ?>">
                                     <div class="media">
                                         <i class="fa fa-fw fa-2x fa-map-marker-alt mr-3"></i>
                                         <div class="media-body">
@@ -364,11 +360,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="ajax-modal"
-                                            data-ajax-url="ajax/ajax_location_edit.php"
-                                            data-ajax-id="<?php echo $location_id; ?>"
-                                            >
+                                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="ajax/ajax_location_edit.php?id=<?=$location_id; ?>">
                                             <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                         </a>
                                         <?php if ($session_user_role == 3 && $location_primary == 0) { ?>