diff --git a/admin_ticket_template_edit_modal.php b/admin_ticket_template_edit_modal.php
index 4a49f6a4..7bd40ee8 100644
--- a/admin_ticket_template_edit_modal.php
+++ b/admin_ticket_template_edit_modal.php
@@ -17,9 +17,6 @@
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="pill" href="#pills-ticket"><i class="fa fa-fw fa-life-ring mr-2"></i>Template</a>
                         </li>
-                        <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-project-template"><i class="fa fa-fw fa-project-diagram mr-2"></i>Project Template</a>
-                        </li>
                     </ul>
 
                     <hr>
@@ -79,31 +76,6 @@
                         
                         </div>
 
-                        <div class="tab-pane fade" id="pills-project-template">
-
-                            <div class="form-group">
-                                <label>Project Template</label>
-                                <div class="input-group">
-                                    <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
-                                    </div>
-                                    <select class="form-control select2" name="project_template">
-                                        <option value="0">- None -</option>
-                                        <?php
-
-                                        $sql_project_templates = mysqli_query($mysqli, "SELECT * FROM project_templates WHERE project_template_archived_at IS NULL ORDER BY project_template_name ASC");
-                                        while ($row = mysqli_fetch_array($sql_project_templates)) {
-                                            $project_template_id_select = intval($row['project_template_id']);
-                                            $project_template_name_select = nullable_htmlentities($row['project_template_name']); ?>
-                                            <option <?php if($project_template_id == $project_template_id_select) { echo "selected"; } ?> value="<?php echo $project_template_id_select; ?>"><?php echo $project_template_name_select; ?></option>
-
-                                        <?php } ?>
-                                    </select>
-                                </div>
-                            </div>
-
-                        </div>
-
                     </div>
                 
                 </div>
diff --git a/client_contact_add_modal.php b/client_contact_add_modal.php
index b5942535..b7a0235f 100644
--- a/client_contact_add_modal.php
+++ b/client_contact_add_modal.php
@@ -25,7 +25,7 @@
                             <a class="nav-link" data-toggle="pill" href="#pills-photo"><i class="fa fa-fw fa-image mr-2"></i>Photo</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-secure"><i class="fa fa-fw fa-lock mr-2"></i>Secure</a>
+                            <a class="nav-link" data-toggle="pill" href="#pills-access"><i class="fa fa-fw fa-lock mr-2"></i>Access</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="pill" href="#pills-notes"><i class="fa fa-fw fa-edit mr-2"></i>Notes</a>
@@ -132,35 +132,6 @@
                                 </div>
                             </div>
 
-                            <div class="form-row">
-
-                                <div class="col-md-4">
-                                    <div class="form-group">
-                                        <div class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox" name="contact_important" value="1">
-                                            <label class="custom-control-label" for="contactImportantCheckbox">Important</label>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-md-4">
-                                    <div class="form-group">
-                                        <div class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox" name="contact_billing" value="1">
-                                            <label class="custom-control-label" for="contactBillingCheckbox">Billing</label>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-md-4">
-                                    <div class="form-group">
-                                        <div class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox" name="contact_technical" value="1">
-                                            <label class="custom-control-label" for="contactTechnicalCheckbox">Technical</label>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            </div>
-
                         </div>
 
                         <div class="tab-pane fade" id="pills-photo">
@@ -172,7 +143,7 @@
 
                         </div>
 
-                        <div class="tab-pane fade" id="pills-secure">
+                        <div class="tab-pane fade" id="pills-access">
 
                             <div class="form-group">
                                 <label>Pin</label>
@@ -218,6 +189,36 @@
                                     </div>
                                 </div>
                             <?php } ?>
+                            
+                            <label>Roles:</label>
+                            <div class="form-row">
+
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox" name="contact_important" value="1">
+                                            <label class="custom-control-label" for="contactImportantCheckbox">Important</label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox" name="contact_billing" value="1">
+                                            <label class="custom-control-label" for="contactBillingCheckbox">Billing</label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox" name="contact_technical" value="1">
+                                            <label class="custom-control-label" for="contactTechnicalCheckbox">Technical</label>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
 
                         </div>
 
diff --git a/client_contact_edit_modal.php b/client_contact_edit_modal.php
index bea22ae9..d1d454c2 100644
--- a/client_contact_edit_modal.php
+++ b/client_contact_edit_modal.php
@@ -27,7 +27,7 @@
                             <a class="nav-link" data-toggle="pill" href="#pills-photo<?php echo $contact_id; ?>"><i class="fa fa-fw fa-image mr-2"></i>Photo</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" data-toggle="pill" href="#pills-secure<?php echo $contact_id; ?>"><i class="fa fa-fw fa-lock mr-2"></i>Secure</a>
+                            <a class="nav-link" data-toggle="pill" href="#pills-access<?php echo $contact_id; ?>"><i class="fa fa-fw fa-lock mr-2"></i>Access</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $contact_id; ?>"><i class="fa fa-fw fa-edit mr-2"></i>Notes</a>
@@ -142,38 +142,9 @@
                                 </div>
                             </div>
 
-                            <div class="form-row">
-
-                                <div class="col-md-4">
-                                    <div class="form-group">
-                                        <div class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox<?php echo $contact_id; ?>" name="contact_important" value="1" <?php if ($contact_important == 1) { echo "checked"; } ?>>
-                                            <label class="custom-control-label" for="contactImportantCheckbox<?php echo $contact_id; ?>">Important</label>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-md-4">
-                                    <div class="form-group">
-                                        <div class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox<?php echo $contact_id; ?>" name="contact_billing" value="1" <?php if ($contact_billing == 1) { echo "checked"; } ?>>
-                                            <label class="custom-control-label" for="contactBillingCheckbox<?php echo $contact_id; ?>">Billing</label>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-md-4">
-                                    <div class="form-group">
-                                        <div class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox<?php echo $contact_id; ?>" name="contact_technical" value="1" <?php if ($contact_technical == 1) { echo "checked"; } ?>>
-                                            <label class="custom-control-label" for="contactTechnicalCheckbox<?php echo $contact_id; ?>">Technical</label>
-                                        </div>
-                                    </div>
-                                </div>
-
-                            </div>
-
                         </div>
 
-                        <div class="tab-pane fade" id="pills-secure<?php echo $contact_id; ?>">
+                        <div class="tab-pane fade" id="pills-access<?php echo $contact_id; ?>">
 
                             <div class="form-group">
                                 <label>Pin</label>
@@ -226,6 +197,37 @@
 
                             <?php } ?>
 
+                            <label>Roles:</label>
+
+                            <div class="form-row">
+
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox<?php echo $contact_id; ?>" name="contact_important" value="1" <?php if ($contact_important == 1) { echo "checked"; } ?>>
+                                            <label class="custom-control-label" for="contactImportantCheckbox<?php echo $contact_id; ?>">Important</label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox<?php echo $contact_id; ?>" name="contact_billing" value="1" <?php if ($contact_billing == 1) { echo "checked"; } ?>>
+                                            <label class="custom-control-label" for="contactBillingCheckbox<?php echo $contact_id; ?>">Billing</label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-4">
+                                    <div class="form-group">
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox<?php echo $contact_id; ?>" name="contact_technical" value="1" <?php if ($contact_technical == 1) { echo "checked"; } ?>>
+                                            <label class="custom-control-label" for="contactTechnicalCheckbox<?php echo $contact_id; ?>">Technical</label>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+
                         </div>
 
                         <div class="tab-pane fade" id="pills-photo<?php echo $contact_id; ?>">
diff --git a/post/admin.php b/post/admin.php
index 7c8e116c..1661533f 100644
--- a/post/admin.php
+++ b/post/admin.php
@@ -154,7 +154,6 @@ if (isset($_POST['edit_ticket_template'])) {
     $description = sanitizeInput($_POST['description']);
     $subject = sanitizeInput($_POST['subject']);
     $details = mysqli_real_escape_string($mysqli, $_POST['details']);
-    $project_template_id = intval($_POST['project_template']);
 
     mysqli_query($mysqli, "UPDATE ticket_templates SET ticket_template_name = '$name', ticket_template_description = '$description', ticket_template_subject = '$subject', ticket_template_details = '$details' WHERE ticket_template_id = $ticket_template_id");