diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index c6c63e27..a35f898c 100644
--- a/ticket_add_modal.php
+++ b/ticket_add_modal.php
@@ -128,11 +128,31 @@
                                         <select class="form-control select2" name="contact" required>
                                             <option value="">- Contact -</option>
                                             <?php
-                                            $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL ORDER BY contact_name ASC");
+                                            $sql = mysqli_query($mysqli, "SELECT * 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)) {
                                                 $contact_id = intval($row['contact_id']);
-                                                $contact_name = nullable_htmlentities($row['contact_name']); ?>
-                                                <option value="<?php echo $contact_id; ?>" <?php if ($primary_contact == $contact_id) { echo "selected"; } ?>><?php echo "$contact_name"; ?></option>
+                                                $contact_name = nullable_htmlentities($row['contact_name']);
+                                                $contact_primary = intval($row['contact_primary']);
+                                                if($contact_primary == 1) {
+                                                    $contact_primary_display = " (Primary)";
+                                                } else {
+                                                    $contact_primary_display = "";
+                                                }
+                                                $contact_technical = intval($row['contact_technical']);
+                                                if($contact_technical == 1) {
+                                                    $contact_technical_display = " (Technical)";
+                                                } else {
+                                                    $contact_technical_display = "";
+                                                }
+                                                $contact_title = nullable_htmlentities($row['contact_title']);
+                                                if(!empty($contact_title)) {
+                                                    $contact_title_display = " - $contact_title";
+                                                } else {
+                                                    $contact_title_display = "";
+                                                }
+                                                
+                                                ?>
+                                                <option value="<?php echo $contact_id; ?>" <?php if ($contact_primary == 1) { echo "selected"; } ?>><?php echo "$contact_name$contact_title_display$contact_primary_display$contact_technical_display"; ?></option>
 
                                             <?php } ?>
                                         </select>
diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php
index e4d2b88b..e69de29b 100644
--- a/ticket_edit_modal.php
+++ b/ticket_edit_modal.php
@@ -1,203 +0,0 @@
-<div class="modal" id="editTicketModal<?php echo $ticket_id; ?>" tabindex="-1">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-life-ring mr-2"></i>Editing 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="client_id" value="<?php echo $client_id; ?>">
-                <input type="hidden" name="ticket_number" value="<?php echo "$ticket_prefix$ticket_number"; ?>">
-                <div class="modal-body bg-white">
-
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $ticket_id; ?>"><i class="fa fa-fw fa-life-ring mr-2"></i>Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-contacts<?php echo $ticket_id; ?>"><i class="fa fa-fw fa-users mr-2"></i>Contacts</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-assets<?php echo $ticket_id; ?>"><i class="fa fa-fw fa-desktop mr-2"></i>Assets</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-vendors<?php echo $ticket_id; ?>"><i class="fa fa-fw fa-building mr-2"></i>Vendors</a>
-                        </li>
-                    </ul>
-
-                    <hr>
-
-                    <div class="tab-content">
-
-                        <div class="tab-pane fade show active" id="pills-details<?php echo $ticket_id; ?>">
-
-                            <div class="form-group">
-                                <label>Subject <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="subject" value="<?php echo $ticket_subject; ?>" placeholder="Subject" required>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <textarea class="form-control tinymce" rows="8" name="details"><?php echo $ticket_details; ?></textarea>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Priority <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-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 class="form-group">
-                                <label>Assigned 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="assigned_to">
-                                        <option value="0">Not Assigned</option>
-                                        <?php
-
-                                        $sql_assign_to_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_role > 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
-                                        );
-                                        while ($row = mysqli_fetch_array($sql_assign_to_select)) {
-                                            $user_id = intval($row['user_id']);
-                                            $user_name = nullable_htmlentities($row['user_name']);
-                                            ?>
-                                            <option <?php if ($ticket_assigned_to == $user_id) { echo "selected"; } ?> value="<?php echo $user_id; ?>"><?php echo $user_name; ?></option>
-
-                                            <?php
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-contacts<?php echo $ticket_id; ?>">
-
-                            <div class="form-group">
-                                <label>Client 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 * FROM contacts WHERE contact_client_id = $client_id ORDER BY 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']);
-                                            ?>
-                                            <option <?php if ($contact_id_select == $contact_id) { echo "selected"; } ?> value="<?php echo $contact_id_select; ?>"><?php echo $contact_name_select; ?></option>
-
-                                            <?php
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-assets<?php echo $ticket_id; ?>">
-
-                            <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 * FROM assets WHERE asset_client_id = $client_id 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']);
-                                            ?>
-                                            <option <?php if ($asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
-
-                                            <?php
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-vendors<?php echo $ticket_id; ?>">
-
-                            <div class="form-group">
-                                <label>Vendor</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="vendor">
-                                        <option value="0">- None -</option>
-                                        <?php
-
-                                        $sql_vendors = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_client_id = $client_id AND vendor_template = 0 ORDER BY vendor_name ASC");
-                                        while ($row = mysqli_fetch_array($sql_vendors)) {
-                                            $vendor_id_select = intval($row['vendor_id']);
-                                            $vendor_name_select = nullable_htmlentities($row['vendor_name']);
-                                            ?>
-                                            <option <?php if ($vendor_id == $vendor_id_select) { echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
-
-                                            <?php
-                                        }
-                                        ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Vendor Ticket Number</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="vendor_ticket_number" placeholder="Vendor ticket number" value="<?php echo $ticket_vendor_ticket_number; ?>">
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-
-                </div>
-
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="edit_ticket" 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>