diff --git a/user/accounts.php b/user/accounts.php
index 16ca6995..bac7010b 100644
--- a/user/accounts.php
+++ b/user/accounts.php
@@ -83,11 +83,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                         <tr>
                             <td>
-                                <a class="text-dark" href="#"
-                                    data-toggle="ajax-modal"
-                                    data-ajax-url="ajax/ajax_account_edit.php"
-                                    data-ajax-id="<?php echo $account_id; ?>"
-                                    >
+                                <a class="text-dark ajax-modal" href="#"
+                                    data-modal-url="modals/account/account_edit.php?id=<?= $account_id ?>">
                                     <?php echo $account_name; ?>
                                 </a>
                             </td>
@@ -99,11 +96,8 @@ $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_account_edit.php"
-                                            data-ajax-id="<?php echo $account_id; ?>"
-                                            >
+                                        <a class="dropdown-item ajax-modal" href="#"
+                                            data-modal-url="modals/account/account_edit.php?id=<?= $account_id ?>">
                                             <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                         </a>
                                         <?php if ($balance == 0 && $account_id != $config_stripe_account) { //Cannot Archive an Account until it reaches 0 Balance and cant be selected as an online account ?>
@@ -130,5 +124,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <?php
 
-require_once "modals/account_add_modal.php";
+require_once "modals/account/account_add.php";
 require_once "../includes/footer.php";
diff --git a/user/modals/account_add_modal.php b/user/modals/account/account_add.php
similarity index 100%
rename from user/modals/account_add_modal.php
rename to user/modals/account/account_add.php
diff --git a/user/ajax/ajax_account_edit.php b/user/modals/account/account_edit.php
similarity index 94%
rename from user/ajax/ajax_account_edit.php
rename to user/modals/account/account_edit.php
index cfdea8db..06162efc 100644
--- a/user/ajax/ajax_account_edit.php
+++ b/user/modals/account/account_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../../includes/modal_header.php';
+require_once '../../../includes/modal_header_new.php';
 
 $account_id = intval($_GET['id']);
 
@@ -48,4 +48,4 @@ ob_start();
 
 <?php
 
-require_once '../../includes/modal_footer.php';
+require_once '../../../includes/modal_footer_new.php';