diff --git a/admin_ticket_template_details.php b/admin_ticket_template_details.php
index 2a6d5c8c..be7b8b88 100644
--- a/admin_ticket_template_details.php
+++ b/admin_ticket_template_details.php
@@ -112,7 +112,11 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
                                                 <i class="fas fa-fw fa-ellipsis-v"></i>
                                             </button>
                                             <div class="dropdown-menu">
-                                                <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTaskModal<?php echo $task_id; ?>">
+                                                <a class="dropdown-item" href="#"
+                                                    data-toggle = "ajax-modal"
+                                                    data-ajax-url = "ajax/ajax_ticket_template_task_edit.php"
+                                                    data-ajax-id = "<?php echo $task_id; ?>"
+                                                    >
                                                     <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                                 </a>
                                                 <div class="dropdown-divider"></div>
@@ -125,7 +129,6 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
                                 </td>
                             </tr>
                             <?php
-                            require "modals/task_edit_modal.php";
                         }
                         ?>
                     </table>
diff --git a/ajax/ajax_ticket_assign.php b/ajax/ajax_ticket_assign.php
index c8bd25e1..9286ca6c 100644
--- a/ajax/ajax_ticket_assign.php
+++ b/ajax/ajax_ticket_assign.php
@@ -2,35 +2,25 @@
 
 require_once '../includes/ajax_header.php';
 
-$client_id = intval($_GET['id']);
+$ticket_id = intval($_GET['id']);
 
-$sql = mysqli_query($mysqli, "SELECT * FROM clients WHERE client_id = $client_id LIMIT 1");
+$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);
+$ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
+$ticket_number = intval($row['ticket_number']);
+$ticket_assigned_to = intval($row['ticket_assigned_to']);
+$ticket_status = intval($row['ticket_status']);
+$ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']);
 $client_name = nullable_htmlentities($row['client_name']);
-$client_is_lead = intval($row['client_lead']);
-$client_type = nullable_htmlentities($row['client_type']);
-$client_website = nullable_htmlentities($row['client_website']);
-$client_referral = nullable_htmlentities($row['client_referral']);
-$client_currency_code = nullable_htmlentities($row['client_currency_code']);
-$client_net_terms = intval($row['client_net_terms']);
-$client_tax_id_number = nullable_htmlentities($row['client_tax_id_number']);
-$client_abbreviation = nullable_htmlentities($row['client_abbreviation']);
-$client_rate = floatval($row['client_rate']);
-$client_notes = nullable_htmlentities($row['client_notes']);
-$client_created_at = nullable_htmlentities($row['client_created_at']);
-$client_archived_at = nullable_htmlentities($row['client_archived_at']);
-
-// Client Tags
-$client_tag_id_array = array();
-$sql_client_tags = mysqli_query($mysqli, "SELECT tag_id FROM client_tags WHERE client_id = $client_id");
-while ($row = mysqli_fetch_array($sql_client_tags)) {
-    $client_tag_id = intval($row['tag_id']);
-    $client_tag_id_array[] = $client_tag_id;
-}
 
 // Generate the HTML form content using output buffering.
 ob_start();
+
 ?>
 
 <div class="modal-header">
@@ -42,7 +32,7 @@ ob_start();
 
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
-    <input type="hidden" name="ticket_status" value="<?php echo $ticket_status_id; ?>">
+    <input type="hidden" name="ticket_status" value="<?php echo $ticket_status; ?>">
     <div class="modal-body bg-white">
 
         <div class="form-group">
@@ -74,11 +64,16 @@ ob_start();
     </div>
 
     <div class="modal-footer bg-white">
-        <button type="submit" name="assign_ticket" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Assign</button>
-        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+        <button type="submit" name="assign_ticket" class="btn btn-primary text-bold">
+            <i class="fa fa-check mr-2"></i>Assign
+        </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/ajax_footer.php";
diff --git a/ajax/ajax_ticket_billable.php b/ajax/ajax_ticket_billable.php
new file mode 100644
index 00000000..9f7e7b2a
--- /dev/null
+++ b/ajax/ajax_ticket_billable.php
@@ -0,0 +1,59 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$ticket_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_id = $ticket_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
+$ticket_number = intval($row['ticket_number']);
+$ticket_billable = intval($row['ticket_billable']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title">
+        <i class="fa fa-fw fa-user mr-2"></i>
+        Edit Billable Status for <strong><?php echo "$ticket_prefix$ticket_number"; ?></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">
+    <div class="modal-body bg-white">
+        <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
+        <div class="form-group">
+            <label>Billable</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
+                </div>
+                <select class="form-control" name="billable_status">
+                    <option <?php if ($ticket_billable == 1) { echo "selected"; } ?> value="1">Yes</option>
+                    <option <?php if ($ticket_billable == 0) { echo "selected"; } ?> value="0">No</option>
+                </select>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_ticket_billable_status" 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/ajax_footer.php";
diff --git a/ajax/ajax_ticket_contact.php b/ajax/ajax_ticket_contact.php
new file mode 100644
index 00000000..b790ac7a
--- /dev/null
+++ b/ajax/ajax_ticket_contact.php
@@ -0,0 +1,101 @@
+<?php
+
+require_once '../includes/ajax_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);
+$ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
+$ticket_number = intval($row['ticket_number']);
+$contact_id = intval($row['ticket_contact_id']);
+$client_id = intval($row['ticket_client_id']);
+$client_name = nullable_htmlentities($row['client_name']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i>Changing contact: <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 bg-white">
+
+        <div class="form-group">
+            <label>Contact</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="contact">
+                    <option value="">No One</option>
+                    <?php
+                    $sql_client_contacts_select = mysqli_query($mysqli, "SELECT contact_id, contact_name, contact_title, contact_primary, contact_technical FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL ORDER BY contact_primary DESC, contact_technical DESC, contact_name ASC");
+                    while ($row = mysqli_fetch_array($sql_client_contacts_select)) {
+                        $contact_id_select = intval($row['contact_id']);
+                        $contact_name_select = nullable_htmlentities($row['contact_name']);
+                        $contact_primary_select = intval($row['contact_primary']);
+                        if($contact_primary_select == 1) {
+                            $contact_primary_display_select = " (Primary)";
+                        } else {
+                            $contact_primary_display_select = "";
+                        }
+                        $contact_technical_select = intval($row['contact_technical']);
+                        if($contact_technical_select == 1) {
+                            $contact_technical_display_select = " (Technical)";
+                        } else {
+                            $contact_technical_display_select = "";
+                        }
+                        $contact_title_select = nullable_htmlentities($row['contact_title']);
+                        if(!empty($contact_title_select)) {
+                            $contact_title_display_select = " - $contact_title_select";
+                        } else {
+                            $contact_title_display_select = "";
+                        }
+
+                        ?>
+                        <option 
+                            value="<?php echo $contact_id_select; ?>"
+                            <?php if ($contact_id_select  == $contact_id) { echo "selected"; } ?>
+                            >
+                            <?php echo "$contact_name_select$contact_title_display_select$contact_primary_display_select$contact_technical_display_select"; ?>
+                        </option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <?php if (!empty($config_smtp_host)) { ?>
+            <div class="form-group">
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" name="contact_notify" value="1" id="checkNotifyContact" <?php if ($config_ticket_client_general_notifications) { echo "checked"; } ?>>
+                    <label class="form-check-label" for="checkNotifyContact">
+                        Send email notification
+                    </label>
+                </div>
+            </div>
+        <?php } ?>
+
+    </div>
+
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_ticket_contact" 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/ajax_footer.php";
diff --git a/ajax/ajax_ticket_priority.php b/ajax/ajax_ticket_priority.php
new file mode 100644
index 00000000..d5f3b115
--- /dev/null
+++ b/ajax/ajax_ticket_priority.php
@@ -0,0 +1,62 @@
+<?php
+
+require_once '../includes/ajax_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);
+$ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
+$ticket_number = intval($row['ticket_number']);
+$ticket_priority = nullable_htmlentities($row['ticket_priority']);
+$client_id = intval($row['ticket_client_id']);
+$client_name = nullable_htmlentities($row['client_name']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fa fa-fw fa-thermometer-half mr-2"></i>Editing ticket priority: <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; ?>">
+    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+    
+    <div class="modal-body bg-white">
+
+        <div class="form-group">
+            <label>Priority</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
+                </div>
+                <select class="form-control select2" name="priority" required>
+                    <option <?php if ($ticket_priority == 'Low') { echo "selected"; } ?> >Low</option>
+                    <option <?php if ($ticket_priority == 'Medium') { echo "selected"; } ?> >Medium</option>
+                    <option <?php if ($ticket_priority == 'High') { echo "selected"; } ?> >High</option>
+                </select>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_ticket_priority" 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/ajax_footer.php";
diff --git a/ajax/ajax_ticket_reply_edit.php b/ajax/ajax_ticket_reply_edit.php
new file mode 100644
index 00000000..95a1b0ec
--- /dev/null
+++ b/ajax/ajax_ticket_reply_edit.php
@@ -0,0 +1,70 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$ticket_reply_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM ticket_replies
+    LEFT JOIN tickets ON ticket_id = ticket_reply_ticket_id
+    WHERE ticket_reply_id = $ticket_reply_id
+    LIMIT 1"
+);
+
+$row = mysqli_fetch_array($sql);
+$ticket_reply_type = nullable_htmlentities($row['ticket_reply_type']);
+$ticket_reply_time_worked = date_create($row['ticket_reply_time_worked']);
+$ticket_reply_time_worked_formatted = date_format($ticket_reply_time_worked, 'H:i:s');
+$ticket_reply = nullable_htmlentities($row['ticket_reply']);
+$client_id = intval($row['ticket_client_id']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fa fa-fw fa-edit mr-2"></i>Editing Ticket Reply</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_reply_id" value="<?php echo $ticket_reply_id; ?>">
+    <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+
+    <div class="modal-body bg-white">
+
+        <div class="form-group">
+            <div class="btn-group btn-block btn-group-toggle" data-toggle="buttons">
+                <label class="btn btn-outline-secondary <?php if ($ticket_reply_type == 'Internal') { echo "active"; } ?>">
+                    <input type="radio" name="ticket_reply_type" value="Internal" <?php if ($ticket_reply_type == 'Internal') { echo "checked"; } ?>>Internal Note
+                </label>
+                <label class="btn btn-outline-secondary <?php if ($ticket_reply_type == 'Public') { echo "active"; } ?>">
+                    <input type="radio" name="ticket_reply_type" value="Public" <?php if ($ticket_reply_type == 'Public') { echo "checked"; } ?>>Public Comment
+                </label>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <textarea class="form-control tinymce" name="ticket_reply"><?php echo $ticket_reply; ?></textarea>
+        </div>
+
+        <?php if (!empty($ticket_reply_time_worked)) { ?>
+            <div class="col-3">
+                <div class="form-group">
+                    <label>Time worked</label>
+                    <input class="form-control" name="time" type="text" placeholder="HH:MM:SS" pattern="([01]?[0-9]|2[0-3]):([0-5]?[0-9]):([0-5]?[0-9])" value="<?php echo $ticket_reply_time_worked_formatted; ?>" required>
+                </div>
+            </div>
+        <?php } ?>
+
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_ticket_reply" 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/ajax_footer.php";
diff --git a/ajax/ajax_ticket_task_edit.php b/ajax/ajax_ticket_task_edit.php
new file mode 100644
index 00000000..ef58bbb6
--- /dev/null
+++ b/ajax/ajax_ticket_task_edit.php
@@ -0,0 +1,64 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$task_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM tasks
+    WHERE task_id = $task_id
+    LIMIT 1"
+);
+
+$row = mysqli_fetch_array($sql);
+$task_name = nullable_htmlentities($row['task_name']);
+$task_completion_estimate = intval($row['task_completion_estimate']);
+$task_completed_at = nullable_htmlentities($row['task_completed_at']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fa fa-fw fa-tasks mr-2"></i>Editing task</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="task_id" value="<?php echo $task_id; ?>">
+    
+    <div class="modal-body bg-white">
+
+        <div class="form-group">
+            <label>Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Name the task" maxlength="255" value="<?php echo $task_name; ?>" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Estimated Completion Time <span class="text-secondary">(Minutes)</span></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                </div>
+                <input type="number" class="form-control" name="completion_estimate" placeholder="Estimated time to complete task in mins" value="<?php echo $task_completion_estimate; ?>">
+            </div>
+        </div>
+    
+    </div>
+
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_ticket_task" 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/ajax_footer.php";
diff --git a/ajax/ajax_ticket_template_task_edit.php b/ajax/ajax_ticket_template_task_edit.php
new file mode 100644
index 00000000..b7fe19f4
--- /dev/null
+++ b/ajax/ajax_ticket_template_task_edit.php
@@ -0,0 +1,62 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$task_template_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE task_template_id = $task_template_id LIMIT 1");
+
+$row = mysqli_fetch_array($sql);
+$task_template_name = nullable_htmlentities($row['task_template_name']);
+$task_template_order = intval($row['task_template_order']);
+$task_template_completion_estimate = intval($row['task_template_completion_estimate']);
+$task_template_description = nullable_htmlentities($row['task_template_description']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fa fa-fw fa-tasks mr-2"></i>Editing task</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="task_template_id" value="<?php echo $task_template_id; ?>">
+    
+    <div class="modal-body bg-white">
+
+        <div class="form-group">
+            <label>Name <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Name the task" maxlength="255" value="<?php echo $task_template_name; ?>" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Estimated Completion Time <span class="text-secondary">(Minutes)</span></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                </div>
+                <input type="number" class="form-control" name="completion_estimate" placeholder="Estimated time to complete task in mins" value="<?php echo $task_template_completion_estimate; ?>">
+            </div>
+        </div>
+    
+    </div>
+
+    <div class="modal-footer bg-white">
+        <button type="submit" name="edit_ticket_template_task" 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/ajax_footer.php";
diff --git a/client_tickets.php b/client_tickets.php
index 3659c073..69401560 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -277,13 +277,25 @@ $total_tickets_closed = intval($row['total_tickets_closed']);
 
                         <!-- Ticket Contact -->
                         <td>
-                            <a href="#" data-toggle="modal" data-target="#editTicketContactModal<?php echo $ticket_id; ?>"><?php echo $contact_display; ?></a>
+                            <a href="#"
+                                <?php if (empty($ticket_closed_at)) { ?>
+                                data-toggle = "ajax-modal"
+                                data-ajax-url = "ajax/ajax_ticket_contact.php"
+                                data-ajax-id = "<?php echo $ticket_id; ?>"
+                                <?php } ?>
+                                >
+                                <?php echo $contact_display; ?>    
+                            </a>
                         </td>
 
                         <!-- Ticket Billable (if accounting perms & enabled) -->
                         <?php if ($config_module_enable_accounting && lookupUserPermission("module_sales") >= 2) { ?>
                             <td class="text-center">
-                                <a href="#" data-toggle="modal" data-target="#editTicketBillableModal<?php echo $ticket_id; ?>">
+                                <a href="#" 
+                                    data-toggle = "ajax-modal"
+                                    data-ajax-url = "ajax/ajax_ticket_billable.php"
+                                    data-ajax-id = "<?php echo $ticket_id; ?>"
+                                    >
                                     <?php
                                     if ($ticket_billable == 1) {
                                         echo "<span class='badge badge-pill badge-success p-2'>Yes</span>";
@@ -291,12 +303,21 @@ $total_tickets_closed = intval($row['total_tickets_closed']);
                                         echo "<span class='badge badge-pill badge-secondary p-2'>No</span>";
                                     }
                                     ?>
+                                </a>
                             </td>
                         <?php } ?>
 
                         <!-- Ticket Priority -->
                         <td>
-                            <a href="#" data-toggle="modal" data-target="#editTicketPriorityModal<?php echo $ticket_id; ?>"><?php echo $ticket_priority_display; ?></a>
+                            <a href="#"
+                                <?php if (lookupUserPermission("module_support") >= 2 && empty($ticket_closed_at)) { ?>
+                                data-toggle = "ajax-modal"
+                                data-ajax-url = "ajax/ajax_ticket_priority.php"
+                                data-ajax-id = "<?php echo $ticket_id; ?>"
+                                <?php } ?>
+                                >
+                                <?php echo $ticket_priority_display; ?>
+                            </a>
                         </td>
 
                         <!-- Ticket Status -->
@@ -306,7 +327,15 @@ $total_tickets_closed = intval($row['total_tickets_closed']);
 
                         <!-- Ticket Assigned agent -->
                         <td>
-                            <a href="#" data-toggle="modal" data-target="#assignTicketModal<?php echo $ticket_id; ?>"><?php echo $ticket_assigned_to_display; ?></a>
+                            <a href="#"
+                                <?php if (lookupUserPermission("module_support") >= 2 && empty($ticket_closed_at)) { ?>
+                                data-toggle = "ajax-modal"
+                                data-ajax-url = "ajax/ajax_ticket_assign.php"
+                                data-ajax-id = "<?php echo $ticket_id; ?>"
+                                <?php } ?>
+                                >
+                                <?php echo $ticket_assigned_to_display; ?>
+                            </a>
                         </td>
 
                         <!-- Ticket Last Response -->
@@ -325,20 +354,6 @@ $total_tickets_closed = intval($row['total_tickets_closed']);
                     </tr>
 
                     <?php
-                    // Edit actions, for open tickets
-                    if (empty($ticket_closed_at)) {
-
-                        require "modals/ticket_assign_modal.php";
-
-                        require "modals/ticket_edit_priority_modal.php";
-
-                        require "modals/ticket_edit_contact_modal.php";
-
-                        if ($config_module_enable_accounting) {
-                            require "modals/ticket_edit_billable_modal.php";
-                        }
-
-                    }
 
                 }
 
@@ -353,8 +368,5 @@ $total_tickets_closed = intval($row['total_tickets_closed']);
 
 <?php
 require_once "modals/ticket_add_modal.php";
-
 require_once "modals/client_ticket_export_modal.php";
-
 require_once "includes/footer.php";
-
diff --git a/modals/task_edit_modal.php b/modals/task_edit_modal.php
deleted file mode 100644
index e5aeb251..00000000
--- a/modals/task_edit_modal.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<div class="modal" id="editTaskModal<?php echo $task_id; ?>" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-tasks mr-2"></i>Editing task</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="task_id" value="<?php echo $task_id; ?>">
-                <!-- Check to see if its a ticket template task or ticket task by checking to see if ticket_id is set -->
-                <input type="hidden" name="is_ticket" value="<?php if ($ticket_id) { echo 1; } else { echo 0; } ?>">
-                
-                <div class="modal-body bg-white">
-
-                    <div class="form-group">
-                        <label>Name <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Name the task" maxlength="255" value="<?php echo $task_name; ?>" required autofocus>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Estimated Completion Time <span class="text-secondary">(Minutes)</span></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
-                            </div>
-                            <input type="number" class="form-control" name="completion_estimate" placeholder="Estimated time to complete task in mins" value="<?php echo $task_completion_estimate; ?>">
-                        </div>
-                    </div>
-                
-                </div>
-
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="edit_task" 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/modals/ticket_assign_modal.php b/modals/ticket_assign_modal.php
deleted file mode 100644
index 9ab37025..00000000
--- a/modals/ticket_assign_modal.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<div class="modal" id="assignTicketModal<?php echo $ticket_id; ?>" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-user-check mr-2"></i>Assigning Ticket: <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; ?>">
-                <input type="hidden" name="ticket_status" value="<?php echo $ticket_status_id; ?>">
-                <div class="modal-body bg-white">
-
-                    <div class="form-group">
-                        <label>Assign to</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-user-check"></i></span>
-                            </div>
-                            <select class="form-control select2" name="assigned_to">
-                                <option value="0">Not Assigned</option>
-                                <?php
-                                $sql_users_select = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users
-                                    LEFT JOIN user_settings on users.user_id = user_settings.user_id
-                                    WHERE user_type = 1
-                                    AND user_archived_at IS NULL
-                                    ORDER BY user_name DESC"
-                                );
-                                while ($row = mysqli_fetch_array($sql_users_select)) {
-                                    $user_id_select = intval($row['user_id']);
-                                    $user_name_select = nullable_htmlentities($row['user_name']);
-
-                                    ?>
-                                    <option value="<?php echo $user_id_select; ?>" <?php if ($user_id_select  == $ticket_assigned_to) { echo "selected"; } ?>><?php echo $user_name_select; ?></option>
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-
-                </div>
-
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="assign_ticket" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Assign</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/modals/ticket_edit_billable_modal.php b/modals/ticket_edit_billable_modal.php
deleted file mode 100644
index f938c99f..00000000
--- a/modals/ticket_edit_billable_modal.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="modal" id="editTicketBillableModal<?php echo $ticket_id; ?>" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title">
-                    <i class="fa fa-fw fa-user mr-2"></i>
-                    Edit Billable Status for <strong><?php echo "$ticket_prefix$ticket_number"; ?></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">
-                <div class="modal-body bg-white">
-                    <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
-                    <div class="form-group">
-                        <label>Billable</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
-                            </div>
-                            <select class="form-control" name="billable_status">
-                                <option <?php if ($ticket_billable == 1) { echo "selected"; } ?> value="1">Yes</option>
-                                <option <?php if ($ticket_billable == 0) { echo "selected"; } ?> value="0">No</option>
-                            </select>
-                        </div>
-                    </div>
-
-                </div>
-
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="edit_ticket_billable_status" 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/modals/ticket_edit_priority_modal.php b/modals/ticket_edit_priority_modal.php
deleted file mode 100644
index b0778bca..00000000
--- a/modals/ticket_edit_priority_modal.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="modal" id="editTicketPriorityModal<?php echo $ticket_id; ?>" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-thermometer-half mr-2"></i>Editing ticket priority: <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; ?>">
-                <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                
-                <div class="modal-body bg-white">
-
-                    <div class="form-group">
-                        <label>Priority</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
-                            </div>
-                            <select class="form-control select2" name="priority" required>
-                                <option <?php if ($ticket_priority == 'Low') { echo "selected"; } ?> >Low</option>
-                                <option <?php if ($ticket_priority == 'Medium') { echo "selected"; } ?> >Medium</option>
-                                <option <?php if ($ticket_priority == 'High') { echo "selected"; } ?> >High</option>
-                            </select>
-                        </div>
-                    </div>
-
-                </div>
-
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="edit_ticket_priority" 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/modals/ticket_reply_edit_modal.php b/modals/ticket_reply_edit_modal.php
index b1306b5c..8ea4ef73 100644
--- a/modals/ticket_reply_edit_modal.php
+++ b/modals/ticket_reply_edit_modal.php
@@ -25,7 +25,7 @@
                     </div>
 
                     <div class="form-group">
-                        <textarea class="form-control tinymce" name="ticket_reply"><?php echo nullable_htmlentities($ticket_reply); ?></textarea>
+                        <textarea class="form-control" name="ticket_reply"><?php echo nullable_htmlentities($ticket_reply); ?></textarea>
                     </div>
 
                     <?php if (!empty($ticket_reply_time_worked)) { ?>
diff --git a/post/user/task.php b/post/user/task.php
index 3d74a51f..9add77fb 100644
--- a/post/user/task.php
+++ b/post/user/task.php
@@ -30,7 +30,7 @@ if (isset($_POST['add_task'])) {
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 }
 
-if (isset($_POST['edit_task'])) {
+if (isset($_POST['edit_ticket_task'])) {
 
     enforceUserPermission('module_support', 2);
 
@@ -38,18 +38,12 @@ if (isset($_POST['edit_task'])) {
     $task_name = sanitizeInput($_POST['name']);
     $task_order = intval($_POST['order']);
     $task_completion_estimate = intval($_POST['completion_estimate']);
-    $is_ticket = intval($_POST['is_ticket']);
 
-    if($is_ticket == 1) {
-        // Get Client ID
-        $sql = mysqli_query($mysqli, "SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id WHERE task_id = $task_id");
-        $row = mysqli_fetch_array($sql);
-        $client_id = intval($row['ticket_client_id']);
-        mysqli_query($mysqli, "UPDATE tasks SET task_name = '$task_name', task_order = $task_order, task_completion_estimate = $task_completion_estimate WHERE task_id = $task_id");
-    } else {
-        $client_id = 0;
-        mysqli_query($mysqli, "UPDATE task_templates SET task_template_name = '$task_name', task_template_order = $task_order, task_template_completion_estimate = $task_completion_estimate WHERE task_template_id = $task_id");
-    }
+    // Get Client ID
+    $sql = mysqli_query($mysqli, "SELECT * FROM tasks LEFT JOIN tickets ON ticket_id = task_ticket_id WHERE task_id = $task_id");
+    $row = mysqli_fetch_array($sql);
+    $client_id = intval($row['ticket_client_id']);
+    mysqli_query($mysqli, "UPDATE tasks SET task_name = '$task_name', task_order = $task_order, task_completion_estimate = $task_completion_estimate WHERE task_id = $task_id");
 
     // Logging
     logAction("Task", "Edit", "$session_name edited task $task_name", $client_id, $task_id);
@@ -59,6 +53,25 @@ if (isset($_POST['edit_task'])) {
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 }
 
+if (isset($_POST['edit_ticket_template_task'])) {
+
+    enforceUserPermission('module_support', 2);
+
+    $task_template_id = intval($_POST['task_template_id']);
+    $task_name = sanitizeInput($_POST['name']);
+    $task_order = intval($_POST['order']);
+    $task_completion_estimate = intval($_POST['completion_estimate']);
+
+    mysqli_query($mysqli, "UPDATE task_templates SET task_template_name = '$task_name', task_template_order = $task_order, task_template_completion_estimate = $task_completion_estimate WHERE task_template_id = $task_template_id");
+
+    // Logging
+    logAction("Task", "Edit", "$session_name edited task $task_name", 0, $task_template_id);
+
+    $_SESSION['alert_message'] = "Task <strong>$task_name</strong> edited";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+}
+
 
 if (isset($_GET['delete_task'])) {
 
diff --git a/post/user/ticket.php b/post/user/ticket.php
index fe4ee944..a38720ab 100644
--- a/post/user/ticket.php
+++ b/post/user/ticket.php
@@ -293,7 +293,7 @@ if (isset($_POST['edit_ticket_contact'])) {
 
     $ticket_id = intval($_POST['ticket_id']);
     $contact_id = intval($_POST['contact']);
-    $notify = intval($_POST['contact_notify']);
+    $notify = intval($_POST['contact_notify']) ?? 0;
 
     // Get Original contact, and ticket details
     $sql = mysqli_query($mysqli, "SELECT 
diff --git a/ticket.php b/ticket.php
index 9d131a02..c2483b65 100644
--- a/ticket.php
+++ b/ticket.php
@@ -430,7 +430,11 @@ if (isset($_GET['ticket_id'])) {
                                     </a>
                                     <?php if (empty($ticket_closed_at)) { ?>
                                         <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketContactModal<?php echo $ticket_id; ?>">
+                                        <a class="dropdown-item"
+                                            data-toggle = "ajax-modal"
+                                            data-ajax-url = "ajax/ajax_ticket_contact.php"
+                                            data-ajax-id = "<?php echo $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; ?>">
@@ -500,7 +504,10 @@ if (isset($_GET['ticket_id'])) {
                             <?php } ?>
                         <?php } else { ?>
                             <div class="mt-1">
-                                <a href="#" data-toggle="modal" data-target="#assignTicketModal<?php echo $ticket_id; ?>">
+                                <a href="#"
+                                    data-toggle = "ajax-modal"
+                                    data-ajax-url = "ajax/ajax_ticket_assign.php"
+                                    data-ajax-id = "<?php echo $ticket_id; ?>">
                                     <i class="fas fa-fw fa-user mr-2 text-secondary"></i><?php echo $ticket_assigned_to_display; ?>
                                 </a>
                             </div>
@@ -510,7 +517,16 @@ if (isset($_GET['ticket_id'])) {
 
                     <div class="col-sm-4">
                         <div>
-                            <i class="fa fa-fw fa-thermometer-half text-secondary mr-2"></i><a href="#" data-toggle="modal" data-target="#editTicketPriorityModal<?php echo $ticket_id; ?>"><?php echo $ticket_priority_display; ?></a>
+                            <i class="fa fa-fw fa-thermometer-half text-secondary mr-2"></i>
+                            <a href="#"
+                                <?php if (lookupUserPermission("module_support") >= 2 && empty($ticket_closed_at)) { ?>
+                                data-toggle = "ajax-modal"
+                                data-ajax-url = "ajax/ajax_ticket_priority.php"
+                                data-ajax-id = "<?php echo $ticket_id; ?>"
+                                <?php } ?>
+                                >
+                                <?php echo $ticket_priority_display; ?>
+                            </a>
                         </div>
                         <?php
                         // Ticket scheduling
@@ -529,7 +545,11 @@ if (isset($_GET['ticket_id'])) {
                             <?php } elseif (lookupUserPermission("module_sales") >= 1) { ?>
                                 <div class="mt-1">
                                     <i class="fa fa-fw fa-dollar-sign text-secondary mr-2"></i>Ticket is
-                                    <a href="#" data-toggle="modal" data-target="#editTicketBillableModal<?php echo $ticket_id; ?>">
+                                    <a href="#"
+                                        data-toggle = "ajax-modal"
+                                        data-ajax-url = "ajax/ajax_ticket_billable.php"
+                                        data-ajax-id = "<?php echo $ticket_id; ?>"
+                                        >
                                         <?php
                                         if ($ticket_billable == 1) {
                                             echo "<span class='text-bold text-dark'>Billable</span>";
@@ -775,7 +795,12 @@ if (isset($_GET['ticket_id'])) {
                                                         <i class="fas fa-fw fa-ellipsis-v"></i>
                                                     </button>
                                                     <div class="dropdown-menu">
-                                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#replyEditTicketModal<?php echo $ticket_reply_id; ?>">
+                                                        <a class="dropdown-item"
+                                                            data-toggle = "ajax-modal"
+                                                            data-modal-size = "lg"
+                                                            data-ajax-url = "ajax/ajax_ticket_reply_edit.php"
+                                                            data-ajax-id = "<?php echo $ticket_reply_id; ?>"
+                                                            >
                                                             <i class="fas fa-fw fa-edit text-secondary mr-2"></i>Edit
                                                         </a>
                                                         <div class="dropdown-divider"></div>
@@ -810,13 +835,10 @@ if (isset($_GET['ticket_id'])) {
                             ?>
                         </div>
                     </div>
-
                     <!-- End ticket reply card -->
 
-
                     <?php
 
-                    require "modals/ticket_reply_edit_modal.php";
                 }
 
                 ?>
@@ -890,7 +912,15 @@ if (isset($_GET['ticket_id'])) {
                 <div class="card card-body mb-3">
                     <h5 class="text-secondary">Contact</h5>
                     <div>
-                        <i class="fa fa-fw fa-user text-secondary mr-2"></i><a href="#" data-toggle="modal" data-target="#editTicketContactModal<?php echo $ticket_id; ?>"><i>No One</i>
+                        <i class="fa fa-fw fa-user text-secondary mr-2"></i>
+                            <a href="#"
+                                <?php if (lookupUserPermission("module_support") >= 2 && empty($ticket_closed_at)) { ?>
+                                data-toggle = "ajax-modal"
+                                data-ajax-url = "ajax/ajax_ticket_contact.php"
+                                data-ajax-id = "<?php echo $ticket_id; ?>"
+                                <?php } ?>
+                            >
+                            <i>No One</i>
                         </a>
                     </div>
                 </div>
@@ -951,7 +981,11 @@ if (isset($_GET['ticket_id'])) {
                                                     <i class="fas fa-fw fa-ellipsis-v"></i>
                                                 </button>
                                                 <div class="dropdown-menu">
-                                                    <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTaskModal<?php echo $task_id; ?>">
+                                                    <a class="dropdown-item" href="#"
+                                                        data-toggle = "ajax-modal"
+                                                        data-ajax-url = "ajax/ajax_ticket_task_edit.php"
+                                                        data-ajax-id = "<?php echo $task_id; ?>"
+                                                        >
                                                         <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                                     </a>
                                                     <?php if ($task_completed_at) { ?>
@@ -970,9 +1004,8 @@ if (isset($_GET['ticket_id'])) {
                                 </td>
                             </tr>
                         <?php
-
-                        require "modals/task_edit_modal.php";
-                        } ?>
+                        } 
+                        ?>
                     </table>
                 </div>
                 <?php } ?>
@@ -1166,19 +1199,15 @@ if (isset($_GET['ticket_id'])) {
         <?php
         if (lookupUserPermission("module_support") >= 2 && empty($ticket_closed_at)) {
             require_once "modals/ticket_edit_modal.php";
-            require_once "modals/ticket_assign_modal.php";
-            require_once "modals/ticket_edit_contact_modal.php";
             require_once "modals/ticket_edit_asset_modal.php";
             require_once "modals/ticket_edit_vendor_modal.php";
             require_once "modals/ticket_add_watcher_modal.php";
-            require_once "modals/ticket_edit_priority_modal.php";
             require_once "modals/ticket_change_client_modal.php";
             require_once "modals/ticket_edit_schedule_modal.php";
             require_once "modals/ticket_merge_modal.php";
         }
 
         if (lookupUserPermission("module_support") >= 2 && lookupUserPermission("module_sales") >= 2 && $config_module_enable_accounting) {
-            require_once "modals/ticket_edit_billable_modal.php";
             require_once "modals/ticket_invoice_add_modal.php";
         }
     }
diff --git a/tickets_compact.php b/tickets_compact.php
index a79ae7f0..fc289ee7 100644
--- a/tickets_compact.php
+++ b/tickets_compact.php
@@ -173,7 +173,13 @@
 
                                     
                                     <div class="mt-1">
-                                        <a href="#" data-toggle="modal" data-target="#editTicketPriorityModal<?php echo $ticket_id; ?>">
+                                        <a href="#"
+                                            <?php if (empty($ticket_closed_at)) { ?>
+                                            data-toggle = "ajax-modal"
+                                            data-ajax-url = "ajax/ajax_ticket_priority.php"
+                                            data-ajax-id = "<?php echo $ticket_id; ?>"
+                                            <?php } ?>
+                                            >
                                             <span class='badge badge-<?php echo $ticket_priority_color; ?>'>
                                                 <?php echo $ticket_priority; ?>
                                             </span>
@@ -223,7 +229,11 @@
                                 <!-- Ticket Billable (if accounting enabled -->
                                 <?php if ($config_module_enable_accounting && lookupUserPermission("module_sales") >= 2) { ?>
                                     <td class="text-center">
-                                        <a href="#" data-toggle="modal" data-target="#editTicketBillableModal<?php echo $ticket_id; ?>">
+                                        <a href="#" 
+                                            data-toggle = "ajax-modal"
+                                            data-ajax-url = "ajax/ajax_ticket_billable.php"
+                                            data-ajax-id = "<?php echo $ticket_id; ?>"
+                                            >
                                             <?php
                                             if ($ticket_billable == 1) {
                                                 echo "<span class='badge badge-pill badge-success p-2'>Yes</span>";
@@ -231,6 +241,7 @@
                                                 echo "<span class='badge badge-pill badge-secondary p-2'>No</span>";
                                             }
                                             ?>
+                                        </a>
                                     </td>
                                 <?php } ?>
 
@@ -242,25 +253,21 @@
 
                                 <!-- Ticket Assigned agent -->
                                 <td>
-                                    <a href="#" data-toggle="modal" data-target="#assignTicketModal<?php echo $ticket_id; ?>"><?php echo $ticket_assigned_to_display; ?></a>
+                                    <a href="#"
+                                        <?php if (lookupUserPermission("module_support") >= 2 && empty($ticket_closed_at)) { ?>
+                                        data-toggle = "ajax-modal"
+                                        data-ajax-url = "ajax/ajax_ticket_assign.php"
+                                        data-ajax-id = "<?php echo $ticket_id; ?>"
+                                        <?php } ?>
+                                        >
+                                        <?php echo $ticket_assigned_to_display; ?>        
+                                    </a>
                                 </td>
 
-         
-
                             </tr>
 
                             <?php
-                            // Edit actions, for open tickets
-                            if (empty($ticket_closed_at)) {
-
-                                require_once "modals/ticket_assign_modal.php";
-
-                                require_once "modals/ticket_edit_priority_modal.php";
-
-                                if ($config_module_enable_accounting) {
-                                    require_once "modals/ticket_edit_billable_modal.php";
-                                }
-                            }
+                            
                         }
 
                         ?>
diff --git a/tickets_list.php b/tickets_list.php
index 7830d5a7..07ae8482 100644
--- a/tickets_list.php
+++ b/tickets_list.php
@@ -216,7 +216,11 @@
                                 <!-- Ticket Billable (if accounting enabled -->
                                 <?php if ($config_module_enable_accounting && lookupUserPermission("module_sales") >= 2) { ?>
                                     <td class="text-center">
-                                        <a href="#" data-toggle="modal" data-target="#editTicketBillableModal<?php echo $ticket_id; ?>">
+                                        <a href="#" 
+                                            data-toggle = "ajax-modal"
+                                            data-ajax-url = "ajax/ajax_ticket_billable.php"
+                                            data-ajax-id = "<?php echo $ticket_id; ?>"
+                                            >
                                             <?php
                                             if ($ticket_billable == 1) {
                                                 echo "<span class='badge badge-pill badge-success p-2'>Yes</span>";
@@ -224,12 +228,23 @@
                                                 echo "<span class='badge badge-pill badge-secondary p-2'>No</span>";
                                             }
                                             ?>
+                                        </a>
                                     </td>
                                 <?php } ?>
 
                                 <!-- Ticket Priority -->
                                 <td>
-                                    <a href="#" data-toggle="modal" data-target="#editTicketPriorityModal<?php echo $ticket_id; ?>"><span class='p-2 badge badge-pill badge-<?php echo $ticket_priority_color; ?>'><?php echo $ticket_priority; ?></span></a>
+                                    <a href="#"
+                                        <?php if (lookupUserPermission("module_support") >= 2 && empty($ticket_closed_at)) { ?>
+                                        data-toggle = "ajax-modal"
+                                        data-ajax-url = "ajax/ajax_ticket_priority.php"
+                                        data-ajax-id = "<?php echo $ticket_id; ?>"
+                                        <?php } ?>
+                                        >
+                                        <span class='p-2 badge badge-pill badge-<?php echo $ticket_priority_color; ?>'>
+                                            <?php echo $ticket_priority; ?>
+                                        </span>
+                                    </a>
                                 </td>
 
                                 <!-- Ticket Status -->
@@ -240,7 +255,15 @@
 
                                 <!-- Ticket Assigned agent -->
                                 <td>
-                                    <a href="#" data-toggle="modal" data-target="#assignTicketModal<?php echo $ticket_id; ?>"><?php echo $ticket_assigned_to_display; ?></a>
+                                    <a href="#"
+                                        <?php if (lookupUserPermission("module_support") >= 2 && empty($ticket_closed_at)) { ?>
+                                        data-toggle = "ajax-modal"
+                                        data-ajax-url = "ajax/ajax_ticket_assign.php"
+                                        data-ajax-id = "<?php echo $ticket_id; ?>"
+                                        <?php } ?>
+                                        >
+                                        <?php echo $ticket_assigned_to_display; ?>
+                                    </a>
                                 </td>
 
                                 <!-- Ticket Last Response -->
@@ -259,19 +282,8 @@
                             </tr>
 
                             <?php
-                            // Edit actions, for open tickets
-                            if (empty($ticket_closed_at)) {
-
-                                require_once "modals/ticket_assign_modal.php";
-
-                                require_once "modals/ticket_edit_priority_modal.php";
-
-                                if ($config_module_enable_accounting) {
-                                    require_once "modals/ticket_edit_billable_modal.php";
-                                }
-                            }
                         }
-
+                        
                         ?>
 
                         </tbody>