diff --git a/add_asset_modal.php b/add_asset_modal.php
index da204b71..54085d86 100644
--- a/add_asset_modal.php
+++ b/add_asset_modal.php
@@ -45,7 +45,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" name="type" required>
+                  <select class="form-control selectpicker show-tick" data-live-search="true" name="type" required>
                     <option value="">- Type -</option>
                     <?php foreach($asset_types_array as $asset_type) { ?>
                     <option><?php echo $asset_type; ?></option>
@@ -93,7 +93,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                   </div>
-                  <select class="form-control" name="location">
+                  <select class="form-control selectpicker show-tick" data-live-search="true" name="location">
                     <option value="">- Location -</option>
                     <?php 
                     
@@ -117,7 +117,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                   </div>
-                  <select class="form-control" name="contact">
+                  <select class="form-control selectpicker show-tick" data-live-search="true" name="contact">
                     <option value="">- Contact -</option>
                     <?php 
                     
@@ -145,7 +145,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
                   </div>
-                  <select class="form-control" name="vendor">
+                  <select class="form-control selectpicker show-tick" data-live-search="true" name="vendor">
                     <option value="">- Vendor -</option>
                     <?php 
                     
diff --git a/add_calendar_event_modal.php b/add_calendar_event_modal.php
index 4e8e6815..681b58aa 100644
--- a/add_calendar_event_modal.php
+++ b/add_calendar_event_modal.php
@@ -24,7 +24,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
               </div>
-              <select class="form-control" name="calendar" required>
+              <select class="form-control selectpicker show-tick" name="calendar" required>
                 <option value="">- Calendar -</option>
                 <?php 
                 
@@ -32,8 +32,9 @@
                 while($row = mysqli_fetch_array($sql)){
                   $calendar_id = $row['calendar_id'];
                   $calendar_name = $row['calendar_name'];
+                  $calendar_color = $row['calendar_color'];
                 ?>
-                  <option value="<?php echo $calendar_id; ?>"><?php echo $calendar_name; ?></option>
+                  <option data-content="<i class='fa fa-circle mr-2' style='color:<?php echo $calendar_color; ?>;'></i> value="<?php echo $calendar_id; ?> ><?php echo $calendar_name; ?></option>
                 
                 <?php
                 }
diff --git a/add_category_modal.php b/add_category_modal.php
index aad6d29e..e53d82da 100644
--- a/add_category_modal.php
+++ b/add_category_modal.php
@@ -15,7 +15,7 @@
           </div>
           <div class="form-group">
             <label>Type</label>
-            <select class="form-control" name="type" required>
+            <select class="form-control selectpicker" name="type" required>
               <option value="">- Type -</option>
               <?php foreach($category_types_array as $category_type) { ?>
               <option><?php echo $category_type; ?></option>
diff --git a/add_client_modal.php b/add_client_modal.php
index a1c02e2f..c787fb8e 100644
--- a/add_client_modal.php
+++ b/add_client_modal.php
@@ -47,7 +47,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
                   </div>
-                  <select class="form-control" name="type" required>
+                  <select class="form-control selectpicker show-tick" data-live-search="true" name="type" required>
                     <option value="">- Type -</option>
                     <?php foreach($client_types_array as $client_type) { ?>
                     <option><?php echo $client_type; ?></option>
@@ -86,7 +86,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
                   </div>
-                  <select class="form-control" name="state">
+                  <select class="form-control selectpicker show-tick" data-live-search="true" name="state">
                     <option value="">- State -</option>
                     <?php foreach($states_array as $state_abbr => $state_name) { ?>
                     <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
@@ -159,7 +159,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                   </div>
-                  <select class="form-control" name="net_terms">
+                  <select class="form-control selectpicker show-tick" name="net_terms">
                     <option value="">- Net Terms -</option>
                     <?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
                     <option value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
diff --git a/add_domain_modal.php b/add_domain_modal.php
index d68ba880..141be2e2 100644
--- a/add_domain_modal.php
+++ b/add_domain_modal.php
@@ -26,7 +26,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
               </div>
-              <select class="form-control" name="registrar">
+              <select class="form-control selectpicker show-tick" data-live-search="true" name="registrar">
                 <option value="">- Vendor -</option>
                 <?php 
                 
@@ -50,7 +50,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
               </div>
-              <select class="form-control" name="webhost">
+              <select class="form-control selectpicker show-tick" data-live-search="true" name="webhost">
                 <option value="">- Vendor -</option>
                 <?php 
                 
diff --git a/add_expense_copy_modal.php b/add_expense_copy_modal.php
index 46114692..2ef3c425 100644
--- a/add_expense_copy_modal.php
+++ b/add_expense_copy_modal.php
@@ -34,7 +34,7 @@
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
                 </div>
-                <select class="form-control" name="account" required>
+                <select class="form-control selectpicker show-tick" name="account" required>
                   <?php 
                   
                   $sql2 = mysqli_query($mysqli,"SELECT * FROM accounts"); 
@@ -69,7 +69,7 @@
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
                 </div>
-                <select class="form-control" name="vendor" required>
+                <select class="form-control selectpicker show-tick" data-live-search="true" name="vendor" required>
                   <?php 
                   
                   $sql2 = mysqli_query($mysqli,"SELECT * FROM vendors"); 
@@ -91,7 +91,7 @@
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
                 </div>
-                <select class="form-control" name="category" required>
+                <select class="form-control selectpicker show-tick" name="category" required>
                   <?php 
                   
                   $sql2 = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense'"); 
diff --git a/add_expense_modal.php b/add_expense_modal.php
index 4e9fe367..9e8e0759 100644
--- a/add_expense_modal.php
+++ b/add_expense_modal.php
@@ -34,7 +34,7 @@
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
                 </div>
-                <select class="form-control" name="account" required>
+                <select class="form-control selectpicker show-tick" name="account" required>
                   <option value="">- Account -</option>
                   <?php 
                   
@@ -71,7 +71,7 @@
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
                 </div>
-                <select class="form-control" name="vendor" required>
+                <select class="form-control selectpicker show-tick" data-live-search="true" name="vendor" required>
                   <option value="">- Vendor -</option>
                   <?php 
                   
@@ -94,7 +94,7 @@
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
                 </div>
-                <select class="form-control" name="category" required>
+                <select class="form-control selectpicker show-tick" name="category" required>
                   <option value="">- Category -</option>
                   <?php 
                   
diff --git a/add_invoice_modal.php b/add_invoice_modal.php
index 746f8fdf..f70f4749 100644
--- a/add_invoice_modal.php
+++ b/add_invoice_modal.php
@@ -21,7 +21,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
               </div>
-              <select class="form-control" name="client" required <?php if(isset($_GET['client_id'])){ echo "disabled"; } ?>>
+              <select class="form-control selectpicker show-tick" data-live-search="true" name="client" required <?php if(isset($_GET['client_id'])){ echo "disabled"; } ?>>
                 <option value="">- Client -</option>
                 <?php 
                 
@@ -55,7 +55,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
               </div>
-              <select class="form-control" name="category" required>
+              <select class="form-control selectpicker show-tick" name="category" required>
                 <option value="">- Category -</option>
                 <?php 
                 
diff --git a/add_invoice_recurring_modal.php b/add_invoice_recurring_modal.php
index 91e7f6b1..fc895a38 100644
--- a/add_invoice_recurring_modal.php
+++ b/add_invoice_recurring_modal.php
@@ -17,7 +17,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
               </div>
-              <select class="form-control" name="frequency" required>
+              <select class="form-control selectpicker show-tick" name="frequency" required>
                 <option value="">- Frequency -</option>
                 <option value="week">Weekly</option>
                 <option value="month">Monthly</option>
diff --git a/add_location_modal.php b/add_location_modal.php
index 5e1bb368..d86d2ca0 100644
--- a/add_location_modal.php
+++ b/add_location_modal.php
@@ -45,7 +45,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
               </div>
-              <select class="form-control" name="state" required>
+              <select class="form-control selectpicker show-tick" data-live-search="true" name="state" required>
                 <option value="">- State -</option>
                 <?php foreach($states_array as $state_abbr => $state_name) { ?>
                 <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
diff --git a/add_payment_modal.php b/add_payment_modal.php
index 18110143..178e248d 100644
--- a/add_payment_modal.php
+++ b/add_payment_modal.php
@@ -38,7 +38,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
               </div> 
-              <select class="form-control" name="account" required>
+              <select class="form-control selectpicker show-tick" name="account" required>
                 <option value="">- Account -</option>
                 <?php 
                 
@@ -74,7 +74,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-money-check-alt"></i></span>
               </div> 
-              <select class="form-control" name="payment_method" required>
+              <select class="form-control selectpicker show-tick" name="payment_method" required>
                 <option value="">- Method of Payment -</option>
                 <?php 
                 
diff --git a/add_quote_modal.php b/add_quote_modal.php
index ddc22abb..e7c4f7df 100644
--- a/add_quote_modal.php
+++ b/add_quote_modal.php
@@ -19,7 +19,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
               </div>
-              <select class="form-control" name="client" required <?php if(isset($_GET['client_id'])){ echo "disabled"; } ?>>
+              <select class="form-control selectpicker show-tick" data-live-search="true" name="client" required <?php if(isset($_GET['client_id'])){ echo "disabled"; } ?>>
                 <option value="">- Client -</option>
                 <?php 
                 
@@ -52,7 +52,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
               </div>
-              <select class="form-control" name="category" required>
+              <select class="form-control selectpicker show-tick" name="category" required>
                 <option value="">- Category -</option>
                 <?php 
                 
diff --git a/add_recurring_modal.php b/add_recurring_modal.php
index f30f26e9..25fb5690 100644
--- a/add_recurring_modal.php
+++ b/add_recurring_modal.php
@@ -20,7 +20,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
               </div>
-              <select class="form-control" name="client" required <?php if(isset($_GET['client_id'])){ echo "disabled"; } ?>>
+              <select class="form-control selectpicker show-tick" data-live-search="true" name="client" required <?php if(isset($_GET['client_id'])){ echo "disabled"; } ?>>
                 <option value="">- Client -</option>
                 <?php 
                 
@@ -54,7 +54,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
               </div>
-              <select class="form-control" name="frequency" required>
+              <select class="form-control selectpicker show-tick" name="frequency" required>
                 <option value="">- Frequency -</option>
                 <option value="week">Weekly</option>
                 <option value="month">Monthly</option>
@@ -70,7 +70,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
               </div>
-              <select class="form-control" name="category" required>
+              <select class="form-control selectpicker show-tick" name="category" required>
                 <option value="">- Category -</option>
                 <?php 
                 
diff --git a/add_software_modal.php b/add_software_modal.php
index 601cd598..a7c98599 100644
--- a/add_software_modal.php
+++ b/add_software_modal.php
@@ -27,7 +27,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-tag"></i></span>
               </div>
-              <select class="form-control" name="type" required>
+              <select class="form-control selectpicker show-tick" name="type" required>
                 <option value="">- Type -</option>
                 <?php foreach($software_types_array as $software_type) { ?>
                 <option><?php echo $software_type; ?></option>
diff --git a/add_ticket_modal.php b/add_ticket_modal.php
index afb05222..36e0b407 100644
--- a/add_ticket_modal.php
+++ b/add_ticket_modal.php
@@ -16,7 +16,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
               </div>
-              <select class="form-control" id="selectIt" name="client" required <?php if(isset($_GET['client_id'])){ echo "disabled"; } ?>>
+              <select class="form-control selectpicker show-tick" data-live-search="true" name="client" required <?php if(isset($_GET['client_id'])){ echo "disabled"; } ?>>
                 <option value="">- Client -</option>
                 <?php 
                 
diff --git a/add_transfer_modal.php b/add_transfer_modal.php
index e801e37c..4120480c 100644
--- a/add_transfer_modal.php
+++ b/add_transfer_modal.php
@@ -36,7 +36,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
               </div> 
-              <select class="form-control" name="account_from" required>
+              <select class="form-control selectpicker show-tick" name="account_from" required>
                 <option value="">- Account From -</option>
                 <?php 
                 
@@ -70,7 +70,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-arrow-right"></i></span>
               </div>
-              <select class="form-control" name="account_to" required>
+              <select class="form-control selectpicker show-tick" name="account_to" required>
                 <option value="">- Account To -</option>
                 <?php 
                 
diff --git a/add_trip_modal.php b/add_trip_modal.php
index 04008adf..621f7fd3 100644
--- a/add_trip_modal.php
+++ b/add_trip_modal.php
@@ -81,7 +81,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
                   </div>
-                  <select class="form-control" id="selectIt" name="invoice">
+                  <select class="form-control selectpicker show-tick" data-live-search="true" name="invoice">
                     <option value="">- Invoice -</option>
                     <?php 
                     
@@ -109,7 +109,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                   </div>
-                  <select class="form-control" id="selectIt" name="client">
+                  <select class="form-control selectpicker show-tick" data-live-search="true" name="client">
                     <option value="">- Client -</option>
                     <?php 
                     
@@ -133,7 +133,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                   </div>
-                  <select class="form-control" name="location">
+                  <select class="form-control selectpicker show-tick" data-live-search="true" name="location">
                     <option value="">- Location -</option>
                     <?php 
                     
@@ -158,7 +158,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
                   </div>
-                  <select class="form-control" name="vendor">
+                  <select class="form-control selectpicker show-tick" data-live-search="true" name="vendor">
                     <option value="">- Vendor -</option>
                     <?php 
                     
diff --git a/add_user_modal.php b/add_user_modal.php
index 17dcfa00..b7c46760 100644
--- a/add_user_modal.php
+++ b/add_user_modal.php
@@ -16,7 +16,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
               </div>
-              <select class="form-control" name="client">
+              <select class="form-control selectpicker show-tick" data-live-search="true" name="client">
                 <option value="0">No Client Assignment</option>
                 <?php 
                 
diff --git a/add_vendor_modal.php b/add_vendor_modal.php
index e42daf55..56dba051 100644
--- a/add_vendor_modal.php
+++ b/add_vendor_modal.php
@@ -89,7 +89,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
                   </div>
-                  <select class="form-control" name="state">
+                  <select class="form-control selectpicker show-tick" data-live-search="true" name="state">
                     <option value="">- State -</option>
                     <?php foreach($states_array as $state_abbr => $state_name) { ?>
                     <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
diff --git a/dashboard.php b/dashboard.php
index e7953cc0..fc95f919 100644
--- a/dashboard.php
+++ b/dashboard.php
@@ -53,7 +53,7 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
 ?>
 
 <form>
-  <select onchange="this.form.submit()" class="form-control mb-3" name="year">
+  <select onchange="this.form.submit()" class="form-control selectpicker mb-3" name="year">
     <?php 
             
     while($row = mysqli_fetch_array($sql_payment_years)){
diff --git a/edit_category_modal.php b/edit_category_modal.php
index 89576c08..7d518939 100644
--- a/edit_category_modal.php
+++ b/edit_category_modal.php
@@ -16,7 +16,7 @@
           </div>
           <div class="form-group">
             <label>Type</label>
-            <select class="form-control" name="type" required>
+            <select class="form-control selectpicker" name="type" required>
               <?php foreach($category_types_array as $category_type_select) { ?>
               <option <?php if($category_type == $category_type_select) { echo "selected"; } ?>><?php echo $category_type_select; ?></option>
               <?php } ?>
diff --git a/edit_client_modal.php b/edit_client_modal.php
index ccb9b1a7..7fcad71a 100644
--- a/edit_client_modal.php
+++ b/edit_client_modal.php
@@ -48,10 +48,14 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
                   </div>
-                  <select class="form-control" name="type" required>
-                    <option value="">- Type -</option>
+                  <select class="form-control" name="type">
+                  
                     <?php foreach($client_types_array as $client_type_select) { ?>
-                    <option <?php if($client_type_select == $client_type) { echo "selected"; } ?>><?php echo $client_type_select; ?></option>
+                    <option 
+                      value="<?php echo $client_type_select; ?>"
+                      <?php if($client_type_select == $client_type) { echo "selected"; } ?> >
+                      <?php echo $client_type_select; ?>  
+                    </option>
                     <?php } ?>
                   </select> 
                 </div>
@@ -87,7 +91,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
                   </div>
-                  <select class="form-control" name="state">
+                  <select class="form-control" data-live-search="true" name="state">
                     <option value="">- State -</option>
                     <?php foreach($states_array as $state_abbr => $state_name) { ?>
                     <option <?php if($client_state == $state_abbr) { echo "selected"; } ?> value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
diff --git a/post.php b/post.php
index 18aceb72..fb3ed07d 100644
--- a/post.php
+++ b/post.php
@@ -267,7 +267,7 @@ if(isset($_POST['edit_client'])){
 
     mysqli_query($mysqli,"UPDATE clients SET client_name = '$name', client_type = '$type', client_address = '$address', client_city = '$city', client_state = '$state', client_zip = '$zip', client_phone = '$phone', client_email = '$email', client_website = '$website', client_net_terms = $net_terms, client_updated_at = NOW() WHERE client_id = $client_id");
 
-    $_SESSION['alert_message'] = "Client updated";
+    $_SESSION['alert_message'] = "Client updated type: $type - name: $name";
     
     header("Location: " . $_SERVER["HTTP_REFERER"]);