diff --git a/agent/modals/vendor/vendor_details.php b/agent/modals/vendor/vendor.php
similarity index 86%
rename from agent/modals/vendor/vendor_details.php
rename to agent/modals/vendor/vendor.php
index 1f0a86a0..03a59c41 100644
--- a/agent/modals/vendor/vendor_details.php
+++ b/agent/modals/vendor/vendor.php
@@ -7,18 +7,18 @@ $vendor_id = intval($_GET['id']);
 $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_id = $vendor_id LIMIT 1");
 
 $row = mysqli_fetch_assoc($sql);
-$name = escapeSql($row['vendor_name']);
-$description = escapeSql($row['vendor_description']);
-$account_number = escapeSql($row['vendor_account_number']);
-$contact_name = escapeSql($row['vendor_contact_name']);
+$name = escapeHtml($row['vendor_name']);
+$description = escapeHtml($row['vendor_description']);
+$account_number = escapeHtml($row['vendor_account_number']);
+$contact_name = escapeHtml($row['vendor_contact_name']);
 $phone = preg_replace("/[^0-9]/", '',$row['vendor_phone']);
 $extension = preg_replace("/[^0-9]/", '',$row['vendor_extension']);
-$email = escapeSql($row['vendor_email']);
-$website = escapeSql($row['vendor_website']);
-$hours = escapeSql($row['vendor_hours']);
-$sla = escapeSql($row['vendor_sla']);
-$code = escapeSql($row['vendor_code']);
-$notes = escapeSql($row['vendor_notes']);
+$email = escapeHtml($row['vendor_email']);
+$website = escapeHtml($row['vendor_website']);
+$hours = escapeHtml($row['vendor_hours']);
+$sla = escapeHtml($row['vendor_sla']);
+$code = escapeHtml($row['vendor_code']);
+$notes = escapeHtml($row['vendor_notes']);
 $client_id = intval($row['vendor_client_id']);
 
 if ($client_id) {
diff --git a/agent/modals/vendor/vendor_contact_add.php b/agent/modals/vendor/vendor_contact_add.php
deleted file mode 100644
index 52a91237..00000000
--- a/agent/modals/vendor/vendor_contact_add.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<div class="modal" id="addVendorContactModal" 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-plus mr-2"></i>New Vendor Contact</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-                <input type="hidden" name="vendor_id" value="<?php echo $vendor_id; ?>">
-                <div class="modal-body">
-
-                    <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-user"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Full Name" maxlength="200" required autofocus>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Title</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="title" placeholder="Title" maxlength="200">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Department</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-users"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="department" placeholder="Department" maxlength="200">
-                        </div>
-                    </div>
-
-                    <label>Phone</label>
-                    <div class="form-row">
-                        <div class="col-8">
-                            <div class="form-group">
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="phone" placeholder="Phone Number" maxlength="200">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-4">
-                            <input type="text" class="form-control" name="extension" placeholder="Extension" maxlength="200">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Mobile</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="mobile" placeholder="Mobile Phone Number" maxlength="200">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Email</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-                            </div>
-                            <input type="email" class="form-control" name="email" placeholder="Email Address" maxlength="200">
-                        </div>
-                    </div>
-
-                </div>
-
-                <div class="form-group">
-                    <textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"></textarea>
-                </div>
-
-                <div class="modal-footer">
-                    <button type="submit" name="add_vendor_contact" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create</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/agent/modals/vendor/vendor_contact_edit.php b/agent/modals/vendor/vendor_contact_edit.php
deleted file mode 100644
index a3319cb8..00000000
--- a/agent/modals/vendor/vendor_contact_edit.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<div class="modal" id="editVendorContactModal<?php echo $vendor_contact_id; ?>" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-user-edit mr-2"></i>Editing vendor contact: <strong><?php echo $contact_name; ?></strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
-                <input type="hidden" name="vendor_contact_id" value="<?php echo $vendor_contact_id; ?>">
-
-                <div class="modal-body">
-
-                    <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-user"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Full Name" maxlength="200" value="<?php echo $contact_name; ?>" required>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Title</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="title" placeholder="Title" maxlength="200" value="<?php echo $contact_title; ?>">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Department</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-users"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="department" placeholder="Department" maxlength="200" value="<?php echo $contact_department; ?>">
-                        </div>
-                    </div>
-
-                    <label>Phone</label>
-                    <div class="form-row">
-                        <div class="col-8">
-                            <div class="form-group">
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="phone" placeholder="Phone Number" maxlength="200" value="<?php echo $contact_phone; ?>">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-4">
-                            <input type="text" class="form-control" name="extension" placeholder="Extension" maxlength="200" value="<?php echo $contact_extension; ?>">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Mobile</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="mobile" placeholder="Mobile Phone Number" maxlength="200" value="<?php echo $contact_mobile; ?>">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Email</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-                            </div>
-                            <input type="email" class="form-control" name="email" placeholder="Email Address" maxlength="200" value="<?php echo $contact_email; ?>">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"><?php echo $contact_notes; ?></textarea>
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="edit_vendor_contact" class="btn btn-primary text-bold"><i class="fas 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>