diff --git a/agent/modals/ticket/ticket_billable.php b/agent/modals/ticket/ticket_billable.php
index 9520c7c2..2a259aa6 100644
--- a/agent/modals/ticket/ticket_billable.php
+++ b/agent/modals/ticket/ticket_billable.php
@@ -18,8 +18,7 @@ ob_start();
 
 <div class="modal-header bg-dark">
     <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>
+        <i class="fa fa-fw fa-money-bill mr-2"></i>Editing Billable Status: <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong>
     </h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -29,7 +28,7 @@ ob_start();
     <div class="modal-body">
         <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
         <div class="form-group">
-            <label>Billable</label>
+            <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>
diff --git a/agent/modals/ticket/ticket_edit_schedule.php b/agent/modals/ticket/ticket_edit_schedule.php
index 1be6c21a..877ac3e9 100644
--- a/agent/modals/ticket/ticket_edit_schedule.php
+++ b/agent/modals/ticket/ticket_edit_schedule.php
@@ -1,50 +1,74 @@
-<div class="modal" id="editTicketScheduleModal" 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-user mr-2"></i>
-                    Edit Scheduled Time for <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong>
-                </h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$ticket_id = intval($_GET['ticket_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_scheduled_for = nullable_htmlentities($row['ticket_schedule']);
+$ticket_onsite = intval($row['ticket_onsite']);
+$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 bg-dark">
+    <h5 class="modal-title">
+        <i class="fa fa-fw fa-calendar-check mr-2"></i>Scheduling Ticket: <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">
+        <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
+
+        <div class="form-group">
+            <label>Date / Time</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-calendar-day"></i></span>
+                </div>
+                <input type="datetime-local" class="form-control" name="scheduled_date_time" placeholder="Scheduled Date & Time" min="<?php echo date('Y-m-d\TH:i'); ?>" <?php if ($ticket_scheduled_for) { echo "value='$ticket_scheduled_for'"; } ?>>
             </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <div class="modal-body">
-                    <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
+        </div>
 
-                    <div class="form-group">
-                        <label>Scheduled Date and Time </label>
-
-                        <?php if (!$ticket_scheduled_for) { ?>
-                            <input type="datetime-local" class="form-control" name="scheduled_date_time" placeholder="Scheduled Date & Time" min="<?php echo date('Y-m-d\TH:i'); ?>">
-                        <?php } else { ?>
-                            <input type="datetime-local" class="form-control" name="scheduled_date_time" min="<?php echo date('Y-m-d\TH:i'); ?>" value="<?php echo $ticket_scheduled_for; ?>">
-                        <?php } ?>
-
-                    </div>
-                    <div class="form-group">
-                        <label>Onsite </label>
-                        <select class="form-control" name="onsite" required>
-                            <option value="0" <?php if ($ticket_onsite == 0) echo "selected"; ?>>No</option>
-                            <option value="1" <?php if ($ticket_onsite == 1) echo "selected"; ?>>Yes</option>
-                        </select>
-                    </div>
+        <div class="form-group">
+            <label>Onsite?</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                 </div>
-
-                <div class="modal-footer">
-                <?php if (!empty($ticket_scheduled_for)) { ?>
-                    <a href="post.php?cancel_ticket_schedule=<?php echo htmlspecialchars($ticket_id); ?>" class="btn btn-danger text-bold">
-                        <i class="fa fa-trash mr-2"></i>Cancel Scheduled Time
-                    </a>
-                <?php } ?>
-                    <button type="submit" name="edit_ticket_schedule" 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>
-
+                <select class="form-control" name="onsite" required>
+                    <option value="0" <?php if ($ticket_onsite == 0) echo "selected"; ?>>No</option>
+                    <option value="1" <?php if ($ticket_onsite == 1) echo "selected"; ?>>Yes</option>
+                </select>
+            </div>
         </div>
     </div>
-</div>
+
+    <div class="modal-footer">
+    <?php if ($ticket_scheduled_for) { ?>
+        <a href="post.php?cancel_ticket_schedule=<?php echo htmlspecialchars($ticket_id); ?>" class="btn btn-danger text-bold">
+            <i class="fa fa-trash mr-2"></i>Cancel Scheduled Time
+        </a>
+    <?php } ?>
+        <button type="submit" name="edit_ticket_schedule" 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/agent/modals/ticket/ticket_merge.php b/agent/modals/ticket/ticket_merge.php
index 221d9b27..c72d7e5c 100644
--- a/agent/modals/ticket/ticket_merge.php
+++ b/agent/modals/ticket/ticket_merge.php
@@ -1,77 +1,96 @@
-<div class="modal" id="mergeTicketModal<?php echo $ticket_id; ?>" tabindex="-1">
-    <div class="modal-dialog modal-md">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-clone mr-2"></i>Merge & Close <?php echo "$ticket_prefix$ticket_number"; ?> into another ticket</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" id="current_ticket_id" name="ticket_id" value="<?php echo $ticket_id; ?>">
-                <div class="modal-body">
+<?php
 
-                    <div class="form-group">
-                        <label>Ticket number to merge this ticket into <strong class="text-danger">*</strong></label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <?php
-                                // Show the ticket prefix, or just the tag icon
-                                if (empty($ticket_prefix)) {
-                                    echo "<span class=\"input-group-text\"><i class=\"fa fa-fw fa-tag\"></i></span>";
-                                } else {
-                                    echo "<div class=\"input-group-text\"> $ticket_prefix </div>";
-                                }
-                                ?>
-                            </div>
-                            <input type="text" class="form-control" id="merge_into_ticket_number" name="merge_into_ticket_number" placeholder="Ticket number" required onfocusout="merge_into_number_get_details()">
-                            <!-- Calls Javascript function merge_into_number_get_details() after leaving input field -->
-                        </div>
-                    </div>
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
-                        <label>Reason for merge <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-sticky-note"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="merge_comment" placeholder="Comments" required>
-                        </div>
-                    </div>
+$ticket_id = intval($_GET['ticket_id']);
 
-                    <div class="form-group">
-                        <div class="form-check">
-                            <input class="form-check-input" type="checkbox" name="merge_move_replies" value="1" id="checkMoveReplies">
-                            <label class="form-check-label" for="checkMoveReplies">
-                                Move notes & replies to the new parent ticket
-                            </label>
-                        </div>
-                    </div>
+$sql = mysqli_query($mysqli, "SELECT * FROM tickets
+    LEFT JOIN clients ON client_id = ticket_client_id
+    WHERE ticket_id = $ticket_id
+    LIMIT 1"
+);
 
-                    <div class="alert alert-dark" role="alert">
-                        <i>The current ticket will be closed once merging is complete.</i>
-                    </div>
+$row = mysqli_fetch_array($sql);
+$ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
+$ticket_number = intval($row['ticket_number']);
+$client_id = intval($row['ticket_client_id']);
+$client_name = nullable_htmlentities($row['client_name']);
 
+// Generate the HTML form content using output buffering.
+ob_start();
 
-                    <hr>
-                    <div class="form-group" id="merge_into_details_div" hidden>
-                        <h5 id="merge_into_details_number"></h5>
-                        <p id="merge_into_details_client"></p>
-                        <p id="merge_into_details_subject"></p>
-                        <p id="merge_into_details_priority"></p>
-                        <p id="merge_into_details_status"></p>
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" id="merge_ticket_btn" name="merge_ticket" class="btn btn-primary text-bold" disabled><i class="fa fa-check mr-2"></i>Merge</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                    <!-- Merge button starts disabled. Is enabled by the merge_into_number_get_details Javascript function-->
-                </div>
-            </form>
-        </div>
-    </div>
+?>
+<div class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-clone mr-2"></i>Merge & Close <?= "$ticket_prefix$ticket_number" ?> into another ticket</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" id="current_ticket_id" name="ticket_id" value="<?php echo $ticket_id; ?>">
+    <div class="modal-body">
+
+        <div class="form-group">
+            <label>Ticket number to merge this ticket into <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <?php
+                    // Show the ticket prefix, or just the tag icon
+                    if (empty($ticket_prefix)) {
+                        echo "<span class=\"input-group-text\"><i class=\"fa fa-fw fa-tag\"></i></span>";
+                    } else {
+                        echo "<div class=\"input-group-text\"> $ticket_prefix </div>";
+                    }
+                    ?>
+                </div>
+                <input type="text" class="form-control" id="merge_into_ticket_number" name="merge_into_ticket_number" placeholder="Ticket number" required onfocusout="merge_into_number_get_details()">
+                <!-- Calls Javascript function merge_into_number_get_details() after leaving input field -->
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Reason for merge <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-sticky-note"></i></span>
+                </div>
+                <input type="text" class="form-control" name="merge_comment" placeholder="Comments" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="form-check">
+                <input class="form-check-input" type="checkbox" name="merge_move_replies" value="1" id="checkMoveReplies">
+                <label class="form-check-label" for="checkMoveReplies">
+                    Move notes & replies to the new parent ticket
+                </label>
+            </div>
+        </div>
+
+        <div class="alert alert-dark" role="alert">
+            <i>The current ticket will be closed once merging is complete.</i>
+        </div>
+
+
+        <hr>
+        <div class="form-group" id="merge_into_details_div" hidden>
+            <h5 id="merge_into_details_number"></h5>
+            <p id="merge_into_details_client"></p>
+            <p id="merge_into_details_subject"></p>
+            <p id="merge_into_details_priority"></p>
+            <p id="merge_into_details_status"></p>
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" id="merge_ticket_btn" name="merge_ticket" class="btn btn-primary text-bold" disabled><i class="fa fa-check mr-2"></i>Merge</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+        <!-- Merge button starts disabled. Is enabled by the merge_into_number_get_details Javascript function-->
+    </div>
+</form>
 
 <!-- Ticket merge JS -->
-<script src="js/ticket_merge.js"></script>
+<script src="/agent/js/ticket_merge.js"></script>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/ticket.php b/agent/ticket.php
index f0f40c78..f608d388 100644
--- a/agent/ticket.php
+++ b/agent/ticket.php
@@ -46,7 +46,7 @@ if (isset($_GET['ticket_id'])) {
     if (mysqli_num_rows($sql) == 0) {
         echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='tickets.php'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
 
-        include_once "../includes/footer.php";
+        require_once "../includes/footer.php";
     } else {
 
         $row = mysqli_fetch_array($sql);
@@ -419,7 +419,7 @@ if (isset($_GET['ticket_id'])) {
                                         <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/ticket/ticket_summary.php?ticket_id=<?= $ticket_id ?>" data-modal-size="lg">
                                             <i class="fas fa-fw fa-lightbulb mr-2"></i>Summarize
                                         </a>
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#mergeTicketModal<?php echo $ticket_id; ?>">
+                                        <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/ticket/ticket_merge.php?ticket_id=<?= $ticket_id ?>">
                                             <i class="fas fa-fw fa-clone mr-2"></i>Merge
                                         </a>
                                         <?php if (empty($ticket_closed_at)) { ?>
@@ -498,7 +498,7 @@ if (isset($_GET['ticket_id'])) {
                 <!-- Ticket scheduling -->
                 <?php if (empty ($ticket_closed_at)) { ?>
                     <div class="mt-1">
-                        <i class="fa fa-fw fa-calendar-check text-secondary mr-2"></i>Scheduled: <a href="#" data-toggle="modal" data-target="#editTicketScheduleModal"> <?=$ticket_scheduled_wording ?> </a>
+                        <i class="fa fa-fw fa-calendar-check text-secondary mr-2"></i>Scheduled: <a class='ajax-modal' href="#" data-modal-url="modals/ticket/ticket_edit_schedule.php?ticket_id=<?= $ticket_id ?>"> <?=$ticket_scheduled_wording ?> </a>
                     </div>
                 <?php } ?>
                 <!-- End ticket scheduling -->
@@ -1242,11 +1242,7 @@ if (isset($_GET['ticket_id'])) {
 
         </div> <!-- End row -->
 
-        <?php
-        if (lookupUserPermission("module_support") >= 2 && empty($ticket_closed_at)) {
-            require_once "modals/ticket/ticket_edit_schedule.php";
-            require_once "modals/ticket/ticket_merge.php";
-        }
+    <?php
     }
 }