diff --git a/admin/ai_model.php b/admin/ai_model.php
index f2fb497d..758a76f3 100644
--- a/admin/ai_model.php
+++ b/admin/ai_model.php
@@ -111,4 +111,4 @@ $num_rows = mysqli_num_rows($sql);
 
 <?php
 require_once "modals/admin_ai_model_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/ai_provider.php b/admin/ai_provider.php
index f9da573c..887f6a8f 100644
--- a/admin/ai_provider.php
+++ b/admin/ai_provider.php
@@ -112,4 +112,4 @@ $num_rows = mysqli_num_rows($sql);
 
 <?php
 require_once "modals/admin_ai_provider_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/user/ajax/ajax_ai_model_edit.php b/admin/ajax/ajax_ai_model_edit.php
similarity index 97%
rename from user/ajax/ajax_ai_model_edit.php
rename to admin/ajax/ajax_ai_model_edit.php
index 2a3307d6..73335a42 100644
--- a/user/ajax/ajax_ai_model_edit.php
+++ b/admin/ajax/ajax_ai_model_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $model_id = intval($_GET['id']);
 
@@ -87,4 +87,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_ai_provider_edit.php b/admin/ajax/ajax_ai_provider_edit.php
similarity index 96%
rename from user/ajax/ajax_ai_provider_edit.php
rename to admin/ajax/ajax_ai_provider_edit.php
index c5aaf113..e7342fc3 100644
--- a/user/ajax/ajax_ai_provider_edit.php
+++ b/admin/ajax/ajax_ai_provider_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $provider_id = intval($_GET['id']);
 
@@ -66,4 +66,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_category_add.php b/admin/ajax/ajax_category_add.php
similarity index 86%
rename from user/ajax/ajax_category_add.php
rename to admin/ajax/ajax_category_add.php
index a5b7481d..9111fc04 100644
--- a/user/ajax/ajax_category_add.php
+++ b/admin/ajax/ajax_category_add.php
@@ -1,12 +1,12 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $category = nullable_htmlentities($_GET['category']);
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-list-ul mr-2"></i>New Category</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -15,7 +15,7 @@ $category = nullable_htmlentities($_GET['category']);
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="type" value="<?php echo ($category); ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-row">
 
@@ -33,11 +33,11 @@ $category = nullable_htmlentities($_GET['category']);
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="add_category" 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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_category_edit.php b/admin/ajax/ajax_category_edit.php
similarity index 91%
rename from user/ajax/ajax_category_edit.php
rename to admin/ajax/ajax_category_edit.php
index a3ce233a..43a8bf1d 100644
--- a/user/ajax/ajax_category_edit.php
+++ b/admin/ajax/ajax_category_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $category_id = intval($_GET['id']);
 
@@ -14,7 +14,7 @@ $category_type = nullable_htmlentities($row['category_type']);
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-list-ul mr-2"></i>Editing category: <strong><?php echo $category_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -23,7 +23,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="category_id" value="<?php echo $category_id; ?>">
     <input type="hidden" name="type" value="<?php echo $category_type; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
@@ -46,11 +46,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_category" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_custom_link_edit.php b/admin/ajax/ajax_custom_link_edit.php
similarity index 95%
rename from user/ajax/ajax_custom_link_edit.php
rename to admin/ajax/ajax_custom_link_edit.php
index 872d0b6b..e6fa091e 100644
--- a/user/ajax/ajax_custom_link_edit.php
+++ b/admin/ajax/ajax_custom_link_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $custom_link_id = intval($_GET['id']);
 
@@ -17,7 +17,7 @@ $custom_link_location = intval($row['custom_link_location']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-external-link-alt mr-2"></i>Editing link: <strong><?php echo $custom_link_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -27,7 +27,7 @@ ob_start();
     
     <input type="hidden" name="custom_link_id" value="<?php echo $custom_link_id; ?>">
     
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
@@ -89,11 +89,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_custom_link" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_custom_ticket_status_edit.php b/admin/ajax/ajax_custom_ticket_status_edit.php
similarity index 94%
rename from user/ajax/ajax_custom_ticket_status_edit.php
rename to admin/ajax/ajax_custom_ticket_status_edit.php
index c9a3ad16..a38e960d 100644
--- a/user/ajax/ajax_custom_ticket_status_edit.php
+++ b/admin/ajax/ajax_custom_ticket_status_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $ticket_status_id = intval($_GET['id']);
 
@@ -15,7 +15,7 @@ $ticket_status_active = intval($row['ticket_status_active']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-info-circle mr-2"></i>Editing Ticket Status: <strong><?php echo $ticket_status_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -23,7 +23,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="ticket_status_id" value="<?php echo $ticket_status_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
@@ -69,11 +69,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_ticket_status" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_document_template_edit.php b/admin/ajax/ajax_document_template_edit.php
similarity index 90%
rename from user/ajax/ajax_document_template_edit.php
rename to admin/ajax/ajax_document_template_edit.php
index fb69d1c1..58e5c003 100644
--- a/user/ajax/ajax_document_template_edit.php
+++ b/admin/ajax/ajax_document_template_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $document_template_id = intval($_GET['id']);
 
@@ -14,7 +14,7 @@ $document_template_content = nullable_htmlentities($row['document_template_conte
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>Editing template: <strong><?php echo $document_template_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -22,7 +22,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="document_template_id" value="<?php echo $document_template_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <input type="text" class="form-control" name="name" maxlength="200" value="<?php echo $document_template_name; ?>" placeholder="Name" required>
@@ -37,11 +37,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_document_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_admin_mail_queue_message_view.php b/admin/ajax/ajax_mail_queue_message_view.php
similarity index 93%
rename from user/ajax/ajax_admin_mail_queue_message_view.php
rename to admin/ajax/ajax_mail_queue_message_view.php
index 0de43eab..107443f5 100644
--- a/user/ajax/ajax_admin_mail_queue_message_view.php
+++ b/admin/ajax/ajax_mail_queue_message_view.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 if (!isset($session_is_admin) || !$session_is_admin) {
     exit(WORDING_ROLECHECK_FAILED . "<br>Tell your admin: Your role does not have admin access.");
@@ -9,7 +9,7 @@ if (!isset($session_is_admin) || !$session_is_admin) {
 $email_id = intval($_GET['id']);
 
 //Initialize the HTML Purifier to prevent XSS
-require "../plugins/htmlpurifier/HTMLPurifier.standalone.php";
+require "../../plugins/htmlpurifier/HTMLPurifier.standalone.php";
 
 $purifier_config = HTMLPurifier_Config::createDefault();
 $purifier_config->set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one
@@ -73,7 +73,7 @@ ob_start();
     </div>
 </div>
 
-<script src="../js/pretty_content.js"></script>
+<script src="../../js/pretty_content.js"></script>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_payment_method_edit.php b/admin/ajax/ajax_payment_method_edit.php
similarity index 90%
rename from user/ajax/ajax_payment_method_edit.php
rename to admin/ajax/ajax_payment_method_edit.php
index 6499e1c0..72d8527d 100644
--- a/user/ajax/ajax_payment_method_edit.php
+++ b/admin/ajax/ajax_payment_method_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $payment_method_id = intval($_GET['id']);
 
@@ -14,7 +14,7 @@ $payment_method_description = nullable_htmlentities($row['payment_method_descrip
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Editing: <strong><?php echo $payment_method_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -23,7 +23,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
@@ -40,7 +40,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_payment_method" 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>
@@ -48,4 +48,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_payment_provider_edit.php b/admin/ajax/ajax_payment_provider_edit.php
similarity index 96%
rename from user/ajax/ajax_payment_provider_edit.php
rename to admin/ajax/ajax_payment_provider_edit.php
index e681cf27..e6cb873f 100644
--- a/user/ajax/ajax_payment_provider_edit.php
+++ b/admin/ajax/ajax_payment_provider_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $provider_id = intval($_GET['id']);
 
@@ -21,7 +21,7 @@ $flat_fee = floatval($row['payment_provider_expense_flat_fee']);
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Editing: <strong><?php echo $provider_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -31,7 +31,7 @@ ob_start();
     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="provider_id" value="<?php echo $provider_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Publishable key <strong class="text-danger">*</strong></label>
@@ -97,7 +97,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_payment_provider" 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>
@@ -105,4 +105,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_role_edit.php b/admin/ajax/ajax_role_edit.php
similarity index 97%
rename from user/ajax/ajax_role_edit.php
rename to admin/ajax/ajax_role_edit.php
index 9b1d967f..5cc8c3c1 100644
--- a/user/ajax/ajax_role_edit.php
+++ b/admin/ajax/ajax_role_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $role_id = intval($_GET['id']);
 
@@ -35,7 +35,7 @@ if (empty($user_names_string)) {
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-user-shield mr-2"></i>Editing role:
         <strong><?php echo $role_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -45,7 +45,7 @@ ob_start();
 <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="role_id" value="<?php echo $role_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -143,11 +143,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_role" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_software_template_edit.php b/admin/ajax/ajax_software_template_edit.php
similarity index 95%
rename from user/ajax/ajax_software_template_edit.php
rename to admin/ajax/ajax_software_template_edit.php
index 34de0b57..38d35223 100644
--- a/user/ajax/ajax_software_template_edit.php
+++ b/admin/ajax/ajax_software_template_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $software_template_id = intval($_GET['id']);
 
@@ -17,7 +17,7 @@ $software_notes = nullable_htmlentities($row['software_template_notes']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>Editing template: <strong><?php echo $software_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -25,7 +25,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="software_template_id" value="<?php echo $software_template_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Template Name <strong class="text-danger">*</strong></label>
@@ -89,11 +89,11 @@ ob_start();
         <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"><?php echo $software_notes; ?></textarea>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_software_template" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_tag_add.php b/admin/ajax/ajax_tag_add.php
similarity index 88%
rename from user/ajax/ajax_tag_add.php
rename to admin/ajax/ajax_tag_add.php
index 05ef73fa..63e326eb 100644
--- a/user/ajax/ajax_tag_add.php
+++ b/admin/ajax/ajax_tag_add.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $type = intval($_GET['id']);
 
@@ -11,7 +11,7 @@ $type = intval($_GET['id']);
 <!-- <option value="3">Contact Tag</option> -->
 <!-- <option value="4">Credential Tag</option> -->
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-tag mr-2"></i>New Tag</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -19,7 +19,7 @@ $type = intval($_GET['id']);
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="type" value="<?php echo $type; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
         <div class="form-group">
             <div class="input-group">
                 <input type="text" class="form-control" name="name" placeholder="Tag name" maxlength="200" required autofocus>
@@ -39,11 +39,11 @@ $type = intval($_GET['id']);
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="add_tag" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_tag_edit.php b/admin/ajax/ajax_tag_edit.php
similarity index 94%
rename from user/ajax/ajax_tag_edit.php
rename to admin/ajax/ajax_tag_edit.php
index d2425a89..beaf31eb 100644
--- a/user/ajax/ajax_tag_edit.php
+++ b/admin/ajax/ajax_tag_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $tag_id = intval($_GET['id']);
 
@@ -15,7 +15,7 @@ $tag_icon = nullable_htmlentities($row['tag_icon']);
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-tag mr-2"></i>Editing tag: <strong><?php echo $tag_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -23,7 +23,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="tag_id" value="<?php echo $tag_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
@@ -72,11 +72,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_tag" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_tax_edit.php b/admin/ajax/ajax_tax_edit.php
similarity index 89%
rename from user/ajax/ajax_tax_edit.php
rename to admin/ajax/ajax_tax_edit.php
index a2c2c47c..3a2a36b6 100644
--- a/user/ajax/ajax_tax_edit.php
+++ b/admin/ajax/ajax_tax_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $tax_id = intval($_GET['id']);
 
@@ -13,7 +13,7 @@ $tax_percent = floatval($row['tax_percent']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-balance-scale mr-2"></i>Editing tax: <strong><?php echo $tax_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -23,7 +23,7 @@ ob_start();
     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="tax_id" value="<?php echo $tax_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
@@ -36,11 +36,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_tax" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_ticket_template_task_edit.php b/admin/ajax/ajax_ticket_template_task_edit.php
similarity index 92%
rename from user/ajax/ajax_ticket_template_task_edit.php
rename to admin/ajax/ajax_ticket_template_task_edit.php
index 3038b877..3ba7f887 100644
--- a/user/ajax/ajax_ticket_template_task_edit.php
+++ b/admin/ajax/ajax_ticket_template_task_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $task_template_id = intval($_GET['id']);
 
@@ -17,7 +17,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-tasks mr-2"></i>Editing task</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -26,7 +26,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="task_template_id" value="<?php echo $task_template_id; ?>">
     
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
@@ -50,7 +50,7 @@ ob_start();
     
     </div>
 
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_ticket_template_task" 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>
@@ -59,4 +59,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_user_edit.php b/admin/ajax/ajax_user_edit.php
similarity index 97%
rename from user/ajax/ajax_user_edit.php
rename to admin/ajax/ajax_user_edit.php
index 1ea23f0e..0739c55f 100644
--- a/user/ajax/ajax_user_edit.php
+++ b/admin/ajax/ajax_user_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $user_id = intval($_GET['id']);
 
@@ -28,7 +28,7 @@ while ($row = mysqli_fetch_assoc($user_client_access_sql)) {
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-user-edit mr-2"></i>Editing user:
         <strong><?php echo $user_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -38,7 +38,7 @@ ob_start();
 <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="user_id" value="<?php echo $user_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -194,11 +194,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_user" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_vendor_template_edit.php b/admin/ajax/ajax_vendor_template_edit.php
similarity index 98%
rename from user/ajax/ajax_vendor_template_edit.php
rename to admin/ajax/ajax_vendor_template_edit.php
index afb365f2..f61f8032 100644
--- a/user/ajax/ajax_vendor_template_edit.php
+++ b/admin/ajax/ajax_vendor_template_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $vendor_template_id = intval($_GET['id']);
 
@@ -24,7 +24,7 @@ $vendor_notes = nullable_htmlentities($row['vendor_template_notes']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-building mr-2"></i>Editing vendor template: <strong><?php echo $vendor_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -32,7 +32,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="vendor_template_id" value="<?php echo $vendor_template_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -244,11 +244,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" class="btn btn-primary text-bold" name="edit_vendor_template"><i class="fa fa-check mr-2"></i>Update 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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/admin/api.php b/admin/api_keys.php
similarity index 98%
rename from admin/api.php
rename to admin/api_keys.php
index 7b70d09f..122bdde3 100644
--- a/admin/api.php
+++ b/admin/api_keys.php
@@ -162,15 +162,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </form>
 
             </div>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
  ?>
         </div>
     </div>
 
-    <script src="js/bulk_actions.js"></script>
+    <script src="../js/bulk_actions.js"></script>
 
 <?php
 require_once "modals/admin_api_key_add_modal.php";
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/app_log.php b/admin/app_log.php
index d98afbb0..2997fe54 100644
--- a/admin/app_log.php
+++ b/admin/app_log.php
@@ -183,10 +183,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
  ?>
         </div>
     </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/audit_log.php b/admin/audit_log.php
index 04b1a41b..3da62911 100644
--- a/admin/audit_log.php
+++ b/admin/audit_log.php
@@ -266,7 +266,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         if (empty($client_name)) {
                             $client_name_display = "-";
                         } else {
-                            $client_name_display = "<a href='client_overview.php?client_id=$client_id'>$client_name</a>";
+                            $client_name_display = "<a href='../user/client_overview.php?client_id=$client_id'>$client_name</a>";
                         }
                         $log_entity_id = intval($row['log_entity_id']);
 
@@ -292,11 +292,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
  ?>
         </div>
     </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/backup.php b/admin/backup.php
index 6acb4780..5bbc6599 100644
--- a/admin/backup.php
+++ b/admin/backup.php
@@ -34,5 +34,5 @@ require_once "includes/inc_all_admin.php";
 </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/category.php b/admin/category.php
index 177df25d..b61f4196 100644
--- a/admin/category.php
+++ b/admin/category.php
@@ -176,11 +176,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php require_once "includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php";
  ?>
     </div>
 </div>
 
 <?php
 require_once "modals/admin_category_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/custom_link.php b/admin/custom_link.php
index b87ff102..3db22557 100644
--- a/admin/custom_link.php
+++ b/admin/custom_link.php
@@ -138,11 +138,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
  ?>
         </div>
     </div>
 
 <?php
 require_once "modals/admin_custom_link_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/debug.php b/admin/debug.php
index a3207ca8..cb9399da 100644
--- a/admin/debug.php
+++ b/admin/debug.php
@@ -766,5 +766,5 @@ $mysqli->close();
 
 <?php
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/document_template.php b/admin/document_template.php
index 4b0b6e5d..796611c6 100644
--- a/admin/document_template.php
+++ b/admin/document_template.php
@@ -79,7 +79,7 @@
 
                     <tr>
                         <td>
-                            <a class="text-bold" href="admin_document_template_details.php?document_template_id=<?php echo $document_template_id; ?>"><i class="fas fa-fw fa-file-alt text-dark"></i> <?php echo $document_template_name; ?></a>
+                            <a class="text-bold" href="document_template_details.php?document_template_id=<?php echo $document_template_id; ?>"><i class="fas fa-fw fa-file-alt text-dark"></i> <?php echo $document_template_name; ?></a>
                             <div class="mt-1 text-secondary"><?php echo $document_template_description; ?></div>
                         </td>
                         <td>
@@ -120,12 +120,12 @@
             </table>
             <br>
         </div>
-        <?php require_once "includes/filter_footer.php"; ?>
+        <?php require_once "../includes/filter_footer.php"; ?>
     </div>
 </div>
 
 <?php require_once "modals/admin_document_template_add_modal.php"; ?>
-<?php require_once "includes/footer.php"; ?>
+<?php require_once "../includes/footer.php"; ?>
 
 <script>
 $(document).ready(function(){
diff --git a/admin/document_template_details.php b/admin/document_template_details.php
index 0d638d55..5c846af2 100644
--- a/admin/document_template_details.php
+++ b/admin/document_template_details.php
@@ -4,7 +4,7 @@ require_once "includes/inc_all_admin.php";
 
 
 //Initialize the HTML Purifier to prevent XSS
-require "plugins/htmlpurifier/HTMLPurifier.standalone.php";
+require "../plugins/htmlpurifier/HTMLPurifier.standalone.php";
 
 $purifier_config = HTMLPurifier_Config::createDefault();
 $purifier_config->set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one
@@ -29,13 +29,13 @@ $document_template_updated_at = nullable_htmlentities($row['document_template_up
 
 <ol class="breadcrumb d-print-none">
     <li class="breadcrumb-item">
-        <a href="clients.php">Home</a>
+        <a href="../">Home</a>
     </li>
     <li class="breadcrumb-item">
-        <a href="admin_user.php">Admin</a>
+        <a href="users.php">Admin</a>
     </li>
     <li class="breadcrumb-item">
-        <a href="admin_document_template.php">Document Templates</a>
+        <a href="document_template.php">Document Templates</a>
     </li>
     <li class="breadcrumb-item active"><i class="fas fa-file mr-2"></i><?php echo $document_template_name; ?></li>
 </ol>
@@ -61,7 +61,7 @@ $document_template_updated_at = nullable_htmlentities($row['document_template_up
     </div>
 </div>
 
-<script src="js/pretty_content.js"></script>
+<script src="../js/pretty_content.js"></script>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/identity_provider.php b/admin/identity_provider.php
index 2149815d..6405422f 100644
--- a/admin/identity_provider.php
+++ b/admin/identity_provider.php
@@ -55,4 +55,4 @@ require_once "includes/inc_all_admin.php";
     </div>
 </div>
 
-<?php require_once "includes/footer.php";
+<?php require_once "../includes/footer.php";
diff --git a/admin/mail_queue.php b/admin/mail_queue.php
index 1bf65065..23d9aa38 100644
--- a/admin/mail_queue.php
+++ b/admin/mail_queue.php
@@ -177,7 +177,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <a class="btn btn-sm btn-secondary" href="#"
                                         data-toggle = "ajax-modal"
                                         data-modal-size = "lg"
-                                        data-ajax-url = "ajax/ajax_admin_mail_queue_message_view.php"
+                                        data-ajax-url = "ajax/ajax_mail_queue_message_view.php"
                                         data-ajax-id = "<?php echo $email_id; ?>"
                                         >
                                         <i class="fas fa-fw fa-eye"></i>
@@ -205,11 +205,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </div>
             </form>
 
-            <?php require_once "includes/filter_footer.php"; ?>
+            <?php require_once "../includes/filter_footer.php"; ?>
         </div>
     </div>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/modals/admin_ai_model_add_modal.php b/admin/modals/admin_ai_model_add_modal.php
index ec1f8489..32c3880d 100644
--- a/admin/modals/admin_ai_model_add_modal.php
+++ b/admin/modals/admin_ai_model_add_modal.php
@@ -1,8 +1,8 @@
 <div class="form-group">
     <div class="modal" id="addAIModelModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-robot mr-2"></i>Add AI Model</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,7 +11,7 @@
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Provider <strong class="text-danger">*</strong></label>
@@ -63,7 +63,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_ai_model" 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>
diff --git a/admin/modals/admin_ai_provider_add_modal.php b/admin/modals/admin_ai_provider_add_modal.php
index 7e478073..34cf5e60 100644
--- a/admin/modals/admin_ai_provider_add_modal.php
+++ b/admin/modals/admin_ai_provider_add_modal.php
@@ -1,8 +1,8 @@
 <div class="form-group">
     <div class="modal" id="addAIProviderModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-robot mr-2"></i>New AI Provider</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,7 +11,7 @@
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Provider Name <strong class="text-danger">*</strong></label>
@@ -44,7 +44,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_ai_provider" 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>
diff --git a/admin/modals/admin_api_key_add_modal.php b/admin/modals/admin_api_key_add_modal.php
index 61510e4d..8a515847 100644
--- a/admin/modals/admin_api_key_add_modal.php
+++ b/admin/modals/admin_api_key_add_modal.php
@@ -4,15 +4,15 @@ $decryptPW = randomString(160);
 ?>
 <div class="modal" id="addApiKeyModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-key mr-2"></i>New Key</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 bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -111,7 +111,7 @@ $decryptPW = randomString(160);
                     </div>
 
                     </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_api_key" 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="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/admin/modals/admin_category_add_modal.php b/admin/modals/admin_category_add_modal.php
index bf193e38..f6123ffd 100644
--- a/admin/modals/admin_category_add_modal.php
+++ b/admin/modals/admin_category_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addCategoryModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-list-ul mr-2"></i>New <?php echo nullable_htmlentities($category); ?> Category</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -10,7 +10,7 @@
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="type" value="<?php echo nullable_htmlentities($category); ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Name <strong class="text-danger">*</strong></label>
@@ -33,7 +33,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_category" 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>
diff --git a/admin/modals/admin_custom_link_add_modal.php b/admin/modals/admin_custom_link_add_modal.php
index 45b2c3a6..26a57b02 100644
--- a/admin/modals/admin_custom_link_add_modal.php
+++ b/admin/modals/admin_custom_link_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addLinkModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-external-link-alt mr-2"></i>New Custom Link</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Name <strong class="text-danger">*</strong></label>
@@ -71,7 +71,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_custom_link" 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="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/admin/modals/admin_document_template_add_modal.php b/admin/modals/admin_document_template_add_modal.php
index 083e0ce0..73e9f370 100644
--- a/admin/modals/admin_document_template_add_modal.php
+++ b/admin/modals/admin_document_template_add_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addDocumentTemplateModal" tabindex="-1">
     <div class="modal-dialog modal-xl">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <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 bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <input type="text" class="form-control" name="name" placeholder="Template name" maxlength="200">
@@ -40,7 +40,7 @@
                 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <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>
diff --git a/admin/modals/admin_payment_method_add_modal.php b/admin/modals/admin_payment_method_add_modal.php
index 8a913611..25002544 100644
--- a/admin/modals/admin_payment_method_add_modal.php
+++ b/admin/modals/admin_payment_method_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addPaymentMethodModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Creating: <strong>Payment Method</strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -10,7 +10,7 @@
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Name <strong class="text-danger">*</strong></label>
@@ -27,7 +27,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_payment_method" 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>
diff --git a/admin/modals/admin_payment_provider_add_modal.php b/admin/modals/admin_payment_provider_add_modal.php
index b72a8131..b0eb7e9b 100644
--- a/admin/modals/admin_payment_provider_add_modal.php
+++ b/admin/modals/admin_payment_provider_add_modal.php
@@ -1,8 +1,8 @@
 <div class="form-group">
     <div class="modal" id="addPaymentProviderModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Add Payment Provider</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,7 +11,7 @@
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="alert alert-info">An income account named after the provider will always be created and used for income of payed invoices.
                     If "Enable Expense" option is enabled, a matching vendor will also be automatically created (if it doesn't already exist), and used for expense tracking. Additionally, an expense category named "Payment Processing" will be created if it does not already exist.
@@ -92,7 +92,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_payment_provider" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Add</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/admin/modals/admin_project_template_add_modal.php b/admin/modals/admin_project_template_add_modal.php
index 259e506a..97676550 100644
--- a/admin/modals/admin_project_template_add_modal.php
+++ b/admin/modals/admin_project_template_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addProjectTemplateModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-project-diagram mr-2"></i>Creating Project Template</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                     <div class="form-group">
                         <label>Project Template Name <strong class="text-danger">*</strong></label>
                         <div class="input-group">
@@ -31,7 +31,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_project_template" 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>
diff --git a/admin/modals/admin_project_template_edit_modal.php b/admin/modals/admin_project_template_edit_modal.php
index 5cbca4df..14eda4a1 100644
--- a/admin/modals/admin_project_template_edit_modal.php
+++ b/admin/modals/admin_project_template_edit_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="editProjectTemplateModal<?php echo $project_template_id; ?>" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-project-diagram mr-2"></i>Editing Project Template: <strong><?php echo $project_template_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -10,7 +10,7 @@
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="project_template_id" value="<?php echo $project_template_id; ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                     <div class="form-group">
                         <label>Project Template Name <strong class="text-danger">*</strong></label>
                         <div class="input-group">
@@ -33,7 +33,7 @@
 
                 </div>
                 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="edit_project_template" 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>
diff --git a/admin/modals/admin_project_template_ticket_template_add_modal.php b/admin/modals/admin_project_template_ticket_template_add_modal.php
index ccfb21c8..9acced48 100644
--- a/admin/modals/admin_project_template_ticket_template_add_modal.php
+++ b/admin/modals/admin_project_template_ticket_template_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addProjectTemplateTicketTemplateModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Adding Ticket Template</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="project_template_id" value="<?php echo $project_template_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Ticket Template <strong class="text-danger">*</strong></label>
@@ -54,7 +54,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_ticket_template_to_project_template" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Add</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/admin/modals/admin_role_add_modal.php b/admin/modals/admin_role_add_modal.php
index 0112960d..a633b342 100644
--- a/admin/modals/admin_role_add_modal.php
+++ b/admin/modals/admin_role_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addRoleModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-user-shield mr-2"></i>Add new role</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                     <div class="tab-content">
 
                         <div class="form-group">
@@ -48,7 +48,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_role" 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="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/admin/modals/admin_software_template_add_modal.php b/admin/modals/admin_software_template_add_modal.php
index e0881339..7f83720e 100644
--- a/admin/modals/admin_software_template_add_modal.php
+++ b/admin/modals/admin_software_template_add_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addSoftwareTemplateModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <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 bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Template Name <strong class="text-danger">*</strong></label>
@@ -73,7 +73,7 @@
                     <textarea class="form-control" rows="8" placeholder="Enter some notes" name="notes"></textarea>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <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>
diff --git a/admin/modals/admin_tag_add_modal.php b/admin/modals/admin_tag_add_modal.php
index 6d4085be..dcedb7d8 100644
--- a/admin/modals/admin_tag_add_modal.php
+++ b/admin/modals/admin_tag_add_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addTagModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-tag mr-2"></i>New Tag</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 bg-white">
+                <div class="modal-body">
                     <div class="form-group">
                         <label>Name <strong class="text-danger">*</strong></label>
                         <div class="input-group">
@@ -56,7 +56,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_tag" 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="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/admin/modals/admin_tax_add_modal.php b/admin/modals/admin_tax_add_modal.php
index 95bf4f78..804982ad 100644
--- a/admin/modals/admin_tax_add_modal.php
+++ b/admin/modals/admin_tax_add_modal.php
@@ -1,6 +1,6 @@
 <div class="modal" id="addTaxModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content bg-dark">
+    <div class="modal-content">
       <div class="modal-header text-white">
         <h5 class="modal-title"><i class="fas fa-fw fa-balance-scale mr-2"></i>New Tax</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
@@ -10,7 +10,7 @@
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-        <div class="modal-body bg-white">
+        <div class="modal-body">
           <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
             <input type="text" class="form-control" name="name" placeholder="Tax name" maxlength="200" required autofocus>
@@ -20,7 +20,7 @@
             <input type="number" min="0" step="any" class="form-control col-md-4" name="percent">
           </div>
         </div>
-        <div class="modal-footer bg-white">
+        <div class="modal-footer">
           <button type="submit" name="add_tax" 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="fas fa-times mr-2"></i>Cancel</button>
         </div>
diff --git a/admin/modals/admin_ticket_status_add_modal.php b/admin/modals/admin_ticket_status_add_modal.php
index ceb78a24..98b205b3 100644
--- a/admin/modals/admin_ticket_status_add_modal.php
+++ b/admin/modals/admin_ticket_status_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addTicketStatusModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
+    <div class="modal-content">
+      <div class="modal-header bg-dark">
         <h5 class="modal-title"><i class="fas fa-fw fa-info-circle mr-2"></i>New Ticket Status</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
@@ -9,7 +9,7 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
 
-        <div class="modal-body bg-white">
+        <div class="modal-body">
           
           <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
@@ -32,7 +32,7 @@
           </div>
         
         </div>
-        <div class="modal-footer bg-white">
+        <div class="modal-footer">
           <button type="submit" name="add_ticket_status" 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="fas fa-times mr-2"></i>Cancel</button>
         </div>
diff --git a/admin/modals/admin_ticket_template_add_modal.php b/admin/modals/admin_ticket_template_add_modal.php
index 5408a396..d414f9a3 100644
--- a/admin/modals/admin_ticket_template_add_modal.php
+++ b/admin/modals/admin_ticket_template_add_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addTicketTemplateModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-life-ring mr-2"></i>Creating Ticket 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 bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Template Name <strong class="text-danger">*</strong></label>
@@ -65,7 +65,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_ticket_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>
diff --git a/admin/modals/admin_ticket_template_edit_modal.php b/admin/modals/admin_ticket_template_edit_modal.php
index 9109e4ec..f0480a71 100644
--- a/admin/modals/admin_ticket_template_edit_modal.php
+++ b/admin/modals/admin_ticket_template_edit_modal.php
@@ -1,8 +1,8 @@
 <div class="modal" id="editTicketTemplateModal" tabindex="-1">
 
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-life-ring mr-2"></i>Editing Ticket Template: <?php echo $ticket_template_name; ?></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -10,7 +10,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="ticket_template_id" value="<?php echo $ticket_template_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Template Name <strong class="text-danger">*</strong></label>
@@ -47,7 +47,7 @@
                     </div>
             
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="edit_ticket_template" 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>
diff --git a/admin/modals/admin_user_add_modal.php b/admin/modals/admin_user_add_modal.php
index 9945a08e..e57da329 100644
--- a/admin/modals/admin_user_add_modal.php
+++ b/admin/modals/admin_user_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addUserModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-user-plus mr-2"></i>New User</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -146,7 +146,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_user" 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="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/admin/modals/admin_user_export_modal.php b/admin/modals/admin_user_export_modal.php
index 82e68dfc..b0aa26e2 100644
--- a/admin/modals/admin_user_export_modal.php
+++ b/admin/modals/admin_user_export_modal.php
@@ -1,17 +1,17 @@
 <div class="modal" id="exportUserModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Users to CSV</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 bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_users_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/admin/modals/admin_user_invite_modal.php b/admin/modals/admin_user_invite_modal.php
index 21c93356..ae3ccee7 100644
--- a/admin/modals/admin_user_invite_modal.php
+++ b/admin/modals/admin_user_invite_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="userInviteModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-user-plus"></i>Invite User</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Email <strong class="text-danger">*</strong></label>
@@ -35,7 +35,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="invite_user" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Send Invite</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/admin/modals/admin_vendor_template_add_modal.php b/admin/modals/admin_vendor_template_add_modal.php
index e8a2ba85..c9b6ed62 100644
--- a/admin/modals/admin_vendor_template_add_modal.php
+++ b/admin/modals/admin_vendor_template_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addVendorTemplateModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <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>
@@ -11,7 +11,7 @@
 
                 <input type="hidden" name="client_id" value="<?php if (isset($_GET['client_id'])) { echo $client_id; } else { echo 0; } ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -158,7 +158,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <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>
diff --git a/admin/modals/roles/role_add.php b/admin/modals/role_add.php
similarity index 94%
rename from admin/modals/roles/role_add.php
rename to admin/modals/role_add.php
index 0112960d..a633b342 100644
--- a/admin/modals/roles/role_add.php
+++ b/admin/modals/role_add.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addRoleModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-user-shield mr-2"></i>Add new role</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                     <div class="tab-content">
 
                         <div class="form-group">
@@ -48,7 +48,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_role" 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="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/admin/modals/roles/role_edit.php b/admin/modals/role_edit.php
similarity index 97%
rename from admin/modals/roles/role_edit.php
rename to admin/modals/role_edit.php
index 9b1d967f..d22a2a4b 100644
--- a/admin/modals/roles/role_edit.php
+++ b/admin/modals/role_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/ajax_header.php';
 
 $role_id = intval($_GET['id']);
 
@@ -35,7 +35,7 @@ if (empty($user_names_string)) {
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-user-shield mr-2"></i>Editing role:
         <strong><?php echo $role_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -45,7 +45,7 @@ ob_start();
 <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="role_id" value="<?php echo $role_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -143,11 +143,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_role" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once "../../includes/ajax_footer.php";
diff --git a/admin/modals/users/user_add.php b/admin/modals/user_add.php
similarity index 97%
rename from admin/modals/users/user_add.php
rename to admin/modals/user_add.php
index 9945a08e..e57da329 100644
--- a/admin/modals/users/user_add.php
+++ b/admin/modals/user_add.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addUserModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-user-plus mr-2"></i>New User</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -146,7 +146,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_user" 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="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/admin/modals/users/user_all_reset_password.php b/admin/modals/user_all_reset_password.php
similarity index 100%
rename from admin/modals/users/user_all_reset_password.php
rename to admin/modals/user_all_reset_password.php
diff --git a/admin/modals/users/user_archive.php b/admin/modals/user_archive.php
similarity index 100%
rename from admin/modals/users/user_archive.php
rename to admin/modals/user_archive.php
diff --git a/admin/modals/users/user_edit.php b/admin/modals/user_edit.php
similarity index 98%
rename from admin/modals/users/user_edit.php
rename to admin/modals/user_edit.php
index 7cd470a1..7bbf9e54 100644
--- a/admin/modals/users/user_edit.php
+++ b/admin/modals/user_edit.php
@@ -28,7 +28,7 @@ while ($row = mysqli_fetch_assoc($user_client_access_sql)) {
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-user-edit mr-2"></i>Editing user:
         <strong><?php echo $user_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
@@ -38,7 +38,7 @@ ob_start();
 <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="user_id" value="<?php echo $user_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -194,7 +194,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_user" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
diff --git a/admin/modals/users/user_export.php b/admin/modals/user_export.php
similarity index 81%
rename from admin/modals/users/user_export.php
rename to admin/modals/user_export.php
index 82e68dfc..b0aa26e2 100644
--- a/admin/modals/users/user_export.php
+++ b/admin/modals/user_export.php
@@ -1,17 +1,17 @@
 <div class="modal" id="exportUserModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Users to CSV</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 bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_users_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/admin/modals/users/user_invite.php b/admin/modals/user_invite.php
similarity index 92%
rename from admin/modals/users/user_invite.php
rename to admin/modals/user_invite.php
index 21c93356..ae3ccee7 100644
--- a/admin/modals/users/user_invite.php
+++ b/admin/modals/user_invite.php
@@ -1,7 +1,7 @@
 <div class="modal" id="userInviteModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-user-plus"></i>Invite User</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Email <strong class="text-danger">*</strong></label>
@@ -35,7 +35,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="invite_user" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Send Invite</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/admin/payment_method.php b/admin/payment_method.php
index 7d3fb981..434bc50a 100644
--- a/admin/payment_method.php
+++ b/admin/payment_method.php
@@ -105,4 +105,4 @@ $num_rows = mysqli_num_rows($sql);
 
 <?php
 require_once "modals/admin_payment_method_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/payment_provider.php b/admin/payment_provider.php
index 433106bb..2e324694 100644
--- a/admin/payment_provider.php
+++ b/admin/payment_provider.php
@@ -138,4 +138,4 @@ $num_rows = mysqli_num_rows($sql);
 
 <?php
 require_once "modals/admin_payment_provider_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/project_template.php b/admin/project_template.php
index c719d5b2..26934ab3 100644
--- a/admin/project_template.php
+++ b/admin/project_template.php
@@ -92,7 +92,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fa fa-fw fa-2x fa-project-diagram mr-3"></i>
                                     <div class="media-body">
                                         <div>
-                                            <a href="admin_project_template_details.php?project_template_id=<?php echo $project_template_id; ?>">
+                                            <a href="project_template_details.php?project_template_id=<?php echo $project_template_id; ?>">
                                                 <?php echo $project_template_name; ?>
                                             </a>
                                         </div>
@@ -134,7 +134,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php require_once "includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php";
  ?>
     </div>
 </div>
@@ -142,4 +142,4 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <?php
 require_once "modals/admin_project_template_add_modal.php";
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/project_template_details.php b/admin/project_template_details.php
index a0ef83bb..6e70714e 100644
--- a/admin/project_template_details.php
+++ b/admin/project_template_details.php
@@ -51,7 +51,7 @@ if (isset($_GET['project_template_id'])) {
         <a href="admin_user.php">Admin</a>
     </li>
     <li class="breadcrumb-item">
-        <a href="admin_project_template.php">Project Templates</a>
+        <a href="project_template.php">Project Templates</a>
     </li>
     <li class="breadcrumb-item active">Project Template Details</li>
 </ol>
@@ -227,7 +227,7 @@ require_once "modals/admin_project_template_ticket_template_add_modal.php";
 
 }
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
 ?>
 
diff --git a/admin/roles.php b/admin/roles.php
index 23aa2dbb..229ce34f 100644
--- a/admin/roles.php
+++ b/admin/roles.php
@@ -95,7 +95,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         ?>
                         <tr>
                             <td>
-                                <a class="text-dark text-bold" href="#" data-toggle="modal" data-target="#editRoleModal<?php echo $role_id; ?>">
+                                <a class="text-dark text-bold" href="#" <?php if ($role_id !== 3) { ?> data-toggle="ajax-modal" data-ajax-url="modals/role_edit.php" data-ajax-id="<?php echo $role_id; ?>" <?php } ?>>
                                     <?php echo $role_name; ?>
                                 </a>
                                 <div class="text-secondary"><?php echo $role_description; ?></div>
@@ -112,7 +112,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                                             <a class="dropdown-item" href="#"
                                                 data-toggle="ajax-modal"
-                                                data-ajax-url="ajax/ajax_role_edit.php"
+                                                data-ajax-url="modals/role_edit.php"
                                                 data-ajax-id="<?php echo $role_id; ?>"
                                                 >
                                                 <i class="fas fa-fw fa-user-edit mr-2"></i>Edit
@@ -140,12 +140,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
             ?>
         </div>
     </div>
 
 <?php
 
-require_once "modals/admin_role_add_modal.php";
-require_once "includes/footer.php";
+require_once "modals/role_add.php";
+require_once "../includes/footer.php";
diff --git a/admin/saved_payment_method.php b/admin/saved_payment_method.php
index 52d57c35..e268a05d 100644
--- a/admin/saved_payment_method.php
+++ b/admin/saved_payment_method.php
@@ -130,9 +130,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             </table>
 
         </div>
-        <?php require_once "includes/filter_footer.php"; ?>
+        <?php require_once "../includes/filter_footer.php"; ?>
     </div>
 </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/settings_ai.php b/admin/settings_ai.php
index 1f8d28f3..82a0773f 100644
--- a/admin/settings_ai.php
+++ b/admin/settings_ai.php
@@ -73,5 +73,5 @@ require_once "includes/inc_all_admin.php";
 </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/settings_company.php b/admin/settings_company.php
index acee61d9..19b378a1 100644
--- a/admin/settings_company.php
+++ b/admin/settings_company.php
@@ -36,7 +36,7 @@ $company_initials = nullable_htmlentities(initials($company_name));
                     <div class="row">
                         <div class="col-md-3 text-center">
                             <?php if ($company_logo) { ?>
-                                <img class="img-thumbnail" src="<?php echo "uploads/settings/$company_logo"; ?>">
+                                <img class="img-thumbnail" src="<?php echo "../uploads/settings/$company_logo"; ?>">
                                 <a href="post.php?remove_company_logo" class="btn btn-outline-danger btn-block">Remove Logo</a>
                                 <hr>
                             <?php } ?>
@@ -168,4 +168,4 @@ $company_initials = nullable_htmlentities(initials($company_name));
     </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/settings_custom_fields.php b/admin/settings_custom_fields.php
index 8bf5bfe3..d21e804a 100644
--- a/admin/settings_custom_fields.php
+++ b/admin/settings_custom_fields.php
@@ -109,7 +109,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
  ?>
         </div>
     </div>
@@ -117,5 +117,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <?php
 require_once "custom_field_create_modal.php";
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/settings_default.php b/admin/settings_default.php
index ac319af1..505b1e6f 100644
--- a/admin/settings_default.php
+++ b/admin/settings_default.php
@@ -227,4 +227,4 @@ require_once "includes/inc_all_admin.php";
 </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/settings_invoice.php b/admin/settings_invoice.php
index cb432452..913aa7f3 100644
--- a/admin/settings_invoice.php
+++ b/admin/settings_invoice.php
@@ -111,5 +111,5 @@ require_once "includes/inc_all_admin.php";
     </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/settings_localization.php b/admin/settings_localization.php
index ff8a72ed..c73688ad 100644
--- a/admin/settings_localization.php
+++ b/admin/settings_localization.php
@@ -75,5 +75,5 @@ $timezones = DateTimeZone::listIdentifiers();
     </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/settings_mail.php b/admin/settings_mail.php
index b2649093..6d9c9af5 100644
--- a/admin/settings_mail.php
+++ b/admin/settings_mail.php
@@ -327,5 +327,5 @@ require_once "includes/inc_all_admin.php";
 
     <?php } ?>
 
-<?php require_once "includes/footer.php";
+<?php require_once "../includes/footer.php";
 
diff --git a/admin/settings_module.php b/admin/settings_module.php
index e95f8613..1bb25aa4 100644
--- a/admin/settings_module.php
+++ b/admin/settings_module.php
@@ -78,5 +78,5 @@ require_once "includes/inc_all_admin.php";
 </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/settings_notification.php b/admin/settings_notification.php
index 55726f50..bfd1d397 100644
--- a/admin/settings_notification.php
+++ b/admin/settings_notification.php
@@ -181,4 +181,4 @@ require_once "includes/inc_all_admin.php";
     </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/settings_online_payment.php b/admin/settings_online_payment.php
index ac288b79..04a71d6a 100644
--- a/admin/settings_online_payment.php
+++ b/admin/settings_online_payment.php
@@ -150,5 +150,5 @@ require_once "includes/inc_all_admin.php";
     </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/settings_online_payment_clients.php b/admin/settings_online_payment_clients.php
index c4deb42d..cc692ccb 100644
--- a/admin/settings_online_payment_clients.php
+++ b/admin/settings_online_payment_clients.php
@@ -74,4 +74,4 @@ $stripe_clients_sql = mysqli_query($mysqli, "SELECT * FROM client_stripe LEFT JO
     </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/settings_project.php b/admin/settings_project.php
index 9f411e75..50222402 100644
--- a/admin/settings_project.php
+++ b/admin/settings_project.php
@@ -41,4 +41,4 @@ require_once "includes/inc_all_admin.php";
     </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/settings_quote.php b/admin/settings_quote.php
index 6c8910a3..481d4950 100644
--- a/admin/settings_quote.php
+++ b/admin/settings_quote.php
@@ -54,5 +54,5 @@ require_once "includes/inc_all_admin.php";
     </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/settings_security.php b/admin/settings_security.php
index f5d10a76..91670d8a 100644
--- a/admin/settings_security.php
+++ b/admin/settings_security.php
@@ -62,5 +62,5 @@ require_once "includes/inc_all_admin.php";
 </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/settings_telemetry.php b/admin/settings_telemetry.php
index 0005ddfb..f2276989 100644
--- a/admin/settings_telemetry.php
+++ b/admin/settings_telemetry.php
@@ -38,5 +38,5 @@ require_once "includes/inc_all_admin.php";
     </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/settings_theme.php b/admin/settings_theme.php
index b3f70c9c..7a7293b0 100644
--- a/admin/settings_theme.php
+++ b/admin/settings_theme.php
@@ -57,7 +57,7 @@ require_once "includes/inc_all_admin.php";
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                <img class="mb-3" src="<?php if(file_exists("uploads/favicon.ico")) { echo "uploads/favicon.ico"; } else { echo "favicon.ico"; } ?>">
+                <img class="mb-3" src="<?php if(file_exists("../uploads/favicon.ico")) { echo "../uploads/favicon.ico"; } else { echo "../favicon.ico"; } ?>">
 
                 <div class="form-group">
                     <input type="file" class="form-control-file" name="file" accept=".ico">
@@ -72,5 +72,5 @@ require_once "includes/inc_all_admin.php";
     </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/settings_ticket.php b/admin/settings_ticket.php
index 2dcdea6c..05e7fbba 100644
--- a/admin/settings_ticket.php
+++ b/admin/settings_ticket.php
@@ -114,5 +114,5 @@ require_once "includes/inc_all_admin.php";
     </div>
 
 <?php
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/software_template.php b/admin/software_template.php
index 7091f3d2..77d9b474 100644
--- a/admin/software_template.php
+++ b/admin/software_template.php
@@ -121,11 +121,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php require_once "includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php";
  ?>
     </div>
 </div>
 
 <?php
 require_once "modals/admin_software_template_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/tag.php b/admin/tag.php
index 4d05d0d7..ed449594 100644
--- a/admin/tag.php
+++ b/admin/tag.php
@@ -123,7 +123,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
  ?>
         </div>
     </div>
@@ -131,5 +131,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <?php
 require_once "modals/admin_tag_add_modal.php";
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/tax.php b/admin/tax.php
index 1af6aaa4..33730542 100644
--- a/admin/tax.php
+++ b/admin/tax.php
@@ -104,5 +104,5 @@ $num_rows = mysqli_num_rows($sql);
 <?php
 require_once "modals/admin_tax_add_modal.php";
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/ticket_status.php b/admin/ticket_status.php
index f4054dc7..cdcdffdf 100644
--- a/admin/ticket_status.php
+++ b/admin/ticket_status.php
@@ -120,7 +120,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php require_once "includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php";
 ?>
     </div>
 </div>
@@ -128,5 +128,5 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <?php
 require_once "modals/admin_ticket_status_add_modal.php";
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/ticket_template.php b/admin/ticket_template.php
index 6509ab49..9c1da06f 100644
--- a/admin/ticket_template.php
+++ b/admin/ticket_template.php
@@ -75,7 +75,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <i class="fa fa-fw fa-2x fa-life-ring mr-3"></i>
                                     <div class="media-body">
                                         <div>
-                                            <a href="admin_ticket_template_details.php?ticket_template_id=<?php echo $ticket_template_id; ?>">
+                                            <a href="ticket_template_details.php?ticket_template_id=<?php echo $ticket_template_id; ?>">
                                                 <?php echo $ticket_template_name; ?>
                                             </a>
                                         </div>
@@ -104,12 +104,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </tbody>
             </table>
         </div>
-        <?php require_once "includes/filter_footer.php";
+        <?php require_once "../includes/filter_footer.php";
  ?>
     </div>
 </div>
 
 <?php
 require_once "modals/admin_ticket_template_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/ticket_template_details.php b/admin/ticket_template_details.php
index 99b3ab78..5834b790 100644
--- a/admin/ticket_template_details.php
+++ b/admin/ticket_template_details.php
@@ -4,7 +4,7 @@ require_once "includes/inc_all_admin.php";
 
 
 //Initialize the HTML Purifier to prevent XSS
-require "plugins/htmlpurifier/HTMLPurifier.standalone.php";
+require "../plugins/htmlpurifier/HTMLPurifier.standalone.php";
 
 $purifier_config = HTMLPurifier_Config::createDefault();
 $purifier_config->set('Cache.DefinitionImpl', null); // Disable cache by setting a non-existent directory or an invalid one
@@ -33,13 +33,13 @@ $sql_task_templates = mysqli_query($mysqli, "SELECT * FROM task_templates WHERE
 
 <ol class="breadcrumb d-print-none">
     <li class="breadcrumb-item">
-        <a href="clients.php">Home</a>
+        <a href="../index.php">Home</a>
     </li>
     <li class="breadcrumb-item">
-        <a href="admin_user.php">Admin</a>
+        <a href="users.php">Admin</a>
     </li>
     <li class="breadcrumb-item">
-        <a href="admin_ticket_template.php">Ticket Templates</a>
+        <a href="ticket_template.php">Ticket Templates</a>
     </li>
     <li class="breadcrumb-item active"><i class="fas fa-life-ring mr-2"></i><?php echo $ticket_template_name; ?></li>
 </ol>
@@ -163,4 +163,4 @@ new Sortable(document.querySelector('table#tasks tbody'), {
 <?php
 
 require_once "modals/admin_ticket_template_edit_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/admin/update.php b/admin/update.php
index c1accee9..e8c1a96b 100644
--- a/admin/update.php
+++ b/admin/update.php
@@ -106,5 +106,5 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
 
 <?php
 
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
 
diff --git a/admin/users.php b/admin/users.php
index c7f9112f..ef7513c7 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -151,12 +151,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             <a class="text-dark" href="#" 
                                 <?php if ($user_id !== $session_user_id) { // Prevent modifying self ?>
                                 data-toggle="ajax-modal"
-                                data-ajax-url="modals/users/user_edit.php"
+                                data-ajax-url="modals/user_edit.php"
                                 data-ajax-id="<?php echo $user_id; ?>"
                                 <?php } ?>
                                 >
                                 <?php if (!empty($user_avatar)) { ?>
-                                    <img class="img-size-50 img-circle" src="<?php echo "uploads/users/$user_id/$user_avatar"; ?>">
+                                    <img class="img-size-50 img-circle" src="<?php echo "../uploads/users/$user_id/$user_avatar"; ?>">
                                 <?php } else { ?>
                                     <span class="fa-stack fa-2x">
                                         <i class="fa fa-circle fa-stack-2x text-secondary"></i>
@@ -182,7 +182,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 <div class="dropdown-menu">
                                     <a class="dropdown-item" href="#"
                                         data-toggle="ajax-modal"
-                                        data-ajax-url="modals/users/user_edit.php"
+                                        data-ajax-url="modals/user_edit.php"
                                         data-ajax-id="<?php echo $user_id; ?>"
                                         >
                                         <i class="fas fa-fw fa-user-edit mr-2"></i>Edit
@@ -212,7 +212,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     <?php
 
-                    require "modals/users/user_archive.php";
+                    require "modals/user_archive.php";
 
                 }
 
@@ -232,8 +232,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 </script>
 
 <?php
-require_once "modals/users/user_add.php";
-require_once "modals/users/user_invite.php";
-require_once "modals/users/user_export.php";
-require_once "modals/users/user_all_reset_password.php";
-require_once "includes/footer.php";
\ No newline at end of file
+require_once "modals/user_add.php";
+require_once "modals/user_invite.php";
+require_once "modals/user_export.php";
+require_once "modals/user_all_reset_password.php";
+require_once "../includes/footer.php";
\ No newline at end of file
diff --git a/admin/vendor_template.php b/admin/vendor_template.php
index b6831124..86b97d06 100644
--- a/admin/vendor_template.php
+++ b/admin/vendor_template.php
@@ -164,11 +164,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     </tbody>
                 </table>
             </div>
-            <?php require_once "includes/filter_footer.php";
+            <?php require_once "../includes/filter_footer.php";
  ?>
         </div>
     </div>
 
 <?php
 require_once "modals/admin_vendor_template_add_modal.php";
-require_once "includes/footer.php";
+require_once "../includes/footer.php";
diff --git a/includes/footer.php b/includes/footer.php
index 5b2e5929..a769a43e 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -1,9 +1,9 @@
 <?php
-require_once "../includes/inc_confirm_modal.php";
+require_once "$prepend_uri../includes/inc_confirm_modal.php";
 ?>
 
 <?php
-if ($_SERVER['REQUEST_URI'] === '/admin') { ?>
+if (basename(dirname($_SERVER['REQUEST_URI'])) === 'admin') { ?>
     <p class="text-right font-weight-light">ITFlow <?php echo APP_VERSION ?> &nbsp; · &nbsp; <a target="_blank" href="https://docs.itflow.org">Docs</a> &nbsp; · &nbsp; <a target="_blank" href="https://forum.itflow.org">Forum</a> &nbsp; · &nbsp; <a target="_blank" href="https://services.itflow.org">Services</a></p>
     <br>
 <?php } ?>
@@ -19,7 +19,7 @@ if ($_SERVER['REQUEST_URI'] === '/admin') { ?>
 <!-- REQUIRED SCRIPTS -->
 
 <!-- Bootstrap 4 -->
-<script src="../plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
+<script src="<?= $prepend_uri ?>../plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
 
 <!-- Custom js-->
 <script src="<?= $prepend_uri ?>../plugins/moment/moment.min.js"></script>
diff --git a/includes/modal_footer.php b/includes/modal_footer.php
index a39ff63f..dd8e513b 100644
--- a/includes/modal_footer.php
+++ b/includes/modal_footer.php
@@ -1,5 +1,5 @@
-<script src="../../../js/app.js"></script>
-<script src="../../../plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
+<script src="../../js/app.js"></script>
+<script src="../../plugins/Show-Hide-Passwords-Bootstrap-4/bootstrap-show-password.min.js"></script>
 
 <?php
     $content = ob_get_clean();
diff --git a/includes/modal_header.php b/includes/modal_header.php
index 695f098a..74f3848c 100644
--- a/includes/modal_header.php
+++ b/includes/modal_header.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once "../../../config.php";
-require_once "../../../functions.php";
-require_once "../../../includes/check_login.php";
+require_once "../../config.php";
+require_once "../../functions.php";
+require_once "../../includes/check_login.php";
 
 header('Content-Type: application/json');
 
diff --git a/includes/top_nav.php b/includes/top_nav.php
index f3999766..bcf8e672 100644
--- a/includes/top_nav.php
+++ b/includes/top_nav.php
@@ -66,7 +66,7 @@
         <li class="nav-item">
             <a class="nav-link" href="#"
                 data-toggle="ajax-modal"
-                data-ajax-url="../ajax/ajax_notifications.php"
+                data-ajax-url="../modals/notifications.php"
                 >
                 <i class="fas fa-bell"></i>
                 <?php if ($num_notifications) { ?>
@@ -107,7 +107,7 @@
                     <?php if ($session_is_admin) { ?>
                         <a href="../admin" class="btn btn-default btn-block btn-flat mb-2"><i class="fas fa-user-shield mr-2"></i>Administration</a>
                     <?php } ?>
-                    <a href="user_details.php" class="btn btn-default btn-flat"><i class="fas fa-user-cog mr-2"></i>Account</a>
+                    <a href="../user/user_details.php" class="btn btn-default btn-flat"><i class="fas fa-user-cog mr-2"></i>Account</a>
                     <a href="post.php?logout" class="btn btn-default btn-flat float-right"><i class="fas fa-sign-out-alt mr-2"></i>Logout</a>
                 </li>
             </ul>
diff --git a/user/ajax/ajax_notifications.php b/modals/notifications.php
similarity index 92%
rename from user/ajax/ajax_notifications.php
rename to modals/notifications.php
index 8652b8ad..b2d961bd 100644
--- a/user/ajax/ajax_notifications.php
+++ b/modals/notifications.php
@@ -1,6 +1,10 @@
 <?php
 
-require_once "../includes/ajax_header.php";
+require_once "../config.php";
+require_once "../functions.php";
+require_once "../includes/check_login.php";
+
+header('Content-Type: application/json');
 
 $sql = mysqli_query(
     $mysqli,
@@ -16,14 +20,14 @@ $num_notifications = mysqli_num_rows($sql);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class='fas fa-bell mr-2'></i>Notifications<span class='badge badge-secondary badge-pill px-3 ml-3'><?php echo $num_notifications; ?><span></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
 
-<div class="modal-body bg-white">
+<div class="modal-body">
     <?php if ($num_notifications) { ?>
     <table class="table table-sm table-hover table-borderless">
     
@@ -74,7 +78,7 @@ ob_start();
     </div>
     <?php } ?>
 </div>
-<div class="modal-footer bg-white">
+<div class="modal-footer">
     <?php if ($num_notifications) { ?>
     
     <a href="post.php?dismiss_all_notifications&csrf_token=<?php echo $_SESSION[
@@ -132,4 +136,8 @@ $(document).ready(function () {
 });
 </script>
 
-<?php require_once "../includes/ajax_footer.php";
+<?php
+    $content = ob_get_clean();
+
+    // Return the title and content as a JSON response
+    echo json_encode(['content' => $content]);
diff --git a/user/ajax/ajax_account_edit.php b/user/ajax/ajax_account_edit.php
index 7380821a..cfdea8db 100644
--- a/user/ajax/ajax_account_edit.php
+++ b/user/ajax/ajax_account_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $account_id = intval($_GET['id']);
 
@@ -48,4 +48,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_asset_copy.php b/user/ajax/ajax_asset_copy.php
index 18b5f8e0..8ff28cba 100644
--- a/user/ajax/ajax_asset_copy.php
+++ b/user/ajax/ajax_asset_copy.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $asset_id = intval($_GET['id']);
 
@@ -54,7 +54,7 @@ ob_start();
     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -436,11 +436,11 @@ ob_start();
 
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="add_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Copy</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_asset_details.php b/user/ajax/ajax_asset_details.php
index 4accc12d..028e6a3c 100644
--- a/user/ajax/ajax_asset_details.php
+++ b/user/ajax/ajax_asset_details.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $asset_id = intval($_GET['id']);
 
@@ -195,14 +195,14 @@ if (isset($_GET['client_id'])) {
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-<?php echo $device_icon; ?> mr-2"></i><strong><?php echo $asset_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
 
-<div class="modal-body bg-white">
+<div class="modal-body">
 
     <ul class="nav nav-pills nav-justified mb-3">
         <li class="nav-item">
@@ -852,7 +852,7 @@ ob_start();
 
 </div>
 
-<div class="modal-footer bg-white">
+<div class="modal-footer">
     <a href="asset_details.php?client_id=<?php echo $client_id; ?>&asset_id=<?php echo $asset_id; ?>" class="btn btn-primary text-bold"><span class="text-white"><i class="fas fa-info-circle mr-2"></i>More Details</span></a>
     <a href="#" class="btn btn-secondary" 
         data-toggle="ajax-modal" data-ajax-url="ajax/ajax_asset_edit.php" data-ajax-id="<?php echo $asset_id; ?>">
@@ -862,4 +862,4 @@ ob_start();
 </div>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_asset_edit.php b/user/ajax/ajax_asset_edit.php
index 1b9d4e4e..aca0aaa6 100644
--- a/user/ajax/ajax_asset_edit.php
+++ b/user/ajax/ajax_asset_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $asset_id = intval($_GET['id']);
 
@@ -52,7 +52,7 @@ $sql_asset_history = mysqli_query($mysqli, "SELECT * FROM asset_history
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class='fa fa-fw fa-<?php echo $device_icon; ?> mr-2'></i>Editing asset: <strong><?php echo $asset_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -63,7 +63,7 @@ ob_start();
     <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -476,11 +476,11 @@ ob_start();
 
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_asset_interface_edit.php b/user/ajax/ajax_asset_interface_edit.php
index c0f53bc8..430c834b 100644
--- a/user/ajax/ajax_asset_interface_edit.php
+++ b/user/ajax/ajax_asset_interface_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $interface_id = intval($_GET['id']);
 
@@ -48,7 +48,7 @@ if ($link_row = mysqli_fetch_assoc($sql_link)) {
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class='fa fa-fw fa-ethernet mr-2'></i>Editing Interface: <?php echo $asset_name; ?> - <strong><?php echo $interface_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -58,7 +58,7 @@ ob_start();
     <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token']; ?>">
     <input type="hidden" name="interface_id" value="<?php echo $interface_id; ?>">
 
-    <div class="modal-body bg-white" <?php if (lookupUserPermission('module_support') <= 1) { echo 'inert'; } ?>>  
+    <div class="modal-body" <?php if (lookupUserPermission('module_support') <= 1) { echo 'inert'; } ?>>  
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -319,7 +319,7 @@ ob_start();
 
     </div>
     <!-- End Footer Section -->
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_asset_interface" class="btn btn-primary text-bold">
             <i class="fas fa-check mr-2"></i>Save
         </button>
@@ -330,4 +330,4 @@ ob_start();
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_asset_link_credential.php b/user/ajax/ajax_asset_link_credential.php
index c075a283..206efd57 100644
--- a/user/ajax/ajax_asset_link_credential.php
+++ b/user/ajax/ajax_asset_link_credential.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $asset_id = intval($_GET['id']);
 
@@ -18,7 +18,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i>Link Credential to <strong><?php echo $asset_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -26,7 +26,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <div class="input-group">
@@ -58,12 +58,12 @@ ob_start();
             </div>
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="link_asset_to_credential" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
 ?>
diff --git a/user/ajax/ajax_asset_link_document.php b/user/ajax/ajax_asset_link_document.php
index 82020756..e74476e3 100644
--- a/user/ajax/ajax_asset_link_document.php
+++ b/user/ajax/ajax_asset_link_document.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $asset_id = intval($_GET['id']);
 
@@ -18,7 +18,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-folder mr-2"></i>Link Document to <strong><?php echo $asset_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -26,7 +26,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <div class="input-group">
@@ -59,12 +59,12 @@ ob_start();
             </div>
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="link_asset_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
 ?>
diff --git a/user/ajax/ajax_asset_link_file.php b/user/ajax/ajax_asset_link_file.php
index 6cfdf871..6393572c 100644
--- a/user/ajax/ajax_asset_link_file.php
+++ b/user/ajax/ajax_asset_link_file.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $asset_id = intval($_GET['id']);
 
@@ -18,7 +18,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-paperclip mr-2"></i>Link File to <strong><?php echo $asset_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -26,7 +26,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <div class="input-group">
@@ -62,12 +62,12 @@ ob_start();
             </div>
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="link_asset_to_file" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
 ?>
diff --git a/user/ajax/ajax_asset_link_service.php b/user/ajax/ajax_asset_link_service.php
index 4e538aa2..9f58c711 100644
--- a/user/ajax/ajax_asset_link_service.php
+++ b/user/ajax/ajax_asset_link_service.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $asset_id = intval($_GET['id']);
 
@@ -18,7 +18,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-stream mr-2"></i>Link Service to <strong><?php echo $asset_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -26,7 +26,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <div class="input-group">
@@ -58,11 +58,11 @@ ob_start();
             </div>
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="link_service_to_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_asset_link_software.php b/user/ajax/ajax_asset_link_software.php
index cf57e059..7d65c5ef 100644
--- a/user/ajax/ajax_asset_link_software.php
+++ b/user/ajax/ajax_asset_link_software.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $asset_id = intval($_GET['id']);
 
@@ -19,7 +19,7 @@ ob_start();
 ?>
 
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>License Software to <strong><?php echo $asset_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -27,7 +27,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <div class="input-group">
@@ -63,11 +63,11 @@ ob_start();
             </div>
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="link_software_to_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</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/ajax_footer.php";
\ No newline at end of file
+require_once '../../includes/modal_footer.php';
\ No newline at end of file
diff --git a/user/ajax/ajax_calendar_edit.php b/user/ajax/ajax_calendar_edit.php
index 7773b33d..4a2c5062 100644
--- a/user/ajax/ajax_calendar_edit.php
+++ b/user/ajax/ajax_calendar_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $calendar_id = intval($_GET['id']);
 
@@ -14,7 +14,7 @@ $calendar_color = nullable_htmlentities($row['calendar_color']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-circle mr-2" style="color:<?php echo $calendar_color; ?>"></i><?php echo $calendar_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -22,7 +22,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="calendar_id" value="<?php echo $calendar_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Name</label>
@@ -45,11 +45,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_calendar" class="btn btn-primary"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_calendar_event_edit.php b/user/ajax/ajax_calendar_event_edit.php
index 937b9749..c3f8e0a0 100644
--- a/user/ajax/ajax_calendar_event_edit.php
+++ b/user/ajax/ajax_calendar_event_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $event_id = intval($_GET['id']);
 
@@ -21,7 +21,7 @@ $client_id = intval($row['event_client_id']);
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-calendar mr-2" style="color:<?php echo $calendar_color; ?>"></i><?php echo $event_title; ?></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -31,7 +31,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="event_id" value="<?php echo $event_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -183,7 +183,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <a class="btn btn-default text-danger mr-auto" href="post.php?delete_event=<?php echo $event_id; ?>"><i class="fa fa-calendar-times mr-2"></i>Delete</a>
         <button type="submit" name="edit_event" 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>
@@ -191,4 +191,4 @@ ob_start();
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_certificate_edit.php b/user/ajax/ajax_certificate_edit.php
index 3a9789b3..5693c1c7 100644
--- a/user/ajax/ajax_certificate_edit.php
+++ b/user/ajax/ajax_certificate_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $certificate_id = intval($_GET['id']);
 
@@ -24,7 +24,7 @@ $history_sql = mysqli_query($mysqli, "SELECT * FROM certificate_history WHERE ce
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-lock mr-2"></i>Editing certificate: <span class="text-bold"><?php echo $certificate_name; ?></span></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -33,7 +33,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="certificate_id" value="<?php echo $certificate_id; ?>">
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -187,11 +187,11 @@ ob_start();
 
     </div>
 
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_certificate" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_contact_details.php b/user/ajax/ajax_contact_details.php
index 51230c9a..2043b0d0 100644
--- a/user/ajax/ajax_contact_details.php
+++ b/user/ajax/ajax_contact_details.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $contact_id = intval($_GET['id']);
 
@@ -152,14 +152,14 @@ if (isset($_GET['client_id'])) {
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i><strong><?php echo $contact_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
 
-<div class="modal-body bg-white">
+<div class="modal-body">
 
     <ul class="nav nav-pills nav-justified mb-3">
         <li class="nav-item">
@@ -843,7 +843,7 @@ ob_start();
 
 </div>
 
-<div class="modal-footer bg-white">
+<div class="modal-footer">
     <a href="contact_details.php?client_id=<?php echo $client_id; ?>&contact_id=<?php echo $contact_id; ?>" class="btn btn-primary text-bold">
         <span class="text-white"><i class="fas fa-info-circle mr-2"></i>More Details</span>
     </a>
@@ -855,4 +855,4 @@ ob_start();
 </div>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_contact_edit.php b/user/ajax/ajax_contact_edit.php
index 86e7d73e..9eb42eb0 100644
--- a/user/ajax/ajax_contact_edit.php
+++ b/user/ajax/ajax_contact_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $contact_id = intval($_GET['id']);
 
@@ -46,7 +46,7 @@ while ($row = mysqli_fetch_array($sql_contact_tags)) {
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class='fas fa-user-edit mr-2'></i>Editing Contact: <strong><?php echo $contact_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -55,7 +55,7 @@ ob_start();
 <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
     <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -340,7 +340,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_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>
@@ -385,7 +385,7 @@ $(document).ready(function() {
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
 
 ?>
 
diff --git a/user/ajax/ajax_contact_link_asset.php b/user/ajax/ajax_contact_link_asset.php
index 3cff50d2..cbf4c641 100644
--- a/user/ajax/ajax_contact_link_asset.php
+++ b/user/ajax/ajax_contact_link_asset.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $contact_id = intval($_GET['id']);
 
@@ -18,7 +18,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>Link Asset to <strong><?php echo $contact_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -26,7 +26,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <div class="input-group">
@@ -56,12 +56,12 @@ ob_start();
             </div>
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="link_contact_to_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
 ?>
diff --git a/user/ajax/ajax_contact_link_credential.php b/user/ajax/ajax_contact_link_credential.php
index 83e3e09c..7a3e6608 100644
--- a/user/ajax/ajax_contact_link_credential.php
+++ b/user/ajax/ajax_contact_link_credential.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $contact_id = intval($_GET['id']);
 
@@ -18,7 +18,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i>Link Credential to <strong><?php echo $contact_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -26,7 +26,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <div class="input-group">
@@ -56,12 +56,12 @@ ob_start();
             </div>
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="link_contact_to_credential" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
 ?>
diff --git a/user/ajax/ajax_contact_link_document.php b/user/ajax/ajax_contact_link_document.php
index d177919b..684ef54f 100644
--- a/user/ajax/ajax_contact_link_document.php
+++ b/user/ajax/ajax_contact_link_document.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $contact_id = intval($_GET['id']);
 
@@ -18,7 +18,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-folder mr-2"></i>Link Document to <strong><?php echo $contact_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -26,7 +26,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <div class="input-group">
@@ -59,12 +59,12 @@ ob_start();
             </div>
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="link_contact_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
 ?>
diff --git a/user/ajax/ajax_contact_link_file.php b/user/ajax/ajax_contact_link_file.php
index debbbd0a..fd6108d3 100644
--- a/user/ajax/ajax_contact_link_file.php
+++ b/user/ajax/ajax_contact_link_file.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $contact_id = intval($_GET['id']);
 
@@ -18,7 +18,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-paperclip mr-2"></i>Link File to <strong><?php echo $contact_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -26,7 +26,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <div class="input-group">
@@ -62,11 +62,11 @@ ob_start();
             </div>
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="link_contact_to_file" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_contact_link_service.php b/user/ajax/ajax_contact_link_service.php
index b71306f9..3915e100 100644
--- a/user/ajax/ajax_contact_link_service.php
+++ b/user/ajax/ajax_contact_link_service.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $contact_id = intval($_GET['id']);
 
@@ -18,7 +18,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-stream mr-2"></i>Link Service to <strong><?php echo $contact_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -26,7 +26,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <div class="input-group">
@@ -58,11 +58,11 @@ ob_start();
             </div>
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="link_service_to_contact" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_contact_link_software.php b/user/ajax/ajax_contact_link_software.php
index b6551268..bb99c2cb 100644
--- a/user/ajax/ajax_contact_link_software.php
+++ b/user/ajax/ajax_contact_link_software.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $contact_id = intval($_GET['id']);
 
@@ -18,7 +18,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>License Software to <strong><?php echo $contact_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -26,7 +26,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <div class="input-group">
@@ -60,12 +60,12 @@ ob_start();
             </div>
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="link_software_to_contact" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
 ?>
diff --git a/user/ajax/ajax_contact_note_create.php b/user/ajax/ajax_contact_note_create.php
index f668e23a..a2c931e0 100644
--- a/user/ajax/ajax_contact_note_create.php
+++ b/user/ajax/ajax_contact_note_create.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $contact_id = intval($_GET['id']);
 
@@ -12,7 +12,7 @@ $contact_name = nullable_htmlentities($row['contact_name']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class='fa fa-fw fa-sticky-note mr-2'></i>Creating note: <strong><?php echo $contact_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -22,7 +22,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Type</label>
@@ -44,11 +44,11 @@ ob_start();
 
     </div>
 
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="add_contact_note" 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>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_credential_edit.php b/user/ajax/ajax_credential_edit.php
index 3b25b61e..5ac407ef 100644
--- a/user/ajax/ajax_credential_edit.php
+++ b/user/ajax/ajax_credential_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $credential_id = intval($_GET['id']);
 
@@ -36,7 +36,7 @@ while ($row = mysqli_fetch_array($sql_credential_tags)) {
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class='fas fa-fw fa-key mr-2'></i>Editing credential: <strong><?php echo $credential_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -46,7 +46,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="credential_id" value="<?php echo $credential_id; ?>">
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -259,11 +259,11 @@ ob_start();
 
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_credential" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_credential_view.php b/user/ajax/ajax_credential_view.php
index ea2a38f3..a1ae0722 100644
--- a/user/ajax/ajax_credential_view.php
+++ b/user/ajax/ajax_credential_view.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $credential_id = intval($_GET['id']);
 
@@ -91,4 +91,4 @@ ob_start();
 <script src="js/credential_show_otp_via_id.js"></script>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_document_edit.php b/user/ajax/ajax_document_edit.php
index 1bf4a163..8149ee6e 100644
--- a/user/ajax/ajax_document_edit.php
+++ b/user/ajax/ajax_document_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $document_id = intval($_GET['id']);
 
@@ -18,7 +18,7 @@ $client_id = intval($row['document_client_id']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>Editing document: <strong><?php echo $document_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -27,7 +27,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <input type="text" class="form-control" name="name" maxlength="200" value="<?php echo $document_name; ?>" placeholder="Name" required>
@@ -63,11 +63,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_document_move.php b/user/ajax/ajax_document_move.php
index 2f4368c4..77a54d4a 100644
--- a/user/ajax/ajax_document_move.php
+++ b/user/ajax/ajax_document_move.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $document_id = intval($_GET['id']);
 
@@ -15,7 +15,7 @@ $document_name = nullable_htmlentities($row['document_name']);
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>Moving document: <strong><?php echo $document_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -23,7 +23,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Move Document to</label>
@@ -99,11 +99,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="move_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Move</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_document_rename.php b/user/ajax/ajax_document_rename.php
index 019ab486..a4f2480a 100644
--- a/user/ajax/ajax_document_rename.php
+++ b/user/ajax/ajax_document_rename.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $document_id = intval($_GET['id']);
 
@@ -14,7 +14,7 @@ $document_name = nullable_htmlentities($row['document_name']);
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>Renaming document: <strong><?php echo $document_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -23,7 +23,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Document Name <strong class="text-danger">*</strong></label>
@@ -36,11 +36,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="rename_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Rename</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_document_version_view.php b/user/ajax/ajax_document_version_view.php
index dc0e7f76..b2b418c2 100644
--- a/user/ajax/ajax_document_version_view.php
+++ b/user/ajax/ajax_document_version_view.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 // Initialize the HTML Purifier to prevent XSS
 require_once "../plugins/htmlpurifier/HTMLPurifier.standalone.php";
@@ -23,17 +23,17 @@ $document_version_content = $purifier->purify($row['document_version_content']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title text-white"><i class="fa fa-fw fa-file-alt mr-2"></i><?php echo $document_version_name; ?></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
-<div class="modal-body bg-white prettyContent">
+<div class="modal-body prettyContent">
     <?php echo $document_version_content; ?>
 </div>
 
 <script src="../js/pretty_content.js"></script>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_document_view.php b/user/ajax/ajax_document_view.php
index 40b44bea..674f74cf 100644
--- a/user/ajax/ajax_document_view.php
+++ b/user/ajax/ajax_document_view.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 // Initialize the HTML Purifier to prevent XSS
 require_once "../plugins/htmlpurifier/HTMLPurifier.standalone.php";
@@ -23,18 +23,18 @@ $document_content = $purifier->purify($row['document_content']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title text-white"><i class="fa fa-fw fa-file-alt mr-2"></i><?php echo $document_name; ?></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
-<div class="modal-body bg-white prettyContent">
+<div class="modal-body prettyContent">
     <?php echo $document_content; ?>
 </div>
 
 <script src="../js/pretty_content.js"></script>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
 
diff --git a/user/ajax/ajax_domain_edit.php b/user/ajax/ajax_domain_edit.php
index 38479e47..262f2ece 100644
--- a/user/ajax/ajax_domain_edit.php
+++ b/user/ajax/ajax_domain_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $domain_id = intval($_GET['id']);
 
@@ -30,7 +30,7 @@ $history_sql = mysqli_query($mysqli, "SELECT * FROM domain_history WHERE domain_
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-globe mr-2"></i>Editing domain: <span class="text-bold"><?php echo $domain_name; ?></span></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -39,7 +39,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="domain_id" value="<?php echo $domain_id; ?>">
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -276,11 +276,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_domain" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_expense_copy.php b/user/ajax/ajax_expense_copy.php
index 66b04f0f..3f1cee5d 100644
--- a/user/ajax/ajax_expense_copy.php
+++ b/user/ajax/ajax_expense_copy.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $expense_id = intval($_GET['id']);
 
@@ -23,7 +23,7 @@ $expense_client_id = intval($row['expense_client_id']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class='fas fa-fw fa-copy mr-2'></i>Copying expense</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -31,7 +31,7 @@ ob_start();
 </div>
 
 <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
         <div class="form-row">
 
             <div class="form-group col-md">
@@ -200,7 +200,7 @@ ob_start();
 
     </div>
 
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="add_expense" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Copy</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
@@ -208,7 +208,7 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
 
 ?>
 
diff --git a/user/ajax/ajax_expense_edit.php b/user/ajax/ajax_expense_edit.php
index 563c1659..84a06a24 100644
--- a/user/ajax/ajax_expense_edit.php
+++ b/user/ajax/ajax_expense_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $expense_id = intval($_GET['id']);
 
@@ -29,7 +29,7 @@ $category_name = nullable_htmlentities($row['category_name']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class='fas fa-fw fa-shopping-cart mr-2'></i>Editing expense</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -37,7 +37,7 @@ ob_start();
 </div>
 
 <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
         <input type="hidden" name="expense_id" value="<?php echo $expense_id; ?>">
 
         <div class="form-row">
@@ -237,7 +237,7 @@ ob_start();
         <?php } ?>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_expense" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
@@ -245,7 +245,7 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
 
 ?>
 
diff --git a/user/ajax/ajax_expense_refund.php b/user/ajax/ajax_expense_refund.php
index cbf8d619..4ec75d07 100644
--- a/user/ajax/ajax_expense_refund.php
+++ b/user/ajax/ajax_expense_refund.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $expense_id = intval($_GET['id']);
 
@@ -23,7 +23,7 @@ $expense_client_id = intval($row['expense_client_id']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class='fas fa-fw fa-undo mr-2'></i>Refunding expense</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -31,7 +31,7 @@ ob_start();
 </div>
 
 <form action="post.php" method="post" autocomplete="off">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
         <input type="hidden" name="account" value="<?php echo $expense_account_id; ?>">
         <input type="hidden" name="vendor" value="<?php echo $expense_vendor_id; ?>">
         <input type="hidden" name="category" value="<?php echo $expense_category_id; ?>">
@@ -80,7 +80,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="add_expense" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Refund</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
     </div>
@@ -88,7 +88,7 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
 
 ?>
 
diff --git a/user/ajax/ajax_file_move.php b/user/ajax/ajax_file_move.php
index fb242065..7beb6702 100644
--- a/user/ajax/ajax_file_move.php
+++ b/user/ajax/ajax_file_move.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $file_id = intval($_GET['id']);
 
@@ -38,7 +38,7 @@ if ($file_ext == 'pdf') {
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-<?php echo $file_icon; ?> mr-2"></i>Moving File: <strong><?php echo $file_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -46,7 +46,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="file_id" value="<?php echo $file_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Move File to</label>
@@ -122,11 +122,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="move_file" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Move</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_file_rename.php b/user/ajax/ajax_file_rename.php
index f49dc26c..c70fd3eb 100644
--- a/user/ajax/ajax_file_rename.php
+++ b/user/ajax/ajax_file_rename.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $file_id = intval($_GET['id']);
 
@@ -14,7 +14,7 @@ $file_description = nullable_htmlentities($row['file_description']);
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-<?php echo $file_icon; ?> mr-2"></i>Renaming file: <strong><?php echo $file_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -22,7 +22,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="file_id" value="<?php echo $file_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>File Name <strong class="text-danger">*</strong></label>
@@ -45,11 +45,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="rename_file" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Rename</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_folder_rename.php b/user/ajax/ajax_folder_rename.php
index 40929a13..f43dd009 100644
--- a/user/ajax/ajax_folder_rename.php
+++ b/user/ajax/ajax_folder_rename.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $folder_id = intval($_GET['id']);
 
@@ -13,7 +13,7 @@ $folder_name = nullable_htmlentities($row['folder_name']);
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-folder mr-2"></i>Renaming folder: <strong><?php echo $folder_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -21,7 +21,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="folder_id" value="<?php echo $folder_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
@@ -34,11 +34,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="rename_folder" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Rename</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_invoice_apply_credit.php b/user/ajax/ajax_invoice_apply_credit.php
index 5e80e474..cb928fdc 100644
--- a/user/ajax/ajax_invoice_apply_credit.php
+++ b/user/ajax/ajax_invoice_apply_credit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $invoice_id = intval($_GET['id']);
 
@@ -85,4 +85,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_invoice_copy.php b/user/ajax/ajax_invoice_copy.php
index 6a281d48..cc645eee 100644
--- a/user/ajax/ajax_invoice_copy.php
+++ b/user/ajax/ajax_invoice_copy.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $invoice_id = intval($_GET['id']);
 
@@ -15,7 +15,7 @@ $client_name = nullable_htmlentities($row['client_name']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-copy mr-2"></i>Copying invoice: <strong><?php echo "$invoice_prefix$invoice_number"; ?></strong> - <?php echo $client_name; ?></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -24,7 +24,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
     
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Invoice Date <strong class="text-danger">*</strong></label>
@@ -37,7 +37,7 @@ ob_start();
         </div>
         
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="add_invoice_copy" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Copy</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
@@ -45,4 +45,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_invoice_edit.php b/user/ajax/ajax_invoice_edit.php
index d6a804f3..38797d33 100644
--- a/user/ajax/ajax_invoice_edit.php
+++ b/user/ajax/ajax_invoice_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $invoice_id = intval($_GET['id']);
 
@@ -22,7 +22,7 @@ $client_name = nullable_htmlentities($row['client_name']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-file-invoice mr-2"></i>Editing invoice: <strong><?php echo "$invoice_prefix$invoice_number"; ?></strong> - <?php echo $client_name; ?></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -31,7 +31,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
 
-    <div class="modal-body bg-white" <?php if (lookupUserPermission('module_sales') <= 1) { echo 'inert'; } ?>>
+    <div class="modal-body" <?php if (lookupUserPermission('module_sales') <= 1) { echo 'inert'; } ?>>
 
         <div class="form-group">
             <label>Invoice Date <strong class="text-danger">*</strong></label>
@@ -108,7 +108,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_invoice" 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>
@@ -116,4 +116,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_invoice_pay.php b/user/ajax/ajax_invoice_pay.php
index 898c8a1c..3624f1d5 100644
--- a/user/ajax/ajax_invoice_pay.php
+++ b/user/ajax/ajax_invoice_pay.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $invoice_id = intval($_GET['id']);
 
@@ -177,4 +177,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_item_edit.php b/user/ajax/ajax_item_edit.php
index 7ace177e..424bd9dd 100644
--- a/user/ajax/ajax_item_edit.php
+++ b/user/ajax/ajax_item_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $item_id = intval($_GET['id']);
 
@@ -17,7 +17,7 @@ $tax_id = intval($row['item_tax_id']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-edit mr-2"></i>Editing Line Item: <strong><?php echo $item_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -26,7 +26,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="item_id" value="<?php echo $item_id; ?>">
     
-    <div class="modal-body bg-white">
+    <div class="modal-body">
         <div class="form-group">
             <label>Item <strong class="text-danger">*</strong></label>
             <div class="input-group">
@@ -94,11 +94,11 @@ ob_start();
         </div>
     </div>
 
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_item" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_location_edit.php b/user/ajax/ajax_location_edit.php
index fb84acbc..2b477f92 100644
--- a/user/ajax/ajax_location_edit.php
+++ b/user/ajax/ajax_location_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../../includes/modal_header.php';
 
 $location_id = intval($_GET['id']);
 
@@ -40,7 +40,7 @@ while ($row = mysqli_fetch_array($sql_location_tags)) {
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Editing location: <strong><?php echo $location_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -50,7 +50,7 @@ ob_start();
     <input type="hidden" name="location_id" value="<?php echo $location_id; ?>">
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
     
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -291,7 +291,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_location" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
@@ -299,4 +299,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_network_edit.php b/user/ajax/ajax_network_edit.php
index 71b6139d..d5fa384a 100644
--- a/user/ajax/ajax_network_edit.php
+++ b/user/ajax/ajax_network_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $network_id = intval($_GET['id']);
 
@@ -24,7 +24,7 @@ $client_id = intval($row['network_client_id']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-network-wired mr-2"></i>Editing network: <span class="text-bold"><?php echo $network_name; ?></span></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -33,7 +33,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="network_id" value="<?php echo $network_id; ?>">
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -192,11 +192,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_network" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_product_edit.php b/user/ajax/ajax_product_edit.php
index 61a74af2..cb336a32 100644
--- a/user/ajax/ajax_product_edit.php
+++ b/user/ajax/ajax_product_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $product_id = intval($_GET['id']);
 
@@ -18,7 +18,7 @@ $product_tax_id = intval($row['product_tax_id']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-box-open mr-2"></i>Editing product: <strong><?php echo $product_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -26,7 +26,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="product_id" value="<?php echo $product_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
@@ -116,7 +116,7 @@ ob_start();
 
     </div>
 
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_product" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
@@ -124,4 +124,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_project_edit.php b/user/ajax/ajax_project_edit.php
index 71076f57..ddd9658c 100644
--- a/user/ajax/ajax_project_edit.php
+++ b/user/ajax/ajax_project_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $project_id = intval($_GET['id']);
 
@@ -25,7 +25,7 @@ $project_manager = intval($row['project_manager']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title">
         <i class="fas fa-fw fa-project-diagram mr-2"></i>Editing Project: <strong><?php echo $project_name; ?></strong>
     </h5>
@@ -35,7 +35,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="project_id" value="<?php echo $project_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
         <div class="form-group">
             <label>Project Name <strong class="text-danger">*</strong></label>
             <div class="input-group">
@@ -105,7 +105,7 @@ ob_start();
             </div>
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_project" class="btn btn-primary text-bold">
             <i class="fas fa-check mr-2"></i>Save
         </button>
@@ -117,4 +117,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_quote_copy.php b/user/ajax/ajax_quote_copy.php
index ba30333a..10087246 100644
--- a/user/ajax/ajax_quote_copy.php
+++ b/user/ajax/ajax_quote_copy.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $quote_id = intval($_GET['id']);
 
@@ -16,7 +16,7 @@ $client_name = nullable_htmlentities($row['client_name']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-copy mr-2"></i>Copying quote: <strong><?php echo "$quote_prefix$quote_number"; ?></strong> - <?php echo $client_name; ?></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -24,7 +24,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="quote_id" value="<?php echo $quote_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
         <?php if (isset($_GET['client_id'])) { ?>
         <input type="hidden" name="client" value="<?php echo $client_id; ?>">
         <?php } else { ?>
@@ -69,7 +69,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="add_quote_copy" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Copy</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
@@ -78,4 +78,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_quote_edit.php b/user/ajax/ajax_quote_edit.php
index 51c7c8bd..80876730 100644
--- a/user/ajax/ajax_quote_edit.php
+++ b/user/ajax/ajax_quote_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $quote_id = intval($_GET['id']);
 
@@ -22,7 +22,7 @@ $client_name = nullable_htmlentities($row['client_name']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title text-white"><i class="fas fa-fw fa-comment-dollar mr-2"></i>Editing quote: <span class="text-bold"><?php echo "$quote_prefix$quote_number"; ?></span> - <span class="text"><?php echo $client_name; ?></span></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -31,7 +31,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="quote_id" value="<?php echo $quote_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Quote Date</label>
@@ -105,7 +105,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_quote" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
@@ -113,4 +113,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_rack_device_add.php b/user/ajax/ajax_rack_device_add.php
index 2434c1d3..7e378eaa 100644
--- a/user/ajax/ajax_rack_device_add.php
+++ b/user/ajax/ajax_rack_device_add.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $rack_id = intval($_GET['id']);
 
@@ -13,7 +13,7 @@ $client_id = intval($row['rack_client_id']);
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-server mr-2"></i>Adding Device to Rack <strong><?php echo $rack_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -25,7 +25,7 @@ ob_start();
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
     <input type="hidden" name="rack_id" value="<?php echo $rack_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Custom Device</label>
@@ -80,11 +80,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="add_rack_unit" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Add to Rack</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/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_rack_edit.php b/user/ajax/ajax_rack_edit.php
index b8343817..92c5fdc0 100644
--- a/user/ajax/ajax_rack_edit.php
+++ b/user/ajax/ajax_rack_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $rack_id = intval($_GET['id']);
 
@@ -23,7 +23,7 @@ $client_id = intval($row['rack_client_id']);
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-server mr-2"></i>Editing rack: <strong><?php echo $rack_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -35,7 +35,7 @@ ob_start();
     <input type="hidden" name="rack_id" value="<?php echo $rack_id; ?>">
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -170,11 +170,11 @@ ob_start();
 
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_rack" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_recurring_expense_edit.php b/user/ajax/ajax_recurring_expense_edit.php
index 34a7c55e..dd6b8bee 100644
--- a/user/ajax/ajax_recurring_expense_edit.php
+++ b/user/ajax/ajax_recurring_expense_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $recurring_expense_id = intval($_GET['id']);
 
@@ -29,14 +29,14 @@ $recurring_expense_client_id = intval($row['recurring_expense_client_id']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title text-white"><i class="fa fa-fw fa-clock mr-2"></i>Editing recurring expense</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 bg-white">
+    <div class="modal-body">
         <input type="hidden" name="recurring_expense_id" value="<?php echo $recurring_expense_id; ?>">
 
         <div class="form-row">
@@ -257,7 +257,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_recurring_expense" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
@@ -265,4 +265,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_recurring_invoice_edit.php b/user/ajax/ajax_recurring_invoice_edit.php
index 0a62b4f4..25785e11 100644
--- a/user/ajax/ajax_recurring_invoice_edit.php
+++ b/user/ajax/ajax_recurring_invoice_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $recurring_invoice_id = intval($_GET['id']);
 
@@ -21,7 +21,7 @@ $category_id = intval($row['recurring_invoice_category_id']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-redo-alt mr-2"></i>Editing Recur Invoice: <strong><?php echo "$recurring_invoice_prefix$recurring_invoice_number"; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -30,7 +30,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="recurring_invoice_id" value="<?php echo $recurring_invoice_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Scope</label>
@@ -126,7 +126,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_recurring_invoice" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
@@ -134,4 +134,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_recurring_ticket_edit.php b/user/ajax/ajax_recurring_ticket_edit.php
index 2893b742..c5ca372f 100644
--- a/user/ajax/ajax_recurring_ticket_edit.php
+++ b/user/ajax/ajax_recurring_ticket_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $recurring_ticket_id = intval($_GET['id']);
 
@@ -31,7 +31,7 @@ while ($row = mysqli_fetch_array($sql_additional_assets)) {
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-calendar-check mr-2"></i>Editing Recurring Ticket: <strong><?php echo $recurring_ticket_subject; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -41,7 +41,7 @@ ob_start();
     <input type="hidden" name="recurring_ticket_id" value="<?php echo $recurring_ticket_id; ?>">
     <input type="hidden" name="client" value="<?php echo $client_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -292,7 +292,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_recurring_ticket" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
@@ -300,4 +300,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_revenue_edit.php b/user/ajax/ajax_revenue_edit.php
index 593bb6ff..ff9f44d7 100644
--- a/user/ajax/ajax_revenue_edit.php
+++ b/user/ajax/ajax_revenue_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $revenue_id = intval($_GET['id']);
 
@@ -21,7 +21,7 @@ $category_id = intval($row['revenue_category_id']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-hand-holding-usd mr-2"></i>Edit Revenue</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -29,7 +29,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="revenue_id" value="<?php echo $revenue_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-row">
 
@@ -180,7 +180,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_revenue" 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="fas fa-times mr-2"></i>Cancel</button>
     </div>
@@ -188,4 +188,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_service_details.php b/user/ajax/ajax_service_details.php
index 8c386fba..fed781e6 100644
--- a/user/ajax/ajax_service_details.php
+++ b/user/ajax/ajax_service_details.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $service_id = intval($_GET['id']);
 
@@ -91,13 +91,13 @@ $sql_docs = mysqli_query(
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title text-white"><i class="fa fa-fw fa-stream mr-2"></i><?php echo $service_name; ?></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
     </button>
 </div>
-<div class="modal-body bg-white">
+<div class="modal-body">
     <div class="row">
 
         <!-- Main/Left side -->
@@ -310,5 +310,5 @@ ob_start();
 </div>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
 ?>
diff --git a/user/ajax/ajax_service_edit.php b/user/ajax/ajax_service_edit.php
index 2045a693..d493c6f3 100644
--- a/user/ajax/ajax_service_edit.php
+++ b/user/ajax/ajax_service_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $service_id = intval($_GET['id']);
 
@@ -84,7 +84,7 @@ $sql_docs = mysqli_query(
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title text-white"><i class="fa fa-fw fa-stream mr-2"></i>Editing service: <strong><?php echo $service_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span aria-hidden="true">&times;</span>
@@ -95,7 +95,7 @@ ob_start();
     <input type="hidden" name="client_id" value="<?php echo $client_id ?>">
     <input type="hidden" name="service_id" value="<?php echo $service_id ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -348,11 +348,11 @@ ob_start();
 
         </div>
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_service" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_software_edit.php b/user/ajax/ajax_software_edit.php
index 7aa7d523..260b4c28 100644
--- a/user/ajax/ajax_software_edit.php
+++ b/user/ajax/ajax_software_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $software_id = intval($_GET['id']);
 
@@ -44,7 +44,7 @@ $contact_licenses = implode(',', $contact_licenses_array);
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>Editing license: <strong><?php echo $software_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -53,7 +53,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="software_id" value="<?php echo $software_id; ?>">
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -307,11 +307,11 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_software" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_ticket_assign.php b/user/ajax/ajax_ticket_assign.php
index 9286ca6c..e2ae6df2 100644
--- a/user/ajax/ajax_ticket_assign.php
+++ b/user/ajax/ajax_ticket_assign.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $ticket_id = intval($_GET['id']);
 
@@ -23,7 +23,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class='fa fa-fw fa-user-check mr-2'></i>Assigning 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>
@@ -33,7 +33,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
     <input type="hidden" name="ticket_status" value="<?php echo $ticket_status; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Assign to</label>
@@ -63,7 +63,7 @@ ob_start();
 
     </div>
 
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="assign_ticket" class="btn btn-primary text-bold">
             <i class="fa fa-check mr-2"></i>Assign
         </button>
@@ -76,4 +76,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_ticket_billable.php b/user/ajax/ajax_ticket_billable.php
index 9f7e7b2a..e14ceacb 100644
--- a/user/ajax/ajax_ticket_billable.php
+++ b/user/ajax/ajax_ticket_billable.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $ticket_id = intval($_GET['id']);
 
@@ -16,7 +16,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title">
         <i class="fa fa-fw fa-user mr-2"></i>
         Edit Billable Status for <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong>
@@ -26,7 +26,7 @@ ob_start();
     </button>
 </div>
 <form action="post.php" method="post" autocomplete="off">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
         <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
         <div class="form-group">
             <label>Billable</label>
@@ -43,7 +43,7 @@ ob_start();
 
     </div>
 
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_ticket_billable_status" class="btn btn-primary text-bold">
             <i class="fa fa-check mr-2"></i>Save
         </button>
@@ -56,4 +56,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_ticket_contact.php b/user/ajax/ajax_ticket_contact.php
index b790ac7a..e865de78 100644
--- a/user/ajax/ajax_ticket_contact.php
+++ b/user/ajax/ajax_ticket_contact.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $ticket_id = intval($_GET['id']);
 
@@ -22,7 +22,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i>Changing contact: <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>
@@ -30,7 +30,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Contact</label>
@@ -89,7 +89,7 @@ ob_start();
 
     </div>
 
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_ticket_contact" 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>
@@ -98,4 +98,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_ticket_edit.php b/user/ajax/ajax_ticket_edit.php
index 5a27209c..5aa6de8d 100644
--- a/user/ajax/ajax_ticket_edit.php
+++ b/user/ajax/ajax_ticket_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $ticket_id = intval($_GET['id']);
 
@@ -37,7 +37,7 @@ while ($row = mysqli_fetch_array($sql_additional_assets)) {
 // Generate the HTML form content using output buffering.
 ob_start();
 ?>
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <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>
@@ -46,7 +46,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -387,7 +387,7 @@ ob_start();
 
     </div>
 
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <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>
@@ -395,4 +395,4 @@ ob_start();
 </form>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_ticket_priority.php b/user/ajax/ajax_ticket_priority.php
index d5f3b115..c4ab0fdc 100644
--- a/user/ajax/ajax_ticket_priority.php
+++ b/user/ajax/ajax_ticket_priority.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $ticket_id = intval($_GET['id']);
 
@@ -22,7 +22,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-thermometer-half mr-2"></i>Editing ticket priority: <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>
@@ -32,7 +32,7 @@ ob_start();
     <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
     
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Priority</label>
@@ -50,7 +50,7 @@ ob_start();
 
     </div>
 
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_ticket_priority" 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>
@@ -59,4 +59,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_ticket_reply_edit.php b/user/ajax/ajax_ticket_reply_edit.php
index 95a1b0ec..39172e00 100644
--- a/user/ajax/ajax_ticket_reply_edit.php
+++ b/user/ajax/ajax_ticket_reply_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $ticket_reply_id = intval($_GET['id']);
 
@@ -22,7 +22,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-edit mr-2"></i>Editing Ticket Reply</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -32,7 +32,7 @@ ob_start();
     <input type="hidden" name="ticket_reply_id" value="<?php echo $ticket_reply_id; ?>">
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <div class="btn-group btn-block btn-group-toggle" data-toggle="buttons">
@@ -59,7 +59,7 @@ ob_start();
         <?php } ?>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_ticket_reply" 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>
@@ -67,4 +67,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_ticket_reply_redact.php b/user/ajax/ajax_ticket_reply_redact.php
index 4766ad55..0d6c8e88 100644
--- a/user/ajax/ajax_ticket_reply_redact.php
+++ b/user/ajax/ajax_ticket_reply_redact.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $ticket_reply_id = intval($_GET['id']);
 
@@ -19,7 +19,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-edit mr-2"></i>Redacting Ticket Reply</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -29,14 +29,14 @@ ob_start();
     <input type="hidden" name="ticket_reply_id" value="<?php echo $ticket_reply_id; ?>">
     <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <textarea class="form-control tinymceRedact" name="ticket_reply"><?php echo $ticket_reply; ?></textarea>
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="redact_ticket_reply" 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>
@@ -44,4 +44,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_ticket_task_edit.php b/user/ajax/ajax_ticket_task_edit.php
index ef58bbb6..27056a40 100644
--- a/user/ajax/ajax_ticket_task_edit.php
+++ b/user/ajax/ajax_ticket_task_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $task_id = intval($_GET['id']);
 
@@ -19,7 +19,7 @@ ob_start();
 
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-fw fa-tasks mr-2"></i>Editing task</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -28,7 +28,7 @@ ob_start();
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="task_id" value="<?php echo $task_id; ?>">
     
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
@@ -52,7 +52,7 @@ ob_start();
     
     </div>
 
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_ticket_task" 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>
@@ -61,4 +61,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_transfer_edit.php b/user/ajax/ajax_transfer_edit.php
index 0bdd9a99..84ee2176 100644
--- a/user/ajax/ajax_transfer_edit.php
+++ b/user/ajax/ajax_transfer_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $transfer_id = intval($_GET['id']);
 
@@ -26,7 +26,7 @@ $revenue_id = intval($row['transfer_revenue_id']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-exchange-alt mr-2"></i>Editing Transfer</h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -37,7 +37,7 @@ ob_start();
     <input type="hidden" name="expense_id" value="<?php echo $expense_id; ?>">
     <input type="hidden" name="revenue_id" value="<?php echo $revenue_id; ?>">
 
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <div class="form-row">
 
@@ -181,7 +181,7 @@ ob_start();
 
     </div>
 
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_transfer" 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>
@@ -189,4 +189,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_trip_copy.php b/user/ajax/ajax_trip_copy.php
index 3eddd5a0..67304735 100644
--- a/user/ajax/ajax_trip_copy.php
+++ b/user/ajax/ajax_trip_copy.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $trip_id = intval($_GET['id']);
 
@@ -22,14 +22,14 @@ $client_id = intval($row['trip_client_id']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-copy mr-2"></i>Copying Trip</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 bg-white">
+    <div class="modal-body">
 
         <div class="form-row">
 
@@ -157,7 +157,7 @@ ob_start();
         <?php } ?>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="add_trip" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Copy</button>
         <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
     </div>
@@ -165,4 +165,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_trip_edit.php b/user/ajax/ajax_trip_edit.php
index 352f47dc..917c4ef4 100644
--- a/user/ajax/ajax_trip_edit.php
+++ b/user/ajax/ajax_trip_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $trip_id = intval($_GET['id']);
 
@@ -22,14 +22,14 @@ $client_id = intval($row['trip_client_id']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fa fa-route mr-2"></i>Editing Trip</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 bg-white">
+    <div class="modal-body">
         <input type="hidden" name="trip_id" value="<?php echo $trip_id; ?>">
 
         <div class="form-row">
@@ -168,7 +168,7 @@ ob_start();
 
     </div>
 
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_trip" 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>
@@ -176,4 +176,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_vendor_details.php b/user/ajax/ajax_vendor_details.php
index eac971fe..cd143531 100644
--- a/user/ajax/ajax_vendor_details.php
+++ b/user/ajax/ajax_vendor_details.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $vendor_id = intval($_GET['id']);
 
@@ -86,4 +86,4 @@ ob_start();
 </div>
 
 <?php
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/ajax/ajax_vendor_edit.php b/user/ajax/ajax_vendor_edit.php
index 28e16c51..f1c4b4ac 100644
--- a/user/ajax/ajax_vendor_edit.php
+++ b/user/ajax/ajax_vendor_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../includes/ajax_header.php';
+require_once '../../includes/modal_header.php';
 
 $vendor_id = intval($_GET['id']);
 
@@ -26,7 +26,7 @@ $vendor_template_id = intval($row['vendor_template_id']);
 ob_start();
 ?>
 
-<div class="modal-header">
+<div class="modal-header bg-dark">
     <h5 class="modal-title"><i class="fas fa-fw fa-building mr-2"></i>Editing vendor: <strong><?php echo $vendor_name; ?></strong></h5>
     <button type="button" class="close text-white" data-dismiss="modal">
         <span>&times;</span>
@@ -34,7 +34,7 @@ ob_start();
 </div>
 <form action="post.php" method="post" autocomplete="off">
     <input type="hidden" name="vendor_id" value="<?php echo $vendor_id; ?>">
-    <div class="modal-body bg-white">
+    <div class="modal-body">
 
         <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
@@ -204,7 +204,7 @@ ob_start();
         </div>
 
     </div>
-    <div class="modal-footer bg-white">
+    <div class="modal-footer">
         <button type="submit" name="edit_vendor" 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>
@@ -212,4 +212,4 @@ ob_start();
 
 <?php
 
-require_once "../includes/ajax_footer.php";
+require_once '../../includes/modal_footer.php';
diff --git a/user/asset_details.php b/user/asset_details.php
index 59c07d64..f0aba1a5 100644
--- a/user/asset_details.php
+++ b/user/asset_details.php
@@ -1242,7 +1242,7 @@ if (isset($_GET['asset_id'])) {
 <!-- Include script to get TOTP code via the credential ID -->
 <script src="js/credential_show_otp_via_id.js"></script>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <?php
 
diff --git a/user/assets.php b/user/assets.php
index 0d73840e..adcd0800 100644
--- a/user/assets.php
+++ b/user/assets.php
@@ -718,7 +718,7 @@ if (mysqli_num_rows($os_sql) > 0) {
     </div>
 </div>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <!-- JSON Autocomplete / type ahead -->
 <link rel="stylesheet" href="plugins/jquery-ui/jquery-ui.min.css">
diff --git a/user/calendar.php b/user/calendar.php
index 1f0fd9d4..f59f8c9e 100644
--- a/user/calendar.php
+++ b/user/calendar.php
@@ -109,7 +109,7 @@ while ($row = mysqli_fetch_array($sql)) {
 <?php require_once "../includes/footer.php";
 ?>
 
-<script src='plugins/fullcalendar/dist/index.global.js'></script>
+<script src='../plugins/fullcalendar/dist/index.global.js'></script>
 
 <script>
     document.addEventListener('DOMContentLoaded', function() {
diff --git a/user/certificates.php b/user/certificates.php
index d765d3c7..36393445 100644
--- a/user/certificates.php
+++ b/user/certificates.php
@@ -313,7 +313,7 @@ require_once "modals/certificate_add_modal.php";
 require_once "modals/certificate_export_modal.php";
 ?>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 <script src="js/certificate_fetch_ssl.js"></script>
 
 <?php require_once "../includes/footer.php";
\ No newline at end of file
diff --git a/user/client_documents.php b/user/client_documents.php
index c87f0b1f..54eb8d1b 100644
--- a/user/client_documents.php
+++ b/user/client_documents.php
@@ -488,7 +488,7 @@ while ($folder_id > 0) {
     </div>
 </div>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <?php
 require_once "modals/share_modal.php";
diff --git a/user/client_files.php b/user/client_files.php
index cc83e8ba..97cea6c3 100644
--- a/user/client_files.php
+++ b/user/client_files.php
@@ -632,7 +632,7 @@ function prevFile() {
 }
 </script>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <?php
 require_once "modals/client_file_upload_modal.php";
diff --git a/user/clients.php b/user/clients.php
index ad480fdc..7b498dac 100644
--- a/user/clients.php
+++ b/user/clients.php
@@ -584,7 +584,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         <div class="dropdown-menu">
                                             <a class="dropdown-item" href="#"
                                                 data-toggle="ajax-modal"
-                                                data-ajax-url="modals/client/client_edit.php"
+                                                data-ajax-url="modals/client_edit.php"
                                                 data-ajax-id="<?php echo $client_id; ?>">
                                                 <i class="fas fa-fw fa-edit mr-2"></i>Edit
                                             </a>
@@ -613,11 +613,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 </table>
             </div>
             <?php 
-                require_once "modals/client/client_bulk_edit_industry.php";
-                require_once "modals/client/client_bulk_edit_referral.php";
-                require_once "modals/client/client_bulk_edit_hourly_rate.php";
-                require_once "modals/client/client_bulk_assign_tags.php"; 
-                require_once "modals/client/client_bulk_email.php";
+                require_once "modals/client_bulk_edit_industry.php";
+                require_once "modals/client_bulk_edit_referral.php";
+                require_once "modals/client_bulk_edit_hourly_rate.php";
+                require_once "modals/client_bulk_assign_tags.php"; 
+                require_once "modals/client_bulk_email.php";
             ?>
         </form>
      <!-- Ends Card Body -->
@@ -628,7 +628,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="../js/bulk_actions.js"></script>
 
 <?php
-require_once "modals/client/client_add.php";
-require_once "modals/client/client_import.php";
-require_once "modals/client/client_export.php";
+require_once "modals/client_add.php";
+require_once "modals/client_import.php";
+require_once "modals/client_export.php";
 require_once "../includes/footer.php";
diff --git a/user/contacts.php b/user/contacts.php
index b77d779b..135343b7 100644
--- a/user/contacts.php
+++ b/user/contacts.php
@@ -602,7 +602,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     });
 </script>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <?php
 
diff --git a/user/credentials.php b/user/credentials.php
index 4c81bd96..e96d2534 100644
--- a/user/credentials.php
+++ b/user/credentials.php
@@ -537,7 +537,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 <script src="js/credential_show_otp_via_id.js"></script>
 <!-- Include script to generate readable passwords for login entries -->
 <script src="js/generate_password.js"></script>
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <?php
 
diff --git a/user/domains.php b/user/domains.php
index 68b0f9ad..59f82b9a 100644
--- a/user/domains.php
+++ b/user/domains.php
@@ -375,7 +375,7 @@ require_once "modals/domain_add_modal.php";
 require_once "modals/domain_export_modal.php";
 ?>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <?php require_once "../includes/footer.php";
 
diff --git a/user/expenses.php b/user/expenses.php
index b19dfdfc..39c8235a 100644
--- a/user/expenses.php
+++ b/user/expenses.php
@@ -380,7 +380,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         </div>
     </div>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <?php
 require_once "modals/expense_add_modal.php";
diff --git a/user/global_search.php b/user/global_search.php
index ca21e3b3..30ce3685 100644
--- a/user/global_search.php
+++ b/user/global_search.php
@@ -3,7 +3,7 @@
 require_once "includes/inc_all.php";
 
 // Initialize the HTML Purifier to prevent XSS
-require "plugins/htmlpurifier/HTMLPurifier.standalone.php";
+require "../plugins/htmlpurifier/HTMLPurifier.standalone.php";
 
 $purifier_config = HTMLPurifier_Config::createDefault();
 $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]);
@@ -857,4 +857,4 @@ require_once "../includes/footer.php";
 
 ?>
 
-<script src="js/pretty_content.js"></script>
+<script src="../js/pretty_content.js"></script>
diff --git a/user/includes/inc_client_top_head.php b/user/includes/inc_client_top_head.php
index d352e991..53ba2e7f 100644
--- a/user/includes/inc_client_top_head.php
+++ b/user/includes/inc_client_top_head.php
@@ -13,7 +13,7 @@
                 <div class="dropdown-menu">
                     <a class="dropdown-item" href="#" 
                         data-toggle="ajax-modal"
-                        data-ajax-url="ajax/ajax_client_edit.php"
+                        data-ajax-url="modals/client_edit.php"
                         data-ajax-id="<?php echo $client_id; ?>">
                         <i class="fas fa-fw fa-edit mr-2"></i>Edit Client
                     </a>
@@ -174,6 +174,6 @@
 </div>
 
 <?php
-require_once "modals/client/client_credit_add.php";
-require_once "modals/client/client_delete.php";
-require_once "modals/client/client_download_pdf.php";
+require_once "modals/client_credit_add.php";
+require_once "modals/client_delete.php";
+require_once "modals/client_download_pdf.php";
diff --git a/user/invoices.php b/user/invoices.php
index c292b078..84341e84 100644
--- a/user/invoices.php
+++ b/user/invoices.php
@@ -459,7 +459,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 </div>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <?php
 require_once "modals/invoice_add_modal.php";
diff --git a/user/locations.php b/user/locations.php
index 0fbc1f55..31156530 100644
--- a/user/locations.php
+++ b/user/locations.php
@@ -408,7 +408,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 </div>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <?php
 
diff --git a/user/modals/account_add_modal.php b/user/modals/account_add_modal.php
index f7ac138a..c2271d00 100644
--- a/user/modals/account_add_modal.php
+++ b/user/modals/account_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addAccountModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-piggy-bank mr-2"></i>New Account</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -10,7 +10,7 @@
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Account Name <strong class="text-danger">*</strong></label>
@@ -53,7 +53,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_account" 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>
diff --git a/user/modals/asset_add_modal.php b/user/modals/asset_add_modal.php
index 12e23ee3..f5607821 100644
--- a/user/modals/asset_add_modal.php
+++ b/user/modals/asset_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addAssetModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>New <?php if (!empty($_GET['type'])) { echo ucwords(strip_tags($_GET['type'])); }else{ echo "Asset"; } ?></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,7 +11,7 @@
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                <div class="modal-body bg-white ui-front">
+                <div class="modal-body ui-front">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -435,7 +435,7 @@
 
                     </div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_asset" 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>
diff --git a/user/modals/asset_bulk_add_ticket_modal.php b/user/modals/asset_bulk_add_ticket_modal.php
index 86124ef9..e6cbaf1d 100644
--- a/user/modals/asset_bulk_add_ticket_modal.php
+++ b/user/modals/asset_bulk_add_ticket_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="bulkAddTicketModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Creating Tickets for Assets</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -10,7 +10,7 @@
             
             <input type="hidden" name="bulk_billable" value="0">
             <input type="hidden" name="bulk_client" value="<?php echo $client_id; ?>">
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Subject <strong class="text-danger">*</strong></label>
@@ -126,7 +126,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_add_asset_ticket" 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="fas fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/asset_bulk_assign_contact_modal.php b/user/modals/asset_bulk_assign_contact_modal.php
index c95978cd..6f928a30 100644
--- a/user/modals/asset_bulk_assign_contact_modal.php
+++ b/user/modals/asset_bulk_assign_contact_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkAssignContactModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-user-check mr-2"></i>Bulk Assign Contact</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Assign To</label>
@@ -35,7 +35,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_assign_asset_contact" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/asset_bulk_assign_location_modal.php b/user/modals/asset_bulk_assign_location_modal.php
index c9989c2f..3e3b85f9 100644
--- a/user/modals/asset_bulk_assign_location_modal.php
+++ b/user/modals/asset_bulk_assign_location_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkAssignLocationModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Bulk Assign Location</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Location</label>
@@ -34,7 +34,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_assign_asset_location" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/asset_bulk_assign_physical_location_modal.php b/user/modals/asset_bulk_assign_physical_location_modal.php
index 58f4b1ae..32d49043 100644
--- a/user/modals/asset_bulk_assign_physical_location_modal.php
+++ b/user/modals/asset_bulk_assign_physical_location_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkAssignPhysicalLocationModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Bulk Set Physical Location</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Physical Location</label>
@@ -22,7 +22,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_assign_asset_physical_location" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/asset_bulk_edit_status_modal.php b/user/modals/asset_bulk_edit_status_modal.php
index 02e18e50..384ce234 100644
--- a/user/modals/asset_bulk_edit_status_modal.php
+++ b/user/modals/asset_bulk_edit_status_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkEditStatusModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-info mr-2"></i>Bulk Edit Status</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Status</label>
@@ -27,7 +27,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_asset_status" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/asset_bulk_transfer_client_modal.php b/user/modals/asset_bulk_transfer_client_modal.php
index c469d395..1c1ccb89 100644
--- a/user/modals/asset_bulk_transfer_client_modal.php
+++ b/user/modals/asset_bulk_transfer_client_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkTransferAssetClientModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-exchange mr-2"></i>Transferring Asset(s)</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>New Client <strong class="text-danger">*</strong></label>
@@ -39,7 +39,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_transfer_client_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Transfer</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/asset_export_modal.php b/user/modals/asset_export_modal.php
index 8860ba99..db652510 100644
--- a/user/modals/asset_export_modal.php
+++ b/user/modals/asset_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportAssetModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Assets to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -13,10 +13,10 @@
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_assets_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/asset_import_modal.php b/user/modals/asset_import_modal.php
index d5aa4f51..764355ae 100644
--- a/user/modals/asset_import_modal.php
+++ b/user/modals/asset_import_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="importAssetModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>Import Assets</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -13,7 +13,7 @@
                 <?php if ($client_url) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                     <p><strong>Format csv file with headings & data:</strong><br>Name, Description, Type, Make, Model, Serial, OS, Purchase Date, Assigned To, Location, Physical Location</p>
                     <hr>
                     <div class="form-group my-4">
@@ -23,7 +23,7 @@
                     <div>Download <a href="post.php?download_assets_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
                     <small class="text-muted">Note: Purchase date must be in the format YYYY-MM-DD. Spreadsheet tools may automatically reformat dates.</small>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="import_assets_csv" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Import</button>
                 </div>
             </form>
diff --git a/user/modals/asset_interface_add_modal.php b/user/modals/asset_interface_add_modal.php
index a5826367..6016ca32 100644
--- a/user/modals/asset_interface_add_modal.php
+++ b/user/modals/asset_interface_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addAssetInterfaceModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-ethernet mr-2"></i>New Network Interface</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -12,7 +12,7 @@
                 <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -212,7 +212,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_asset_interface" class="btn btn-primary text-bold">
                         <i class="fas fa-check mr-2"></i>Create
                     </button>
diff --git a/user/modals/asset_interface_bulk_edit_network_modal.php b/user/modals/asset_interface_bulk_edit_network_modal.php
index f8b27f7e..f041a6f6 100644
--- a/user/modals/asset_interface_bulk_edit_network_modal.php
+++ b/user/modals/asset_interface_bulk_edit_network_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkAssignNetworkModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-network-wired mr-2"></i>Bulk Assign Network</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <!-- Network -->
                 <div class="form-group">
@@ -42,7 +42,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_asset_interface_network" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/asset_interface_bulk_edit_type_modal.php b/user/modals/asset_interface_bulk_edit_type_modal.php
index b9ab777c..f98f2d0f 100644
--- a/user/modals/asset_interface_bulk_edit_type_modal.php
+++ b/user/modals/asset_interface_bulk_edit_type_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkSetInterfaceTypeModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-ethernet mr-2"></i>Bulk Set Interface Type</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Interface Type</label>
@@ -27,7 +27,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_asset_interface_type" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/asset_interface_export_modal.php b/user/modals/asset_interface_export_modal.php
index f8b6f182..b58c663b 100644
--- a/user/modals/asset_interface_export_modal.php
+++ b/user/modals/asset_interface_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportAssetInterfaceModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Interfaces to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,10 +11,10 @@
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
                 <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_client_asset_interfaces_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/asset_interface_import_modal.php b/user/modals/asset_interface_import_modal.php
index 3df676e3..b5165297 100644
--- a/user/modals/asset_interface_import_modal.php
+++ b/user/modals/asset_interface_import_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="importAssetInterfaceModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-ethernet mr-2"></i>Import Interfaces</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -10,7 +10,7 @@
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
                 <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                     <p><strong>Format csv file with headings & data:</strong><br>Name, Description, Type, MAC, IP, NAT IP, IPv6, Network</p>
                     <hr>
                     <div class="form-group my-4">
@@ -19,7 +19,7 @@
                     <hr>
                     <div>Download <a href="post.php?download_client_asset_interfaces_csv_template=<?php echo $asset_id; ?>">sample csv template</a></div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="import_client_asset_interfaces_csv" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Import</button>
                 </div>
             </form>
diff --git a/user/modals/asset_interface_multiple_add_modal.php b/user/modals/asset_interface_multiple_add_modal.php
index 2fc707cd..7862c750 100644
--- a/user/modals/asset_interface_multiple_add_modal.php
+++ b/user/modals/asset_interface_multiple_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addMultipleAssetInterfacesModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-ethernet mr-2"></i>Creating Multiple Interfaces: <strong><?php echo $asset_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -12,7 +12,7 @@
                 <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <!-- Starting Interface Number -->
                     <div class="form-group">
@@ -95,7 +95,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_asset_multiple_interfaces" class="btn btn-primary text-bold">
                         <i class="fas fa-check mr-2"></i>Create Interfaces
                     </button>
diff --git a/user/modals/budget_create_modal.php b/user/modals/budget_create_modal.php
index 5f3bb0af..7fc084cd 100644
--- a/user/modals/budget_create_modal.php
+++ b/user/modals/budget_create_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="createBudgetModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-balance-scale mr-2"></i>Creating Budget</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 bg-white">
+                <div class="modal-body">
 
                     <div class="form-row">
 
@@ -98,7 +98,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="create_budget" class="btn btn-primary text-bold"><i class="fa fa-fw 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>
diff --git a/user/modals/budget_edit_modal.php b/user/modals/budget_edit_modal.php
index a23376ac..40647be0 100644
--- a/user/modals/budget_edit_modal.php
+++ b/user/modals/budget_edit_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="editBudgetModal<?php echo $budget_id; ?>" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title text-white"><i class="fa fa-fw fa-balance-scale mr-2"></i>Editing Budget</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                     <input type="hidden" name="budget_id" value="<?php echo $budget_id; ?>">
 
                     <div class="form-row">
@@ -92,7 +92,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="edit_budget" 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="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/calendar_add_modal.php b/user/modals/calendar_add_modal.php
index 5a0dae61..9b46dffb 100644
--- a/user/modals/calendar_add_modal.php
+++ b/user/modals/calendar_add_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addCalendarModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-calendar-plus mr-2"></i>New Calendar</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 bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Name</label>
@@ -31,7 +31,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_calendar" class="btn btn-primary"><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>
diff --git a/user/modals/calendar_event_add_modal.php b/user/modals/calendar_event_add_modal.php
index 401fc163..c8c05d0e 100644
--- a/user/modals/calendar_event_add_modal.php
+++ b/user/modals/calendar_event_add_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addCalendarEventModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-calendar-plus mr-2"></i>New Event</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 bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -161,7 +161,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_event" 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>
diff --git a/user/modals/certificate_add_modal.php b/user/modals/certificate_add_modal.php
index b392846a..32522bfc 100644
--- a/user/modals/certificate_add_modal.php
+++ b/user/modals/certificate_add_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addCertificateModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-lock mr-2"></i>New Certificate</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 bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -156,7 +156,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_certificate" class="btn btn-primary text-bold"><i class="fa fa-check"></i> Create</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/certificate_export_modal.php b/user/modals/certificate_export_modal.php
index 632312cb..d30a6137 100644
--- a/user/modals/certificate_export_modal.php
+++ b/user/modals/certificate_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportCertificateModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Certificates to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,10 +11,10 @@
                 <?php if ($client_url) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_certificates_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/client/client_add.php b/user/modals/client_add.php
similarity index 100%
rename from user/modals/client/client_add.php
rename to user/modals/client_add.php
diff --git a/user/modals/client_asset_documents_modal.php b/user/modals/client_asset_documents_modal.php
index bf7e7234..42303534 100644
--- a/user/modals/client_asset_documents_modal.php
+++ b/user/modals/client_asset_documents_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="assetDocumentsModal<?php echo $asset_id; ?>" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-<?php echo $device_icon; ?> mr-2"></i><?php echo $asset_name; ?> Documents</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
                 <?php
                 while ($row = mysqli_fetch_array($sql_related_documents)) {
                     $related_document_id = intval($row['document_id']);
@@ -20,7 +20,7 @@
                     </p>
                 <?php } ?>
             </div>
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
 
diff --git a/user/modals/client/client_bulk_assign_tags.php b/user/modals/client_bulk_assign_tags.php
similarity index 92%
rename from user/modals/client/client_bulk_assign_tags.php
rename to user/modals/client_bulk_assign_tags.php
index 0f16f823..a029ba2a 100644
--- a/user/modals/client/client_bulk_assign_tags.php
+++ b/user/modals/client_bulk_assign_tags.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkAssignTagsModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-tags mr-2"></i>Bulk Assign Tags</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
                 <input type="hidden" name="bulk_remove_tags" value="0">
 
                 <div class="form-group form-check">
@@ -39,7 +39,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_assign_client_tags" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/client/client_bulk_edit_hourly_rate.php b/user/modals/client_bulk_edit_hourly_rate.php
similarity index 87%
rename from user/modals/client/client_bulk_edit_hourly_rate.php
rename to user/modals/client_bulk_edit_hourly_rate.php
index fd8bf169..ed1b53db 100644
--- a/user/modals/client/client_bulk_edit_hourly_rate.php
+++ b/user/modals/client_bulk_edit_hourly_rate.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkEditHourlyRateModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-clock mr-2"></i>Bulk Edit Hourly Rate</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Hourly Rate</label>
@@ -22,7 +22,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_client_hourly_rate" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/client/client_bulk_edit_industry.php b/user/modals/client_bulk_edit_industry.php
similarity index 87%
rename from user/modals/client/client_bulk_edit_industry.php
rename to user/modals/client_bulk_edit_industry.php
index cbfa8b1b..8211e54e 100644
--- a/user/modals/client/client_bulk_edit_industry.php
+++ b/user/modals/client_bulk_edit_industry.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkEditIndustryModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-briefcase mr-2"></i>Bulk Edit Industry</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Industry</label>
@@ -22,7 +22,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_client_industry" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/client/client_bulk_edit_referral.php b/user/modals/client_bulk_edit_referral.php
similarity index 92%
rename from user/modals/client/client_bulk_edit_referral.php
rename to user/modals/client_bulk_edit_referral.php
index 9417ae4b..768357e6 100644
--- a/user/modals/client/client_bulk_edit_referral.php
+++ b/user/modals/client_bulk_edit_referral.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkEditReferralModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-link mr-2"></i>Bulk Edit Referral</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Referral</label>
@@ -40,7 +40,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_client_referral" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/client/client_bulk_email.php b/user/modals/client_bulk_email.php
similarity index 96%
rename from user/modals/client/client_bulk_email.php
rename to user/modals/client_bulk_email.php
index fc61ce54..b0371ebc 100644
--- a/user/modals/client/client_bulk_email.php
+++ b/user/modals/client_bulk_email.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkSendEmailModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-envelope-open mr-2"></i>Bulk Send Email</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <label>From Email / <span class="text-secondary">Display Name</span></label>
                 <div class="form-row">
@@ -91,7 +91,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_send_client_email" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Send</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/client/client_credit_add.php b/user/modals/client_credit_add.php
similarity index 100%
rename from user/modals/client/client_credit_add.php
rename to user/modals/client_credit_add.php
diff --git a/user/modals/client/client_delete.php b/user/modals/client_delete.php
similarity index 100%
rename from user/modals/client/client_delete.php
rename to user/modals/client_delete.php
diff --git a/user/modals/client_document_add_file_relation_modal.php b/user/modals/client_document_add_file_relation_modal.php
index 37a7b13f..8a986ead 100644
--- a/user/modals/client_document_add_file_relation_modal.php
+++ b/user/modals/client_document_add_file_relation_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="associateFileToDocumentModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-paperclip mr-2"></i>Associate File to <strong><?php echo $document_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -10,7 +10,7 @@
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <div class="input-group">
@@ -38,7 +38,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="associate_file_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Associate</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/client_document_add_from_template_modal.php b/user/modals/client_document_add_from_template_modal.php
index 2ccb5a3d..7c81c158 100644
--- a/user/modals/client_document_add_from_template_modal.php
+++ b/user/modals/client_document_add_from_template_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addDocumentFromTemplateModal" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
+    <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>New Document from Template</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
@@ -9,7 +9,7 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">
+        <div class="modal-body">
 
           <label>Template</label>
           <div class="form-group">
@@ -81,7 +81,7 @@
 
         </div>
 
-        <div class="modal-footer bg-white">
+        <div class="modal-footer">
 
           <button type="submit" name="add_document_from_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>
diff --git a/user/modals/client_document_add_modal.php b/user/modals/client_document_add_modal.php
index dc6aef0c..cdf65146 100644
--- a/user/modals/client_document_add_modal.php
+++ b/user/modals/client_document_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addDocumentModal" tabindex="-1">
     <div class="modal-dialog modal-xl">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <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>New Document</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -15,7 +15,7 @@
                 <?php if (isset($_GET['asset_id'])) { ?>
                 <input type="hidden" name="asset" value="<?php echo intval($_GET['asset_id']); ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <input type="text" class="form-control" name="name" placeholder="Name" maxlength="200" required autofocus>
@@ -51,7 +51,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_document" 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>
diff --git a/user/modals/client_document_bulk_move_modal.php b/user/modals/client_document_bulk_move_modal.php
index 79b37561..3d1b9eb9 100644
--- a/user/modals/client_document_bulk_move_modal.php
+++ b/user/modals/client_document_bulk_move_modal.php
@@ -1,13 +1,13 @@
 <div class="modal" id="bulkMoveDocumentModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <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>Moving documents</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Move Documents to</label>
@@ -83,7 +83,7 @@
                 </div>
 
             </div>
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_move_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Move</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/client_document_link_asset_modal.php b/user/modals/client_document_link_asset_modal.php
index 8bbf386c..9876114a 100644
--- a/user/modals/client_document_link_asset_modal.php
+++ b/user/modals/client_document_link_asset_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="linkAssetToDocumentModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>Link Asset to <strong><?php echo $document_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <div class="input-group">
@@ -47,7 +47,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="link_asset_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/client_document_link_contact_modal.php b/user/modals/client_document_link_contact_modal.php
index 19db93de..e2139547 100644
--- a/user/modals/client_document_link_contact_modal.php
+++ b/user/modals/client_document_link_contact_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="linkContactToDocumentModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i>Link Contact to <strong><?php echo $document_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <div class="input-group">
@@ -47,7 +47,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="link_contact_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/client_document_link_file_modal.php b/user/modals/client_document_link_file_modal.php
index 3739cb5d..96690548 100644
--- a/user/modals/client_document_link_file_modal.php
+++ b/user/modals/client_document_link_file_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="linkFileToDocumentModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-paperclip mr-2"></i>Link File to <strong><?php echo $document_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <div class="input-group">
@@ -37,7 +37,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="link_file_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/client_document_link_software_modal.php b/user/modals/client_document_link_software_modal.php
index be2ac172..1ca2f6fb 100644
--- a/user/modals/client_document_link_software_modal.php
+++ b/user/modals/client_document_link_software_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="linkSoftwareToDocumentModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i>Link Software to <strong><?php echo $document_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <div class="input-group">
@@ -47,7 +47,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="link_software_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/client_document_link_vendor_modal.php b/user/modals/client_document_link_vendor_modal.php
index 727f6f53..b7af9b00 100644
--- a/user/modals/client_document_link_vendor_modal.php
+++ b/user/modals/client_document_link_vendor_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="linkVendorToDocumentModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-building mr-2"></i>Link Vendor to <strong><?php echo $document_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <div class="input-group">
@@ -47,7 +47,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="link_vendor_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/client/client_download_pdf.php b/user/modals/client_download_pdf.php
similarity index 98%
rename from user/modals/client/client_download_pdf.php
rename to user/modals/client_download_pdf.php
index 1dc7310d..6f29c5d9 100644
--- a/user/modals/client/client_download_pdf.php
+++ b/user/modals/client_download_pdf.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportClientPDFModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-file-pdf mr-2"></i>Export PDF</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off" target="_blank">
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                     <ul class="list-group">
                         <div class="row">
                             <div class="col-sm-6">
@@ -175,7 +175,7 @@
                         </div>
                     </ul>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_client_pdf" class="btn btn-primary text-bold"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/client/client_edit.php b/user/modals/client_edit.php
similarity index 99%
rename from user/modals/client/client_edit.php
rename to user/modals/client_edit.php
index 0481a385..aaa502a2 100644
--- a/user/modals/client/client_edit.php
+++ b/user/modals/client_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../../../includes/modal_header.php';
+require_once '../../includes/modal_header.php';
 
 $client_id = intval($_GET['id']);
 
@@ -263,4 +263,4 @@ ob_start();
 </form>
 
 <?php
-require_once '../../../includes/modal_footer.php';
+require_once '../../includes/modal_footer.php';
diff --git a/user/modals/client/client_export.php b/user/modals/client_export.php
similarity index 81%
rename from user/modals/client/client_export.php
rename to user/modals/client_export.php
index 8d4e6fa5..4e1f7589 100644
--- a/user/modals/client/client_export.php
+++ b/user/modals/client_export.php
@@ -1,16 +1,16 @@
 <div class="modal" id="exportClientModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Clients to CSV</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 bg-white">
+                <div class="modal-body">
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_clients_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/client_file_bulk_move_modal.php b/user/modals/client_file_bulk_move_modal.php
index 7a814a40..f9645969 100644
--- a/user/modals/client_file_bulk_move_modal.php
+++ b/user/modals/client_file_bulk_move_modal.php
@@ -1,13 +1,13 @@
 <div class="modal" id="bulkMoveFilesModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-exchange-alt mr-2"></i>Bulk Moving Files</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Folder</label>
@@ -83,7 +83,7 @@
                 </div>
 
             </div>
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_move_files" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Move</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/client_file_link_asset_modal.php b/user/modals/client_file_link_asset_modal.php
index df705321..c13d60f2 100644
--- a/user/modals/client_file_link_asset_modal.php
+++ b/user/modals/client_file_link_asset_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="linkAssetToFileModal<?php echo $file_id; ?>" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>Link Asset to <strong><?php echo $file_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="file_id" value="<?php echo $file_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <div class="input-group">
@@ -65,7 +65,7 @@
                         ?>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="link_asset_to_file" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/client_file_upload_modal.php b/user/modals/client_file_upload_modal.php
index 816f80df..8f1dab72 100644
--- a/user/modals/client_file_upload_modal.php
+++ b/user/modals/client_file_upload_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="uploadFilesModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-cloud-upload-alt mr-2"></i>Upload File(s)</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -15,7 +15,7 @@
                 <?php if (isset($_GET['asset_id'])) { ?>
                 <input type="hidden" name="asset" value="<?php echo intval($_GET['asset_id']); ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Description</label>
@@ -49,7 +49,7 @@
                     <small class="text-secondary">Up to 20 files can be uploaded at once by holding down CTRL and selecting files</small>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="upload_files" class="btn btn-primary text-bold"><i class="fa fa-upload mr-2"></i>Upload</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/client_file_view_modal.php b/user/modals/client_file_view_modal.php
index 47d99825..486c5153 100644
--- a/user/modals/client_file_view_modal.php
+++ b/user/modals/client_file_view_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="viewFileModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
         <div class="modal-content bg-dark text-white">
-            <div class="modal-header">
+            <div class="modal-header bg-dark">
                 <h6 class="modal-title" id="modalTitle"></h6>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
diff --git a/user/modals/client/client_import.php b/user/modals/client_import.php
similarity index 91%
rename from user/modals/client/client_import.php
rename to user/modals/client_import.php
index d9d450c9..1122c726 100644
--- a/user/modals/client/client_import.php
+++ b/user/modals/client_import.php
@@ -1,14 +1,14 @@
 <div class="modal" id="importClientModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-users mr-2"></i>Import Clients</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">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                     <p><strong>Importing Multiple Contacts:</strong><br>When importing a client, only one contact (which will become the primary contact) and one location (which will become the primary location) can be added initially. To add additional contacts, you will need to click into each client, navigate to the Contacts section, and import multiple contacts individually for each client.</p>
                     <p><strong>Format csv file with headings & data:</strong><br>Client Name, Industry, Referral, Website, Primary Location Name, Location Phone, Location Address, City, State, Postal Code, Country, Primary Contact Name, Title, Contact Phone, Extension, Contact Mobile, Contact Email, Hourly Rate, Currency, Payment Terms, Tax ID, Abbreviation</p>
                     <hr>
@@ -18,7 +18,7 @@
                     <hr>
                     <div>Download: <a class="text-bold" href="post.php?download_clients_csv_template">sample csv template</a></div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="import_clients_csv" class="btn btn-primary text-strong"><i class="fas fa-upload mr-2"></i>Import</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/client_rack_add_modal.php b/user/modals/client_rack_add_modal.php
index 54225372..2f517bca 100644
--- a/user/modals/client_rack_add_modal.php
+++ b/user/modals/client_rack_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addRackModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-server mr-2"></i>New Rack</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -12,7 +12,7 @@
 
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -143,7 +143,7 @@
 
                     </div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_rack" 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>
diff --git a/user/modals/client_recurring_export_modal.php b/user/modals/client_recurring_export_modal.php
index 5377f440..e999b96d 100644
--- a/user/modals/client_recurring_export_modal.php
+++ b/user/modals/client_recurring_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportRecurringModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Recurring Invoices to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,10 +9,10 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_client_recurring_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/contact_add_modal.php b/user/modals/contact_add_modal.php
index 9586d709..f08b2808 100644
--- a/user/modals/contact_add_modal.php
+++ b/user/modals/contact_add_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addContactModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <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 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">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -296,7 +296,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_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>
diff --git a/user/modals/contact_archive_modal.php b/user/modals/contact_archive_modal.php
index d5daa12c..036d6d8e 100644
--- a/user/modals/contact_archive_modal.php
+++ b/user/modals/contact_archive_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="archiveContactModal<?php echo $contact_id; ?>" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-archive mr-2"></i>Archiving contact: <strong><?php echo $contact_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="alert alert-warning">
                         Client Portal Access will be revoked upon archiving
@@ -46,7 +46,7 @@
                     </div>
                 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="archive_contact" class="btn btn-danger text-bold"><i class="fas fa-check mr-2"></i>Arhive</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/contact_bulk_assign_location_modal.php b/user/modals/contact_bulk_assign_location_modal.php
index 7b08ba3b..5da0d344 100644
--- a/user/modals/contact_bulk_assign_location_modal.php
+++ b/user/modals/contact_bulk_assign_location_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkAssignLocationModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Bulk Assign Location</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Location</label>
@@ -34,7 +34,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_assign_contact_location" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/contact_bulk_assign_tags_modal.php b/user/modals/contact_bulk_assign_tags_modal.php
index 312215fb..2bb403a1 100644
--- a/user/modals/contact_bulk_assign_tags_modal.php
+++ b/user/modals/contact_bulk_assign_tags_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkAssignTagsModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-tags mr-2"></i>Bulk Assign Tags</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
                 <input type="hidden" name="bulk_remove_tags" value="0">
 
                 <div class="form-group form-check">
@@ -39,7 +39,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_assign_contact_tags" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/contact_bulk_edit_department_modal.php b/user/modals/contact_bulk_edit_department_modal.php
index dfa1b733..776b7002 100644
--- a/user/modals/contact_bulk_edit_department_modal.php
+++ b/user/modals/contact_bulk_edit_department_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkEditDepartmentModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-users mr-2"></i>Bulk Set Department / Group</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <label>Department / Group</label>
                 <div class="form-group">
@@ -22,7 +22,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_contact_department" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/contact_bulk_edit_phone_modal.php b/user/modals/contact_bulk_edit_phone_modal.php
index 8f1df37c..ff8bfef4 100644
--- a/user/modals/contact_bulk_edit_phone_modal.php
+++ b/user/modals/contact_bulk_edit_phone_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkEditPhoneModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-phone-alt mr-2"></i>Bulk Set Phone Number</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <label>Phone</label>
                 <div class="form-group">
@@ -22,7 +22,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_contact_phone" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/contact_bulk_edit_role_modal.php b/user/modals/contact_bulk_edit_role_modal.php
index f5b59899..858fc298 100644
--- a/user/modals/contact_bulk_edit_role_modal.php
+++ b/user/modals/contact_bulk_edit_role_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkEditRoleModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-user-shield mr-2"></i>Bulk Set Roles</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <input type="hidden" name="bulk_contact_important" value="0">
                 <input type="hidden" name="bulk_contact_billing" value="0">
@@ -40,7 +40,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_contact_role" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Set</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/contact_bulk_email_modal.php b/user/modals/contact_bulk_email_modal.php
index 5d9e4e4c..e0c8f6b4 100644
--- a/user/modals/contact_bulk_email_modal.php
+++ b/user/modals/contact_bulk_email_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkSendEmailModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-envelope-open mr-2"></i>Bulk Send Email</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <label>From Email / Display Name</label>
                 <div class="form-row">
@@ -52,7 +52,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="send_bulk_mail_now" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Send</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/contact_create_note_modal.php b/user/modals/contact_create_note_modal.php
index de9ebf3d..170e40b1 100644
--- a/user/modals/contact_create_note_modal.php
+++ b/user/modals/contact_create_note_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="createContactNoteModal<?php echo $contact_id; ?>" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-sticky-note mr-2"></i>Creating note: <strong><?php echo $contact_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -10,7 +10,7 @@
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Type</label>
@@ -32,7 +32,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_contact_note" 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>
diff --git a/user/modals/contact_export_modal.php b/user/modals/contact_export_modal.php
index aff19968..0db84e86 100644
--- a/user/modals/contact_export_modal.php
+++ b/user/modals/contact_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportContactModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Contacts to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,10 +11,10 @@
                 <?php if($client_url) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_contacts_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/contact_import_modal.php b/user/modals/contact_import_modal.php
index d126d4f4..cb019279 100644
--- a/user/modals/contact_import_modal.php
+++ b/user/modals/contact_import_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="importContactModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-users mr-2"></i>Import Contacts</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,7 +11,7 @@
                 <?php if($client_url) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                     <p><strong>Format csv file with headings & data:</strong><br>Name, Title, Department, Email, Phone, Extension, Mobile, Location</p>
                     <hr>
                     <div class="form-group my-4">
@@ -20,7 +20,7 @@
                     <hr>
                     <div>Download: <a class="text-bold" href="post.php?download_contacts_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="import_contacts_csv" class="btn btn-primary text-strong"><i class="fas fa-upload mr-2"></i>Import</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/contact_invite_modal.php b/user/modals/contact_invite_modal.php
index 0ea124c3..f755dc80 100644
--- a/user/modals/contact_invite_modal.php
+++ b/user/modals/contact_invite_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="contactInviteModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-user-plus mr-2"></i>Invite Contact</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,7 +11,7 @@
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Email</label>
@@ -72,7 +72,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="invite_contact" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Send Invite</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/credential_add_modal.php b/user/modals/credential_add_modal.php
index 61d3aa35..237f9011 100644
--- a/user/modals/credential_add_modal.php
+++ b/user/modals/credential_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addCredentialModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i>New Credential</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -250,7 +250,7 @@
 
                     </div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_credential" 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>
diff --git a/user/modals/credential_bulk_assign_tags_modal.php b/user/modals/credential_bulk_assign_tags_modal.php
index 5bb5b310..202fbae0 100644
--- a/user/modals/credential_bulk_assign_tags_modal.php
+++ b/user/modals/credential_bulk_assign_tags_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkAssignTagsModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-tags mr-2"></i>Bulk Assigning Tags</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
                 <input type="hidden" name="bulk_remove_tags" value="0">
 
                 <div class="form-group form-check">
@@ -48,7 +48,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_assign_credential_tags" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/credential_export_modal.php b/user/modals/credential_export_modal.php
index ae777498..8e8adc75 100644
--- a/user/modals/credential_export_modal.php
+++ b/user/modals/credential_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportCredentialModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Credentials to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,10 +11,10 @@
                 <?php if ($client_url) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_credentials_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/credential_import_modal.php b/user/modals/credential_import_modal.php
index 4b8890fe..68d0d5a3 100644
--- a/user/modals/credential_import_modal.php
+++ b/user/modals/credential_import_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="importCredentialModal" tabindex="-1">
 	<div class="modal-dialog">
-		<div class="modal-content bg-dark">
-			<div class="modal-header">
+		<div class="modal-content">
+			<div class="modal-header bg-dark">
 				<h5 class="modal-title"><i class="fas fa-fw fa-key mr-2"></i>Import Credentials</h5>
 				<button type="button" class="close text-white" data-dismiss="modal">
 					<span>&times;</span>
@@ -11,7 +11,7 @@
 				<?php if ($client_url) { ?>
 				<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 				<?php } ?>
-				<div class="modal-body bg-white">
+				<div class="modal-body">
 					<p><strong>Format csv file with headings & data:</strong><br>Name, Description, Username, Password, URL</p>
 					<hr>
 					<div class="form-group my-4">
@@ -20,7 +20,7 @@
 					<hr>
 					<div>Download <a class="text-bold" href="post.php?download_credentials_csv_template">sample csv template</a></div>
 				</div>
-				<div class="modal-footer bg-white">
+				<div class="modal-footer">
 					<button type="submit" name="import_credentials_csv" class="btn btn-primary"><i class="fa fa-upload mr-2"></i>Import</button>
 					<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
 				</div>
diff --git a/user/modals/custom_field_create_modal.php b/user/modals/custom_field_create_modal.php
index d0b9916e..849b442a 100644
--- a/user/modals/custom_field_create_modal.php
+++ b/user/modals/custom_field_create_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="createCustomFieldModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-th-list mr-2"></i>Create <?php echo nullable_htmlentities($table); ?> field</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -10,7 +10,7 @@
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="table" value="<?php echo nullable_htmlentities($table); ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Label <strong class="text-danger">*</strong></label>
@@ -31,7 +31,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="create_custom_field" 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>
diff --git a/user/modals/custom_field_edit_modal.php b/user/modals/custom_field_edit_modal.php
index da542351..cbf440ef 100644
--- a/user/modals/custom_field_edit_modal.php
+++ b/user/modals/custom_field_edit_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="editCustomFieldModal<?php echo $custom_field_id; ?>" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-th-list mr-2"></i>Editing custom field: <strong><?php echo $custom_field_label; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="custom_field_id" value="<?php echo $custom_field_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Label <strong class="text-danger">*</strong></label>
@@ -30,7 +30,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="edit_custom_field" 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>
diff --git a/user/modals/document_edit_visibility_modal.php b/user/modals/document_edit_visibility_modal.php
index 4cbd211a..cb5ac667 100644
--- a/user/modals/document_edit_visibility_modal.php
+++ b/user/modals/document_edit_visibility_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="editDocumentClientVisibileModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title">
                     <i class="fa fa-fw fa-handshake mr-2"></i>
                     Edit Visibility Status for <strong><?php echo "$document_name"; ?></strong>
@@ -11,7 +11,7 @@
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                     <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
                     <div class="form-group">
                         <label>Visibility</label>
@@ -30,7 +30,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="toggle_document_visibility" 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>
diff --git a/user/modals/domain_add_modal.php b/user/modals/domain_add_modal.php
index 4d134f68..1ad8371c 100644
--- a/user/modals/domain_add_modal.php
+++ b/user/modals/domain_add_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addDomainModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-globe mr-2"></i>New Domain</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 bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -181,7 +181,7 @@
                 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_domain" 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>
diff --git a/user/modals/domain_export_modal.php b/user/modals/domain_export_modal.php
index 7b985881..1541d9df 100644
--- a/user/modals/domain_export_modal.php
+++ b/user/modals/domain_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportDomainModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Domains to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,10 +11,10 @@
                 <?php if ($client_url) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_domains_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/expense_add_modal.php b/user/modals/expense_add_modal.php
index 4b7ee099..a36df32f 100644
--- a/user/modals/expense_add_modal.php
+++ b/user/modals/expense_add_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addExpenseModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-cart-plus mr-2"></i>New Expense</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">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-row">
                         <div class="form-group col-md">
@@ -190,7 +190,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_expense" class="btn btn-primary text-bold"><i class="fa fa-fw 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>
diff --git a/user/modals/expense_bulk_edit_account_modal.php b/user/modals/expense_bulk_edit_account_modal.php
index 43c930b7..55bc311e 100644
--- a/user/modals/expense_bulk_edit_account_modal.php
+++ b/user/modals/expense_bulk_edit_account_modal.php
@@ -1,13 +1,13 @@
 <div class="modal" id="bulkEditAccountModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-piggy-bank mr-2"></i>Bulk Set Account</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Account <strong class="text-danger">*</strong></label>
@@ -49,7 +49,7 @@
                 </div>
 
             </div>
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_expense_account" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Set</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/expense_bulk_edit_category_modal.php b/user/modals/expense_bulk_edit_category_modal.php
index e0e79da7..ab78c3c5 100644
--- a/user/modals/expense_bulk_edit_category_modal.php
+++ b/user/modals/expense_bulk_edit_category_modal.php
@@ -1,13 +1,13 @@
 <div class="modal" id="bulkEditCategoryModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-list mr-2"></i>Bulk Set Category</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Category <strong class="text-danger">*</strong></label>
@@ -33,7 +33,7 @@
                 </div>
 
             </div>
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_expense_category" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Set</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/expense_bulk_edit_client_modal.php b/user/modals/expense_bulk_edit_client_modal.php
index 2d069289..847026f5 100644
--- a/user/modals/expense_bulk_edit_client_modal.php
+++ b/user/modals/expense_bulk_edit_client_modal.php
@@ -1,13 +1,13 @@
 <div class="modal" id="bulkEditClientModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i>Bulk Set Client</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Client</label>
@@ -34,7 +34,7 @@
                 </div>
 
             </div>
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_expense_client" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Set</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/expense_export_modal.php b/user/modals/expense_export_modal.php
index fd5ff658..58af2af8 100644
--- a/user/modals/expense_export_modal.php
+++ b/user/modals/expense_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportExpensesModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-download mr-2"></i>Exporting Expenses to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Account</label>
@@ -104,7 +104,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_expenses_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/folder_create_modal.php b/user/modals/folder_create_modal.php
index fe47c7c2..cc532b31 100644
--- a/user/modals/folder_create_modal.php
+++ b/user/modals/folder_create_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="createFolderModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-folder-plus mr-2"></i>Creating folder in <strong><?php if($get_folder_id > 0) { echo $folder_path[count($folder_path)-1]['folder_name']; } else { echo "/"; } ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,7 +11,7 @@
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <input type="hidden" name="folder_location" value="<?php echo $folder_location; ?>">
                 <input type="hidden" name="parent_folder" value="<?php echo $get_folder_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Folder Name <strong class="text-danger">*</strong></label>
@@ -24,7 +24,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="create_folder" 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>
diff --git a/user/modals/invoice_add_modal.php b/user/modals/invoice_add_modal.php
index 9dab27fe..34782e76 100644
--- a/user/modals/invoice_add_modal.php
+++ b/user/modals/invoice_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addInvoiceModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-file-invoice mr-2"></i>New Invoice</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Scope</label>
@@ -94,7 +94,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_invoice" 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>
diff --git a/user/modals/invoice_add_ticket_modal.php b/user/modals/invoice_add_ticket_modal.php
index 911c55a8..44516543 100644
--- a/user/modals/invoice_add_ticket_modal.php
+++ b/user/modals/invoice_add_ticket_modal.php
@@ -1,14 +1,14 @@
 
 <div class="modal" id="addTicketModal">
 <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-file-invoice mr-2"></i>Add Unbilled Ticket to Invoice</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
-            <div class="modal-body bg-white">
+            <div class="modal-body">
                 <div class="table-responsive">
                     <table class="table table-striped">
                         <thead>
diff --git a/user/modals/invoice_bulk_edit_category_modal.php b/user/modals/invoice_bulk_edit_category_modal.php
index c2686134..a9547ac8 100644
--- a/user/modals/invoice_bulk_edit_category_modal.php
+++ b/user/modals/invoice_bulk_edit_category_modal.php
@@ -1,13 +1,13 @@
 <div class="modal" id="bulkEditCategoryModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-list mr-2"></i>Bulk Set Category</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Category <strong class="text-danger">*</strong></label>
@@ -33,7 +33,7 @@
                 </div>
 
             </div>
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_invoice_category" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Set</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/invoice_export_modal.php b/user/modals/invoice_export_modal.php
index efe941fb..cadd3b79 100644
--- a/user/modals/invoice_export_modal.php
+++ b/user/modals/invoice_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportInvoicesModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-download mr-2"></i>Export Invoices to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,7 +11,7 @@
                 <?php if (isset($_GET['client_id'])) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Date From</label>
@@ -34,7 +34,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_invoices_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/invoice_note_modal.php b/user/modals/invoice_note_modal.php
index 3abf465c..ed723fa2 100644
--- a/user/modals/invoice_note_modal.php
+++ b/user/modals/invoice_note_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="invoiceNoteModal" tabindex="-1">
   <div class="modal-dialog modal-lg">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
+    <div class="modal-content">
+      <div class="modal-header bg-dark">
         <h5 class="modal-title text-white"><i class="fas fa-fw fa-edit mr-2"></i>Invoice Notes</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
@@ -9,12 +9,12 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
-        <div class="modal-body bg-white">  
+        <div class="modal-body">  
           <div class="form-group">
             <textarea class="form-control" rows="8" name="note" placeholder="Enter some notes"><?php echo $invoice_note; ?></textarea>
           </div>
         </div>
-        <div class="modal-footer bg-white">
+        <div class="modal-footer">
           <button type="submit" name="invoice_note" 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="fas fa-times mr-2"></i>Cancel</button>
         </div>
diff --git a/user/modals/invoice_payment_add_bulk_modal.php b/user/modals/invoice_payment_add_bulk_modal.php
index 346d0d9f..28c40dc5 100644
--- a/user/modals/invoice_payment_add_bulk_modal.php
+++ b/user/modals/invoice_payment_add_bulk_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addBulkPaymentModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Make Batch Payment</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,7 +11,7 @@
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <input type="hidden" name="balance" value="<?php echo $balance; ?>">
                 <input type="hidden" name="currency_code" value="<?php echo $client_currency_code; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="alert alert-info">
                         <h5>Batch Payment Notice</h5>
@@ -139,7 +139,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_bulk_payment" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Pay</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/invoice_recurring_add_modal.php b/user/modals/invoice_recurring_add_modal.php
index dead0ff5..e8ab7a82 100644
--- a/user/modals/invoice_recurring_add_modal.php
+++ b/user/modals/invoice_recurring_add_modal.php
@@ -1,6 +1,6 @@
 <div class="modal" id="addInvoiceRecurringModal<?php echo $invoice_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content bg-dark">
+    <div class="modal-content">
       <div class="modal-header text-white">
         <h5 class="modal-title"><i class="fas fa-fw fa-copy mr-2"></i>Make <?php echo "$invoice_prefix$invoice_number"; ?> Recurring</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
@@ -9,7 +9,7 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>"> 
-        <div class="modal-body bg-white">
+        <div class="modal-body">
           
           <div class="form-group">
             <label>Frequency <strong class="text-danger">*</strong></label>
@@ -26,7 +26,7 @@
           </div>
         
         </div>
-        <div class="modal-footer bg-white">
+        <div class="modal-footer">
           <button type="submit" name="add_invoice_recurring" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create Recurring Invoice</button>
           <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
         </div>
diff --git a/user/modals/item_edit_modal.php b/user/modals/item_edit_modal.php
index 41c88a68..836cb20e 100644
--- a/user/modals/item_edit_modal.php
+++ b/user/modals/item_edit_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="editItemModal<?php echo $item_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
+    <div class="modal-content">
+      <div class="modal-header bg-dark">
         <h5 class="modal-title"><i class="fas fa-fw fa-edit mr-2"></i>Editing Line Item: <strong><?php echo $item_name; ?></strong></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
@@ -17,7 +17,7 @@
         <?php } ?>
         
         <input type="hidden" name="item_id" value="<?php echo $item_id; ?>">
-        <div class="modal-body bg-white">
+        <div class="modal-body">
           
           <div class="form-group">
             <label>Item <strong class="text-danger">*</strong></label>
@@ -94,7 +94,7 @@
           </div>
           
         </div>
-        <div class="modal-footer bg-white">
+        <div class="modal-footer">
           <button type="submit" name="edit_item" 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="fas fa-times mr-2"></i>Cancel</button>
         </div>
diff --git a/user/modals/location_add_modal.php b/user/modals/location_add_modal.php
index cdd43b99..ae230e72 100644
--- a/user/modals/location_add_modal.php
+++ b/user/modals/location_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addLocationModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Creating location</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -264,7 +264,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_location" 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>
diff --git a/user/modals/location_bulk_assign_tags_modal.php b/user/modals/location_bulk_assign_tags_modal.php
index d92894f3..579ca4c4 100644
--- a/user/modals/location_bulk_assign_tags_modal.php
+++ b/user/modals/location_bulk_assign_tags_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkAssignTagsModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-tags mr-2"></i>Bulk Assign Tags</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
                 <input type="hidden" name="bulk_remove_tags" value="0">
 
                 <div class="form-group form-check">
@@ -39,7 +39,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_assign_location_tags" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Assign</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/location_export_modal.php b/user/modals/location_export_modal.php
index b9bda966..c92a00c6 100644
--- a/user/modals/location_export_modal.php
+++ b/user/modals/location_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportLocationModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Locations to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,10 +11,10 @@
                 <?php if ($client_url) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_locations_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/location_import_modal.php b/user/modals/location_import_modal.php
index bbc14fa3..09fe400d 100644
--- a/user/modals/location_import_modal.php
+++ b/user/modals/location_import_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="importLocationModal" tabindex="-1">
 	<div class="modal-dialog">
-		<div class="modal-content bg-dark">
-			<div class="modal-header">
+		<div class="modal-content">
+			<div class="modal-header bg-dark">
 				<h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt mr-2"></i>Import Locations</h5>
 				<button type="button" class="close text-white" data-dismiss="modal">
 					<span>&times;</span>
@@ -11,7 +11,7 @@
 				<?php if ($client_url) { ?>
 				<input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
 				<?php } ?>
-				<div class="modal-body bg-white">
+				<div class="modal-body">
 					<p><strong>Format csv file with headings & data:</strong><br>Name, Description, Address, City, State, Postal Code, Phone, Hours</p>
 					<hr>
 					<div class="form-group my-4">
@@ -20,7 +20,7 @@
 					<hr>
 					<div>Download: <a class="text-bold" href="post.php?download_locations_csv_template=<?php echo $client_id; ?>">sample csv template</a></div>
 				</div>
-				<div class="modal-footer bg-white">
+				<div class="modal-footer">
 					<button type="submit" name="import_locations_csv" class="btn btn-primary text-bold"><i class="fa fa-upload mr-2"></i>Import</button>
 					<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
 				</div>
diff --git a/user/modals/network_add_modal.php b/user/modals/network_add_modal.php
index 62bb2df2..3edaa044 100644
--- a/user/modals/network_add_modal.php
+++ b/user/modals/network_add_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addNetworkModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-network-wired mr-2"></i>New Network</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 bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -190,7 +190,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_network" 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>
diff --git a/user/modals/network_export_modal.php b/user/modals/network_export_modal.php
index 47b32e61..9201c68f 100644
--- a/user/modals/network_export_modal.php
+++ b/user/modals/network_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportNetworkModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Networks to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,10 +11,10 @@
                 <?php if ($client_url) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_networks_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/payment_export_modal.php b/user/modals/payment_export_modal.php
index bd618abd..db8af73e 100644
--- a/user/modals/payment_export_modal.php
+++ b/user/modals/payment_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportPaymentModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Payments to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,10 +11,10 @@
                 <?php if (isset($_GET['client_id'])) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                     
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_payments_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/product_add_modal.php b/user/modals/product_add_modal.php
index 5da9fed2..11e893e5 100644
--- a/user/modals/product_add_modal.php
+++ b/user/modals/product_add_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addProductModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-box-open mr-2"></i>New Product</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 bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Name <strong class="text-danger">*</strong></label>
@@ -100,7 +100,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_product" 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="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/product_bulk_edit_category_modal.php b/user/modals/product_bulk_edit_category_modal.php
index 4222ee69..aa39be30 100644
--- a/user/modals/product_bulk_edit_category_modal.php
+++ b/user/modals/product_bulk_edit_category_modal.php
@@ -1,13 +1,13 @@
 <div class="modal" id="bulkEditCategoryModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-list mr-2"></i>Bulk Set Category</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Category <strong class="text-danger">*</strong></label>
@@ -33,7 +33,7 @@
                 </div>
 
             </div>
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_product_category" class="btn btn-primary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Set</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/product_export_modal.php b/user/modals/product_export_modal.php
index 45ac710a..3b6c432d 100644
--- a/user/modals/product_export_modal.php
+++ b/user/modals/product_export_modal.php
@@ -1,17 +1,17 @@
 <div class="modal" id="exportProductsModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-download mr-2"></i>Export Products to CSV</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 bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_products_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/project_add_modal.php b/user/modals/project_add_modal.php
index 8f2ba7de..e08780d5 100644
--- a/user/modals/project_add_modal.php
+++ b/user/modals/project_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addProjectModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-project-diagram mr-2"></i>New Project</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -10,7 +10,7 @@
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="client_id" value="<?php if (isset($_GET['client_id'])) { echo $client_id; } else { echo 0; } ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Project Name <strong class="text-danger">*</strong></label>
@@ -110,7 +110,7 @@
                     <?php } ?>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_project" 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>
diff --git a/user/modals/project_link_closed_ticket_modal.php b/user/modals/project_link_closed_ticket_modal.php
index be93b6ab..ab4b975f 100644
--- a/user/modals/project_link_closed_ticket_modal.php
+++ b/user/modals/project_link_closed_ticket_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="linkClosedTicketModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Link closed ticket to project: <strong><?php echo $project_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="project_id" value="<?php echo $project_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Ticket number <strong class="text-danger">*</strong></label>
@@ -32,7 +32,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="link_closed_ticket_to_project" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Link</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/project_link_ticket_modal.php b/user/modals/project_link_ticket_modal.php
index 72ad05ee..033f6f6e 100644
--- a/user/modals/project_link_ticket_modal.php
+++ b/user/modals/project_link_ticket_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="linkTicketModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Link open ticket to project: <strong><?php echo $project_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="project_id" value="<?php echo $project_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Ticket <strong class="text-danger">*</strong></label>
@@ -40,7 +40,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="link_ticket_to_project" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Link</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/quote_add_modal.php b/user/modals/quote_add_modal.php
index df80d3a4..c6165665 100644
--- a/user/modals/quote_add_modal.php
+++ b/user/modals/quote_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addQuoteModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-comment-dollar mr-2"></i>New Quote</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Scope</label>
@@ -102,7 +102,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_quote" 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>
diff --git a/user/modals/quote_export_modal.php b/user/modals/quote_export_modal.php
index 9fa53607..e78f9f5b 100644
--- a/user/modals/quote_export_modal.php
+++ b/user/modals/quote_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportQuoteModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Quotes to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,10 +11,10 @@
                 <?php if(isset($_GET['client_id'])) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_quotes_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/quote_note_modal.php b/user/modals/quote_note_modal.php
index f040ec0a..b71cfef0 100644
--- a/user/modals/quote_note_modal.php
+++ b/user/modals/quote_note_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="quoteNoteModal" tabindex="-1">
   <div class="modal-dialog modal-lg">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
+    <div class="modal-content">
+      <div class="modal-header bg-dark">
         <h5 class="modal-title text-white"><i class="fas fa-fw fa-edit mr-2"></i>Quote Notes</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span aria-hidden="true">&times;</span>
@@ -9,12 +9,12 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="quote_id" value="<?php echo $quote_id; ?>">
-        <div class="modal-body bg-white">  
+        <div class="modal-body">  
           <div class="form-group">
             <textarea class="form-control" rows="8" name="note" placeholder="Enter some notes"><?php echo $quote_note; ?></textarea>
           </div>
         </div>
-        <div class="modal-footer bg-white">
+        <div class="modal-footer">
           <button type="submit" name="quote_note" 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="fas fa-times mr-2"></i>Cancel</button>
         </div>
diff --git a/user/modals/quote_to_invoice_modal.php b/user/modals/quote_to_invoice_modal.php
index e15d7ac1..d943cf57 100644
--- a/user/modals/quote_to_invoice_modal.php
+++ b/user/modals/quote_to_invoice_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addQuoteToInvoiceModal<?php echo $quote_id; ?>" tabindex="-1">
   <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
+    <div class="modal-content">
+      <div class="modal-header bg-dark">
         <h5 class="modal-title"><i class="fas fa-fw fa-file mr-2"></i>Quote <?php echo "$quote_prefix$quote_number"; ?> <i class="fas fa-arrow-right mr-2"></i>Invoice</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
@@ -11,7 +11,7 @@
         <input type="hidden" name="quote_id" value="<?php echo $quote_id; ?>">
         <input type="hidden" name="client_net_terms" value="<?php echo $client_net_terms; ?>">
         
-        <div class="modal-body bg-white">
+        <div class="modal-body">
          
           <div class="form-group">
             <label>Invoice Date <strong class="text-danger">*</strong></label>
@@ -24,7 +24,7 @@
           </div>
       
         </div>
-        <div class="modal-footer bg-white">
+        <div class="modal-footer">
           <button type="submit" name="add_quote_to_invoice" class="btn btn-primary text-bold"><strong><i class="fas fa-check mr-2"></i>Create Invoice</button>
             <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
         </div>
diff --git a/user/modals/recurring_expense_create_modal.php b/user/modals/recurring_expense_create_modal.php
index 95345c45..b2a28ddc 100644
--- a/user/modals/recurring_expense_create_modal.php
+++ b/user/modals/recurring_expense_create_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="createRecurringExpenseModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-clock mr-2"></i>Create Recurring Expense</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 bg-white">
+                <div class="modal-body">
 
                     <div class="form-row">
 
@@ -227,7 +227,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="create_recurring_expense" class="btn btn-primary text-bold"><i class="fa fa-fw 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>
diff --git a/user/modals/recurring_invoice_add_modal.php b/user/modals/recurring_invoice_add_modal.php
index 33cd8ab5..25dd05f2 100644
--- a/user/modals/recurring_invoice_add_modal.php
+++ b/user/modals/recurring_invoice_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addRecurringInvoiceModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-redo-alt mr-2"></i>New Recurring Invoice</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Scope</label>
@@ -108,7 +108,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_recurring_invoice" 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="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/recurring_invoice_note_modal.php b/user/modals/recurring_invoice_note_modal.php
index d7107d17..c31e49bf 100644
--- a/user/modals/recurring_invoice_note_modal.php
+++ b/user/modals/recurring_invoice_note_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="recurringInvoiceNoteModal" tabindex="-1">
   <div class="modal-dialog modal-lg">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
+    <div class="modal-content">
+      <div class="modal-header bg-dark">
         <h5 class="modal-title text-white"><i class="fa fa-fw fa-edit mr-2"></i>Editing: <strong>Recurring Invoice</strong> Notes</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
@@ -9,12 +9,12 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="recurring_invoice_id" value="<?php echo $recurring_invoice_id; ?>">
-        <div class="modal-body bg-white">  
+        <div class="modal-body">  
           <div class="form-group">
             <textarea class="form-control" rows="8" name="note" placeholder="Enter some notes"><?php echo $recurring_invoice_note; ?></textarea>
           </div>
         </div>
-        <div class="modal-footer bg-white">
+        <div class="modal-footer">
           <button type="submit" name="recurring_invoice_note" 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="fas fa-times mr-2"></i>Cancel</button>
         </div>
diff --git a/user/modals/recurring_payment_add_modal.php b/user/modals/recurring_payment_add_modal.php
index b920cc0d..487c3f5c 100644
--- a/user/modals/recurring_payment_add_modal.php
+++ b/user/modals/recurring_payment_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addRecurringPaymentModal<?php echo $recurring_invoice_id; ?>" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-redo-alt mr-2"></i>Creating Recurring Payment: <strong><?php echo "$recurring_invoice_prefix$recurring_invoice_number"; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -10,7 +10,7 @@
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="recurring_invoice_id" value="<?php echo $recurring_invoice_id; ?>">
                 <input type="hidden" name="currency_code" value="<?php echo $recurring_invoice_currency_code; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Account <strong class="text-danger">*</strong></label>
@@ -70,7 +70,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_recurring_payment" 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="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/recurring_ticket_add_modal.php b/user/modals/recurring_ticket_add_modal.php
index 73117579..53b03d8d 100644
--- a/user/modals/recurring_ticket_add_modal.php
+++ b/user/modals/recurring_ticket_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addRecurringTicketModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-calendar-check mr-2"></i>New Recurring Ticket</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -13,7 +13,7 @@
                 <?php } ?>
                 <input type="hidden" name="billable" value="0">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -276,7 +276,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_recurring_ticket" 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="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/revenue_add_modal.php b/user/modals/revenue_add_modal.php
index 9ed411a6..ccc43073 100644
--- a/user/modals/revenue_add_modal.php
+++ b/user/modals/revenue_add_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addRevenueModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-hand-holding-usd mr-2"></i>New Revenue</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 bg-white">
+                <div class="modal-body">
 
                     <div class="form-row">
 
@@ -154,7 +154,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_revenue" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Add Revenue</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/service_add_modal.php b/user/modals/service_add_modal.php
index 7d4c3228..9a60bf2d 100644
--- a/user/modals/service_add_modal.php
+++ b/user/modals/service_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addServiceModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title text-white"><i class="fa fa-fw fa-stream mr-2"></i>New Service</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -10,7 +10,7 @@
 
             <form action="post.php" method="post" autocomplete="off">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                     <?php if ($client_url) { ?>
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -237,7 +237,7 @@
 
                     </div>
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_service" 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>
diff --git a/user/modals/share_modal.php b/user/modals/share_modal.php
index 852fa342..bbf4252f 100644
--- a/user/modals/share_modal.php
+++ b/user/modals/share_modal.php
@@ -2,8 +2,8 @@
 
 <div class="modal" id="shareModal" tabindex="-1">
     <div class="modal-dialog modal-md">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-share mr-2"></i>Share Link</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -13,7 +13,7 @@
                 <input type="hidden" name="client_id" id="share_client_id" value="">
                 <input type="hidden" name="item_type" id="share_item_type" value="">
                 <input type="hidden" name="item_ref_id" id="share_item_ref_id" value="">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div id="div_share_link_form">
 
@@ -82,7 +82,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="button" id="div_share_link_generate" class="btn btn-primary text-bold" onclick="event.preventDefault(); generateShareLink()"><i class="fas fa-paper-plane mr-2"></i>Send and Show Link</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/software_add_from_template_modal.php b/user/modals/software_add_from_template_modal.php
index 4714024c..57549b64 100644
--- a/user/modals/software_add_from_template_modal.php
+++ b/user/modals/software_add_from_template_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addSoftwareFromTemplateModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <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 from 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 bg-white">
+                <div class="modal-body">
 
                     <?php if ($client_url) { ?>
                         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
@@ -61,7 +61,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_software_from_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>
diff --git a/user/modals/software_add_modal.php b/user/modals/software_add_modal.php
index 7f652ccd..18548180 100644
--- a/user/modals/software_add_modal.php
+++ b/user/modals/software_add_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addSoftwareModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <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</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 bg-white">
+                <div class="modal-body">
 
                     <ul class="nav nav-pills nav-justified mb-3">
                         <li class="nav-item">
@@ -289,7 +289,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_software" 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>
diff --git a/user/modals/software_export_modal.php b/user/modals/software_export_modal.php
index 641fae93..01207b66 100644
--- a/user/modals/software_export_modal.php
+++ b/user/modals/software_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportSoftwareModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Licenses to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,10 +11,10 @@
                 <?php if($client_url) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_client_software_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/ticket_add_modal.php b/user/modals/ticket_add_modal.php
index f07ccffd..67110e0e 100644
--- a/user/modals/ticket_add_modal.php
+++ b/user/modals/ticket_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addTicketModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>New Ticket (v1)</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -13,7 +13,7 @@
                 <input type="hidden" name="project" value="<?php echo intval($_GET['project_id']); ?>">
                 <?php } ?>
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <?php if (isset($_GET['client_id'])) { ?>
                         <ul class="nav nav-pills nav-justified mb-3">
@@ -450,7 +450,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_ticket" 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="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/ticket_add_modal_v2.php b/user/modals/ticket_add_modal_v2.php
index 0c545f11..c2d560ea 100644
--- a/user/modals/ticket_add_modal_v2.php
+++ b/user/modals/ticket_add_modal_v2.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addTicketModalv2" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>New Ticket (v2)</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -20,7 +20,7 @@
                 <?php } ?>
                 <input type="hidden" name="billable" value="0">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <!-- Nav -->
                     <ul class="nav nav-pills nav-justified mb-3">
@@ -286,7 +286,7 @@
 
         </div>
 
-        <div class="modal-footer bg-white">
+        <div class="modal-footer">
             <button type="submit" name="add_ticket" 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="fas fa-times mr-2"></i>Cancel</button>
         </div>
diff --git a/user/modals/ticket_add_watcher_modal.php b/user/modals/ticket_add_watcher_modal.php
index d6dfdebb..2ffdb70e 100644
--- a/user/modals/ticket_add_watcher_modal.php
+++ b/user/modals/ticket_add_watcher_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addTicketWatcherModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-eye mr-2"></i>Adding a ticket Watcher: <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>
@@ -12,7 +12,7 @@
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <input type="hidden" name="ticket_number" value="<?php echo "$ticket_prefix$ticket_number"; ?>">
                 <input type="hidden" name="watcher_notify" value="0"> <!-- Default 0 -->
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Watcher Email</label>
@@ -52,7 +52,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_ticket_watcher" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Add</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/ticket_bulk_add_project_modal.php b/user/modals/ticket_bulk_add_project_modal.php
index c3df0396..543c38c3 100644
--- a/user/modals/ticket_bulk_add_project_modal.php
+++ b/user/modals/ticket_bulk_add_project_modal.php
@@ -1,13 +1,13 @@
 <div class="modal" id="bulkAssignTicketToProjectModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-user-check mr-2"></i>Adding Tickets to Project</strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Project</label>
@@ -37,7 +37,7 @@
                 </div>
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_add_ticket_project" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Assign</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/ticket_bulk_assign_modal.php b/user/modals/ticket_bulk_assign_modal.php
index eb6e5948..52a1f968 100644
--- a/user/modals/ticket_bulk_assign_modal.php
+++ b/user/modals/ticket_bulk_assign_modal.php
@@ -1,13 +1,13 @@
 <div class="modal" id="bulkAssignTicketModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-user-check mr-2"></i>Bulk Assigning Selected Tickets:</strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Assign to</label>
@@ -36,7 +36,7 @@
                 </div>
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_assign_ticket" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Bulk Assign</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/ticket_bulk_edit_category_modal.php b/user/modals/ticket_bulk_edit_category_modal.php
index 4b0c2526..4464d407 100644
--- a/user/modals/ticket_bulk_edit_category_modal.php
+++ b/user/modals/ticket_bulk_edit_category_modal.php
@@ -1,13 +1,13 @@
 <div class="modal" id="bulkEditCategoryTicketModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-layer-group mr-2"></i>Bulk Categorizing Selected Tickets:</strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Category</label>
@@ -32,7 +32,7 @@
                 </div>
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_ticket_category" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Bulk Edit</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/ticket_bulk_edit_priority_modal.php b/user/modals/ticket_bulk_edit_priority_modal.php
index 3b3582a9..ac9dd9d7 100644
--- a/user/modals/ticket_bulk_edit_priority_modal.php
+++ b/user/modals/ticket_bulk_edit_priority_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="bulkEditPriorityTicketModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-thermometer-half mr-2"></i>Bulk Editing Priority:</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
                 
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Priority</label>
@@ -26,7 +26,7 @@
 
             </div>
 
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_edit_ticket_priority" 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>
diff --git a/user/modals/ticket_bulk_merge_modal.php b/user/modals/ticket_bulk_merge_modal.php
index c0c20484..2be22401 100644
--- a/user/modals/ticket_bulk_merge_modal.php
+++ b/user/modals/ticket_bulk_merge_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="bulkMergeTicketModal" tabindex="-1">
     <div class="modal-dialog modal-md">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-clone mr-2"></i>Bulk merge & close tickets</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -10,7 +10,7 @@
 
             <input type="hidden" id="current_ticket_id" value="0"> <!-- Can't currently bulk check this -->
             <input type="hidden" name="merge_move_replies" value="0"> <!-- Default 0 -->
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <div class="form-group">
                     <label>Ticket number to merge tickets into <strong class="text-danger">*</strong></label>
@@ -55,7 +55,7 @@
                 </div>
 
             </div>
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" id="merge_ticket_btn" name="bulk_merge_tickets" class="btn btn-primary text-bold" disabled><i class="fa fa-check mr-2"></i>Merge</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 <!-- Merge button starts disabled. Is enabled by the merge_into_number_get_details Javascript function-->
diff --git a/user/modals/ticket_bulk_reply_modal.php b/user/modals/ticket_bulk_reply_modal.php
index 76377e6c..3a375aff 100644
--- a/user/modals/ticket_bulk_reply_modal.php
+++ b/user/modals/ticket_bulk_reply_modal.php
@@ -1,13 +1,13 @@
 <div class="modal" id="bulkReplyTicketModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-paper-plane mr-2"></i>Bulk Update/Reply</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <input type="hidden" name="bulk_private_reply" value="0">
 
@@ -51,7 +51,7 @@
                 </div>
 
             </div>
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_ticket_reply" class="btn btn-primary text-bold"><i class="fas fa-paper-plane mr-2"></i>Reply</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/ticket_bulk_resolve_modal.php b/user/modals/ticket_bulk_resolve_modal.php
index f2a45565..48b7d661 100644
--- a/user/modals/ticket_bulk_resolve_modal.php
+++ b/user/modals/ticket_bulk_resolve_modal.php
@@ -1,13 +1,13 @@
 <div class="modal" id="bulkCloseTicketsModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-check mr-2"></i>Resolving Multiple Tickets</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
             </div>
-            <div class="modal-body bg-white">
+            <div class="modal-body">
 
                 <input type="hidden" name="bulk_private_note" value="0">
 
@@ -31,7 +31,7 @@
                 </div>
 
             </div>
-            <div class="modal-footer bg-white">
+            <div class="modal-footer">
                 <button type="submit" name="bulk_resolve_tickets" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Resolve</button>
                 <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
             </div>
diff --git a/user/modals/ticket_change_client_modal.php b/user/modals/ticket_change_client_modal.php
index 148e4325..f6d433f0 100644
--- a/user/modals/ticket_change_client_modal.php
+++ b/user/modals/ticket_change_client_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="clientChangeTicketModal" tabindex="-1">
     <div class="modal-dialog modal-md">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-people-carry mr-2"></i>Change <?php echo "$ticket_prefix$ticket_number"; ?> to another client</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>New Client <strong class="text-danger">*</strong></label>
@@ -34,7 +34,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="change_client_ticket" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Change</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/ticket_edit_asset_modal.php b/user/modals/ticket_edit_asset_modal.php
index 2ac3e43d..a1c87d87 100644
--- a/user/modals/ticket_edit_asset_modal.php
+++ b/user/modals/ticket_edit_asset_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="editTicketAssetModal<?php echo $ticket_id; ?>" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-desktop mr-2"></i>Editing ticket Asset: <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>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Asset</label>
@@ -39,7 +39,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="edit_ticket_asset" 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>
diff --git a/user/modals/ticket_edit_schedule_modal.php b/user/modals/ticket_edit_schedule_modal.php
index d0d96e32..1be6c21a 100644
--- a/user/modals/ticket_edit_schedule_modal.php
+++ b/user/modals/ticket_edit_schedule_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="editTicketScheduleModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title">
                     <i class="fa fa-fw fa-user mr-2"></i>
                     Edit Scheduled Time for <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong>
@@ -11,7 +11,7 @@
                 </button>
             </div>
             <form action="post.php" method="post" autocomplete="off">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                     <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
 
                     <div class="form-group">
@@ -33,7 +33,7 @@
                     </div>
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                 <?php if (!empty($ticket_scheduled_for)) { ?>
                     <a href="post.php?cancel_ticket_schedule=<?php echo htmlspecialchars($ticket_id); ?>" class="btn btn-danger text-bold">
                         <i class="fa fa-trash mr-2"></i>Cancel Scheduled Time
diff --git a/user/modals/ticket_edit_vendor_modal.php b/user/modals/ticket_edit_vendor_modal.php
index 763adfc3..4418fad5 100644
--- a/user/modals/ticket_edit_vendor_modal.php
+++ b/user/modals/ticket_edit_vendor_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="editTicketVendorModal<?php echo $ticket_id; ?>" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-building mr-2"></i>Editing ticket Vendor: <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>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Vendor</label>
@@ -37,7 +37,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="edit_ticket_vendor" 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>
diff --git a/user/modals/ticket_export_modal.php b/user/modals/ticket_export_modal.php
index 1ad30ce4..c1b23bbb 100644
--- a/user/modals/ticket_export_modal.php
+++ b/user/modals/ticket_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportTicketModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Tickets to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,10 +11,10 @@
                 <?php if (isset($_GET['client_id'])) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_tickets_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/ticket_invoice_add_modal.php b/user/modals/ticket_invoice_add_modal.php
index 5bce881a..9c320e55 100644
--- a/user/modals/ticket_invoice_add_modal.php
+++ b/user/modals/ticket_invoice_add_modal.php
@@ -5,8 +5,8 @@ $sql_invoices = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_stat
 
 <div class="modal" id="addInvoiceFromTicketModal" tabindex="-1">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-file-invoice-dollar mr-2"></i>Invoice ticket</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -14,7 +14,7 @@ $sql_invoices = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_stat
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                     <?php if (mysqli_num_rows($sql_invoices) > 0) { ?>
 
                     <ul class="nav nav-pills nav-justified mb-3">
@@ -200,7 +200,7 @@ $sql_invoices = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_stat
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_invoice_from_ticket" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Invoice</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/ticket_merge_modal.php b/user/modals/ticket_merge_modal.php
index 0c9b4ee8..221d9b27 100644
--- a/user/modals/ticket_merge_modal.php
+++ b/user/modals/ticket_merge_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="mergeTicketModal<?php echo $ticket_id; ?>" tabindex="-1">
     <div class="modal-dialog modal-md">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-clone mr-2"></i>Merge & Close <?php echo "$ticket_prefix$ticket_number"; ?> into another ticket</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" id="current_ticket_id" name="ticket_id" value="<?php echo $ticket_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Ticket number to merge this ticket into <strong class="text-danger">*</strong></label>
@@ -63,7 +63,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" id="merge_ticket_btn" name="merge_ticket" class="btn btn-primary text-bold" disabled><i class="fa fa-check mr-2"></i>Merge</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                     <!-- Merge button starts disabled. Is enabled by the merge_into_number_get_details Javascript function-->
diff --git a/user/modals/top_nav_tickets_modal.php b/user/modals/top_nav_tickets_modal.php
index 82a96d5e..de7e8fce 100644
--- a/user/modals/top_nav_tickets_modal.php
+++ b/user/modals/top_nav_tickets_modal.php
@@ -2,7 +2,7 @@
 <div class="modal fade" id="openTicketsModal" tabindex="-1" role="dialog" aria-labelledby="openTicketsModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
-            <div class="modal-header">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title" id="openTicketsModalLabel">Open Tickets</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
diff --git a/user/modals/transfer_add_modal.php b/user/modals/transfer_add_modal.php
index cd5437c3..1aa133b4 100644
--- a/user/modals/transfer_add_modal.php
+++ b/user/modals/transfer_add_modal.php
@@ -1,14 +1,14 @@
 <div class="modal" id="addTransferModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-exchange-alt mr-2"></i>Transfering Funds</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 bg-white">
+                <div class="modal-body">
 
                     <div class="form-row">
 
@@ -168,7 +168,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_transfer" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Transfer</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/trip_add_modal.php b/user/modals/trip_add_modal.php
index a16e3313..e81eb15b 100644
--- a/user/modals/trip_add_modal.php
+++ b/user/modals/trip_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addTripModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-route mr-2"></i>New Trip</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-row">
                         <div class="form-group col">
@@ -137,7 +137,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_trip" 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>
diff --git a/user/modals/trip_export_modal.php b/user/modals/trip_export_modal.php
index 9f074c0d..8bbf85bc 100644
--- a/user/modals/trip_export_modal.php
+++ b/user/modals/trip_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportTripsModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Trips to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,7 +11,7 @@
                 <?php if (isset($_GET['client_id'])) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Date From</label>
@@ -34,7 +34,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_trips_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/user_mfa_modal.php b/user/modals/user_mfa_modal.php
index 7808299d..0ae32885 100644
--- a/user/modals/user_mfa_modal.php
+++ b/user/modals/user_mfa_modal.php
@@ -15,8 +15,8 @@ $data = "otpauth://totp/ITFlow:$session_email?secret=$token";
 
 <div class="modal" id="enableMFAModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fa fa-fw fa-lock mr-2"></i>Multi-Factor Authentication</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -24,7 +24,7 @@ $data = "otpauth://totp/ITFlow:$session_email?secret=$token";
             </div>
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
                         
                     <div class="text-center">
                         <img src='plugins/barcode/barcode.php?f=png&s=qr&d=<?php echo $data; ?>'>
@@ -43,7 +43,7 @@ $data = "otpauth://totp/ITFlow:$session_email?secret=$token";
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="enable_mfa" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Enable</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/vendor_add_from_template_modal.php b/user/modals/vendor_add_from_template_modal.php
index 35f5ad99..79dc8822 100644
--- a/user/modals/vendor_add_from_template_modal.php
+++ b/user/modals/vendor_add_from_template_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addVendorFromTemplateModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <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 from Template</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,7 +11,7 @@
 
                 <input type="hidden" name="client_id" value="<?php if (isset($_GET['client_id'])) { echo $client_id; } else { echo 0; } ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <label>Template</label>
                     <div class="form-group">
@@ -37,7 +37,7 @@
 
                 </div>
 
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_vendor_from_template" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Create Vendor</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/modals/vendor_add_modal.php b/user/modals/vendor_add_modal.php
index fbd8acb3..f6a7df4e 100644
--- a/user/modals/vendor_add_modal.php
+++ b/user/modals/vendor_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addVendorModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <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</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -10,7 +10,7 @@
             <form action="post.php" method="post" autocomplete="off">
                 <input type="hidden" name="client_id" value="<?php if (isset($_GET['client_id'])) { echo $client_id; } else { echo 0; } ?>">
 
-                <div class="modal-body bg-white">
+                <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>
@@ -149,7 +149,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="add_vendor" 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>
diff --git a/user/modals/vendor_contact_add_modal.php b/user/modals/vendor_contact_add_modal.php
index 834a9a29..40872c70 100644
--- a/user/modals/vendor_contact_add_modal.php
+++ b/user/modals/vendor_contact_add_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="addVendorContactModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <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>
@@ -9,7 +9,7 @@
             </div>
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="vendor_id" value="<?php echo $vendor_id; ?>">
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Name <strong class="text-danger">*</strong></label>
@@ -84,7 +84,7 @@
                     <textarea class="form-control" rows="8" name="notes" placeholder="Enter some notes"></textarea>
                 </div>
 
-                <div class="modal-footer bg-white">
+                <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>
diff --git a/user/modals/vendor_contact_edit_modal.php b/user/modals/vendor_contact_edit_modal.php
index 4ed8b37f..d6883ae4 100644
--- a/user/modals/vendor_contact_edit_modal.php
+++ b/user/modals/vendor_contact_edit_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="editVendorContactModal<?php echo $vendor_contact_id; ?>" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <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>
@@ -10,7 +10,7 @@
             <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
                 <input type="hidden" name="vendor_contact_id" value="<?php echo $vendor_contact_id; ?>">
 
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                     <div class="form-group">
                         <label>Name <strong class="text-danger">*</strong></label>
@@ -84,7 +84,7 @@
                     </div>
 
                 </div>
-                <div class="modal-footer bg-white">
+                <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>
diff --git a/user/modals/vendor_export_modal.php b/user/modals/vendor_export_modal.php
index ab904b19..766869f3 100644
--- a/user/modals/vendor_export_modal.php
+++ b/user/modals/vendor_export_modal.php
@@ -1,7 +1,7 @@
 <div class="modal" id="exportVendorModal" tabindex="-1">
     <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
+        <div class="modal-content">
+            <div class="modal-header bg-dark">
                 <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Vendors to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
@@ -11,10 +11,10 @@
                 <?php if(isset($_GET['client_id'])) { ?>
                 <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
                 <?php } ?>
-                <div class="modal-body bg-white">
+                <div class="modal-body">
 
                 </div>
-                <div class="modal-footer bg-white">
+                <div class="modal-footer">
                     <button type="submit" name="export_vendors_csv" class="btn btn-primary text-bold"><i class="fas fa-fw fa-download mr-2"></i>Download CSV</button>
                     <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
                 </div>
diff --git a/user/networks.php b/user/networks.php
index 1e8d052c..6743a7ee 100644
--- a/user/networks.php
+++ b/user/networks.php
@@ -373,7 +373,7 @@ require_once "modals/network_export_modal.php";
 
 ?>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <?php
 require_once "../includes/footer.php";
diff --git a/user/post/client.php b/user/post/client.php
index 681c11d7..cb71f849 100644
--- a/user/post/client.php
+++ b/user/post/client.php
@@ -39,9 +39,9 @@ if (isset($_POST['add_client'])) {
 
     $client_id = mysqli_insert_id($mysqli);
 
-    if (!file_exists("uploads/clients/$client_id")) {
-        mkdir("uploads/clients/$client_id");
-        file_put_contents("uploads/clients/$client_id/index.php", "");
+    if (!file_exists("../uploads/clients/$client_id")) {
+        mkdir("../uploads/clients/$client_id");
+        file_put_contents("../uploads/clients/$client_id/index.php", "");
     }
 
     // Create Referral if it doesn't exist
@@ -295,7 +295,7 @@ if (isset($_GET['delete_client'])) {
     mysqli_query($mysqli, "DELETE FROM vendors WHERE vendor_client_id = $client_id");
 
     //Delete Client Files
-    removeDirectory('uploads/clients/$client_id');
+    removeDirectory("../uploads/clients/$client_id");
 
     //Finally Remove the Client
     mysqli_query($mysqli, "DELETE FROM clients WHERE client_id = $client_id");
@@ -1061,7 +1061,7 @@ if (isset($_POST["export_client_pdf"])) {
             asset_name, software_name;"
     );
 
-    require_once("plugins/TCPDF/tcpdf.php");
+    require_once("../plugins/TCPDF/tcpdf.php");
 
     $pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, "UTF-8", false);
     $pdf->SetCreator(PDF_CREATOR);
@@ -1106,7 +1106,7 @@ if (isset($_POST["export_client_pdf"])) {
     // Cover page section (for main content, not the TOC)
     $html .= '<div class="cover">';
     if (!empty($company_logo)) {
-        $pdf->Image('uploads/settings/' . $company_logo, '', '', 35, 35, '', '', 'L', false, 300, '', false, false, 1, false, false, false);
+        $pdf->Image('../uploads/settings/' . $company_logo, '', '', 35, 35, '', '', 'L', false, 300, '', false, false, 1, false, false, false);
     }
     $html .= "
      <h1>IT Documentation</h1>
diff --git a/user/products.php b/user/products.php
index ef7422ff..3260f672 100644
--- a/user/products.php
+++ b/user/products.php
@@ -278,7 +278,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         </div>
     </div>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <?php
 
diff --git a/user/project_details.php b/user/project_details.php
index 4b6e63b5..2267cbed 100644
--- a/user/project_details.php
+++ b/user/project_details.php
@@ -565,6 +565,6 @@ require_once "../includes/footer.php";
 
 ?>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <script src="js/pretty_content.js"></script>
diff --git a/user/recurring_tickets.php b/user/recurring_tickets.php
index f4448148..24f41440 100644
--- a/user/recurring_tickets.php
+++ b/user/recurring_tickets.php
@@ -244,7 +244,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
     </div>
 </div>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <?php
 require_once "modals/recurring_ticket_add_modal.php";
diff --git a/user/tickets.php b/user/tickets.php
index 1388d416..1223748b 100644
--- a/user/tickets.php
+++ b/user/tickets.php
@@ -436,7 +436,7 @@ if (isset($_GET["view"])) {
 
 ?>
 
-<script src="js/bulk_actions.js"></script>
+<script src="../js/bulk_actions.js"></script>
 
 <?php
 require_once "modals/ticket_add_modal_v2.php";