diff --git a/add_calendar_event_modal.php b/add_calendar_event_modal.php
index b5068a59..221b1941 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 selectpicker show-tick" name="calendar" required>
+              <select class="form-control select2" name="calendar" required>
                 <option value="">- Calendar -</option>
                 <?php 
                 
@@ -69,7 +69,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 selectpicker show-tick" data-live-search="true" name="client">
+              <select class="form-control select2" name="client">
                 <option value="">- Client -</option>
                 <?php 
                 
diff --git a/add_category_modal.php b/add_category_modal.php
index aa6aa93e..955e4fe7 100644
--- a/add_category_modal.php
+++ b/add_category_modal.php
@@ -15,7 +15,7 @@
           </div>
           <div class="form-group">
             <label>Type <strong class="text-danger">*</strong></label>
-            <select class="form-control selectpicker" name="type" required>
+            <select class="form-control select2" 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 0b48a1f7..bfb0d312 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 selectpicker show-tick" data-live-search="true" name="type" required>
+                  <select class="form-control select2" 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 selectpicker show-tick" data-live-search="true" name="state">
+                  <select class="form-control select2" 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>
@@ -179,7 +179,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 selectpicker show-tick" name="net_terms">
+                  <select class="form-control select2" name="net_terms">
                     <?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
                     <option <?php if($config_default_net_terms == $net_term_value){ echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
                     <?php } ?>
diff --git a/add_company_modal.php b/add_company_modal.php
index 01a58437..eda1d4e7 100644
--- a/add_company_modal.php
+++ b/add_company_modal.php
@@ -46,7 +46,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 selectpicker show-tick" data-live-search="true" name="state">
+              <select class="form-control select2" name="state">
                 <option value="">Select a 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_expense_copy_modal.php b/add_expense_copy_modal.php
index cc688906..f8dbcb1a 100644
--- a/add_expense_copy_modal.php
+++ b/add_expense_copy_modal.php
@@ -41,7 +41,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 selectpicker show-tick" name="account" required>
+                <select class="form-control select2" name="account" required>
                   <?php 
                   
                   $sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts WHERE company_id = $session_company_id"); 
@@ -79,7 +79,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 selectpicker show-tick" data-live-search="true" name="vendor" required>
+                <select class="form-control select2" name="vendor" required>
                   <?php 
                   
                   $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE company_id = $session_company_id"); 
@@ -111,7 +111,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 selectpicker show-tick" name="category" required>
+                <select class="form-control select2" name="category" required>
                   <?php 
                   
                   $sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense' AND company_id = $session_company_id"); 
diff --git a/add_expense_modal.php b/add_expense_modal.php
index ecde9d80..4c03e55d 100644
--- a/add_expense_modal.php
+++ b/add_expense_modal.php
@@ -39,7 +39,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 selectpicker show-tick" name="account" required>
+                <select class="form-control select2" name="account" required>
                   <option value="">- Account -</option>
                   <?php 
                   
@@ -79,7 +79,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 selectpicker show-tick" data-live-search="true" name="vendor" required>
+                <select class="form-control select2" name="vendor" required>
                   <option value="">- Vendor -</option>
                   <?php 
                   
@@ -111,7 +111,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 selectpicker show-tick" name="category" required>
+                <select class="form-control select2" name="category" required>
                   <option value="">- Category -</option>
                   <?php 
                   
diff --git a/add_invoice_modal.php b/add_invoice_modal.php
index 64476e34..eb7b19dc 100644
--- a/add_invoice_modal.php
+++ b/add_invoice_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 selectpicker show-tick" data-live-search="true" name="client" required>
+              <select class="form-control select2" name="client" required>
                 <option value="">- Client -</option>
                 <?php 
                 
@@ -66,7 +66,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 selectpicker show-tick" name="category" required>
+              <select class="form-control select2" name="category" required>
                 <option value="">- Category -</option>
                 <?php 
                 
diff --git a/add_invoice_recurring_modal.php b/add_invoice_recurring_modal.php
index e7a09515..08b6003a 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 selectpicker show-tick" name="frequency" required>
+              <select class="form-control select2" 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 211f8cc7..2af0a775 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 selectpicker show-tick" data-live-search="true" name="state" required>
+              <select class="form-control select2" 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_note_modal.php b/add_note_modal.php
index 6658b4ea..b09fbed6 100644
--- a/add_note_modal.php
+++ b/add_note_modal.php
@@ -16,7 +16,7 @@
           </div>
           <div class="form-group">
             <label>Note <strong class="text-danger">*</strong></label>
-            <textarea rows="8" class="form-control" name="note" id="addClientNote"></textarea>
+            <textarea class="form-control summernote" name="note" id="addClientNote"></textarea>
           </div>
         </div>
         <div class="modal-footer bg-white">
diff --git a/add_product_modal.php b/add_product_modal.php
index 2d10f10a..1ec697ca 100644
--- a/add_product_modal.php
+++ b/add_product_modal.php
@@ -20,7 +20,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 selectpicker show-tick" name="category" required>
+              <select class="form-control select2" name="category" required>
                 <option value="">- Category -</option>
                 <?php 
                 
diff --git a/add_quote_modal.php b/add_quote_modal.php
index f4bcb743..d6c32c35 100644
--- a/add_quote_modal.php
+++ b/add_quote_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 selectpicker show-tick" data-live-search="true" name="client" required>
+              <select class="form-control select2" name="client" required>
                 <option value="">- Client -</option>
                 <?php 
                 
@@ -56,7 +56,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 selectpicker show-tick" name="category" required>
+              <select class="form-control select2" name="category" required>
                 <option value="">- Category -</option>
                 <?php 
                 
diff --git a/add_recurring_modal.php b/add_recurring_modal.php
index 17f3b320..a67c4b0b 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 selectpicker show-tick" data-live-search="true" name="client" required>
+              <select class="form-control select2" name="client" required>
                 <option value="">- Client -</option>
                 <?php 
                 
@@ -56,7 +56,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 selectpicker show-tick" name="frequency" required>
+              <select class="form-control select2" name="frequency" required>
                 <option value="">- Frequency -</option>
                 <option value="week">Weekly</option>
                 <option value="month">Monthly</option>
@@ -72,7 +72,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 selectpicker show-tick" name="category" required>
+              <select class="form-control select2" name="category" required>
                 <option value="">- Category -</option>
                 <?php 
                 
diff --git a/add_revenue_modal.php b/add_revenue_modal.php
index 288e2135..5186f96d 100644
--- a/add_revenue_modal.php
+++ b/add_revenue_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 selectpicker show-tick" name="account" required>
+              <select class="form-control select2" name="account" required>
                 <option value="">- Account -</option>
                 <?php 
                 
@@ -76,7 +76,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 selectpicker show-tick" name="category" required>
+              <select class="form-control select2" name="category" required>
                 <option value="">- Category -</option>
                 <?php 
                 
@@ -100,7 +100,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 selectpicker show-tick" name="payment_method" required>
+              <select class="form-control select2" name="payment_method" required>
                 <option value="">- Method of Payment -</option>
                 <?php 
                 
diff --git a/add_ticket_modal.php b/add_ticket_modal.php
index 9491630e..cda2e689 100644
--- a/add_ticket_modal.php
+++ b/add_ticket_modal.php
@@ -18,7 +18,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 selectpicker show-tick" data-live-search="true" name="client" required>
+              <select class="form-control select2" name="client" required>
                 <option value="">- Client -</option>
                 <?php 
                 
diff --git a/add_transfer_modal.php b/add_transfer_modal.php
index 0f251953..d0ff4b91 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 selectpicker show-tick" name="account_from" required>
+              <select class="form-control select2" name="account_from" required>
                 <option value="">- Account From -</option>
                 <?php 
                 
@@ -74,7 +74,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 selectpicker show-tick" name="account_to" required>
+              <select class="form-control select2" name="account_to" required>
                 <option value="">- Account To -</option>
                 <?php 
                 
diff --git a/add_trip_copy_modal.php b/add_trip_copy_modal.php
index 9a78223a..ce22f09a 100644
--- a/add_trip_copy_modal.php
+++ b/add_trip_copy_modal.php
@@ -88,7 +88,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 selectpicker show-tick" data-live-search="true" name="invoice">
+                  <select class="form-control select2" name="invoice">
                     <option value="">- Invoice -</option>
                     <?php 
                     
@@ -116,7 +116,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 selectpicker show-tick" data-live-search="true" name="client">
+                  <select class="form-control select2" name="client">
                     <option value="">- Client -</option>
                     <?php 
                     
@@ -140,7 +140,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 selectpicker show-tick" data-live-search="true" name="location">
+                  <select class="form-control select2" name="location">
                     <option value="">- Location -</option>
                     <?php 
                     
@@ -165,7 +165,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 selectpicker show-tick" data-live-search="true" name="vendor">
+                  <select class="form-control select2" name="vendor">
                     <option value="">- Vendor -</option>
                     <?php 
                     
diff --git a/add_trip_modal.php b/add_trip_modal.php
index 8be9be58..41f2fd1b 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 selectpicker show-tick" data-live-search="true" name="invoice">
+                  <select class="form-control select2" 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 selectpicker show-tick" data-live-search="true" name="client">
+                  <select class="form-control select2" 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 selectpicker show-tick" data-live-search="true" name="location">
+                  <select class="form-control select2" 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 selectpicker show-tick" data-live-search="true" name="vendor">
+                  <select class="form-control select2" name="vendor">
                     <option value="">- Vendor -</option>
                     <?php 
                     
diff --git a/add_user_modal.php b/add_user_modal.php
index d6c19e88..eb3a1d33 100644
--- a/add_user_modal.php
+++ b/add_user_modal.php
@@ -86,7 +86,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 selectpicker show-tick" data-live-search="true" name="client">
+                  <select class="form-control select2" name="client">
                     <option value="0">No Client Assignment</option>
                     <?php 
                     
diff --git a/add_vendor_modal.php b/add_vendor_modal.php
index 0faa0945..80ed81a6 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 selectpicker show-tick" data-live-search="true" name="state">
+                  <select class="form-control select2" 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/clients.php b/clients.php
index 62e3779e..55e5ac42 100644
--- a/clients.php
+++ b/clients.php
@@ -58,38 +58,42 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 ?>
 
+<section class="content-header">
+      <div class="container-fluid">
+        <div class="row mb-2">
+          <div class="col-sm-6">
+            <h1>Clients</h1>
+          </div>
+          <div class="col-sm-6">
+            <button class="btn btn-primary float-right">Add</button>
+          </div>
+        </div>
+      </div><!-- /.container-fluid -->
+    </section>
+
 <div class="card">
   <div class="card-header">
-    <h3 class="card-title">Simple Full Width Table</h3>
-
-    <div class="card-tools">
-      <ul class="pagination pagination-sm float-right">
-        <li class="page-item"><a class="page-link" href="#">&laquo;</a></li>
-        <li class="page-item"><a class="page-link" href="#">1</a></li>
-        <li class="page-item"><a class="page-link" href="#">2</a></li>
-        <li class="page-item"><a class="page-link" href="#">3</a></li>
-        <li class="page-item"><a class="page-link" href="#">&raquo;</a></li>
-      </ul>
-    </div>
-  </div>
-  <div class="card-header bg-gray-dark border-0">
-    <h3 class="card-title">Clients</h3>
     <div class="card-tools">   
-      <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#addClientModal">add</button>
+      <form class="form-inline" autocomplete="off">
+        <div class="input-group">
+          <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Clients">
+          <div class="input-group-append">
+            <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+          </div>
+        </div>
+        
+          <select class="form-control" name="type">
+            <option>Poop</option>
+            <option>soup</option>
+          </select>
+          
+       
+      </form>
     </div>   
   </div>
   <div class="card-body p-0">
-    <form class="p-3 bg-light" autocomplete="off">
-      <div class="input-group">
-        <input type="search" class="form-control col-md-4" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Clients">
-        <div class="input-group-append">
-          <button class="btn btn-primary"><i class="fa fa-search"></i></button>
-        </div>
-      </div>
-    </form>
-   
     <div class="table-responsive">
-      <table class="table table-striped table-borderless table-hover">
+      <table class="table table-hover">
         <thead class="<?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Name <i class="fa fa-sort-alpha<?php if($disp=='ASC'){ echo "-up"; }else{ echo "-down"; }?>"></i></a></th>
@@ -205,9 +209,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
         </tbody>
       </table>
-
-      <?php include("pagination.php"); ?>
-
+      <div class="mr-3">
+        <?php include("pagination.php"); ?>
+      </div>
     </div>
   </div>
 </div>
diff --git a/dashboard.php b/dashboard.php
index 27bb1959..be3374e8 100644
--- a/dashboard.php
+++ b/dashboard.php
@@ -83,8 +83,8 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
 
 ?>
 
-<form>
-  <select onchange="this.form.submit()" class="form-control selectpicker mb-3" name="year">
+<form class="mb-3">
+  <select onchange="this.form.submit()" class="form-control" name="year">
     <?php 
             
     while($row = mysqli_fetch_array($sql_payment_years)){
@@ -99,6 +99,7 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
   </select>
 </form>
 
+
 <!-- Icon Cards-->
 <div class="row">
   <div class="col-lg-3 col-6">
diff --git a/edit_calendar_event_modal.php b/edit_calendar_event_modal.php
index c2306bfd..3a458f10 100644
--- a/edit_calendar_event_modal.php
+++ b/edit_calendar_event_modal.php
@@ -26,7 +26,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-calendar"></i></span>
               </div>
-              <select class="form-control selectpicker show-tick" name="calendar" required>
+              <select class="form-control select2" name="calendar" required>
                 <?php 
                 
                 $sql_calendars_select = mysqli_query($mysqli,"SELECT * FROM calendars WHERE company_id = $session_company_id"); 
@@ -68,7 +68,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 selectpicker show-tick" data-live-search="true" name="client">
+              <select class="form-control select2" name="client">
                 <option value="">- Client -</option>
                 <?php 
                 
diff --git a/edit_category_modal.php b/edit_category_modal.php
index 40b50bfd..57c7925c 100644
--- a/edit_category_modal.php
+++ b/edit_category_modal.php
@@ -16,7 +16,7 @@
           </div>
           <div class="form-group">
             <label>Type <strong class="text-danger">*</strong></label>
-            <select class="form-control selectpicker show-tick" name="type" required>
+            <select class="form-control select2" 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 ebbf8a5c..82970936 100644
--- a/edit_client_modal.php
+++ b/edit_client_modal.php
@@ -48,7 +48,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 selectpicker show-tick" data-live-search="true" name="type">
+                  <select class="form-control select2" name="type">
                   
                     <?php foreach($client_types_array as $client_type_select) { ?>
                     <option 
@@ -91,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 selectpicker show-tick" data-live-search="true" name="state">
+                  <select class="form-control select2" 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>
@@ -184,7 +184,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 selectpicker show-tick" name="net_terms">
+                  <select class="form-control select2" name="net_terms">
                     <option value="">- Net Terms -</option>
                     <?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
                     <option <?php if($net_term_value == $client_net_terms) { echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
diff --git a/edit_company_modal.php b/edit_company_modal.php
index df3ce15d..811b42ee 100644
--- a/edit_company_modal.php
+++ b/edit_company_modal.php
@@ -47,7 +47,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 selectpicker show-tick" data-live-search="true" name="state">
+              <select class="form-control select2" name="state">
                 <option value="">- State -</option>
                 <?php foreach($states_array as $state_abbr => $state_name) { ?>
                 <option <?php if($company_state == $state_abbr) { echo "selected"; } ?> value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
diff --git a/edit_expense_modal.php b/edit_expense_modal.php
index d5740d66..60a5044d 100644
--- a/edit_expense_modal.php
+++ b/edit_expense_modal.php
@@ -43,7 +43,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 selectpicker show-tick" name="account" required>
+                <select class="form-control select2" name="account" required>
                   <?php 
                   
                   $sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts WHERE company_id = $session_company_id"); 
@@ -82,7 +82,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 selectpicker show-tick" data-live-search="true" name="vendor" required>
+                <select class="form-control select2" name="vendor" required>
                   <?php 
                   
                   $sql_select = mysqli_query($mysqli,"SELECT * FROM vendors WHERE client_id = 0 AND company_id = $session_company_id ORDER BY vendor_name ASC"); 
@@ -114,7 +114,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 selectpicker show-tick" name="category" required>
+                <select class="form-control select2" name="category" required>
                   <?php 
                   
                   $sql_select = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense' AND company_id = $session_company_id"); 
diff --git a/edit_invoice_modal.php b/edit_invoice_modal.php
index 3049e610..b3e9002d 100644
--- a/edit_invoice_modal.php
+++ b/edit_invoice_modal.php
@@ -38,7 +38,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 selectpicker show-tick" name="category" required>
+              <select class="form-control select2" name="category" required>
                 <option value="">- Category -</option>
                 <?php 
                 
diff --git a/edit_location_modal.php b/edit_location_modal.php
index 0c56c40a..16abf02f 100644
--- a/edit_location_modal.php
+++ b/edit_location_modal.php
@@ -44,7 +44,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 selectpicker show-tick" data-live-search="true" name="state" required>
+              <select class="form-control select2" name="state" required>
                   <?php foreach($states_array as $state_abbr => $state_name) { ?>
                   <option <?php if($location_state == $state_abbr) { echo "selected"; } ?> value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
                   <?php } ?>
diff --git a/edit_note_modal.php b/edit_note_modal.php
index 6ff51453..4d66c2dd 100644
--- a/edit_note_modal.php
+++ b/edit_note_modal.php
@@ -16,7 +16,7 @@
           </div>
           <div class="form-group">
             <label>Note <strong class="text-danger">*</strong></label>
-            <textarea rows="8" class="form-control" id="editClientNote" name="note"><?php echo $note_body; ?></textarea>
+            <textarea class="form-control summernote" name="note"><?php echo $note_body; ?></textarea>
           </div>
         </div>
         <div class="modal-footer bg-white">
diff --git a/edit_product_modal.php b/edit_product_modal.php
index e2165454..06c8cc37 100644
--- a/edit_product_modal.php
+++ b/edit_product_modal.php
@@ -21,7 +21,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 selectpicker show-tick" name="category" required>
+              <select class="form-control select2" name="category" required>
                 <?php 
                 
                 $sql_select = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Income' AND company_id = $session_company_id"); 
diff --git a/edit_revenue_modal.php b/edit_revenue_modal.php
index 536f3005..237ec72d 100644
--- a/edit_revenue_modal.php
+++ b/edit_revenue_modal.php
@@ -37,7 +37,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 selectpicker show-tick" name="account" required>
+              <select class="form-control select2" name="account" required>
                 <option value="">- Account -</option>
                 <?php 
                 
@@ -77,7 +77,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 selectpicker show-tick" name="payment_method" required>
+              <select class="form-control select2" name="payment_method" required>
                 <option value="">- Method of Payment -</option>
                 <?php 
                 
diff --git a/edit_transfer_modal.php b/edit_transfer_modal.php
index 8b0a1b91..66951846 100644
--- a/edit_transfer_modal.php
+++ b/edit_transfer_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 selectpicker show-tick" name="account_from" required>
+              <select class="form-control select2" name="account_from" required>
                 <?php 
                 
                 $sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts WHERE company_id = $session_company_id"); 
@@ -75,7 +75,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 selectpicker show-tick" name="account_to" required>
+              <select class="form-control select2" name="account_to" required>
                 <?php 
                 
                 $sql2 = mysqli_query($mysqli,"SELECT * FROM accounts WHERE company_id = $session_company_id"); 
diff --git a/edit_trip_modal.php b/edit_trip_modal.php
index 6a4f8182..9ea2f213 100644
--- a/edit_trip_modal.php
+++ b/edit_trip_modal.php
@@ -89,7 +89,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 selectpicker show-tick" data-live-search="true" name="invoice">
+                  <select class="form-control select2" name="invoice">
                     <option value="">- Invoice -</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 selectpicker show-tick" data-live-search="true" name="client">
+                  <select class="form-control select2" name="client">
                     <option value="">- Client -</option>
                     <?php 
                     
@@ -141,7 +141,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 selectpicker show-tick" data-live-search="true" name="location">
+                  <select class="form-control select2" name="location">
                     <option value="">- Location -</option>
                     <?php 
                     
@@ -166,7 +166,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 selectpicker show-tick" data-live-search="true" name="vendor">
+                  <select class="form-control select2" name="vendor">
                     <option value="">- Vendor -</option>
                     <?php 
                     
diff --git a/edit_vendor_modal.php b/edit_vendor_modal.php
index 66e7b4a1..9ad4cec3 100644
--- a/edit_vendor_modal.php
+++ b/edit_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 selectpicker show-tick" data-live-search="true" name="state">
+                  <select class="form-control select2" name="state">
                     <option value="">- State -</option>
                     <?php foreach($states_array as $state_abbr => $state_name) { ?>
                     <option <?php if($vendor_state == $state_abbr){ echo "selected"; } ?> value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
diff --git a/footer.php b/footer.php
index 0757501c..bb446cea 100644
--- a/footer.php
+++ b/footer.php
@@ -24,6 +24,8 @@
 	<script src='plugins/select2/js/select2.min.js'></script>
 	<script src='plugins/inputmask/min/jquery.inputmask.bundle.min.js'></script>
 	<script src='plugins/inputmask/min/inputmask/bindings/inputmask.binding.min.js'></script>
+	<script src='plugins/bootstrap-select/js/bootstrap-select.min.js'></script>
+	<script src="plugins/summernote/summernote-bs4.min.js"></script>
 	<!-- AdminLTE App -->
 	<script src="dist/js/adminlte.min.js"></script>
 	<script src="js/app.js"></script>
diff --git a/header.php b/header.php
index f1e81cfd..51f7fdbd 100644
--- a/header.php
+++ b/header.php
@@ -27,6 +27,7 @@ scratch. This page gets rid of all links and provides the needed markup only.
   <!-- <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet"> -->
 
   <!-- Custom Style Sheet -->
+  <link href="plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet" type="text/css">
   <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">
@@ -35,6 +36,7 @@ scratch. This page gets rid of all links and provides the needed markup only.
   <link href='plugins/fullcalendar-timegrid/main.min.css' rel='stylesheet' />
   <link href='plugins/fullcalendar-bootstrap/main.min.css' rel='stylesheet' />
   <link href='plugins/daterangepicker/daterangepicker.css' rel='stylesheet' />
+  <link href="plugins/summernote/summernote-bs4.css" rel="stylesheet">
 
 </head>
 <body class="hold-transition sidebar-mini">
diff --git a/js/app.js b/js/app.js
index a706d864..7a018728 100644
--- a/js/app.js
+++ b/js/app.js
@@ -8,14 +8,12 @@ $("#alert").fadeTo(2000, 500).slideUp(500, function(){
   $("#alert").slideUp(500);
 });
 
-new EasyMDE({
-  autoDownloadFontAwesome: false,
-  element: document.getElementById('addClientNote')
-});
+//Initialize Select2 Elements
+$('.select2').select2({
+  theme: 'bootstrap4'
+})
 
-new EasyMDE({
-  autoDownloadFontAwesome: false,
-  autofocus: true,
-  forceSync: true,
-  element: document.getElementById('editClientNote')    
+// Summernote
+$('.summernote').summernote({
+	height: 300
 });
\ No newline at end of file
diff --git a/vendor/bootstrap-select/css/bootstrap-select.css b/plugins/bootstrap-select/css/bootstrap-select.css
similarity index 100%
rename from vendor/bootstrap-select/css/bootstrap-select.css
rename to plugins/bootstrap-select/css/bootstrap-select.css
diff --git a/vendor/bootstrap-select/css/bootstrap-select.css.map b/plugins/bootstrap-select/css/bootstrap-select.css.map
similarity index 100%
rename from vendor/bootstrap-select/css/bootstrap-select.css.map
rename to plugins/bootstrap-select/css/bootstrap-select.css.map
diff --git a/vendor/bootstrap-select/css/bootstrap-select.min.css b/plugins/bootstrap-select/css/bootstrap-select.min.css
similarity index 100%
rename from vendor/bootstrap-select/css/bootstrap-select.min.css
rename to plugins/bootstrap-select/css/bootstrap-select.min.css
diff --git a/vendor/bootstrap-select/js/bootstrap-select.js b/plugins/bootstrap-select/js/bootstrap-select.js
similarity index 100%
rename from vendor/bootstrap-select/js/bootstrap-select.js
rename to plugins/bootstrap-select/js/bootstrap-select.js
diff --git a/vendor/bootstrap-select/js/bootstrap-select.js.map b/plugins/bootstrap-select/js/bootstrap-select.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/bootstrap-select.js.map
rename to plugins/bootstrap-select/js/bootstrap-select.js.map
diff --git a/vendor/bootstrap-select/js/bootstrap-select.min.js b/plugins/bootstrap-select/js/bootstrap-select.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/bootstrap-select.min.js
rename to plugins/bootstrap-select/js/bootstrap-select.min.js
diff --git a/vendor/bootstrap-select/js/bootstrap-select.min.js.map b/plugins/bootstrap-select/js/bootstrap-select.min.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/bootstrap-select.min.js.map
rename to plugins/bootstrap-select/js/bootstrap-select.min.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-am_ET.js b/plugins/bootstrap-select/js/i18n/defaults-am_ET.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-am_ET.js
rename to plugins/bootstrap-select/js/i18n/defaults-am_ET.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-am_ET.js.map b/plugins/bootstrap-select/js/i18n/defaults-am_ET.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-am_ET.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-am_ET.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-am_ET.min.js b/plugins/bootstrap-select/js/i18n/defaults-am_ET.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-am_ET.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-am_ET.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ar_AR.js b/plugins/bootstrap-select/js/i18n/defaults-ar_AR.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ar_AR.js
rename to plugins/bootstrap-select/js/i18n/defaults-ar_AR.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ar_AR.js.map b/plugins/bootstrap-select/js/i18n/defaults-ar_AR.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ar_AR.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-ar_AR.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ar_AR.min.js b/plugins/bootstrap-select/js/i18n/defaults-ar_AR.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ar_AR.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-ar_AR.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-bg_BG.js b/plugins/bootstrap-select/js/i18n/defaults-bg_BG.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-bg_BG.js
rename to plugins/bootstrap-select/js/i18n/defaults-bg_BG.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-bg_BG.js.map b/plugins/bootstrap-select/js/i18n/defaults-bg_BG.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-bg_BG.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-bg_BG.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-bg_BG.min.js b/plugins/bootstrap-select/js/i18n/defaults-bg_BG.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-bg_BG.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-bg_BG.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-cs_CZ.js b/plugins/bootstrap-select/js/i18n/defaults-cs_CZ.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-cs_CZ.js
rename to plugins/bootstrap-select/js/i18n/defaults-cs_CZ.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-cs_CZ.js.map b/plugins/bootstrap-select/js/i18n/defaults-cs_CZ.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-cs_CZ.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-cs_CZ.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-cs_CZ.min.js b/plugins/bootstrap-select/js/i18n/defaults-cs_CZ.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-cs_CZ.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-cs_CZ.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-da_DK.js b/plugins/bootstrap-select/js/i18n/defaults-da_DK.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-da_DK.js
rename to plugins/bootstrap-select/js/i18n/defaults-da_DK.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-da_DK.js.map b/plugins/bootstrap-select/js/i18n/defaults-da_DK.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-da_DK.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-da_DK.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-da_DK.min.js b/plugins/bootstrap-select/js/i18n/defaults-da_DK.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-da_DK.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-da_DK.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-de_DE.js b/plugins/bootstrap-select/js/i18n/defaults-de_DE.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-de_DE.js
rename to plugins/bootstrap-select/js/i18n/defaults-de_DE.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-de_DE.js.map b/plugins/bootstrap-select/js/i18n/defaults-de_DE.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-de_DE.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-de_DE.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-de_DE.min.js b/plugins/bootstrap-select/js/i18n/defaults-de_DE.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-de_DE.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-de_DE.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-en_US.js b/plugins/bootstrap-select/js/i18n/defaults-en_US.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-en_US.js
rename to plugins/bootstrap-select/js/i18n/defaults-en_US.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-en_US.js.map b/plugins/bootstrap-select/js/i18n/defaults-en_US.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-en_US.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-en_US.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-en_US.min.js b/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-en_US.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-en_US.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-es_CL.js b/plugins/bootstrap-select/js/i18n/defaults-es_CL.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-es_CL.js
rename to plugins/bootstrap-select/js/i18n/defaults-es_CL.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-es_CL.js.map b/plugins/bootstrap-select/js/i18n/defaults-es_CL.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-es_CL.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-es_CL.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-es_CL.min.js b/plugins/bootstrap-select/js/i18n/defaults-es_CL.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-es_CL.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-es_CL.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-es_ES.js b/plugins/bootstrap-select/js/i18n/defaults-es_ES.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-es_ES.js
rename to plugins/bootstrap-select/js/i18n/defaults-es_ES.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-es_ES.js.map b/plugins/bootstrap-select/js/i18n/defaults-es_ES.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-es_ES.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-es_ES.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-es_ES.min.js b/plugins/bootstrap-select/js/i18n/defaults-es_ES.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-es_ES.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-es_ES.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-et_EE.js b/plugins/bootstrap-select/js/i18n/defaults-et_EE.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-et_EE.js
rename to plugins/bootstrap-select/js/i18n/defaults-et_EE.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-et_EE.js.map b/plugins/bootstrap-select/js/i18n/defaults-et_EE.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-et_EE.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-et_EE.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-et_EE.min.js b/plugins/bootstrap-select/js/i18n/defaults-et_EE.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-et_EE.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-et_EE.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-eu.js b/plugins/bootstrap-select/js/i18n/defaults-eu.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-eu.js
rename to plugins/bootstrap-select/js/i18n/defaults-eu.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-eu.js.map b/plugins/bootstrap-select/js/i18n/defaults-eu.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-eu.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-eu.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-eu.min.js b/plugins/bootstrap-select/js/i18n/defaults-eu.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-eu.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-eu.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-fa_IR.js b/plugins/bootstrap-select/js/i18n/defaults-fa_IR.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-fa_IR.js
rename to plugins/bootstrap-select/js/i18n/defaults-fa_IR.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-fa_IR.js.map b/plugins/bootstrap-select/js/i18n/defaults-fa_IR.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-fa_IR.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-fa_IR.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-fa_IR.min.js b/plugins/bootstrap-select/js/i18n/defaults-fa_IR.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-fa_IR.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-fa_IR.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-fi_FI.js b/plugins/bootstrap-select/js/i18n/defaults-fi_FI.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-fi_FI.js
rename to plugins/bootstrap-select/js/i18n/defaults-fi_FI.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-fi_FI.js.map b/plugins/bootstrap-select/js/i18n/defaults-fi_FI.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-fi_FI.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-fi_FI.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-fi_FI.min.js b/plugins/bootstrap-select/js/i18n/defaults-fi_FI.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-fi_FI.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-fi_FI.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-fr_FR.js b/plugins/bootstrap-select/js/i18n/defaults-fr_FR.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-fr_FR.js
rename to plugins/bootstrap-select/js/i18n/defaults-fr_FR.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-fr_FR.js.map b/plugins/bootstrap-select/js/i18n/defaults-fr_FR.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-fr_FR.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-fr_FR.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-fr_FR.min.js b/plugins/bootstrap-select/js/i18n/defaults-fr_FR.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-fr_FR.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-fr_FR.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-hr_HR.js b/plugins/bootstrap-select/js/i18n/defaults-hr_HR.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-hr_HR.js
rename to plugins/bootstrap-select/js/i18n/defaults-hr_HR.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-hr_HR.js.map b/plugins/bootstrap-select/js/i18n/defaults-hr_HR.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-hr_HR.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-hr_HR.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-hr_HR.min.js b/plugins/bootstrap-select/js/i18n/defaults-hr_HR.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-hr_HR.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-hr_HR.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-hu_HU.js b/plugins/bootstrap-select/js/i18n/defaults-hu_HU.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-hu_HU.js
rename to plugins/bootstrap-select/js/i18n/defaults-hu_HU.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-hu_HU.js.map b/plugins/bootstrap-select/js/i18n/defaults-hu_HU.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-hu_HU.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-hu_HU.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-hu_HU.min.js b/plugins/bootstrap-select/js/i18n/defaults-hu_HU.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-hu_HU.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-hu_HU.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-id_ID.js b/plugins/bootstrap-select/js/i18n/defaults-id_ID.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-id_ID.js
rename to plugins/bootstrap-select/js/i18n/defaults-id_ID.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-id_ID.js.map b/plugins/bootstrap-select/js/i18n/defaults-id_ID.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-id_ID.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-id_ID.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-id_ID.min.js b/plugins/bootstrap-select/js/i18n/defaults-id_ID.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-id_ID.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-id_ID.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-it_IT.js b/plugins/bootstrap-select/js/i18n/defaults-it_IT.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-it_IT.js
rename to plugins/bootstrap-select/js/i18n/defaults-it_IT.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-it_IT.js.map b/plugins/bootstrap-select/js/i18n/defaults-it_IT.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-it_IT.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-it_IT.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-it_IT.min.js b/plugins/bootstrap-select/js/i18n/defaults-it_IT.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-it_IT.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-it_IT.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ja_JP.js b/plugins/bootstrap-select/js/i18n/defaults-ja_JP.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ja_JP.js
rename to plugins/bootstrap-select/js/i18n/defaults-ja_JP.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ja_JP.js.map b/plugins/bootstrap-select/js/i18n/defaults-ja_JP.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ja_JP.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-ja_JP.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ja_JP.min.js b/plugins/bootstrap-select/js/i18n/defaults-ja_JP.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ja_JP.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-ja_JP.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-kh_KM.js b/plugins/bootstrap-select/js/i18n/defaults-kh_KM.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-kh_KM.js
rename to plugins/bootstrap-select/js/i18n/defaults-kh_KM.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-kh_KM.js.map b/plugins/bootstrap-select/js/i18n/defaults-kh_KM.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-kh_KM.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-kh_KM.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-kh_KM.min.js b/plugins/bootstrap-select/js/i18n/defaults-kh_KM.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-kh_KM.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-kh_KM.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ko_KR.js b/plugins/bootstrap-select/js/i18n/defaults-ko_KR.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ko_KR.js
rename to plugins/bootstrap-select/js/i18n/defaults-ko_KR.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ko_KR.js.map b/plugins/bootstrap-select/js/i18n/defaults-ko_KR.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ko_KR.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-ko_KR.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ko_KR.min.js b/plugins/bootstrap-select/js/i18n/defaults-ko_KR.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ko_KR.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-ko_KR.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-lt_LT.js b/plugins/bootstrap-select/js/i18n/defaults-lt_LT.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-lt_LT.js
rename to plugins/bootstrap-select/js/i18n/defaults-lt_LT.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-lt_LT.js.map b/plugins/bootstrap-select/js/i18n/defaults-lt_LT.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-lt_LT.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-lt_LT.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-lt_LT.min.js b/plugins/bootstrap-select/js/i18n/defaults-lt_LT.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-lt_LT.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-lt_LT.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-lv_LV.js b/plugins/bootstrap-select/js/i18n/defaults-lv_LV.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-lv_LV.js
rename to plugins/bootstrap-select/js/i18n/defaults-lv_LV.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-lv_LV.js.map b/plugins/bootstrap-select/js/i18n/defaults-lv_LV.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-lv_LV.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-lv_LV.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-lv_LV.min.js b/plugins/bootstrap-select/js/i18n/defaults-lv_LV.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-lv_LV.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-lv_LV.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-nb_NO.js b/plugins/bootstrap-select/js/i18n/defaults-nb_NO.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-nb_NO.js
rename to plugins/bootstrap-select/js/i18n/defaults-nb_NO.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-nb_NO.js.map b/plugins/bootstrap-select/js/i18n/defaults-nb_NO.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-nb_NO.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-nb_NO.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-nb_NO.min.js b/plugins/bootstrap-select/js/i18n/defaults-nb_NO.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-nb_NO.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-nb_NO.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-nl_NL.js b/plugins/bootstrap-select/js/i18n/defaults-nl_NL.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-nl_NL.js
rename to plugins/bootstrap-select/js/i18n/defaults-nl_NL.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-nl_NL.js.map b/plugins/bootstrap-select/js/i18n/defaults-nl_NL.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-nl_NL.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-nl_NL.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-nl_NL.min.js b/plugins/bootstrap-select/js/i18n/defaults-nl_NL.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-nl_NL.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-nl_NL.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-pl_PL.js b/plugins/bootstrap-select/js/i18n/defaults-pl_PL.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-pl_PL.js
rename to plugins/bootstrap-select/js/i18n/defaults-pl_PL.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-pl_PL.js.map b/plugins/bootstrap-select/js/i18n/defaults-pl_PL.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-pl_PL.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-pl_PL.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-pl_PL.min.js b/plugins/bootstrap-select/js/i18n/defaults-pl_PL.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-pl_PL.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-pl_PL.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-pt_BR.js b/plugins/bootstrap-select/js/i18n/defaults-pt_BR.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-pt_BR.js
rename to plugins/bootstrap-select/js/i18n/defaults-pt_BR.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-pt_BR.js.map b/plugins/bootstrap-select/js/i18n/defaults-pt_BR.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-pt_BR.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-pt_BR.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-pt_BR.min.js b/plugins/bootstrap-select/js/i18n/defaults-pt_BR.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-pt_BR.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-pt_BR.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-pt_PT.js b/plugins/bootstrap-select/js/i18n/defaults-pt_PT.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-pt_PT.js
rename to plugins/bootstrap-select/js/i18n/defaults-pt_PT.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-pt_PT.js.map b/plugins/bootstrap-select/js/i18n/defaults-pt_PT.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-pt_PT.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-pt_PT.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-pt_PT.min.js b/plugins/bootstrap-select/js/i18n/defaults-pt_PT.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-pt_PT.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-pt_PT.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ro_RO.js b/plugins/bootstrap-select/js/i18n/defaults-ro_RO.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ro_RO.js
rename to plugins/bootstrap-select/js/i18n/defaults-ro_RO.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ro_RO.js.map b/plugins/bootstrap-select/js/i18n/defaults-ro_RO.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ro_RO.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-ro_RO.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ro_RO.min.js b/plugins/bootstrap-select/js/i18n/defaults-ro_RO.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ro_RO.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-ro_RO.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ru_RU.js b/plugins/bootstrap-select/js/i18n/defaults-ru_RU.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ru_RU.js
rename to plugins/bootstrap-select/js/i18n/defaults-ru_RU.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ru_RU.js.map b/plugins/bootstrap-select/js/i18n/defaults-ru_RU.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ru_RU.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-ru_RU.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ru_RU.min.js b/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ru_RU.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-sk_SK.js b/plugins/bootstrap-select/js/i18n/defaults-sk_SK.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-sk_SK.js
rename to plugins/bootstrap-select/js/i18n/defaults-sk_SK.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-sk_SK.js.map b/plugins/bootstrap-select/js/i18n/defaults-sk_SK.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-sk_SK.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-sk_SK.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-sk_SK.min.js b/plugins/bootstrap-select/js/i18n/defaults-sk_SK.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-sk_SK.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-sk_SK.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-sl_SI.js b/plugins/bootstrap-select/js/i18n/defaults-sl_SI.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-sl_SI.js
rename to plugins/bootstrap-select/js/i18n/defaults-sl_SI.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-sl_SI.js.map b/plugins/bootstrap-select/js/i18n/defaults-sl_SI.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-sl_SI.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-sl_SI.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-sl_SI.min.js b/plugins/bootstrap-select/js/i18n/defaults-sl_SI.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-sl_SI.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-sl_SI.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-sv_SE.js b/plugins/bootstrap-select/js/i18n/defaults-sv_SE.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-sv_SE.js
rename to plugins/bootstrap-select/js/i18n/defaults-sv_SE.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-sv_SE.js.map b/plugins/bootstrap-select/js/i18n/defaults-sv_SE.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-sv_SE.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-sv_SE.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-sv_SE.min.js b/plugins/bootstrap-select/js/i18n/defaults-sv_SE.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-sv_SE.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-sv_SE.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-tr_TR.js b/plugins/bootstrap-select/js/i18n/defaults-tr_TR.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-tr_TR.js
rename to plugins/bootstrap-select/js/i18n/defaults-tr_TR.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-tr_TR.js.map b/plugins/bootstrap-select/js/i18n/defaults-tr_TR.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-tr_TR.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-tr_TR.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-tr_TR.min.js b/plugins/bootstrap-select/js/i18n/defaults-tr_TR.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-tr_TR.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-tr_TR.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ua_UA.js b/plugins/bootstrap-select/js/i18n/defaults-ua_UA.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ua_UA.js
rename to plugins/bootstrap-select/js/i18n/defaults-ua_UA.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ua_UA.js.map b/plugins/bootstrap-select/js/i18n/defaults-ua_UA.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ua_UA.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-ua_UA.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-ua_UA.min.js b/plugins/bootstrap-select/js/i18n/defaults-ua_UA.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-ua_UA.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-ua_UA.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-vi_VN.js b/plugins/bootstrap-select/js/i18n/defaults-vi_VN.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-vi_VN.js
rename to plugins/bootstrap-select/js/i18n/defaults-vi_VN.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-vi_VN.js.map b/plugins/bootstrap-select/js/i18n/defaults-vi_VN.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-vi_VN.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-vi_VN.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-vi_VN.min.js b/plugins/bootstrap-select/js/i18n/defaults-vi_VN.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-vi_VN.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-vi_VN.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-zh_CN.js b/plugins/bootstrap-select/js/i18n/defaults-zh_CN.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-zh_CN.js
rename to plugins/bootstrap-select/js/i18n/defaults-zh_CN.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-zh_CN.js.map b/plugins/bootstrap-select/js/i18n/defaults-zh_CN.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-zh_CN.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-zh_CN.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-zh_CN.min.js b/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-zh_CN.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-zh_TW.js b/plugins/bootstrap-select/js/i18n/defaults-zh_TW.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-zh_TW.js
rename to plugins/bootstrap-select/js/i18n/defaults-zh_TW.js
diff --git a/vendor/bootstrap-select/js/i18n/defaults-zh_TW.js.map b/plugins/bootstrap-select/js/i18n/defaults-zh_TW.js.map
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-zh_TW.js.map
rename to plugins/bootstrap-select/js/i18n/defaults-zh_TW.js.map
diff --git a/vendor/bootstrap-select/js/i18n/defaults-zh_TW.min.js b/plugins/bootstrap-select/js/i18n/defaults-zh_TW.min.js
similarity index 100%
rename from vendor/bootstrap-select/js/i18n/defaults-zh_TW.min.js
rename to plugins/bootstrap-select/js/i18n/defaults-zh_TW.min.js
diff --git a/post.php b/post.php
index 7e9642ae..c6a127d9 100644
--- a/post.php
+++ b/post.php
@@ -3106,7 +3106,7 @@ if(isset($_POST['add_note'])){
 
     $client_id = intval($_POST['client_id']);
     $subject = strip_tags(mysqli_real_escape_string($mysqli,$_POST['subject']));
-    $note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['note']));
+    $note = mysqli_real_escape_string($mysqli,$_POST['note']);
 
     mysqli_query($mysqli,"INSERT INTO notes SET note_subject = '$subject', note_body = '$note', note_created_at = NOW(), client_id = $client_id, company_id = $session_company_id");
 
@@ -3123,7 +3123,7 @@ if(isset($_POST['edit_note'])){
 
     $note_id = intval($_POST['note_id']);
     $subject = strip_tags(mysqli_real_escape_string($mysqli,$_POST['subject']));
-    $note = strip_tags(mysqli_real_escape_string($mysqli,$_POST['note']));
+    $note = mysqli_real_escape_string($mysqli,$_POST['note']);
 
     mysqli_query($mysqli,"UPDATE notes SET note_subject = '$subject', note_body = '$note', note_updated_at = NOW() WHERE note_id = $note_id AND company_id = $session_company_id");
 
diff --git a/report_profit_loss.php b/report_profit_loss.php
index 056f1f67..81cf5f6d 100644
--- a/report_profit_loss.php
+++ b/report_profit_loss.php
@@ -23,8 +23,8 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
     <h6 class="float-left mt-1"><i class="fa fw-fw fa-balance-scale mr-2"></i>Profit & Loss</h6>
     <button type="button" class="btn btn-primary btn-sm float-right d-print-none" onclick="window.print();"><i class="fas fa-fw fa-print"></i> Print</button>
   </div>
-  <div class="card-body">
-    <form class="mb-3">
+  <div class="card-body p-0">
+    <form class="p-3">
       <select onchange="this.form.submit()" class="form-control" name="year">
         <?php 
                 
@@ -40,7 +40,7 @@ $sql_categories_expense = mysqli_query($mysqli,"SELECT * FROM categories WHERE c
       </select>
     </form>
     <div class="table-responsive">
-      <table class="table table-striped table-sm">
+      <table class="table table-sm">
         <thead class="text-dark">
           <tr>
             <th></th>
diff --git a/settings-company.php b/settings-company.php
index acc15f3d..811adad8 100644
--- a/settings-company.php
+++ b/settings-company.php
@@ -44,7 +44,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 selectpicker show-tick" data-live-search="true" name="config_company_state">
+          <select class="form-control select2" name="config_company_state">
             <option value="">Select a state...</option>
               <?php foreach($states_array as $state_abbr => $state_name) { ?>
               <option <?php if($config_company_state == $state_abbr) { echo "selected"; } ?> value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
diff --git a/settings-defaults.php b/settings-defaults.php
index 9ce5878f..bd8a4da3 100644
--- a/settings-defaults.php
+++ b/settings-defaults.php
@@ -14,7 +14,7 @@
           <div class="input-group-prepend">
             <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
           </div>
-          <select class="form-control selectpicker show-tick" name="config_default_transfer_from_account">
+          <select class="form-control select2" name="config_default_transfer_from_account">
             <option value="0">- None -</option>
             <?php 
             
@@ -39,7 +39,7 @@
           <div class="input-group-prepend">
             <span class="input-group-text"><i class="fa fa-fw fa-exchange-alt"></i></span>
           </div>
-          <select class="form-control selectpicker show-tick" name="config_default_transfer_to_account">
+          <select class="form-control select2" name="config_default_transfer_to_account">
             <option value="0">- None -</option>
             <?php 
             
@@ -64,7 +64,7 @@
           <div class="input-group-prepend">
             <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
           </div>
-          <select class="form-control selectpicker show-tick" name="config_default_payment_account">
+          <select class="form-control select2" name="config_default_payment_account">
             <option value="0">- None -</option>
             <?php 
             
@@ -89,7 +89,7 @@
           <div class="input-group-prepend">
             <span class="input-group-text"><i class="fa fa-fw fa-shopping-cart"></i></span>
           </div>
-          <select class="form-control selectpicker show-tick" name="config_default_expense_account">
+          <select class="form-control select2" name="config_default_expense_account">
             <option value="0">- None -</option>
             <?php 
             
@@ -114,7 +114,7 @@
           <div class="input-group-prepend">
             <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
           </div>
-          <select class="form-control selectpicker show-tick" name="config_default_payment_method">
+          <select class="form-control select2" name="config_default_payment_method">
             <option value="">- None -</option>
             <?php 
             
@@ -138,7 +138,7 @@
           <div class="input-group-prepend">
             <span class="input-group-text"><i class="fa fa-fw fa-credit-card"></i></span>
           </div>
-          <select class="form-control selectpicker show-tick" name="config_default_expense_payment_method">
+          <select class="form-control select2" name="config_default_expense_payment_method">
             <option value="">- None -</option>
             <?php 
             
@@ -162,7 +162,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 selectpicker show-tick" name="config_default_calendar">
+          <select class="form-control select2" name="config_default_calendar">
             <option value="0">- None -</option>
             <?php 
             
@@ -187,7 +187,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 selectpicker show-tick" name="config_default_net_terms">
+          <select class="form-control select2" name="config_default_net_terms">
             <?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
             <option <?php if($config_default_net_terms == $net_term_value){ echo "selected"; } ?> value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
             <?php } ?>
diff --git a/ticket.php b/ticket.php
index a8c807c6..64c028bd 100644
--- a/ticket.php
+++ b/ticket.php
@@ -68,48 +68,7 @@ if(isset($_GET['ticket_id'])){
   <li class="breadcrumb-item active">Ticket Details</li>
 </ol>
 <div class="row">
-  <div class="col-md-3">
-    <div class="card mb-3">
-      <div class="card-header">
-        <h2>
-          Ticket <?php echo $ticket_number; ?>
-        </h2>
-        <span class="p-2 badge badge-<?php echo $ticket_badge_color; ?>">
-          <?php echo $ticket_status; ?>
-          </span>
 
-      </div>
-      <div class="card-body">
-  
-        <div class="mb-4">  
-          <h4 class="text-secondary">Client</h4>
-          <i class="fa fa-fw fa-user text-secondary ml-1 mr-2 mb-2"></i> <?php echo $client_name; ?>
-          <br>
-          <?php
-          if(!empty($client_email)){
-          ?>
-          <i class="fa fa-fw fa-envelope text-secondary ml-1 mr-2 mb-2"></i> <a href="mailto:<?php echo $client_email; ?>"><?php echo $client_email; ?></a>
-          <br>
-          <?php
-          }
-          ?>
-          <?php
-          if(!empty($client_phone)){
-          ?>
-          <i class="fa fa-fw fa-phone text-secondary ml-1 mr-2 mb-2"></i> <?php echo $client_phone; ?>
-          <br>
-          <?php 
-          } 
-          ?>
-        </div>
-  
-        <h4 class="text-secondary">Details</h4>
-        <div class="ml-1"><i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i> <?php echo $name; ?></div>
-        <div class="ml-1"><i class="fa fa-fw fa-clock text-secondary mr-2 mb-2"></i> <?php echo $ticket_created_at; ?></div>
-        
-      </div>
-    </div>
-  </div>
   <div class="col-md-9">
 
     <div class="card mb-3">
@@ -165,6 +124,49 @@ if(isset($_GET['ticket_id'])){
   
   </div>
 
+  <div class="col-md-3">
+    <div class="card mb-3">
+      <div class="card-header">
+        <h2>
+          Ticket <?php echo $ticket_number; ?>
+        </h2>
+        <span class="p-2 badge badge-<?php echo $ticket_badge_color; ?>">
+          <?php echo $ticket_status; ?>
+          </span>
+
+      </div>
+      <div class="card-body">
+  
+        <div class="mb-4">  
+          <h4 class="text-secondary">Client</h4>
+          <i class="fa fa-fw fa-user text-secondary ml-1 mr-2 mb-2"></i> <?php echo $client_name; ?>
+          <br>
+          <?php
+          if(!empty($client_email)){
+          ?>
+          <i class="fa fa-fw fa-envelope text-secondary ml-1 mr-2 mb-2"></i> <a href="mailto:<?php echo $client_email; ?>"><?php echo $client_email; ?></a>
+          <br>
+          <?php
+          }
+          ?>
+          <?php
+          if(!empty($client_phone)){
+          ?>
+          <i class="fa fa-fw fa-phone text-secondary ml-1 mr-2 mb-2"></i> <?php echo $client_phone; ?>
+          <br>
+          <?php 
+          } 
+          ?>
+        </div>
+  
+        <h4 class="text-secondary">Details</h4>
+        <div class="ml-1"><i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i> <?php echo $name; ?></div>
+        <div class="ml-1"><i class="fa fa-fw fa-clock text-secondary mr-2 mb-2"></i> <?php echo $ticket_created_at; ?></div>
+        
+      </div>
+    </div>
+  </div>
+
 </div>
 
 <?php include("edit_ticket_modal.php"); ?>
diff --git a/view_note_modal.php b/view_note_modal.php
index bc4ff3c6..20e48f27 100644
--- a/view_note_modal.php
+++ b/view_note_modal.php
@@ -8,10 +8,7 @@
         </button>
       </div>
       <div class="modal-body bg-white">
-        <?php
-          $Parsedown = new Parsedown();
-          echo $Parsedown->text("$note_body");
-        ?>
+        <?php echo $note_body; ?>
       </div>
     </div>
   </div>