diff --git a/.gitignore b/.gitignore
index f60657bd..f83f4883 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,14 @@ plugins/htmlpurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/CSS/*
 xcustom/*
 !xcustom/readme.php
 post/xcustom
-custom/*
 !post/xcustom/readme.php
+admin/custom/*
+!admin/custom/readme.php
+agent/custom/*
+!agent/custom/readme.php
+client/custom/*
+!client/custom/readme.php
+guest/custom/*
+!guest/custom/readme.php
 .zed
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69983bcb..5797ed84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,44 @@
 
 This file documents all notable changes made to ITFlow.
 
+## [25.10]
+
+### Breaking Changes
+- Renamed `/user/` directory to `/agent/`.
+- Deprecation Notice: `/scripts/cron_mail_queue.php` and `/scripts/cron_ticket_email_parser.php` are being phased out. Please transition to `/cron/mail_queue.php` and `/cron/ticket_email_parser.php`. These older scripts will be removed in the November release—update accordingly. New Installs via the script will have this already configured.
+- Custom is working now. Custom code should be placed in /admin/custom/ , /agent/custom/ , /client/custom/ /guest/custom/
+We will provide example code with directory structure for each custom directory a week after this release.
+
+### Fixes
+- Resolved issue with "Restore from Setup" not functioning correctly.
+- Corrected asset name display in logs and flash messages when editing an asset in a ticket.
+- Fixed Payment Provider Threshold not being applied.
+- Fixed issue where Threshold setting was not saving properly.
+- Various minor fixes for Payment Provider issues.
+- Removed leads from the client selection list in the "New Ticket" modal.
+- Fixed issues with the MFA modal.
+- Resolved MFA enforcement bugs.
+- Fixed KeepAlive functionality to maintain user sessions longer.
+- Fixed multiple broken links caused by the `/user/` to `/agent/` path migration.
+- Fixed Custom code directories.
+
+### Added / Changed
+- Removed "ACH" as a payment method; added "Bank Transfer" instead.
+- Replaced relative paths with absolute paths for web assets.
+- Tickets can now be resolved via the API.
+- Added a filter for Archived Users and an option to restore them.
+- Introduced a modal when archiving users, allowing reassignment of open and recurring tickets to another agent.
+- Improved logic for determining the index/root page.
+- Added "Assigned Agent" column for recurring tickets.
+- Introduced "Additional Assets" option when editing assets in tickets; modal now uses the updated AJAX method.
+- Added Gibraltar to the list of supported countries.
+- Added Custom Link Option for the Admin Nav.
+- Added Custom Link Option for the Reports Nav.
+
+### Other notes
+- Major releases will happen on the first week of every Month.
+
+
 ## [25.09.2]
 
 ### Fixes
diff --git a/admin/audit_log.php b/admin/audit_log.php
index 3da62911..33b58ac0 100644
--- a/admin/audit_log.php
+++ b/admin/audit_log.php
@@ -266,7 +266,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         if (empty($client_name)) {
                             $client_name_display = "-";
                         } else {
-                            $client_name_display = "<a href='../user/client_overview.php?client_id=$client_id'>$client_name</a>";
+                            $client_name_display = "<a href='../agent/client_overview.php?client_id=$client_id'>$client_name</a>";
                         }
                         $log_entity_id = intval($row['log_entity_id']);
 
diff --git a/admin/custom/readme.php b/admin/custom/readme.php
new file mode 100644
index 00000000..498c1b53
--- /dev/null
+++ b/admin/custom/readme.php
@@ -0,0 +1,8 @@
+<?php
+
+/*
+
+- Custom Pages -
+     If you wish to add custom pages to ITFlow, add them to this directory"
+     Link to Documentation for File Directory Structure and examples
+*/
diff --git a/admin/custom_link.php b/admin/custom_link.php
index 2432709e..77a42072 100644
--- a/admin/custom_link.php
+++ b/admin/custom_link.php
@@ -96,6 +96,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $custom_link_location_display = "Top Nav";
                         } elseif ($custom_link_location == 3) {
                             $custom_link_location_display = "Client Portal Nav";
+                        } elseif ($custom_link_location == 4) {
+                            $custom_link_location_display = "Admin Nav";
+                        } elseif ($custom_link_location == 5) {
+                            $custom_link_location_display = "Reports Nav";
                         }
 
                         ?>
diff --git a/admin/database_updates.php b/admin/database_updates.php
index f97ce66b..688a9daa 100644
--- a/admin/database_updates.php
+++ b/admin/database_updates.php
@@ -3992,6 +3992,40 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
 
         mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.4'");
     }
+
+    if (CURRENT_DATABASE_VERSION == '2.3.4') {
+
+        // Add Software Keys
+        mysqli_query($mysqli, "CREATE TABLE `software_keys` (
+            `software_key_id` INT(11) NOT NULL AUTO_INCREMENT,
+            `software_key` VARCHAR(400) NOT NULL,
+            `software_key_software_id` INT(11) NOT NULL,
+            PRIMARY KEY (`software_key_id`),
+            FOREIGN KEY (`software_key_software_id`) REFERENCES `software`(`software_id`) ON DELETE CASCADE
+        )");
+
+        // Software Key Assignments to Contacts
+        mysqli_query($mysqli, "CREATE TABLE `software_key_contact_assignments` (
+            `software_key_id` INT(11) NOT NULL,
+            `contact_id` INT(11) NOT NULL,
+            `software_key_assigned_at` DATETIME DEFAULT CURRENT_TIMESTAMP,
+            PRIMARY KEY (`software_key_id`, `contact_id`),
+            FOREIGN KEY (`software_key_id`) REFERENCES `software_keys`(`software_key_id`) ON DELETE CASCADE,
+            FOREIGN KEY (`contact_id`) REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE
+        )");
+
+        // Software Key Assignments to Assets
+        mysqli_query($mysqli, "CREATE TABLE `software_key_asset_assignments` (
+            `software_key_id` INT(11) NOT NULL,
+            `asset_id` INT(11) NOT NULL,
+            `software_key_assigned_at` DATETIME DEFAULT CURRENT_TIMESTAMP,
+            PRIMARY KEY (`software_key_id`, `asset_id`),
+            FOREIGN KEY (`software_key_id`) REFERENCES `software_keys`(`software_key_id`) ON DELETE CASCADE,
+            FOREIGN KEY (`asset_id`) REFERENCES `assets`(`asset_id`) ON DELETE CASCADE
+        )");
+
+        mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.3.5'");
+    }
     
     // if (CURRENT_DATABASE_VERSION == '2.3.4') {
     //     // Insert queries here required to update to DB version 2.3.4
diff --git a/admin/includes/inc_all_admin.php b/admin/includes/inc_all_admin.php
index ceeec4e2..fb600215 100644
--- a/admin/includes/inc_all_admin.php
+++ b/admin/includes/inc_all_admin.php
@@ -2,7 +2,6 @@
 
 require_once "../config.php";
 require_once "../functions.php";
-require_once "../includes/router.php";
 require_once "../includes/check_login.php";
 require_once "../includes/page_title.php";
 if (!isset($session_is_admin) || !$session_is_admin) {
diff --git a/admin/includes/side_nav.php b/admin/includes/side_nav.php
index ea0fc168..ee85e322 100644
--- a/admin/includes/side_nav.php
+++ b/admin/includes/side_nav.php
@@ -1,6 +1,6 @@
 <!-- Main Sidebar Container -->
 <aside class="main-sidebar sidebar-dark-<?php echo nullable_htmlentities($config_theme); ?> d-print-none">
-    <a class="brand-link pb-1 mt-1" href="../user/<?php echo $config_start_page ?>">
+    <a class="brand-link pb-1 mt-1" href="../agent/<?php echo $config_start_page ?>">
         <p class="h6">
             <i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
             <span class="brand-text">
@@ -277,6 +277,36 @@
                         </li>
                     </ul>
                 </li>
+
+                <?php
+                $sql_custom_links = mysqli_query($mysqli, "SELECT * FROM custom_links 
+                    WHERE custom_link_location = 4 AND custom_link_archived_at IS NULL
+                    ORDER BY custom_link_order ASC, custom_link_name ASC"
+                );
+
+                while ($row = mysqli_fetch_array($sql_custom_links)) {
+                    $custom_link_name = nullable_htmlentities($row['custom_link_name']);
+                    $custom_link_uri = sanitize_url($row['custom_link_uri']);
+                    $custom_link_icon = nullable_htmlentities($row['custom_link_icon']);
+                    $custom_link_new_tab = intval($row['custom_link_new_tab']);
+                    if ($custom_link_new_tab == 1) {
+                        $target = "target='_blank' rel='noopener noreferrer'";
+                    } else {
+                        $target = "";
+                    }
+
+                    ?>
+
+                <li class="nav-item">
+                    <a href="<?php echo $custom_link_uri; ?>" <?php echo $target; ?> class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == basename($custom_link_uri)) { echo "active"; } ?>">
+                        <i class="fas fa-<?php echo $custom_link_icon; ?> nav-icon"></i>
+                        <p><?php echo $custom_link_name; ?></p>
+                        <i class="fas fa-angle-right nav-icon float-right"></i>
+                    </a>
+                </li>
+
+                <?php } ?>
+
             </ul>
         </nav>
         <!-- /.sidebar-menu -->
diff --git a/admin/modals/custom_link/custom_link_add.php b/admin/modals/custom_link/custom_link_add.php
index 26a57b02..4e02b74d 100644
--- a/admin/modals/custom_link/custom_link_add.php
+++ b/admin/modals/custom_link/custom_link_add.php
@@ -66,6 +66,8 @@
                                 <option value="1">Main Side Nav</option>
                                 <option value="2">Top Nav (Icon Required)</option>
                                 <option value="3">Client Portal Nav</option>
+                                <option value="4">Admin Nav</option>
+                                <option value="5">Reports Nav</option>
                             </select>
                         </div>
                     </div>
diff --git a/admin/modals/custom_link/custom_link_edit.php b/admin/modals/custom_link/custom_link_edit.php
index 98c2f558..fdca1141 100644
--- a/admin/modals/custom_link/custom_link_edit.php
+++ b/admin/modals/custom_link/custom_link_edit.php
@@ -81,9 +81,11 @@ ob_start();
                     <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>
+                    <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>
+                    <option value="4" <?php if ($custom_link_location === 4) { echo "selected"; } ?> >Admin Nav</option>
+                    <option value="5" <?php if ($custom_link_location === 5) { echo "selected"; } ?> >Reports Nav</option>
                 </select>
             </div>
         </div>
diff --git a/admin/modals/payment_provider/payment_provider_add.php b/admin/modals/payment_provider/payment_provider_add.php
index fafa6422..54b52182 100644
--- a/admin/modals/payment_provider/payment_provider_add.php
+++ b/admin/modals/payment_provider/payment_provider_add.php
@@ -58,7 +58,7 @@
                             </div>
                             <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00">
                         </div>
-                        <small class="form-text text-muted">Will not show as an option at Checkout if above this number</small>
+                        <small class="form-text text-muted">Will not show as an option at Checkout if invoice amount is above this number, 0 disables the threshold check.</small>
                     </div>
 
                     <hr>
diff --git a/admin/modals/payment_provider/payment_provider_edit.php b/admin/modals/payment_provider/payment_provider_edit.php
index a98e94d5..f5e65cb6 100644
--- a/admin/modals/payment_provider/payment_provider_edit.php
+++ b/admin/modals/payment_provider/payment_provider_edit.php
@@ -58,7 +58,7 @@ ob_start();
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
                 </div>
-                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="Threshold" placeholder="1000.00" value="<?php echo $threshold; ?>">
+                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="threshold" placeholder="1000.00" value="<?php echo $threshold; ?>">
             </div>
             <small class="form-text text-muted">Will not show as an option at Checkout if above this number</small>
         </div>
diff --git a/admin/modals/user/user_archive.php b/admin/modals/user/user_archive.php
index 8662ad4c..ad3662c5 100644
--- a/admin/modals/user/user_archive.php
+++ b/admin/modals/user/user_archive.php
@@ -1,16 +1,83 @@
-<div class="modal" id="archiveUserModal<?php echo $user_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-body">
-        <div class="mb-4" style="text-align: center;">
-          <i class="far fa-10x fa-times-circle text-danger mb-3 mt-3"></i>
-          <h2>Are you sure?</h2>
-          <h6 class="mb-4 text-secondary">Do you really want to <b>archive <?php echo $user_name; ?></b>? This process cannot be undone.</h6>
-          <h6 class="mb-4 text-secondary"><?php echo $user_name ?> will no longer be able to log in or use ITFlow, but all associated content will remain accessible.</h6>
-          <button type="button" class="btn btn-outline-secondary btn-lg px-5 mr-4" data-dismiss="modal">Cancel</button>
-          <a class="btn btn-danger btn-lg px-5" href="post.php?archive_user=<?php echo $user_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">Yes, archive!</a>
-        </div>
-      </div>
-    </div>
-  </div>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$user_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM users WHERE users.user_id = $user_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$user_name = nullable_htmlentities($row['user_name']);
+$user_email = nullable_htmlentities($row['user_email']);
+$user_avatar = nullable_htmlentities($row['user_avatar']);
+$user_initials = nullable_htmlentities(initials($user_name));
+
+$sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets
+    WHERE ticket_assigned_to = $user_id AND ticket_resolved_at IS NULL AND ticket_closed_at IS NULL");
+
+$ticket_count = mysqli_num_rows($sql_related_tickets);
+
+// Related Recurring Tickets Query
+$sql_related_recurring_tickets = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_assigned_to = $user_id");
+
+$recurring_ticket_count = mysqli_num_rows($sql_related_recurring_tickets);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-user-slash mr-2"></i>Archiving user:
+        <strong><?php echo $user_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="user_id" value="<?php echo $user_id; ?>">
+    <div class="modal-body">
+
+
+        <center class="mb-3">
+            <?php if (!empty($user_avatar)) { ?>
+                <img class="img-fluid" src="<?php echo "../uploads/users/$user_id/$user_avatar"; ?>">
+            <?php } else { ?>
+                <span class="fa-stack fa-4x">
+                    <i class="fa fa-circle fa-stack-2x text-secondary"></i>
+                    <span class="fa fa-stack-1x text-white"><?php echo $user_initials; ?></span>
+                </span>
+            <?php } ?>
+        </center>
+
+
+        <div class="form-group">
+            <label>Reassign <?= $ticket_count ?> Open Tickets and <?= $recurring_ticket_count ?> Recurring Tickets To:</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+                </div>
+                <select class="form-control select2" name="ticket_assign" required>
+                    <option value="0">No one</option>
+                    <?php
+                    $sql_users = mysqli_query($mysqli, "SELECT * FROM users WHERE user_type = 1 AND user_archived_at IS NULL");
+                    while ($row = mysqli_fetch_array($sql_users)) {
+                        $user_id_select = intval($row['user_id']);
+                        $user_name_select = nullable_htmlentities($row['user_name']);
+
+                        ?>
+                        <option value="<?= $user_id_select ?>"><?= $user_name_select ?></option>
+                    <?php } ?>
+
+                </select>
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="archive_user" class="btn btn-danger text-bold"><i class="fas fa-archive mr-2"></i>Archive</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/modal_footer.php";
diff --git a/admin/modals/user/user_edit.php b/admin/modals/user/user_edit.php
index 6e9e2cc3..154dff83 100644
--- a/admin/modals/user/user_edit.php
+++ b/admin/modals/user/user_edit.php
@@ -57,7 +57,7 @@ ob_start();
 
                 <center class="mb-3">
                     <?php if (!empty($user_avatar)) { ?>
-                        <img class="img-fluid" src="<?php echo "uploads/users/$user_id/$user_avatar"; ?>">
+                        <img class="img-fluid" src="<?php echo "../uploads/users/$user_id/$user_avatar"; ?>">
                     <?php } else { ?>
                         <span class="fa-stack fa-4x">
                             <i class="fa fa-circle fa-stack-2x text-secondary"></i>
diff --git a/admin/modals/user/user_restore.php b/admin/modals/user/user_restore.php
new file mode 100644
index 00000000..ecd05356
--- /dev/null
+++ b/admin/modals/user/user_restore.php
@@ -0,0 +1,87 @@
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$user_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM users WHERE user_id = $user_id AND user_archived_at IS NOT NULL LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$user_name = str_replace(" (archived)", "", $row['user_name']); //Removed (archived) from user_name
+$user_name = nullable_htmlentities($user_name);
+$user_email = nullable_htmlentities($row['user_email']);
+$user_avatar = nullable_htmlentities($row['user_avatar']);
+$user_initials = initials($user_name);
+$user_role_id = intval($row['user_role_id']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-redo-alt mr-2"></i>Restoring user:
+        <strong><?php echo $user_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="user_id" value="<?php echo $user_id; ?>">
+    <div class="modal-body">
+
+
+        <center class="mb-3">
+            <?php if (!empty($user_avatar)) { ?>
+                <img class="img-fluid" src="<?php echo "../uploads/users/$user_id/$user_avatar"; ?>">
+            <?php } else { ?>
+                <span class="fa-stack fa-4x">
+                    <i class="fa fa-circle fa-stack-2x text-secondary"></i>
+                    <span class="fa fa-stack-1x text-white"><?php echo $user_initials; ?></span>
+                </span>
+            <?php } ?>
+        </center>
+
+        <div class="form-group">
+            <label>Set a New Password</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
+                </div>
+                <input type="password" class="form-control" data-toggle="password" name="new_password"
+                       placeholder="Enter a new password" autocomplete="new-password" required>
+                <div class="input-group-append">
+                    <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Role <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-user-shield"></i></span>
+                </div>
+                <select class="form-control select2" name="role" required>
+                    <?php
+                    $sql_user_roles = mysqli_query($mysqli, "SELECT * FROM user_roles WHERE role_archived_at IS NULL");
+                    while ($row = mysqli_fetch_array($sql_user_roles)) {
+                        $role_id = intval($row['role_id']);
+                        $role_name = nullable_htmlentities($row['role_name']);
+
+                        ?>
+                        <option <?php if ($role_id == $user_role_id) {echo "selected";} ?> value="<?php echo $role_id; ?>"><?php echo $role_name; ?></option>
+                    <?php } ?>
+
+                </select>
+            </div>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="restore_user" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Restore</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/modal_footer.php";
diff --git a/admin/payment_provider.php b/admin/payment_provider.php
index bb3b3cef..1c1073fe 100644
--- a/admin/payment_provider.php
+++ b/admin/payment_provider.php
@@ -55,7 +55,7 @@ $num_rows = mysqli_num_rows($sql);
                         </a>
                     </th>
                     <th>
-                        <a class="text-dark">Fee</a>
+                        <a class="text-dark">Expensed Fee</a>
                     </th>
                     <th>
                         <a class="text-dark">Saved Payment Methods</a>
@@ -93,7 +93,7 @@ $num_rows = mysqli_num_rows($sql);
                         <td><?php echo numfmt_format_currency($currency_format, $threshold, $session_company_currency); ?></td>
                         <td><?php echo $vendor_name; ?></td>
                         <td><?php echo $category; ?></td>
-                        <td><?php echo $percent_fee; ?> + <?php echo numfmt_format_currency($currency_format, $flat_fee, $session_company_currency); ?></td>
+                        <td><?php echo $percent_fee; ?>% + <?php echo numfmt_format_currency($currency_format, $flat_fee, $session_company_currency); ?></td>
                         <td><?php echo $saved_payment_count; ?></td>
                         <td>
                             <div class="dropdown dropleft text-center">
@@ -106,9 +106,12 @@ $num_rows = mysqli_num_rows($sql);
                                         <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                     </a>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item text-danger confirm-link" href="post.php?disable_payment_provicer=<?php echo $provider_id; ?>&csrf_token=<?php echo $_SESSION['csrf_token'] ?>">
-                                        <i class="fas fa-fw fa-thumbs-down mr-2"></i>Disable
-                                    </a>
+<!--                                    <a class="dropdown-item text-danger confirm-link" href="post.php?disable_payment_provider=--><?php //echo $provider_id; ?><!--&csrf_token=--><?php //echo $_SESSION['csrf_token'] ?><!--">-->
+<!--                                        <i class="fas fa-fw fa-thumbs-down mr-2"></i>Disable-->
+<!--                                    </a>-->
+<!--                                    <a class="dropdown-item text-danger confirm-link" href="post.php?delete_payment_provider=--><?php //echo $provider_id; ?><!--&csrf_token=--><?php //echo $_SESSION['csrf_token'] ?><!--">-->
+<!--                                        <i class="fas fa-fw fa-trash mr-2"></i>Delete-->
+<!--                                    </a>-->
                                 </div>
                             </div>
                         </td>
diff --git a/admin/post/payment_provider.php b/admin/post/payment_provider.php
index 650f774b..0ff98af7 100644
--- a/admin/post/payment_provider.php
+++ b/admin/post/payment_provider.php
@@ -15,10 +15,10 @@ if (isset($_POST['add_payment_provider'])) {
     $private_key = sanitizeInput($_POST['private_key']);
     $threshold = floatval($_POST['threshold']);
     $enable_expense = intval($_POST['enable_expense'] ?? 0);
-    $percentage_fee = floatval($_POST['percentage_fee']) / 100;
-    $flat_fee = floatval($_POST['flat_fee']);
+    $percentage_fee = floatval($_POST['percentage_fee']) / 100 ?? 0;
+    $flat_fee = floatval($_POST['flat_fee']) ?? 0;
 
-    // Check to make sure Provider isnt added Twice
+    // Check to ensure provider isn't added twice
     $sql = "SELECT 1 FROM payment_providers WHERE payment_provider_name = '$provider' LIMIT 1";
     $result = mysqli_query($mysqli, $sql);
     if (mysqli_num_rows($result) > 0) {
@@ -26,7 +26,7 @@ if (isset($_POST['add_payment_provider'])) {
         redirect();
     }
 
-    // Check for Stripe Account if not create it
+    // Check for Stripe Account, if not create it
     $sql_account = mysqli_query($mysqli,"SELECT account_id FROM accounts WHERE account_name = '$provider' AND account_archived_at IS NULL LIMIT 1");
     if (mysqli_num_rows($sql_account) == 0) {
         $account_id = mysqli_insert_id($mysqli);
@@ -35,6 +35,10 @@ if (isset($_POST['add_payment_provider'])) {
         $account_id = intval($row['account_id']);
     }
 
+    // Expense defaults
+    $category_id = 0;
+    $vendor_id = 0;
+
     if ($enable_expense) {
         // Category
         $sql_category = mysqli_query($mysqli,"SELECT category_id FROM categories WHERE category_name = 'Payment Processing' AND category_type = 'Expense' AND category_archived_at IS NULL LIMIT 1");
@@ -45,7 +49,7 @@ if (isset($_POST['add_payment_provider'])) {
             $row = mysqli_fetch_array($sql_category);
             $category_id = intval($row['category_id']);
         }
-        //Vendor
+        // Vendor
         $sql_vendor = mysqli_query($mysqli,"SELECT vendor_id FROM vendors WHERE vendor_name = '$provider' AND vendor_client_id = 0 AND vendor_archived_at IS NULL LIMIT 1");
         if (mysqli_num_rows($sql_vendor) == 0) {
             mysqli_query($mysqli,"INSERT INTO vendors SET vendor_name = '$provider', vendor_description = 'Payment Processor Provider', vendor_client_id = 0");
@@ -56,7 +60,7 @@ if (isset($_POST['add_payment_provider'])) {
         }
     }
 
-    mysqli_query($mysqli,"INSERT INTO payment_providers SET payment_provider_name = '$provider', payment_provider_public_key = '$public_key', payment_provider_private_key = '$private_key', payment_provider_account = $account_id, payment_provider_expense_vendor = $vendor_id, payment_provider_expense_category = $category_id, payment_provider_expense_percentage_fee = $percentage_fee, payment_provider_expense_flat_fee = $flat_fee");
+    mysqli_query($mysqli,"INSERT INTO payment_providers SET payment_provider_name = '$provider', payment_provider_public_key = '$public_key', payment_provider_private_key = '$private_key', payment_provider_threshold = $threshold, payment_provider_account = $account_id, payment_provider_expense_vendor = $vendor_id, payment_provider_expense_category = $category_id, payment_provider_expense_percentage_fee = $percentage_fee, payment_provider_expense_flat_fee = $flat_fee");
 
     $provider_id = mysqli_insert_id($mysqli);
 
@@ -81,7 +85,7 @@ if (isset($_POST['edit_payment_provider'])) {
     $percentage_fee = floatval($_POST['percentage_fee']) / 100;
     $flat_fee = floatval($_POST['flat_fee']);
 
-    mysqli_query($mysqli,"UPDATE payment_providers SET payment_provider_public_key = '$public_key', payment_provider_private_key = '$private_key', payment_provider_expense_percentage_fee = $percentage_fee, payment_provider_expense_flat_fee = $flat_fee WHERE payment_provider_id = $provider_id");
+    mysqli_query($mysqli,"UPDATE payment_providers SET payment_provider_public_key = '$public_key', payment_provider_private_key = '$private_key', payment_provider_threshold = $threshold, payment_provider_expense_percentage_fee = $percentage_fee, payment_provider_expense_flat_fee = $flat_fee WHERE payment_provider_id = $provider_id");
 
     logAction("Payment Provider", "Edit", "$session_name edited Payment Provider $provider");
 
@@ -92,11 +96,14 @@ if (isset($_POST['edit_payment_provider'])) {
 }
 
 if (isset($_GET['delete_payment_provider'])) {
+
+    validateCSRFToken($_GET['csrf_token']);
     
     $provider_id = intval($_GET['delete_payment_provider']);
 
-    $provider_name = sanitizeInput(getFieldById('provider_providers', $provider_id, 'provider_name'));
+    $provider_name = sanitizeInput(getFieldById('payment_providers', $provider_id, 'provider_name'));
 
+    // Delete provider
     mysqli_query($mysqli,"DELETE FROM payment_providers WHERE payment_provider_id = $provider_id");
 
     logAction("Payment Provider", "Delete", "$session_name deleted Payment Provider $provider_name");
diff --git a/admin/post/saved_payment_method.php b/admin/post/saved_payment_method.php
index da69664a..7645b390 100644
--- a/admin/post/saved_payment_method.php
+++ b/admin/post/saved_payment_method.php
@@ -37,7 +37,7 @@ if (isset($_GET['delete_saved_payment'])) {
 
     $private_key = $row['payment_provider_private_key'];
 
-    // Seperate logic for each Payment Provider
+    // Separate logic for each Payment Provider
     if ($payment_provider_name == 'Stripe') {
 
         try {
diff --git a/admin/post/users.php b/admin/post/users.php
index 7fce39cb..2217a22b 100644
--- a/admin/post/users.php
+++ b/admin/post/users.php
@@ -236,16 +236,20 @@ if (isset($_GET['revoke_remember_me'])) {
 
 }
 
-if (isset($_GET['archive_user'])) {
+if (isset($_POST['archive_user'])) {
 
-    validateCSRFToken($_GET['csrf_token']);
+    validateCSRFToken($_POST['csrf_token']);
 
-    // Variables from GET
-    $user_id = intval($_GET['archive_user']);
+    $user_id = intval($_POST['user_id']);
+    $ticket_assign = intval($_POST['ticket_assign']);
     $password = password_hash(randomString(), PASSWORD_DEFAULT);
 
     $user_name = sanitizeInput(getFieldById('users', $user_id, 'user_name'));
 
+    // Un-assign / Re-assign tickets
+    mysqli_query($mysqli, "UPDATE tickets SET ticket_assigned_to = $ticket_assign WHERE ticket_assigned_to = $user_id AND ticket_closed_at IS NULL AND ticket_resolved_at IS NULL");
+    mysqli_query($mysqli, "UPDATE recurring_tickets SET recurring_ticket_assigned_to = $ticket_assign WHERE recurring_ticket_assigned_to = $user_id");
+
     // Archive user query
     mysqli_query($mysqli, "UPDATE users SET user_name = '$user_name (archived)', user_password = '$password', user_status = 0, user_specific_encryption_ciphertext = '', user_archived_at = NOW() WHERE user_id = $user_id");
 
@@ -257,6 +261,36 @@ if (isset($_GET['archive_user'])) {
 
 }
 
+if (isset($_POST['restore_user'])) {
+
+    validateCSRFToken($_POST['csrf_token']);
+
+    $user_id = intval($_POST['user_id']);
+    $new_password = trim($_POST['new_password']);
+    $role = intval($_POST['role']);
+
+    $user_name = getFieldById('users', $user_id, 'user_name');
+    $user_name = sanitizeInput(str_replace(" (archived)", "", $user_name)); //Removed (archived) from user_name
+
+    // Restore user query
+    mysqli_query($mysqli, "UPDATE users SET user_name = '$user_name', user_status = 1, user_role_id = $role, user_archived_at = NULL WHERE user_id = $user_id");
+
+    if (!empty($new_password)) {
+        $new_password = password_hash($new_password, PASSWORD_DEFAULT);
+        $user_specific_encryption_ciphertext = encryptUserSpecificKey(trim($_POST['new_password']));
+        mysqli_query($mysqli, "UPDATE users SET user_password = '$new_password', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext' WHERE user_id = $user_id");
+        //Extended Logging
+        $extended_log_description .= ", password changed";
+    }
+
+    logAction("User", "Restored", "$session_name restored user $user_name", 0, $user_id);
+
+    flash_alert("User <strong>$user_name</strong> restored");
+
+    redirect();
+
+}
+
 if (isset($_POST['export_users_csv'])) {
 
     //get records from database
diff --git a/admin/users.php b/admin/users.php
index 2d66dd0f..08feccfa 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -13,7 +13,7 @@ $sql = mysqli_query(
     LEFT JOIN user_settings ON users.user_id = user_settings.user_id
     WHERE (user_name LIKE '%$q%' OR user_email LIKE '%$q%')
     AND user_type = 1
-    AND user_archived_at IS NULL
+    AND user_$archive_query
     ORDER BY $sort $order LIMIT $record_from, $record_to"
 );
 
@@ -53,6 +53,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </div>
                 </div>
                 <div class="col-md-8">
+                    <div class="btn-group float-right">
+                        <a href="?archived=<?php if($archived == 1){ echo 0; } else { echo 1; } ?>" 
+                            class="btn btn-<?php if($archived == 1){ echo "primary"; } else { echo "default"; } ?>">
+                            <i class="fa fa-fw fa-archive mr-2"></i>Archived
+                        </a>
+                    </div>
                 </div>
             </div>
         </form>
@@ -113,8 +119,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     $user_config_force_mfa = intval($row['user_config_force_mfa']);
                     $user_role = intval($row['user_role_id']);
                     $user_role_display = nullable_htmlentities($row['role_name']);
+                    $user_archived_at = nullable_htmlentities($row['user_archived_at']);
                     $user_initials = nullable_htmlentities(initials($user_name));
 
+
                     $sql_last_login = mysqli_query(
                         $mysqli,
                         "SELECT * FROM logs
@@ -196,10 +204,17 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                             <i class="fas fa-fw fa-user-slash mr-2"></i>Disable
                                         </a>
                                     <?php } ?>
+                                    <?php if ($user_archived_at) { ?>
                                     <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item text-danger" href="#" data-toggle="modal" data-target="#archiveUserModal<?php echo $user_id; ?>">
+                                    <a class="dropdown-item text-info ajax-modal" href="#" data-modal-url="modals/user/user_restore.php?id=<?= $user_id ?>">
+                                        <i class="fas fa-fw fa-redo-alt mr-2"></i>Restore
+                                    </a>
+                                    <?php } else { ?>
+                                    <div class="dropdown-divider"></div>
+                                    <a class="dropdown-item text-danger ajax-modal" href="#" data-modal-url="modals/user/user_archive.php?id=<?= $user_id ?>">
                                         <i class="fas fa-fw fa-archive mr-2"></i>Archive
                                     </a>
+                                    <?php } ?>
                                 </div>
                             </div>
                             <?php } ?>
@@ -207,9 +222,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tr>
 
                     <?php
-
-                    require "modals/user/user_archive.php";
-
                 }
 
                 ?>
diff --git a/user/accounts.php b/agent/accounts.php
similarity index 100%
rename from user/accounts.php
rename to agent/accounts.php
diff --git a/user/ajax.php b/agent/ajax.php
similarity index 100%
rename from user/ajax.php
rename to agent/ajax.php
diff --git a/user/asset_details.php b/agent/asset_details.php
similarity index 100%
rename from user/asset_details.php
rename to agent/asset_details.php
diff --git a/user/assets.php b/agent/assets.php
similarity index 100%
rename from user/assets.php
rename to agent/assets.php
diff --git a/user/blank.php b/agent/blank.php
similarity index 100%
rename from user/blank.php
rename to agent/blank.php
diff --git a/user/budget.php b/agent/budget.php
similarity index 100%
rename from user/budget.php
rename to agent/budget.php
diff --git a/user/budget_edit.php b/agent/budget_edit.php
similarity index 100%
rename from user/budget_edit.php
rename to agent/budget_edit.php
diff --git a/user/calendar.php b/agent/calendar.php
similarity index 99%
rename from user/calendar.php
rename to agent/calendar.php
index 75356d69..c8891783 100644
--- a/user/calendar.php
+++ b/agent/calendar.php
@@ -106,7 +106,7 @@ while ($row = mysqli_fetch_array($sql)) {
 <?php require_once "../includes/footer.php";
 ?>
 
-<script src='../plugins/fullcalendar/dist/index.global.js'></script>
+<script src='/plugins/fullcalendar/dist/index.global.js'></script>
 
 <script>
     document.addEventListener('DOMContentLoaded', function() {
diff --git a/user/certificates.php b/agent/certificates.php
similarity index 100%
rename from user/certificates.php
rename to agent/certificates.php
diff --git a/user/client_autopay.php b/agent/client_autopay.php
similarity index 100%
rename from user/client_autopay.php
rename to agent/client_autopay.php
diff --git a/user/client_overview.php b/agent/client_overview.php
similarity index 100%
rename from user/client_overview.php
rename to agent/client_overview.php
diff --git a/user/clients.php b/agent/clients.php
similarity index 100%
rename from user/clients.php
rename to agent/clients.php
diff --git a/user/contact_details.php b/agent/contact_details.php
similarity index 100%
rename from user/contact_details.php
rename to agent/contact_details.php
diff --git a/user/contacts.php b/agent/contacts.php
similarity index 100%
rename from user/contacts.php
rename to agent/contacts.php
diff --git a/user/credentials.php b/agent/credentials.php
similarity index 100%
rename from user/credentials.php
rename to agent/credentials.php
diff --git a/user/css/quote_dropdowns_fix.css b/agent/css/quote_dropdowns_fix.css
similarity index 100%
rename from user/css/quote_dropdowns_fix.css
rename to agent/css/quote_dropdowns_fix.css
diff --git a/user/css/ticket_kanban.css b/agent/css/ticket_kanban.css
similarity index 100%
rename from user/css/ticket_kanban.css
rename to agent/css/ticket_kanban.css
diff --git a/agent/custom/includes/custom_side_nav.php b/agent/custom/includes/custom_side_nav.php
new file mode 100644
index 00000000..534b8dfc
--- /dev/null
+++ b/agent/custom/includes/custom_side_nav.php
@@ -0,0 +1,45 @@
+<!-- Main Sidebar Container -->
+<aside class="main-sidebar sidebar-dark-primary d-print-none">
+
+    <a class="pb-1 mt-1 brand-link" href="../<?php echo $config_start_page ?>">
+        <p class="h5"><i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
+            <span class="brand-text ">Back | <strong>Custom</strong>
+        </p>
+    </a>
+
+    <!-- Sidebar -->
+    <div class="sidebar">
+
+        <!-- Sidebar Menu -->
+        <nav>
+
+            <ul class="nav nav-pills nav-sidebar flex-column mt-2" data-widget="treeview" data-accordion="false">
+
+                <li class="nav-header">CUSTOM HEADER</li>
+         
+                <li class="nav-item">
+                    <a href="index.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "index.php") { echo "active"; } ?>">
+                        <i class="far fa-circle nav-icon"></i>
+                        <p>custom</p>
+                    </a>
+                </li>
+        
+            </ul>
+
+        </nav>
+        <!-- /.sidebar-menu -->
+
+        <div class="sidebar-custom mb-3">
+
+        </div>
+
+    </div>
+    <!-- /.sidebar -->
+</aside>
+
+
+
+
+
+
+
diff --git a/agent/custom/includes/inc_all_custom.php b/agent/custom/includes/inc_all_custom.php
new file mode 100644
index 00000000..a66fcce4
--- /dev/null
+++ b/agent/custom/includes/inc_all_custom.php
@@ -0,0 +1,13 @@
+<?php
+
+require_once "../../config.php";
+require_once "../../functions.php";
+require_once "../../includes/check_login.php";
+require_once "../../includes/page_title.php";
+require_once "../../includes/header.php";
+require_once "../../includes/top_nav.php";
+require_once "includes/custom_side_nav.php";
+require_once "../../includes/inc_wrapper.php";
+require_once "../../includes/inc_alert_feedback.php";
+require_once "../../includes/filter_header.php";
+
diff --git a/agent/custom/index.php b/agent/custom/index.php
new file mode 100644
index 00000000..558c87ae
--- /dev/null
+++ b/agent/custom/index.php
@@ -0,0 +1,72 @@
+<?php require_once "includes/inc_all_custom.php"; ?>
+
+    <!-- Breadcrumbs-->
+    <ol class="breadcrumb">
+        <li class="breadcrumb-item">
+            <a href="index.html">Dashboard</a>
+        </li>
+        <li class="breadcrumb-item active">Blank Page</li>
+    </ol>
+
+    <!-- Page Content -->
+    <h1>Blank Page</h1>
+    <hr>
+    <p>This is a great starting point for new custom pages.</p>
+    <h1><?php echo $session_user_role; ?></h1>
+    <?php validateAdminRole(); ?>
+
+<?php
+
+$start_date = date('Y') . "-10-10";
+
+echo "<H1>$start_date</H1>";
+
+echo "<H2>User Agent</H2>";
+echo getUserAgent();
+
+
+?>
+    <br>
+
+    <input type="tel" name="phone" id="phone">
+
+     <div class="form-group">
+                  <label>Minimal</label>
+                  <select class="form-control select2 select2-hidden-accessible" style="width: 100%;" data-select2-id="1" tabindex="-1" aria-hidden="true">
+                    <option selected="selected" data-select2-id="3">Alabama</option>
+                    <option data-select2-id="35">Alaska</option>
+                    <option data-select2-id="36">California</option>
+                    <option data-select2-id="37">Delaware</option>
+                    <option data-select2-id="38">Tennessee</option>
+                    <option data-select2-id="39">Texas</option>
+                    <option data-select2-id="40">Washington</option>
+                  </select><span class="select2 select2-container select2-container--default select2-container--below" dir="ltr" data-select2-id="2" style="width: 100%;"><span class="selection"><span class="select2-selection select2-selection--single" role="combobox" aria-haspopup="true" aria-expanded="false" tabindex="0" aria-disabled="false" aria-labelledby="select2-nbex-container"><span class="select2-selection__rendered" id="select2-nbex-container" role="textbox" aria-readonly="true" title="Alabama">Alabama</span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span></span></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>
+                </div>
+
+    <dl>
+        <dt>Requester</dt>
+        <dd>Sam Adams</dd>
+
+        <dt>Created</dt>
+        <dd><time datetime="2024-04-11T17:52:30+00:00" title="2024-04-11 13:52" data-datetime="calendar">Today at 13:52</time></dd>
+
+        <dt>Last activity</dt>
+        <dd><time datetime="2024-04-11T18:08:55+00:00" title="2024-04-11 14:08" data-datetime="calendar">Today at 14:08</time></dd>
+    </dl>
+
+    <?php echo randomString(100); ?>
+    <br>
+    <textarea class="tinymceTest"></textarea>
+
+    <textarea class="tinymce"></textarea>
+
+    <textarea class="tinymceTicket"></textarea>
+<?php
+// show the current Date and Time
+$date_time = date('Y-m-d H:i:s');
+echo "Current Date and Time: <strong>$date_time</strong>";
+?>
+
+<script>toastr.success('Have Fun Wozz!!')</script>
+
+<?php require_once "../../includes/footer.php";
diff --git a/custom/post.php b/agent/custom/post.php
similarity index 50%
rename from custom/post.php
rename to agent/custom/post.php
index 9737b77a..50b8332b 100644
--- a/custom/post.php
+++ b/agent/custom/post.php
@@ -1,12 +1,12 @@
 <?php
 
 /*
- * ITFlow - Custom GET/POST request handler
+ * ITFlow - User GET/POST request handler
  */
 
-require_once "../config.php";
-require_once "../functions.php";
-require_once "../includes/check_login.php";
+require_once "../../config.php";
+require_once "../../functions.php";
+require_once "../../includes/check_login.php";
 
 // Define a variable that we can use to only allow running post files via inclusion (prevents people/bots poking them)
 define('FROM_POST_HANDLER', true);
@@ -24,17 +24,23 @@ $module = explode(".", basename($path))[0];
 $module = str_ireplace('_details', '', $module);
 
 // Dynamically load admin-related module POST logic
-if (str_contains($module, 'custom')) {
-    // Dynamically load any custom POST logic
 
-    include_once "post/$module.php";
+// Load all module POST logic
+//  Loads everything in post/user/
+//  Eventually, it would be nice to only specifically load what we need like we do for admins
 
+foreach (glob("post/*.php") as $user_module) {
+    if (!preg_match('/_model\.php$/', basename($user_module))) {
+        require_once $user_module;
+    }
 }
 
+
 // Logout is the same for user and admin
-require_once "../post/logout.php";
+require_once "../../post/logout.php";
 
 // TODO: Find a home for these
 
-require_once "../post/ai.php";
-require_once "../post/misc.php";
+require_once "../../post/ai.php";
+require_once "../../post/misc.php";
+
diff --git a/user/dashboard.php b/agent/dashboard.php
similarity index 99%
rename from user/dashboard.php
rename to agent/dashboard.php
index 26090008..4f38035c 100644
--- a/user/dashboard.php
+++ b/agent/dashboard.php
@@ -209,7 +209,7 @@ if ($user_config_dashboard_financial_enable == 1) {
 
         <div class="col-lg-4 col-md-6 col-sm-12">
             <!-- small box -->
-            <a class="small-box bg-success" href="report_profit_loss.php">
+            <a class="small-box bg-success" href="reports/profit_loss.php">
                 <div class="inner">
                     <h3><?php echo numfmt_format_currency($currency_format, $profit, "$session_company_currency"); ?></h3>
                     <p>Profit</p>
@@ -223,7 +223,7 @@ if ($user_config_dashboard_financial_enable == 1) {
 
         <div class="col-lg-6 col-md-6 col-sm-12">
             <!-- small box -->
-            <a class="small-box bg-info" href="report_recurring_by_client.php">
+            <a class="small-box bg-info" href="reports/recurring_by_client.php">
                 <div class="inner">
                     <h3><?php echo numfmt_format_currency($currency_format, $recurring_monthly_total, "$session_company_currency"); ?></h3>
                     <p>Monthly Recurring Income</p>
@@ -252,7 +252,7 @@ if ($user_config_dashboard_financial_enable == 1) {
         <?php if ($config_module_enable_ticketing && $config_module_enable_accounting) { ?>
             <div class="col-lg-2 col-md-6 col-sm-12">
                 <!-- small box -->
-                <a class="small-box bg-secondary" href="report_tickets_unbilled.php">
+                <a class="small-box bg-secondary" href="reports/tickets_unbilled.php">
                     <div class="inner">
                         <h3><?php echo $unbilled_tickets; ?></h3>
                         <p>Unbilled Ticket<?php if ($unbilled_tickets > 1 || $unbilled_tickets == 0) { echo "s"; } ?></p>
@@ -338,7 +338,7 @@ if ($user_config_dashboard_financial_enable == 1) {
                 <div class="card-header">
                     <h3 class="card-title"><i class="fas fa-fw fa-chart-area mr-2"></i>Cash Flow</h3>
                     <div class="card-tools">
-                        <a href="report_income_summary.php" class="btn btn-tool">
+                        <a href="reports/income_summary.php" class="btn btn-tool">
                             <i class="fas fa-eye"></i>
                         </a>
                         <button type="button" class="btn btn-tool" data-card-widget="remove">
diff --git a/user/document_details.php b/agent/document_details.php
similarity index 100%
rename from user/document_details.php
rename to agent/document_details.php
diff --git a/user/documents.php b/agent/documents.php
similarity index 100%
rename from user/documents.php
rename to agent/documents.php
diff --git a/user/domains.php b/agent/domains.php
similarity index 100%
rename from user/domains.php
rename to agent/domains.php
diff --git a/user/expenses.php b/agent/expenses.php
similarity index 100%
rename from user/expenses.php
rename to agent/expenses.php
diff --git a/user/files.php b/agent/files.php
similarity index 100%
rename from user/files.php
rename to agent/files.php
diff --git a/user/global_search.php b/agent/global_search.php
similarity index 100%
rename from user/global_search.php
rename to agent/global_search.php
diff --git a/user/includes/client_overview_side_nav.php b/agent/includes/client_overview_side_nav.php
similarity index 100%
rename from user/includes/client_overview_side_nav.php
rename to agent/includes/client_overview_side_nav.php
diff --git a/user/includes/client_side_nav.php b/agent/includes/client_side_nav.php
similarity index 100%
rename from user/includes/client_side_nav.php
rename to agent/includes/client_side_nav.php
diff --git a/user/includes/get_side_nav_counts.php b/agent/includes/get_side_nav_counts.php
similarity index 100%
rename from user/includes/get_side_nav_counts.php
rename to agent/includes/get_side_nav_counts.php
diff --git a/user/includes/inc_all.php b/agent/includes/inc_all.php
similarity index 93%
rename from user/includes/inc_all.php
rename to agent/includes/inc_all.php
index 36016377..6af71f8e 100644
--- a/user/includes/inc_all.php
+++ b/agent/includes/inc_all.php
@@ -2,7 +2,6 @@
 // Configuration & core
 require_once "../config.php";
 require_once "../functions.php";
-require_once "../includes/router.php";
 require_once "../includes/check_login.php";
 
 // Page setup
diff --git a/user/includes/inc_all_client.php b/agent/includes/inc_all_client.php
similarity index 99%
rename from user/includes/inc_all_client.php
rename to agent/includes/inc_all_client.php
index 346d69c2..2c78f774 100644
--- a/user/includes/inc_all_client.php
+++ b/agent/includes/inc_all_client.php
@@ -2,7 +2,6 @@
 
 require_once "../config.php";
 require_once "../functions.php";
-require_once "../includes/router.php";
 require_once "../includes/check_login.php";
 require_once "../includes/page_title.php";
 
diff --git a/user/includes/inc_client_overview_all.php b/agent/includes/inc_client_overview_all.php
similarity index 91%
rename from user/includes/inc_client_overview_all.php
rename to agent/includes/inc_client_overview_all.php
index 6967f755..22dce8c0 100644
--- a/user/includes/inc_client_overview_all.php
+++ b/agent/includes/inc_client_overview_all.php
@@ -2,7 +2,6 @@
 
 require_once "../config.php";
 require_once "../functions.php";
-require_once "../includes/router.php";
 require_once "../includes/check_login.php";
 require_once "../includes/page_title.php";
 require_once "../includes/header.php";
@@ -11,4 +10,3 @@ require_once "includes/client_overview_side_nav.php";
 require_once "../includes/inc_wrapper.php";
 require_once "../includes/inc_alert_feedback.php";
 require_once "../includes/filter_header.php";
-
diff --git a/user/includes/inc_client_top_head.php b/agent/includes/inc_client_top_head.php
similarity index 100%
rename from user/includes/inc_client_top_head.php
rename to agent/includes/inc_client_top_head.php
diff --git a/user/includes/side_nav.php b/agent/includes/side_nav.php
similarity index 99%
rename from user/includes/side_nav.php
rename to agent/includes/side_nav.php
index 0ed1efb1..44d09ab1 100644
--- a/user/includes/side_nav.php
+++ b/agent/includes/side_nav.php
@@ -188,7 +188,7 @@
 
                 <?php if (lookupUserPermission("module_reporting") >= 1) { ?>
                     <li class="nav-item mt-3">
-                        <a href="report_overview.php" class="nav-link">
+                        <a href="reports/" class="nav-link">
                             <i class="fas fa-chart-line nav-icon"></i>
                             <p>Reports</p>
                             <i class="fas fa-angle-right nav-icon float-right"></i>
diff --git a/user/index.php b/agent/index.php
similarity index 100%
rename from user/index.php
rename to agent/index.php
diff --git a/user/invoice.php b/agent/invoice.php
similarity index 100%
rename from user/invoice.php
rename to agent/invoice.php
diff --git a/user/invoices.php b/agent/invoices.php
similarity index 100%
rename from user/invoices.php
rename to agent/invoices.php
diff --git a/user/js/ai_ticket_summary.js b/agent/js/ai_ticket_summary.js
similarity index 100%
rename from user/js/ai_ticket_summary.js
rename to agent/js/ai_ticket_summary.js
diff --git a/user/js/autopay_setup_stripe.js b/agent/js/autopay_setup_stripe.js
similarity index 100%
rename from user/js/autopay_setup_stripe.js
rename to agent/js/autopay_setup_stripe.js
diff --git a/user/js/certificate_fetch_ssl.js b/agent/js/certificate_fetch_ssl.js
similarity index 100%
rename from user/js/certificate_fetch_ssl.js
rename to agent/js/certificate_fetch_ssl.js
diff --git a/user/js/client_delete_confirm.js b/agent/js/client_delete_confirm.js
similarity index 100%
rename from user/js/client_delete_confirm.js
rename to agent/js/client_delete_confirm.js
diff --git a/user/js/credential_show_otp_via_id.js b/agent/js/credential_show_otp_via_id.js
similarity index 100%
rename from user/js/credential_show_otp_via_id.js
rename to agent/js/credential_show_otp_via_id.js
diff --git a/user/js/file_delete_modal.js b/agent/js/file_delete_modal.js
similarity index 100%
rename from user/js/file_delete_modal.js
rename to agent/js/file_delete_modal.js
diff --git a/user/js/generate_password.js b/agent/js/generate_password.js
similarity index 100%
rename from user/js/generate_password.js
rename to agent/js/generate_password.js
diff --git a/user/js/guest_pay_invoice_stripe.js b/agent/js/guest_pay_invoice_stripe.js
similarity index 100%
rename from user/js/guest_pay_invoice_stripe.js
rename to agent/js/guest_pay_invoice_stripe.js
diff --git a/user/js/share_modal.js b/agent/js/share_modal.js
similarity index 100%
rename from user/js/share_modal.js
rename to agent/js/share_modal.js
diff --git a/user/js/ticket_change_client.js b/agent/js/ticket_change_client.js
similarity index 100%
rename from user/js/ticket_change_client.js
rename to agent/js/ticket_change_client.js
diff --git a/user/js/ticket_collision_detection.js b/agent/js/ticket_collision_detection.js
similarity index 100%
rename from user/js/ticket_collision_detection.js
rename to agent/js/ticket_collision_detection.js
diff --git a/user/js/ticket_merge.js b/agent/js/ticket_merge.js
similarity index 100%
rename from user/js/ticket_merge.js
rename to agent/js/ticket_merge.js
diff --git a/user/js/ticket_time_tracking.js b/agent/js/ticket_time_tracking.js
similarity index 100%
rename from user/js/ticket_time_tracking.js
rename to agent/js/ticket_time_tracking.js
diff --git a/user/js/tickets_add_modal.js b/agent/js/tickets_add_modal.js
similarity index 100%
rename from user/js/tickets_add_modal.js
rename to agent/js/tickets_add_modal.js
diff --git a/user/js/tickets_kanban.js b/agent/js/tickets_kanban.js
similarity index 100%
rename from user/js/tickets_kanban.js
rename to agent/js/tickets_kanban.js
diff --git a/user/locations.php b/agent/locations.php
similarity index 100%
rename from user/locations.php
rename to agent/locations.php
diff --git a/user/modals/account/account_add.php b/agent/modals/account/account_add.php
similarity index 100%
rename from user/modals/account/account_add.php
rename to agent/modals/account/account_add.php
diff --git a/user/modals/account/account_edit.php b/agent/modals/account/account_edit.php
similarity index 100%
rename from user/modals/account/account_edit.php
rename to agent/modals/account/account_edit.php
diff --git a/user/modals/asset/asset_add.php b/agent/modals/asset/asset_add.php
similarity index 100%
rename from user/modals/asset/asset_add.php
rename to agent/modals/asset/asset_add.php
diff --git a/user/modals/asset/asset_bulk_add_ticket.php b/agent/modals/asset/asset_bulk_add_ticket.php
similarity index 100%
rename from user/modals/asset/asset_bulk_add_ticket.php
rename to agent/modals/asset/asset_bulk_add_ticket.php
diff --git a/user/modals/asset/asset_bulk_assign_contact.php b/agent/modals/asset/asset_bulk_assign_contact.php
similarity index 100%
rename from user/modals/asset/asset_bulk_assign_contact.php
rename to agent/modals/asset/asset_bulk_assign_contact.php
diff --git a/user/modals/asset/asset_bulk_assign_location.php b/agent/modals/asset/asset_bulk_assign_location.php
similarity index 100%
rename from user/modals/asset/asset_bulk_assign_location.php
rename to agent/modals/asset/asset_bulk_assign_location.php
diff --git a/user/modals/asset/asset_bulk_assign_physical_location.php b/agent/modals/asset/asset_bulk_assign_physical_location.php
similarity index 100%
rename from user/modals/asset/asset_bulk_assign_physical_location.php
rename to agent/modals/asset/asset_bulk_assign_physical_location.php
diff --git a/user/modals/asset/asset_bulk_edit_status.php b/agent/modals/asset/asset_bulk_edit_status.php
similarity index 100%
rename from user/modals/asset/asset_bulk_edit_status.php
rename to agent/modals/asset/asset_bulk_edit_status.php
diff --git a/user/modals/asset/asset_bulk_transfer_client.php b/agent/modals/asset/asset_bulk_transfer_client.php
similarity index 100%
rename from user/modals/asset/asset_bulk_transfer_client.php
rename to agent/modals/asset/asset_bulk_transfer_client.php
diff --git a/user/modals/asset/asset_copy.php b/agent/modals/asset/asset_copy.php
similarity index 100%
rename from user/modals/asset/asset_copy.php
rename to agent/modals/asset/asset_copy.php
diff --git a/user/modals/asset/asset_details.php b/agent/modals/asset/asset_details.php
similarity index 100%
rename from user/modals/asset/asset_details.php
rename to agent/modals/asset/asset_details.php
diff --git a/user/modals/asset/asset_documents.php b/agent/modals/asset/asset_documents.php
similarity index 100%
rename from user/modals/asset/asset_documents.php
rename to agent/modals/asset/asset_documents.php
diff --git a/user/modals/asset/asset_edit.php b/agent/modals/asset/asset_edit.php
similarity index 100%
rename from user/modals/asset/asset_edit.php
rename to agent/modals/asset/asset_edit.php
diff --git a/user/modals/asset/asset_export.php b/agent/modals/asset/asset_export.php
similarity index 100%
rename from user/modals/asset/asset_export.php
rename to agent/modals/asset/asset_export.php
diff --git a/user/modals/asset/asset_import.php b/agent/modals/asset/asset_import.php
similarity index 100%
rename from user/modals/asset/asset_import.php
rename to agent/modals/asset/asset_import.php
diff --git a/user/modals/asset/asset_interface_add.php b/agent/modals/asset/asset_interface_add.php
similarity index 100%
rename from user/modals/asset/asset_interface_add.php
rename to agent/modals/asset/asset_interface_add.php
diff --git a/user/modals/asset/asset_interface_bulk_edit_network.php b/agent/modals/asset/asset_interface_bulk_edit_network.php
similarity index 100%
rename from user/modals/asset/asset_interface_bulk_edit_network.php
rename to agent/modals/asset/asset_interface_bulk_edit_network.php
diff --git a/user/modals/asset/asset_interface_bulk_edit_type.php b/agent/modals/asset/asset_interface_bulk_edit_type.php
similarity index 100%
rename from user/modals/asset/asset_interface_bulk_edit_type.php
rename to agent/modals/asset/asset_interface_bulk_edit_type.php
diff --git a/user/modals/asset/asset_interface_edit.php b/agent/modals/asset/asset_interface_edit.php
similarity index 100%
rename from user/modals/asset/asset_interface_edit.php
rename to agent/modals/asset/asset_interface_edit.php
diff --git a/user/modals/asset/asset_interface_export.php b/agent/modals/asset/asset_interface_export.php
similarity index 100%
rename from user/modals/asset/asset_interface_export.php
rename to agent/modals/asset/asset_interface_export.php
diff --git a/user/modals/asset/asset_interface_import.php b/agent/modals/asset/asset_interface_import.php
similarity index 100%
rename from user/modals/asset/asset_interface_import.php
rename to agent/modals/asset/asset_interface_import.php
diff --git a/user/modals/asset/asset_interface_multiple_add.php b/agent/modals/asset/asset_interface_multiple_add.php
similarity index 100%
rename from user/modals/asset/asset_interface_multiple_add.php
rename to agent/modals/asset/asset_interface_multiple_add.php
diff --git a/user/modals/asset/asset_link_credential.php b/agent/modals/asset/asset_link_credential.php
similarity index 100%
rename from user/modals/asset/asset_link_credential.php
rename to agent/modals/asset/asset_link_credential.php
diff --git a/user/modals/asset/asset_link_document.php b/agent/modals/asset/asset_link_document.php
similarity index 100%
rename from user/modals/asset/asset_link_document.php
rename to agent/modals/asset/asset_link_document.php
diff --git a/user/modals/asset/asset_link_file.php b/agent/modals/asset/asset_link_file.php
similarity index 100%
rename from user/modals/asset/asset_link_file.php
rename to agent/modals/asset/asset_link_file.php
diff --git a/user/modals/asset/asset_link_service.php b/agent/modals/asset/asset_link_service.php
similarity index 100%
rename from user/modals/asset/asset_link_service.php
rename to agent/modals/asset/asset_link_service.php
diff --git a/user/modals/asset/asset_link_software.php b/agent/modals/asset/asset_link_software.php
similarity index 100%
rename from user/modals/asset/asset_link_software.php
rename to agent/modals/asset/asset_link_software.php
diff --git a/user/modals/calendar/calendar_add.php b/agent/modals/calendar/calendar_add.php
similarity index 100%
rename from user/modals/calendar/calendar_add.php
rename to agent/modals/calendar/calendar_add.php
diff --git a/user/modals/calendar/calendar_edit.php b/agent/modals/calendar/calendar_edit.php
similarity index 100%
rename from user/modals/calendar/calendar_edit.php
rename to agent/modals/calendar/calendar_edit.php
diff --git a/user/modals/calendar/calendar_event_add.php b/agent/modals/calendar/calendar_event_add.php
similarity index 100%
rename from user/modals/calendar/calendar_event_add.php
rename to agent/modals/calendar/calendar_event_add.php
diff --git a/user/modals/calendar/calendar_event_edit.php b/agent/modals/calendar/calendar_event_edit.php
similarity index 100%
rename from user/modals/calendar/calendar_event_edit.php
rename to agent/modals/calendar/calendar_event_edit.php
diff --git a/user/modals/certificate/certificate_add.php b/agent/modals/certificate/certificate_add.php
similarity index 100%
rename from user/modals/certificate/certificate_add.php
rename to agent/modals/certificate/certificate_add.php
diff --git a/user/modals/certificate/certificate_edit.php b/agent/modals/certificate/certificate_edit.php
similarity index 100%
rename from user/modals/certificate/certificate_edit.php
rename to agent/modals/certificate/certificate_edit.php
diff --git a/user/modals/certificate/certificate_export.php b/agent/modals/certificate/certificate_export.php
similarity index 100%
rename from user/modals/certificate/certificate_export.php
rename to agent/modals/certificate/certificate_export.php
diff --git a/user/modals/client/client_add.php b/agent/modals/client/client_add.php
similarity index 100%
rename from user/modals/client/client_add.php
rename to agent/modals/client/client_add.php
diff --git a/user/modals/client/client_bulk_assign_tags.php b/agent/modals/client/client_bulk_assign_tags.php
similarity index 100%
rename from user/modals/client/client_bulk_assign_tags.php
rename to agent/modals/client/client_bulk_assign_tags.php
diff --git a/user/modals/client/client_bulk_edit_hourly_rate.php b/agent/modals/client/client_bulk_edit_hourly_rate.php
similarity index 100%
rename from user/modals/client/client_bulk_edit_hourly_rate.php
rename to agent/modals/client/client_bulk_edit_hourly_rate.php
diff --git a/user/modals/client/client_bulk_edit_industry.php b/agent/modals/client/client_bulk_edit_industry.php
similarity index 100%
rename from user/modals/client/client_bulk_edit_industry.php
rename to agent/modals/client/client_bulk_edit_industry.php
diff --git a/user/modals/client/client_bulk_edit_referral.php b/agent/modals/client/client_bulk_edit_referral.php
similarity index 100%
rename from user/modals/client/client_bulk_edit_referral.php
rename to agent/modals/client/client_bulk_edit_referral.php
diff --git a/user/modals/client/client_bulk_email.php b/agent/modals/client/client_bulk_email.php
similarity index 100%
rename from user/modals/client/client_bulk_email.php
rename to agent/modals/client/client_bulk_email.php
diff --git a/user/modals/client/client_credit_add.php b/agent/modals/client/client_credit_add.php
similarity index 100%
rename from user/modals/client/client_credit_add.php
rename to agent/modals/client/client_credit_add.php
diff --git a/user/modals/client/client_delete.php b/agent/modals/client/client_delete.php
similarity index 100%
rename from user/modals/client/client_delete.php
rename to agent/modals/client/client_delete.php
diff --git a/user/modals/client/client_download_pdf.php b/agent/modals/client/client_download_pdf.php
similarity index 100%
rename from user/modals/client/client_download_pdf.php
rename to agent/modals/client/client_download_pdf.php
diff --git a/user/modals/client/client_edit.php b/agent/modals/client/client_edit.php
similarity index 100%
rename from user/modals/client/client_edit.php
rename to agent/modals/client/client_edit.php
diff --git a/user/modals/client/client_export.php b/agent/modals/client/client_export.php
similarity index 100%
rename from user/modals/client/client_export.php
rename to agent/modals/client/client_export.php
diff --git a/user/modals/client/client_import.php b/agent/modals/client/client_import.php
similarity index 100%
rename from user/modals/client/client_import.php
rename to agent/modals/client/client_import.php
diff --git a/user/modals/contact/contact_add.php b/agent/modals/contact/contact_add.php
similarity index 100%
rename from user/modals/contact/contact_add.php
rename to agent/modals/contact/contact_add.php
diff --git a/user/modals/contact/contact_archive.php b/agent/modals/contact/contact_archive.php
similarity index 100%
rename from user/modals/contact/contact_archive.php
rename to agent/modals/contact/contact_archive.php
diff --git a/user/modals/contact/contact_bulk_assign_location.php b/agent/modals/contact/contact_bulk_assign_location.php
similarity index 100%
rename from user/modals/contact/contact_bulk_assign_location.php
rename to agent/modals/contact/contact_bulk_assign_location.php
diff --git a/user/modals/contact/contact_bulk_assign_tags.php b/agent/modals/contact/contact_bulk_assign_tags.php
similarity index 100%
rename from user/modals/contact/contact_bulk_assign_tags.php
rename to agent/modals/contact/contact_bulk_assign_tags.php
diff --git a/user/modals/contact/contact_bulk_edit_department.php b/agent/modals/contact/contact_bulk_edit_department.php
similarity index 100%
rename from user/modals/contact/contact_bulk_edit_department.php
rename to agent/modals/contact/contact_bulk_edit_department.php
diff --git a/user/modals/contact/contact_bulk_edit_phone.php b/agent/modals/contact/contact_bulk_edit_phone.php
similarity index 100%
rename from user/modals/contact/contact_bulk_edit_phone.php
rename to agent/modals/contact/contact_bulk_edit_phone.php
diff --git a/user/modals/contact/contact_bulk_edit_role.php b/agent/modals/contact/contact_bulk_edit_role.php
similarity index 100%
rename from user/modals/contact/contact_bulk_edit_role.php
rename to agent/modals/contact/contact_bulk_edit_role.php
diff --git a/user/modals/contact/contact_bulk_email.php b/agent/modals/contact/contact_bulk_email.php
similarity index 100%
rename from user/modals/contact/contact_bulk_email.php
rename to agent/modals/contact/contact_bulk_email.php
diff --git a/user/modals/contact/contact_details.php b/agent/modals/contact/contact_details.php
similarity index 100%
rename from user/modals/contact/contact_details.php
rename to agent/modals/contact/contact_details.php
diff --git a/user/modals/contact/contact_edit.php b/agent/modals/contact/contact_edit.php
similarity index 100%
rename from user/modals/contact/contact_edit.php
rename to agent/modals/contact/contact_edit.php
diff --git a/user/modals/contact/contact_export.php b/agent/modals/contact/contact_export.php
similarity index 100%
rename from user/modals/contact/contact_export.php
rename to agent/modals/contact/contact_export.php
diff --git a/user/modals/contact/contact_import.php b/agent/modals/contact/contact_import.php
similarity index 100%
rename from user/modals/contact/contact_import.php
rename to agent/modals/contact/contact_import.php
diff --git a/user/modals/contact/contact_invite.php b/agent/modals/contact/contact_invite.php
similarity index 100%
rename from user/modals/contact/contact_invite.php
rename to agent/modals/contact/contact_invite.php
diff --git a/user/modals/contact/contact_link_asset.php b/agent/modals/contact/contact_link_asset.php
similarity index 100%
rename from user/modals/contact/contact_link_asset.php
rename to agent/modals/contact/contact_link_asset.php
diff --git a/user/modals/contact/contact_link_credential.php b/agent/modals/contact/contact_link_credential.php
similarity index 100%
rename from user/modals/contact/contact_link_credential.php
rename to agent/modals/contact/contact_link_credential.php
diff --git a/user/modals/contact/contact_link_document.php b/agent/modals/contact/contact_link_document.php
similarity index 100%
rename from user/modals/contact/contact_link_document.php
rename to agent/modals/contact/contact_link_document.php
diff --git a/user/modals/contact/contact_link_file.php b/agent/modals/contact/contact_link_file.php
similarity index 100%
rename from user/modals/contact/contact_link_file.php
rename to agent/modals/contact/contact_link_file.php
diff --git a/user/modals/contact/contact_link_service.php b/agent/modals/contact/contact_link_service.php
similarity index 100%
rename from user/modals/contact/contact_link_service.php
rename to agent/modals/contact/contact_link_service.php
diff --git a/user/modals/contact/contact_link_software.php b/agent/modals/contact/contact_link_software.php
similarity index 100%
rename from user/modals/contact/contact_link_software.php
rename to agent/modals/contact/contact_link_software.php
diff --git a/user/modals/contact/contact_note_add.php b/agent/modals/contact/contact_note_add.php
similarity index 100%
rename from user/modals/contact/contact_note_add.php
rename to agent/modals/contact/contact_note_add.php
diff --git a/user/modals/credential/credential_add.php b/agent/modals/credential/credential_add.php
similarity index 100%
rename from user/modals/credential/credential_add.php
rename to agent/modals/credential/credential_add.php
diff --git a/user/modals/credential/credential_bulk_assign_tags.php b/agent/modals/credential/credential_bulk_assign_tags.php
similarity index 100%
rename from user/modals/credential/credential_bulk_assign_tags.php
rename to agent/modals/credential/credential_bulk_assign_tags.php
diff --git a/user/modals/credential/credential_edit.php b/agent/modals/credential/credential_edit.php
similarity index 100%
rename from user/modals/credential/credential_edit.php
rename to agent/modals/credential/credential_edit.php
diff --git a/user/modals/credential/credential_export.php b/agent/modals/credential/credential_export.php
similarity index 100%
rename from user/modals/credential/credential_export.php
rename to agent/modals/credential/credential_export.php
diff --git a/user/modals/credential/credential_import.php b/agent/modals/credential/credential_import.php
similarity index 100%
rename from user/modals/credential/credential_import.php
rename to agent/modals/credential/credential_import.php
diff --git a/user/modals/credential/credential_view.php b/agent/modals/credential/credential_view.php
similarity index 100%
rename from user/modals/credential/credential_view.php
rename to agent/modals/credential/credential_view.php
diff --git a/user/modals/document/document_add.php b/agent/modals/document/document_add.php
similarity index 100%
rename from user/modals/document/document_add.php
rename to agent/modals/document/document_add.php
diff --git a/user/modals/document/document_add_file_relation.php b/agent/modals/document/document_add_file_relation.php
similarity index 100%
rename from user/modals/document/document_add_file_relation.php
rename to agent/modals/document/document_add_file_relation.php
diff --git a/user/modals/document/document_add_from_template.php b/agent/modals/document/document_add_from_template.php
similarity index 100%
rename from user/modals/document/document_add_from_template.php
rename to agent/modals/document/document_add_from_template.php
diff --git a/user/modals/document/document_bulk_move.php b/agent/modals/document/document_bulk_move.php
similarity index 100%
rename from user/modals/document/document_bulk_move.php
rename to agent/modals/document/document_bulk_move.php
diff --git a/user/modals/document/document_edit.php b/agent/modals/document/document_edit.php
similarity index 100%
rename from user/modals/document/document_edit.php
rename to agent/modals/document/document_edit.php
diff --git a/user/modals/document/document_edit_visibility.php b/agent/modals/document/document_edit_visibility.php
similarity index 100%
rename from user/modals/document/document_edit_visibility.php
rename to agent/modals/document/document_edit_visibility.php
diff --git a/user/modals/document/document_link_asset.php b/agent/modals/document/document_link_asset.php
similarity index 100%
rename from user/modals/document/document_link_asset.php
rename to agent/modals/document/document_link_asset.php
diff --git a/user/modals/document/document_link_contact.php b/agent/modals/document/document_link_contact.php
similarity index 100%
rename from user/modals/document/document_link_contact.php
rename to agent/modals/document/document_link_contact.php
diff --git a/user/modals/document/document_link_file.php b/agent/modals/document/document_link_file.php
similarity index 100%
rename from user/modals/document/document_link_file.php
rename to agent/modals/document/document_link_file.php
diff --git a/user/modals/document/document_link_software.php b/agent/modals/document/document_link_software.php
similarity index 100%
rename from user/modals/document/document_link_software.php
rename to agent/modals/document/document_link_software.php
diff --git a/user/modals/document/document_link_vendor.php b/agent/modals/document/document_link_vendor.php
similarity index 100%
rename from user/modals/document/document_link_vendor.php
rename to agent/modals/document/document_link_vendor.php
diff --git a/user/modals/document/document_move.php b/agent/modals/document/document_move.php
similarity index 100%
rename from user/modals/document/document_move.php
rename to agent/modals/document/document_move.php
diff --git a/user/modals/document/document_rename.php b/agent/modals/document/document_rename.php
similarity index 100%
rename from user/modals/document/document_rename.php
rename to agent/modals/document/document_rename.php
diff --git a/user/modals/document/document_version_view.php b/agent/modals/document/document_version_view.php
similarity index 100%
rename from user/modals/document/document_version_view.php
rename to agent/modals/document/document_version_view.php
diff --git a/user/modals/document/document_view.php b/agent/modals/document/document_view.php
similarity index 100%
rename from user/modals/document/document_view.php
rename to agent/modals/document/document_view.php
diff --git a/user/modals/domain/domain_add.php b/agent/modals/domain/domain_add.php
similarity index 100%
rename from user/modals/domain/domain_add.php
rename to agent/modals/domain/domain_add.php
diff --git a/user/modals/domain/domain_edit.php b/agent/modals/domain/domain_edit.php
similarity index 100%
rename from user/modals/domain/domain_edit.php
rename to agent/modals/domain/domain_edit.php
diff --git a/user/modals/domain/domain_export.php b/agent/modals/domain/domain_export.php
similarity index 100%
rename from user/modals/domain/domain_export.php
rename to agent/modals/domain/domain_export.php
diff --git a/user/modals/expense/expense_add.php b/agent/modals/expense/expense_add.php
similarity index 100%
rename from user/modals/expense/expense_add.php
rename to agent/modals/expense/expense_add.php
diff --git a/user/modals/expense/expense_bulk_edit_account.php b/agent/modals/expense/expense_bulk_edit_account.php
similarity index 100%
rename from user/modals/expense/expense_bulk_edit_account.php
rename to agent/modals/expense/expense_bulk_edit_account.php
diff --git a/user/modals/expense/expense_bulk_edit_category.php b/agent/modals/expense/expense_bulk_edit_category.php
similarity index 100%
rename from user/modals/expense/expense_bulk_edit_category.php
rename to agent/modals/expense/expense_bulk_edit_category.php
diff --git a/user/modals/expense/expense_bulk_edit_client.php b/agent/modals/expense/expense_bulk_edit_client.php
similarity index 100%
rename from user/modals/expense/expense_bulk_edit_client.php
rename to agent/modals/expense/expense_bulk_edit_client.php
diff --git a/user/modals/expense/expense_copy.php b/agent/modals/expense/expense_copy.php
similarity index 100%
rename from user/modals/expense/expense_copy.php
rename to agent/modals/expense/expense_copy.php
diff --git a/user/modals/expense/expense_edit.php b/agent/modals/expense/expense_edit.php
similarity index 100%
rename from user/modals/expense/expense_edit.php
rename to agent/modals/expense/expense_edit.php
diff --git a/user/modals/expense/expense_export.php b/agent/modals/expense/expense_export.php
similarity index 100%
rename from user/modals/expense/expense_export.php
rename to agent/modals/expense/expense_export.php
diff --git a/user/modals/expense/expense_refund.php b/agent/modals/expense/expense_refund.php
similarity index 100%
rename from user/modals/expense/expense_refund.php
rename to agent/modals/expense/expense_refund.php
diff --git a/user/modals/file/file_bulk_move.php b/agent/modals/file/file_bulk_move.php
similarity index 100%
rename from user/modals/file/file_bulk_move.php
rename to agent/modals/file/file_bulk_move.php
diff --git a/user/modals/file/file_delete.php b/agent/modals/file/file_delete.php
similarity index 100%
rename from user/modals/file/file_delete.php
rename to agent/modals/file/file_delete.php
diff --git a/user/modals/file/file_link_asset.php b/agent/modals/file/file_link_asset.php
similarity index 100%
rename from user/modals/file/file_link_asset.php
rename to agent/modals/file/file_link_asset.php
diff --git a/user/modals/file/file_move.php b/agent/modals/file/file_move.php
similarity index 100%
rename from user/modals/file/file_move.php
rename to agent/modals/file/file_move.php
diff --git a/user/modals/file/file_rename.php b/agent/modals/file/file_rename.php
similarity index 100%
rename from user/modals/file/file_rename.php
rename to agent/modals/file/file_rename.php
diff --git a/user/modals/file/file_upload.php b/agent/modals/file/file_upload.php
similarity index 100%
rename from user/modals/file/file_upload.php
rename to agent/modals/file/file_upload.php
diff --git a/user/modals/file/file_view.php b/agent/modals/file/file_view.php
similarity index 100%
rename from user/modals/file/file_view.php
rename to agent/modals/file/file_view.php
diff --git a/user/modals/folder/folder_add.php b/agent/modals/folder/folder_add.php
similarity index 100%
rename from user/modals/folder/folder_add.php
rename to agent/modals/folder/folder_add.php
diff --git a/user/modals/folder/folder_rename.php b/agent/modals/folder/folder_rename.php
similarity index 100%
rename from user/modals/folder/folder_rename.php
rename to agent/modals/folder/folder_rename.php
diff --git a/user/modals/invoice/invoice_add.php b/agent/modals/invoice/invoice_add.php
similarity index 100%
rename from user/modals/invoice/invoice_add.php
rename to agent/modals/invoice/invoice_add.php
diff --git a/user/modals/invoice/invoice_add_ticket.php b/agent/modals/invoice/invoice_add_ticket.php
similarity index 100%
rename from user/modals/invoice/invoice_add_ticket.php
rename to agent/modals/invoice/invoice_add_ticket.php
diff --git a/user/modals/invoice/invoice_apply_credit.php b/agent/modals/invoice/invoice_apply_credit.php
similarity index 100%
rename from user/modals/invoice/invoice_apply_credit.php
rename to agent/modals/invoice/invoice_apply_credit.php
diff --git a/user/modals/invoice/invoice_bulk_edit_category.php b/agent/modals/invoice/invoice_bulk_edit_category.php
similarity index 100%
rename from user/modals/invoice/invoice_bulk_edit_category.php
rename to agent/modals/invoice/invoice_bulk_edit_category.php
diff --git a/user/modals/invoice/invoice_copy.php b/agent/modals/invoice/invoice_copy.php
similarity index 100%
rename from user/modals/invoice/invoice_copy.php
rename to agent/modals/invoice/invoice_copy.php
diff --git a/user/modals/invoice/invoice_edit.php b/agent/modals/invoice/invoice_edit.php
similarity index 100%
rename from user/modals/invoice/invoice_edit.php
rename to agent/modals/invoice/invoice_edit.php
diff --git a/user/modals/invoice/invoice_export.php b/agent/modals/invoice/invoice_export.php
similarity index 100%
rename from user/modals/invoice/invoice_export.php
rename to agent/modals/invoice/invoice_export.php
diff --git a/user/modals/invoice/invoice_note.php b/agent/modals/invoice/invoice_note.php
similarity index 100%
rename from user/modals/invoice/invoice_note.php
rename to agent/modals/invoice/invoice_note.php
diff --git a/user/modals/invoice/invoice_pay.php b/agent/modals/invoice/invoice_pay.php
similarity index 100%
rename from user/modals/invoice/invoice_pay.php
rename to agent/modals/invoice/invoice_pay.php
diff --git a/user/modals/invoice/invoice_payment_add_bulk.php b/agent/modals/invoice/invoice_payment_add_bulk.php
similarity index 100%
rename from user/modals/invoice/invoice_payment_add_bulk.php
rename to agent/modals/invoice/invoice_payment_add_bulk.php
diff --git a/user/modals/invoice/invoice_recurring_add.php b/agent/modals/invoice/invoice_recurring_add.php
similarity index 100%
rename from user/modals/invoice/invoice_recurring_add.php
rename to agent/modals/invoice/invoice_recurring_add.php
diff --git a/user/modals/invoice/invoice_saved_method_pay.php b/agent/modals/invoice/invoice_saved_method_pay.php
similarity index 100%
rename from user/modals/invoice/invoice_saved_method_pay.php
rename to agent/modals/invoice/invoice_saved_method_pay.php
diff --git a/user/modals/invoice/item_edit.php b/agent/modals/invoice/item_edit.php
similarity index 100%
rename from user/modals/invoice/item_edit.php
rename to agent/modals/invoice/item_edit.php
diff --git a/user/modals/location/location_add.php b/agent/modals/location/location_add.php
similarity index 100%
rename from user/modals/location/location_add.php
rename to agent/modals/location/location_add.php
diff --git a/user/modals/location/location_bulk_assign_tags.php b/agent/modals/location/location_bulk_assign_tags.php
similarity index 100%
rename from user/modals/location/location_bulk_assign_tags.php
rename to agent/modals/location/location_bulk_assign_tags.php
diff --git a/user/modals/location/location_edit.php b/agent/modals/location/location_edit.php
similarity index 100%
rename from user/modals/location/location_edit.php
rename to agent/modals/location/location_edit.php
diff --git a/user/modals/location/location_export.php b/agent/modals/location/location_export.php
similarity index 100%
rename from user/modals/location/location_export.php
rename to agent/modals/location/location_export.php
diff --git a/user/modals/location/location_import.php b/agent/modals/location/location_import.php
similarity index 100%
rename from user/modals/location/location_import.php
rename to agent/modals/location/location_import.php
diff --git a/user/modals/network/network_add.php b/agent/modals/network/network_add.php
similarity index 100%
rename from user/modals/network/network_add.php
rename to agent/modals/network/network_add.php
diff --git a/user/modals/network/network_edit.php b/agent/modals/network/network_edit.php
similarity index 100%
rename from user/modals/network/network_edit.php
rename to agent/modals/network/network_edit.php
diff --git a/user/modals/network/network_export.php b/agent/modals/network/network_export.php
similarity index 100%
rename from user/modals/network/network_export.php
rename to agent/modals/network/network_export.php
diff --git a/user/modals/payment/payment_export.php b/agent/modals/payment/payment_export.php
similarity index 100%
rename from user/modals/payment/payment_export.php
rename to agent/modals/payment/payment_export.php
diff --git a/user/modals/product/product_add.php b/agent/modals/product/product_add.php
similarity index 100%
rename from user/modals/product/product_add.php
rename to agent/modals/product/product_add.php
diff --git a/user/modals/product/product_bulk_edit_category.php b/agent/modals/product/product_bulk_edit_category.php
similarity index 100%
rename from user/modals/product/product_bulk_edit_category.php
rename to agent/modals/product/product_bulk_edit_category.php
diff --git a/user/modals/product/product_edit.php b/agent/modals/product/product_edit.php
similarity index 100%
rename from user/modals/product/product_edit.php
rename to agent/modals/product/product_edit.php
diff --git a/user/modals/product/product_export.php b/agent/modals/product/product_export.php
similarity index 100%
rename from user/modals/product/product_export.php
rename to agent/modals/product/product_export.php
diff --git a/user/modals/product/product_stock_add.php b/agent/modals/product/product_stock_add.php
similarity index 100%
rename from user/modals/product/product_stock_add.php
rename to agent/modals/product/product_stock_add.php
diff --git a/user/modals/project/project_add.php b/agent/modals/project/project_add.php
similarity index 100%
rename from user/modals/project/project_add.php
rename to agent/modals/project/project_add.php
diff --git a/user/modals/project/project_edit.php b/agent/modals/project/project_edit.php
similarity index 100%
rename from user/modals/project/project_edit.php
rename to agent/modals/project/project_edit.php
diff --git a/user/modals/project/project_link_closed_ticket.php b/agent/modals/project/project_link_closed_ticket.php
similarity index 100%
rename from user/modals/project/project_link_closed_ticket.php
rename to agent/modals/project/project_link_closed_ticket.php
diff --git a/user/modals/project/project_link_ticket.php b/agent/modals/project/project_link_ticket.php
similarity index 100%
rename from user/modals/project/project_link_ticket.php
rename to agent/modals/project/project_link_ticket.php
diff --git a/user/modals/quote/quote_add.php b/agent/modals/quote/quote_add.php
similarity index 100%
rename from user/modals/quote/quote_add.php
rename to agent/modals/quote/quote_add.php
diff --git a/user/modals/quote/quote_copy.php b/agent/modals/quote/quote_copy.php
similarity index 100%
rename from user/modals/quote/quote_copy.php
rename to agent/modals/quote/quote_copy.php
diff --git a/user/modals/quote/quote_edit.php b/agent/modals/quote/quote_edit.php
similarity index 100%
rename from user/modals/quote/quote_edit.php
rename to agent/modals/quote/quote_edit.php
diff --git a/user/modals/quote/quote_export.php b/agent/modals/quote/quote_export.php
similarity index 100%
rename from user/modals/quote/quote_export.php
rename to agent/modals/quote/quote_export.php
diff --git a/user/modals/quote/quote_note.php b/agent/modals/quote/quote_note.php
similarity index 100%
rename from user/modals/quote/quote_note.php
rename to agent/modals/quote/quote_note.php
diff --git a/user/modals/quote/quote_to_invoice.php b/agent/modals/quote/quote_to_invoice.php
similarity index 100%
rename from user/modals/quote/quote_to_invoice.php
rename to agent/modals/quote/quote_to_invoice.php
diff --git a/user/modals/rack/rack_add.php b/agent/modals/rack/rack_add.php
similarity index 100%
rename from user/modals/rack/rack_add.php
rename to agent/modals/rack/rack_add.php
diff --git a/user/modals/rack/rack_device_add.php b/agent/modals/rack/rack_device_add.php
similarity index 100%
rename from user/modals/rack/rack_device_add.php
rename to agent/modals/rack/rack_device_add.php
diff --git a/user/modals/rack/rack_edit.php b/agent/modals/rack/rack_edit.php
similarity index 100%
rename from user/modals/rack/rack_edit.php
rename to agent/modals/rack/rack_edit.php
diff --git a/user/modals/recurring_expense/recurring_expense_add.php b/agent/modals/recurring_expense/recurring_expense_add.php
similarity index 100%
rename from user/modals/recurring_expense/recurring_expense_add.php
rename to agent/modals/recurring_expense/recurring_expense_add.php
diff --git a/user/modals/recurring_expense/recurring_expense_edit.php b/agent/modals/recurring_expense/recurring_expense_edit.php
similarity index 100%
rename from user/modals/recurring_expense/recurring_expense_edit.php
rename to agent/modals/recurring_expense/recurring_expense_edit.php
diff --git a/user/modals/recurring_invoice/recurring_invoice_add.php b/agent/modals/recurring_invoice/recurring_invoice_add.php
similarity index 100%
rename from user/modals/recurring_invoice/recurring_invoice_add.php
rename to agent/modals/recurring_invoice/recurring_invoice_add.php
diff --git a/user/modals/recurring_invoice/recurring_invoice_edit.php b/agent/modals/recurring_invoice/recurring_invoice_edit.php
similarity index 100%
rename from user/modals/recurring_invoice/recurring_invoice_edit.php
rename to agent/modals/recurring_invoice/recurring_invoice_edit.php
diff --git a/user/modals/recurring_invoice/recurring_invoice_export.php b/agent/modals/recurring_invoice/recurring_invoice_export.php
similarity index 100%
rename from user/modals/recurring_invoice/recurring_invoice_export.php
rename to agent/modals/recurring_invoice/recurring_invoice_export.php
diff --git a/user/modals/recurring_invoice/recurring_invoice_note.php b/agent/modals/recurring_invoice/recurring_invoice_note.php
similarity index 100%
rename from user/modals/recurring_invoice/recurring_invoice_note.php
rename to agent/modals/recurring_invoice/recurring_invoice_note.php
diff --git a/user/modals/recurring_ticket/recurring_ticket_add.php b/agent/modals/recurring_ticket/recurring_ticket_add.php
similarity index 100%
rename from user/modals/recurring_ticket/recurring_ticket_add.php
rename to agent/modals/recurring_ticket/recurring_ticket_add.php
diff --git a/user/modals/recurring_ticket/recurring_ticket_edit.php b/agent/modals/recurring_ticket/recurring_ticket_edit.php
similarity index 100%
rename from user/modals/recurring_ticket/recurring_ticket_edit.php
rename to agent/modals/recurring_ticket/recurring_ticket_edit.php
diff --git a/user/modals/revenue/revenue_add.php b/agent/modals/revenue/revenue_add.php
similarity index 100%
rename from user/modals/revenue/revenue_add.php
rename to agent/modals/revenue/revenue_add.php
diff --git a/user/modals/revenue/revenue_edit.php b/agent/modals/revenue/revenue_edit.php
similarity index 100%
rename from user/modals/revenue/revenue_edit.php
rename to agent/modals/revenue/revenue_edit.php
diff --git a/user/modals/service/service_add.php b/agent/modals/service/service_add.php
similarity index 100%
rename from user/modals/service/service_add.php
rename to agent/modals/service/service_add.php
diff --git a/user/modals/service/service_details.php b/agent/modals/service/service_details.php
similarity index 100%
rename from user/modals/service/service_details.php
rename to agent/modals/service/service_details.php
diff --git a/user/modals/service/service_edit.php b/agent/modals/service/service_edit.php
similarity index 100%
rename from user/modals/service/service_edit.php
rename to agent/modals/service/service_edit.php
diff --git a/user/modals/share_modal.php b/agent/modals/share_modal.php
similarity index 100%
rename from user/modals/share_modal.php
rename to agent/modals/share_modal.php
diff --git a/user/modals/software/software_add.php b/agent/modals/software/software_add.php
similarity index 100%
rename from user/modals/software/software_add.php
rename to agent/modals/software/software_add.php
diff --git a/user/modals/software/software_add_from_template.php b/agent/modals/software/software_add_from_template.php
similarity index 100%
rename from user/modals/software/software_add_from_template.php
rename to agent/modals/software/software_add_from_template.php
diff --git a/user/modals/software/software_edit.php b/agent/modals/software/software_edit.php
similarity index 100%
rename from user/modals/software/software_edit.php
rename to agent/modals/software/software_edit.php
diff --git a/user/modals/software/software_export.php b/agent/modals/software/software_export.php
similarity index 100%
rename from user/modals/software/software_export.php
rename to agent/modals/software/software_export.php
diff --git a/user/modals/ticket/ticket_add.php b/agent/modals/ticket/ticket_add.php
similarity index 100%
rename from user/modals/ticket/ticket_add.php
rename to agent/modals/ticket/ticket_add.php
diff --git a/user/modals/ticket/ticket_add_v2.php b/agent/modals/ticket/ticket_add_v2.php
similarity index 98%
rename from user/modals/ticket/ticket_add_v2.php
rename to agent/modals/ticket/ticket_add_v2.php
index 6d575c7a..7e96fd44 100644
--- a/user/modals/ticket/ticket_add_v2.php
+++ b/agent/modals/ticket/ticket_add_v2.php
@@ -79,8 +79,6 @@
                                                     data-details="<?php echo $ticket_template_details_select; ?>">
                                                 <?php echo $ticket_template_name_select; ?> (<?php echo $task_count; ?> tasks)
                                             </option>
-                                            <?php echo "aaaaa"; ?>
-                                            <?php var_dump($row); ?>
                                         <?php } ?>
                                     </select>
                                 </div>
@@ -198,7 +196,7 @@
                                             <option value="">- Client -</option>
                                             <?php
 
-                                            $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
+                                            $sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_lead = 0 AND client_archived_at IS NULL $access_permission_query ORDER BY client_name ASC");
                                             while ($row = mysqli_fetch_array($sql)) {
                                                 $selectable_client_id = intval($row['client_id']);
                                                 $client_name = nullable_htmlentities($row['client_name']); ?>
diff --git a/user/modals/ticket/ticket_add_watcher.php b/agent/modals/ticket/ticket_add_watcher.php
similarity index 100%
rename from user/modals/ticket/ticket_add_watcher.php
rename to agent/modals/ticket/ticket_add_watcher.php
diff --git a/user/modals/ticket/ticket_assign.php b/agent/modals/ticket/ticket_assign.php
similarity index 100%
rename from user/modals/ticket/ticket_assign.php
rename to agent/modals/ticket/ticket_assign.php
diff --git a/user/modals/ticket/ticket_billable.php b/agent/modals/ticket/ticket_billable.php
similarity index 100%
rename from user/modals/ticket/ticket_billable.php
rename to agent/modals/ticket/ticket_billable.php
diff --git a/user/modals/ticket/ticket_bulk_add_project.php b/agent/modals/ticket/ticket_bulk_add_project.php
similarity index 100%
rename from user/modals/ticket/ticket_bulk_add_project.php
rename to agent/modals/ticket/ticket_bulk_add_project.php
diff --git a/user/modals/ticket/ticket_bulk_assign.php b/agent/modals/ticket/ticket_bulk_assign.php
similarity index 100%
rename from user/modals/ticket/ticket_bulk_assign.php
rename to agent/modals/ticket/ticket_bulk_assign.php
diff --git a/user/modals/ticket/ticket_bulk_edit_category.php b/agent/modals/ticket/ticket_bulk_edit_category.php
similarity index 100%
rename from user/modals/ticket/ticket_bulk_edit_category.php
rename to agent/modals/ticket/ticket_bulk_edit_category.php
diff --git a/user/modals/ticket/ticket_bulk_edit_priority.php b/agent/modals/ticket/ticket_bulk_edit_priority.php
similarity index 100%
rename from user/modals/ticket/ticket_bulk_edit_priority.php
rename to agent/modals/ticket/ticket_bulk_edit_priority.php
diff --git a/user/modals/ticket/ticket_bulk_merge.php b/agent/modals/ticket/ticket_bulk_merge.php
similarity index 100%
rename from user/modals/ticket/ticket_bulk_merge.php
rename to agent/modals/ticket/ticket_bulk_merge.php
diff --git a/user/modals/ticket/ticket_bulk_reply.php b/agent/modals/ticket/ticket_bulk_reply.php
similarity index 100%
rename from user/modals/ticket/ticket_bulk_reply.php
rename to agent/modals/ticket/ticket_bulk_reply.php
diff --git a/user/modals/ticket/ticket_bulk_resolve.php b/agent/modals/ticket/ticket_bulk_resolve.php
similarity index 100%
rename from user/modals/ticket/ticket_bulk_resolve.php
rename to agent/modals/ticket/ticket_bulk_resolve.php
diff --git a/user/modals/ticket/ticket_change_client.php b/agent/modals/ticket/ticket_change_client.php
similarity index 100%
rename from user/modals/ticket/ticket_change_client.php
rename to agent/modals/ticket/ticket_change_client.php
diff --git a/user/modals/ticket/ticket_contact.php b/agent/modals/ticket/ticket_contact.php
similarity index 100%
rename from user/modals/ticket/ticket_contact.php
rename to agent/modals/ticket/ticket_contact.php
diff --git a/user/modals/ticket/ticket_edit.php b/agent/modals/ticket/ticket_edit.php
similarity index 100%
rename from user/modals/ticket/ticket_edit.php
rename to agent/modals/ticket/ticket_edit.php
diff --git a/agent/modals/ticket/ticket_edit_asset.php b/agent/modals/ticket/ticket_edit_asset.php
new file mode 100644
index 00000000..b119e1f3
--- /dev/null
+++ b/agent/modals/ticket/ticket_edit_asset.php
@@ -0,0 +1,98 @@
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$ticket_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN clients ON client_id = ticket_client_id WHERE ticket_id = $ticket_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$client_id = intval($row['ticket_client_id']);
+$client_name = nullable_htmlentities($row['client_name']);
+$ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
+$ticket_number = intval($row['ticket_number']);
+$asset_id = intval($row['ticket_asset_id']);
+
+// Additional Assets Selected
+$additional_assets_array = array();
+$sql_additional_assets = mysqli_query($mysqli, "SELECT asset_id FROM ticket_assets WHERE ticket_id = $ticket_id");
+while ($row = mysqli_fetch_array($sql_additional_assets)) {
+    $additional_asset_id = intval($row['asset_id']);
+    $additional_assets_array[] = $additional_asset_id;
+}
+
+// Generate the HTML form content using output buffering.
+ob_start();
+?>
+
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>Editing ticket Asset: <strong><?php echo "$ticket_prefix$ticket_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="ticket_id" value="<?php echo $ticket_id; ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Asset</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
+                </div>
+                <select class="form-control select2" name="asset">
+                    <option value="0">- None -</option>
+                    <?php
+
+                    $sql_assets = mysqli_query($mysqli, "SELECT asset_id, asset_name, contact_name FROM assets LEFT JOIN contacts ON contact_id = asset_contact_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
+                    while ($row = mysqli_fetch_array($sql_assets)) {
+                        $asset_id_select = intval($row['asset_id']);
+                        $asset_name_select = nullable_htmlentities($row['asset_name']);
+                        $asset_contact_name_select = nullable_htmlentities($row['contact_name']);
+                        ?>
+                        <option <?php if ($asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo "$asset_name_select - $asset_contact_name_select"; ?></option>
+
+                        <?php
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Additional Assets</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
+                </div>
+                <select class="form-control select2" name="additional_assets[]" data-tags="true" data-placeholder="- Select Additional Assets -" multiple>
+                    <option value=""></option>
+                    <?php
+
+                    $sql_assets = mysqli_query($mysqli, "SELECT asset_id, asset_name, contact_name FROM assets LEFT JOIN contacts ON contact_id = asset_contact_id WHERE asset_client_id = $client_id AND asset_id != $asset_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
+                    while ($row = mysqli_fetch_array($sql_assets)) {
+                        $asset_id_select = intval($row['asset_id']);
+                        $asset_name_select = nullable_htmlentities($row['asset_name']);
+                        $asset_contact_name_select = nullable_htmlentities($row['contact_name']);
+                    ?>
+                        <option value="<?php echo $asset_id_select; ?>" 
+                            <?php if (in_array($asset_id_select, $additional_assets_array)) { echo "selected"; } ?>
+                            ><?php echo "$asset_name_select - $asset_contact_name_select"; ?></option>
+
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer">
+        <button type="submit" name="edit_ticket_asset" class="btn btn-primary text-bold"><i class="fa 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/modal_footer.php';
diff --git a/user/modals/ticket/ticket_edit_schedule.php b/agent/modals/ticket/ticket_edit_schedule.php
similarity index 100%
rename from user/modals/ticket/ticket_edit_schedule.php
rename to agent/modals/ticket/ticket_edit_schedule.php
diff --git a/user/modals/ticket/ticket_edit_vendor.php b/agent/modals/ticket/ticket_edit_vendor.php
similarity index 100%
rename from user/modals/ticket/ticket_edit_vendor.php
rename to agent/modals/ticket/ticket_edit_vendor.php
diff --git a/user/modals/ticket/ticket_export.php b/agent/modals/ticket/ticket_export.php
similarity index 100%
rename from user/modals/ticket/ticket_export.php
rename to agent/modals/ticket/ticket_export.php
diff --git a/user/modals/ticket/ticket_invoice_add.php b/agent/modals/ticket/ticket_invoice_add.php
similarity index 100%
rename from user/modals/ticket/ticket_invoice_add.php
rename to agent/modals/ticket/ticket_invoice_add.php
diff --git a/user/modals/ticket/ticket_merge.php b/agent/modals/ticket/ticket_merge.php
similarity index 100%
rename from user/modals/ticket/ticket_merge.php
rename to agent/modals/ticket/ticket_merge.php
diff --git a/user/modals/ticket/ticket_priority.php b/agent/modals/ticket/ticket_priority.php
similarity index 100%
rename from user/modals/ticket/ticket_priority.php
rename to agent/modals/ticket/ticket_priority.php
diff --git a/user/modals/ticket/ticket_reply_edit.php b/agent/modals/ticket/ticket_reply_edit.php
similarity index 100%
rename from user/modals/ticket/ticket_reply_edit.php
rename to agent/modals/ticket/ticket_reply_edit.php
diff --git a/user/modals/ticket/ticket_reply_redact.php b/agent/modals/ticket/ticket_reply_redact.php
similarity index 100%
rename from user/modals/ticket/ticket_reply_redact.php
rename to agent/modals/ticket/ticket_reply_redact.php
diff --git a/user/modals/ticket/ticket_task_edit.php b/agent/modals/ticket/ticket_task_edit.php
similarity index 100%
rename from user/modals/ticket/ticket_task_edit.php
rename to agent/modals/ticket/ticket_task_edit.php
diff --git a/user/modals/top_nav_tickets_modal.php b/agent/modals/top_nav_tickets_modal.php
similarity index 100%
rename from user/modals/top_nav_tickets_modal.php
rename to agent/modals/top_nav_tickets_modal.php
diff --git a/user/modals/transfer/transfer_add.php b/agent/modals/transfer/transfer_add.php
similarity index 100%
rename from user/modals/transfer/transfer_add.php
rename to agent/modals/transfer/transfer_add.php
diff --git a/user/modals/transfer/transfer_edit.php b/agent/modals/transfer/transfer_edit.php
similarity index 100%
rename from user/modals/transfer/transfer_edit.php
rename to agent/modals/transfer/transfer_edit.php
diff --git a/user/modals/trip/trip_add.php b/agent/modals/trip/trip_add.php
similarity index 100%
rename from user/modals/trip/trip_add.php
rename to agent/modals/trip/trip_add.php
diff --git a/user/modals/trip/trip_copy.php b/agent/modals/trip/trip_copy.php
similarity index 100%
rename from user/modals/trip/trip_copy.php
rename to agent/modals/trip/trip_copy.php
diff --git a/user/modals/trip/trip_edit.php b/agent/modals/trip/trip_edit.php
similarity index 100%
rename from user/modals/trip/trip_edit.php
rename to agent/modals/trip/trip_edit.php
diff --git a/user/modals/trip/trip_export.php b/agent/modals/trip/trip_export.php
similarity index 100%
rename from user/modals/trip/trip_export.php
rename to agent/modals/trip/trip_export.php
diff --git a/user/modals/vendor/vendor_add.php b/agent/modals/vendor/vendor_add.php
similarity index 100%
rename from user/modals/vendor/vendor_add.php
rename to agent/modals/vendor/vendor_add.php
diff --git a/user/modals/vendor/vendor_add_from_template.php b/agent/modals/vendor/vendor_add_from_template.php
similarity index 100%
rename from user/modals/vendor/vendor_add_from_template.php
rename to agent/modals/vendor/vendor_add_from_template.php
diff --git a/user/modals/vendor/vendor_contact_add.php b/agent/modals/vendor/vendor_contact_add.php
similarity index 100%
rename from user/modals/vendor/vendor_contact_add.php
rename to agent/modals/vendor/vendor_contact_add.php
diff --git a/user/modals/vendor/vendor_contact_edit.php b/agent/modals/vendor/vendor_contact_edit.php
similarity index 100%
rename from user/modals/vendor/vendor_contact_edit.php
rename to agent/modals/vendor/vendor_contact_edit.php
diff --git a/user/modals/vendor/vendor_details.php b/agent/modals/vendor/vendor_details.php
similarity index 100%
rename from user/modals/vendor/vendor_details.php
rename to agent/modals/vendor/vendor_details.php
diff --git a/user/modals/vendor/vendor_edit.php b/agent/modals/vendor/vendor_edit.php
similarity index 100%
rename from user/modals/vendor/vendor_edit.php
rename to agent/modals/vendor/vendor_edit.php
diff --git a/user/modals/vendor/vendor_export.php b/agent/modals/vendor/vendor_export.php
similarity index 100%
rename from user/modals/vendor/vendor_export.php
rename to agent/modals/vendor/vendor_export.php
diff --git a/user/networks.php b/agent/networks.php
similarity index 100%
rename from user/networks.php
rename to agent/networks.php
diff --git a/user/notifications.php b/agent/notifications.php
similarity index 100%
rename from user/notifications.php
rename to agent/notifications.php
diff --git a/user/payments.php b/agent/payments.php
similarity index 100%
rename from user/payments.php
rename to agent/payments.php
diff --git a/user/post.php b/agent/post.php
similarity index 100%
rename from user/post.php
rename to agent/post.php
diff --git a/user/post/account.php b/agent/post/account.php
similarity index 100%
rename from user/post/account.php
rename to agent/post/account.php
diff --git a/user/post/asset.php b/agent/post/asset.php
similarity index 100%
rename from user/post/asset.php
rename to agent/post/asset.php
diff --git a/user/post/asset_interface_model.php b/agent/post/asset_interface_model.php
similarity index 100%
rename from user/post/asset_interface_model.php
rename to agent/post/asset_interface_model.php
diff --git a/user/post/asset_model.php b/agent/post/asset_model.php
similarity index 100%
rename from user/post/asset_model.php
rename to agent/post/asset_model.php
diff --git a/user/post/budget.php b/agent/post/budget.php
similarity index 100%
rename from user/post/budget.php
rename to agent/post/budget.php
diff --git a/user/post/category.php b/agent/post/category.php
similarity index 100%
rename from user/post/category.php
rename to agent/post/category.php
diff --git a/user/post/category_model.php b/agent/post/category_model.php
similarity index 100%
rename from user/post/category_model.php
rename to agent/post/category_model.php
diff --git a/user/post/certificate.php b/agent/post/certificate.php
similarity index 100%
rename from user/post/certificate.php
rename to agent/post/certificate.php
diff --git a/user/post/certificate_model.php b/agent/post/certificate_model.php
similarity index 100%
rename from user/post/certificate_model.php
rename to agent/post/certificate_model.php
diff --git a/user/post/client.php b/agent/post/client.php
similarity index 100%
rename from user/post/client.php
rename to agent/post/client.php
diff --git a/user/post/client_model.php b/agent/post/client_model.php
similarity index 100%
rename from user/post/client_model.php
rename to agent/post/client_model.php
diff --git a/user/post/contact.php b/agent/post/contact.php
similarity index 100%
rename from user/post/contact.php
rename to agent/post/contact.php
diff --git a/user/post/contact_model.php b/agent/post/contact_model.php
similarity index 100%
rename from user/post/contact_model.php
rename to agent/post/contact_model.php
diff --git a/user/post/credential.php b/agent/post/credential.php
similarity index 100%
rename from user/post/credential.php
rename to agent/post/credential.php
diff --git a/user/post/credential_model.php b/agent/post/credential_model.php
similarity index 100%
rename from user/post/credential_model.php
rename to agent/post/credential_model.php
diff --git a/user/post/credit.php b/agent/post/credit.php
similarity index 100%
rename from user/post/credit.php
rename to agent/post/credit.php
diff --git a/user/post/document.php b/agent/post/document.php
similarity index 100%
rename from user/post/document.php
rename to agent/post/document.php
diff --git a/user/post/document_model.php b/agent/post/document_model.php
similarity index 100%
rename from user/post/document_model.php
rename to agent/post/document_model.php
diff --git a/user/post/domain.php b/agent/post/domain.php
similarity index 100%
rename from user/post/domain.php
rename to agent/post/domain.php
diff --git a/user/post/domain_model.php b/agent/post/domain_model.php
similarity index 100%
rename from user/post/domain_model.php
rename to agent/post/domain_model.php
diff --git a/user/post/event.php b/agent/post/event.php
similarity index 100%
rename from user/post/event.php
rename to agent/post/event.php
diff --git a/user/post/event_model.php b/agent/post/event_model.php
similarity index 100%
rename from user/post/event_model.php
rename to agent/post/event_model.php
diff --git a/user/post/expense.php b/agent/post/expense.php
similarity index 100%
rename from user/post/expense.php
rename to agent/post/expense.php
diff --git a/user/post/expense_model.php b/agent/post/expense_model.php
similarity index 100%
rename from user/post/expense_model.php
rename to agent/post/expense_model.php
diff --git a/user/post/file.php b/agent/post/file.php
similarity index 100%
rename from user/post/file.php
rename to agent/post/file.php
diff --git a/user/post/folder.php b/agent/post/folder.php
similarity index 100%
rename from user/post/folder.php
rename to agent/post/folder.php
diff --git a/user/post/invoice.php b/agent/post/invoice.php
similarity index 99%
rename from user/post/invoice.php
rename to agent/post/invoice.php
index 1a050bc1..069fe47e 100644
--- a/user/post/invoice.php
+++ b/agent/post/invoice.php
@@ -1205,7 +1205,7 @@ if (isset($_POST['add_payment_stripe'])) {
         }
 
         // Notify/log
-        appNotify("Invoice Paid", "Invoice $invoice_prefix$invoice_number automatically paid", "invoice.php?invoice_id=$invoice_id", $client_id);
+        appNotify("Invoice Paid", "Invoice $invoice_prefix$invoice_number automatically paid", "/agent/invoice.php?invoice_id=$invoice_id", $client_id);
         logAction("Invoice", "Payment", "$session_name initiated Stripe payment amount of " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . " added to invoice $invoice_prefix$invoice_number - $pi_id $extended_log_desc", $client_id, $invoice_id);
         customAction('invoice_pay', $invoice_id);
 
diff --git a/user/post/invoice_model.php b/agent/post/invoice_model.php
similarity index 100%
rename from user/post/invoice_model.php
rename to agent/post/invoice_model.php
diff --git a/user/post/location.php b/agent/post/location.php
similarity index 100%
rename from user/post/location.php
rename to agent/post/location.php
diff --git a/user/post/location_model.php b/agent/post/location_model.php
similarity index 100%
rename from user/post/location_model.php
rename to agent/post/location_model.php
diff --git a/user/post/network.php b/agent/post/network.php
similarity index 100%
rename from user/post/network.php
rename to agent/post/network.php
diff --git a/user/post/network_model.php b/agent/post/network_model.php
similarity index 100%
rename from user/post/network_model.php
rename to agent/post/network_model.php
diff --git a/user/post/product.php b/agent/post/product.php
similarity index 100%
rename from user/post/product.php
rename to agent/post/product.php
diff --git a/user/post/product_model.php b/agent/post/product_model.php
similarity index 100%
rename from user/post/product_model.php
rename to agent/post/product_model.php
diff --git a/user/post/project.php b/agent/post/project.php
similarity index 100%
rename from user/post/project.php
rename to agent/post/project.php
diff --git a/user/post/quote.php b/agent/post/quote.php
similarity index 100%
rename from user/post/quote.php
rename to agent/post/quote.php
diff --git a/user/post/quote_model.php b/agent/post/quote_model.php
similarity index 100%
rename from user/post/quote_model.php
rename to agent/post/quote_model.php
diff --git a/user/post/rack.php b/agent/post/rack.php
similarity index 100%
rename from user/post/rack.php
rename to agent/post/rack.php
diff --git a/user/post/revenue.php b/agent/post/revenue.php
similarity index 100%
rename from user/post/revenue.php
rename to agent/post/revenue.php
diff --git a/user/post/service.php b/agent/post/service.php
similarity index 100%
rename from user/post/service.php
rename to agent/post/service.php
diff --git a/user/post/software.php b/agent/post/software.php
similarity index 100%
rename from user/post/software.php
rename to agent/post/software.php
diff --git a/user/post/tag.php b/agent/post/tag.php
similarity index 100%
rename from user/post/tag.php
rename to agent/post/tag.php
diff --git a/user/post/tag_model.php b/agent/post/tag_model.php
similarity index 100%
rename from user/post/tag_model.php
rename to agent/post/tag_model.php
diff --git a/user/post/task.php b/agent/post/task.php
similarity index 100%
rename from user/post/task.php
rename to agent/post/task.php
diff --git a/user/post/ticket.php b/agent/post/ticket.php
similarity index 98%
rename from user/post/ticket.php
rename to agent/post/ticket.php
index 42ca0a70..bbe55b50 100644
--- a/user/post/ticket.php
+++ b/agent/post/ticket.php
@@ -571,9 +571,22 @@ if (isset($_POST['edit_ticket_asset'])) {
 
     mysqli_query($mysqli, "UPDATE tickets SET ticket_asset_id = $asset_id WHERE ticket_id = $ticket_id");
 
+    // Add Additional Assets
+    if (isset($_POST['additional_assets'])) {
+        mysqli_query($mysqli, "DELETE FROM ticket_assets WHERE ticket_id = $ticket_id");
+        foreach ($_POST['additional_assets'] as $additional_asset) {
+            $additional_asset_id = intval($additional_asset);
+            mysqli_query($mysqli, "INSERT INTO ticket_assets SET ticket_id = $ticket_id, asset_id = $additional_asset_id");
+        }
+    } else {
+        // If no additional assets are provided, delete them all
+        // This handles cases where the assets input might be cleared or not set at all.
+        mysqli_query($mysqli, "DELETE FROM ticket_assets WHERE ticket_id = $ticket_id");
+    }
+
     // Get ticket / asset details for logging
     $sql = mysqli_query($mysqli, "SELECT asset_name, ticket_prefix, ticket_number, ticket_status_name, ticket_client_id FROM assets 
-        LEFT JOIN tickets ON ticket_asset_id = $asset_id
+        LEFT JOIN tickets ON ticket_asset_id = asset_id
         LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
         WHERE ticket_id = $ticket_id"
     );
@@ -695,7 +708,7 @@ if (isset($_POST['assign_ticket'])) {
             $company_name = sanitizeInput($session_company_name);
 
             $subject = "$config_app_name - Ticket $ticket_prefix$ticket_number assigned to you - $ticket_subject";
-            $body = "Hi $agent_name, <br><br>A ticket has been assigned to you!<br><br>Client: $client_name<br>Ticket Number: $ticket_prefix$ticket_number<br> Subject: $ticket_subject<br><br>https://$config_base_url/user/ticket.php?ticket_id=$ticket_id <br><br>Thanks, <br>$session_name<br>$company_name";
+            $body = "Hi $agent_name, <br><br>A ticket has been assigned to you!<br><br>Client: $client_name<br>Ticket Number: $ticket_prefix$ticket_number<br> Subject: $ticket_subject<br><br>https://$config_base_url/agent/ticket.php?ticket_id=$ticket_id <br><br>Thanks, <br>$session_name<br>$company_name";
 
             // Email Ticket Agent
             // Queue Mail
@@ -2697,7 +2710,7 @@ if (isset($_POST['edit_ticket_schedule'])) {
             'recipient' => $user_email,
             'recipient_name' => $user_name,
             'subject' => "Ticket Scheduled - [$ticket_prefix$ticket_number] - $ticket_subject",
-            'body' => "Hello, " . $user_name . "<br><br>The ticket regarding $ticket_subject has been scheduled for $email_datetime.<br><br>--------------------------------<br><a href=\"https://$config_base_url/user/ticket.php?ticket_id=$ticket_id\">$ticket_link</a><br>--------------------------------<br><br>Please do not reply to this email. <br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Portal: https://$config_base_url/user/ticket.php?ticket_id=$ticket_id<br><br>~<br>$session_company_name<br>Support Department<br>$config_ticket_from_email",
+            'body' => "Hello, " . $user_name . "<br><br>The ticket regarding $ticket_subject has been scheduled for $email_datetime.<br><br>--------------------------------<br><a href=\"https://$config_base_url/agent/ticket.php?ticket_id=$ticket_id\">$ticket_link</a><br>--------------------------------<br><br>Please do not reply to this email. <br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Portal: https://$config_base_url/agent/ticket.php?ticket_id=$ticket_id<br><br>~<br>$session_company_name<br>Support Department<br>$config_ticket_from_email",
             'cal_str' => $cal_str
         ];
 
@@ -2849,7 +2862,7 @@ if (isset($_GET['cancel_ticket_schedule'])) {
             'recipient' => $user_email,
             'recipient_name' => $user_name,
             'subject' => "Ticket Schedule Cancelled - [$ticket_prefix$ticket_number] - $ticket_subject",
-            'body' => "Hello, " . $user_name . "<br><br>Scheduled work for the ticket regarding $ticket_subject has been cancelled.<br><br>--------------------------------<br><a href=\"https://$config_base_url/user/ticket.php?ticket_id=$ticket_id\">$ticket_link</a><br>--------------------------------<br><br>Please do not reply to this email. <br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Portal: https://$config_base_url/user/ticket.php?id=$ticket_id<br><br>~<br>$session_company_name<br>Support Department<br>$config_ticket_from_email",
+            'body' => "Hello, " . $user_name . "<br><br>Scheduled work for the ticket regarding $ticket_subject has been cancelled.<br><br>--------------------------------<br><a href=\"https://$config_base_url/agent/ticket.php?ticket_id=$ticket_id\">$ticket_link</a><br>--------------------------------<br><br>Please do not reply to this email. <br><br>Ticket: $ticket_prefix$ticket_number<br>Subject: $ticket_subject<br>Portal: https://$config_base_url/agent/ticket.php?id=$ticket_id<br><br>~<br>$session_company_name<br>Support Department<br>$config_ticket_from_email",
             'cal_str' => $cal_str
         ];
 
diff --git a/user/post/ticket_recurring_model.php b/agent/post/ticket_recurring_model.php
similarity index 100%
rename from user/post/ticket_recurring_model.php
rename to agent/post/ticket_recurring_model.php
diff --git a/user/post/transfer.php b/agent/post/transfer.php
similarity index 100%
rename from user/post/transfer.php
rename to agent/post/transfer.php
diff --git a/user/post/transfer_model.php b/agent/post/transfer_model.php
similarity index 100%
rename from user/post/transfer_model.php
rename to agent/post/transfer_model.php
diff --git a/user/post/trip.php b/agent/post/trip.php
similarity index 100%
rename from user/post/trip.php
rename to agent/post/trip.php
diff --git a/user/post/trip_model.php b/agent/post/trip_model.php
similarity index 100%
rename from user/post/trip_model.php
rename to agent/post/trip_model.php
diff --git a/user/post/vendor.php b/agent/post/vendor.php
similarity index 100%
rename from user/post/vendor.php
rename to agent/post/vendor.php
diff --git a/user/post/vendor_contact.php b/agent/post/vendor_contact.php
similarity index 100%
rename from user/post/vendor_contact.php
rename to agent/post/vendor_contact.php
diff --git a/user/post/vendor_contact_model.php b/agent/post/vendor_contact_model.php
similarity index 100%
rename from user/post/vendor_contact_model.php
rename to agent/post/vendor_contact_model.php
diff --git a/user/post/vendor_model.php b/agent/post/vendor_model.php
similarity index 100%
rename from user/post/vendor_model.php
rename to agent/post/vendor_model.php
diff --git a/user/products.php b/agent/products.php
similarity index 100%
rename from user/products.php
rename to agent/products.php
diff --git a/user/project_details.php b/agent/project_details.php
similarity index 100%
rename from user/project_details.php
rename to agent/project_details.php
diff --git a/user/projects.php b/agent/projects.php
similarity index 100%
rename from user/projects.php
rename to agent/projects.php
diff --git a/user/quote.php b/agent/quote.php
similarity index 100%
rename from user/quote.php
rename to agent/quote.php
diff --git a/user/quotes.php b/agent/quotes.php
similarity index 100%
rename from user/quotes.php
rename to agent/quotes.php
diff --git a/user/racks.php b/agent/racks.php
similarity index 100%
rename from user/racks.php
rename to agent/racks.php
diff --git a/user/recurring_expenses.php b/agent/recurring_expenses.php
similarity index 100%
rename from user/recurring_expenses.php
rename to agent/recurring_expenses.php
diff --git a/user/recurring_invoice.php b/agent/recurring_invoice.php
similarity index 100%
rename from user/recurring_invoice.php
rename to agent/recurring_invoice.php
diff --git a/user/recurring_invoices.php b/agent/recurring_invoices.php
similarity index 100%
rename from user/recurring_invoices.php
rename to agent/recurring_invoices.php
diff --git a/user/recurring_tickets.php b/agent/recurring_tickets.php
similarity index 95%
rename from user/recurring_tickets.php
rename to agent/recurring_tickets.php
index 8a99aa17..ab7b3e4f 100644
--- a/user/recurring_tickets.php
+++ b/agent/recurring_tickets.php
@@ -32,7 +32,8 @@ $sql = mysqli_query(
     $mysqli,
     "SELECT SQL_CALC_FOUND_ROWS * FROM recurring_tickets
     LEFT JOIN clients ON recurring_ticket_client_id = client_id
-    LEFT JOIN categories ON category_id = recurring_ticket_category 
+    LEFT JOIN categories ON category_id = recurring_ticket_category
+    LEFT JOIN users ON user_id = recurring_ticket_assigned_to
     WHERE (recurring_tickets.recurring_ticket_subject LIKE '%$q%' OR category_name LIKE '%$q%')
     $rec_ticket_permission_snippet
     $client_query
@@ -147,6 +148,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     Frequency <?php if ($sort == 'recurring_ticket_frequency') { echo $order_icon; } ?>
                                 </a>
                             </th>
+                            <th>
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">
+                                    Assigned <?php if ($sort == 'user_name') { echo $order_icon; } ?>
+                                </a>
+                            </th>
                             <th>
                                 <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=recurring_ticket_next_run&order=<?php echo $disp; ?>">
                                     Next Run Date <?php if ($sort == 'recurring_ticket_next_run') { echo $order_icon; } ?>
@@ -171,6 +177,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $recurring_ticket_next_run = nullable_htmlentities($row['recurring_ticket_next_run']);
                             $recurring_ticket_category = getFallBack(nullable_htmlentities($row['category_name']));
                             $recurring_ticket_client_name = nullable_htmlentities($row['client_name']);
+                            $assigned_to = getFallBack(nullable_htmlentities($row['user_name']));
                         ?>
 
                             <tr>
@@ -195,6 +202,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <td><?php echo $recurring_ticket_category ?></td>
                                 <td><?php echo $recurring_ticket_priority ?></td>
                                 <td><?php echo $recurring_ticket_frequency ?></td>
+                                <td><?php echo $assigned_to ?></td>
                                 <td class="text-bold"><?php echo $recurring_ticket_next_run ?></td>
 
                                 <?php if (lookupUserPermission("module_support") >= 2) { ?>
diff --git a/user/report_budget.php b/agent/reports/budget.php
similarity index 98%
rename from user/report_budget.php
rename to agent/reports/budget.php
index f55e15a6..badad9ce 100644
--- a/user/report_budget.php
+++ b/agent/reports/budget.php
@@ -103,5 +103,5 @@ $monthlyTotals = array_fill(1, 12, 0);  // Initialize monthly totals for each mo
     </div>
 </div>
 
-<?php require_once "../includes/footer.php";
+<?php require_once "../../includes/footer.php";
  ?>
\ No newline at end of file
diff --git a/user/report_clients_with_balance.php b/agent/reports/clients_with_balance.php
similarity index 93%
rename from user/report_clients_with_balance.php
rename to agent/reports/clients_with_balance.php
index 30abd2de..29ac13f8 100644
--- a/user/report_clients_with_balance.php
+++ b/agent/reports/clients_with_balance.php
@@ -67,7 +67,7 @@ enforceUserPermission('module_financial');
                     ?>
 
                     <tr>
-                        <td><a href="invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
+                        <td><a href="../../agent/invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $balance, $session_company_currency); ?></td>
                     </tr>
                     <?php
@@ -81,5 +81,5 @@ enforceUserPermission('module_financial');
 </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
 
diff --git a/user/report_credential_rotation.php b/agent/reports/credential_rotation.php
similarity index 98%
rename from user/report_credential_rotation.php
rename to agent/reports/credential_rotation.php
index 10f5395c..be1e09d9 100644
--- a/user/report_credential_rotation.php
+++ b/agent/reports/credential_rotation.php
@@ -71,5 +71,5 @@ $passwords_not_rotated_sql = mysqli_query($mysqli,
     </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
 
diff --git a/user/report_expense_by_vendor.php b/agent/reports/expense_by_vendor.php
similarity index 98%
rename from user/report_expense_by_vendor.php
rename to agent/reports/expense_by_vendor.php
index 9d0745fa..1488a2dc 100644
--- a/user/report_expense_by_vendor.php
+++ b/agent/reports/expense_by_vendor.php
@@ -93,5 +93,5 @@ $sql_vendor_expenses = mysqli_query($mysqli, "
     </div>
 </div>
 
-<?php require_once "../includes/footer.php";
+<?php require_once "../../includes/footer.php";
  ?>
diff --git a/user/report_expense_summary.php b/agent/reports/expense_summary.php
similarity index 99%
rename from user/report_expense_summary.php
rename to agent/reports/expense_summary.php
index 727d9678..a127eb64 100644
--- a/user/report_expense_summary.php
+++ b/agent/reports/expense_summary.php
@@ -122,7 +122,7 @@ $largest_expense_month = 0;
     </div>
 </div>
 
-<?php require_once "../includes/footer.php"; ?>
+<?php require_once "../../includes/footer.php"; ?>
 
 <script>
     // Bootstrap-like defaults for Chart.js v4
diff --git a/agent/reports/includes/inc_all_reports.php b/agent/reports/includes/inc_all_reports.php
new file mode 100644
index 00000000..60ac3c69
--- /dev/null
+++ b/agent/reports/includes/inc_all_reports.php
@@ -0,0 +1,19 @@
+<?php
+
+require_once "../../config.php";
+require_once "../../functions.php";
+require_once "../../includes/check_login.php";
+require_once "../../includes/page_title.php";
+// Reporting Perms
+enforceUserPermission('module_reporting');
+require_once "../../includes/header.php";
+require_once "../../includes/top_nav.php";
+require_once "includes/reports_side_nav.php";
+require_once "../../includes/inc_wrapper.php";
+require_once "../../includes/inc_alert_feedback.php";
+require_once "../../includes/filter_header.php";
+
+// Set variable default values
+$largest_income_month = 0;
+$largest_invoice_month = 0;
+$recurring_total = 0;
diff --git a/user/includes/reports_side_nav.php b/agent/reports/includes/reports_side_nav.php
similarity index 52%
rename from user/includes/reports_side_nav.php
rename to agent/reports/includes/reports_side_nav.php
index d9a07424..901cedac 100644
--- a/user/includes/reports_side_nav.php
+++ b/agent/reports/includes/reports_side_nav.php
@@ -1,7 +1,7 @@
 <!-- Main Sidebar Container -->
 <aside class="main-sidebar sidebar-dark-primary d-print-none">
 
-    <a class="pb-1 mt-1 brand-link" href="index.php">
+    <a class="pb-1 mt-1 brand-link" href="../<?php echo $config_start_page ?>">
         <p class="h5"><i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
             <span class="brand-text ">Back | <strong>Reports</strong>
         </p>
@@ -18,55 +18,55 @@
                 <li class="nav-header">FINANCIAL</li>
                 <?php if ($config_module_enable_accounting == 1 && lookupUserPermission("module_financial") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="report_income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_summary.php") { echo "active"; } ?>">
+                        <a href="income_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_summary.php") { echo "active"; } ?>">
                             <i class="far fa-circle nav-icon"></i>
                             <p>Income</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_income_by_client.php") { echo "active"; } ?>">
+                        <a href="income_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "income_by_client.php") { echo "active"; } ?>">
                             <i class="far fa-user nav-icon"></i>
                             <p>Income By Client</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_recurring_by_client.php") { echo "active"; } ?>">
+                        <a href="recurring_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "recurring_by_client.php") { echo "active"; } ?>">
                             <i class="fa fa-sync nav-icon"></i>
                             <p>Recurring Income By Client</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_clients_with_balance.php") { echo "active"; } ?>">
+                        <a href="clients_with_balance.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "clients_with_balance.php") { echo "active"; } ?>">
                             <i class="fa fa-exclamation-triangle nav-icon"></i>
                             <p>Clients with a Balance</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_expense_summary.php") { echo "active"; } ?>">
+                        <a href="expense_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_summary.php") { echo "active"; } ?>">
                             <i class="far fa-credit-card nav-icon"></i>
                             <p>Expense</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_expense_by_vendor.php") { echo "active"; } ?>">
+                        <a href="expense_by_vendor.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "expense_by_vendor.php") { echo "active"; } ?>">
                             <i class="far fa-building nav-icon"></i>
                             <p>Expense By Vendor</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_tax_summary.php") { echo "active"; } ?>">
+                        <a href="tax_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tax_summary.php") { echo "active"; } ?>">
                             <i class="fas fa-percent nav-icon"></i>
                             <p>Tax Summary</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_profit_loss.php") { echo "active"; } ?>">
+                        <a href="profit_loss.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "profit_loss.php") { echo "active"; } ?>">
                             <i class="fas fa-file-invoice-dollar nav-icon"></i>
                             <p>Profit & Loss</p>
                         </a>
                     </li>
                     <li class="nav-item">
-                        <a href="report_tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_tickets_unbilled.php") { echo "active"; } ?>">
+                        <a href="tickets_unbilled.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "tickets_unbilled.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Unbilled Tickets</p>
                         </a>
@@ -78,21 +78,21 @@
                 <li class="nav-header">TECHNICAL</li>
                 <?php  if ($config_module_enable_ticketing && lookupUserPermission("module_support") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="report_ticket_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_ticket_summary.php") { echo "active"; } ?>">
+                        <a href="ticket_summary.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_summary.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Tickets</p>
                         </a>
                     </li>
 
                     <li class="nav-item">
-                        <a href="report_ticket_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_ticket_by_client.php") { echo "active"; } ?>">
+                        <a href="ticket_by_client.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "ticket_by_client.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Tickets by Client</p>
                         </a>
                     </li>
 
                     <li class="nav-item">
-                        <a href="report_time_by_tech.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_time_by_tech.php") { echo "active"; } ?>">
+                        <a href="time_by_tech.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "time_by_tech.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-life-ring"></i>
                             <p>Time by Technician</p>
                         </a>
@@ -100,13 +100,42 @@
                 <?php } ?>
                 <?php if (lookupUserPermission("module_credential") >= 1) { ?>
                     <li class="nav-item">
-                        <a href="report_credential_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "report_credential_rotation.php") { echo "active"; } ?>">
+                        <a href="credential_rotation.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "credential_rotation.php") { echo "active"; } ?>">
                             <i class="nav-icon fas fa-key"></i>
                             <p>Credential rotation</p>
                         </a>
                     </li>
                 <?php } ?>
 
+                <?php
+                $sql_custom_links = mysqli_query($mysqli, "SELECT * FROM custom_links 
+                    WHERE custom_link_location = 5 AND custom_link_archived_at IS NULL
+                    ORDER BY custom_link_order ASC, custom_link_name ASC"
+                );
+
+                while ($row = mysqli_fetch_array($sql_custom_links)) {
+                    $custom_link_name = nullable_htmlentities($row['custom_link_name']);
+                    $custom_link_uri = sanitize_url($row['custom_link_uri']);
+                    $custom_link_icon = nullable_htmlentities($row['custom_link_icon']);
+                    $custom_link_new_tab = intval($row['custom_link_new_tab']);
+                    if ($custom_link_new_tab == 1) {
+                        $target = "target='_blank' rel='noopener noreferrer'";
+                    } else {
+                        $target = "";
+                    }
+
+                    ?>
+
+                <li class="nav-item">
+                    <a href="<?php echo $custom_link_uri; ?>" <?php echo $target; ?> class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == basename($custom_link_uri)) { echo "active"; } ?>">
+                        <i class="fas fa-<?php echo $custom_link_icon; ?> nav-icon"></i>
+                        <p><?php echo $custom_link_name; ?></p>
+                        <i class="fas fa-angle-right nav-icon float-right"></i>
+                    </a>
+                </li>
+
+                <?php } ?>
+
             </ul>
 
         </nav>
diff --git a/user/report_income_by_client.php b/agent/reports/income_by_client.php
similarity index 94%
rename from user/report_income_by_client.php
rename to agent/reports/income_by_client.php
index d7e8f55a..4f8f886e 100644
--- a/user/report_income_by_client.php
+++ b/agent/reports/income_by_client.php
@@ -77,7 +77,7 @@ $sql_payment_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(payment_date) A
                     ?>
 
                     <tr>
-                        <td><a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
+                        <td><a href="../../agent/client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $amount_paid, $session_company_currency); ?></td>
                     </tr>
                     <?php
@@ -91,5 +91,5 @@ $sql_payment_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(payment_date) A
 </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
 
diff --git a/user/report_income_summary.php b/agent/reports/income_summary.php
similarity index 99%
rename from user/report_income_summary.php
rename to agent/reports/income_summary.php
index 13975619..95d6f420 100644
--- a/user/report_income_summary.php
+++ b/agent/reports/income_summary.php
@@ -124,7 +124,7 @@ $largest_income_month = 0;
     </div>
 </div>
 
-<?php require_once "../includes/footer.php"; ?>
+<?php require_once "../../includes/footer.php"; ?>
 
 <script>
     // Bootstrap-like defaults for Chart.js v4
diff --git a/user/report_overview.php b/agent/reports/index.php
similarity index 92%
rename from user/report_overview.php
rename to agent/reports/index.php
index 75fab592..3732ab40 100644
--- a/user/report_overview.php
+++ b/agent/reports/index.php
@@ -16,5 +16,5 @@ require_once "includes/inc_all_reports.php";
         </div>
     </div>
 
-<?php require_once "../includes/footer.php"; ?>
+<?php require_once "../../includes/footer.php"; ?>
 
diff --git a/user/report_profit_loss.php b/agent/reports/profit_loss.php
similarity index 99%
rename from user/report_profit_loss.php
rename to agent/reports/profit_loss.php
index 50bc529b..f250614f 100644
--- a/user/report_profit_loss.php
+++ b/agent/reports/profit_loss.php
@@ -433,5 +433,5 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
         </div>
     </div>
 
-<?php require_once "../includes/footer.php";
+<?php require_once "../../includes/footer.php";
 
diff --git a/user/report_recurring_by_client.php b/agent/reports/recurring_by_client.php
similarity index 92%
rename from user/report_recurring_by_client.php
rename to agent/reports/recurring_by_client.php
index a65af8c8..9a8813b0 100644
--- a/user/report_recurring_by_client.php
+++ b/agent/reports/recurring_by_client.php
@@ -46,7 +46,7 @@ $sql = mysqli_query($mysqli, "
 
 
                     <tr>
-                        <td><a href="client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
+                        <td><a href="../../agent/client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
                         <td class="text-right"><?php echo numfmt_format_currency($currency_format, $recurring_monthly_total, $session_company_currency); ?></td>
                     </tr>
                     <?php
@@ -63,5 +63,5 @@ $sql = mysqli_query($mysqli, "
     </div>
 </div>
 
-<?php require_once "../includes/footer.php";
+<?php require_once "../../includes/footer.php";
  ?>
diff --git a/user/report_tax_summary.php b/agent/reports/tax_summary.php
similarity index 99%
rename from user/report_tax_summary.php
rename to agent/reports/tax_summary.php
index 7e664a24..62df4990 100644
--- a/user/report_tax_summary.php
+++ b/agent/reports/tax_summary.php
@@ -117,5 +117,5 @@ $sql_tax = mysqli_query($mysqli, "SELECT `tax_name` FROM `taxes`");
         </div>
     </div>
 
-<?php require_once "../includes/footer.php";
+<?php require_once "../../includes/footer.php";
 
diff --git a/user/report_ticket_by_client.php b/agent/reports/ticket_by_client.php
similarity index 99%
rename from user/report_ticket_by_client.php
rename to agent/reports/ticket_by_client.php
index 8b3de281..6772e689 100644
--- a/user/report_ticket_by_client.php
+++ b/agent/reports/ticket_by_client.php
@@ -339,5 +339,5 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients
     </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
 
diff --git a/user/report_ticket_summary.php b/agent/reports/ticket_summary.php
similarity index 99%
rename from user/report_ticket_summary.php
rename to agent/reports/ticket_summary.php
index ec5e77a6..8d8ad342 100644
--- a/user/report_ticket_summary.php
+++ b/agent/reports/ticket_summary.php
@@ -95,7 +95,7 @@ $largest_ticket_month = 0;
     </div>
 </div>
 
-<?php require_once "../includes/footer.php"; ?>
+<?php require_once "../../includes/footer.php"; ?>
 
 <script>
     // Bootstrap-like defaults for Chart.js v4
diff --git a/user/report_tickets_unbilled.php b/agent/reports/tickets_unbilled.php
similarity index 97%
rename from user/report_tickets_unbilled.php
rename to agent/reports/tickets_unbilled.php
index fc6f634a..b5514887 100644
--- a/user/report_tickets_unbilled.php
+++ b/agent/reports/tickets_unbilled.php
@@ -152,7 +152,7 @@ $rows = 0;
 
                             <tr>
                                 <td>
-                                    <a href="tickets.php?client_id=<?php echo $client_id; ?>&billable=1&unbilled"><?php echo $client_name; ?></a>
+                                    <a href="../../agent/tickets.php?client_id=<?php echo $client_id; ?>&billable=1&unbilled"><?php echo $client_name; ?></a>
                                 </td>
                                 <td class="text-right"><?php echo $ticket_raised_count; ?></td>
                                 <td class="text-right"><?php echo $ticket_closed_count; ?></td>
@@ -178,5 +178,5 @@ $rows = 0;
     </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
 
diff --git a/user/report_time_by_tech.php b/agent/reports/time_by_tech.php
similarity index 99%
rename from user/report_time_by_tech.php
rename to agent/reports/time_by_tech.php
index 3315446f..db0acaa9 100644
--- a/user/report_time_by_tech.php
+++ b/agent/reports/time_by_tech.php
@@ -177,5 +177,5 @@ $sql_users = mysqli_query($mysqli, "
     </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
 
diff --git a/user/revenues.php b/agent/revenues.php
similarity index 100%
rename from user/revenues.php
rename to agent/revenues.php
diff --git a/user/services.php b/agent/services.php
similarity index 100%
rename from user/services.php
rename to agent/services.php
diff --git a/user/software.php b/agent/software.php
similarity index 100%
rename from user/software.php
rename to agent/software.php
diff --git a/user/ticket.php b/agent/ticket.php
similarity index 99%
rename from user/ticket.php
rename to agent/ticket.php
index 083f4ea5..383bfeb1 100644
--- a/user/ticket.php
+++ b/agent/ticket.php
@@ -437,7 +437,7 @@ if (isset($_GET['ticket_id'])) {
                                                 data-modal-url="modals/ticket/ticket_contact.php?id=<?= $ticket_id ?>">
                                                 <i class="fa fa-fw fa-user mr-2"></i>Add Contact
                                             </a>
-                                            <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketAssetModal<?php echo $ticket_id; ?>">
+                                            <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/ticket/ticket_edit_asset.php?id=<?= $ticket_id ?>">
                                                 <i class="fas fa-fw fa-desktop mr-2"></i>Add Asset
                                             </a>
                                             <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketVendorModal<?php echo $ticket_id; ?>">
@@ -1124,7 +1124,7 @@ if (isset($_GET['ticket_id'])) {
                             <h5 class="card-title"><i class="fas fa-fw fa-desktop mr-2 mt-2"></i>Primary Asset</h5>
                             <div class="card-tools">
                                 <?php if (empty($ticket_resolved_at) && lookupUserPermission("module_support") >= 2) { ?>
-                                    <a class="btn btn-light text-secondary btn-sm" href="#" data-toggle="modal" data-target="#editTicketAssetModal<?php echo $ticket_id; ?>">
+                                    <a class="btn btn-light text-secondary btn-sm ajax-modal" href="#" data-modal-url="modals/ticket/ticket_edit_asset.php?id=<?= $ticket_id ?>">
                                         <i class="fas fa-edit"></i>
                                     </a>
                                 <?php } ?>
@@ -1255,7 +1255,6 @@ if (isset($_GET['ticket_id'])) {
 
         <?php
         if (lookupUserPermission("module_support") >= 2 && empty($ticket_closed_at)) {
-            require_once "modals/ticket/ticket_edit_asset.php";
             require_once "modals/ticket/ticket_edit_vendor.php";
             require_once "modals/ticket/ticket_add_watcher.php";
             require_once "modals/ticket/ticket_change_client.php";
@@ -1292,7 +1291,7 @@ require_once "../includes/footer.php";
     </div>
 </div>
 
-<script src="../js/show_modals.js"></script>
+<script src="/js/show_modals.js"></script>
 
 <?php if (empty($ticket_closed_at)) { ?>
     <!-- create js variable related to ticket timer setting -->
@@ -1307,7 +1306,7 @@ require_once "../includes/footer.php";
     <script src="js/ticket_collision_detection.js"></script>
 <?php } ?>
 
-<script src="../js/pretty_content.js"></script>
+<script src="/js/pretty_content.js"></script>
 
 <script>
     $('#summaryModal').on('shown.bs.modal', function (e) {
@@ -1326,7 +1325,7 @@ require_once "../includes/footer.php";
     });
 </script>
 
-<script src="../plugins/SortableJS/Sortable.min.js"></script>
+<script src="/plugins/SortableJS/Sortable.min.js"></script>
 <script>
 new Sortable(document.querySelector('table#tasks tbody'), {
     handle: '.drag-handle',
diff --git a/user/ticket_kanban.php b/agent/ticket_kanban.php
similarity index 100%
rename from user/ticket_kanban.php
rename to agent/ticket_kanban.php
diff --git a/user/ticket_list.php b/agent/ticket_list.php
similarity index 100%
rename from user/ticket_list.php
rename to agent/ticket_list.php
diff --git a/user/tickets.php b/agent/tickets.php
similarity index 100%
rename from user/tickets.php
rename to agent/tickets.php
diff --git a/user/transfers.php b/agent/transfers.php
similarity index 100%
rename from user/transfers.php
rename to agent/transfers.php
diff --git a/user/trips.php b/agent/trips.php
similarity index 100%
rename from user/trips.php
rename to agent/trips.php
diff --git a/agent/user/includes/inc_all_user.php b/agent/user/includes/inc_all_user.php
new file mode 100644
index 00000000..72429109
--- /dev/null
+++ b/agent/user/includes/inc_all_user.php
@@ -0,0 +1,13 @@
+<?php
+
+require_once "../../config.php";
+require_once "../../functions.php";
+require_once "../../includes/check_login.php";
+require_once "../../includes/page_title.php";
+require_once "../../includes/header.php";
+require_once "../../includes/top_nav.php";
+require_once "includes/user_side_nav.php";
+require_once "../../includes/inc_wrapper.php";
+require_once "../../includes/inc_alert_feedback.php";
+require_once "../../includes/filter_header.php";
+
diff --git a/user/includes/user_side_nav.php b/agent/user/includes/user_side_nav.php
similarity index 96%
rename from user/includes/user_side_nav.php
rename to agent/user/includes/user_side_nav.php
index 45ca3ce9..d7d38eb3 100644
--- a/user/includes/user_side_nav.php
+++ b/agent/user/includes/user_side_nav.php
@@ -1,7 +1,7 @@
 <!-- Main Sidebar Container -->
 <aside class="main-sidebar sidebar-dark-<?php echo nullable_htmlentities($config_theme); ?> d-print-none">
 
-    <a class="brand-link pb-1 mt-1" href="clients.php">    
+    <a class="brand-link pb-1 mt-1" href="../<?php echo $config_start_page ?>">  
         <p class="h5">
             <i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i> 
             <span class="brand-text">
@@ -55,3 +55,4 @@
     </div>
     <!-- /.sidebar -->
 </aside>
+
diff --git a/user/mfa_enforcement.php b/agent/user/mfa_enforcement.php
similarity index 78%
rename from user/mfa_enforcement.php
rename to agent/user/mfa_enforcement.php
index dc759842..fc01e9c6 100644
--- a/user/mfa_enforcement.php
+++ b/agent/user/mfa_enforcement.php
@@ -1,8 +1,8 @@
 <?php
-require_once "../config.php";
-require_once "../functions.php";
-require_once "../includes/check_login.php";
-require_once '../plugins/totp/totp.php'; //TOTP MFA Lib
+require_once "../../config.php";
+require_once "../../functions.php";
+require_once "../../includes/check_login.php";
+require_once '../../plugins/totp/totp.php'; //TOTP MFA Lib
 
 // Get Company Logo
 $sql = mysqli_query($mysqli, "SELECT company_logo FROM companies");
@@ -36,28 +36,28 @@ $data = "otpauth://totp/ITFlow:$session_email?secret=$token";
     Favicon
     If Fav Icon exists else use the default one 
     -->
-    <?php if(file_exists('../uploads/favicon.ico')) { ?>
-        <link rel="icon" type="image/x-icon" href="/uploads/favicon.ico">
+    <?php if(file_exists('../../uploads/favicon.ico')) { ?>
+        <link rel="icon" type="image/x-icon" href="../../uploads/favicon.ico">
     <?php } ?>
     
     <!-- Font Awesome Icons -->
-    <link rel="stylesheet" href="../plugins/fontawesome-free/css/all.min.css">
+    <link rel="stylesheet" href="../../plugins/fontawesome-free/css/all.min.css">
 
     <!-- Theme style -->
-    <link rel="stylesheet" href="../plugins/adminlte/css/adminlte.min.css">
-    <link href="../plugins/toastr/toastr.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="../../plugins/adminlte/css/adminlte.min.css">
+    <link href="../../plugins/toastr/toastr.min.css" rel="stylesheet">
 
     <!-- jQuery -->
-    <script src="../plugins/jquery/jquery.min.js"></script>
-    <script src="../plugins/toastr/toastr.min.js"></script>
+    <script src="../../plugins/jquery/jquery.min.js"></script>
+    <script src="../../plugins/toastr/toastr.min.js"></script>
 
 </head>
 <body class="hold-transition login-page">
-    <?php require_once "../includes/inc_alert_feedback.php"; ?>
+    <?php require_once "../../includes/inc_alert_feedback.php"; ?>
     <div class="login-box">
         <div class="login-logo">
             <?php if (!empty($company_logo)) { ?>
-                <img alt="<?= nullable_htmlentities($company_name)?> logo" height="110" width="380" class="img-fluid" src="<?php echo "../uploads/settings/$company_logo"; ?>">
+                <img alt="<?= nullable_htmlentities($company_name)?> logo" height="110" width="380" class="img-fluid" src="<?php echo "../../uploads/settings/$company_logo"; ?>">
             <?php } else { ?>
                 <span class="text-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>IT</span>Flow
             <?php } ?>
@@ -72,7 +72,7 @@ $data = "otpauth://totp/ITFlow:$session_email?secret=$token";
                 <form action="post.php" method="post" autocomplete="off">
                     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
                     
-                    <img src='../plugins/barcode/barcode.php?f=png&s=qr&d=<?php echo $data; ?>' data-toggle="tooltip" title="Scan QR code into your MFA App">
+                    <img src='../../plugins/barcode/barcode.php?f=png&s=qr&d=<?php echo $data; ?>' data-toggle="tooltip" title="Scan QR code into your MFA App">
                    
                     <p>
                         <small data-toggle="tooltip" title="Can't Scan? Copy and paste this code into your app"><?php echo $token; ?></small>
@@ -100,10 +100,10 @@ $data = "otpauth://totp/ITFlow:$session_email?secret=$token";
     <!-- REQUIRED SCRIPTS -->
 
     <!-- Bootstrap 4 -->
-    <script src="../plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
+    <script src="../../plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
 
     <!-- Custom js-->
-    <script src="../plugins/clipboardjs/clipboard.min.js"></script>
+    <script src="../../plugins/clipboardjs/clipboard.min.js"></script>
 
     <script>
 
diff --git a/user/modals/user_mfa_modal.php b/agent/user/modals/user_mfa_modal.php
similarity index 93%
rename from user/modals/user_mfa_modal.php
rename to agent/user/modals/user_mfa_modal.php
index 043d152d..cea5334e 100644
--- a/user/modals/user_mfa_modal.php
+++ b/agent/user/modals/user_mfa_modal.php
@@ -1,5 +1,5 @@
 <?php
-require_once '../plugins/totp/totp.php';
+require_once '../../plugins/totp/totp.php';
 
 // Only generate the token once and store it in session:
 if (empty($_SESSION['mfa_token'])) {
@@ -27,7 +27,7 @@ $data = "otpauth://totp/ITFlow:$session_email?secret=$token";
                 <div class="modal-body">
                         
                     <div class="text-center">
-                        <img src='../plugins/barcode/barcode.php?f=png&s=qr&d=<?php echo $data; ?>'>
+                        <img src='../../plugins/barcode/barcode.php?f=png&s=qr&d=<?php echo $data; ?>'>
                         <p><span class='text-secondary'>Secret:</span> <?php echo $token; ?>
                             <button type="button" class='btn btn-sm clipboardjs' data-clipboard-text='<?php echo $token; ?>'><i class='far fa-copy text-secondary'></i></button>
                         </p>
@@ -51,3 +51,4 @@ $data = "otpauth://totp/ITFlow:$session_email?secret=$token";
         </div>
     </div>
 </div>
+
diff --git a/agent/user/post.php b/agent/user/post.php
new file mode 100644
index 00000000..50b8332b
--- /dev/null
+++ b/agent/user/post.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * ITFlow - User GET/POST request handler
+ */
+
+require_once "../../config.php";
+require_once "../../functions.php";
+require_once "../../includes/check_login.php";
+
+// Define a variable that we can use to only allow running post files via inclusion (prevents people/bots poking them)
+define('FROM_POST_HANDLER', true);
+
+
+// Determine which files we should load
+
+// Parse URL & get the path
+$path = parse_url($_SERVER['HTTP_REFERER'], PHP_URL_PATH);
+
+// Get the base name (the page name)
+$module = explode(".", basename($path))[0];
+
+// Strip off any _details bits
+$module = str_ireplace('_details', '', $module);
+
+// Dynamically load admin-related module POST logic
+
+// Load all module POST logic
+//  Loads everything in post/user/
+//  Eventually, it would be nice to only specifically load what we need like we do for admins
+
+foreach (glob("post/*.php") as $user_module) {
+    if (!preg_match('/_model\.php$/', basename($user_module))) {
+        require_once $user_module;
+    }
+}
+
+
+// Logout is the same for user and admin
+require_once "../../post/logout.php";
+
+// TODO: Find a home for these
+
+require_once "../../post/ai.php";
+require_once "../../post/misc.php";
+
diff --git a/user/post/profile.php b/agent/user/post/profile.php
similarity index 97%
rename from user/post/profile.php
rename to agent/user/post/profile.php
index 2944eba1..f730bdb6 100644
--- a/user/post/profile.php
+++ b/agent/user/post/profile.php
@@ -55,12 +55,12 @@ if (isset($_POST['edit_your_user_details'])) {
             $file_tmp_path = $_FILES['avatar']['tmp_name'];
 
             // directory in which the uploaded file will be moved
-            $upload_file_dir = "../uploads/users/$session_user_id/";
+            $upload_file_dir = "../../uploads/users/$session_user_id/";
             $dest_path = $upload_file_dir . $new_file_name;
             move_uploaded_file($file_tmp_path, $dest_path);
 
             // Delete old file
-            unlink("../uploads/users/$session_user_id/$existing_file_name");
+            unlink("../../uploads/users/$session_user_id/$existing_file_name");
 
             // Set Avatar
             mysqli_query($mysqli,"UPDATE users SET user_avatar = '$new_file_name' WHERE user_id = $session_user_id");
@@ -193,7 +193,7 @@ if (isset($_POST['enable_mfa'])) {
 
     validateCSRFToken($_POST['csrf_token']);
 
-    require_once "../plugins/totp/totp.php";
+    require_once "../../plugins/totp/totp.php";
 
     // Grab the code from the user
     $verify_code = trim($_POST['verify_code']); 
@@ -226,7 +226,7 @@ if (isset($_POST['enable_mfa'])) {
             $previousPage = basename(parse_url($_SERVER['HTTP_REFERER'], PHP_URL_PATH));
             if ($previousPage === 'mfa_enforcement.php') {
                 // Redirect back to mfa_enforcement.php
-                redirect("$config_start_page");
+                redirect("../$config_start_page");
                 
             }
         }    
diff --git a/user/user_activity.php b/agent/user/user_activity.php
similarity index 92%
rename from user/user_activity.php
rename to agent/user/user_activity.php
index de10e259..ad384dfb 100644
--- a/user/user_activity.php
+++ b/agent/user/user_activity.php
@@ -43,7 +43,7 @@ $sql_recent_logs = mysqli_query($mysqli, "SELECT * FROM logs
     </table>
     <?php if (isset($session_is_admin) && $session_is_admin === true) { ?>
         <div class="card-footer">
-            <a href="../admin/audit_log.php?q=<?php echo "$session_name successfully logged in"; ?>">See More...</a>
+            <a href="../../admin/audit_log.php?q=<?php echo "$session_name successfully logged in"; ?>">See More...</a>
         </div>
     <?php } ?>
 </div>
@@ -90,10 +90,10 @@ $sql_recent_logs = mysqli_query($mysqli, "SELECT * FROM logs
     </table>
     <?php if (isset($session_is_admin) && $session_is_admin === true) { ?>
         <div class="card-footer">
-            <a href="../admin/audit_log.php?q=<?php echo nullable_htmlentities($session_name); ?>">See More...</a>
+            <a href="../../admin/audit_log.php?q=<?php echo nullable_htmlentities($session_name); ?>">See More...</a>
         </div>
     <?php } ?>
 </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
diff --git a/user/user_details.php b/agent/user/user_details.php
similarity index 96%
rename from user/user_details.php
rename to agent/user/user_details.php
index 5b5e7a97..d5c1ac25 100644
--- a/user/user_details.php
+++ b/agent/user/user_details.php
@@ -15,7 +15,7 @@ require_once "includes/inc_all_user.php";
             <div class="row">
                 <div class="col-md-3 text-center">
                     <?php if($session_avatar) { ?>
-                    <img class="img-thumbnail" src="<?php echo "../uploads/users/$session_user_id/" . nullable_htmlentities($session_avatar); ?>">
+                    <img class="img-thumbnail" src="<?php echo "../../uploads/users/$session_user_id/" . nullable_htmlentities($session_avatar); ?>">
                     <a href="post.php?clear_your_user_avatar&csrf_token=<?= $_SESSION['csrf_token'] ?>" class="btn btn-outline-danger btn-block">Remove Avatar</a>
                     <hr>
                     <?php } ?>
@@ -78,4 +78,4 @@ require_once "includes/inc_all_user.php";
 </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
diff --git a/user/user_preferences.php b/agent/user/user_preferences.php
similarity index 98%
rename from user/user_preferences.php
rename to agent/user/user_preferences.php
index 9f968fc9..6730a369 100644
--- a/user/user_preferences.php
+++ b/agent/user/user_preferences.php
@@ -51,4 +51,4 @@ $user_config_calendar_first_day = intval($row['user_config_calendar_first_day'])
 </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
diff --git a/user/user_security.php b/agent/user/user_security.php
similarity index 98%
rename from user/user_security.php
rename to agent/user/user_security.php
index 81b91d9f..63163c13 100644
--- a/user/user_security.php
+++ b/agent/user/user_security.php
@@ -97,4 +97,4 @@ if (!empty($_SESSION['show_mfa_modal'])) {
     unset($_SESSION['show_mfa_modal']);
 }
 
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
diff --git a/user/vendor_details.php b/agent/vendor_details.php
similarity index 100%
rename from user/vendor_details.php
rename to agent/vendor_details.php
diff --git a/user/vendors.php b/agent/vendors.php
similarity index 100%
rename from user/vendors.php
rename to agent/vendors.php
diff --git a/api/v1/tickets/resolve.php b/api/v1/tickets/resolve.php
new file mode 100644
index 00000000..1079bbce
--- /dev/null
+++ b/api/v1/tickets/resolve.php
@@ -0,0 +1,48 @@
+<?php
+
+// Resolve endpoint for tickets
+// Just send a POST here with a ticket & client id, and we do the rest
+
+require_once '../validate_api_key.php';
+
+require_once '../require_post_method.php';
+
+// Parse Info
+$ticket_id = intval($_POST['ticket_id']);
+
+// Default
+$update_count = false;
+
+if (!empty($ticket_id)) {
+
+    $ticket_row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = '$ticket_id' AND ticket_resolved_at IS NULL AND ticket_client_id = $client_id LIMIT 1"));
+
+    // Grab what we need, not using the model
+    $ticket_id = intval($ticket_row['ticket_id']); // Override so things fail if this is bad
+    $ticket_prefix = sanitizeInput($ticket_row['ticket_prefix']);
+    $ticket_number = intval($ticket_row['ticket_number']);
+    $ticket_first_response_at = sanitizeInput($ticket_row['ticket_first_response_at']);
+
+    // Mark FR (if not)
+    if (empty($ticket_first_response_at)) {
+        mysqli_query($mysqli, "UPDATE tickets SET ticket_first_response_at = NOW() WHERE ticket_id = $ticket_id AND ticket_client_id = $client_id LIMIT 1");
+    }
+
+    // Resolve
+    $update_sql = mysqli_query($mysqli, "UPDATE tickets SET ticket_status = 4, ticket_resolved_at = NOW() WHERE ticket_id = $ticket_id AND ticket_client_id = $client_id LIMIT 1");
+
+    // Check insert & get insert ID
+    if ($update_sql) {
+        $update_count = mysqli_affected_rows($mysqli);
+
+        // Logging
+        logAction("Ticket", "Resolved", "$ticket_prefix$ticket_number ticket via API ($api_key_name)", $client_id, $ticket_id);
+        logAction("API", "Success", "Resolved ticket $ticket_prefix$ticket_number via API ($api_key_name)", $client_id);
+    }
+
+    customAction('ticket_resolve', $ticket_id);
+
+}
+
+// Output
+require_once '../update_output.php';
\ No newline at end of file
diff --git a/custom/readme.php b/client/custom/readme.php
similarity index 72%
rename from custom/readme.php
rename to client/custom/readme.php
index 94b0e942..6f3cf5d6 100644
--- a/custom/readme.php
+++ b/client/custom/readme.php
@@ -4,6 +4,7 @@
 
 - Custom Pages -
 
-    If you wish to add custom pages to ITFlow, add them to this directory with the prefix "xcustom_"
-
+    If you wish to add custom pages to ITFlow, add them to this directory"
+    
 */
+
diff --git a/client/includes/footer.php b/client/includes/footer.php
index 80bd67d8..4cb42257 100644
--- a/client/includes/footer.php
+++ b/client/includes/footer.php
@@ -24,13 +24,13 @@
 <?php require_once "../includes/inc_confirm_modal.php"; ?>
 
 <!-- jQuery -->
-<script src="../plugins/jquery/jquery.min.js"></script>
+<script src="/plugins/jquery/jquery.min.js"></script>
 
 <!-- Bootstrap 4 -->
-<script src="../plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
+<script src="/plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
 
 <!--- TinyMCE -->
-<script src="../plugins/tinymce/tinymce.min.js" referrerpolicy="origin"></script>
+<script src="/plugins/tinymce/tinymce.min.js" referrerpolicy="origin"></script>
 
 <script>
     
@@ -65,6 +65,8 @@
 
 </script>
 
-<script src="../js/pretty_content.js"></script>
+<script src="/js/pretty_content.js"></script>
 
-<script src="../js/confirm_modal.js"></script>
+<script src="/js/confirm_modal.js"></script>
+
+<script src="/js/keepalive.js"></script>
diff --git a/client/includes/header.php b/client/includes/header.php
index 8b9eddd9..c272d6f2 100644
--- a/client/includes/header.php
+++ b/client/includes/header.php
@@ -20,14 +20,14 @@ header("X-Frame-Options: DENY"); // Legacy
 
     <!-- Favicon: If Fav Icon exists, else use the default one -->
     <?php if (file_exists('../uploads/favicon.ico')) { ?>
-        <link rel="icon" type="image/x-icon" href="../uploads/favicon.ico">
+        <link rel="icon" type="image/x-icon" href="/uploads/favicon.ico">
     <?php } ?>
 
     <!-- Font Awesome -->
-    <link rel="stylesheet" href="../plugins/fontawesome-free/css/all.min.css">
+    <link rel="stylesheet" href="/plugins/fontawesome-free/css/all.min.css">
 
     <!-- Theme style -->
-    <link rel="stylesheet" href="../plugins/adminlte/css/adminlte.min.css">
+    <link rel="stylesheet" href="/plugins/adminlte/css/adminlte.min.css">
 
 </head>
 
@@ -140,7 +140,7 @@ header("X-Frame-Options: DENY"); // Legacy
 
         <div class="col-md-11 p-0">
                 <?php if ($session_company_logo) { ?>
-                    <img height="48" width="142" class="img-fluid float-right" src="<?php echo "../uploads/settings/$session_company_logo"; ?>">
+                    <img height="48" width="142" class="img-fluid float-right" src="<?php echo "/uploads/settings/$session_company_logo"; ?>">
                 <?php } ?>
             <h4>Welcome, <strong><?php echo stripslashes(nullable_htmlentities($session_contact_name)); ?></strong>!</h4>
         </div>
diff --git a/client/post.php b/client/post.php
index 4b4b9925..ce0f4a38 100644
--- a/client/post.php
+++ b/client/post.php
@@ -194,7 +194,7 @@ if (isset($_POST['add_ticket_feedback'])) {
         if ($feedback == "Bad") {
             $ticket_details = mysqli_fetch_array(mysqli_query($mysqli, "SELECT ticket_number FROM tickets WHERE ticket_id = $ticket_id LIMIT 1"));
             $ticket_number = intval($ticket_details['ticket_number']);
-            appNotify("Feedback", "$session_contact_name rated ticket $config_ticket_prefix$ticket_number as bad (ID: $ticket_id)", "ticket.php?ticket_id=$ticket_id", $session_client_id, $ticket_id);
+            appNotify("Feedback", "$session_contact_name rated ticket $config_ticket_prefix$ticket_number as bad (ID: $ticket_id)", "/agent/ticket.php?ticket_id=$ticket_id", $session_client_id, $ticket_id);
         }
 
         // Custom action/notif handler
@@ -608,7 +608,7 @@ if (isset($_GET['add_payment_by_provider'])) {
         }
 
         // Notify/log
-        appNotify("Invoice Paid", "Invoice $invoice_prefix$invoice_number automatically paid", "invoice.php?invoice_id=$invoice_id", $client_id);
+        appNotify("Invoice Paid", "Invoice $invoice_prefix$invoice_number automatically paid", "/agent/invoice.php?invoice_id=$invoice_id", $client_id);
         logAction("Invoice", "Payment", "$session_name initiated Stripe payment amount of " . numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code) . " added to invoice $invoice_prefix$invoice_number - $pi_id $extended_log_desc", $client_id, $invoice_id);
         customAction('invoice_pay', $invoice_id);
 
diff --git a/client/saved_payment_methods.php b/client/saved_payment_methods.php
index 656010ff..fc0b6674 100644
--- a/client/saved_payment_methods.php
+++ b/client/saved_payment_methods.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Client Portal - AutoPay Configuration (multi-provider)
+ * Client Portal - AutoPay Configuration (multi-provider - assumes Stripe for now)
  */
 
 require_once "includes/inc_all.php";
diff --git a/client/unpaid_invoices.php b/client/unpaid_invoices.php
index 9276600b..9f6f6271 100644
--- a/client/unpaid_invoices.php
+++ b/client/unpaid_invoices.php
@@ -22,7 +22,9 @@ $invoices_sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_clie
 // Payment Provider Active Query
 $sql_payment_provider = mysqli_query($mysqli, "SELECT * FROM payment_providers WHERE payment_provider_active = 1 LIMIT 1;");
 $row = mysqli_fetch_array($sql_payment_provider);
+$payment_provider_id = intval($row['payment_provider_id']);
 $payment_provider_active = intval($row['payment_provider_active']);
+$payment_provider_threshold = floatval($row['payment_provider_threshold']);
 
 // Saved Payment Methods
 $sql_saved_payment_methods = mysqli_query($mysqli, "
@@ -140,7 +142,16 @@ $balance = $invoice_amounts - $amount_paid;
                     <td><?php echo $invoice_date; ?></td>
                     <td class="<?php echo $overdue_color; ?>"><?php echo $invoice_due; ?></td>
                     <td>
-                        <?php if ($payment_provider_active && ($invoice_status === 'Sent' || $invoice_status === 'Viewed')) { ?>
+                        <?php
+                        if ($invoice_status !== "Paid" &&
+                            $invoice_status  !== "Cancelled" &&
+                            $invoice_status !== "Draft" &&
+                            $payment_provider_id &&
+                            (
+                                $payment_provider_threshold == 0 ||
+                                $payment_provider_threshold > $invoice_amount
+                            ) 
+                        ){ ?>
                         <button type="button" class="btn btn-sm btn-outline-success dropdown-toggle" data-toggle="dropdown"><i class="fa fa-fw fa-credit-card mr-2"></i>Pay</button>
                         <div class="dropdown-menu">
                             <a class="dropdown-item" href="//<?php echo $config_base_url ?>/guest/guest_pay_invoice_stripe.php?invoice_id=<?php echo "$invoice_id&url_key=$invoice_url_key"; ?>">Enter Card Manually</a>
diff --git a/cron/ticket_email_parser.php b/cron/ticket_email_parser.php
index 3b3b1cc4..34361c46 100644
--- a/cron/ticket_email_parser.php
+++ b/cron/ticket_email_parser.php
@@ -159,7 +159,7 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date
             $client_name = sanitizeInput($client_row['client_name']);
         }
         $email_subject = "$config_app_name - New Ticket - $client_name: $subject";
-        $email_body = "Hello, <br><br>This is a notification that a new ticket has been raised in ITFlow. <br>Client: $client_name<br>Priority: Low (email parsed)<br>Link: https://$config_base_url/user/ticket.php?ticket_id=$id <br><br>--------------------------------<br><br><b>$subject</b><br>$message";
+        $email_body = "Hello, <br><br>This is a notification that a new ticket has been raised in ITFlow. <br>Client: $client_name<br>Priority: Low (email parsed)<br>Link: https://$config_base_url/agent/ticket.php?ticket_id=$id <br><br>--------------------------------<br><br><b>$subject</b><br>$message";
 
         $data[] = [
             'from' => $config_ticket_from_email,
@@ -212,7 +212,7 @@ function addReply($from_email, $date, $subject, $ticket_number, $message, $attac
             $config_ticket_prefix_esc = mysqli_real_escape_string($mysqli, $config_ticket_prefix);
             $ticket_number_esc2 = mysqli_real_escape_string($mysqli, $ticket_number);
 
-            appNotify("Ticket", "Email parser: $from_email attempted to re-open ticket $config_ticket_prefix_esc$ticket_number_esc2 (ID $ticket_id) - check inbox manually to see email", "ticket.php?ticket_id=$ticket_id", $client_id);
+            appNotify("Ticket", "Email parser: $from_email attempted to re-open ticket $config_ticket_prefix_esc$ticket_number_esc2 (ID $ticket_id) - check inbox manually to see email", "/agent/ticket.php?ticket_id=$ticket_id", $client_id);
 
             $email_subject = "Action required: This ticket is already closed";
             $email_body = "Hi there, <br><br>You've tried to reply to a ticket that is closed - we won't see your response. <br><br>Please raise a new ticket by sending a new e-mail to our support address below. <br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
@@ -284,7 +284,7 @@ function addReply($from_email, $date, $subject, $ticket_number, $message, $attac
                 $tech_name = sanitizeInput($tech_row['user_name']);
 
                 $email_subject = "$config_app_name - Ticket updated - [$config_ticket_prefix$ticket_number] $ticket_subject";
-                $email_body    = "Hello $tech_name,<br><br>A new reply has been added to the below ticket, check ITFlow for full details.<br><br>Client: $client_name<br>Ticket: $config_ticket_prefix$ticket_number<br>Subject: $ticket_subject<br><br>https://$config_base_url/user/ticket.php?ticket_id=$ticket_id";
+                $email_body    = "Hello $tech_name,<br><br>A new reply has been added to the below ticket, check ITFlow for full details.<br><br>Client: $client_name<br>Ticket: $config_ticket_prefix$ticket_number<br>Subject: $ticket_subject<br><br>https://$config_base_url/agent/ticket.php?ticket_id=$ticket_id";
 
                 $data = [
                     [
diff --git a/custom/post/readme.php b/custom/post/readme.php
deleted file mode 100644
index bbfca6b4..00000000
--- a/custom/post/readme.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/*
-    - Custom Pages -
-
-    If you wish to add custom pages to ITFlow, add them to the xcustom folder in the root directory with the prefix "xcustom_"
-        e.g. If your page was called my_page_one, name it "xcustom/xcustom_my_page_one.php"
-    Note: If required, you can use the Custom Links module to have the page show on the user sidebar.
-
-    To process POST data via your custom pages, create a file in this directory (post/xcustom) named after your page (e.g. xcustom_my_page_one.php).
-    The relevant file will be automatically loaded upon a POST request based on the referer - your form just needs to target the standard root/post.php.
-
- */
diff --git a/custom/test.php b/custom/test.php
deleted file mode 100644
index 22e056ed..00000000
--- a/custom/test.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-require_once "../includes/inc_xcustom.php";
-?>
-
-    <!-- Breadcrumbs-->
-    <ol class="breadcrumb">
-        <li class="breadcrumb-item">
-            <a href="index.html">Dashboard</a>
-        </li>
-        <li class="breadcrumb-item active">Blank Page</li>
-    </ol>
-
-    <!-- Page Content -->
-    <h1>Blank Page</h1>
-    <hr>
-    <p>This is a great starting point for new custom pages.</p>
-
-<?php require_once "../includes/footer.php";
diff --git a/db.sql b/db.sql
index ee73d44d..8f3e0946 100644
--- a/db.sql
+++ b/db.sql
@@ -2210,6 +2210,59 @@ CREATE TABLE `software_files` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `software_key_asset_assignments`
+--
+
+DROP TABLE IF EXISTS `software_key_asset_assignments`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8mb4 */;
+CREATE TABLE `software_key_asset_assignments` (
+  `software_key_id` int(11) NOT NULL,
+  `asset_id` int(11) NOT NULL,
+  `software_key_assigned_at` datetime DEFAULT current_timestamp(),
+  PRIMARY KEY (`software_key_id`,`asset_id`),
+  KEY `asset_id` (`asset_id`),
+  CONSTRAINT `software_key_asset_assignments_ibfk_1` FOREIGN KEY (`software_key_id`) REFERENCES `software_keys` (`software_key_id`) ON DELETE CASCADE,
+  CONSTRAINT `software_key_asset_assignments_ibfk_2` FOREIGN KEY (`asset_id`) REFERENCES `assets` (`asset_id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `software_key_contact_assignments`
+--
+
+DROP TABLE IF EXISTS `software_key_contact_assignments`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8mb4 */;
+CREATE TABLE `software_key_contact_assignments` (
+  `software_key_id` int(11) NOT NULL,
+  `contact_id` int(11) NOT NULL,
+  `software_key_assigned_at` datetime DEFAULT current_timestamp(),
+  PRIMARY KEY (`software_key_id`,`contact_id`),
+  KEY `contact_id` (`contact_id`),
+  CONSTRAINT `software_key_contact_assignments_ibfk_1` FOREIGN KEY (`software_key_id`) REFERENCES `software_keys` (`software_key_id`) ON DELETE CASCADE,
+  CONSTRAINT `software_key_contact_assignments_ibfk_2` FOREIGN KEY (`contact_id`) REFERENCES `contacts` (`contact_id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `software_keys`
+--
+
+DROP TABLE IF EXISTS `software_keys`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8mb4 */;
+CREATE TABLE `software_keys` (
+  `software_key_id` int(11) NOT NULL AUTO_INCREMENT,
+  `software_key` varchar(400) NOT NULL,
+  `software_key_software_id` int(11) NOT NULL,
+  PRIMARY KEY (`software_key_id`),
+  KEY `software_key_software_id` (`software_key_software_id`),
+  CONSTRAINT `software_keys_ibfk_1` FOREIGN KEY (`software_key_software_id`) REFERENCES `software` (`software_id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `software_templates`
 --
@@ -2766,4 +2819,4 @@ CREATE TABLE `vendors` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2025-09-15 17:22:23
+-- Dump completed on 2025-09-25 17:24:06
diff --git a/functions.php b/functions.php
index 70c9117a..740a7d1b 100644
--- a/functions.php
+++ b/functions.php
@@ -1481,10 +1481,14 @@ function enforceAdminPermission() {
 }
 
 function customAction($trigger, $entity) {
+    $original_dir = getcwd(); // Save
+
     chdir(dirname(__FILE__));
     if (file_exists(__DIR__ . "/custom/custom_action_handler.php")) {
         include_once __DIR__ . "/custom/custom_action_handler.php";
     }
+
+    chdir($original_dir); // Restore original working directory
 }
 
 function appNotify($type, $details, $action = null, $client_id = 0, $entity_id = 0) {
diff --git a/guest/custom/readme.php b/guest/custom/readme.php
new file mode 100644
index 00000000..3919d43c
--- /dev/null
+++ b/guest/custom/readme.php
@@ -0,0 +1,9 @@
+<?php
+
+/*
+
+- Custom Pages -
+
+    If you wish to add custom pages to ITFlow, add them to this directory"
+
+*/
diff --git a/guest/guest_pay_invoice_stripe.php b/guest/guest_pay_invoice_stripe.php
index 34124a7a..21526022 100644
--- a/guest/guest_pay_invoice_stripe.php
+++ b/guest/guest_pay_invoice_stripe.php
@@ -242,7 +242,7 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent
     mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Paid', history_description = 'Online Payment added (client) - $ip - $os - $browser', history_invoice_id = $invoice_id");
 
     // Notify
-    appNotify("Invoice Paid", "Invoice $invoice_prefix$invoice_number has been paid by $client_name - $ip - $os - $browser", "invoice.php?invoice_id=$invoice_id", $pi_client_id);
+    appNotify("Invoice Paid", "Invoice $invoice_prefix$invoice_number has been paid by $client_name - $ip - $os - $browser", "/agent/invoice.php?invoice_id=$invoice_id", $pi_client_id);
 
     customAction('invoice_pay', $invoice_id);
 
diff --git a/guest/guest_post.php b/guest/guest_post.php
index 89defa40..800cee90 100644
--- a/guest/guest_post.php
+++ b/guest/guest_post.php
@@ -27,7 +27,7 @@ if (isset($_GET['accept_quote'], $_GET['url_key'])) {
         mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Accepted', history_description = 'Client accepted Quote!', history_quote_id = $quote_id");
 
         // Notification
-        appNotify("Quote Accepted", "Quote $quote_prefix$quote_number has been accepted by $client_name", "quote.php?quote_id=$quote_id", $client_id);
+        appNotify("Quote Accepted", "Quote $quote_prefix$quote_number has been accepted by $client_name", "/agent/quote.php?quote_id=$quote_id", $client_id);
         customAction('quote_accept', $quote_id);
 
         // Internal email notification
@@ -92,7 +92,7 @@ if (isset($_GET['decline_quote'], $_GET['url_key'])) {
         mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Declined', history_description = 'Client declined Quote!', history_quote_id = $quote_id");
 
         // Notification
-        appNotify("Quote Declined", "Quote $quote_prefix$quote_number has been declined by $client_name", "quote.php?quote_id=$quote_id", $client_id);
+        appNotify("Quote Declined", "Quote $quote_prefix$quote_number has been declined by $client_name", "/agent/quote.php?quote_id=$quote_id", $client_id);
         customAction('quote_decline', $quote_id);
 
         // Internal email notification
@@ -210,7 +210,7 @@ if (isset($_GET['add_ticket_feedback'], $_GET['url_key'])) {
             $ticket_prefix = sanitizeInput($ticket_details['ticket_prefix']);
             $ticket_number = intval($ticket_details['ticket_number']);
 
-            appNotify("Feedback", "Guest rated ticket number $ticket_prefix$ticket_number (ID: $ticket_id) as bad", "ticket.php?ticket_id=$ticket_id");
+            appNotify("Feedback", "Guest rated ticket number $ticket_prefix$ticket_number (ID: $ticket_id) as bad", "/agent/ticket.php?ticket_id=$ticket_id");
         }
 
         flash_alert("Feedback recorded - thank you");
@@ -727,7 +727,7 @@ if (isset($_POST['guest_quote_upload_file'])) {
                     // Logging & feedback
                     flash_alert('File uploaded!');
                     
-                    appNotify("Quote File", "$file_name was uploaded to quote $quote_prefix$quote_number", "quote.php?quote_id=$quote_id", $client_id);
+                    appNotify("Quote File", "$file_name was uploaded to quote $quote_prefix$quote_number", "/agent/quote.php?quote_id=$quote_id", $client_id);
                     
                     mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Upload', history_description = 'Client uploaded file $file_name', history_quote_id = $quote_id");
                     
diff --git a/guest/guest_view_invoice.php b/guest/guest_view_invoice.php
index 05879292..4e1ed287 100644
--- a/guest/guest_view_invoice.php
+++ b/guest/guest_view_invoice.php
@@ -112,7 +112,7 @@ mysqli_query($mysqli, "INSERT INTO history SET history_status = '$invoice_status
 
 if ($invoice_status !== 'Paid') {
     
-    appNotify("Invoice Viewed", "Invoice $invoice_prefix$invoice_number has been viewed by $client_name_escaped - $ip - $os - $browser", "invoice.php?invoice_id=$invoice_id", $client_id);
+    appNotify("Invoice Viewed", "Invoice $invoice_prefix$invoice_number has been viewed by $client_name_escaped - $ip - $os - $browser", "/agent/invoice.php?invoice_id=$invoice_id", $client_id);
     
 }
 $sql_payments = mysqli_query($mysqli, "SELECT * FROM payments, accounts WHERE payment_account_id = account_id AND payment_invoice_id = $invoice_id ORDER BY payments.payment_id DESC");
@@ -173,7 +173,15 @@ if ($balance > 0) {
                         <i class="fa fa-fw fa-download mr-2"></i>Download
                     </a>
                     <?php
-                    if ($invoice_status !== "Paid" && $invoice_status  !== "Cancelled" && $invoice_status !== "Draft" && $payment_provider_id) { ?>
+                    if ($invoice_status !== "Paid" &&
+                        $invoice_status  !== "Cancelled" &&
+                        $invoice_status !== "Draft" &&
+                        $payment_provider_id &&
+                        (
+                            $payment_provider_threshold == 0 ||
+                            $payment_provider_threshold > $invoice_amount
+                        ) 
+                    ){ ?>
                         <a class="btn btn-success" href="guest_pay_invoice_stripe.php?invoice_id=<?php echo $invoice_id; ?>&url_key=<?php echo $url_key; ?>"><i class="fa fa-fw fa-credit-card mr-2"></i>Pay Now </a>
                     <?php } ?>
                 </div>
diff --git a/guest/guest_view_item.php b/guest/guest_view_item.php
index 1a4ed46b..553da300 100644
--- a/guest/guest_view_item.php
+++ b/guest/guest_view_item.php
@@ -83,7 +83,7 @@ $client_id = intval($row['item_client_id']);
 $item_type_sql_escaped = sanitizeInput($row['item_type']);
 $item_recipient_sql_escaped = sanitizeInput($row['item_recipient']);
 
-appNotify("Share Viewed", "$item_type_sql_escaped has been viewed by $item_recipient_sql_escaped", "client_overview.php?client_id=$client_id", $client_id);
+appNotify("Share Viewed", "$item_type_sql_escaped has been viewed by $item_recipient_sql_escaped", "/agent/client_overview.php?client_id=$client_id", $client_id);
 
 ?>
 
diff --git a/guest/guest_view_quote.php b/guest/guest_view_quote.php
index 90c7c044..7497f654 100644
--- a/guest/guest_view_quote.php
+++ b/guest/guest_view_quote.php
@@ -112,7 +112,7 @@ mysqli_query($mysqli, "INSERT INTO history SET history_status = '$quote_status',
 
 if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Viewed") {
 
-    appNotify("Quote Viewed", "Quote $quote_prefix$quote_number has been viewed by $client_name_escaped - $ip - $os - $browser", "quote.php?quote_id=$quote_id", $client_id);
+    appNotify("Quote Viewed", "Quote $quote_prefix$quote_number has been viewed by $client_name_escaped - $ip - $os - $browser", "/agent/quote.php?quote_id=$quote_id", $client_id);
 }
 
 ?>
diff --git a/guest/includes/guest_footer.php b/guest/includes/guest_footer.php
index 1af14af2..8421428e 100644
--- a/guest/includes/guest_footer.php
+++ b/guest/includes/guest_footer.php
@@ -10,20 +10,20 @@
   <?php require_once "../includes/inc_confirm_modal.php"; ?>
 
   <!-- jQuery -->
-  <script src="../plugins/jquery/jquery.min.js"></script>
+  <script src="/plugins/jquery/jquery.min.js"></script>
   <!-- Bootstrap 4 -->
-  <script src="../plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
+  <script src="/plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
   <!-- AdminLTE App -->
-  <script src="../plugins/adminlte/js/adminlte.min.js"></script>
+  <script src="/plugins/adminlte/js/adminlte.min.js"></script>
   <!-- Custom js -->
-  <script src="../plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
-  <script src="../plugins/moment/moment.min.js"></script>
-  <script src='../plugins/daterangepicker/daterangepicker.js'></script>
-  <script src='../plugins/select2/js/select2.min.js'></script>
-  <script src='../plugins/inputmask/inputmask.min.js'></script>
-  <script src="../js/app.js"></script>
-  <script src="../js/pretty_content.js"></script>
-  <script src="../js/confirm_modal.js"></script>
+  <script src="/plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
+  <script src="/plugins/moment/moment.min.js"></script>
+  <script src='/plugins/daterangepicker/daterangepicker.js'></script>
+  <script src='/plugins/select2/js/select2.min.js'></script>
+  <script src='/plugins/inputmask/inputmask.min.js'></script>
+  <script src="/js/app.js"></script>
+  <script src="/js/pretty_content.js"></script>
+  <script src="/js/confirm_modal.js"></script>
 
   </body>
 </html>
diff --git a/guest/includes/guest_header.php b/guest/includes/guest_header.php
index 9efb5e7f..bc2a267e 100644
--- a/guest/includes/guest_header.php
+++ b/guest/includes/guest_header.php
@@ -37,19 +37,19 @@ $session_company_name = $row['company_name'];
     If Fav Icon exists else use the default one 
     -->
     <?php if(file_exists('../uploads/favicon.ico')) { ?>
-        <link rel="icon" type="image/x-icon" href="../uploads/favicon.ico">
+        <link rel="icon" type="image/x-icon" href="/uploads/favicon.ico">
     <?php } ?>
 
     <!-- Font Awesome Icons -->
-    <link rel="stylesheet" href="../plugins/fontawesome-free/css/all.min.css">
+    <link rel="stylesheet" href="/plugins/fontawesome-free/css/all.min.css">
     <!-- Theme style -->
-    <link rel="stylesheet" href="../plugins/adminlte/css/adminlte.min.css">
+    <link rel="stylesheet" href="/plugins/adminlte/css/adminlte.min.css">
 
     <!-- Custom Style Sheet -->
-    <link href="../plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
-    <link href="../plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
-    <link href="../plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
-    <link href='../plugins/daterangepicker/daterangepicker.css' rel='stylesheet' />
+    <link href="/plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
+    <link href="/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
+    <link href="/plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
+    <link href='/plugins/daterangepicker/daterangepicker.css' rel='stylesheet' />
 
 </head>
 <body class="layout-top-nav">
diff --git a/guest/index.php b/guest/index.php
index f403a675..ad3bed58 100644
--- a/guest/index.php
+++ b/guest/index.php
@@ -1,3 +1,3 @@
 <?php 
 // Redirect to the portal
-header("Location: ../client/");
+header("Location: /client");
diff --git a/includes/app_version.php b/includes/app_version.php
index 4bb89458..5055c138 100644
--- a/includes/app_version.php
+++ b/includes/app_version.php
@@ -5,4 +5,4 @@
  * Update this file each time we merge develop into master. Format is YY.MM (add a .v if there is more than one release a month.
  */
 
-DEFINE("APP_VERSION", "25.09.2");
+DEFINE("APP_VERSION", "25.10");
diff --git a/includes/auth_check.php b/includes/auth_check.php
index 442c8acc..8ebd0e9f 100644
--- a/includes/auth_check.php
+++ b/includes/auth_check.php
@@ -3,9 +3,9 @@
 // Check user is logged in with a valid session
 if (!isset($_SESSION['logged']) || !$_SESSION['logged']) {
     if ($_SERVER["REQUEST_URI"] == "/") {
-        header("Location: ../login.php");
+        header("Location: /login.php");
     } else {
-        header("Location: ../login.php?last_visited=" . base64_encode($_SERVER["REQUEST_URI"]) );
+        header("Location: /login.php?last_visited=" . base64_encode($_SERVER["REQUEST_URI"]) );
     }
     exit;
 }
diff --git a/includes/database_version.php b/includes/database_version.php
index fed44bcb..d83815ec 100644
--- a/includes/database_version.php
+++ b/includes/database_version.php
@@ -5,4 +5,4 @@
  * It is used in conjunction with database_updates.php
  */
 
-DEFINE("LATEST_DATABASE_VERSION", "2.3.4");
+DEFINE("LATEST_DATABASE_VERSION", "2.3.5");
diff --git a/includes/footer.php b/includes/footer.php
index 8800ddac..827b0ead 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -19,27 +19,27 @@ if (basename(dirname($_SERVER['REQUEST_URI'])) === 'admin') { ?>
 <!-- REQUIRED SCRIPTS -->
 
 <!-- Bootstrap 4 -->
-<script src="../plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
+<script src="/plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
 
 <!-- Custom js-->
-<script src="../plugins/moment/moment.min.js"></script>
-<script src="../plugins/chart.js/chart.umd.min.js"></script>
-<script src="../plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
-<script src="../plugins/daterangepicker/daterangepicker.js"></script>
-<script src="../plugins/select2/js/select2.min.js"></script>
-<script src="../plugins/inputmask/jquery.inputmask.min.js"></script>
-<script src="../plugins/tinymce/tinymce.min.js" referrerpolicy="origin"></script>
-<script src="../plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
-<script src="../plugins/clipboardjs/clipboard.min.js"></script>
-<script src="../js/keepalive.js"></script>
-<script src="../plugins/DataTables/datatables.min.js"></script>
-<script src="../plugins/intl-tel-input/js/intlTelInput.min.js"></script>
+<script src="/plugins/moment/moment.min.js"></script>
+<script src="/plugins/chart.js/chart.umd.min.js"></script>
+<script src="/plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
+<script src="/plugins/daterangepicker/daterangepicker.js"></script>
+<script src="/plugins/select2/js/select2.min.js"></script>
+<script src="/plugins/inputmask/jquery.inputmask.min.js"></script>
+<script src="/plugins/tinymce/tinymce.min.js" referrerpolicy="origin"></script>
+<script src="/plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
+<script src="/plugins/clipboardjs/clipboard.min.js"></script>
+<script src="/js/keepalive.js"></script>
+<script src="/plugins/DataTables/datatables.min.js"></script>
+<script src="/plugins/intl-tel-input/js/intlTelInput.min.js"></script>
 
 <!-- AdminLTE App -->
-<script src="../plugins/adminlte/js/adminlte.min.js"></script>
-<script src="../js/app.js"></script>
-<script src="../js/ajax_modal.js"></script>
-<script src="../js/confirm_modal.js"></script>
+<script src="/plugins/adminlte/js/adminlte.min.js"></script>
+<script src="/js/app.js"></script>
+<script src="/js/ajax_modal.js"></script>
+<script src="/js/confirm_modal.js"></script>
 
 </body>
 </html>
diff --git a/includes/header.php b/includes/header.php
index 835da821..2a9a49d6 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -19,27 +19,27 @@ header("X-Frame-Options: DENY");
     <title><?= $session_company_name; ?></title>
 
     <!-- Favicon -->
-    <?php if(file_exists('../uploads/favicon.ico')): ?>
-        <link rel="icon" type="image/x-icon" href="../uploads/favicon.ico">
+    <?php if(file_exists(__DIR__ . '../uploads/favicon.ico')): ?>
+        <link rel="icon" type="image/x-icon" href="/uploads/favicon.ico">
     <?php endif; ?>
 
     <!-- Font Awesome -->
-    <link rel="stylesheet" href="../plugins/fontawesome-free/css/all.min.css">
+    <link rel="stylesheet" href="/plugins/fontawesome-free/css/all.min.css">
 
     <!-- Custom Styles -->
-    <link href="../plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
-    <link href="../plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
-    <link href="../plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
-    <link href="../plugins/daterangepicker/daterangepicker.css" rel="stylesheet">
-    <link href="../plugins/toastr/toastr.min.css" rel="stylesheet">
-    <link href="../plugins/DataTables/datatables.min.css" rel="stylesheet">
-    <link href="../plugins/intl-tel-input/css/intlTelInput.min.css" rel="stylesheet">
-    <link href="../css/itflow_custom.css" rel="stylesheet">
-    <link rel="stylesheet" href="../plugins/adminlte/css/adminlte.min.css">
+    <link rel="stylesheet" href="/plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" >
+    <link rel="stylesheet" href="/plugins/select2/css/select2.min.css">
+    <link rel="stylesheet" href="/plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css">
+    <link rel="stylesheet" href="/plugins/daterangepicker/daterangepicker.css">
+    <link rel="stylesheet" href="/plugins/toastr/toastr.min.css">
+    <link rel="stylesheet" href="/plugins/DataTables/datatables.min.css">
+    <link rel="stylesheet" href="/plugins/intl-tel-input/css/intlTelInput.min.css">
+    <link rel="stylesheet" href="/css/itflow_custom.css">
+    <link rel="stylesheet" href="/plugins/adminlte/css/adminlte.min.css">
 
     <!-- Scripts -->
-    <script src="../plugins/jquery/jquery.min.js"></script>
-    <script src="../plugins/toastr/toastr.min.js"></script>
+    <script src="/plugins/jquery/jquery.min.js"></script>
+    <script src="/plugins/toastr/toastr.min.js"></script>
 </head>
 <body class="
     hold-transition sidebar-mini layout-fixed layout-navbar-fixed 
diff --git a/includes/inc_debug.php b/includes/inc_debug.php
deleted file mode 100644
index b9b52aaf..00000000
--- a/includes/inc_debug.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-ini_set('display_errors', 1);
-ini_set('display_startup_errors', 1);
-error_reporting(E_ALL);
\ No newline at end of file
diff --git a/includes/load_user_session.php b/includes/load_user_session.php
index d1852160..27fdec97 100644
--- a/includes/load_user_session.php
+++ b/includes/load_user_session.php
@@ -29,8 +29,7 @@ $user_config_theme_dark = intval($row['user_config_theme_dark']);
 if ($session_user_type !== 1) {
     session_unset();
     session_destroy();
-    header("Location: ../login.php");
-    exit;
+    redirect("/client/login.php");
 }
 
 // Load user client permissions
diff --git a/includes/modal_footer.php b/includes/modal_footer.php
index 852f792f..831dd7bf 100644
--- a/includes/modal_footer.php
+++ b/includes/modal_footer.php
@@ -1,5 +1,5 @@
-<script src="../../../js/app.js"></script>
-<script src="../../../plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
+<script src="/js/app.js"></script>
+<script src="/plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
 
 <?php
     $content = ob_get_clean();
diff --git a/includes/page_title.php b/includes/page_title.php
index 91a3506b..b3d57707 100644
--- a/includes/page_title.php
+++ b/includes/page_title.php
@@ -5,18 +5,7 @@
 // Get the current page name without the .php extension
 $page_title = basename($_SERVER['PHP_SELF'], '.php');
 
-// Remove 'client_' from the page name
-$page_title = str_replace('client_', '', $page_title);
-
-// Remove 'report_' from the page name
-$page_title = str_replace('report_', '', $page_title);
-
-// Remove 'admin_' from the page name
-$page_title = str_replace('admin_', '', $page_title);
-
-// Remove 'admin_' from the page name
-$page_title = str_replace('settings_', '', $page_title);
-
+// Lets make the Page title look pretty
 // Replace any underscores with spaces
 $page_title = str_replace('_', ' ', $page_title);
 
diff --git a/includes/redirect_if_setup_enabled.php b/includes/redirect_if_setup_enabled.php
index 8d834d66..a0249bea 100644
--- a/includes/redirect_if_setup_enabled.php
+++ b/includes/redirect_if_setup_enabled.php
@@ -1,6 +1,5 @@
 <?php
 
 if (!isset($config_enable_setup) || $config_enable_setup == 1) {
-    header("Location: /setup");
-    exit;
+    redirect("/setup");
 }
diff --git a/includes/router.php b/includes/router.php
deleted file mode 100644
index 31cd8e7a..00000000
--- a/includes/router.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-// URI Router
-// Currently unused, but the idea is to dynamically prepend ../../ to asset paths (like includes, libraries, etc.)
-// based on the current directory depth. This allows us to support deeply nested folder structures.
-
-$depth = min(substr_count(trim($_SERVER['REQUEST_URI'], '/'), '/'), 3);
-$path_prefix = str_repeat('../', $depth);
diff --git a/includes/settings_localization_array.php b/includes/settings_localization_array.php
index 6a1c4337..926c49d3 100644
--- a/includes/settings_localization_array.php
+++ b/includes/settings_localization_array.php
@@ -66,6 +66,7 @@ $countries_array = array(
     "Georgia",
     "Germany",
     "Ghana",
+    "Gibraltar",
     "Greece",
     "Grenada",
     "Guatemala",
diff --git a/includes/top_nav.php b/includes/top_nav.php
index 630ccf6b..e01fa235 100644
--- a/includes/top_nav.php
+++ b/includes/top_nav.php
@@ -12,7 +12,7 @@
     <ul class="navbar-nav ml-auto">
 
         <!-- SEARCH FORM -->
-        <form class="form-inline" action="../user/global_search.php">
+        <form class="form-inline" action="/agent/global_search.php">
             <div class="input-group input-group-sm">
                 <input class="form-control form-control-navbar" type="search" placeholder="Search everywhere" name="query"
                     value="<?php if (isset($_GET['query'])) { echo nullable_htmlentities($_GET['query']); } ?>">
@@ -64,7 +64,7 @@
         ?>
 
         <li class="nav-item">
-            <a class="nav-link ajax-modal" href="#" data-modal-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;">
@@ -79,7 +79,7 @@
                 <?php if (empty($session_avatar)) { ?>
                 <i class="fas fa-user-circle mr-1"></i>
                 <?php }else{ ?>
-                <img src="<?php echo "../uploads/users/$session_user_id/$session_avatar"; ?>"
+                <img src="<?php echo "/uploads/users/$session_user_id/$session_avatar"; ?>"
                     class="user-image img-circle">
                 <?php } ?>
                 <span
@@ -92,7 +92,7 @@
                     <i class="fas fa-user-circle fa-6x"></i>
                     <?php }else{ ?>
 
-                    <img src="<?php echo "../uploads/users/$session_user_id/$session_avatar"; ?>" class="img-circle">
+                    <img src="<?php echo "/uploads/users/$session_user_id/$session_avatar"; ?>" class="img-circle">
                     <?php } ?>
                     <p>
                         <?php echo stripslashes(nullable_htmlentities($session_name)); ?>
@@ -102,10 +102,10 @@
                 <!-- Menu Footer-->
                 <li class="user-footer">
                     <?php if ($session_is_admin) { ?>
-                        <a href="../admin" class="btn btn-default btn-block btn-flat mb-2"><i class="fas fa-user-shield mr-2"></i>Administration</a>
+                        <a href="/admin" class="btn btn-default btn-block btn-flat mb-2"><i class="fas fa-user-shield mr-2"></i>Administration</a>
                     <?php } ?>
-                    <a href="../user/user_details.php" class="btn btn-default btn-flat"><i class="fas fa-user-cog mr-2"></i>Account</a>
-                    <a href="post.php?logout" class="btn btn-default btn-flat float-right"><i class="fas fa-sign-out-alt mr-2"></i>Logout</a>
+                    <a href="/agent/user/user_details.php" class="btn btn-default btn-flat"><i class="fas fa-user-cog mr-2"></i>Account</a>
+                    <a href="/agent/post.php?logout" class="btn btn-default btn-flat float-right"><i class="fas fa-sign-out-alt mr-2"></i>Logout</a>
                 </li>
             </ul>
         </li>
diff --git a/index.php b/index.php
index 36e1df46..dac0e37c 100644
--- a/index.php
+++ b/index.php
@@ -1,10 +1,27 @@
-<?php 
+<?php
 
+
+// App setup is complete?
 if (file_exists("config.php")) {
-    //require_once "includes/check_login.php";
+    require_once "config.php";
+    require_once "includes/session_init.php";
 
-    header("Location: /user/$config_start_page");
+    // If they are an app user, send them to their start page
+    if (isset($_SESSION['logged'])) {
+        require_once "includes/load_global_settings.php";
+        header("Location: /agent/$config_start_page");
 
+    // If they're a client, send them to the client area
+    } elseif (isset($_SESSION['client_logged_in'])) {
+        header("Location: /client/");
+
+    // Else, require login
+    } else {
+        header("Location: /login.php");
+    }
+
+
+// Installation needs to be completed
 } else {
 	header("Location: /setup");
     exit();
diff --git a/js/keepalive.js b/js/keepalive.js
index d8a2f425..493dfc3e 100644
--- a/js/keepalive.js
+++ b/js/keepalive.js
@@ -1,11 +1,11 @@
 // Keep PHP sessions alive
-// Sends requests to keepalive.php in the background every 10 mins to prevent PHP garbage collection ending sessions
+// Sends requests to keepalive.php in the background every 8 mins to prevent PHP garbage collection ending sessions
 
 function keep_alive() {
 
     //Send a GET request to keepalive.php as keepalive.php?keepalive
     jQuery.get(
-        "keepalive.php",
+        "/keepalive.php",
         {keepalive: 'true'},
         function(data) {
             // Don't care about a response
@@ -14,5 +14,5 @@ function keep_alive() {
 
 }
 
-// Run every 10 mins
-setInterval(keep_alive, 600000);
+// Run every 8 mins
+setInterval(keep_alive, 480000);
diff --git a/keepalive.php b/keepalive.php
index 1e761209..63df5d4d 100644
--- a/keepalive.php
+++ b/keepalive.php
@@ -1,7 +1,7 @@
 <?php
 
 // Keep PHP sessions alive
-// Receives requests via AJAX in the background every 10 mins to prevent PHP garbage collection ending sessions
+// Receives requests via AJAX in the background every 8 mins to prevent PHP garbage collection ending sessions
 //  See footer.php & js/keepalive.js
 
 session_start();
diff --git a/login.php b/login.php
index c18c003f..7be23041 100644
--- a/login.php
+++ b/login.php
@@ -4,7 +4,7 @@
 header("Content-Security-Policy: default-src 'self'");
 
 if (!file_exists('config.php')) {
-    redirect("setup");
+    header("Location: /setup"); //must use header instead of redirect as functions isnt included yet.
 }
 
 require_once "config.php";
@@ -195,7 +195,7 @@ if (isset($_POST['login'])) {
 
             // Forcing MFA
             if ($force_mfa == 1 && $token == NULL) {
-                $config_start_page = "mfa_enforcement.php";
+                $config_start_page = "user/mfa_enforcement.php";
             }
 
             // Setup encryption session key
@@ -218,7 +218,7 @@ if (isset($_POST['login'])) {
             if (isset($_GET['last_visited'])) {
                 redirect($_SERVER["REQUEST_SCHEME"] . "://" . $config_base_url . base64_decode($_GET['last_visited']) );
             } else {
-                redirect("user/$config_start_page");
+                redirect("agent/$config_start_page");
             }
         } else {
 
diff --git a/modals/notifications.php b/modals/notifications.php
index b2d961bd..5bd0b39d 100644
--- a/modals/notifications.php
+++ b/modals/notifications.php
@@ -81,16 +81,16 @@ ob_start();
 <div class="modal-footer">
     <?php if ($num_notifications) { ?>
     
-    <a href="post.php?dismiss_all_notifications&csrf_token=<?php echo $_SESSION[
+    <a href="/agent/post.php?dismiss_all_notifications&csrf_token=<?php echo $_SESSION[
         "csrf_token"
     ]; ?>" class="btn btn-primary">
         <span class="text-white text-bold"><i class="fas fa-check mr-2"></i>Dismiss all</span>
     </a>
-    <a href="notifications.php" class="btn btn-secondary">
+    <a href="/agent/notifications.php" class="btn btn-secondary">
         <span class="text-white">See all Notifications</span>
     </a>
     <?php } else { ?>
-    <a href="notifications.php?dismissed" class="btn btn-dark">
+    <a href="/agent/notifications.php?dismissed" class="btn btn-dark">
         <span class="text-white text-bold">See Dismissed Notifications</span>
     </a>
     <?php } ?>
diff --git a/post/logout.php b/post/logout.php
index 74c9598f..4c369c1b 100644
--- a/post/logout.php
+++ b/post/logout.php
@@ -24,9 +24,9 @@ if (isset($_GET['logout'])) {
     session_destroy();
 
     if ($config_login_key_required == 1) {
-        header('Location: ../login.php?key=' . $config_login_key_secret);
+        header('Location: ../../login.php?key=' . $config_login_key_secret);
     } else {
-        header('Location: ../login.php');
+        header('Location: ../../login.php');
     }
 }
 
diff --git a/scripts/cron.php b/scripts/cron.php
index ef54bec8..14d34a9a 100644
--- a/scripts/cron.php
+++ b/scripts/cron.php
@@ -160,7 +160,7 @@ while ($row = mysqli_fetch_array($sql)) {
 // Whitelabel - Disable if expired/invalid
 if ($config_whitelabel_enabled && !validateWhitelabelKey($config_whitelabel_key)) {
     mysqli_query($mysqli, "UPDATE settings SET config_whitelabel_enabled = 0, config_whitelabel_key = '' WHERE company_id = 1");
-    appNotify("Settings", "White-labelling was disabled due to expired/invalid key", "settings_modules.php");
+    appNotify("Settings", "White-labelling was disabled due to expired/invalid key", "/admin/settings_modules.php");
 }
 
 
@@ -189,7 +189,7 @@ if ($config_enable_alert_domain_expire == 1) {
             $client_id = intval($row['client_id']);
             $client_name = sanitizeInput($row['client_name']);
 
-            appNotify("Domain Expiring", "Domain $domain_name for $client_name will expire in $day Days on $domain_expire", "domains.php?client_id=$client_id", $client_id);
+            appNotify("Domain Expiring", "Domain $domain_name for $client_name will expire in $day Days on $domain_expire", "/agent/domains.php?client_id=$client_id", $client_id);
 
         }
 
@@ -234,12 +234,12 @@ foreach ($certificateAlertArray as $day) {
 
             } else {
                 // This certificate is either expiring in 1 or 7 days or is a non-LE certificate expiring in 45 days
-                appNotify("Certificate Expiring", "Certificate $certificate_name for $client_name will expire in $day day(s) on $certificate_expire", "certificates.php?client_id=$client_id", $client_id);
+                appNotify("Certificate Expiring", "Certificate $certificate_name for $client_name will expire in $day day(s) on $certificate_expire", "/agent/certificates.php?client_id=$client_id", $client_id);
             }
 
         } else {
             // No public key - notify anyway as we can't check the validity period
-            appNotify("Certificate Expiring", "Certificate $certificate_name for $client_name will expire in $day day(s) on $certificate_expire", "certificates.php?client_id=$client_id", $client_id);
+            appNotify("Certificate Expiring", "Certificate $certificate_name for $client_name will expire in $day day(s) on $certificate_expire", "/agent/certificates.php?client_id=$client_id", $client_id);
         }
 
     }
@@ -269,7 +269,7 @@ foreach ($warranty_alert_array as $day) {
         $client_id = intval($row['client_id']);
         $client_name = sanitizeInput($row['client_name']);
 
-        appNotify("Asset Warranty Expiring", "Asset $asset_name warranty for $client_name will expire in $day Days on $asset_warranty_expire", "assets.php?client_id=$client_id", $client_id);
+        appNotify("Asset Warranty Expiring", "Asset $asset_name warranty for $client_name will expire in $day Days on $asset_warranty_expire", "/agent/assets.php?client_id=$client_id", $client_id);
 
     }
 
@@ -285,7 +285,7 @@ $tickets_pending_assignment = mysqli_num_rows($sql_tickets_pending_assignment);
 
 if ($tickets_pending_assignment > 0) {
 
-    appNotify("Pending Tickets", "There are $tickets_pending_assignment new tickets pending assignment", "tickets.php?status=New");
+    appNotify("Pending Tickets", "There are $tickets_pending_assignment new tickets pending assignment", "/agent/tickets.php?status=New");
 
     // Logging
     logApp("Cron", "info", "Cron created notifications for new tickets that are pending assignment");
@@ -388,7 +388,7 @@ if (mysqli_num_rows($sql_recurring_tickets) > 0) {
         if (filter_var($config_ticket_new_ticket_notification_email, FILTER_VALIDATE_EMAIL)) {
 
             $email_subject = "ITFlow - New Recurring Ticket - $client_name: $ticket_subject";
-            $email_body = "Hello, <br><br>This is a notification that a recurring (scheduled) ticket has been raised in ITFlow. <br>Ticket: $ticket_prefix$ticket_number<br>Client: $client_name<br>Priority: $priority<br>Link: https://$config_base_url/user/ticket.php?ticket_id=$id <br><br>--------------------------------<br><br><b>$ticket_subject</b><br>$ticket_details";
+            $email_body = "Hello, <br><br>This is a notification that a recurring (scheduled) ticket has been raised in ITFlow. <br>Ticket: $ticket_prefix$ticket_number<br>Client: $client_name<br>Priority: $priority<br>Link: https://$config_base_url/agent/ticket.php?ticket_id=$id <br><br>--------------------------------<br><br><b>$ticket_subject</b><br>$ticket_details";
 
             $email = [
                     'from' => $config_ticket_from_email,
@@ -435,7 +435,7 @@ if (mysqli_num_rows($sql_recurring_tickets) > 0) {
 $sql_invalid_recurring_tickets = mysqli_query($mysqli, "SELECT * FROM recurring_tickets WHERE recurring_ticket_next_run < CURDATE()");
 while ($row = mysqli_fetch_array($sql_invalid_recurring_tickets)) {
     $subject = sanitizeInput($row['recurring_ticket_subject']);
-    appNotify("Ticket", "Recurring ticket $subject next run date is in the past!", "recurring_tickets.php");
+    appNotify("Ticket", "Recurring ticket $subject next run date is in the past!", "/agent/recurring_tickets.php");
 }
 
 // Logging
@@ -523,11 +523,11 @@ if ($config_send_invoice_reminders == 1) {
 
                 mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Cron applied a late fee of $late_fee_amount', history_invoice_id = $invoice_id");
 
-                appNotify("Invoice Late Charge", "Invoice $invoice_prefix$invoice_number for $client_name in the amount of $invoice_amount was charged a late fee of $late_fee_amount", "invoice.php?invoice_id=$invoice_id", $client_id);
+                appNotify("Invoice Late Charge", "Invoice $invoice_prefix$invoice_number for $client_name in the amount of $invoice_amount was charged a late fee of $late_fee_amount", "/agent/invoice.php?invoice_id=$invoice_id", $client_id);
 
             }
 
-            appNotify("Invoice Overdue", "Invoice $invoice_prefix$invoice_number for $client_name in the amount of $invoice_amount is overdue by $day days", "invoice.php?invoice_id=$invoice_id", $client_id);
+            appNotify("Invoice Overdue", "Invoice $invoice_prefix$invoice_number for $client_name in the amount of $invoice_amount is overdue by $day days", "/agent/invoice.php?invoice_id=$invoice_id", $client_id);
 
             $subject = "Overdue Invoice $invoice_prefix$invoice_number";
             $body = "Hello $contact_name,<br><br>Our records indicate that we have not yet received payment for the invoice $invoice_prefix$invoice_number. We kindly request that you submit your payment as soon as possible. If you have any questions or concerns, please do not hesitate to contact us at $company_email or $company_phone.
@@ -633,7 +633,7 @@ while ($row = mysqli_fetch_array($sql_recurring_invoices)) {
 
     mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Sent', history_description = 'Invoice Generated from Recurring!', history_invoice_id = $new_invoice_id");
 
-    appNotify("Recurring Sent", "Recurring Invoice $config_invoice_prefix$new_invoice_number for $client_name Sent", "invoice.php?invoice_id=$new_invoice_id", $client_id);
+    appNotify("Recurring Sent", "Recurring Invoice $config_invoice_prefix$new_invoice_number for $client_name Sent", "/agent/invoice.php?invoice_id=$new_invoice_id", $client_id);
 
     customAction('invoice_create', $new_invoice_id);
 
@@ -726,7 +726,7 @@ $sql_invalid_recurring_invoices = mysqli_query($mysqli, "SELECT * FROM recurring
 while ($row = mysqli_fetch_array($sql_invalid_recurring_invoices)) {
     $invoice_prefix = sanitizeInput($row['recurring_invoice_prefix']);
     $invoice_number = intval($row['recurring_invoice_number']);
-    appNotify("Invoice", "Recurring invoice $invoice_prefix$invoice_number next run date is in the past!", "recurring_invoices.php");
+    appNotify("Invoice", "Recurring invoice $invoice_prefix$invoice_number next run date is in the past!", "/agent/recurring_invoices.php");
 }
 // End Flag any active recurring "next run" dates that are in the past
 
@@ -889,7 +889,7 @@ while ($row = mysqli_fetch_array($sql_recurring_payments)) {
 
                     // LOGGING
                     $extended_log_desc = !$pi_livemode ? '(DEV MODE)' : '';
-                    appNotify("Invoice Paid", "Invoice $invoice_prefix$invoice_number automatically paid", "invoice.php?invoice_id=$invoice_id", $client_id);
+                    appNotify("Invoice Paid", "Invoice $invoice_prefix$invoice_number automatically paid", "/agent/invoice.php?invoice_id=$invoice_id", $client_id);
                     logAction("Invoice", "Payment", "Auto Stripe payment amount of " . numfmt_format_currency($currency_format, $invoice_amount, $recurring_payment_currency_code) . " added to invoice $invoice_prefix$invoice_number - $pi_id $extended_log_desc", $client_id, $invoice_id);
                     customAction('invoice_pay', $invoice_id);
 
@@ -944,7 +944,7 @@ while ($row = mysqli_fetch_array($sql_recurring_expenses)) {
 
     $expense_id = mysqli_insert_id($mysqli);
 
-    appNotify("Expense Created", "Expense $recurring_expense_description created from recurring expenses", "expenses.php", $recurring_expense_client_id);
+    appNotify("Expense Created", "Expense $recurring_expense_description created from recurring expenses", "/agent/expenses.php", $recurring_expense_client_id);
 
     // Update recurring dates using calculated next billing date
 
@@ -957,7 +957,7 @@ while ($row = mysqli_fetch_array($sql_recurring_expenses)) {
 $sql_invalid_recurring_expenses = mysqli_query($mysqli, "SELECT * FROM recurring_expenses WHERE recurring_expense_next_date < CURDATE() AND recurring_expense_status = 1");
 while ($row = mysqli_fetch_array($sql_invalid_recurring_expenses)) {
     $recurring_expense_description = sanitizeInput($row['recurring_expense_description']);
-    appNotify("Expense", "Recurring expense $recurring_expense_description next run date is in the past!", "recurring_expenses.php");
+    appNotify("Expense", "Recurring expense $recurring_expense_description next run date is in the past!", "/agent/recurring_expenses.php");
 }
 
 // Logging
@@ -1220,7 +1220,7 @@ $update_message = $updates->update_message;
 
 if ($updates->current_version !== $updates->latest_version) {
     // Send Alert to inform Updates Available
-    appNotify("Update", "$update_message", "admin_update.php");
+    appNotify("Update", "$update_message", "/admin/update.php");
 }
 
 
@@ -1232,7 +1232,7 @@ if ($updates->current_version !== $updates->latest_version) {
  */
 
 // Send Alert to inform Cron was run
-appNotify("Cron", "Cron successfully executed", "admin_audit_log.php");
+appNotify("Cron", "Cron successfully executed", "/admin/audit_log.php");
 
 // Logging
 logApp("Cron", "info", "Cron executed successfully");
diff --git a/scripts/cron_ticket_email_parser.php b/scripts/cron_ticket_email_parser.php
index 72300f83..f5ad0b04 100644
--- a/scripts/cron_ticket_email_parser.php
+++ b/scripts/cron_ticket_email_parser.php
@@ -174,7 +174,7 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date
             $client_name = sanitizeInput($client_row['client_name']);
         }
         $email_subject = "$config_app_name - New Ticket - $client_name: $subject";
-        $email_body = "Hello, <br><br>This is a notification that a new ticket has been raised in ITFlow. <br>Client: $client_name<br>Priority: Low (email parsed)<br>Link: https://$config_base_url/user/ticket.php?ticket_id=$id <br><br>--------------------------------<br><br><b>$subject</b><br>$message";
+        $email_body = "Hello, <br><br>This is a notification that a new ticket has been raised in ITFlow. <br>Client: $client_name<br>Priority: Low (email parsed)<br>Link: https://$config_base_url/agent/ticket.php?ticket_id=$id <br><br>--------------------------------<br><br><b>$subject</b><br>$message";
 
         $data[] = [
             'from' => $config_ticket_from_email,
@@ -232,7 +232,7 @@ function addReply($from_email, $date, $subject, $ticket_number, $message, $attac
             $config_ticket_prefix_esc = mysqli_real_escape_string($mysqli, $config_ticket_prefix);
             $ticket_number_esc = mysqli_real_escape_string($mysqli, $ticket_number);
 
-            appNotify("Ticket", "Email parser: $from_email attempted to re-open ticket $config_ticket_prefix_esc$ticket_number_esc (ID $ticket_id) - check inbox manually to see email", "ticket.php?ticket_id=$ticket_id", $client_id);
+            appNotify("Ticket", "Email parser: $from_email attempted to re-open ticket $config_ticket_prefix_esc$ticket_number_esc (ID $ticket_id) - check inbox manually to see email", "/agent/ticket.php?ticket_id=$ticket_id", $client_id);
 
             $email_subject = "Action required: This ticket is already closed";
             $email_body = "Hi there, <br><br>You've tried to reply to a ticket that is closed - we won't see your response. <br><br>Please raise a new ticket by sending a new e-mail to our support address below. <br><br>--<br>$company_name - Support<br>$config_ticket_from_email<br>$company_phone";
@@ -306,7 +306,7 @@ function addReply($from_email, $date, $subject, $ticket_number, $message, $attac
                 $tech_name = sanitizeInput($tech_row['user_name']);
 
                 $email_subject = "$config_app_name - Ticket updated - [$config_ticket_prefix$ticket_number] $ticket_subject";
-                $email_body    = "Hello $tech_name,<br><br>A new reply has been added to the below ticket, check ITFlow for full details.<br><br>Client: $client_name<br>Ticket: $config_ticket_prefix$ticket_number<br>Subject: $ticket_subject<br><br>https://$config_base_url/user/ticket.php?ticket_id=$ticket_id";
+                $email_body    = "Hello $tech_name,<br><br>A new reply has been added to the below ticket, check ITFlow for full details.<br><br>Client: $client_name<br>Ticket: $config_ticket_prefix$ticket_number<br>Subject: $ticket_subject<br><br>https://$config_base_url/agent/ticket.php?ticket_id=$ticket_id";
 
                 $data = [
                     [
diff --git a/setup/index.php b/setup/index.php
index 8eb15fc8..bd30655c 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -13,7 +13,7 @@ if (!isset($config_enable_setup)) {
 }
 
 if ($config_enable_setup == 0) {
-    header("Location: ../login.php");
+    header("Location: /login.php");
     exit;
 }
 
@@ -203,7 +203,7 @@ if (isset($_POST['restore'])) {
     }
 
     // === 5. Restore uploads directory ===
-    $uploadDir = __DIR__ . "../uploads/";
+    $uploadDir = __DIR__ . "/../uploads/";
     $uploadsZip = "$tempDir/uploads.zip";
 
     if (file_exists($uploadsZip)) {
@@ -440,7 +440,7 @@ if (isset($_POST['add_company_settings'])) {
     // Payment Methods
     mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = 'Cash'");
     mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = 'Check'");
-    mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = 'ACH'");
+    mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = 'Bank Transfer'");
     mysqli_query($mysqli,"INSERT INTO payment_methods SET payment_method_name = 'Credit Card'");
 
     // Default Calendar
@@ -582,12 +582,12 @@ if (isset($_POST['add_telemetry'])) {
     <title>ITFlow Setup</title>
 
     <!-- Font Awesome Icons -->
-    <link rel="stylesheet" href="../plugins/fontawesome-free/css/all.min.css">
+    <link rel="stylesheet" href="/plugins/fontawesome-free/css/all.min.css">
     <!-- Theme style -->
-    <link rel="stylesheet" href="../plugins/adminlte/css/adminlte.min.css">
+    <link rel="stylesheet" href="/plugins/adminlte/css/adminlte.min.css">
     <!-- Custom Style Sheet -->
-    <link href="../plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
-    <link href="../plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
+    <link href="/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
+    <link href="/plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
 
 </head>
 
@@ -712,8 +712,6 @@ if (isset($_POST['add_telemetry'])) {
                     // Section: PHP Extensions
                     $phpExtensions = [];
                     $extensions = [
-                        'php-mailparse' => 'mailparse',
-                        'php-imap' => 'imap',
                         'php-mysqli' => 'mysqli',
                         'php-intl' => 'intl',
                         'php-curl' => 'curl',
@@ -1020,7 +1018,7 @@ if (isset($_POST['add_telemetry'])) {
                         </div>
                         <div class="card-body">
                             <?php
-                            if (file_exists('config.php')) {
+                            if (file_exists('../config.php')) {
 
                                 echo "<p>Database is already configured. Any further changes should be made by editing the <code>config.php</code> file.</p>";
 
@@ -1476,17 +1474,17 @@ if (isset($_POST['add_telemetry'])) {
 <!-- REQUIRED SCRIPTS -->
 
 <!-- jQuery -->
-<script src="../plugins/jquery/jquery.min.js"></script>
+<script src="/plugins/jquery/jquery.min.js"></script>
 <!-- Bootstrap 4 -->
-<script src="../plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
+<script src="/plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
 <!-- Custom js-->
-<script src='../plugins/select2/js/select2.min.js'></script>
-<script src="../plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
+<script src='/plugins/select2/js/select2.min.js'></script>
+<script src="/plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
 <!-- AdminLTE App -->
-<script src="../plugins/adminlte/js/adminlte.min.js"></script>
+<script src="/plugins/adminlte/js/adminlte.min.js"></script>
 
 <!-- Custom js-->
-<script src="../js/app.js"></script>
+<script src="/js/app.js"></script>
 
 </body>
 
diff --git a/user/includes/inc_all_reports.php b/user/includes/inc_all_reports.php
deleted file mode 100644
index 1a2ec280..00000000
--- a/user/includes/inc_all_reports.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-require_once "../config.php";
-require_once "../functions.php";
-require_once "../includes/router.php";
-require_once "../includes/check_login.php";
-require_once "../includes/page_title.php";
-// Reporting Perms
-enforceUserPermission('module_reporting');
-require_once "../includes/header.php";
-require_once "../includes/top_nav.php";
-require_once "includes/reports_side_nav.php";
-require_once "../includes/inc_wrapper.php";
-require_once "../includes/inc_alert_feedback.php";
-require_once "../includes/filter_header.php";
-
-// Set variable default values
-$largest_income_month = 0;
-$largest_invoice_month = 0;
-$recurring_total = 0;
diff --git a/user/includes/inc_all_user.php b/user/includes/inc_all_user.php
deleted file mode 100644
index 7830a69f..00000000
--- a/user/includes/inc_all_user.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require_once "../config.php";
-require_once "../functions.php";
-require_once "../includes/router.php";
-require_once "../includes/check_login.php";
-require_once "../includes/page_title.php";
-require_once "../includes/header.php";
-require_once "../includes/top_nav.php";
-require_once "includes/user_side_nav.php";
-require_once "../includes/inc_wrapper.php";
-require_once "../includes/inc_alert_feedback.php";
-require_once "../includes/filter_header.php";
-
diff --git a/user/js/keepalive.js b/user/js/keepalive.js
deleted file mode 100644
index 60f07a18..00000000
--- a/user/js/keepalive.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// Keep PHP sessions alive
-// Sends requests to keepalive.php in the background every 10 mins to prevent PHP garbage collection ending sessions
-
-function keep_alive() {
-
-    //Send a GET request to keepalive.php as keepalive.php?keepalive
-    jQuery.get(
-        "../keepalive.php",
-        {keepalive: 'true'},
-        function(data) {
-            // Don't care about a response
-        }
-    );
-
-}
-
-// Run every 10 mins
-setInterval(keep_alive, 600000);
diff --git a/user/modals/ticket/ticket_edit_asset.php b/user/modals/ticket/ticket_edit_asset.php
deleted file mode 100644
index a1c87d87..00000000
--- a/user/modals/ticket/ticket_edit_asset.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="modal" id="editTicketAssetModal<?php echo $ticket_id; ?>" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>Editing ticket Asset: <strong><?php echo "$ticket_prefix$ticket_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="ticket_id" value="<?php echo $ticket_id; ?>">
-                <div class="modal-body">
-
-                    <div class="form-group">
-                        <label>Asset</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-desktop"></i></span>
-                            </div>
-                            <select class="form-control select2" name="asset">
-                                <option value="0">- None -</option>
-                                <?php
-
-                                $sql_assets = mysqli_query($mysqli, "SELECT asset_id, asset_name, contact_name FROM assets LEFT JOIN contacts ON contact_id = asset_contact_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
-                                while ($row = mysqli_fetch_array($sql_assets)) {
-                                    $asset_id_select = intval($row['asset_id']);
-                                    $asset_name_select = nullable_htmlentities($row['asset_name']);
-                                    $asset_contact_name_select = nullable_htmlentities($row['contact_name']);
-                                    ?>
-                                    <option <?php if ($asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo "$asset_name_select - $asset_contact_name_select"; ?></option>
-
-                                    <?php
-                                }
-                                ?>
-                            </select>
-                        </div>
-
-                    </div>
-
-                </div>
-
-                <div class="modal-footer">
-                    <button type="submit" name="edit_ticket_asset" class="btn btn-primary text-bold"><i class="fa 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/user/post/recurring_invoice.php b/user/post/recurring_invoice.php
deleted file mode 100644
index e69de29b..00000000