diff --git a/accounts.php b/accounts.php
index 0a839067..6d6aa7e9 100644
--- a/accounts.php
+++ b/accounts.php
@@ -1,9 +1,5 @@
 <?php include("header.php");
   
-  //Rebuild URL
-
-  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
-
   //Paging
   if(isset($_GET['p'])){
     $p = intval($_GET['p']);
@@ -40,20 +36,23 @@
     $disp = "DESC";
   }
 
+  //Rebuild URL
+  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+
   $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM accounts 
     WHERE account_name LIKE '%$q%' AND company_id = $session_company_id
     ORDER BY $sb $o LIMIT $record_from, $record_to");
 
   $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
-  $total_found_rows = $num_rows[0];
-  $total_pages = ceil($total_found_rows / 10);
 
 ?>
 
-<div class="card mb-3">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-piggy-bank mr-2"></i>Accounts</h6>
-    <button type="button" class="btn btn-primary btn-sm mr-auto float-right" data-toggle="modal" data-target="#addAccountModal"><i class="fas fa-plus"></i></button>
+<div class="card card-dark mb-3">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-piggy-bank"></i> Accounts</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAccountModal"><i class="fas fa-fw fa-plus"></i> New Account</button>
+    </div>
   </div>
   <div class="card-body">
     <form autocomplete="off">
@@ -111,12 +110,12 @@
                   <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="post.php?delete_account=<?php echo $account_id; ?>">Delete</a>
                 </div>
-              </div>
-              <?php include("edit_account_modal.php"); ?>      
+              </div>      
             </td>
           </tr>
 
           <?php
+          include("edit_account_modal.php");
           }
           ?>
 
diff --git a/add_account_modal.php b/add_account_modal.php
index 02aa4239..0c2836f9 100644
--- a/add_account_modal.php
+++ b/add_account_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="addAccountModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-piggy-bank mr-2"></i>New Account</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-piggy-bank"></i> New Account</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
diff --git a/add_calendar_event_modal.php b/add_calendar_event_modal.php
index bc3a7f7c..604f687b 100644
--- a/add_calendar_event_modal.php
+++ b/add_calendar_event_modal.php
@@ -1,14 +1,15 @@
 <div class="modal" id="addCalendarEventModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-calendar-plus mr-2"></i>New Event</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-calendar-plus"></i> New Event</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <div class="modal-body bg-white">
+          
           <div class="form-group">
             <label>Title <strong class="text-danger">*</strong></label>
             <div class="input-group">
@@ -18,6 +19,7 @@
               <input type="text" class="form-control" name="title" placeholder="Title of the event" required autofocus>
             </div>
           </div>
+          
           <div class="form-group">
             <label>Calendar <strong class="text-danger">*</strong></label>
             <div class="input-group">
diff --git a/add_expense_modal.php b/add_expense_modal.php
index d1dab453..26dce192 100644
--- a/add_expense_modal.php
+++ b/add_expense_modal.php
@@ -1,14 +1,15 @@
 <div class="modal" id="addExpenseModal" tabindex="-1">
   <div class="modal-dialog modal-lg">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-cart-plus mr-2"></i>New Expense</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-cart-plus"></i> New Expense</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
         <div class="modal-body bg-white">
+          
           <div class="form-row"> 
             <div class="form-group col-md">
               <label>Date <strong class="text-danger">*</strong></label>
@@ -29,7 +30,6 @@
                 <input type="number" class="form-control" step="0.01" name="amount" placeholder="Enter amount" autofocus required>
               </div>
             </div>
-
           </div>
 
           <div class="form-row">
@@ -145,6 +145,7 @@
             <label>Receipt</label>
             <input type="file" class="form-control-file" name="file">
           </div>
+          
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
diff --git a/add_invoice_copy_modal.php b/add_invoice_copy_modal.php
index 33981eca..f9687ecc 100644
--- a/add_invoice_copy_modal.php
+++ b/add_invoice_copy_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="addInvoiceCopyModal<?php echo $invoice_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-copy mr-2"></i>Copying <?php echo $invoice_number; ?></h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-copy"></i> Copying <?php echo $invoice_number; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
diff --git a/add_invoice_modal.php b/add_invoice_modal.php
index 15098154..bdd93498 100644
--- a/add_invoice_modal.php
+++ b/add_invoice_modal.php
@@ -1,8 +1,8 @@
 <div class="modal" id="addInvoiceModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-file mr-2"></i>New Invoice</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-file"></i> New Invoice</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -29,7 +29,7 @@
                   $client_id = $row['client_id'];
                   $client_name = $row['client_name'];
                 ?>
-                  <option <?php if($_GET['client_id'] == $client_id) { echo "selected"; } ?> value="<?php echo "$client_id"; ?>"><?php echo "$client_name"; ?></option>
+                  <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
                 
                 <?php
                 }
diff --git a/add_product_modal.php b/add_product_modal.php
index 1ec697ca..66de867c 100644
--- a/add_product_modal.php
+++ b/add_product_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="addProductModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-box mr-2"></i>New Product</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-box"></i> New Product</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
@@ -42,15 +42,19 @@
             <label>Description</label>
             <input type="text" class="form-control" name="description" placeholder="Product description">
           </div>
+          
           <div class="form-group">
             <label>Cost <strong class="text-danger">*</strong></label>
             <input type="number" step="0.01" min="0" class="form-control" name="cost" placeholder="Cost" required>
           </div>
+        
         </div>
+        
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_product" class="btn btn-primary">Save</button>
         </div>
+      
       </form>
     </div>
   </div>
diff --git a/add_quote_copy_modal.php b/add_quote_copy_modal.php
index b7eff05c..eb8e678b 100644
--- a/add_quote_copy_modal.php
+++ b/add_quote_copy_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="addQuoteCopyModal<?php echo $quote_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-copy mr-2"></i>Copying <?php echo $quote_number; ?></h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-copy"></i> Copying <?php echo $quote_number; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
diff --git a/add_quote_modal.php b/add_quote_modal.php
index bddaa83f..e7f2562e 100644
--- a/add_quote_modal.php
+++ b/add_quote_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="addQuoteModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-file mr-2"></i>New Quote</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-file"></i> New Quote</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
@@ -30,7 +30,7 @@
                   $client_id = $row['client_id'];
                   $client_name = $row['client_name'];
                 ?>
-                  <option <?php if($_GET['client_id'] == $client_id) { echo "selected"; } ?> value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+                  <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
                 
                 <?php
                 }
diff --git a/add_recurring_modal.php b/add_recurring_modal.php
index 1b11936d..beacfdb3 100644
--- a/add_recurring_modal.php
+++ b/add_recurring_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="addRecurringModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-sync-alt mr-2"></i>New Recurring Invoice</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-sync-alt"></i> New Recurring Invoice</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
@@ -29,7 +29,7 @@
                   $client_id = $row['client_id'];
                   $client_name = $row['client_name'];
                 ?>
-                  <option <?php if($_GET['client_id'] == $client_id) { echo "selected"; } ?> value="<?php echo "$client_id"; ?>"><?php echo "$client_name"; ?></option>
+                  <option value="<?php echo $client_id; ?>"><?php echo "$client_name"; ?></option>
                 
                 <?php
                 }
diff --git a/add_revenue_modal.php b/add_revenue_modal.php
index a2b405f3..896210f2 100644
--- a/add_revenue_modal.php
+++ b/add_revenue_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="addRevenueModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-money-bill-alt mr-2"></i>Add Revenue</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-money-bill-alt"></i> Add Revenue</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
diff --git a/add_ticket_modal.php b/add_ticket_modal.php
index 5c4a2d01..a8ca8609 100644
--- a/add_ticket_modal.php
+++ b/add_ticket_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="addTicketModal" tabindex="-1">
   <div class="modal-dialog modal-lg">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-tag mr-2"></i>New Ticket</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-tag"></i> New Ticket</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
diff --git a/add_transfer_modal.php b/add_transfer_modal.php
index 819fd05d..9d88cd20 100644
--- a/add_transfer_modal.php
+++ b/add_transfer_modal.php
@@ -1,34 +1,35 @@
 <div class="modal" id="addTransferModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-exchange-alt mr-2"></i>Transfer Money</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-exchange-alt"></i> Transfer Money</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <div class="modal-body bg-white">
 
-          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab" role="tablist">
+          <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
-              <a class="nav-link active" id="pills-details-tab" data-toggle="pill" href="#pills-details">Details</a>
+              <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" id="pills-assign-tab" data-toggle="pill" href="#pills-assign">Assign</a>
+              <a class="nav-link" data-toggle="pill" href="#pills-assign">Assign</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" id="pills-notes-tab" data-toggle="pill" href="#pills-notes">Notes</a>
+              <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
             </li>
           </ul>
 
           <hr>
 
-          <div class="tab-content" id="pills-tabContent">
+          <div class="tab-content">
 
             <div class="tab-pane fade show active" id="pills-details">
 
               <div class="form-row">
+                
                 <div class="form-group col">
                   <label>Date <strong class="text-danger">*</strong></label>
                   <div class="input-group">
@@ -38,6 +39,7 @@
                     <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
                   </div>
                 </div>
+                
                 <div class="form-group col">
                   <label>Amount <strong class="text-danger">*</strong></label>
                   <div class="input-group">
@@ -47,6 +49,7 @@
                     <input type="number" class="form-control" step="0.01" min="0" name="amount" placeholder="Amount to transfer" required autofocus>
                   </div>
                 </div>
+              
               </div>
            
               <div class="form-group">
@@ -88,6 +91,7 @@
                   </select>
                 </div>
               </div>
+
               <div class="form-group">
                 <div class="input-group">
                   <div class="input-group-prepend">
@@ -131,7 +135,10 @@
             <div class="tab-pane fade" id="pills-assign">
 
               <?php
-              $sql_payments = mysqli_query($mysqli,"SELECT * FROM payments, transfers WHERE account_id = 1 AND ");
+
+              //UNFINISHED BUSINESS (The goal is to select checks that need deposited and autocalculate)
+
+              $sql_payments = mysqli_query($mysqli,"SELECT * FROM payments WHERE account_id = 1");
 
               while($row = mysqli_fetch_array($sql_payments)){
                 $payment_id = $row['payment_id'];
@@ -141,7 +148,7 @@
 
                 <div class="form-check">
                   <input type="checkbox" class="form-check-input" name="payments[]" value="<?php echo $payment_id; ?>">
-                  <label class="form-check-label"><?php echo $payment_method - $payment_amount; ?></label>
+                  <label class="form-check-label"><?php echo "$payment_method - $payment_amount"; ?></label>
                 </div>
 
               <?php
diff --git a/add_trip_copy_modal.php b/add_trip_copy_modal.php
index d7dc18ff..92ba0980 100644
--- a/add_trip_copy_modal.php
+++ b/add_trip_copy_modal.php
@@ -2,112 +2,95 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-route mr-2"></i>Copy Trip</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-route"></i> Copy Trip</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <div class="modal-body bg-white">
 
-          <ul class="nav nav-pills nav-justified mb-3" id="pills-tabCopy<?php echo $trip_id; ?>">
-            <li class="nav-item">
-              <a class="nav-link active" id="pills-basic-tabCopy<?php echo $trip_id; ?>" data-toggle="pill" href="#pills-basicCopy<?php echo $trip_id; ?>">Basic</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" id="pills-link-tabCopy<?php echo $trip_id; ?>" data-toggle="pill" href="#pills-linkCopy<?php echo $trip_id; ?>" role="tab" aria-controls="pills-link" aria-selected="false">Link</a>
-            </li>
-          </ul>
-
-          <hr>
-      
-          <div class="tab-content" id="pills-tabContentCopy<?php echo $trip_id; ?>">
-
-            <div class="tab-pane fade show active" id="pills-basicCopy<?php echo $trip_id; ?>" role="tabpanel" aria-labelledby="pills-basic-tab">
-
-              <div class="form-row">
-                
-                <div class="form-group col">
-                  <label>Date <strong class="text-danger">*</strong></label>
-                  <div class="input-group">
-                    <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                    </div>
-                    <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
-                  </div>
-                </div>
-
-                <div class="form-group col">
-                  <label>Miles <strong class="text-danger">*</strong></label>
-                  <div class="input-group">
-                    <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
-                    </div>
-                    <input type="number" step="0.1" min="0" class="form-control" name="miles" value="<?php echo $trip_miles; ?>" required>
-                  </div>
-                </div>
-              
-              </div>
-
-              <div class="form-group">
-                <label>Location <strong class="text-danger">*</strong></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="source" value="<?php echo $trip_starting_location; ?>" required>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <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 $trip_destination; ?>" required>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Purpose <strong class="text-danger">*</strong></label>
-                <textarea rows="4" class="form-control" name="purpose" required><?php echo $trip_purpose; ?></textarea>
-              </div>
-
-              <div class="custom-control custom-checkbox">
-                <input type="checkbox" <?php if($round_trip == 1){ echo "checked"; } ?> class="custom-control-input" id="customControlAutosizingCopy<?php echo $trip_id; ?>" name="roundtrip" value="1" >
-                <label class="custom-control-label" for="customControlAutosizingCopy<?php echo $trip_id; ?>">Round Trip</label>
-              </div>
+          <div class="form-row">
             
-            </div>
-
-            <div class="tab-pane fade" id="pills-linkCopy<?php echo $trip_id; ?>" role="tabpanel" aria-labelledby="pills-link-tab">
-
-              <div class="form-group">
-                <label>Client</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                  </div>
-                  <select class="form-control select2" name="client">
-                    <option value="">- Client -</option>
-                    <?php 
-                    
-                    $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC"); 
-                    while($row = mysqli_fetch_array($sql_clients)){
-                      $client_id_select = $row['client_id'];
-                      $client_name_select = $row['client_name'];
-                    ?>
-                      <option <?php if($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
+            <div class="form-group col">
+              <label>Date <strong class="text-danger">*</strong></label>
+              <div class="input-group">
+                <div class="input-group-prepend">
+                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
+                <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
               </div>
-
             </div>
 
+            <div class="form-group col">
+              <label>Miles <strong class="text-danger">*</strong></label>
+              <div class="input-group">
+                <div class="input-group-prepend">
+                  <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
+                </div>
+                <input type="number" step="0.1" min="0" class="form-control" name="miles" value="<?php echo $trip_miles; ?>" required>
+              </div>
+            </div>
+          
+          </div>
+
+          <div class="form-group">
+            <label>Location <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
+              </div>
+              <input type="text" class="form-control" name="source" value="<?php echo $trip_source; ?>" required>
+            </div>
+          </div>
+          
+          <div class="form-group">
+            <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 $trip_destination; ?>" required>
+            </div>
+          </div>
+          
+          <div class="form-group">
+            <label>Purpose <strong class="text-danger">*</strong></label>
+            <textarea rows="4" class="form-control" name="purpose" required><?php echo $trip_purpose; ?></textarea>
+          </div>
+
+          <?php if(isset($_GET['client_id'])){ ?>
+          <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+          <?php }else{ ?>
+
+          <div class="form-group">
+            <label>Client</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+              </div>
+              <select class="form-control select2" name="client">
+                <option value="">- Client (Optional) -</option>
+                <?php 
+                
+                $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
+                while($row = mysqli_fetch_array($sql_clients)){
+                  $client_id_select = $row['client_id'];
+                  $client_name_select = $row['client_name'];
+                ?>
+                  <option <?php if($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
+            </div>
+          </div>
+
+          <?php } ?>
+
+          <div class="custom-control custom-checkbox">
+            <input type="checkbox" <?php if($round_trip == 1){ echo "checked"; } ?> class="custom-control-input" id="customControlAutosizingCopy<?php echo $trip_id; ?>" name="roundtrip" value="1" >
+            <label class="custom-control-label" for="customControlAutosizingCopy<?php echo $trip_id; ?>">Round Trip</label>
           </div>
 
         </div>
diff --git a/add_trip_modal.php b/add_trip_modal.php
index 72142765..658df0f5 100644
--- a/add_trip_modal.php
+++ b/add_trip_modal.php
@@ -1,108 +1,99 @@
 <div class="modal" id="addTripModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-route mr-2"></i>New Trip</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-route"></i> New Trip</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <div class="modal-body bg-white">
-          
-          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab">
-            <li class="nav-item">
-              <a class="nav-link active" id="pills-basic-tab" data-toggle="pill" href="#pills-basic">Basic</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" id="pills-link-tab" data-toggle="pill" href="#pills-link" role="tab" aria-controls="pills-link" aria-selected="false">Link</a>
-            </li>
-          </ul>
+        
 
-          <hr>
-
-          <div class="tab-content" id="pills-tabContent">
-
-            <div class="tab-pane fade show active" id="pills-basic" role="tabpanel" aria-labelledby="pills-basic-tab">
-
-              <div class="form-row">
-                <div class="form-group col">
-                  <label>Date <strong class="text-danger">*</strong></label>
-                  <div class="input-group">
-                    <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                    </div>
-                    <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
-                  </div>
-                </div>
-                <div class="form-group col">
-                  <label>Miles <strong class="text-danger">*</strong></label>
-                  <div class="input-group">
-                    <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
-                    </div>
-                    <input type="number" step="0.1" min="0" class="form-control" name="miles" placeholder="Enter miles" required autofocus>
-                  </div>
+          <div class="form-row">
+            <div class="form-group col">
+              <label>Date <strong class="text-danger">*</strong></label>
+              <div class="input-group">
+                <div class="input-group-prepend">
+                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
+                <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
               </div>
-              <div class="form-group">
-                <label>Location <strong class="text-danger">*</strong></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="source" placeholder="Enter your starting location" required>
-                </div>
-              </div>
-              <div class="form-group">
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-arrow-right"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="destination" placeholder="Enter your destination" required>
-                </div>
-              </div>
-              <div class="form-group">
-                <label>Purpose <strong class="text-danger">*</strong></label>
-                <textarea rows="4" class="form-control" name="purpose" required></textarea>
-              </div>
-              <div class="custom-control custom-checkbox">
-                <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="roundtrip" value="1" >
-                <label class="custom-control-label" for="customControlAutosizing">Round Trip</label>
-              </div>
+            </div>
             
-            </div>
-
-            <div class="tab-pane fade" id="pills-link" role="tabpanel" aria-labelledby="pills-link-tab">
-
-              <div class="form-group">
-                <label>Client</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                  </div>
-                  <select class="form-control select2" name="client">
-                    <option value="">- Client -</option>
-                    <?php 
-                    
-                    $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC"); 
-                    while($row = mysqli_fetch_array($sql)){
-                      $client_id = $row['client_id'];
-                      $client_name = $row['client_name'];
-                    ?>
-                      <option <?php if($_GET['client_id'] == $client_id) { echo "selected"; } ?> value="<?php echo "$client_id"; ?>"><?php echo "$client_name"; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
+            <div class="form-group col">
+              <label>Miles <strong class="text-danger">*</strong></label>
+              <div class="input-group">
+                <div class="input-group-prepend">
+                  <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
                 </div>
+                <input type="number" step="0.1" min="0" class="form-control" name="miles" placeholder="Enter miles" required autofocus>
               </div>
-
             </div>
+          </div>
+          
+          <div class="form-group">
+            <label>Location <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+              </div>
+              <input type="text" class="form-control" name="source" placeholder="Enter your starting location" required>
+            </div>
+          </div>
+          
+          <div class="form-group">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-arrow-right"></i></span>
+              </div>
+              <input type="text" class="form-control" name="destination" placeholder="Enter your destination" required>
+            </div>
+          </div>
+          
+          <div class="form-group">
+            <label>Purpose <strong class="text-danger">*</strong></label>
+            <textarea rows="4" class="form-control" name="purpose" required></textarea>
+          </div>
+
+          <?php if(isset($_GET['client_id'])){ ?>
+          <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+          <?php }else{ ?>
+          
+          <div class="form-group">
+            <label>Client</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+              </div>
+              <select class="form-control select2" name="client" required>
+                <option value="0">- Client (Optional) -</option>
+                <?php 
+                
+                $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC"); 
+                while($row = mysqli_fetch_array($sql)){
+                  $client_id = $row['client_id'];
+                  $client_name = $row['client_name'];
+                ?>
+                  <option value="<?php echo $client_id; ?>"><?php echo $client_name; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
+            </div>
+          </div>
+
+          <?php } ?>
+          
+          <div class="custom-control custom-checkbox">
+            <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="roundtrip" value="1" >
+            <label class="custom-control-label" for="customControlAutosizing">Round Trip</label>
+          </div>
 
-          </div> <!-- Tabn Content -->
         </div>
+
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_trip" class="btn btn-primary">Save</button>
diff --git a/assets.php b/assets.php
index 6519ba3f..a8c2fe68 100644
--- a/assets.php
+++ b/assets.php
@@ -1,9 +1,5 @@
 <?php include("header.php");
 
-//Rebuild URL
-
-//$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
-
 //Paging
 if(isset($_GET['p'])){
   $p = intval($_GET['p']);
@@ -56,24 +52,56 @@ if(!empty($_GET['dtf'])){
 
 $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM assets, clients WHERE (asset_name LIKE '%$q%' OR asset_type LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' OR asset_ip LIKE '%$q%' OR asset_mac LIKE '%$q%' OR client_name LIKE '%$q%') AND DATE(asset_created_at) BETWEEN '$dtf' AND '$dtt' AND  assets.client_id = clients.client_id AND assets.company_id = $session_company_id ORDER BY $sb $o LIMIT $record_from, $record_to"); 
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM assets, clients 
+  WHERE (asset_name LIKE '%$q%' OR asset_type LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' 
+  OR asset_ip LIKE '%$q%' OR asset_mac LIKE '%$q%' OR client_name LIKE '%$q%') 
+  AND DATE(asset_created_at) BETWEEN '$dtf' AND '$dtt' 
+  AND  assets.client_id = clients.client_id 
+  AND assets.company_id = $session_company_id 
+  ORDER BY $sb $o LIMIT $record_from, $record_to"
+); 
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 ?>
 
-<div class="card">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-desktop"></i> Assets</h6>
+<div class="card card-dark mb-3">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-desktop"></i> Assets</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addAssetModal"><i class="fas fa-fw fa-plus"></i> New Asset</button>
+    </div>
   </div>
+
   <div class="card-body">
-    <form autocomplete="off">
-      <div class="input-group">
-        <input type="search" class="form-control " name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search <?php echo ucwords($_GET['tab']); ?>">
-        <div class="input-group-append">
-          <button class="btn btn-secondary"><i class="fa fa-search"></i></button>
+    <form class="mb-4" autocomplete="off">
+      <div class="row">
+        <div class="col-sm-4">
+          <div class="input-group">
+            <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Assets">
+            <div class="input-group-append">
+              <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+            </div>
+          </div>
         </div>
       </div>
+      <div class="collapse mt-3 <?php if(!empty($_GET['dtf'])){ echo "show"; } ?>" id="advancedFilter">
+        <div class="row">
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date From</label>
+              <input type="date" class="form-control" name="dtf" value="<?php echo $dtf; ?>">
+            </div>
+          </div>
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date To</label>
+              <input type="date" class="form-control" name="dtt" value="<?php echo $dtt; ?>">
+            </div>
+          </div>
+        </div>    
+      </div>
     </form>
     <hr>
     <div class="table-responsive">
diff --git a/calendar_events.php b/calendar_events.php
index 82baa6df..959176e4 100644
--- a/calendar_events.php
+++ b/calendar_events.php
@@ -8,10 +8,9 @@ if(isset($_GET['calendar_id'])){
 
 ?>
 
-<div class="card">
-  <div class="card-header bg-dark text-white">
-    <i class="fa fa-fw fa-calendar-alt"></i>
-    Calendar
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title py-2"><i class="fa fa-fw fa-calendar-alt"></i> Calendar</h3>
   </div>
   <div class="card-body pt-0">
     <div id='calendar'></div>
diff --git a/client_add_trip_copy_modal.php b/client_add_trip_copy_modal.php
deleted file mode 100644
index c3f82a7d..00000000
--- a/client_add_trip_copy_modal.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<div class="modal" id="addTripCopyModal<?php echo $trip_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-bicycle mr-2"></i>Copy Trip</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">
-
-          <div class="form-row">
-            
-            <div class="form-group col">
-              <label>Date <strong class="text-danger">*</strong></label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                </div>
-                <input type="date" class="form-control" name="date" required>
-              </div>
-            </div>
-
-            <div class="form-group col">
-              <label>Miles <strong class="text-danger">*</strong></label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
-                </div>
-                <input type="number" step="0.1" min="0" class="form-control" name="miles" value="<?php echo $trip_miles; ?>" required>
-              </div>
-            </div>
-          
-          </div>
-
-          <div class="form-group">
-            <label>Location <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
-              </div>
-              <input type="text" class="form-control" name="source" value="<?php echo $trip_source; ?>" required>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <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 $trip_destination; ?>" required>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Purpose <strong class="text-danger">*</strong></label>
-            <textarea rows="4" class="form-control" name="purpose" required><?php echo $trip_purpose; ?></textarea>
-          </div>
-
-          <div class="custom-control custom-checkbox">
-            <input type="checkbox" class="custom-control-input" id="customControlAutosizingCopy<?php echo $trip_id; ?>" name="roundtrip" value="1" >
-            <label class="custom-control-label" for="customControlAutosizingCopy<?php echo $trip_id; ?>">Round Trip</label>
-          </div>
-        
-        </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_trip" class="btn btn-primary">Save</button>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/client_add_trip_modal.php b/client_add_trip_modal.php
deleted file mode 100644
index 283fae85..00000000
--- a/client_add_trip_modal.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<div class="modal" id="addTripModal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-bicycle mr-2"></i>New Trip</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span>&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">
-
-          <div class="form-row">
-            <div class="form-group col">
-              <label>Date <strong class="text-danger">*</strong></label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                </div>
-                <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
-              </div>
-            </div>
-            <div class="form-group col">
-              <label>Miles <strong class="text-danger">*</strong></label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
-                </div>
-                <input type="number" step="0.1" min="0" class="form-control" name="miles" placeholder="Enter miles" required autofocus>
-              </div>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Location <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-              </div>
-              <input type="text" class="form-control" name="source" placeholder="Enter your starting location" required>
-            </div>
-          </div>
-          <div class="form-group">
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-fw fa-arrow-right"></i></span>
-              </div>
-              <input type="text" class="form-control" name="destination" placeholder="Enter your destination" required>
-            </div>
-          </div>
-          <div class="form-group">
-            <label>Purpose <strong class="text-danger">*</strong></label>
-            <textarea rows="4" class="form-control" name="purpose" required></textarea>
-          </div>
-          <div class="custom-control custom-checkbox">
-            <input type="checkbox" class="custom-control-input" id="customControlAutosizing" name="roundtrip" value="1" >
-            <label class="custom-control-label" for="customControlAutosizing">Round Trip</label>
-          </div>
-        
-        </div>
-        
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="add_trip" class="btn btn-primary">Save</button>
-        </div>
-      </form>
-    </div> <!-- Modal Content -->
-  </div> <!-- Modal Dialog -->
-</div> <!-- Modal -->
\ No newline at end of file
diff --git a/client_edit_trip_modal.php b/client_edit_trip_modal.php
deleted file mode 100644
index 3b00135e..00000000
--- a/client_edit_trip_modal.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<div class="modal" id="editTripModal<?php echo $trip_id; ?>" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content bg-dark">
-      <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-bicycle mr-2"></i>Edit Trip</h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <input type="hidden" name="trip_id" value="<?php echo $trip_id; ?>">
-        <input type="hidden" name="client" value="<?php echo $client_id; ?>">
-        <div class="modal-body bg-white">
-    
-          <div class="form-row">
-            
-            <div class="form-group col">
-              <label>Date <strong class="text-danger">*</strong></label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                </div>
-                <input type="date" class="form-control" name="date" value="<?php echo $trip_date; ?>" required>
-              </div>
-            </div>
-            
-            <div class="form-group col">
-              <label>Miles <strong class="text-danger">*</strong></label>
-              <div class="input-group">
-                <div class="input-group-prepend">
-                  <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
-                </div>
-                <input type="number" step="0.1" min="0" class="form-control" name="miles" value="<?php echo $trip_miles; ?>" required>
-              </div>
-            </div>
-
-          </div>
-      
-          <div class="form-group">
-            <label>Location <strong class="text-danger">*</strong></label>
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
-              </div>
-              <input type="text" class="form-control" name="source" value="<?php echo $trip_source; ?>" required>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <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 $trip_destination; ?>" required>
-            </div>
-          </div>
-          
-          <div class="form-group">
-            <label>Purpose <strong class="text-danger">*</strong></label>
-            <textarea rows="4" class="form-control" name="purpose" required><?php echo $trip_purpose; ?></textarea>
-          </div>
-
-          <div class="custom-control custom-checkbox">
-            <input type="checkbox" <?php if($round_trip == 1){ echo "checked"; } ?> class="custom-control-input" id="customControlAutosizing<?php echo $trip_id; ?>" name="roundtrip" value="1" >
-            <label class="custom-control-label" for="customControlAutosizing<?php echo $trip_id; ?>">Round Trip</label>
-          </div>
-
-        </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-          <button type="submit" name="edit_trip" class="btn btn-primary">Save</button>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/client_trips.php b/client_trips.php
index 2ae322d1..6ba1003b 100644
--- a/client_trips.php
+++ b/client_trips.php
@@ -135,8 +135,8 @@ $total_pages = ceil($total_found_rows / 10);
   
               <?php 
               
-              include("client_add_trip_copy_modal.php");
-              include("client_edit_trip_modal.php");
+              include("add_trip_copy_modal.php");
+              include("edit_trip_modal.php");
 
               ?>
               
@@ -158,4 +158,4 @@ $total_pages = ceil($total_found_rows / 10);
   </div>
 </div>
 
-<?php include("client_add_trip_modal.php"); ?>
\ No newline at end of file
+<?php include("add_trip_modal.php"); ?>
\ No newline at end of file
diff --git a/clients.php b/clients.php
index 74042b19..94cbd73e 100644
--- a/clients.php
+++ b/clients.php
@@ -58,7 +58,13 @@ if(!empty($_GET['dtf'])){
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM clients WHERE (client_name LIKE '%$q%' OR client_type LIKE '%$q%' OR client_email LIKE '%$q%' OR client_contact LIKE '%$q%' OR client_phone LIKE '%$q%' OR client_mobile LIKE '%$q%' OR client_address LIKE '%$q%' OR client_city LIKE '%$q%' OR client_state LIKE '%$q%' OR client_zip LIKE '%$q%') AND DATE(client_created_at) BETWEEN '$dtf' AND '$dtt' AND company_id = $session_company_id $permission_sql ORDER BY $sb $o LIMIT $record_from, $record_to"); 
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM clients 
+  WHERE (client_name LIKE '%$q%' OR client_type LIKE '%$q%' OR client_email LIKE '%$q%' OR client_contact LIKE '%$q%' OR client_phone LIKE '%$q%' 
+  OR client_mobile LIKE '%$q%' OR client_address LIKE '%$q%' OR client_city LIKE '%$q%' OR client_state LIKE '%$q%' OR client_zip LIKE '%$q%') 
+  AND DATE(client_created_at) BETWEEN '$dtf' AND '$dtt' 
+  AND company_id = $session_company_id $permission_sql 
+  ORDER BY $sb $o LIMIT $record_from, $record_to"
+); 
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
@@ -66,7 +72,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 <div class="card card-dark mb-3">
   <div class="card-header">
-    <h3 class="card-title mt-2"><i class="fa fa-users"></i> Clients</h3>
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-users"></i> Clients</h3>
     <div class="card-tools">
       <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addClientModal"><i class="fas fa-fw fa-plus"></i> New Client</button>
     </div>
diff --git a/edit_account_modal.php b/edit_account_modal.php
index 27fb007d..77ac817e 100644
--- a/edit_account_modal.php
+++ b/edit_account_modal.php
@@ -2,9 +2,9 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-piggy-bank mr-2"></i><?php echo $account_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-piggy-bank"></i> <?php echo $account_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
diff --git a/edit_calendar_event_modal.php b/edit_calendar_event_modal.php
index 3ba88843..1c6f3c59 100644
--- a/edit_calendar_event_modal.php
+++ b/edit_calendar_event_modal.php
@@ -2,15 +2,17 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-calendar mr-2"></i><?php echo $event_title; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-calendar"></i> <?php echo $event_title; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
+      
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="event_id" value="<?php echo $event_id; ?>">
+        
         <div class="modal-body bg-white">
-          <p></p>
+
           <div class="form-group">
             <label>Title <strong class="text-danger">*</strong></label>
             <div class="input-group">
@@ -20,6 +22,7 @@
               <input type="text" class="form-control" name="title" value="<?php echo $event_title; ?>" placeholder="Title of the event" required>
             </div>
           </div>
+          
           <div class="form-group">
             <label>Calendar <strong class="text-danger">*</strong></label>
             <div class="input-group">
@@ -43,6 +46,7 @@
               </select>
             </div>
           </div>
+          
           <div class="form-group">
             <label>Starts <strong class="text-danger">*</strong></label>
             <div class="input-group">
@@ -52,6 +56,7 @@
               <input type="datetime-local" class="form-control" name="start" value="<?php echo date('Y-m-d\TH:i:s', strtotime($event_start)); ?>" required>
             </div>
           </div>
+          
           <div class="form-group">
             <label>Ends <strong class="text-danger">*</strong></label>
             <div class="input-group">
diff --git a/edit_invoice_modal.php b/edit_invoice_modal.php
index c62959d3..59dbfb8a 100644
--- a/edit_invoice_modal.php
+++ b/edit_invoice_modal.php
@@ -2,9 +2,9 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-file mr-2"></i><?php echo $invoice_number; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-file"></i> <?php echo $invoice_number; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
diff --git a/edit_product_modal.php b/edit_product_modal.php
index 06c8cc37..206dab8f 100644
--- a/edit_product_modal.php
+++ b/edit_product_modal.php
@@ -2,9 +2,9 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-box mr-2"></i><?php echo $product_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-box"></i> <?php echo $product_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
@@ -29,7 +29,7 @@
                   $category_id_select = $row['category_id'];
                   $category_name_select = $row['category_name'];
                 ?>
-                <option <?php if($category_id == $category_id_select){ ?> selected <?php } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name_select; ?></option>
+                <option <?php if($category_id == $category_id_select){ echo "selected"; } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name_select; ?></option>
                 <?php
                 }
                 
@@ -42,11 +42,14 @@
             <label>Description</label>
             <input type="text" class="form-control" name="description" value="<?php echo $product_description; ?>">
           </div>
+          
           <div class="form-group">
             <label>Cost <strong class="text-danger">*</strong></label>
             <input type="number" step="0.01" min="0" class="form-control" name="cost" value="<?php echo $product_cost; ?>" required>
           </div>
+        
         </div>
+        
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_product" class="btn btn-primary">Save</button>
diff --git a/edit_quote_modal.php b/edit_quote_modal.php
index ded76c12..810a3dd5 100644
--- a/edit_quote_modal.php
+++ b/edit_quote_modal.php
@@ -2,9 +2,9 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-file mr-2"></i><?php echo $quote_number; ?></h5>
+        <h5 class="modal-title text-white"><i class="fa fa-fw fa-file"></i> <?php echo $quote_number; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
@@ -12,6 +12,16 @@
 
         <div class="modal-body bg-white">
 
+          <div class="form-group">
+            <label>Scope</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
+              </div>
+              <input type="text" class="form-control" name="scope" placeholder="Quick description" value="<?php echo $quote_scope; ?>">
+            </div>
+          </div>
+
           <div class="form-group">
             <label>Quote Date</label>
             <div class="input-group">
@@ -37,7 +47,7 @@
                   $category_id_select = $row['category_id'];
                   $category_name_select = $row['category_name'];
                 ?>
-                <option <?php if($category_id_select == $category_id){ ?> selected <?php } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name_select; ?></option>
+                <option <?php if($category_id_select == $category_id){ echo "selected"; } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name_select; ?></option>
                 
                 <?php
                 }
diff --git a/edit_recurring_modal.php b/edit_recurring_modal.php
index bbebdffe..07f64ec4 100644
--- a/edit_recurring_modal.php
+++ b/edit_recurring_modal.php
@@ -2,9 +2,9 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-sync-alt mr-2"></i><?php echo $recurring_id; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-sync-alt"></i> <?php echo $recurring_id; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
diff --git a/edit_revenue_modal.php b/edit_revenue_modal.php
index 8f8db511..97018772 100644
--- a/edit_revenue_modal.php
+++ b/edit_revenue_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="editRevenueModal<?php echo $revenue_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-money-bill-alt mr-2"></i>Edit Revenue</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-money-bill-alt"></i> Edit Revenue</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
diff --git a/edit_ticket_modal.php b/edit_ticket_modal.php
index f842ab80..3ca4f09d 100644
--- a/edit_ticket_modal.php
+++ b/edit_ticket_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="editTicketModal<?php echo $ticket_id; ?>" tabindex="-1">
   <div class="modal-dialog modal-lg">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-tag mr-2"></i>Ticket # <?php echo $ticket_id; ?> for <?php echo $client_name; ?></h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-tag"></i> Ticket # <?php echo $ticket_id; ?> for <?php echo $client_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
diff --git a/edit_trip_modal.php b/edit_trip_modal.php
index 535b28b1..ae1f25a7 100644
--- a/edit_trip_modal.php
+++ b/edit_trip_modal.php
@@ -2,116 +2,100 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-route mr-2"></i>Edit Trip</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-route mr-2"></i>Edit Trip</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <div class="modal-body bg-white">
           <input type="hidden" name="trip_id" value="<?php echo $trip_id; ?>">
 
-          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab<?php echo $trip_id; ?>" role="tablist">
-            <li class="nav-item">
-              <a class="nav-link active" id="pills-basic-tab<?php echo $trip_id; ?>" data-toggle="pill" href="#pills-basic<?php echo $trip_id; ?>" role="tab" aria-controls="pills-basic" aria-selected="true">Basic</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" id="pills-link-tab<?php echo $trip_id; ?>" data-toggle="pill" href="#pills-link<?php echo $trip_id; ?>" role="tab" aria-controls="pills-link" aria-selected="false">Link</a>
-            </li>
-          </ul>
-
-          <hr>
-
-          <div class="tab-content" id="pills-tabContent<?php echo $trip_id; ?>">
-
-            <div class="tab-pane fade show active" id="pills-basic<?php echo $trip_id; ?>" role="tabpanel" aria-labelledby="pills-basic-tab">
-
-              <div class="form-row">
-                
-                <div class="form-group col">
-                  <label>Date <strong class="text-danger">*</strong></label>
-                  <div class="input-group">
-                    <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
-                    </div>
-                    <input type="date" class="form-control" name="date" value="<?php echo $trip_date; ?>" required>
-                  </div>
+          <div class="form-row">
+            
+            <div class="form-group col">
+              <label>Date <strong class="text-danger">*</strong></label>
+              <div class="input-group">
+                <div class="input-group-prepend">
+                  <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
                 </div>
-                
-                <div class="form-group col">
-                  <label>Miles <strong class="text-danger">*</strong></label>
-                  <div class="input-group">
-                    <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
-                    </div>
-                    <input type="number" step="0.1" min="0" class="form-control" name="miles" value="<?php echo $trip_miles; ?>" required>
-                  </div>
-                </div>
-
+                <input type="date" class="form-control" name="date" value="<?php echo $trip_date; ?>" required>
               </div>
-          
-              <div class="form-group">
-                <label>Location <strong class="text-danger">*</strong></label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="source" value="<?php echo $trip_source; ?>" required>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <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 $trip_destination; ?>" required>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Purpose <strong class="text-danger">*</strong></label>
-                <textarea rows="4" class="form-control" name="purpose" required><?php echo $trip_purpose; ?></textarea>
-              </div>
-
-              <div class="custom-control custom-checkbox">
-                <input type="checkbox" <?php if($round_trip == 1){ echo "checked"; } ?> class="custom-control-input" id="customControlAutosizingEdit<?php echo $trip_id; ?>" name="roundtrip" value="1" >
-                <label class="custom-control-label" for="customControlAutosizingEdit<?php echo $trip_id; ?>">Round Trip</label>
-              </div>
-
             </div>
-
-            <div class="tab-pane fade" id="pills-link<?php echo $trip_id; ?>" role="tabpanel" aria-labelledby="pills-link-tab">
-
-              <div class="form-group">
-                <label>Client</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                  </div>
-                  <select class="form-control select2" name="client">
-                    <option value="">- Client -</option>
-                    <?php 
-                    
-                    $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
-                    while($row = mysqli_fetch_array($sql_clients)){
-                      $client_id_select = $row['client_id'];
-                      $client_name_select = $row['client_name'];
-                    ?>
-                      <option <?php if($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
+            
+            <div class="form-group col">
+              <label>Miles <strong class="text-danger">*</strong></label>
+              <div class="input-group">
+                <div class="input-group-prepend">
+                  <span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
                 </div>
+                <input type="number" step="0.1" min="0" class="form-control" name="miles" value="<?php echo $trip_miles; ?>" required>
               </div>
             </div>
 
           </div>
-        
+      
+          <div class="form-group">
+            <label>Location <strong class="text-danger">*</strong></label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
+              </div>
+              <input type="text" class="form-control" name="source" value="<?php echo $trip_source; ?>" required>
+            </div>
+          </div>
+          
+          <div class="form-group">
+            <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 $trip_destination; ?>" required>
+            </div>
+          </div>
+          
+          <div class="form-group">
+            <label>Purpose <strong class="text-danger">*</strong></label>
+            <textarea rows="4" class="form-control" name="purpose" required><?php echo $trip_purpose; ?></textarea>
+          </div>
+
+          <div class="custom-control custom-checkbox">
+            <input type="checkbox" <?php if($round_trip == 1){ echo "checked"; } ?> class="custom-control-input" id="customControlAutosizingEdit<?php echo $trip_id; ?>" name="roundtrip" value="1" >
+            <label class="custom-control-label" for="customControlAutosizingEdit<?php echo $trip_id; ?>">Round Trip</label>
+          </div>
+
+          <?php if(isset($_GET['client_id'])){ ?>
+          <input type="hidden" name="client" value="<?php echo $client_id; ?>">
+          <?php }else{ ?>
+
+          <div class="form-group">
+            <label>Client</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
+              </div>
+              <select class="form-control select2" name="client">
+                <option value="">- Client (Optional) -</option>
+                <?php 
+                
+                $sql_clients = mysqli_query($mysqli,"SELECT * FROM clients WHERE company_id = $session_company_id ORDER BY client_name ASC");
+                while($row = mysqli_fetch_array($sql_clients)){
+                  $client_id_select = $row['client_id'];
+                  $client_name_select = $row['client_name'];
+                ?>
+                  <option <?php if($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
+                
+                <?php
+                }
+                ?>
+              </select>
+            </div>
+          </div>
+
+          <?php } ?>
+
         </div>
-        
+ 
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="edit_trip" class="btn btn-primary">Save</button>
diff --git a/expenses.php b/expenses.php
index 17794630..d7522cd3 100644
--- a/expenses.php
+++ b/expenses.php
@@ -1,101 +1,99 @@
 <?php include("header.php");
   
-  //Rebuild URL
+//Paging
+if(isset($_GET['p'])){
+  $p = intval($_GET['p']);
+  $record_from = (($p)-1)*$config_records_per_page;
+  $record_to = $config_records_per_page;
+}else{
+  $record_from = 0;
+  $record_to = $config_records_per_page;
+  $p = 1;
+}
+  
+if(isset($_GET['q'])){
+  $q = mysqli_real_escape_string($mysqli,$_GET['q']);
+}else{
+  $q = "";
+}
 
-  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+if(!empty($_GET['sb'])){
+  $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
+}else{
+  $sb = "expense_date";
+}
 
-  //Paging
-  if(isset($_GET['p'])){
-    $p = intval($_GET['p']);
-    $record_from = (($p)-1)*$config_records_per_page;
-    $record_to = $config_records_per_page;
-  }else{
-    $record_from = 0;
-    $record_to = $config_records_per_page;
-    $p = 1;
-  }
-    
-  if(isset($_GET['q'])){
-    $q = mysqli_real_escape_string($mysqli,$_GET['q']);
-  }else{
-    $q = "";
-  }
-
-  if(!empty($_GET['sb'])){
-    $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
-  }else{
-    $sb = "expense_date";
-  }
-
-  if(isset($_GET['o'])){
-    if($_GET['o'] == 'ASC'){
-      $o = "ASC";
-      $disp = "DESC";
-    }else{
-      $o = "DESC";
-      $disp = "ASC";
-    }
+if(isset($_GET['o'])){
+  if($_GET['o'] == 'ASC'){
+    $o = "ASC";
+    $disp = "DESC";
   }else{
     $o = "DESC";
     $disp = "ASC";
   }
+}else{
+  $o = "DESC";
+  $disp = "ASC";
+}
 
-  //Date From and Date To Filter
-  if(!empty($_GET['dtf'])){
-    $dtf = $_GET['dtf'];
-    $dtt = $_GET['dtt'];
-  }else{
-    $dtf = "0000-00-00";
-    $dtt = "9999-00-00";
-  }
+//Date From and Date To Filter
+if(!empty($_GET['dtf'])){
+  $dtf = $_GET['dtf'];
+  $dtt = $_GET['dtt'];
+}else{
+  $dtf = "0000-00-00";
+  $dtt = "9999-00-00";
+}
 
-  $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM expenses, categories, vendors, accounts
-    WHERE expenses.category_id = categories.category_id
-    AND expenses.vendor_id = vendors.vendor_id
-    AND expenses.account_id = accounts.account_id
-    AND expenses.company_id = $session_company_id
-    AND DATE(expense_date) BETWEEN '$dtf' AND '$dtt'
-    AND (vendor_name LIKE '%$q%' OR category_name LIKE '%$q%' OR account_name LIKE '%$q%' OR expense_description LIKE '%$q%')
-    ORDER BY $sb $o LIMIT $record_from, $record_to");
+//Rebuild URL
+$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
-  $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
-  $total_found_rows = $num_rows[0];
-  $total_pages = ceil($total_found_rows / 10);
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM expenses, categories, vendors, accounts
+  WHERE expenses.category_id = categories.category_id
+  AND expenses.vendor_id = vendors.vendor_id
+  AND expenses.account_id = accounts.account_id
+  AND expenses.company_id = $session_company_id
+  AND DATE(expense_date) BETWEEN '$dtf' AND '$dtt'
+  AND (vendor_name LIKE '%$q%' OR category_name LIKE '%$q%' OR account_name LIKE '%$q%' OR expense_description LIKE '%$q%' OR expense_amount LIKE '%$q%')
+  ORDER BY $sb $o LIMIT $record_from, $record_to");
+
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 ?>
 
-<div class="card mb-3">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-shopping-cart mr-2"></i>Expenses</h6>
-    <button type="button" class="btn btn-primary btn-sm mr-auto float-right" data-toggle="modal" data-target="#addExpenseModal"><i class="fas fa-fw fa-cart-plus"></i></button>
+<div class="card card-dark mb-3">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-shopping-cart"></i> Expenses</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addExpenseModal"><i class="fas fa-fw fa-plus"></i> New Expense</button>
+    </div>
   </div>
+
   <div class="card-body">
-    <form autocomplete="off">
+    <form class="mb-4" autocomplete="off">
       <div class="row">
-        <div class="col-md-4">
+        <div class="col-sm-4">
           <div class="input-group">
             <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Expenses">
             <div class="input-group-append">
+              <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
               <button class="btn btn-primary"><i class="fa fa-search"></i></button>
             </div>
           </div>
         </div>
-        <div class="col-md-8">
-          <button class="btn btn-primary float-right" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
-        </div>
       </div>
       <div class="collapse mt-3 <?php if(!empty($_GET['dtf'])){ echo "show"; } ?>" id="advancedFilter">
         <div class="row">
           <div class="col-md-2">
             <div class="form-group">
               <label>Date From</label>
-              <input type="date" class="form-control" name="dtf" value="<?php if(isset($dtf)){echo $dtf;} ?>">
+              <input type="date" class="form-control" name="dtf" value="<?php echo $dtf; ?>">
             </div>
           </div>
           <div class="col-md-2">
             <div class="form-group">
               <label>Date To</label>
-              <input type="date" class="form-control" name="dtt" value="<?php if(isset($dtt)){echo $dtt;} ?>">
+              <input type="date" class="form-control" name="dtt" value="<?php echo $dtt; ?>">
             </div>
           </div>
         </div>    
@@ -167,17 +165,14 @@
                   <a class="dropdown-item" href="post.php?delete_expense=<?php echo $expense_id; ?>">Delete</a>
                 </div>
               </div>
-              <?php
-
-              include("edit_expense_modal.php");
-              include("add_expense_copy_modal.php");
-              include("add_expense_refund_modal.php");
-
-              ?>      
             </td>
           </tr>
 
           <?php
+
+          include("edit_expense_modal.php");
+          include("add_expense_copy_modal.php");
+          include("add_expense_refund_modal.php");
           
           }
 
diff --git a/invoices.php b/invoices.php
index eef6b86b..3f86cda6 100644
--- a/invoices.php
+++ b/invoices.php
@@ -51,10 +51,6 @@
 
   $real_overdue_amount = $total_overdue - $total_overdue_partial;
 
-  //Rebuild URL
-
-  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
-
   //Paging
   if(isset($_GET['p'])){
     $p = intval($_GET['p']);
@@ -92,25 +88,26 @@
   }
 
   //Date From and Date To Filter
-  if(isset($_GET['dtf'])){
+  if(!empty($_GET['dtf'])){
     $dtf = $_GET['dtf'];
     $dtt = $_GET['dtt'];
   }else{
     $dtf = "0000-00-00";
     $dtt = "9999-00-00";
   }
+  
+  //Rebuild URL
+  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
   $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM invoices, clients, categories
     WHERE invoices.client_id = clients.client_id
     AND invoices.category_id = categories.category_id
     AND invoices.company_id = $session_company_id
     AND DATE(invoice_date) BETWEEN '$dtf' AND '$dtt'
-    AND (invoice_number LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR invoice_status LIKE '%$q%' OR category_name LIKE '%$q%')
+    AND (invoice_number LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR invoice_status LIKE '%$q%' OR category_name LIKE '%$q%') 
     ORDER BY $sb $o LIMIT $record_from, $record_to");
 
   $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
-  $total_found_rows = $num_rows[0];
-  $total_pages = ceil($total_found_rows / 10);
 
 ?>
 
@@ -173,19 +170,43 @@
 
 </div>
 
-<div class="card mb-3">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-2"><i class="fa fa-fw fa-file mr-2"></i>Invoices</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addInvoiceModal"><i class="fas fa-fw fa-plus"></i></button>
+<div class="card card-dark mb-3">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-file"></i> Invoices</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addInvoiceModal"><i class="fas fa-fw fa-plus"></i> New Invoice</button>
+    </div>
   </div>
+
   <div class="card-body">
-    <form 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 Invoices">
-        <div class="input-group-append">
-          <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+    <form class="mb-4" autocomplete="off">
+      <div class="row">
+        <div class="col-sm-4">
+          <div class="input-group">
+            <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Invoices">
+            <div class="input-group-append">
+              <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+            </div>
+          </div>
         </div>
       </div>
+      <div class="collapse mt-3 <?php if(!empty($_GET['dtf'])){ echo "show"; } ?>" id="advancedFilter">
+        <div class="row">
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date From</label>
+              <input type="date" class="form-control" name="dtf" value="<?php echo $dtf; ?>">
+            </div>
+          </div>
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date To</label>
+              <input type="date" class="form-control" name="dtt" value="<?php echo $dtt; ?>">
+            </div>
+          </div>
+        </div>    
+      </div>
     </form>
     <hr>
     <div class="table-responsive">
@@ -275,16 +296,13 @@
                   <a class="dropdown-item" href="post.php?delete_invoice=<?php echo $invoice_id; ?>">Delete</a>
                 </div>
               </div>
-              <?php
-
-              include("add_invoice_copy_modal.php");
-              include("edit_invoice_modal.php");
-
-              ?>      
             </td>
           </tr>
 
           <?php
+
+            include("add_invoice_copy_modal.php");
+            include("edit_invoice_modal.php");
           
           }
 
diff --git a/payments.php b/payments.php
index 91c1f906..e717b657 100644
--- a/payments.php
+++ b/payments.php
@@ -1,81 +1,101 @@
 <?php include("header.php");
 
-  //Rebuild URL
+//Paging
+if(isset($_GET['p'])){
+  $p = intval($_GET['p']);
+  $record_from = (($p)-1)*$config_records_per_page;
+  $record_to = $config_records_per_page;
+}else{
+  $record_from = 0;
+  $record_to = $config_records_per_page;
+  $p = 1;
+}
+  
+if(isset($_GET['q'])){
+  $q = mysqli_real_escape_string($mysqli,$_GET['q']);
+}else{
+  $q = "";
+}
 
-  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+if(!empty($_GET['sb'])){
+  $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
+}else{
+  $sb = "payment_date";
+}
 
-  //Paging
-  if(isset($_GET['p'])){
-    $p = intval($_GET['p']);
-    $record_from = (($p)-1)*$config_records_per_page;
-    $record_to = $config_records_per_page;
-  }else{
-    $record_from = 0;
-    $record_to = $config_records_per_page;
-    $p = 1;
-  }
-    
-  if(isset($_GET['q'])){
-    $q = mysqli_real_escape_string($mysqli,$_GET['q']);
-  }else{
-    $q = "";
-  }
-
-  if(!empty($_GET['sb'])){
-    $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
-  }else{
-    $sb = "payment_date";
-  }
-
-  if(isset($_GET['o'])){
-    if($_GET['o'] == 'ASC'){
-      $o = "ASC";
-      $disp = "DESC";
-    }else{
-      $o = "DESC";
-      $disp = "ASC";
-    }
+if(isset($_GET['o'])){
+  if($_GET['o'] == 'ASC'){
+    $o = "ASC";
+    $disp = "DESC";
   }else{
     $o = "DESC";
     $disp = "ASC";
   }
+}else{
+  $o = "DESC";
+  $disp = "ASC";
+}
 
-  //Date From and Date To Filter
-  if(isset($_GET['dtf'])){
-    $dtf = $_GET['dtf'];
-    $dtt = $_GET['dtt'];
-  }else{
-    $dtf = "0000-00-00";
-    $dtt = "9999-00-00";
-  }
+//Date From and Date To Filter
+if(!empty($_GET['dtf'])){
+  $dtf = $_GET['dtf'];
+  $dtt = $_GET['dtt'];
+}else{
+  $dtf = "0000-00-00";
+  $dtt = "9999-00-00";
+}
 
-  $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM payments, invoices, clients, accounts
-    WHERE invoices.client_id = clients.client_id
-    AND payments.invoice_id = invoices.invoice_id
-    AND payments.account_id = accounts.account_id
-    AND payments.company_id = $session_company_id
-    AND DATE(payment_date) BETWEEN '$dtf' AND '$dtt'
-    AND (invoice_number LIKE '%$q%' OR client_name LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%' OR payment_reference LIKE '%$q%')
-    ORDER BY $sb $o LIMIT $record_from, $record_to");
+//Rebuild URL
+$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
-  $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
-  $total_found_rows = $num_rows[0];
-  $total_pages = ceil($total_found_rows / 10);
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM payments, invoices, clients, accounts
+  WHERE invoices.client_id = clients.client_id
+  AND payments.invoice_id = invoices.invoice_id
+  AND payments.account_id = accounts.account_id
+  AND payments.company_id = $session_company_id
+  AND DATE(payment_date) BETWEEN '$dtf' AND '$dtt'
+  AND (invoice_number LIKE '%$q%' OR client_name LIKE '%$q%' OR account_name LIKE '%$q%' OR payment_method LIKE '%$q%' OR payment_reference LIKE '%$q%')
+  ORDER BY $sb $o LIMIT $record_from, $record_to"
+);
+
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 ?>
 
-<div class="card mb-3">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-credit-card mr-2"></i> Payments</h6>
+<div class="card card-dark mb-3">
+  <div class="card-header">
+    <h3 class="card-title py-2"><i class="fa fa-fw fa-credit-card"></i> Payments</h3>
   </div>
+
   <div class="card-body">
-    <form 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 Payments">
-        <div class="input-group-append">
-          <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+    <form class="mb-4" autocomplete="off">
+      <div class="row">
+        <div class="col-sm-4">
+          <div class="input-group">
+            <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Payments">
+            <div class="input-group-append">
+              <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+            </div>
+          </div>
         </div>
       </div>
+      <div class="collapse mt-3 <?php if(!empty($_GET['dtf'])){ echo "show"; } ?>" id="advancedFilter">
+        <div class="row">
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date From</label>
+              <input type="date" class="form-control" name="dtf" value="<?php echo $dtf; ?>">
+            </div>
+          </div>
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date To</label>
+              <input type="date" class="form-control" name="dtt" value="<?php echo $dtt; ?>">
+            </div>
+          </div>
+        </div>    
+      </div>
     </form>
     <hr>
     <div class="table-responsive">
diff --git a/products.php b/products.php
index 7bd2484f..9d2d1588 100644
--- a/products.php
+++ b/products.php
@@ -1,65 +1,72 @@
 <?php include("header.php");
 
-  //Rebuild URL
+//Paging
+if(isset($_GET['p'])){
+  $p = intval($_GET['p']);
+  $record_from = (($p)-1)*$config_records_per_page;
+  $record_to = $config_records_per_page;
+}else{
+  $record_from = 0;
+  $record_to = $config_records_per_page;
+  $p = 1;
+}
+  
+if(isset($_GET['q'])){
+  $q = mysqli_real_escape_string($mysqli,$_GET['q']);
+}else{
+  $q = "";
+}
 
-  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+if(!empty($_GET['sb'])){
+  $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
+}else{
+  $sb = "product_name";
+}
 
-  //Paging
-  if(isset($_GET['p'])){
-    $p = intval($_GET['p']);
-    $record_from = (($p)-1)*$config_records_per_page;
-    $record_to = $config_records_per_page;
-  }else{
-    $record_from = 0;
-    $record_to = $config_records_per_page;
-    $p = 1;
-  }
-    
-  if(isset($_GET['q'])){
-    $q = mysqli_real_escape_string($mysqli,$_GET['q']);
-  }else{
-    $q = "";
-  }
-
-  if(!empty($_GET['sb'])){
-    $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
-  }else{
-    $sb = "product_name";
-  }
-
-  if(isset($_GET['o'])){
-    if($_GET['o'] == 'ASC'){
-      $o = "ASC";
-      $disp = "DESC";
-    }else{
-      $o = "DESC";
-      $disp = "ASC";
-    }
-  }else{
+if(isset($_GET['o'])){
+  if($_GET['o'] == 'ASC'){
     $o = "ASC";
     $disp = "DESC";
+  }else{
+    $o = "DESC";
+    $disp = "ASC";
   }
+}else{
+  $o = "ASC";
+  $disp = "DESC";
+}
 
-  $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM products, categories WHERE products.category_id = categories.category_id AND products.company_id = $session_company_id AND (product_name LIKE '%$q%' OR category_name LIKE '%$q%') ORDER BY $sb $o LIMIT $record_from, $record_to");
+//Rebuild URL
+$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
-  $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
-  $total_found_rows = $num_rows[0];
-  $total_pages = ceil($total_found_rows / 10);
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM products, categories 
+  WHERE products.category_id = categories.category_id 
+  AND products.company_id = $session_company_id 
+  AND (product_name LIKE '%$q%' OR product_description LIKE '%$q%' OR category_name LIKE '%$q%' OR product_cost LIKE '%$q%') 
+  ORDER BY $sb $o LIMIT $record_from, $record_to");
+
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 ?>
 
-
-<div class="card mb-3">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-2"><i class="fa fa-fw fa-box mr-2"></i>Products</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addProductModal"><i class="fas fa-fw fa-plus"></i></button>
+<div class="card card-dark mb-3">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-box"></i> Products</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addProductModal"><i class="fas fa-fw fa-plus"></i> New Product</button>
+    </div>
   </div>
+
   <div class="card-body">
-    <form 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 Products">
-        <div class="input-group-append">
-          <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+    <form class="mb-4" autocomplete="off">
+      <div class="row">
+        <div class="col-sm-4">
+          <div class="input-group">
+            <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Products">
+            <div class="input-group-append">
+              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+            </div>
+          </div>
         </div>
       </div>
     </form>
@@ -70,7 +77,7 @@
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=product_name&o=<?php echo $disp; ?>">Name</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=category_name&o=<?php echo $disp; ?>">Category</a></th>
-            <th>Description</th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=product_description&o=<?php echo $disp; ?>">Description</a></th>
             <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=product_cost&o=<?php echo $disp; ?>">Cost</a></th>
             <th class="text-center">Action</th>
           </tr>
@@ -106,9 +113,9 @@
             </td>   
           </tr>
 
-          <?php include("edit_product_modal.php"); ?>
-
           <?php
+
+          include("edit_product_modal.php");
           
           }
           
diff --git a/quotes.php b/quotes.php
index 00bee432..d29a3a50 100644
--- a/quotes.php
+++ b/quotes.php
@@ -1,71 +1,104 @@
 <?php include("header.php");
 
-  //Rebuild URL
+//Paging
+if(isset($_GET['p'])){
+  $p = intval($_GET['p']);
+  $record_from = (($p)-1)*$config_records_per_page;
+  $record_to = $config_records_per_page;
+}else{
+  $record_from = 0;
+  $record_to = $config_records_per_page;
+  $p = 1;
+}
 
-  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+//Custom Query Filter    
+if(isset($_GET['q'])){
+  $q = mysqli_real_escape_string($mysqli,$_GET['q']);
+}else{
+  $q = "";
+}
 
-  //Paging
-  if(isset($_GET['p'])){
-    $p = intval($_GET['p']);
-    $record_from = (($p)-1)*$config_records_per_page;
-    $record_to = $config_records_per_page;
-  }else{
-    $record_from = 0;
-    $record_to = $config_records_per_page;
-    $p = 1;
-  }
-    
-  if(isset($_GET['q'])){
-    $q = mysqli_real_escape_string($mysqli,$_GET['q']);
-  }else{
-    $q = "";
-  }
+if(!empty($_GET['sb'])){
+  $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
+}else{
+  $sb = "quote_number";
+}
 
-  if(!empty($_GET['sb'])){
-    $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
-  }else{
-    $sb = "quote_number";
-  }
-
-  if(isset($_GET['o'])){
-    if($_GET['o'] == 'ASC'){
-      $o = "ASC";
-      $disp = "DESC";
-    }else{
-      $o = "DESC";
-      $disp = "ASC";
-    }
+//Column Order Filter
+if(isset($_GET['o'])){
+  if($_GET['o'] == 'ASC'){
+    $o = "ASC";
+    $disp = "DESC";
   }else{
     $o = "DESC";
     $disp = "ASC";
   }
- 
-  $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM quotes, clients, categories
-    WHERE quotes.client_id = clients.client_id
-    AND quotes.category_id = categories.category_id
-    AND quotes.company_id = $session_company_id
-    AND (quote_number LIKE '%$q%' OR client_name LIKE '%$q%')
-    ORDER BY $sb $o LIMIT $record_from, $record_to");
+}else{
+  $o = "DESC";
+  $disp = "ASC";
+}
 
-  $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
-  $total_found_rows = $num_rows[0];
-  $total_pages = ceil($total_found_rows / 10);
+//Date From and Date To Filter
+if(!empty($_GET['dtf'])){
+  $dtf = $_GET['dtf'];
+  $dtt = $_GET['dtt'];
+}else{
+  $dtf = "0000-00-00";
+  $dtt = "9999-00-00";
+}
+
+//Rebuild URL
+$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM quotes, clients, categories
+  WHERE quotes.client_id = clients.client_id
+  AND quotes.category_id = categories.category_id
+  AND quotes.company_id = $session_company_id
+  AND (quote_number LIKE '%$q%' OR quote_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR quote_status LIKE '%$q%' OR quote_amount LIKE '%$q%' OR client_name LIKE '%$q%')
+  AND DATE(quote_date) BETWEEN '$dtf' AND '$dtt'
+  ORDER BY $sb $o LIMIT $record_from, $record_to");
+
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 ?>
 
-<div class="card mb-3">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-file mr-2"></i>Quotes</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addQuoteModal"><i class="fas fa-fw fa-plus"></i></button>
+<div class="card card-dark mb-3">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-file"></i> Quotes</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addQuoteModal"><i class="fas fa-fw fa-plus"></i> New Quote</button>
+    </div>
   </div>
+
   <div class="card-body">
-    <form 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 Quotes">
-        <div class="input-group-append">
-          <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+    <form class="mb-4" autocomplete="off">
+      <div class="row">
+        <div class="col-sm-4">
+          <div class="input-group">
+            <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Quotes">
+            <div class="input-group-append">
+              <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+            </div>
+          </div>
         </div>
       </div>
+      <div class="collapse mt-3 <?php if(!empty($_GET['dtf'])){ echo "show"; } ?>" id="advancedFilter">
+        <div class="row">
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date From</label>
+              <input type="date" class="form-control" name="dtf" value="<?php echo $dtf; ?>">
+            </div>
+          </div>
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date To</label>
+              <input type="date" class="form-control" name="dtt" value="<?php echo $dtt; ?>">
+            </div>
+          </div>
+        </div>    
+      </div>
     </form>
     <hr>
     <div class="table-responsive">
@@ -143,16 +176,13 @@
                   <a class="dropdown-item" href="post.php?delete_quote=<?php echo $quote_id; ?>">Delete</a>
                 </div>
               </div>
-              <?php
-
-              include("edit_quote_modal.php");
-              include("add_quote_copy_modal.php");
-
-              ?>      
             </td>
           </tr>
 
           <?php
+            
+            include("edit_quote_modal.php");
+            include("add_quote_copy_modal.php");
 
           }
 
diff --git a/recurring.php b/recurring.php
index ae52347d..35536f12 100644
--- a/recurring.php
+++ b/recurring.php
@@ -1,71 +1,102 @@
 <?php include("header.php");
 
-  //Rebuild URL
+//Paging
+if(isset($_GET['p'])){
+  $p = intval($_GET['p']);
+  $record_from = (($p)-1)*$config_records_per_page;
+  $record_to = $config_records_per_page;
+}else{
+  $record_from = 0;
+  $record_to = $config_records_per_page;
+  $p = 1;
+}
+  
+if(isset($_GET['q'])){
+  $q = mysqli_real_escape_string($mysqli,$_GET['q']);
+}else{
+  $q = "";
+}
 
-  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+if(!empty($_GET['sb'])){
+  $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
+}else{
+  $sb = "recurring_next_date";
+}
 
-  //Paging
-  if(isset($_GET['p'])){
-    $p = intval($_GET['p']);
-    $record_from = (($p)-1)*$config_records_per_page;
-    $record_to = $config_records_per_page;
-  }else{
-    $record_from = 0;
-    $record_to = $config_records_per_page;
-    $p = 1;
-  }
-    
-  if(isset($_GET['q'])){
-    $q = mysqli_real_escape_string($mysqli,$_GET['q']);
-  }else{
-    $q = "";
-  }
-
-  if(!empty($_GET['sb'])){
-    $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
-  }else{
-    $sb = "recurring_next_date";
-  }
-
-  if(isset($_GET['o'])){
-    if($_GET['o'] == 'ASC'){
-      $o = "ASC";
-      $disp = "DESC";
-    }else{
-      $o = "DESC";
-      $disp = "ASC";
-    }
-  }else{
+if(isset($_GET['o'])){
+  if($_GET['o'] == 'ASC'){
     $o = "ASC";
     $disp = "DESC";
+  }else{
+    $o = "DESC";
+    $disp = "ASC";
   }
- 
-  $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM recurring, clients, categories
-    WHERE recurring.client_id = clients.client_id
-    AND recurring.category_id = categories.category_id
-    AND recurring.company_id = $session_company_id
-    AND (recurring_frequency LIKE '%$q%' OR recurring_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR category_name LIKE '%$q%')
-    ORDER BY $sb $o LIMIT $record_from, $record_to");
+}else{
+  $o = "ASC";
+  $disp = "DESC";
+}
 
-  $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
-  $total_found_rows = $num_rows[0];
-  $total_pages = ceil($total_found_rows / 10);
+//Date From and Date To Filter
+if(!empty($_GET['dtf'])){
+  $dtf = $_GET['dtf'];
+  $dtt = $_GET['dtt'];
+}else{
+  $dtf = "0000-00-00";
+  $dtt = "9999-00-00";
+}
+
+//Rebuild URL
+$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM recurring, clients, categories
+  WHERE recurring.client_id = clients.client_id
+  AND recurring.category_id = categories.category_id
+  AND recurring.company_id = $session_company_id
+  AND (recurring_frequency LIKE '%$q%' OR recurring_scope LIKE '%$q%' OR client_name LIKE '%$q%' OR category_name LIKE '%$q%')
+  AND DATE(recurring_next_date) BETWEEN '$dtf' AND '$dtt'
+  ORDER BY $sb $o LIMIT $record_from, $record_to");
+
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 ?>
 
-<div class="card mb-3">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-sync-alt mr-2"></i>Recurring Invoices</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addRecurringModal"><i class="fas fa-plus"></i></button>
+<div class="card card-dark mb-3">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-sync-alt"></i> Recurring Invoices</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRecurringModal"><i class="fas fa-fw fa-plus"></i> New Recurring</button>
+    </div>
   </div>
+
   <div class="card-body">
-    <form 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 Recurring Invoices">
-        <div class="input-group-append">
-          <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+    <form class="mb-4" autocomplete="off">
+      <div class="row">
+        <div class="col-sm-4">
+          <div class="input-group">
+            <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Recurring Invoices">
+            <div class="input-group-append">
+              <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+            </div>
+          </div>
         </div>
       </div>
+      <div class="collapse mt-3 <?php if(!empty($_GET['dtf'])){ echo "show"; } ?>" id="advancedFilter">
+        <div class="row">
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date From</label>
+              <input type="date" class="form-control" name="dtf" value="<?php echo $dtf; ?>">
+            </div>
+          </div>
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date To</label>
+              <input type="date" class="form-control" name="dtt" value="<?php echo $dtt; ?>">
+            </div>
+          </div>
+        </div>    
+      </div>
     </form>
     <hr>
     <div class="table-responsive">
diff --git a/revenues.php b/revenues.php
index 51ece8ec..19b062e9 100644
--- a/revenues.php
+++ b/revenues.php
@@ -1,71 +1,102 @@
 <?php include("header.php");
 
-  //Rebuild URL
+//Paging
+if(isset($_GET['p'])){
+  $p = intval($_GET['p']);
+  $record_from = (($p)-1)*$config_records_per_page;
+  $record_to = $config_records_per_page;
+}else{
+  $record_from = 0;
+  $record_to = $config_records_per_page;
+  $p = 1;
+}
+  
+if(isset($_GET['q'])){
+  $q = mysqli_real_escape_string($mysqli,$_GET['q']);
+}else{
+  $q = "";
+}
 
-  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+if(!empty($_GET['sb'])){
+  $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
+}else{
+  $sb = "revenue_date";
+}
 
-  //Paging
-  if(isset($_GET['p'])){
-    $p = intval($_GET['p']);
-    $record_from = (($p)-1)*$config_records_per_page;
-    $record_to = $config_records_per_page;
-  }else{
-    $record_from = 0;
-    $record_to = $config_records_per_page;
-    $p = 1;
-  }
-    
-  if(isset($_GET['q'])){
-    $q = mysqli_real_escape_string($mysqli,$_GET['q']);
-  }else{
-    $q = "";
-  }
-
-  if(!empty($_GET['sb'])){
-    $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
-  }else{
-    $sb = "revenue_date";
-  }
-
-  if(isset($_GET['o'])){
-    if($_GET['o'] == 'ASC'){
-      $o = "ASC";
-      $disp = "DESC";
-    }else{
-      $o = "DESC";
-      $disp = "ASC";
-    }
+if(isset($_GET['o'])){
+  if($_GET['o'] == 'ASC'){
+    $o = "ASC";
+    $disp = "DESC";
   }else{
     $o = "DESC";
     $disp = "ASC";
   }
+}else{
+  $o = "DESC";
+  $disp = "ASC";
+}
 
-  $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM accounts, revenues, categories
-    WHERE revenues.account_id = accounts.account_id
-    AND revenues.category_id = categories.category_id
-    AND revenues.company_id = $session_company_id
-    AND (account_name LIKE '%$q%' AND revenue_payment_method LIKE '%$q%')
-    ORDER BY $sb $o LIMIT $record_from, $record_to");
+//Date From and Date To Filter
+if(!empty($_GET['dtf'])){
+  $dtf = $_GET['dtf'];
+  $dtt = $_GET['dtt'];
+}else{
+  $dtf = "0000-00-00";
+  $dtt = "9999-00-00";
+}
 
-  $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
-  $total_found_rows = $num_rows[0];
-  $total_pages = ceil($total_found_rows / 10);
+//Rebuild URL
+$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM accounts, revenues, categories
+  WHERE revenues.account_id = accounts.account_id
+  AND revenues.category_id = categories.category_id
+  AND revenues.company_id = $session_company_id
+  AND (account_name LIKE '%$q%' OR revenue_payment_method LIKE '%$q%' OR category_name LIKE '%$q%' OR revenue_reference LIKE '%$q%' OR revenue_amount LIKE '%$q%')
+  AND DATE(revenue_date) BETWEEN '$dtf' AND '$dtt'
+  ORDER BY $sb $o LIMIT $record_from, $record_to");
+
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 ?>
 
-<div class="card mb-3">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-2"><i class="fa fa-fw fa-credit-card mr-2"></i>Revenues</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addRevenueModal"><i class="fas fa-fw fa-plus"></i></button>
+<div class="card card-dark mb-3">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-credit-card"></i> Revenues</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRevenueModal"><i class="fas fa-fw fa-plus"></i> Add Revenue</button>
+    </div>
   </div>
+
   <div class="card-body">
-    <form 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 Revenues">
-        <div class="input-group-append">
-          <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+    <form class="mb-4" autocomplete="off">
+      <div class="row">
+        <div class="col-sm-4">
+          <div class="input-group">
+            <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Revenues">
+            <div class="input-group-append">
+              <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+            </div>
+          </div>
         </div>
       </div>
+      <div class="collapse mt-3 <?php if(!empty($_GET['dtf'])){ echo "show"; } ?>" id="advancedFilter">
+        <div class="row">
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date From</label>
+              <input type="date" class="form-control" name="dtf" value="<?php echo $dtf; ?>">
+            </div>
+          </div>
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date To</label>
+              <input type="date" class="form-control" name="dtt" value="<?php echo $dtt; ?>">
+            </div>
+          </div>
+        </div>    
+      </div>
     </form>
     <hr>
     <div class="table-responsive">
diff --git a/tickets.php b/tickets.php
index 82d65f6d..5184b274 100644
--- a/tickets.php
+++ b/tickets.php
@@ -90,7 +90,7 @@
         
         </div>
         <div class="col-sm-8">
-          <div class="btn-group">
+          <div class="btn-group float-right">
             <a href="?status=%" class="btn <?php if($status == '%'){ echo 'btn-primary'; }else{ echo 'btn-default'; } ?>">All</a>
             <a href="?status=Open" class="btn <?php if($status == 'Open'){ echo 'btn-primary'; }else{ echo 'btn-default'; } ?>">Open</a>
             <a href="?status=In-Progress" class="btn <?php if($status == 'In-Progress'){ echo 'btn-primary'; }else{ echo 'btn-default'; } ?>">In-Progress</a>
diff --git a/transfers.php b/transfers.php
index 09be2b17..f1c3ca50 100644
--- a/transfers.php
+++ b/transfers.php
@@ -1,67 +1,102 @@
 <?php include("header.php"); 
+
+//Paging
+if(isset($_GET['p'])){
+  $p = intval($_GET['p']);
+  $record_from = (($p)-1)*$config_records_per_page;
+  $record_to = $config_records_per_page;
+}else{
+  $record_from = 0;
+  $record_to = $config_records_per_page;
+  $p = 1;
+}
   
-  //Rebuild URL
+if(isset($_GET['q'])){
+  $q = mysqli_real_escape_string($mysqli,$_GET['q']);
+}else{
+  $q = "";
+}
 
-  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+if(!empty($_GET['sb'])){
+  $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
+}else{
+  $sb = "transfer_date";
+}
 
-  //Paging
-  if(isset($_GET['p'])){
-    $p = intval($_GET['p']);
-    $record_from = (($p)-1)*$config_records_per_page;
-    $record_to = $config_records_per_page;
-  }else{
-    $record_from = 0;
-    $record_to = $config_records_per_page;
-    $p = 1;
-  }
-    
-  if(isset($_GET['q'])){
-    $q = mysqli_real_escape_string($mysqli,$_GET['q']);
-  }else{
-    $q = "";
-  }
-
-  if(!empty($_GET['sb'])){
-    $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
-  }else{
-    $sb = "transfer_date";
-  }
-
-  if(isset($_GET['o'])){
-    if($_GET['o'] == 'ASC'){
-      $o = "ASC";
-      $disp = "DESC";
-    }else{
-      $o = "DESC";
-      $disp = "ASC";
-    }
+if(isset($_GET['o'])){
+  if($_GET['o'] == 'ASC'){
+    $o = "ASC";
+    $disp = "DESC";
   }else{
     $o = "DESC";
     $disp = "ASC";
   }
- 
+}else{
+  $o = "DESC";
+  $disp = "ASC";
+}
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS expenses.expense_date AS transfer_date, expenses.expense_amount AS transfer_amount, expenses.account_id AS transfer_account_from, revenues.account_id AS transfer_account_to, transfers.expense_id, transfers.revenue_id , transfers.transfer_id, transfers.transfer_notes AS transfer_notes FROM transfers, expenses, revenues WHERE transfers.expense_id = expenses.expense_id AND transfers.revenue_id = revenues.revenue_id AND transfers.company_id = $session_company_id ORDER BY $sb $o LIMIT $record_from, $record_to");
+//Date From and Date To Filter
+if(!empty($_GET['dtf'])){
+  $dtf = $_GET['dtf'];
+  $dtt = $_GET['dtt'];
+}else{
+  $dtf = "0000-00-00";
+  $dtt = "9999-00-00";
+}
+
+//Rebuild URL
+$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+ 
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS expenses.expense_date AS transfer_date, expenses.expense_amount AS transfer_amount, expenses.account_id AS transfer_account_from, revenues.account_id AS transfer_account_to, transfers.expense_id, transfers.revenue_id , transfers.transfer_id, transfers.transfer_notes AS transfer_notes FROM transfers, expenses, revenues 
+  WHERE transfers.expense_id = expenses.expense_id 
+  AND transfers.revenue_id = revenues.revenue_id 
+  AND transfers.company_id = $session_company_id
+  AND DATE(expense_date) BETWEEN '$dtf' AND '$dtt'
+  ORDER BY $sb $o LIMIT $record_from, $record_to"
+);
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
-$total_found_rows = $num_rows[0];
-$total_pages = ceil($total_found_rows / 10);
 
 ?>
 
-<div class="card mb-3">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-exchange-alt mr-2"></i>Transfers</h6>
-    <button type="button" class="btn btn-primary btn-sm mr-auto float-right" data-toggle="modal" data-target="#addTransferModal"><i class="fas fa-plus"></i></button>
+<div class="card card-dark mb-3">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-exchange-alt"></i> Transfers</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTransferModal"><i class="fas fa-fw fa-plus"></i> New Transfer</button>
+    </div>
   </div>
+
   <div class="card-body">
-    <form 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 Transfers">
-        <div class="input-group-append">
-          <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+    <form class="mb-4" autocomplete="off">
+      <div class="row">
+        <div class="col-sm-4">
+          <div class="input-group">
+            <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Transfers">
+            <div class="input-group-append">
+              <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+            </div>
+          </div>
         </div>
       </div>
+      <div class="collapse mt-3 <?php if(!empty($_GET['dtf'])){ echo "show"; } ?>" id="advancedFilter">
+        <div class="row">
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date From</label>
+              <input type="date" class="form-control" name="dtf" value="<?php echo $dtf; ?>">
+            </div>
+          </div>
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date To</label>
+              <input type="date" class="form-control" name="dtt" value="<?php echo $dtt; ?>">
+            </div>
+          </div>
+        </div>    
+      </div>
     </form>
     <hr>
     <div class="table-responsive">
@@ -112,12 +147,13 @@ $total_pages = ceil($total_found_rows / 10);
                   <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="post.php?delete_transfer=<?php echo $transfer_id; ?>">Delete</a>
                 </div>
-              </div>
-              <?php include("edit_transfer_modal.php"); ?>      
+              </div>      
             </td>
           </tr>
 
           <?php
+
+          include("edit_transfer_modal.php");
         
           }
           
diff --git a/trips.php b/trips.php
index a76a0b3c..f45d543e 100644
--- a/trips.php
+++ b/trips.php
@@ -1,9 +1,5 @@
 <?php include("header.php");
 
-  //Rebuild URL
-
-  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
-
   //Paging
   if(isset($_GET['p'])){
     $p = intval($_GET['p']);
@@ -41,7 +37,7 @@
   }
 
   //Date From and Date To Filter
-  if(isset($_GET['dtf'])){
+  if(!empty($_GET['dtf'])){
     $dtf = $_GET['dtf'];
     $dtt = $_GET['dtt'];
   }else{
@@ -49,11 +45,15 @@
     $dtt = "9999-00-00";
   }
 
+  //Rebuild URL
+  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+
   $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM trips  
-    WHERE (trip_purpose LIKE '%$q%' OR trip_source LIKE '%$q%' OR trip_destination LIKE '%$q%')
+    WHERE (trip_purpose LIKE '%$q%' OR trip_source LIKE '%$q%' OR trip_destination LIKE '%$q%' OR trip_miles LIKE '%$q%')
     AND DATE(trip_date) BETWEEN '$dtf' AND '$dtt'
     AND company_id = $session_company_id
-    ORDER BY $sb $o LIMIT $record_from, $record_to");
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
+  );
 
   $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
   $total_found_rows = $num_rows[0];
@@ -61,19 +61,43 @@
 
 ?>
 
-<div class="card mb-3">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-route mr-2"></i>Trips</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addTripModal"><i class="fas fa-plus"></i></button>
+<div class="card card-dark mb-3">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-route"></i> Trips</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTripModal"><i class="fas fa-fw fa-plus"></i> New Trip</button>
+    </div>
   </div>
+
   <div class="card-body">
-    <form 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 Trips">
-        <div class="input-group-append">
-          <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+    <form class="mb-4" autocomplete="off">
+      <div class="row">
+        <div class="col-sm-4">
+          <div class="input-group">
+            <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Trips">
+            <div class="input-group-append">
+              <button class="btn btn-secondary" type="button" data-toggle="collapse" data-target="#advancedFilter"><i class="fas fa-filter"></i></button>
+              <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+            </div>
+          </div>
         </div>
       </div>
+      <div class="collapse mt-3 <?php if(!empty($_GET['dtf'])){ echo "show"; } ?>" id="advancedFilter">
+        <div class="row">
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date From</label>
+              <input type="date" class="form-control" name="dtf" value="<?php echo $dtf; ?>">
+            </div>
+          </div>
+          <div class="col-md-2">
+            <div class="form-group">
+              <label>Date To</label>
+              <input type="date" class="form-control" name="dtt" value="<?php echo $dtt; ?>">
+            </div>
+          </div>
+        </div>    
+      </div>
     </form>
     <hr>
     <div class="table-responsive">
@@ -128,18 +152,13 @@
                   <a class="dropdown-item" href="post.php?delete_trip=<?php echo $trip_id; ?>">Delete</a>
                 </div>
               </div>
-  
-              <?php 
-              
-              include("add_trip_copy_modal.php");
-              include("edit_trip_modal.php");
-
-              ?>
-              
             </td>
           </tr>
 
           <?php
+
+          include("add_trip_copy_modal.php");
+          include("edit_trip_modal.php");
           
           }