diff --git a/add_account_modal.php b/add_account_modal.php
index e9c1f4d0..88571702 100644
--- a/add_account_modal.php
+++ b/add_account_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addAccountModal" tabindex="-1">
+<div class="modal" id="addAccountModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -15,7 +15,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-university"></i></span>
               </div>
-              <input type="text" class="form-control" name="name" placeholder="Account name" required>
+              <input type="text" class="form-control" name="name" placeholder="Account name" required autofocus>
             </div>
           </div>
           <div class="form-group">
diff --git a/add_category_modal.php b/add_category_modal.php
index c7549e8d..36f1ec49 100644
--- a/add_category_modal.php
+++ b/add_category_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addCategoryModal" tabindex="-1">
+<div class="modal" id="addCategoryModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -11,7 +11,7 @@
         <div class="modal-body">
           <div class="form-group">
             <label>Name</label>
-            <input type="text" class="form-control" name="name" required autofocus="autofocus">
+            <input type="text" class="form-control" name="name" required autofocus>
           </div>
           <div class="form-group">
             <label>Type</label>
diff --git a/add_client_application_modal.php b/add_client_application_modal.php
index 0c58ce00..acb761d5 100644
--- a/add_client_application_modal.php
+++ b/add_client_application_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addClientApplicationModal" tabindex="-1">
+<div class="modal" id="addClientApplicationModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -17,7 +17,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-cube"></i></span>
               </div>
-              <input type="text" class="form-control" name="name" placeholder="Application name" required>
+              <input type="text" class="form-control" name="name" placeholder="Application name" required autofocus>
             </div>
           </div>
           
diff --git a/add_client_asset_modal.php b/add_client_asset_modal.php
index 9d058ff4..e60b2414 100644
--- a/add_client_asset_modal.php
+++ b/add_client_asset_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addClientAssetModal" tabindex="-1">
+<div class="modal" id="addClientAssetModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -16,7 +16,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-tag"></i></span>
               </div>
-              <input type="text" class="form-control" name="name" placeholder="Name the asset" required>
+              <input type="text" class="form-control" name="name" placeholder="Name the asset" required autofocus>
             </div>
           </div>
           <div class="form-group">
diff --git a/add_client_contact_modal.php b/add_client_contact_modal.php
index c116d7b3..9db59079 100644
--- a/add_client_contact_modal.php
+++ b/add_client_contact_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addClientContactModal" tabindex="-1">
+<div class="modal" id="addClientContactModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -16,7 +16,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-user"></i></span>
               </div>
-              <input type="text" class="form-control" name="name" placeholder="Full Name" required>
+              <input type="text" class="form-control" name="name" placeholder="Full Name" required autofocus>
             </div>
           </div>
           
diff --git a/add_client_domain_modal.php b/add_client_domain_modal.php
index 82d0b152..135fa9e6 100644
--- a/add_client_domain_modal.php
+++ b/add_client_domain_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addClientDomainModal" tabindex="-1">
+<div class="modal" id="addClientDomainModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -16,7 +16,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-globe"></i></span>
               </div>
-              <input type="text" class="form-control" name="name" placeholder="Domain name exmaple.com" required>
+              <input type="text" class="form-control" name="name" placeholder="Domain name exmaple.com" required autofocus>
             </div>
           </div>
           
diff --git a/add_client_location_modal.php b/add_client_location_modal.php
index a0c40fef..9b86d812 100644
--- a/add_client_location_modal.php
+++ b/add_client_location_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addClientLocationModal" tabindex="-1">
+<div class="modal" id="addClientLocationModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -16,7 +16,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-user"></i></span>
               </div>
-              <input type="text" class="form-control" name="name" placeholder="Name of location" required>
+              <input type="text" class="form-control" name="name" placeholder="Name of location" required autofocus>
             </div>
           </div>
           <div class="form-group">
diff --git a/add_client_login_modal.php b/add_client_login_modal.php
index 5dd38b6b..852489de 100644
--- a/add_client_login_modal.php
+++ b/add_client_login_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addClientLoginModal" tabindex="-1">
+<div class="modal" id="addClientLoginModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -16,7 +16,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-info-circle"></i></span>
               </div>
-              <input type="text" class="form-control" name="description" required>
+              <input type="text" class="form-control" name="description" required autofocus>
             </div>
           </div>
           <div class="form-group">
diff --git a/add_client_modal.php b/add_client_modal.php
index a0ebe502..a4b2031c 100644
--- a/add_client_modal.php
+++ b/add_client_modal.php
@@ -15,7 +15,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-user"></i></span>
               </div>
-              <input type="text" class="form-control" name="name" placeholder="Name or Company" required>
+              <input type="text" class="form-control" name="name" placeholder="Name or Company" required autofocus>
             </div>
           </div>
           <div class="form-group">
@@ -29,9 +29,11 @@
           </div>
           <div class="form-row">
             <div class="form-group col-md-5">
+              <label>City</label>
               <input type="text" class="form-control" name="city" placeholder="City" required>
             </div>
             <div class="form-group col-md-4">
+              <label>State</label>
               <select class="form-control" name="state">
                 <option value="">Select a state...</option>
                 <?php foreach($states_array as $state_abbr => $state_name) { ?>
@@ -40,6 +42,7 @@
               </select> 
             </div>
             <div class="form-group col-md-3">
+              <label>Zip</label>
               <input type="text" class="form-control" name="zip" placeholder="Zip">
             </div>
           </div>
diff --git a/add_client_network_modal.php b/add_client_network_modal.php
index e32030e2..9528f1e6 100644
--- a/add_client_network_modal.php
+++ b/add_client_network_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addClientNetworkModal" tabindex="-1">
+<div class="modal" id="addClientNetworkModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -16,7 +16,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-network-wired"></i></span>
               </div>
-              <input type="text" class="form-control" name="name" placeholder="Network name (VLAN, WAN, LAN2 etc)" required>
+              <input type="text" class="form-control" name="name" placeholder="Network name (VLAN, WAN, LAN2 etc)" required autofocus>
             </div>
           </div>
           
diff --git a/add_client_note_modal.php b/add_client_note_modal.php
index 2ffe7893..233cc735 100644
--- a/add_client_note_modal.php
+++ b/add_client_note_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addClientNoteModal" tabindex="-1">
+<div class="modal" id="addClientNoteModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -8,7 +8,7 @@
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
-        <input type="text" name="client_id" value="<?php echo $client_id; ?>">
+        <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
         <div class="modal-body">  
           <div class="form-group">
             <label>Subject</label>
@@ -16,7 +16,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-edit"></i></span>
               </div>
-              <input type="text" class="form-control" name="subject" required>
+              <input type="text" class="form-control" name="subject" required autofocus>
             </div>
           </div>
           <div class="form-group">
diff --git a/add_client_vendor_modal.php b/add_client_vendor_modal.php
index 856c08ed..562ed8ae 100644
--- a/add_client_vendor_modal.php
+++ b/add_client_vendor_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addClientVendorModal" tabindex="-1">
+<div class="modal" id="addClientVendorModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -16,7 +16,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-building"></i></span>
               </div>
-              <input type="text" class="form-control" name="name" placeholder="Name of the vendor" required>
+              <input type="text" class="form-control" name="name" placeholder="Name of the vendor" required autofocus>
             </div>
           </div>
           <div class="form-group">
diff --git a/add_expense_copy_modal.php b/add_expense_copy_modal.php
index 56c7c54c..c37502f2 100644
--- a/add_expense_copy_modal.php
+++ b/add_expense_copy_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addExpenseCopyModal<?php echo $expense_id; ?>" tabindex="-1">
+<div class="modal" id="addExpenseCopyModal<?php echo $expense_id; ?>" tabindex="-1">
   <div class="modal-dialog modal-lg">
     <div class="modal-content">
       <div class="modal-header">
@@ -16,7 +16,7 @@
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-calendar"></i></span>
                 </div>
-                <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d",time()); ?>" required>
+                <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
               </div>
             </div>
             <div class="form-group col-md">
diff --git a/add_expense_modal.php b/add_expense_modal.php
index a27c4522..c6e10d8b 100644
--- a/add_expense_modal.php
+++ b/add_expense_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addExpenseModal" tabindex="-1">
+<div class="modal" id="addExpenseModal" tabindex="-1">
   <div class="modal-dialog modal-lg">
     <div class="modal-content">
       <div class="modal-header">
@@ -16,7 +16,7 @@
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-calendar"></i></span>
                 </div>
-                <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required autofocus="autofocus">
+                <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
               </div>
             </div>
             <div class="form-group col-md">
@@ -25,7 +25,7 @@
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-dollar-sign"></i></span>
                 </div>
-                <input type="number" class="form-control" step="0.01" name="amount" required>
+                <input type="number" class="form-control" step="0.01" name="amount" autofocus="autofocus" required>
               </div>
             </div>
             <div class="form-group col-md">
diff --git a/add_expense_refund_modal.php b/add_expense_refund_modal.php
index 719557f6..caa45039 100644
--- a/add_expense_refund_modal.php
+++ b/add_expense_refund_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addExpenseRefundModal<?php echo $expense_id; ?>" tabindex="-1">
+<div class="modal" id="addExpenseRefundModal<?php echo $expense_id; ?>" tabindex="-1">
   <div class="modal-dialog modal-lg">
     <div class="modal-content">
       <div class="modal-header">
@@ -19,7 +19,7 @@
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-calendar"></i></span>
                 </div>
-                <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d",time()); ?>" required>
+                <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
               </div>
             </div>
             <div class="form-group col-md">
diff --git a/add_invoice_modal.php b/add_invoice_modal.php
index 5c2de494..19df88a5 100644
--- a/add_invoice_modal.php
+++ b/add_invoice_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addInvoiceModal" tabindex="-1">
+<div class="modal" id="addInvoiceModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -16,7 +16,7 @@
                 <span class="input-group-text"><i class="fa fa-user"></i></span>
               </div>
               <select class="form-control" name="client" required>
-                <option value="">- Customer -</option>
+                <option value="">- Select Customer -</option>
                 <?php 
                 
                 $sql = mysqli_query($mysqli,"SELECT * FROM clients"); 
@@ -54,7 +54,7 @@
           </div>
       
           <div class="form-group">
-            <label>Income Category</label>
+            <label>Category</label>
             <div class="input-group">
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-user"></i></span>
diff --git a/add_mileage_modal.php b/add_mileage_modal.php
index bca3128f..64bc670c 100644
--- a/add_mileage_modal.php
+++ b/add_mileage_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addMileageModal" tabindex="-1">
+<div class="modal" id="addMileageModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -10,43 +10,41 @@
       <form action="post.php" method="post" autocomplete="off">
         <div class="modal-body">
           <div class="form-row">
-            <div class="form-group col-sm">
+            <div class="form-group col-7">
               <label>Date</label>
               <div class="input-group">
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-calendar"></i></span>
                 </div>
-                <input type="date" class="form-control" name="date" required autofocus="autofocus">
+                <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
               </div>
             </div>
-            <div class="form-group col-sm">
+            <div class="form-group col-5">
               <label>Miles</label>
               <div class="input-group">
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-car-side"></i></span>
                 </div>
-                <input type="number" class="form-control" name="miles" required>
+                <input type="number" class="form-control" name="miles" required autofocus="autofocus">
               </div>
             </div>
           </div>
-          <div class="form-row">
-            <div class="form-group col-sm">
-              <label>Starting Location</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-map-marker"></i></span>
-                </div>
-                <input type="text" class="form-control" name="starting_location" required>
+          <div class="form-group">
+            <label>Starting Location</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-map-marker"></i></span>
               </div>
+              <input type="text" class="form-control" name="starting_location" required>
             </div>
-            <div class="form-group col-sm">
-              <label>Destination</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-arrow-right"></i></span>
-                </div>
-                <input type="text" class="form-control" name="destination" required>
+          </div>
+          <div class="form-group">
+            <label>Destination</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-arrow-right"></i></span>
               </div>
+              <input type="text" class="form-control" name="destination" required>
             </div>
           </div>
           <div class="form-group">
diff --git a/add_payment_modal.php b/add_payment_modal.php
index f1272d84..4ffb43fc 100644
--- a/add_payment_modal.php
+++ b/add_payment_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addPaymentModal" tabindex="-1">
+<div class="modal" id="addPaymentModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/add_product_modal.php b/add_product_modal.php
index 596d03e1..d4ae38d0 100644
--- a/add_product_modal.php
+++ b/add_product_modal.php
@@ -11,7 +11,7 @@
         <div class="modal-body">
           <div class="form-group">
             <label>Name</label>
-            <input type="text" class="form-control" name="name" required autofocus="autofocus">
+            <input type="text" class="form-control" name="name" required autofocus>
           </div>
           <div class="form-group">
             <label>Description</label>
diff --git a/add_recurring_invoice_modal.php b/add_recurring_invoice_modal.php
index c09e8e69..9dcb293b 100644
--- a/add_recurring_invoice_modal.php
+++ b/add_recurring_invoice_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addRecurringInvoiceModal" tabindex="-1">
+<div class="modal" id="addRecurringInvoiceModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/add_transfer_modal.php b/add_transfer_modal.php
index 5e3a6ada..9fa70bda 100644
--- a/add_transfer_modal.php
+++ b/add_transfer_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addTransferModal" tabindex="-1">
+<div class="modal" id="addTransferModal" tabindex="-1">
   <div class="modal-dialog modal-lg">
     <div class="modal-content">
       <div class="modal-header">
@@ -25,7 +25,7 @@
                 <div class="input-group-prepend">
                   <span class="input-group-text"><i class="fa fa-hand-holding-usd"></i></span>
                 </div>
-                <input type="number" class="form-control" step="0.01" min="0" name="amount" placeholder="Amount to transfer" required>
+                <input type="number" class="form-control" step="0.01" min="0" name="amount" placeholder="Amount to transfer" required autofocus>
               </div>
             </div>
           </div>
diff --git a/add_user_modal.php b/add_user_modal.php
index 6d3cb205..d5f19ea0 100644
--- a/add_user_modal.php
+++ b/add_user_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addUserModal" tabindex="-1">
+<div class="modal" id="addUserModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -15,7 +15,7 @@
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-user"></i></span>
               </div>
-              <input type="text" class="form-control" name="name" placeholder="Full Name" required>
+              <input type="text" class="form-control" name="name" placeholder="Full Name" required autofocus>
             </div>
           </div>
 
diff --git a/add_vendor_modal.php b/add_vendor_modal.php
index b8be42d3..3bb810fe 100644
--- a/add_vendor_modal.php
+++ b/add_vendor_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="addVendorModal" tabindex="-1">
+<div class="modal" id="addVendorModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -11,7 +11,7 @@
         <div class="modal-body">
           <div class="form-group">
             <label>Name</label>
-            <input type="text" class="form-control" name="name" required autofocus="autofocus">
+            <input type="text" class="form-control" name="name" required autofocus>
           </div>
           <div class="form-group">
             <label>Description</label>
diff --git a/edit_account_modal.php b/edit_account_modal.php
index 5201ec34..07d23f8b 100644
--- a/edit_account_modal.php
+++ b/edit_account_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editAccountModal<?php echo $account_id; ?>" tabindex="-1">
+<div class="modal" id="editAccountModal<?php echo $account_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_category_modal.php b/edit_category_modal.php
index a112ad7f..a34e192e 100644
--- a/edit_category_modal.php
+++ b/edit_category_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editCategoryModal<?php echo $category_id; ?>" tabindex="-1">
+<div class="modal" id="editCategoryModal<?php echo $category_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_client_application_modal.php b/edit_client_application_modal.php
index c1c32d90..20866412 100644
--- a/edit_client_application_modal.php
+++ b/edit_client_application_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editClientApplicationModal<?php echo $client_application_id; ?>" tabindex="-1">
+<div class="modal" id="editClientApplicationModal<?php echo $client_application_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_client_asset_modal.php b/edit_client_asset_modal.php
index d7dbad40..7a267382 100644
--- a/edit_client_asset_modal.php
+++ b/edit_client_asset_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editClientAssetModal<?php echo $client_asset_id; ?>" tabindex="-1">
+<div class="modal" id="editClientAssetModal<?php echo $client_asset_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_client_contact_modal.php b/edit_client_contact_modal.php
index c638309b..15cb6ad4 100644
--- a/edit_client_contact_modal.php
+++ b/edit_client_contact_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editClientContactModal<?php echo $client_contact_id; ?>" tabindex="-1">
+<div class="modal" id="editClientContactModal<?php echo $client_contact_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_client_domain_modal.php b/edit_client_domain_modal.php
index f9f9972c..e665f0bc 100644
--- a/edit_client_domain_modal.php
+++ b/edit_client_domain_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editClientDomainModal<?php echo $client_domain_id; ?>" tabindex="-1">
+<div class="modal" id="editClientDomainModal<?php echo $client_domain_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_client_location_modal.php b/edit_client_location_modal.php
index 17b88f93..2ee84ff5 100644
--- a/edit_client_location_modal.php
+++ b/edit_client_location_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editClientLocationModal<?php echo $client_location_id; ?>" tabindex="-1">
+<div class="modal" id="editClientLocationModal<?php echo $client_location_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_client_login_modal.php b/edit_client_login_modal.php
index 367cee21..ccd07fe6 100644
--- a/edit_client_login_modal.php
+++ b/edit_client_login_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editClientLoginModal<?php echo $client_login_id; ?>" tabindex="-1">
+<div class="modal" id="editClientLoginModal<?php echo $client_login_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_client_modal.php b/edit_client_modal.php
index 57abb0b5..5074efa8 100644
--- a/edit_client_modal.php
+++ b/edit_client_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editClientModal<?php echo $client_id; ?>" tabindex="-1">
+<div class="modal" id="editClientModal<?php echo $client_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_client_network_modal.php b/edit_client_network_modal.php
index 20aa1344..de57d134 100644
--- a/edit_client_network_modal.php
+++ b/edit_client_network_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editClientNetworkModal<?php echo $client_network_id; ?>" tabindex="-1">
+<div class="modal" id="editClientNetworkModal<?php echo $client_network_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_client_note_modal.php b/edit_client_note_modal.php
index 6337c2e4..2abdfc89 100644
--- a/edit_client_note_modal.php
+++ b/edit_client_note_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editClientNoteModal<?php echo $client_note_id; ?>" tabindex="-1">
+<div class="modal" id="editClientNoteModal<?php echo $client_note_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_client_vendor_modal.php b/edit_client_vendor_modal.php
index 034823d1..3527c07c 100644
--- a/edit_client_vendor_modal.php
+++ b/edit_client_vendor_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editClientVendorModal<?php echo $client_vendor_id; ?>" tabindex="-1">
+<div class="modal" id="editClientVendorModal<?php echo $client_vendor_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_expense_modal.php b/edit_expense_modal.php
index 6a020a3e..0f971e43 100644
--- a/edit_expense_modal.php
+++ b/edit_expense_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editExpenseModal<?php echo $expense_id; ?>" tabindex="-1">
+<div class="modal" id="editExpenseModal<?php echo $expense_id; ?>" tabindex="-1">
   <div class="modal-dialog modal-lg">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_invoice_modal.php b/edit_invoice_modal.php
index c73554b0..c36cfaf0 100644
--- a/edit_invoice_modal.php
+++ b/edit_invoice_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editInvoiceModal" tabindex="-1">
+<div class="modal" id="editInvoiceModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_invoice_note_modal.php b/edit_invoice_note_modal.php
index e516b4c1..09a8fd83 100644
--- a/edit_invoice_note_modal.php
+++ b/edit_invoice_note_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editInvoiceNoteModal" tabindex="-1">
+<div class="modal" id="editInvoiceNoteModal" tabindex="-1">
   <div class="modal-dialog modal-lg">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_mileage_modal.php b/edit_mileage_modal.php
index 4b238a3c..4208b768 100644
--- a/edit_mileage_modal.php
+++ b/edit_mileage_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editMileageModal<?php echo $mileage_id; ?>" tabindex="-1">
+<div class="modal" id="editMileageModal<?php echo $mileage_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -11,7 +11,7 @@
         <div class="modal-body">
           <input type="hidden" name="mileage_id" value="<?php echo $mileage_id; ?>">
           <div class="form-row">
-            <div class="form-group col-sm">
+            <div class="form-group col-7">
               <label>Date</label>
               <div class="input-group">
                 <div class="input-group-prepend">
@@ -20,7 +20,7 @@
                 <input type="date" class="form-control" name="date" value="<?php echo $mileage_date; ?>" required>
               </div>
             </div>
-            <div class="form-group col-sm">
+            <div class="form-group col-5">
               <label>Miles</label>
               <div class="input-group">
                 <div class="input-group-prepend">
@@ -30,24 +30,22 @@
               </div>
             </div>
           </div>
-          <div class="form-row">
-            <div class="form-group col-sm">
-              <label>Starting Location</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-map-marker"></i></span>
-                </div>
-                <input type="text" class="form-control" name="starting_location" value="<?php echo $mileage_starting_location; ?>" required>
+          <div class="form-group">
+            <label>Starting Location</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-map-marker"></i></span>
               </div>
+              <input type="text" class="form-control" name="starting_location" value="<?php echo $mileage_starting_location; ?>" required>
             </div>
-            <div class="form-group col-sm">
-              <label>Destination</label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-arrow-right"></i></span>
-                </div>
-                <input type="text" class="form-control" name="destination" value="<?php echo $mileage_destination; ?>" required>
+          </div>
+          <div class="form-group">
+            <label>Destination</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-arrow-right"></i></span>
               </div>
+              <input type="text" class="form-control" name="destination" value="<?php echo $mileage_destination; ?>" required>
             </div>
           </div>
           <div class="form-group">
diff --git a/edit_transfer_modal.php b/edit_transfer_modal.php
index 4e9ea1ac..a5d6fe9f 100644
--- a/edit_transfer_modal.php
+++ b/edit_transfer_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editTransferModal<?php echo $transfer_id; ?>" tabindex="-1">
+<div class="modal" id="editTransferModal<?php echo $transfer_id; ?>" tabindex="-1">
   <div class="modal-dialog modal-lg">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/edit_user_modal.php b/edit_user_modal.php
index 6e132cd1..dd687441 100644
--- a/edit_user_modal.php
+++ b/edit_user_modal.php
@@ -1,4 +1,4 @@
-<div class="modal fade" id="editUserModal<?php echo $user_id; ?>" tabindex="-1">
+<div class="modal" id="editUserModal<?php echo $user_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">