diff --git a/admin/document_template.php b/admin/document_template.php
index 7516abf1..afb6c811 100644
--- a/admin/document_template.php
+++ b/admin/document_template.php
@@ -22,7 +22,7 @@
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fa fa-fw fa-file mr-2"></i>Document Templates</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDocumentTemplateModal">
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/document_template/document_template_add.php" data-modal-size="xl">
                 <i class="fas fa-plus mr-2"></i>New Template
             </button>
         </div>
@@ -121,38 +121,4 @@
     </div>
 </div>
 
-<?php require_once "modals/document_template/document_template_add.php"; ?>
-<?php require_once "../includes/footer.php"; ?>
-
-<script>
-$(document).ready(function(){
-
-    $('#generateAIContent').on('click', function(){
-        var prompt = $('#aiPrompt').val().trim();
-        if(prompt === '') {
-            alert('Please enter a prompt.');
-            return;
-        }
-
-        $('#generateAIContent').prop('disabled', true).html('<i class="fa fa-spinner fa-spin"></i> Generating...');
-
-        $.ajax({
-            url: 'post.php?ai_create_document_template', // The PHP script that calls the OpenAI API
-            method: 'POST',
-            data: { prompt: prompt },
-            dataType: 'html',
-            success: function(response) {
-                // Assuming you have exactly one TinyMCE instance on the page
-                // and it's targeting the .tinymce textarea:
-                tinymce.activeEditor.setContent(response);
-            },
-            error: function() {
-                alert('Error generating content. Please try again.');
-            },
-            complete: function() {
-                $('#generateAIContent').prop('disabled', false).html('<i class="fa fa-fw fa-magic mr-1"></i>Generate with AI');
-            }
-        });
-    });
-});
-</script>
+<?php require_once "../includes/footer.php";
diff --git a/admin/modals/document_template/document_template_add.php b/admin/modals/document_template/document_template_add.php
index 856873f8..52769a3b 100644
--- a/admin/modals/document_template/document_template_add.php
+++ b/admin/modals/document_template/document_template_add.php
@@ -1,49 +1,87 @@
-<div class="modal" id="addDocumentTemplateModal" tabindex="-1">
-    <div class="modal-dialog modal-xl">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>Creating Document Template</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">
+<?php
 
-                    <div class="form-group">
-                        <input type="text" class="form-control" name="name" placeholder="Template name" maxlength="200">
-                    </div>
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
-                        <label>Enter a prompt for the type of IT documentation you want to generate:</label>
-                        <div class="input-group mb-3">
-                            <input type="text" class="form-control" id="aiPrompt" placeholder="e.g. 'A network troubleshooting guide for junior technicians'">
-                            <div class="input-group-append">
-                                <button class="btn btn-info" type="button" id="generateAIContent">
-                                    <i class="fa fa-fw fa-magic mr-1"></i>Generate with AI
-                                </button>
-                            </div>
-                        </div>
-                    </div>
+ob_start();
 
-                    <!-- TinyMCE Content -->
-                    <div class="form-group">
-                        <textarea class="form-control tinymce" name="content"></textarea>
-                    </div>
+?>
 
-                    <div class="form-group">
-                        <input type="text" class="form-control" name="description" placeholder="Enter a short summary">
-                    </div>
-                
-                </div>
-
-                <div class="modal-footer">
-
-                    <button type="submit" name="add_document_template" class="btn btn-primary text-bold"><i class="fa 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 class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>Creating Document Template</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">
+
+        <div class="form-group">
+            <input type="text" class="form-control" name="name" placeholder="Template name" maxlength="200">
+        </div>
+
+        <div class="form-group">
+            <label>Enter a prompt for the type of IT documentation you want to generate:</label>
+            <div class="input-group mb-3">
+                <input type="text" class="form-control" id="aiPrompt" placeholder="e.g. 'A network troubleshooting guide for junior technicians'">
+                <div class="input-group-append">
+                    <button class="btn btn-info" type="button" id="generateAIContent">
+                        <i class="fa fa-fw fa-magic mr-1"></i>Generate with AI
+                    </button>
+                </div>
+            </div>
+        </div>
+
+        <!-- TinyMCE Content -->
+        <div class="form-group">
+            <textarea class="form-control tinymce" name="content"></textarea>
+        </div>
+
+        <div class="form-group">
+            <input type="text" class="form-control" name="description" placeholder="Enter a short summary">
+        </div>
+    
+    </div>
+
+    <div class="modal-footer">
+
+        <button type="submit" name="add_document_template" class="btn btn-primary text-bold"><i class="fa 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>
+
+<script>
+$(document).ready(function(){
+
+    $('#generateAIContent').on('click', function(){
+        var prompt = $('#aiPrompt').val().trim();
+        if(prompt === '') {
+            alert('Please enter a prompt.');
+            return;
+        }
+
+        $('#generateAIContent').prop('disabled', true).html('<i class="fa fa-spinner fa-spin"></i> Generating...');
+
+        $.ajax({
+            url: '/agent/ajax.php?ai_create_document_template', // The PHP script that calls the OpenAI API
+            method: 'POST',
+            data: { prompt: prompt },
+            dataType: 'html',
+            success: function(response) {
+                // Assuming you have exactly one TinyMCE instance on the page
+                // and it's targeting the .tinymce textarea:
+                tinymce.activeEditor.setContent(response);
+            },
+            error: function() {
+                alert('Error generating content. Please try again.');
+            },
+            complete: function() {
+                $('#generateAIContent').prop('disabled', false).html('<i class="fa fa-fw fa-magic mr-1"></i>Generate with AI');
+            }
+        });
+    });
+});
+</script>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/admin/modals/software_template/software_template_add.php b/admin/modals/software_template/software_template_add.php
index 7f83720e..a0ed9bf0 100644
--- a/admin/modals/software_template/software_template_add.php
+++ b/admin/modals/software_template/software_template_add.php
@@ -1,83 +1,87 @@
-<div class="modal" id="addSoftwareTemplateModal" 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-cube mr-2"></i>New License Template</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">
+<?php
 
-                    <div class="form-group">
-                        <label>Template 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-cube"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="name" placeholder="Software name" maxlength="200" required autofocus>
-                        </div>
-                    </div>
+require_once '../../../includes/modal_header.php';
 
-                    <div class="form-group">
-                        <label>Version</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="version" placeholder="Software version" maxlength="200">
-                        </div>
-                    </div>
+ob_start();
 
-                    <div class="form-group">
-                        <label>Description</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                            </div>
-                            <input type="text" class="form-control" name="description" placeholder="Short description">
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>Type <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>
-                            <select class="form-control select2" name="type" required>
-                                <option value="">- Type -</option>
-                                <?php foreach($software_types_array as $software_type) { ?>
-                                    <option><?php echo $software_type; ?></option>
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <label>License Type</label>
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-                            </div>
-                            <select class="form-control select2" name="license_type">
-                                <option value="">- Select a License Type -</option>
-                                <?php foreach($license_types_array as $license_type) { ?>
-                                    <option><?php echo $license_type; ?></option>
-                                <?php } ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_software_template" class="btn btn-primary text-bold"><i class="fa 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 class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>New License Template</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">
+
+        <div class="form-group">
+            <label>Template 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-cube"></i></span>
+                </div>
+                <input type="text" class="form-control" name="name" placeholder="Software name" maxlength="200" required autofocus>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Version</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                </div>
+                <input type="text" class="form-control" name="version" placeholder="Software version" maxlength="200">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Description</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                </div>
+                <input type="text" class="form-control" name="description" placeholder="Short description">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>Type <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>
+                <select class="form-control select2" name="type" required>
+                    <option value="">- Type -</option>
+                    <?php foreach($software_types_array as $software_type) { ?>
+                        <option><?php echo $software_type; ?></option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label>License Type</label>
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                </div>
+                <select class="form-control select2" name="license_type">
+                    <option value="">- Select a License Type -</option>
+                    <?php foreach($license_types_array as $license_type) { ?>
+                        <option><?php echo $license_type; ?></option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_software_template" class="btn btn-primary text-bold"><i class="fa 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>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/admin/modals/vendor_template/vendor_template_add.php b/admin/modals/vendor_template/vendor_template_add.php
index c9b6ed62..31128ba3 100644
--- a/admin/modals/vendor_template/vendor_template_add.php
+++ b/admin/modals/vendor_template/vendor_template_add.php
@@ -1,168 +1,171 @@
-<div class="modal" id="addVendorTemplateModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header bg-dark">
-                <h5 class="modal-title"><i class="fas fa-fw fa-building mr-2"></i>New Vendor Template</h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
+<?php
 
-                <input type="hidden" name="client_id" value="<?php if (isset($_GET['client_id'])) { echo $client_id; } else { echo 0; } ?>">
+require_once '../../../includes/modal_header.php';
 
-                <div class="modal-body">
+ob_start();
 
-                    <ul class="nav nav-pills nav-justified mb-3">
-                        <li class="nav-item">
-                            <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-support">Support</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
-                        </li>
-                    </ul>
+?>
 
-                    <hr>
-
-                    <div class="tab-content">
-
-                        <div class="tab-pane fade show active" id="pills-details">
-
-                            <div class="form-group">
-                                <label>Vendor 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-building"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="name" placeholder="Vendor Name" maxlength="200" required autofocus>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Description</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="description" placeholder="Description" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Account Number</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-fingerprint"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="account_number" placeholder="Account number" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Account Manager</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="contact_name" placeholder="Account manager's name" maxlength="200">
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-support">
-
-                            <label>Support Phone / <span class="text-secondary">Extension</span></label>
-                            <div class="form-row">
-                                <div class="col-9">
-                                    <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="tel" class="form-control col-2" name="phone_country_code" placeholder="+" maxlength="4">
-                                            <input type="tel" class="form-control" name="phone" placeholder="Phone Number" maxlength="200">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-3">
-                                    <div class="form-group">
-                                        <input type="text" class="form-control" name="extension" placeholder="ext." maxlength="200">
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Support Hours</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="hours" placeholder="Support Hours" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Support 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="Support Email" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Support Website URL</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="website" placeholder="Do not include http(s)://" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>Pin/Code</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="code" placeholder="Access Code or Pin" maxlength="200">
-                                </div>
-                            </div>
-
-                            <div class="form-group">
-                                <label>SLA</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-handshake"></i></span>
-                                    </div>
-                                    <input type="text" class="form-control" name="sla" placeholder="SLA Response Time" maxlength="200">
-                                </div>
-                            </div>
-
-                        </div>
-
-                        <div class="tab-pane fade" id="pills-notes">
-
-                            <div class="form-group">
-                                <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
-                            </div>
-
-                        </div>
-
-                    </div>
-
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" name="add_vendor_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create Template</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 class="modal-header bg-dark">
+    <h5 class="modal-title"><i class="fas fa-fw fa-building mr-2"></i>New Vendor Template</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">
+
+        <ul class="nav nav-pills nav-justified mb-3">
+            <li class="nav-item">
+                <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-support">Support</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
+            </li>
+        </ul>
+
+        <hr>
+
+        <div class="tab-content">
+
+            <div class="tab-pane fade show active" id="pills-details">
+
+                <div class="form-group">
+                    <label>Vendor 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-building"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name" placeholder="Vendor Name" maxlength="200" required autofocus>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Description" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Account Number</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-fingerprint"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="account_number" placeholder="Account number" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Account Manager</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="contact_name" placeholder="Account manager's name" maxlength="200">
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-support">
+
+                <label>Support Phone / <span class="text-secondary">Extension</span></label>
+                <div class="form-row">
+                    <div class="col-9">
+                        <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="tel" class="form-control col-2" name="phone_country_code" placeholder="+" maxlength="4">
+                                <input type="tel" class="form-control" name="phone" placeholder="Phone Number" maxlength="200">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-3">
+                        <div class="form-group">
+                            <input type="text" class="form-control" name="extension" placeholder="ext." maxlength="200">
+                        </div>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Support Hours</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="hours" placeholder="Support Hours" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Support 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="Support Email" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Support Website URL</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="website" placeholder="Do not include http(s)://" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Pin/Code</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="code" placeholder="Access Code or Pin" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>SLA</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-handshake"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="sla" placeholder="SLA Response Time" maxlength="200">
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-notes">
+
+                <div class="form-group">
+                    <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
+                </div>
+
+            </div>
+
+        </div>
+
+    </div>
+    <div class="modal-footer">
+        <button type="submit" name="add_vendor_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create Template</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/admin/software_template.php b/admin/software_template.php
index d3631b93..3059fd95 100644
--- a/admin/software_template.php
+++ b/admin/software_template.php
@@ -21,7 +21,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     <div class="card-header py-2">
         <h3 class="card-title mt-2"><i class="fas fa-fw fa-cube mr-2"></i>License Templates</h3>
         <div class="card-tools">
-            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addSoftwareTemplateModal"><i class="fas fa-plus mr-2"></i>New License Template</button>
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/software_template/software_template_add.php"><i class="fas fa-plus mr-2"></i>New License Template</button>
         </div>
     </div>
     <div class="card-body">
@@ -127,5 +127,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </div>
 
 <?php
-require_once "modals/software_template/software_template_add.php";
 require_once "../includes/footer.php";
diff --git a/admin/vendor_template.php b/admin/vendor_template.php
index 5658db73..716371b9 100644
--- a/admin/vendor_template.php
+++ b/admin/vendor_template.php
@@ -16,153 +16,151 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 ?>
 
-    <div class="card card-dark">
-        <div class="card-header py-2">
-            <h3 class="card-title mt-2">
-                <i class="fas fa-fw fa-building mr-2"></i>Vendor Templates
-            </h3>
-            <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addVendorTemplateModal">
-                    <i class="fas fa-plus mr-2"></i>New Vendor Template
-                </button>
-            </div>
-        </div>
-        <div class="card-body">
-            <form autocomplete="off">
-                <div class="row">
-
-                    <div class="col-md-4">
-                        <div class="input-group mb-3 mb-md-0">
-                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Vendors Templates">
-                            <div class="input-group-append">
-                                <button class="btn btn-dark"><i class="fa fa-search"></i></button>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-            </form>
-            <hr>
-            <div class="table-responsive">
-                <table class="table table-striped table-borderless table-hover">
-                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
-                    <tr>
-                        <th>
-                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_template_name&order=<?php echo $disp; ?>">
-                                Vendor <?php if ($sort == 'vendor_template_name') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>
-                            <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_template_description&order=<?php echo $disp; ?>">
-                                Description <?php if ($sort == 'vendor_template_description') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <th>Contact</th>
-                        <th class="text-center">Action</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php
-
-                    while ($row = mysqli_fetch_array($sql)) {
-                        $vendor_template_id = intval($row['vendor_template_id']);
-                        $vendor_template_name = nullable_htmlentities($row['vendor_template_name']);
-                        $vendor_template_description = nullable_htmlentities($row['vendor_template_description']);
-                        if (empty($vendor_template_description)) {
-                            $vendor_template_description_display = "-";
-                        } else {
-                            $vendor_template_description_display = $vendor_template_description;
-                        }
-                        $vendor_template_account_number = nullable_htmlentities($row['vendor_template_account_number']);
-                        $vendor_template_contact_name = nullable_htmlentities($row['vendor_template_contact_name']);
-                        if (empty($vendor_template_contact_name)) {
-                            $vendor_template_contact_name_display = "-";
-                        } else {
-                            $vendor_template_contact_name_display = $vendor_template_contact_name;
-                        }
-                        $vendor_template_phone = formatPhoneNumber($row['vendor_template_phone']);
-                        $vendor_template_extension = nullable_htmlentities($row['vendor_template_extension']);
-                        $vendor_template_email = nullable_htmlentities($row['vendor_template_email']);
-                        $vendor_template_website = nullable_htmlentities($row['vendor_template_website']);
-                        $vendor_template_hours = nullable_htmlentities($row['vendor_template_hours']);
-                        $vendor_template_sla = nullable_htmlentities($row['vendor_template_sla']);
-                        $vendor_template_code = nullable_htmlentities($row['vendor_template_code']);
-                        $vendor_template_notes = nullable_htmlentities($row['vendor_template_notes']);
-
-                        ?>
-                        <tr>
-                            <th>
-                                <a class="text-dark ajax-modal" href="#"
-                                    data-modal-url="modals/vendor_template/vendor_template_edit.php?id=<?= $vendor_template_id ?>">
-                                    <i class="fa fa-fw fa-building text-secondary mr-2"></i><?php echo $vendor_template_name; ?>
-                                </a>
-                                <?php
-                                if (!empty($vendor_template_account_number)) {
-                                    ?>
-                                    <br>
-                                    <small class="text-secondary"><?php echo $vendor_template_account_number; ?></small>
-                                    <?php
-                                }
-                                ?>
-                            </th>
-                            <td><?php echo $vendor_template_description_display; ?></td>
-                            <td>
-                                <?php
-                                if (!empty($vendor_template_contact_name)) {
-                                    ?>
-                                    <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $vendor_template_contact_name_display; ?>
-                                    <br>
-                                    <?php
-                                } else {
-                                    echo $vendor_template_contact_name_display;
-                                }
-
-                                if (!empty($vendor_template_phone)) { ?>
-                                    <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $vendor_template_phone; ?>
-                                    <br>
-                                <?php }
-
-                                if (!empty($vendor_template_email)) { ?>
-                                    <i class="fa fa-fw fa-envelope text-secondary mr-2 mb-2"></i><?php echo $vendor_template_email; ?>
-                                    <br>
-                                <?php } ?>
-
-                            </td>
-                            <td>
-                                <div class="dropdown dropleft text-center">
-                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                                        <i class="fas fa-ellipsis-h"></i>
-                                    </button>
-                                    <div class="dropdown-menu">
-                                        <a class="dropdown-item ajax-modal" href="#"
-                                            data-modal-url="modals/vendor_template/vendor_template_edit.php?id=<?= $vendor_template_id ?>">
-                                            <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                        </a>
-                                        <?php if ($session_user_role == 3) { ?>
-                                            <div class="dropdown-divider"></div>
-                                            <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_vendor=<?php echo $vendor_template_id; ?>">
-                                                <i class="fas fa-fw fa-trash mr-2"></i>Delete
-                                            </a>
-                                        <?php } ?>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-
-                        <?php
-
-                    }
-
-                    ?>
-
-                    </tbody>
-                </table>
-            </div>
-            <?php require_once "../includes/filter_footer.php";
- ?>
+<div class="card card-dark">
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2">
+            <i class="fas fa-fw fa-building mr-2"></i>Vendor Templates
+        </h3>
+        <div class="card-tools">
+            <button type="button" class="btn btn-primary ajax-modal" data-modal-url="modals/vendor_template/vendor_template_add.php">
+                <i class="fas fa-plus mr-2"></i>New Vendor Template
+            </button>
         </div>
     </div>
+    <div class="card-body">
+        <form autocomplete="off">
+            <div class="row">
+
+                <div class="col-md-4">
+                    <div class="input-group mb-3 mb-md-0">
+                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Vendors Templates">
+                        <div class="input-group-append">
+                            <button class="btn btn-dark"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </form>
+        <hr>
+        <div class="table-responsive">
+            <table class="table table-striped table-borderless table-hover">
+                <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                <tr>
+                    <th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_template_name&order=<?php echo $disp; ?>">
+                            Vendor <?php if ($sort == 'vendor_template_name') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>
+                        <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_template_description&order=<?php echo $disp; ?>">
+                            Description <?php if ($sort == 'vendor_template_description') { echo $order_icon; } ?>
+                        </a>
+                    </th>
+                    <th>Contact</th>
+                    <th class="text-center">Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php
+
+                while ($row = mysqli_fetch_array($sql)) {
+                    $vendor_template_id = intval($row['vendor_template_id']);
+                    $vendor_template_name = nullable_htmlentities($row['vendor_template_name']);
+                    $vendor_template_description = nullable_htmlentities($row['vendor_template_description']);
+                    if (empty($vendor_template_description)) {
+                        $vendor_template_description_display = "-";
+                    } else {
+                        $vendor_template_description_display = $vendor_template_description;
+                    }
+                    $vendor_template_account_number = nullable_htmlentities($row['vendor_template_account_number']);
+                    $vendor_template_contact_name = nullable_htmlentities($row['vendor_template_contact_name']);
+                    if (empty($vendor_template_contact_name)) {
+                        $vendor_template_contact_name_display = "-";
+                    } else {
+                        $vendor_template_contact_name_display = $vendor_template_contact_name;
+                    }
+                    $vendor_template_phone = formatPhoneNumber($row['vendor_template_phone']);
+                    $vendor_template_extension = nullable_htmlentities($row['vendor_template_extension']);
+                    $vendor_template_email = nullable_htmlentities($row['vendor_template_email']);
+                    $vendor_template_website = nullable_htmlentities($row['vendor_template_website']);
+                    $vendor_template_hours = nullable_htmlentities($row['vendor_template_hours']);
+                    $vendor_template_sla = nullable_htmlentities($row['vendor_template_sla']);
+                    $vendor_template_code = nullable_htmlentities($row['vendor_template_code']);
+                    $vendor_template_notes = nullable_htmlentities($row['vendor_template_notes']);
+
+                    ?>
+                    <tr>
+                        <th>
+                            <a class="text-dark ajax-modal" href="#"
+                                data-modal-url="modals/vendor_template/vendor_template_edit.php?id=<?= $vendor_template_id ?>">
+                                <i class="fa fa-fw fa-building text-secondary mr-2"></i><?php echo $vendor_template_name; ?>
+                            </a>
+                            <?php
+                            if (!empty($vendor_template_account_number)) {
+                                ?>
+                                <br>
+                                <small class="text-secondary"><?php echo $vendor_template_account_number; ?></small>
+                                <?php
+                            }
+                            ?>
+                        </th>
+                        <td><?php echo $vendor_template_description_display; ?></td>
+                        <td>
+                            <?php
+                            if (!empty($vendor_template_contact_name)) {
+                                ?>
+                                <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $vendor_template_contact_name_display; ?>
+                                <br>
+                                <?php
+                            } else {
+                                echo $vendor_template_contact_name_display;
+                            }
+
+                            if (!empty($vendor_template_phone)) { ?>
+                                <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $vendor_template_phone; ?>
+                                <br>
+                            <?php }
+
+                            if (!empty($vendor_template_email)) { ?>
+                                <i class="fa fa-fw fa-envelope text-secondary mr-2 mb-2"></i><?php echo $vendor_template_email; ?>
+                                <br>
+                            <?php } ?>
+
+                        </td>
+                        <td>
+                            <div class="dropdown dropleft text-center">
+                                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                    <i class="fas fa-ellipsis-h"></i>
+                                </button>
+                                <div class="dropdown-menu">
+                                    <a class="dropdown-item ajax-modal" href="#"
+                                        data-modal-url="modals/vendor_template/vendor_template_edit.php?id=<?= $vendor_template_id ?>">
+                                        <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                    </a>
+                                    <?php if ($session_user_role == 3) { ?>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger text-bold confirm-link" href="post.php?delete_vendor=<?php echo $vendor_template_id; ?>">
+                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                        </a>
+                                    <?php } ?>
+                                </div>
+                            </div>
+                        </td>
+                    </tr>
+
+                    <?php
+
+                }
+
+                ?>
+
+                </tbody>
+            </table>
+        </div>
+        <?php require_once "../includes/filter_footer.php"; ?>
+    </div>
+</div>
 
 <?php
-require_once "modals/vendor_template/vendor_template_add.php";
 require_once "../includes/footer.php";