diff --git a/css/style.css b/css/style.css
index ecd7abce..acf444ca 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1,4 +1,3 @@
 body{
 	font-size: .875rem;
-}
-
+}
\ No newline at end of file
diff --git a/includes/header.php b/includes/header.php
index ac886ac6..e701d30f 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -35,7 +35,7 @@ header("X-Frame-Options: DENY");
     <!-- Custom Style Sheet -->
     <link href="plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
     <link href="plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
-    <link href="plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
+    <link href="plugins/select2-bootstrap4-theme-old/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
     <link href='plugins/daterangepicker/daterangepicker.css' rel='stylesheet' />
     <link href="plugins/toastr/toastr.min.css" rel="stylesheet">
     <link href="plugins/DataTables/datatables.min.css" rel="stylesheet">
diff --git a/js/app.js b/js/app.js
index ca1e78a3..312c370c 100644
--- a/js/app.js
+++ b/js/app.js
@@ -10,7 +10,7 @@ $("#alert").fadeTo(5000, 500).slideUp(500, function(){
 
 // Initialize Select2 Elements
 $('.select2').select2({
-  theme: 'bootstrap4'
+  theme: 'bootstrap4',
 });
 
 // Initialize TinyMCE
diff --git a/modals/client_add_modal.php b/modals/client_add_modal.php
index 4f9b5338..082b7428 100644
--- a/modals/client_add_modal.php
+++ b/modals/client_add_modal.php
@@ -76,10 +76,10 @@
                                 <label>Referral</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-smile-wink"></i></span>
+                                        <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
                                     </div>
                                     <select class="form-control select2" data-tags="true" name="referral">
-                                        <option value="">N/A</option>
+                                        <option value="">- Select Referral -</option>
                                         <?php
 
                                         $referral_sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Referral' AND category_archived_at IS NULL ORDER BY category_name ASC");
@@ -108,7 +108,7 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
                                     </div>
-                                    <select class="form-control select2" name="tags[]" data-placeholder="Add some tags" multiple>
+                                    <select class="form-control select2" name="tags[]" multiple>
                                         <?php
 
                                         $sql_tags_select = mysqli_query($mysqli, "SELECT * FROM tags WHERE tag_type = 1 ORDER BY tag_name ASC");
@@ -194,7 +194,7 @@
                                         <span class="input-group-text"><i class="fa fa-fw fa-globe-americas"></i></span>
                                     </div>
                                     <select class="form-control select2" name="country">
-                                        <option value="">- Country -</option>
+                                        <option value="">- Select Country -</option>
                                         <?php foreach($countries_array as $country_name) { ?>
                                             <option <?php if ($session_company_country == $country_name) { echo "selected"; } ?> ><?php echo $country_name; ?></option>
                                         <?php } ?>
@@ -287,7 +287,7 @@
                                             <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
                                         </div>
                                         <select class="form-control select2" name="currency_code" required>
-                                            <option value="">- Currency -</option>
+                                            <option value="">- Select Currency -</option>
                                             <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
                                                 <option <?php if ($session_company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
                                             <?php } ?>
diff --git a/modals/client_asset_add_modal.php b/modals/client_asset_add_modal.php
index ef42aec1..c7889c48 100644
--- a/modals/client_asset_add_modal.php
+++ b/modals/client_asset_add_modal.php
@@ -68,7 +68,7 @@
                                         <span class="input-group-text"><i class="fa fa-fw fa-tags"></i></span>
                                     </div>
                                     <select class="form-control select2" name="type" required>
-                                        <option value="">- Type -</option>
+                                        <option value="">- Select Type -</option>
                                         <?php foreach($asset_types_array as $asset_type => $asset_icon) { ?>
                                             <option><?php echo $asset_type; ?></option>
                                         <?php } ?>
@@ -132,7 +132,7 @@
                                         <span class="input-group-text"><i class="fa fa-fw fa-network-wired"></i></span>
                                     </div>
                                     <select class="form-control select2" name="network">
-                                        <option value="">- Network -</option>
+                                        <option value="">- Select Network -</option>
                                         <?php
 
                                         $sql = mysqli_query($mysqli, "SELECT * FROM networks WHERE network_archived_at IS NULL AND network_client_id = $client_id ORDER BY network_name ASC");
@@ -235,7 +235,7 @@
                                         <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                                     </div>
                                     <select class="form-control select2" name="location">
-                                        <option value="">- Location -</option>
+                                        <option value="">- Select Location -</option>
                                         <?php
 
                                         $sql = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
@@ -257,7 +257,7 @@
                                         <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                                     </div>
                                     <select class="form-control select2" name="contact">
-                                        <option value="">- Contact -</option>
+                                        <option value="">- Select Contact -</option>
                                         <?php
 
                                         $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_archived_at IS NULL AND contact_client_id = $client_id ORDER BY contact_name ASC");
@@ -280,7 +280,7 @@
                                         <span class="input-group-text"><i class="fa fa-fw fa-info"></i></span>
                                     </div>
                                     <select class="form-control select2" name="status">
-                                        <option value="">- Status -</option>
+                                        <option value="">- Select Status -</option>
                                         <?php foreach($asset_status_array as $asset_status) { ?>
                                             <option><?php echo $asset_status; ?></option>
                                         <?php } ?>
@@ -299,7 +299,7 @@
                                         <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
                                     </div>
                                     <select class="form-control select2" name="vendor">
-                                        <option value="">- Vendor -</option>
+                                        <option value="">- Select Vendor -</option>
                                         <?php
 
                                         $sql = mysqli_query($mysqli, "SELECT * FROM vendors WHERE vendor_archived_at IS NULL AND vendor_client_id = $client_id AND vendor_template = 0 ORDER BY vendor_name ASC");
diff --git a/modals/client_contact_add_modal.php b/modals/client_contact_add_modal.php
index 0517520d..b503ddad 100644
--- a/modals/client_contact_add_modal.php
+++ b/modals/client_contact_add_modal.php
@@ -111,7 +111,7 @@
                                         <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                                     </div>
                                     <select class="form-control select2" name="location">
-                                        <option value="">- Location -</option>
+                                        <option value="">- Select Location -</option>
                                         <?php
 
                                         $sql = mysqli_query($mysqli, "SELECT location_id, location_name FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
@@ -151,15 +151,15 @@
                             <?php if ($config_client_portal_enable == 1) { ?>
                                 <div class="authForm">
                                     <div class="form-group">
-                                        <label>Login</label>
+                                        <label>Client Portal</label>
                                         <div class="input-group">
                                             <div class="input-group-prepend">
                                                 <span class="input-group-text"><i class="fa fa-fw fa-user-circle"></i></span>
                                             </div>
                                             <select class="form-control select2 authMethod" name="auth_method">
-                                                <option value="">- None -</option>
-                                                <option value="local">Local</option>
-                                                <option value="azure">Azure</option>
+                                                <option value="">- No Access -</option>
+                                                <option value="local">Using Set Password</option>
+                                                <option value="azure">Using Azure Credentials</option>
                                             </select>
                                         </div>
                                     </div>
diff --git a/modals/client_contact_bulk_assign_location_modal.php b/modals/client_contact_bulk_assign_location_modal.php
index 404a545a..7b08ba3b 100644
--- a/modals/client_contact_bulk_assign_location_modal.php
+++ b/modals/client_contact_bulk_assign_location_modal.php
@@ -17,7 +17,7 @@
                             <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                         </div>
                         <select class="form-control select2" name="bulk_location_id">
-                            <option value="">- Location -</option>
+                            <option value="">- Select Location -</option>
                             <?php
 
                             $sql = mysqli_query($mysqli, "SELECT location_id, location_name FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
diff --git a/modals/client_contact_bulk_email_modal.php b/modals/client_contact_bulk_email_modal.php
index b0b92ef0..5d9e4e4c 100644
--- a/modals/client_contact_bulk_email_modal.php
+++ b/modals/client_contact_bulk_email_modal.php
@@ -1,5 +1,5 @@
 <div class="modal" id="bulkSendEmailModal" tabindex="-1">
-    <div class="modal-dialog">
+    <div class="modal-dialog modal-lg">
         <div class="modal-content bg-dark">
             <div class="modal-header">
                 <h5 class="modal-title"><i class="fa fa-fw fa-envelope-open mr-2"></i>Bulk Send Email</h5>
@@ -10,22 +10,26 @@
 
             <div class="modal-body bg-white">
 
-                <div class="form-group">
-                    <select type="text" class="form-control select2" name="mail_from">
-                        <option value="<?php echo nullable_htmlentities($config_mail_from_email); ?>">
-                            <?php echo nullable_htmlentities("$config_mail_from_name - $config_mail_from_email"); ?></option>
-                        <option value="<?php echo nullable_htmlentities($config_invoice_from_email); ?>">
-                            <?php echo nullable_htmlentities("$config_invoice_from_name - $config_invoice_from_email"); ?></option>
-                        <option value="<?php echo nullable_htmlentities($config_quote_from_email); ?>">
-                            <?php echo nullable_htmlentities("$config_quote_from_name - $config_quote_from_email"); ?></option>
-                        <option value="<?php echo nullable_htmlentities($config_ticket_from_email); ?>">
-                            <?php echo nullable_htmlentities("$config_ticket_from_name - $config_ticket_from_email"); ?></option>
-                    </select>
-                </div>
+                <label>From Email / Display Name</label>
+                <div class="form-row">
 
-                <div class="form-group">
-                    <input type="text" class="form-control" name="mail_from_name" placeholder="From Name" maxlength="255"
-                        value="<?php echo nullable_htmlentities($config_mail_from_name); ?>">
+                    <div class="form-group col-sm-6">
+                        <select type="text" class="form-control select2" name="mail_from">
+                            <option value="<?php echo nullable_htmlentities($config_mail_from_email); ?>">
+                                <?php echo nullable_htmlentities("$config_mail_from_name - $config_mail_from_email"); ?></option>
+                            <option value="<?php echo nullable_htmlentities($config_invoice_from_email); ?>">
+                                <?php echo nullable_htmlentities("$config_invoice_from_name - $config_invoice_from_email"); ?></option>
+                            <option value="<?php echo nullable_htmlentities($config_quote_from_email); ?>">
+                                <?php echo nullable_htmlentities("$config_quote_from_name - $config_quote_from_email"); ?></option>
+                            <option value="<?php echo nullable_htmlentities($config_ticket_from_email); ?>">
+                                <?php echo nullable_htmlentities("$config_ticket_from_name - $config_ticket_from_email"); ?></option>
+                        </select>
+                    </div>
+
+                    <div class="form-group col-sm-6">
+                        <input type="text" class="form-control" name="mail_from_name" placeholder="From Name" maxlength="255"
+                            value="<?php echo nullable_htmlentities($config_mail_from_name); ?>">
+                    </div>
                 </div>
 
                 <div class="form-group">
diff --git a/modals/client_contact_edit_modal.php b/modals/client_contact_edit_modal.php
index 3205850f..c6d55465 100644
--- a/modals/client_contact_edit_modal.php
+++ b/modals/client_contact_edit_modal.php
@@ -112,7 +112,7 @@
                                         <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                                     </div>
                                     <select class="form-control select2" name="location">
-                                        <option value="">- Location -</option>
+                                        <option value="">- Select Location -</option>
                                         <?php
 
                                         $sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_id = $contact_location_id OR location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
@@ -152,15 +152,15 @@
                             <?php if ($config_client_portal_enable == 1) { ?>
                                 <div class="authForm">
                                     <div class="form-group">
-                                        <label>Login</label>
+                                        <label>Client Portal</label>
                                         <div class="input-group">
                                             <div class="input-group-prepend">
                                                 <span class="input-group-text"><i class="fa fa-fw fa-user-circle"></i></span>
                                             </div>
                                             <select class="form-control select2 authMethod" name="auth_method">
-                                                <option value="">- None -</option>
-                                                <option value="local" <?php if ($auth_method == "local") { echo "selected"; } ?>>Local</option>
-                                                <option value="azure" <?php if ($auth_method == "azure") { echo "selected"; } ?>>Azure</option>
+                                                <option value="">- No Access -</option>
+                                                <option value="local" <?php if ($auth_method == "local") { echo "selected"; } ?>>Using Set Password</option>
+                                                <option value="azure" <?php if ($auth_method == "azure") { echo "selected"; } ?>>Using Azure Credentials</option>
                                             </select>
                                         </div>
                                     </div>
diff --git a/modals/client_edit_modal.php b/modals/client_edit_modal.php
index 75744465..56b47262 100644
--- a/modals/client_edit_modal.php
+++ b/modals/client_edit_modal.php
@@ -75,10 +75,10 @@
                                 <label>Referral</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-smile-wink"></i></span>
+                                        <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
                                     </div>
                                     <select class="form-control select2" data-tags="true" name="referral">
-                                        <option value="">N/A</option>
+                                        <option value="">- Select Referral -</option>
                                         <?php
 
                                         $referral_sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Referral' AND (category_archived_at > '$client_created_at' OR category_archived_at IS NULL) ORDER BY category_name ASC");