diff --git a/calendar_event_add_modal.php b/calendar_event_add_modal.php
index 47d3d9e3..eff6307a 100644
--- a/calendar_event_add_modal.php
+++ b/calendar_event_add_modal.php
@@ -139,9 +139,11 @@
               <?php } ?>
 
               <?php if (!empty($config_smtp_host)) { ?>
-              <div class="custom-control custom-checkbox">
-                <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="email_event" value="1" >
-                <label class="custom-control-label" for="customControlAutosizing">Email Event</label>
+              <div class="form-group">
+                <div class="custom-control custom-checkbox">
+                  <input type="checkbox" class="custom-control-input" id="emailEventCheckbox" name="email_event" value="1" >
+                  <label class="custom-control-label" for="emailEventCheckbox">Email Event</label>
+                </div>
               </div>
               <?php } ?>
 
diff --git a/client_add_modal.php b/client_add_modal.php
index fb2dcfd3..3316f81f 100644
--- a/client_add_modal.php
+++ b/client_add_modal.php
@@ -285,9 +285,13 @@
 
                 ?>
                   <li class="list-group-item">
-                    <div class="form-check">
-                      <input type="checkbox" class="form-check-input" name="tags[]" value="<?php echo $tag_id_select; ?>">
-                      <label class="form-check-label ml-2 badge bg-<?php echo $tag_color_select; ?>"><?php echo "<i class='fa fw fa-$tag_icon_select'></i>"; ?> <?php echo $tag_name_select; ?></label>
+                    <div class="custom-control custom-checkbox">
+                      <input class="custom-control-input" type="checkbox" id="tagCheckbox<?php echo $tag_id_select; ?>" name="tags[]" value="<?php echo $tag_id_select; ?>">
+                      <label for="tagCheckbox<?php echo $tag_id_select; ?>" class="custom-control-label">
+                        <span class="badge bg-<?php echo $tag_color_select; ?>">
+                          <?php echo "<i class='fa fw fa-$tag_icon_select'></i>"; ?> <?php echo $tag_name_select; ?>    
+                        </span>
+                      </label>
                     </div>
                   </li>
 
diff --git a/client_contact_add_modal.php b/client_contact_add_modal.php
index f87bedc5..b3f08d35 100644
--- a/client_contact_add_modal.php
+++ b/client_contact_add_modal.php
@@ -48,17 +48,12 @@
               </div>
               
               <div class="form-group">
-                <label>Title / <span class="text-secondary">Important Contact</span></label>
+                <label>Title</label>
                 <div class="input-group">
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-id-badge"></i></span>
                   </div>
                   <input type="text" class="form-control" name="title" placeholder="Title">
-                  <div class="input-group-append">
-                    <div class="input-group-text">
-                      <input type="checkbox" name="contact_important" value="1">
-                    </div>
-                  </div>
                 </div>
               </div>
 
@@ -133,6 +128,35 @@
                 </div>
               </div>
 
+              <div class="form-row">
+                
+                <div class="col-md-4">
+                  <div class="form-group">
+                    <div class="custom-control custom-checkbox">
+                      <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox" name="contact_important" value="1" >
+                      <label class="custom-control-label" for="contactImportantCheckbox">Important</label>
+                    </div>
+                  </div>
+                </div>
+                <div class="col-md-4">
+                  <div class="form-group">
+                    <div class="custom-control custom-checkbox">
+                      <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox" name="contact_billing" value="1" >
+                      <label class="custom-control-label" for="contactBillingCheckbox">Billing</label>
+                    </div>
+                  </div>
+                </div>
+                <div class="col-md-4">
+                  <div class="form-group">
+                    <div class="custom-control custom-checkbox">
+                      <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox" name="contact_technical" value="1" >
+                      <label class="custom-control-label" for="contactTechnicalCheckbox">Technical</label>
+                    </div>
+                  </div>
+                </div>
+              
+              </div>
+
             </div>
 
             <div class="tab-pane fade" id="pills-photo">
diff --git a/client_contact_edit_modal.php b/client_contact_edit_modal.php
index bbfd7423..809df8c4 100644
--- a/client_contact_edit_modal.php
+++ b/client_contact_edit_modal.php
@@ -135,6 +135,35 @@
                 </div>
               </div>
 
+              <div class="form-row">
+                
+                <div class="col-md-4">
+                  <div class="form-group">
+                    <div class="custom-control custom-checkbox">
+                      <input type="checkbox" class="custom-control-input" id="contactImportantCheckbox<?php echo $contact_id; ?>" name="contact_important" value="1" <?php if ($contact_important == 1) { echo "checked"; } ?> >
+                      <label class="custom-control-label" for="contactImportantCheckbox<?php echo $contact_id; ?>">Important</label>
+                    </div>
+                  </div>
+                </div>
+                <div class="col-md-4">
+                  <div class="form-group">
+                    <div class="custom-control custom-checkbox">
+                      <input type="checkbox" class="custom-control-input" id="contactBillingCheckbox<?php echo $contact_id; ?>" name="contact_billing" value="1" <?php if ($contact_billing == 1) { echo "checked"; } ?> >
+                      <label class="custom-control-label" for="contactBillingCheckbox<?php echo $contact_id; ?>">Billing</label>
+                    </div>
+                  </div>
+                </div>
+                <div class="col-md-4">
+                  <div class="form-group">
+                    <div class="custom-control custom-checkbox">
+                      <input type="checkbox" class="custom-control-input" id="contactTechnicalCheckbox<?php echo $contact_id; ?>" name="contact_technical" value="1" <?php if ($contact_technical == 1) { echo "checked"; } ?> >
+                      <label class="custom-control-label" for="contactTechnicalCheckbox<?php echo $contact_id; ?>">Technical</label>
+                    </div>
+                  </div>
+                </div>
+              
+              </div>
+
             </div>
 
             <div class="tab-pane fade" id="pills-portal<?php echo $contact_id; ?>">
diff --git a/client_contacts.php b/client_contacts.php
index 68373c15..295969b4 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -127,6 +127,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $contact_initials = initials($contact_name);
             $contact_notes = htmlentities($row['contact_notes']);
             $contact_important = intval($row['contact_important']);
+            $contact_billing = intval($row['contact_billing']);
+            $contact_technical = intval($row['contact_technical']);
             $contact_created_at = $row['contact_created_at'];
             if ($contact_id == $primary_contact) {
                 $primary_contact_display = "<small class='text-success'>Primary Contact</small>";
diff --git a/client_edit_modal.php b/client_edit_modal.php
index 7c09f8a7..496d8663 100644
--- a/client_edit_modal.php
+++ b/client_edit_modal.php
@@ -148,11 +148,15 @@
 
                 ?>
                   <li class="list-group-item">
-                    <div class="form-check">
-                      <input type="checkbox" class="form-check-input" name="tags[]" value="<?php echo $tag_id_select; ?>" <?php if (in_array($tag_id_select, $client_tag_id_array)) { echo "checked"; } ?>>
-                      <label class="form-check-label ml-2 badge bg-<?php echo $tag_color_select; ?>"><?php echo "<i class='fa fw fa-$tag_icon_select'></i>"; ?> <?php echo $tag_name_select; ?></label>
+                    <div class="custom-control custom-checkbox">
+                      <input class="custom-control-input" type="checkbox" id="tagCheckbox<?php echo "$tag_id_select$client_id"; ?>" name="tags[]" value="<?php echo $tag_id_select; ?>" <?php if (in_array($tag_id_select, $client_tag_id_array)) { echo "checked"; } ?>>
+                      <label for="tagCheckbox<?php echo "$tag_id_select$client_id"; ?>" class="custom-control-label">
+                        <span class="badge bg-<?php echo $tag_color_select; ?>">
+                          <?php echo "<i class='fa fw fa-$tag_icon_select'></i>"; ?> <?php echo $tag_name_select; ?>    
+                        </span>
+                      </label>
                     </div>
-                  </li>
+                  </li>                  
 
                 <?php
                 }
diff --git a/expense_add_modal.php b/expense_add_modal.php
index 366ecec6..25513c4f 100644
--- a/expense_add_modal.php
+++ b/expense_add_modal.php
@@ -153,8 +153,6 @@
             <label>Receipt</label>
             <input type="file" class="form-control-file" name="file">
           </div>
-
-          
           
         </div>
         <div class="modal-footer bg-white">
diff --git a/post.php b/post.php
index d71ce67e..61c13e30 100644
--- a/post.php
+++ b/post.php
@@ -4124,6 +4124,8 @@ if(isset($_POST['add_contact'])){
     $primary_contact = intval($_POST['primary_contact']);
     $notes = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes'])));
     $contact_important = intval($_POST['contact_important']);
+    $contact_billing = intval($_POST['contact_billing']);
+    $contact_technical = intval($_POST['contact_technical']);
     $location_id = intval($_POST['location']);
     $auth_method = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['auth_method'])));
     $password = password_hash(bin2hex(random_bytes(16)), PASSWORD_DEFAULT);
@@ -4133,7 +4135,7 @@ if(isset($_POST['add_contact'])){
         mkdir("uploads/clients/$session_company_id/$client_id");
     }
 
-    mysqli_query($mysqli,"INSERT INTO contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_important = $contact_important, contact_auth_method = '$auth_method', contact_password_hash = '$password', contact_department = '$department', contact_location_id = $location_id, contact_client_id = $client_id, company_id = $session_company_id");
+    mysqli_query($mysqli,"INSERT INTO contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_important = $contact_important, contact_billing = $contact_billing, contact_technical = $contact_technical, contact_auth_method = '$auth_method', contact_password_hash = '$password', contact_department = '$department', contact_location_id = $location_id, contact_client_id = $client_id, company_id = $session_company_id");
 
     $contact_id = mysqli_insert_id($mysqli);
 
@@ -4209,6 +4211,8 @@ if(isset($_POST['edit_contact'])){
     $primary_contact = intval($_POST['primary_contact']);
     $notes = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['notes'])));
     $contact_important = intval($_POST['contact_important']);
+    $contact_billing = intval($_POST['contact_billing']);
+    $contact_technical = intval($_POST['contact_technical']);
     $location_id = intval($_POST['location']);
     $auth_method = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['auth_method'])));
 
@@ -4218,7 +4222,7 @@ if(isset($_POST['edit_contact'])){
         mkdir("uploads/clients/$session_company_id/$client_id");
     }
 
-    mysqli_query($mysqli,"UPDATE contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_important = $contact_important, contact_auth_method = '$auth_method', contact_department = '$department', contact_location_id = $location_id WHERE contact_id = $contact_id AND company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE contacts SET contact_name = '$name', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_notes = '$notes', contact_important = $contact_important, contact_billing = $contact_billing, contact_technical = $contact_technical, contact_auth_method = '$auth_method', contact_department = '$department', contact_location_id = $location_id WHERE contact_id = $contact_id AND company_id = $session_company_id");
 
     // Update Primary contact in clients if primary contact is checked
     if($primary_contact > 0){
diff --git a/settings_alerts.php b/settings_alerts.php
index b5f772a8..601025ee 100644
--- a/settings_alerts.php
+++ b/settings_alerts.php
@@ -7,19 +7,25 @@
   <div class="card-body">
     <form action="post.php" method="post" autocomplete="off">
 
-      <div class="custom-control custom-switch mb-2">
-        <input type="checkbox" class="custom-control-input" name="config_enable_cron" <?php if ($config_enable_cron == 1) { echo "checked"; } ?> value="1" id="customSwitch1">
-        <label class="custom-control-label" for="customSwitch1">Enable Cron <small>(cron.php must also be added to cron and run daily at 1:00AM for alerts to work)</small></label>
+      <div class="form-group">
+        <div class="custom-control custom-switch">
+          <input type="checkbox" class="custom-control-input" name="config_enable_cron" <?php if ($config_enable_cron == 1) { echo "checked"; } ?> value="1" id="enableCronSwitch">
+          <label class="custom-control-label" for="enableCronSwitch">Enable Cron <small>(cron.php must also be added to cron and run daily at 1:00AM for alerts to work)</small></label>
+        </div>
       </div>
 
-      <div class="custom-control custom-switch mb-2">
-        <input type="checkbox" class="custom-control-input" name="config_enable_alert_domain_expire" <?php if ($config_enable_alert_domain_expire == 1) { echo "checked"; } ?> value="1" id="customSwitch3">
-        <label class="custom-control-label" for="customSwitch3">Enable Domain Expiration Alerts</label>
+      <div class="form-group">
+        <div class="custom-control custom-switch">
+          <input type="checkbox" class="custom-control-input" name="config_enable_alert_domain_expire" <?php if ($config_enable_alert_domain_expire == 1) { echo "checked"; } ?> value="1" id="alertDomainExpireSwitch">
+          <label class="custom-control-label" for="alertDomainExpireSwitch">Enable Domain Expiration Alerts</label>
+        </div>
       </div>
 
-      <div class="custom-control custom-switch mb-2">
-        <input type="checkbox" class="custom-control-input" name="config_send_invoice_reminders" <?php if ($config_send_invoice_reminders == 1) { echo "checked"; } ?> value="1" id="customSwitch4">
-        <label class="custom-control-label" for="customSwitch4">Send Invoice Reminders</label>
+      <div class="form-group">
+        <div class="custom-control custom-switch">
+          <input type="checkbox" class="custom-control-input" name="config_send_invoice_reminders" <?php if ($config_send_invoice_reminders == 1) { echo "checked"; } ?> value="1" id="sendInvoiceRemindersSwitch">
+          <label class="custom-control-label" for="sendInvoiceRemindersSwitch">Send Invoice Reminders</label>
+        </div>
       </div>
 
       <?php if ($config_send_invoice_reminders == 1) { ?>
diff --git a/settings_modules.php b/settings_modules.php
index a2f19904..5756a95e 100644
--- a/settings_modules.php
+++ b/settings_modules.php
@@ -7,19 +7,25 @@
   <div class="card-body">
     <form action="post.php" method="post" autocomplete="off">
 
-      <div class="custom-control custom-switch mb-3">
-        <input type="checkbox" class="custom-control-input" name="config_module_enable_itdoc" <?php if ($config_module_enable_itdoc == 1) { echo "checked"; } ?> value="1" id="customSwitch1">
-        <label class="custom-control-label" for="customSwitch1">Show IT Documentation</label>
+      <div class="form-group">
+        <div class="custom-control custom-switch">
+          <input type="checkbox" class="custom-control-input" name="config_module_enable_itdoc" <?php if ($config_module_enable_itdoc == 1) { echo "checked"; } ?> value="1" id="customSwitch1">
+          <label class="custom-control-label" for="customSwitch1">Show IT Documentation</label>
+        </div>
       </div>
 
-      <div class="custom-control custom-switch mb-3">
-        <input type="checkbox" class="custom-control-input" name="config_module_enable_ticketing" <?php if ($config_module_enable_ticketing == 1) { echo "checked"; } ?> value="1" id="customSwitch2">
-        <label class="custom-control-label" for="customSwitch2">Show Ticketing</label>
+      <div class="form-group">
+        <div class="custom-control custom-switch">
+          <input type="checkbox" class="custom-control-input" name="config_module_enable_ticketing" <?php if ($config_module_enable_ticketing == 1) { echo "checked"; } ?> value="1" id="customSwitch2">
+          <label class="custom-control-label" for="customSwitch2">Show Ticketing</label>
+        </div>
       </div>
 
-      <div class="custom-control custom-switch mb-3">
-        <input type="checkbox" class="custom-control-input" name="config_module_enable_accounting" <?php if ($config_module_enable_accounting == 1) { echo "checked"; } ?> value="1" id="customSwitch3">
-        <label class="custom-control-label" for="customSwitch3">Show Invoicing / Accounting</label>
+      <div class="form-group">
+        <div class="custom-control custom-switch">
+          <input type="checkbox" class="custom-control-input" name="config_module_enable_accounting" <?php if ($config_module_enable_accounting == 1) { echo "checked"; } ?> value="1" id="customSwitch3">
+          <label class="custom-control-label" for="customSwitch3">Show Invoicing / Accounting</label>
+        </div>
       </div>
 
       <hr>
diff --git a/settings_online_payment.php b/settings_online_payment.php
index 9f633578..2a5d54bd 100644
--- a/settings_online_payment.php
+++ b/settings_online_payment.php
@@ -11,9 +11,11 @@
   <div class="card-body">
     <form action="post.php" method="post" autocomplete="off">
 
-      <div class="custom-control custom-switch mb-2">
-        <input type="checkbox" class="custom-control-input" name="config_stripe_enable" <?php if ($config_stripe_enable == 1) { echo "checked"; } ?> value="1" id="customSwitch1">
-        <label class="custom-control-label" for="customSwitch1">Enable Stripe</label>
+      <div class="form-group">
+        <div class="custom-control custom-switch">
+          <input type="checkbox" class="custom-control-input" name="config_stripe_enable" <?php if ($config_stripe_enable == 1) { echo "checked"; } ?> value="1" id="enableStripeSwitch">
+          <label class="custom-control-label" for="enableStripeSwitch">Enable Stripe</label>
+        </div>
       </div>
 
       <?php if ($config_stripe_enable == 1) { ?>
diff --git a/settings_theme.php b/settings_theme.php
index da2a44f1..3954b553 100644
--- a/settings_theme.php
+++ b/settings_theme.php
@@ -17,13 +17,15 @@
                         ?>
 
                         <div class="col-3 text-center mb-3">
-                            <div class="form-check">
-                                <input class="form-check-input" type="radio" name="theme" value="<?php echo $color; ?>" <?php if ($config_theme == $color) { echo "checked"; } ?>>
-                                <label class="form-check-label">
-                                    <i class="fa fa-fw fa-6x fa-circle text-<?php echo $color; ?>"></i>
-                                    <br>
-                                    <?php echo $color; ?>
-                                </label>
+                            <div class="form-group">
+                                <div class="custom-control custom-radio">
+                                    <input class="custom-control-input" type="radio" id="customRadio<?php echo $color; ?>" name="theme" value="<?php echo $color; ?>" <?php if ($config_theme == $color) { echo "checked"; } ?>>
+                                    <label for="customRadio<?php echo $color; ?>" class="custom-control-label">
+                                        <i class="fa fa-fw fa-6x fa-circle text-<?php echo $color; ?>"></i>
+                                        <br>
+                                        <?php echo $color; ?>
+                                    </label>
+                                </div>
                             </div>
                         </div>
 
diff --git a/settings_ticket.php b/settings_ticket.php
index 06b61e7d..5049255a 100644
--- a/settings_ticket.php
+++ b/settings_ticket.php
@@ -47,15 +47,18 @@
                     </div>
                 </div>
 
-
-                <div class="custom-control custom-switch mb-2">
-                    <input type="checkbox" class="custom-control-input" name="config_ticket_email_parse" <?php if($config_ticket_email_parse == 1){ echo "checked"; } ?> value="1" id="customSwitch1">
-                    <label class="custom-control-label" for="customSwitch1">Email-to-ticket parsing (Beta) <small>(cron_ticket_email_parser.php must also be added to cron and run every few mins)</small></label>
+                <div class="form-group">
+                    <div class="custom-control custom-switch">
+                        <input type="checkbox" class="custom-control-input" name="config_ticket_email_parse" <?php if($config_ticket_email_parse == 1){ echo "checked"; } ?> value="1" id="emailToTicketParseSwitch">
+                        <label class="custom-control-label" for="emailToTicketParseSwitch">Email-to-ticket parsing (Beta) <small>(cron_ticket_email_parser.php must also be added to cron and run every few mins)</small></label>
+                    </div>
                 </div>
 
-                <div class="custom-control custom-switch mb-2">
-                    <input type="checkbox" class="custom-control-input" name="config_ticket_client_general_notifications" <?php if($config_ticket_client_general_notifications == 1){ echo "checked"; } ?> value="1" id="customSwitch2">
-                    <label class="custom-control-label" for="customSwitch2">Send clients general notification emails <small>(Should clients receive automatic emails when tickets are raised/closed?)</small></label>
+                <div class="form-group">
+                    <div class="custom-control custom-switch">
+                        <input type="checkbox" class="custom-control-input" name="config_ticket_client_general_notifications" <?php if($config_ticket_client_general_notifications == 1){ echo "checked"; } ?> value="1" id="ticketNotificationSwitch">
+                        <label class="custom-control-label" for="ticketNotificationSwitch">Send clients general notification emails <small>(Should clients receive automatic emails when tickets are raised/closed?)</small></label>
+                    </div>
                 </div>
 
                 <hr>
diff --git a/user_add_modal.php b/user_add_modal.php
index 53edf47a..860f27b1 100644
--- a/user_add_modal.php
+++ b/user_add_modal.php
@@ -91,9 +91,13 @@
             <input type="file" class="form-control-file" accept="image/*;capture=camera" name="file">
           </div>
 
-          <div class="form-check">
-            <input type="checkbox" class="form-check-input" name="send_email" value="" checked/>
-            <label class="form-check-label">Send user e-mail with login details?</label>
+          <div class="form-group">
+            <div class="custom-control custom-checkbox">
+              <input class="custom-control-input" type="checkbox" id="sendEmailCheckBox" name="send_email" value="" checked>
+              <label for="sendEmailCheckBox" class="custom-control-label">
+                Send user e-mail with login details?
+              </label>
+            </div>
           </div>
 
         </div>