diff --git a/add_asset_modal.php b/add_asset_modal.php
index b25c4c0a..9e46df5c 100644
--- a/add_asset_modal.php
+++ b/add_asset_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="addAssetModal" 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-desktop mr-2"></i>New Asset</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-desktop"></i> New Asset</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
       
diff --git a/add_category_modal.php b/add_category_modal.php
index 955e4fe7..6a4bc868 100644
--- a/add_category_modal.php
+++ b/add_category_modal.php
@@ -1,18 +1,20 @@
 <div class="modal" id="addCategoryModal" 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-list mr-2"></i>New Category</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-list"></i> New Category</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>Name <strong class="text-danger">*</strong></label>
             <input type="text" class="form-control" name="name" placeholder="Category name" required autofocus>
           </div>
+          
           <div class="form-group">
             <label>Type <strong class="text-danger">*</strong></label>
             <select class="form-control select2" name="type" required>
@@ -22,10 +24,12 @@
               <?php } ?>
             </select>
           </div>
+          
           <div class="form-group">
             <label>Color <strong class="text-danger">*</strong></label>
             <input type="color" class="form-control col-md-2" name="color">
           </div>
+        
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
diff --git a/add_certificate_modal.php b/add_certificate_modal.php
index 62b8d76a..b69556f9 100644
--- a/add_certificate_modal.php
+++ b/add_certificate_modal.php
@@ -1,15 +1,16 @@
 <div class="modal" id="addCertificateModal" 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-lock mr-2"></i>New Certificate</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-lock"></i> New Certificate</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="client_id" value="<?php echo $client_id; ?>">
         <div class="modal-body bg-white">    
+          
           <div class="form-group">
             <label>Certificate Name <strong class="text-danger">*</strong></label>
             <div class="input-group">
diff --git a/add_contact_modal.php b/add_contact_modal.php
index b8623af5..01215df9 100644
--- a/add_contact_modal.php
+++ b/add_contact_modal.php
@@ -1,31 +1,31 @@
 <div class="modal" id="addContactModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="far fa-fw fa-address-card mr-2"></i>New Contact</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="far fa-fw fa-address-card"></i> New Contact</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">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
         <div class="modal-body bg-white">   
           
-          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab">
+          <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-photo-tab" data-toggle="pill" href="#pills-photo">Photo</a>
+              <a class="nav-link" data-toggle="pill" href="#pills-photo">Photo</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"> 
           
@@ -108,7 +108,7 @@
           </div>
         
         </div>
-        <div class="modal-footer bg-light">
+        <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
           <button type="submit" name="add_contact" class="btn btn-primary">Save</button>
         </div>
diff --git a/add_document_modal.php b/add_document_modal.php
index 8d6e9053..41d714f3 100644
--- a/add_document_modal.php
+++ b/add_document_modal.php
@@ -1,22 +1,25 @@
 <div class="modal" id="addDocumentModal" tabindex="-1">
   <div class="modal-dialog modal-xl">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-file-alt mr-2"></i>New Document</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-file-alt"></i> New Document</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="client_id" value="<?php echo $client_id; ?>">
         <div class="modal-body bg-white">  
+          
           <div class="form-group">
             <input type="text" class="form-control" name="name" placeholder="Name" required autofocus>
           </div>
+          
           <div class="form-group">
             <textarea class="form-control summernote" name="details"></textarea>
           </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_document" class="btn btn-primary">Save</button>
diff --git a/add_domain_modal.php b/add_domain_modal.php
index e3a0cb6a..e7b3dd52 100644
--- a/add_domain_modal.php
+++ b/add_domain_modal.php
@@ -1,15 +1,16 @@
 <div class="modal" id="addDomainModal" 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-globe mr-2"></i>New Domain</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-globe"></i> New Domain</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="client_id" value="<?php echo $client_id; ?>">
         <div class="modal-body bg-white">    
+          
           <div class="form-group">
             <label>Domain Name <strong class="text-danger">*</strong></label>
             <div class="input-group">
diff --git a/add_file_modal.php b/add_file_modal.php
index 773ff6e7..1b32c042 100644
--- a/add_file_modal.php
+++ b/add_file_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="addFileModal" tabindex="-1">
   <div class="modal-dialog modal-sm">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-cloud-upload-alt mr-2"></i>Upload File</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-cloud-upload-alt"></i> Upload File</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">
@@ -18,6 +18,7 @@
           <div class="form-group">
             <input type="file" class="form-control-file" name="file">
           </div>
+          
         </div>
         <div class="modal-footer bg-white">
           <button type="submit" name="add_file" class="btn btn-primary">Upload</button>
diff --git a/add_location_modal.php b/add_location_modal.php
index 0adb3a65..cd35ffa7 100644
--- a/add_location_modal.php
+++ b/add_location_modal.php
@@ -1,37 +1,34 @@
 <div class="modal" id="addLocationModal" 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-map-marker-alt mr-2"></i>New Location</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt"></i> New Location</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">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
         <div class="modal-body bg-white">
 
-          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab">
+          <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-address-tab" data-toggle="pill" href="#pills-address">Address</a>
+              <a class="nav-link" data-toggle="pill" href="#pills-address">Address</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" id="pills-contact-tab" data-toggle="pill" href="#pills-contact">Contact</a>
+              <a class="nav-link" data-toggle="pill" href="#pills-photo">Photo</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" id="pills-photo-tab" data-toggle="pill" href="#pills-photo">Photo</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">
 
@@ -55,6 +52,40 @@
                 </div>
               </div>
 
+              <div class="form-group">
+                <label>Contact</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" name="contact">
+                    <option value="">- Contact -</option>
+                    <?php 
+                    
+                    $sql_vendors = mysqli_query($mysqli,"SELECT * FROM contacts WHERE client_id = $client_id ORDER BY contact_name ASC"); 
+                    while($row = mysqli_fetch_array($sql_vendors)){
+                      $contact_id = $row['contact_id'];
+                      $contact_name = $row['contact_name'];
+                    ?>
+                      <option value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label>Hours</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="hours" placeholder="Hours of operation"> 
+                </div>
+              </div>
+
             </div>
 
             <div class="tab-pane fade" id="pills-address">
@@ -121,44 +152,6 @@
 
             </div>
 
-            <div class="tab-pane fade" id="pills-contact">
-
-              <div class="form-group">
-                <label>Contact</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" name="contact">
-                    <option value="">- Contact -</option>
-                    <?php 
-                    
-                    $sql_vendors = mysqli_query($mysqli,"SELECT * FROM contacts WHERE client_id = $client_id ORDER BY contact_name ASC"); 
-                    while($row = mysqli_fetch_array($sql_vendors)){
-                      $contact_id = $row['contact_id'];
-                      $contact_name = $row['contact_name'];
-                    ?>
-                      <option value="<?php echo $contact_id; ?>"><?php echo $contact_name; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Hours</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="hours" placeholder="Hours of operation"> 
-                </div>
-              </div>
-
-            </div>
-
             <div class="tab-pane fade" id="pills-photo">
 
               <div class="form-group">
diff --git a/add_login_modal.php b/add_login_modal.php
index b155af83..9800ee9c 100644
--- a/add_login_modal.php
+++ b/add_login_modal.php
@@ -1,31 +1,31 @@
 <div class="modal" id="addLoginModal" 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-key mr-2"></i>New Login</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-key"></i> New Login</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="client_id" value="<?php echo $client_id; ?>">
         <div class="modal-body bg-white">  
 
-          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab">
+          <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-relation-tab" data-toggle="pill" href="#pills-relation">Relation</a>
+              <a class="nav-link" data-toggle="pill" href="#pills-relation">Relation</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">
 
diff --git a/add_network_modal.php b/add_network_modal.php
index f1cbac87..351dbd00 100644
--- a/add_network_modal.php
+++ b/add_network_modal.php
@@ -1,15 +1,16 @@
 <div class="modal" id="addNetworkModal" 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-network-wired mr-2"></i>New Network</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-network-wired"></i> New Network</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="client_id" value="<?php echo $client_id; ?>">
         <div class="modal-body bg-white">    
+          
           <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
             <div class="input-group">
diff --git a/add_software_modal.php b/add_software_modal.php
index 4d08d67d..956ee43d 100644
--- a/add_software_modal.php
+++ b/add_software_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="addSoftwareModal" 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-rocket mr-2"></i>New Software</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-rocket"></i> New Software</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_user_modal.php b/add_user_modal.php
index ab38cef3..ad1e6bf8 100644
--- a/add_user_modal.php
+++ b/add_user_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="addUserModal" 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-user mr-2"></i>New User</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-user"></i> New User</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">
diff --git a/alerts.php b/alerts.php
index 84790d57..364ae56e 100644
--- a/alerts.php
+++ b/alerts.php
@@ -6,16 +6,18 @@ $sql = mysqli_query($mysqli,"SELECT * FROM alerts WHERE alert_ack_date IS NULL A
 
 ?>
 
-<div class="card mb-3">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-exclamation-triangle"></i> Alerts</h6>
-    <a href="post.php?ack_all_alerts" class="btn btn-success btn-sm badge-pill float-right mr-2"> <i class="fa fa-check"></i> Acknowledge All</a>
-    <a href="alerts_archived.php" class="btn btn-secondary btn-sm badge-pill float-right mr-2">Archived</a>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-exclamation-triangle"></i> Alerts</h3>
+    <div class="card-tools">
+      <a href="post.php?ack_all_alerts" class="btn btn-success"> <i class="fa fa-check"></i> Acknowledge All</a>
+      <a href="alerts_archived.php" class="btn btn-secondary">Archived</a>
+    </div>
   </div>
   <div class="card-body">
     <div class="table-responsive">
-      <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
-        <thead class="thead-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
+      <table class="table table-striped table-borderless table-hover">
+        <thead>
           <tr>
             <th>Date</th>
             <th>Type</th>
diff --git a/alerts_archived.php b/alerts_archived.php
index 60fc27ed..97603f11 100644
--- a/alerts_archived.php
+++ b/alerts_archived.php
@@ -58,14 +58,9 @@ $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-exclamation-triangle mr-2"></i>Archived Alerts</h6>
-    <a href="post.php?ack_all_alerts" class="btn btn-success btn-sm badge-pill float-right mr-2"> <i class="fa fa-check"></i> Acknowledge All</a>
-    <?php if($num_new_alerts > 0){ ?>
-    <a href="new_alerts.php" class="btn btn-info btn-sm badge-pill float-right mr-2">New</a>
-    <?php } ?>
-    <a href="archive_alerts.php" class="btn btn-secondary btn-sm badge-pill float-right mr-2">Archived</a>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title"><i class="fa fa-fw fa-exclamation-triangle"></i> Archived Alerts</h3>
   </div>
   <div class="card-body">
     <form class="mb-4" autocomplete="off">
@@ -134,9 +129,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
         </tbody>
       </table>
-      <div class="mr-3">
-        <?php include("pagination.php"); ?>
-      </div>
+     
+      <?php include("pagination.php"); ?>
+      
     </div>
   </div>
 </div>
diff --git a/calendar_events.php b/calendar_events.php
index 959176e4..0a654624 100644
--- a/calendar_events.php
+++ b/calendar_events.php
@@ -10,7 +10,7 @@ if(isset($_GET['calendar_id'])){
 
 <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>
+    <h3 class="card-title"><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/categories.php b/categories.php
index 503a28ba..ac2192d5 100644
--- a/categories.php
+++ b/categories.php
@@ -1,58 +1,57 @@
 <?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 = "category_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 = "category_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 categories WHERE (category_name LIKE '%$q%' OR category_type LIKE '%$q%') AND company_id = $session_company_id 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 categories WHERE (category_name LIKE '%$q%' OR category_type 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()"));
+
+?>
 
 
-<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-list mr-2"></i>Categories</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addCategoryModal"><i class="fas fa-plus"></i></button>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-list"></i> Categories</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCategoryModal"><i class="fas fa-fw fa-plus"></i> New Category</button>
+    </div>
   </div>
   <div class="card-body">
     <form autocomplete="off">
@@ -86,24 +85,27 @@
           ?>
           <tr>
             <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editCategoryModal<?php echo $category_id; ?>"><?php echo "$category_name"; ?></a></td>
-            <td><?php echo "$category_type"; ?></td>
+            <td><?php echo $category_type; ?></td>
             <td><i class="fa fa-2x fa-circle" style="color:<?php echo $category_color; ?>;"></i></td>
             <td>
               <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
                   <i class="fas fa-ellipsis-h"></i>
                 </button>
-                <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                <div class="dropdown-menu">
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editCategoryModal<?php echo $category_id; ?>">Edit</a>
+                  <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="post.php?delete_category=<?php echo $category_id; ?>">Delete</a>
                 </div>
               </div>
-              <?php include("edit_category_modal.php"); ?> 
             </td>
           </tr>
 
           <?php
+
+          include("edit_category_modal.php");
           }
+
           ?>
 
         </tbody>
diff --git a/client_assets.php b/client_assets.php
index 7cfa94ed..31d98bce 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -1,9 +1,5 @@
 <?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,21 +36,24 @@ if(isset($_GET['o'])){
   $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 assets
   WHERE client_id = $client_id 
   AND (asset_name LIKE '%$q%' OR asset_type LIKE '%$q%' OR asset_ip LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial 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);
 
 ?>
 
-<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>
-    <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addAssetModal"><i class="fa fa-plus"></i></button>
+<div class="card card-dark">
+  <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">
@@ -67,6 +66,7 @@ $total_pages = ceil($total_found_rows / 10);
         </div>
       </div>
     </form>
+    <hr>
     <div class="table-responsive">
       <table class="table border table-hover">
         <thead class="thead-light <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
@@ -164,7 +164,7 @@ $total_pages = ceil($total_found_rows / 10);
               <div class="modal" id="viewPasswordModal<?php echo $login_id; ?>" tabindex="-1">
                 <div class="modal-dialog modal-sm">
                   <div class="modal-content bg-dark">
-                    <div class="modal-header text-white">
+                    <div class="modal-header">
                       <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i><?php echo $asset_name; ?></h5>
                       <button type="button" class="close text-white" data-dismiss="modal">
                         <span>&times;</span>
@@ -205,21 +205,21 @@ $total_pages = ceil($total_found_rows / 10);
             <td><?php echo $location_name; ?></td>
             <td>
               <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
-                  <i class="fas fa-ellipsis-h"></i>
-                </button>
+                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown"><i class="fas fa-ellipsis-h"></i></button>
                 <div class="dropdown-menu">
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editAssetModal<?php echo $asset_id; ?>">Edit</a>
                   <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="post.php?delete_asset=<?php echo $asset_id; ?>">Delete</a>
                 </div>
               </div>
-              <?php include("edit_domain_modal.php"); ?>     
             </td>
           </tr>
-          <?php include("edit_asset_modal.php"); ?>
+
           <?php
+          
+          include("edit_asset_modal.php");
           }
+          
           ?>
 
         </tbody>
diff --git a/client_certificates.php b/client_certificates.php
index 5a8b3bea..9895f57f 100644
--- a/client_certificates.php
+++ b/client_certificates.php
@@ -1,9 +1,5 @@
 <?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 @@ if(isset($_GET['o'])){
   $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 certificates 
   WHERE client_id = $client_id AND (certificate_name LIKE '%$q%' OR certificate_domain LIKE '%$q%' OR certificate_issued_by 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);
 
 ?>
 
-<div class="card">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-lock"></i> Certificates</h6>
-    <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addCertificateModal"><i class="fa fa-plus"></i></button>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-lock"></i> Certificates</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCertificateModal"><i class="fas fa-fw fa-plus"></i> New Certificate</button>
+    </div>
   </div>
   <div class="card-body">
     <form autocomplete="off">
@@ -108,12 +107,12 @@ $total_pages = ceil($total_found_rows / 10);
                   <a class="dropdown-item" href="post.php?delete_certificate=<?php echo $certificate_id; ?>">Delete</a>
                 </div>
               </div>
-              <?php include("edit_certificate_modal.php"); ?>     
             </td>
           </tr>
 
           <?php
-          
+
+          include("edit_certificate_modal.php");
           }
           
           ?>
diff --git a/client_contacts.php b/client_contacts.php
index 373d60e9..6a10bec4 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -45,10 +45,12 @@ $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-users mr-2"></i>Contacts</h6>
-    <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addContactModal"><i class="fa fa-plus"></i></button>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-users"></i> Contacts</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addContactModal"><i class="fas fa-fw fa-plus"></i> New Contact</button>
+    </div>
   </div>
   <div class="card-body">
     <form autocomplete="off">
@@ -61,7 +63,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
         </div>
       </div>
     </form>
-    
+    <hr>
     <div class="table-responsive">
       <table class="table border">
         <thead class="thead-light <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
diff --git a/client_documents.php b/client_documents.php
index 7aae8680..d4355fe3 100644
--- a/client_documents.php
+++ b/client_documents.php
@@ -1,9 +1,5 @@
 <?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']);
@@ -39,6 +35,9 @@ if(isset($_GET['o'])){
   $o = "ASC";
   $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 documents 
   WHERE documents.client_id = $client_id
@@ -47,15 +46,15 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM documents
   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">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-file-alt"></i> Documents</h6>
-    <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addDocumentModal"><i class="fa fa-plus"></i></button>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-file-alt"></i> Documents</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDocumentModal"><i class="fas fa-fw fa-plus"></i> New Document</button>
+    </div>
   </div>
   <div class="card-body">
     <form autocomplete="off">
@@ -117,15 +116,13 @@ $total_pages = ceil($total_found_rows / 10);
                   <a class="dropdown-item" href="post.php?delete_document=<?php echo $document_id; ?>">Delete</a>
                 </div>
               </div>
-              <?php
-              include("edit_document_modal.php");
-              include("view_document_modal.php");
-              ?>      
+              <?php include("view_document_modal.php"); ?>      
             </td>
           </tr>
 
           <?php
           
+          include("edit_document_modal.php");
           }
 
           ?>
diff --git a/client_domains.php b/client_domains.php
index 3abacfd2..daae65af 100644
--- a/client_domains.php
+++ b/client_domains.php
@@ -1,9 +1,5 @@
 <?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,21 +36,25 @@ if(isset($_GET['o'])){
   $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 domains 
   WHERE client_id = $client_id AND (domain_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);
 
 ?>
 
-<div class="card">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-globe"></i> Domains</h6>
-    <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addDomainModal"><i class="fa fa-plus"></i></button>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-globe"></i> Domains</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDomainModal"><i class="fas fa-fw fa-plus"></i> New Domain</button>
+    </div>
   </div>
+
   <div class="card-body">
     <form autocomplete="off">
       <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
@@ -113,12 +113,12 @@ $total_pages = ceil($total_found_rows / 10);
                   <a class="dropdown-item" href="post.php?delete_domain=<?php echo $domain_id; ?>">Delete</a>
                 </div>
               </div>
-              <?php include("edit_domain_modal.php"); ?>     
             </td>
           </tr>
 
           <?php
-          
+
+          include("edit_domain_modal.php");
           }
           
           ?>
diff --git a/client_files.php b/client_files.php
index e513a006..5f75d00d 100644
--- a/client_files.php
+++ b/client_files.php
@@ -8,10 +8,12 @@ $num_of_files = mysqli_num_rows($sql_files_images) + mysqli_num_rows($sql_files_
 
 ?>
 
-<div class="card">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-paperclip mr-2"></i>Files</h6>
-    <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addFileModal"><i class="fa fa-cloud-upload-alt"></i></button>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-paperclip"></i> Files</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addFileModal"><i class="fas fa-fw fa-cloud-upload-alt"></i> Upload File</button>
+    </div>
   </div>
   <div class="card-body">
 
@@ -52,7 +54,7 @@ $num_of_files = mysqli_num_rows($sql_files_images) + mysqli_num_rows($sql_files_
          
           <?php 
           include("view_file_modal.php");
-           } 
+          } 
           ?>
       </div>
 
diff --git a/client_invoices.php b/client_invoices.php
index cbdf8ae1..f9194e61 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -1,9 +1,5 @@
 <?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']);
@@ -39,7 +35,10 @@ if(isset($_GET['o'])){
   $o = "DESC";
   $disp = "ASC";
 }
- 
+
+//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, categories 
   WHERE invoices.client_id = $client_id 
   AND invoices.category_id = categories.category_id 
@@ -47,15 +46,15 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM invoices, categor
   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">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-file"></i> Invoices</h6>
-    <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addInvoiceModal"><i class="fa fa-plus"></i></button>
+<div class="card card-dark">
+  <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">
@@ -148,15 +147,13 @@ $total_pages = ceil($total_found_rows / 10);
                   <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/client_locations.php b/client_locations.php
index e175f6e7..913bddbc 100644
--- a/client_locations.php
+++ b/client_locations.php
@@ -1,8 +1,4 @@
 <?php 
-  
-//Rebuild URL
-
-$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
 //Paging
 if(isset($_GET['p'])){
@@ -40,21 +36,24 @@ if(isset($_GET['o'])){
   $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 locations 
   WHERE client_id = $client_id 
   AND (location_name LIKE '%$q%' OR location_address LIKE '%$q%' OR location_phone 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);
 
 ?>
 
-<div class="card">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-map-marker-alt"></i> Locations</h6>
-    <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addLocationModal"><i class="fa fa-plus"></i></button>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-map-marker-alt"></i> Locations</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addLocationModal"><i class="fas fa-fw fa-plus"></i> New Location</button>
+    </div>
   </div>
   <div class="card-body">
     <form autocomplete="off">
@@ -74,7 +73,7 @@ $total_pages = ceil($total_found_rows / 10);
           <tr>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=location_name&o=<?php echo $disp; ?>">Name</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=location_address&o=<?php echo $disp; ?>">Address</a></th>
-            <th>Phone</th>
+            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=location_phone&o=<?php echo $disp; ?>">Phone</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=location_hours&o=<?php echo $disp; ?>">Hours</a></th>
             <th class="text-center">Action</th>
           </tr>
diff --git a/client_logins.php b/client_logins.php
index 6e34c40d..b621c694 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -1,9 +1,5 @@
 <?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,6 +36,8 @@ if(isset($_GET['o'])){
   $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 *, AES_DECRYPT(login_password, '$config_aes_key') AS login_password FROM logins 
   WHERE client_id = $client_id 
@@ -47,15 +45,15 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS *, AES_DECRYPT(login_pas
   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">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-key"></i> Logins</h6>
-    <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addLoginModal"><i class="fa fa-plus"></i></button>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-key"></i> Logins</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addLoginModal"><i class="fas fa-fw fa-plus"></i> New Login</button>
+    </div>
   </div>
   <div class="card-body">
     <form autocomplete="off">
@@ -119,12 +117,12 @@ $total_pages = ceil($total_found_rows / 10);
                   <a class="dropdown-item" href="post.php?delete_login=<?php echo $login_id; ?>">Delete</a>
                 </div>
               </div> 
-              <?php include("edit_login_modal.php"); ?>     
             </td>
           </tr>
 
           <?php
           
+          include("edit_login_modal.php");
           }
           
           ?>
diff --git a/client_networks.php b/client_networks.php
index 9b20b595..f0853854 100644
--- a/client_networks.php
+++ b/client_networks.php
@@ -1,9 +1,5 @@
 <?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,21 +36,24 @@ if(isset($_GET['o'])){
   $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 networks 
   WHERE client_id = $client_id 
   AND (network_name LIKE '%$q%' OR network_vlan LIKE '%$q%' OR network LIKE '%$q%' OR network_gateway LIKE '%$q%' OR network_dhcp_range 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);
 
 ?>
 
-<div class="card">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-network-wired"></i> Networks</h6>
-    <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addNetworkModal"><i class="fa fa-plus"></i></button>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-network-wired"></i> Networks</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addNetworkModal"><i class="fas fa-fw fa-plus"></i> New Network</button>
+    </div>
   </div>
   <div class="card-body">
     <form autocomplete="off">
@@ -112,12 +111,12 @@ $total_pages = ceil($total_found_rows / 10);
                   <a class="dropdown-item" href="post.php?delete_network=<?php echo $network_id; ?>">Delete</a>
                 </div>
               </div>
-              <?php include("edit_network_modal.php"); ?>      
             </td>
           </tr>
 
           <?php
           
+          include("edit_network_modal.php");
           }
           
           ?>
diff --git a/client_payments.php b/client_payments.php
index 2d5c228d..e89baed4 100644
--- a/client_payments.php
+++ b/client_payments.php
@@ -1,9 +1,5 @@
 <?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,6 +36,8 @@ if(isset($_GET['o'])){
   $disp = "ASC";
 }
 
+//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 payments, invoices, accounts
   WHERE invoices.client_id = $client_id
@@ -49,14 +47,12 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM payments, invoice
   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">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-credit-card"></i> Payments</h6>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title"><i class="fa fa-fw fa-credit-card"></i> Payments</h3>
   </div>
   <div class="card-body">
     <form autocomplete="off">
diff --git a/client_print.php b/client_print.php
index 999acc89..9dadf4ac 100644
--- a/client_print.php
+++ b/client_print.php
@@ -40,12 +40,9 @@ if(isset($_GET['client_id'])){
   
   $sql_quotes = mysqli_query($mysqli,"SELECT * FROM quotes WHERE client_id = $client_id ORDER BY quote_number DESC");
 
-  $sql_recurring = mysqli_query($mysqli,"SELECT * FROM recurring_invoices, invoices
-    WHERE invoices.invoice_id = recurring_invoices.invoice_id
-    AND invoices.client_id = $client_id
-    ORDER BY recurring_invoices.recurring_invoice_id DESC");
+  $sql_recurring = mysqli_query($mysqli,"SELECT * FROM recurring WHERE client_id = $client_id ORDER BY recurring_id DESC");
 
-  $sql_notes = mysqli_query($mysqli,"SELECT * FROM notes WHERE client_id = $client_id ORDER BY note_created_at DESC");
+  $sql_documents = mysqli_query($mysqli,"SELECT * FROM documents WHERE client_id = $client_id ORDER BY document_created_at DESC");
 
   //Get Counts
   $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('contact_id') AS num FROM contacts WHERE client_id = $client_id"));
@@ -74,11 +71,11 @@ if(isset($_GET['client_id'])){
   $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('quote_id') AS num FROM quotes WHERE client_id = $client_id"));
   $num_quotes = $row['num'];
 
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('recurring_invoice_id') AS num FROM recurring_invoices, invoices WHERE recurring_invoices.invoice_id = invoices.invoice_id AND invoices.client_id = $client_id"));
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('recurring_id') AS num FROM recurring WHERE client_id = $client_id"));
   $num_recurring = $row['num'];
 
-  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('note_id') AS num FROM notes WHERE client_id = $client_id"));
-  $num_notes = $row['num'];
+  $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('document_id') AS num FROM documents WHERE client_id = $client_id"));
+  $num_documents = $row['num'];
 
 ?>
 
@@ -162,8 +159,7 @@ if(isset($_GET['client_id'])){
           <?php if($num_payments > 0){ ?> <li><a href="#payments">Payments</a></li> <?php } ?>
           <?php if($num_quotes > 0){ ?> <li><a href="#quotes">Quotes</a></li> <?php } ?>
           <?php if($num_recurring > 0){ ?> <li><a href="#recurring">Recurring</a></li> <?php } ?>
-          <?php if($num_attachments > 0){ ?> <li><a href="#attachments">Attachments</a></li> <?php } ?>
-          <?php if($num_notes > 0){ ?> <li><a href="#notes">Notes</a></li> <?php } ?>
+          <?php if($num_documents > 0){ ?> <li><a href="#documents">Documents</a></li> <?php } ?>
         </ul>
       </div>
     </div>
@@ -475,13 +471,21 @@ if(isset($_GET['client_id'])){
       $domain_webhost = $row['domain_webhost'];
       $domain_expire = $row['domain_expire'];
 
-      $sql_domain_registrar = mysqli_query($mysqli,"SELECT vendor_name FROM vendors WHERE vendor_id = $domain_registrar");
-      $row = mysqli_fetch_array($sql_domain_registrar);
-      $domain_registrar = $row['vendor_name'];
+      if(!empty($domain_registrar)){
+        $sql_domain_registrar = mysqli_query($mysqli,"SELECT vendor_name FROM vendors WHERE vendor_id = $domain_registrar");
+        $row = mysqli_fetch_array($sql_domain_registrar);
+        $domain_registrar = $row['vendor_name'];
+      }else{
+        $domain_registrar = "-";
+      }
 
-      $sql_domain_webhost = mysqli_query($mysqli,"SELECT vendor_name FROM vendors WHERE vendor_id = $domain_webhost");
-      $row = mysqli_fetch_array($sql_domain_webhost);
-      $domain_webhost = $row['vendor_name'];
+      if(!empty($domain_webhost)){
+        $sql_domain_webhost = mysqli_query($mysqli,"SELECT vendor_name FROM vendors WHERE vendor_id = $domain_webhost");
+        $row = mysqli_fetch_array($sql_domain_webhost);
+        $domain_webhost = $row['vendor_name'];
+      }else{
+        $domain_webhost = "-";
+      }
       
 
     ?>
@@ -683,7 +687,7 @@ if(isset($_GET['client_id'])){
   <thead>
     <tr>
       <th>Frequency</th>
-      <th>Start Date</th>
+      <th>Created</th>
       <th>Last Sent</th>
       <th>Next Date</th>
       <th>Status</th>
@@ -693,30 +697,29 @@ if(isset($_GET['client_id'])){
     <?php
 
     while($row = mysqli_fetch_array($sql_recurring)){
-      $recurring_invoice_id = $row['recurring_invoice_id'];
-      $recurring_invoice_frequency = $row['recurring_invoice_frequency'];
-      $recurring_invoice_status = $row['recurring_invoice_status'];
-      $recurring_invoice_start_date = $row['recurring_invoice_start_date'];
-      $recurring_invoice_last_sent = $row['recurring_invoice_last_sent'];
-      if($recurring_invoice_last_sent == 0){
-        $recurring_invoice_last_sent = "-";
+      $recurring_id = $row['recurring_id'];
+      $recurring_frequency = $row['recurring_frequency'];
+      $recurring_status = $row['recurring_status'];
+      $recurring_created_at = $row['recurring_created_at'];
+      $recurring_last_sent = $row['recurring_last_sent'];
+      if($recurring_last_sent == 0){
+        $recurring_last_sent = "-";
       }
-      $recurring_invoice_next_date = $row['recurring_invoice_next_date'];
-      $invoice_id = $row['invoice_id'];
-      if($recurring_invoice_status == 1){
-        $status = "Active";
+      $recurring_next_date = $row['recurring_next_date'];
+      if($recurring_status == 1){
+        $status_display = "Active";
       }else{
-        $status = "Inactive";
+        $status_display = "Inactive";
       }
 
     ?>
 
     <tr>
-      <td><?php echo ucwords($recurring_invoice_frequency); ?>ly</td>
-      <td><?php echo $recurring_invoice_start_date; ?></td>
-      <td><?php echo $recurring_invoice_last_sent; ?></td>
-      <td><?php echo $recurring_invoice_next_date; ?></td>
-      <td><?php echo $status; ?></td>
+      <td><?php echo ucwords($recurring_frequency); ?>ly</td>
+      <td><?php echo $recurring_created_at; ?></td>
+      <td><?php echo $recurring_last_sent; ?></td>
+      <td><?php echo $recurring_next_date; ?></td>
+      <td><?php echo $status_display; ?></td>
     </tr>
 
     <?php
@@ -730,21 +733,21 @@ if(isset($_GET['client_id'])){
 <?php } ?>
 
 
-<?php if($num_notes > 0){ ?>
-<h4 id="notes">Notes <small>(<?php echo $num_notes; ?>)</small></h4>
+<?php if($num_documents > 0){ ?>
+<h4 id="documents">Documents <small>(<?php echo $num_documents; ?>)</small></h4>
 <hr>
 
 <?php
 
-while($row = mysqli_fetch_array($sql_notes)){
-  $note_id = $row['note_id'];
-  $note_subject = $row['note_subject'];
-  $note_body = $row['note_body'];
+while($row = mysqli_fetch_array($sql_documents)){
+  $document_id = $row['document_id'];
+  $document_name = $row['document_name'];
+  $document_details = $row['document_details'];
 
 ?>
-<h6><?php echo $note_subject; ?></h6>
+<h6><?php echo $document_name; ?></h6>
 <hr>
-<p class="mb-4"><?php echo $note_body; ?></p>
+<p class="mb-4"><?php echo $document_details; ?></p>
 
 <?php } ?>
 
diff --git a/client_quotes.php b/client_quotes.php
index 91dfb0d7..019d40fe 100644
--- a/client_quotes.php
+++ b/client_quotes.php
@@ -1,9 +1,5 @@
 <?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']);
@@ -39,7 +35,10 @@ if(isset($_GET['o'])){
   $o = "DESC";
   $disp = "ASC";
 }
- 
+
+//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, categories 
   WHERE client_id = $client_id 
   AND categories.category_id = quotes.category_id 
@@ -47,15 +46,15 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM quotes, categorie
   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">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-file"></i> Quotes</h6>
-    <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addQuoteModal"><i class="fa fa-plus"></i></button>
+<div class="card card-dark">
+  <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">
@@ -135,18 +134,14 @@ $total_pages = ceil($total_found_rows / 10);
                   <div class="dropdown-divider"></div>     
                   <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");
-
-              ?>      
+              </div>    
             </td>
           </tr>
 
           <?php
-          
+
+          include("edit_quote_modal.php");
+          include("add_quote_copy_modal.php");
           }
 
           ?>
@@ -160,6 +155,4 @@ $total_pages = ceil($total_found_rows / 10);
   </div>
 </div>
 
-<?php include("add_quote_modal.php"); ?>
-
-<?php include("add_client_quote_modal.php"); ?>
\ No newline at end of file
+<?php include("add_quote_modal.php"); ?>
\ No newline at end of file
diff --git a/client_recurring.php b/client_recurring.php
index e07500bc..651fc70a 100644
--- a/client_recurring.php
+++ b/client_recurring.php
@@ -1,9 +1,5 @@
 <?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']);
@@ -39,6 +35,9 @@ if(isset($_GET['o'])){
   $o = "ASC";
   $disp = "DESC";
 }
+
+//Rebuild URL
+$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
  
 $sql = mysqli_query($mysqli,"SELECT * FROM recurring, categories
   WHERE recurring.client_id = $client_id
@@ -47,15 +46,15 @@ $sql = mysqli_query($mysqli,"SELECT * FROM recurring, categories
   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">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-sync-alt"></i> Recurring Invoices</h6>
-    <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addRecurringModal"><i class="fa fa-plus"></i></button>
+<div class="card card-dark">
+  <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">
@@ -142,7 +141,7 @@ $total_pages = ceil($total_found_rows / 10);
               </tr>
 
           <?php
-
+          include("edit_recurring_modal.php");
           }
 
           ?>
diff --git a/client_software.php b/client_software.php
index 54ef45ed..9bd7e86f 100644
--- a/client_software.php
+++ b/client_software.php
@@ -1,9 +1,5 @@
 <?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,21 +36,24 @@ if(isset($_GET['o'])){
   $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 software 
   WHERE client_id = $client_id 
   AND (software_name LIKE '%$q%' OR software_type LIKE '%$q%' OR software_license 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);
 
 ?>
 
-<div class="card">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-1"><i class="fa fa-rocket mr-2"></i>Software</h6>
-    <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addSoftwareModal"><i class="fa fa-plus"></i></button>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-rocket"></i> Software</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addSoftwareModal"><i class="fas fa-fw fa-plus"></i> New Software</button>
+    </div>
   </div>
   <div class="card-body">
     <form autocomplete="off">
@@ -110,10 +109,10 @@ $total_pages = ceil($total_found_rows / 10);
               <div class="modal" id="viewPasswordModal<?php echo $login_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-key mr-2"></i><?php echo $software_name; ?></h5>
+                    <div class="modal-header">
+                      <h5 class="modal-title"><i class="fa fa-fw fa-key"></i> <?php echo $software_name; ?></h5>
                       <button type="button" class="close text-white" data-dismiss="modal">
-                        <span aria-hidden="true">&times;</span>
+                        <span>&times;</span>
                       </button>
                     </div>
                     <div class="modal-body bg-white">
@@ -152,13 +151,13 @@ $total_pages = ceil($total_found_rows / 10);
                   <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="post.php?delete_software=<?php echo $software_id; ?>">Delete</a>
                 </div>
-              </div>
-              <?php include("edit_software_modal.php"); ?>      
+              </div> 
             </td>
           </tr>
 
           <?php
-          
+
+          include("edit_software_modal.php");
           }
           
           ?>
diff --git a/client_tickets.php b/client_tickets.php
index ecfe9afc..00bc54fd 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -1,9 +1,5 @@
 <?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,21 +36,24 @@ if(isset($_GET['o'])){
   $disp = "ASC";
 }
 
+//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 tickets 
   WHERE client_id = $client_id 
   AND (ticket_number LIKE '%$q%' OR ticket_subject LIKE '%$q%' OR ticket_status LIKE '%$q%' OR ticket_priority 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);
 
 ?>
 
-<div class="card">
-  <div class="card-header  bg-dark text-white">
-    <h6 class="float-left mt-2"><i class="fa fa-fw fa-tags mr-2"></i>Tickets</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addTicketModal"><i class="fas fa-fw fa-plus"></i></button>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-tags"></i> Tickets</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTicketModal"><i class="fas fa-fw fa-plus"></i> New Ticket</button>
+    </div>
   </div>
   <div class="card-body">
     <form autocomplete="off">
@@ -131,16 +130,12 @@ $total_pages = ceil($total_found_rows / 10);
                   <a class="dropdown-item" href="post.php?delete_ticket=<?php echo $ticket_id; ?>">Delete</a>
                 </div>
               </div>
-              <?php
-
-              include("edit_ticket_modal.php");
-
-              ?>      
             </td>
           </tr>
 
           <?php
 
+          include("edit_ticket_modal.php");
           }
 
           ?>
diff --git a/client_trips.php b/client_trips.php
index 6ba1003b..20964680 100644
--- a/client_trips.php
+++ b/client_trips.php
@@ -1,9 +1,5 @@
 <?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']);
@@ -49,6 +45,9 @@ if(isset($_GET['dtf'])){
   $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%')
   AND DATE(trip_date) BETWEEN '$dtf' AND '$dtt'
@@ -57,15 +56,15 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM trips
   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-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">
+  <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">
@@ -101,9 +100,6 @@ $total_pages = ceil($total_found_rows / 10);
             $trip_miles = $row['trip_miles'];
             $round_trip = $row['round_trip'];
             $client_id = $row['client_id'];
-            $invoice_id = $row['invoice_id'];
-            $location_id = $row['location_id'];
-            $vendor_id = $row['vendor_id'];
 
             if($round_trip == 1){
               $round_trip_display = "<i class='fa fa-fw fa-sync-alt text-secondary'></i>";
@@ -132,19 +128,13 @@ $total_pages = ceil($total_found_rows / 10);
                   <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");
           }
           
           ?>
diff --git a/client_vendors.php b/client_vendors.php
index ccb780ae..9fb72308 100644
--- a/client_vendors.php
+++ b/client_vendors.php
@@ -37,7 +37,6 @@ if(isset($_GET['o'])){
 }
 
 //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 vendors 
@@ -49,10 +48,12 @@ $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-fw fa-building mr-2"></i>Vendors</h6>
-    <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addVendorModal"><i class="fa fa-plus"></i></button>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-building"></i> Vendors</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addVendorModal"><i class="fas fa-fw fa-plus"></i> New Vendor</button>
+    </div>
   </div>
   <div class="card-body">
     <form autocomplete="off">
@@ -151,12 +152,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                   <a class="dropdown-item" href="post.php?delete_vendor=<?php echo $vendor_id; ?>">Delete</a>
                 </div>
               </div>
-              <?php include("edit_vendor_modal.php"); ?>      
             </td>
           </tr>
 
           <?php
           
+          include("edit_vendor_modal.php");
           }
           
           ?>
diff --git a/clients.php b/clients.php
index 94cbd73e..72bc5338 100644
--- a/clients.php
+++ b/clients.php
@@ -70,7 +70,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 ?>
 
-<div class="card card-dark mb-3">
+<div class="card card-dark">
   <div class="card-header">
     <h3 class="card-title mt-2"><i class="fa fa-fw fa-users"></i> Clients</h3>
     <div class="card-tools">
diff --git a/companies.php b/companies.php
index d0da12f6..69b33d6d 100644
--- a/companies.php
+++ b/companies.php
@@ -1,60 +1,59 @@
 <?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 = "company_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 = "company_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 companies, settings
-    WHERE companies.company_id = settings.company_id 
-    AND companies.company_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 companies, settings
+  WHERE companies.company_id = settings.company_id 
+  AND companies.company_name 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-building mr-2"></i>Companies</h6>
-    <button type="button" class="btn btn-primary btn-sm mr-auto float-right" data-toggle="modal" data-target="#addCompanyModal"><i class="fas fa-fw fa-plus"></i></button>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-building"></i> Companies</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCompanyModal"><i class="fas fa-fw fa-plus"></i> New Company</button>
+    </div>
   </div>
   <div class="card-body">
     <form autocomplete="off">
@@ -109,21 +108,21 @@
             </td>
             <td>
               <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
                   <i class="fas fa-ellipsis-h"></i>
                 </button>
-                <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                <div class="dropdown-menu">
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editCompanyModal<?php echo $company_id; ?>">Edit</a>
                   <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="post.php?delete_company=<?php echo $company_id; ?>">Delete</a>
                 </div>
               </div>
-              <?php include("edit_company_modal.php"); ?>      
             </td>
           </tr>
 
           <?php
           
+          include("edit_company_modal.php");
           }
           
           ?>
diff --git a/edit_asset_modal.php b/edit_asset_modal.php
index 771e0131..0a43fc90 100644
--- a/edit_asset_modal.php
+++ b/edit_asset_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-<?php echo $device_icon; ?> mr-2"></i><?php echo $asset_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-<?php echo $device_icon; ?>"></i> <?php echo $asset_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">
@@ -34,7 +34,7 @@
           
           <hr>
           
-          <div class="tab-content" id="pills-tabContent<?php echo $asset_id; ?>">
+          <div class="tab-content">
 
             <div class="tab-pane fade show active" id="pills-details<?php echo $asset_id; ?>">
           
diff --git a/edit_category_modal.php b/edit_category_modal.php
index 57c7925c..7cd78b84 100644
--- a/edit_category_modal.php
+++ b/edit_category_modal.php
@@ -2,18 +2,20 @@
   <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-list mr-2"></i><?php echo $category_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-list"></i> <?php echo $category_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">
         <input type="hidden" name="category_id" value="<?php echo $category_id; ?>">
         <div class="modal-body bg-white">
+          
           <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
             <input type="text" class="form-control" name="name" value="<?php echo $category_name; ?>" required>
           </div>
+          
           <div class="form-group">
             <label>Type <strong class="text-danger">*</strong></label>
             <select class="form-control select2" name="type" required>
@@ -22,10 +24,12 @@
               <?php } ?>
             </select>
           </div>
+          
           <div class="form-group">
             <label>Color <strong class="text-danger">*</strong></label>
             <input type="color" class="form-control col-md-2" name="color" value="<?php echo $category_color; ?>">
           </div>
+        
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
diff --git a/edit_certificate_modal.php b/edit_certificate_modal.php
index 48cf5014..0111148c 100644
--- a/edit_certificate_modal.php
+++ b/edit_certificate_modal.php
@@ -2,14 +2,15 @@
   <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-lock mr-2"></i><?php echo $certificate_name ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-lock"></i> <?php echo $certificate_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">
         <input type="hidden" name="certificate_id" value="<?php echo $certificate_id; ?>">
         <div class="modal-body bg-white">    
+          
           <div class="form-group">
             <label>Certificate Name <strong class="text-danger">*</strong></label>
             <div class="input-group">
diff --git a/edit_contact_modal.php b/edit_contact_modal.php
index 95a8c2ba..07d5ba49 100644
--- a/edit_contact_modal.php
+++ b/edit_contact_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-user-edit mr-2"></i><?php echo $contact_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-user-edit"></i> <?php echo $contact_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" enctype="multipart/form-data" autocomplete="off">
@@ -13,21 +13,21 @@
         <input type="hidden" name="current_avatar_path" value="<?php echo $contact_photo; ?>">
         <div class="modal-body bg-white">
 
-          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab">
+          <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
-              <a class="nav-link active" id="pills-details-tab<?php echo $contact_id; ?>" data-toggle="pill" href="#pills-details<?php echo $contact_id; ?>">Details</a>
+              <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $contact_id; ?>">Details</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" id="pills-photo-tab<?php echo $contact_id; ?>" data-toggle="pill" href="#pills-photo<?php echo $contact_id; ?>">Photo</a>
+              <a class="nav-link" data-toggle="pill" href="#pills-photo<?php echo $contact_id; ?>">Photo</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" id="pills-notes-tab<?php echo $contact_id; ?>" data-toggle="pill" href="#pills-notes<?php echo $contact_id; ?>">Notes</a>
+              <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $contact_id; ?>">Notes</a>
             </li>
           </ul>
 
           <hr>
           
-          <div class="tab-content" id="pills-tabContent<?php echo $contact_id; ?>">
+          <div class="tab-content">
 
             <div class="tab-pane fade show active" id="pills-details<?php echo $contact_id; ?>">
 
diff --git a/edit_document_modal.php b/edit_document_modal.php
index 7e0fd772..d28d1025 100644
--- a/edit_document_modal.php
+++ b/edit_document_modal.php
@@ -2,20 +2,23 @@
   <div class="modal-dialog modal-xl">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-file-alt mr-2"></i><?php echo $document_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-file-alt"></i> <?php echo $document_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">
         <input type="hidden" name="document_id" value="<?php echo $document_id; ?>">
         <div class="modal-body bg-white">  
+          
           <div class="form-group">
             <input type="text" class="form-control" name="name" value="<?php echo $document_name; ?>" placeholder="Name" required>
           </div>
+          
           <div class="form-group">
             <textarea class="form-control summernote" name="details"><?php echo $document_details; ?></textarea>
           </div>
+        
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
diff --git a/edit_domain_modal.php b/edit_domain_modal.php
index 5faa5866..11820371 100644
--- a/edit_domain_modal.php
+++ b/edit_domain_modal.php
@@ -2,14 +2,15 @@
   <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-globe mr-2"></i><?php echo $domain_name ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-globe"></i> <?php echo $domain_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">
         <input type="hidden" name="domain_id" value="<?php echo $domain_id; ?>">
         <div class="modal-body bg-white">    
+          
           <div class="form-group">
             <label>Domain Name <strong class="text-danger">*</strong></label>
             <div class="input-group">
diff --git a/edit_location_modal.php b/edit_location_modal.php
index e8c6f24f..84a5361f 100644
--- a/edit_location_modal.php
+++ b/edit_location_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-map-marker-alt mr-2"></i><?php echo $location_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-map-marker-alt"></i> <?php echo $location_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" enctype="multipart/form-data" autocomplete="off">
@@ -13,27 +13,24 @@
         <input type="hidden" name="current_file_path" value="<?php echo $location_photo; ?>">
         <div class="modal-body bg-white">
 
-          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab<?php echo $location_id; ?>">
+          <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
-              <a class="nav-link active" id="pills-details-tab<?php echo $location_id; ?>" data-toggle="pill" href="#pills-details<?php echo $location_id; ?>">Details</a>
+              <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $location_id; ?>">Details</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" id="pills-address-tab<?php echo $location_id; ?>" data-toggle="pill" href="#pills-address<?php echo $location_id; ?>">Address</a>
+              <a class="nav-link" data-toggle="pill" href="#pills-address<?php echo $location_id; ?>">Address</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" id="pills-contact-tab<?php echo $location_id; ?>" data-toggle="pill" href="#pills-contact<?php echo $location_id; ?>">Contact</a>
+              <a class="nav-link" data-toggle="pill" href="#pills-photo<?php echo $location_id; ?>">Photo</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" id="pills-photo-tab<?php echo $location_id; ?>" data-toggle="pill" href="#pills-photo<?php echo $location_id; ?>">Photo</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" id="pills-notes-tab<?php echo $location_id; ?>" data-toggle="pill" href="#pills-notes<?php echo $location_id; ?>">Notes</a>
+              <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $location_id; ?>">Notes</a>
             </li>
           </ul>
 
           <hr>
 
-          <div class="tab-content" id="pills-tabContent<?php echo $location_id; ?>">
+          <div class="tab-content">
 
             <div class="tab-pane fade show active" id="pills-details<?php echo $location_id; ?>">
 
@@ -57,6 +54,41 @@
                 </div>
               </div>
 
+              <div class="form-group">
+                <label>Contact</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" name="contact">
+                    <option value="">- Contact -</option>
+                    <?php 
+                    
+                    $sql_contacts = mysqli_query($mysqli,"SELECT * FROM contacts WHERE client_id = $client_id ORDER BY contact_name ASC"); 
+                    while($row = mysqli_fetch_array($sql_contacts)){
+                      $contact_id_select = $row['contact_id'];
+                      $contact_name_select = $row['contact_name'];
+
+                    ?>
+                      <option <?php if($contact_id == $contact_id_select){ echo "selected"; } ?> value="<?php echo $contact_id_select; ?>"><?php echo $contact_name_select; ?></option>
+                    
+                    <?php
+                    }
+                    ?>
+                  </select>
+                </div>
+              </div>
+              
+              <div class="form-group">
+                <label>Hours</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="hours" placeholder="Hours of operation" value="<?php echo $location_hours; ?>"> 
+                </div>
+              </div>
+
             </div>
 
             <div class="tab-pane fade" id="pills-address<?php echo $location_id; ?>">
@@ -122,82 +154,6 @@
 
             </div>
 
-            <div class="tab-pane fade" id="pills-contact<?php echo $location_id; ?>">
-
-              <div class="form-group">
-                <label>Contact</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" name="contact">
-                    <option value="">- Contact -</option>
-                    <?php 
-                    
-                    $sql_contacts = mysqli_query($mysqli,"SELECT * FROM contacts WHERE client_id = $client_id ORDER BY contact_name ASC"); 
-                    while($row = mysqli_fetch_array($sql_contacts)){
-                      $contact_id_select = $row['contact_id'];
-                      $contact_name_select = $row['contact_name'];
-
-                    ?>
-                      <option <?php if($contact_id == $contact_id_select){ echo "selected"; } ?> value="<?php echo $contact_id_select; ?>"><?php echo $contact_name_select; ?></option>
-                    
-                    <?php
-                    }
-                    ?>
-                  </select>
-                </div>
-              </div>
-
-              <label>Phone</label>
-              <div class="form-row">
-                <div class="col-8">
-                  <div class="form-group">
-                    <div class="input-group">
-                      <div class="input-group-prepend">
-                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                      </div>
-                      <input type="text" class="form-control" name="phone" placeholder="Phone Number" data-inputmask="'mask': '999-999-9999'" value="<?php echo $contact_phone; ?>" disabled> 
-                    </div>
-                  </div>
-                </div>
-                <div class="col-4">
-                  <input type="text" class="form-control" name="extension" placeholder="Extension" value="<?php echo $contact_extension; ?>" disabled>
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Mobile</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="mobile" placeholder="Mobile Phone Number" data-inputmask="'mask': '999-999-9999'" value="<?php echo $contact_mobile; ?>" disabled> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Email</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-envelope"></i></span>
-                  </div>
-                  <input type="email" class="form-control" name="email" placeholder="Email Address" value="<?php echo $contact_email; ?>" disabled>
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Hours</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-clock"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="hours" placeholder="Hours of operation" value="<?php echo $location_hours; ?>"> 
-                </div>
-              </div>
-
-            </div>
-
             <div class="tab-pane fade" id="pills-photo<?php echo $location_id; ?>">
 
               <div class="form-group">
diff --git a/edit_login_modal.php b/edit_login_modal.php
index 4fec9159..5ea96034 100644
--- a/edit_login_modal.php
+++ b/edit_login_modal.php
@@ -1,8 +1,8 @@
 <div class="modal" id="editLoginModal<?php echo $login_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-key mr-2"></i><?php echo $login_name; ?></h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-key"></i> <?php echo $login_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>
@@ -144,7 +144,7 @@
                     <?php 
                     
                     $sql_software = mysqli_query($mysqli,"SELECT * FROM software WHERE client_id = $client_id ORDER BY software_name ASC"); 
-                    while($row = mysqli_fetch_array($sql_applications)){
+                    while($row = mysqli_fetch_array($sql_software)){
                       $software_id_select = $row['software_id'];
                       $software_name_select = $row['software_name'];
                     ?>
diff --git a/edit_network_modal.php b/edit_network_modal.php
index f2933f5e..a31857df 100644
--- a/edit_network_modal.php
+++ b/edit_network_modal.php
@@ -2,14 +2,15 @@
   <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-network-wired mr-2"></i><?php echo $network_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-network-wired"></i> <?php echo $network_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">
         <input type="hidden" name="network_id" value="<?php echo $network_id; ?>">
         <div class="modal-body bg-white">    
+          
           <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
             <div class="input-group">
diff --git a/edit_software_modal.php b/edit_software_modal.php
index a3ea4049..56517cc8 100644
--- a/edit_software_modal.php
+++ b/edit_software_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-rocket mr-2"></i><?php echo $software_name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-rocket"></i> <?php echo $software_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">
@@ -12,7 +12,7 @@
         <input type="hidden" name="login_id" value="<?php echo $login_id; ?>">
         <div class="modal-body bg-white">    
           
-          <ul class="nav nav-pills nav-justified mb-3" id="pills-tab">
+          <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
               <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $software_id; ?>">Details</a>
             </li>
@@ -26,7 +26,7 @@
 
           <hr>
           
-          <div class="tab-content" id="pills-tabContent<?php echo $software_id; ?>">
+          <div class="tab-content">
 
             <div class="tab-pane fade show active" id="pills-details<?php echo $software_id; ?>">
 
diff --git a/edit_user_modal.php b/edit_user_modal.php
index 4a6e6fe2..5b217b8d 100644
--- a/edit_user_modal.php
+++ b/edit_user_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-user mr-2"></i><?php echo $name; ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-user"></i> <?php echo $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" enctype="multipart/form-data" autocomplete="off">
@@ -12,6 +12,7 @@
         <input type="hidden" name="current_password_hash" value="<?php echo $password; ?>">
         <input type="hidden" name="current_avatar_path" value="<?php echo $avatar; ?>">
         <div class="modal-body bg-white">    
+          
           <center class="mb-3">
             <?php if(!empty($avatar)){ ?>
             <img class="img-fluid rounded-circle" src="<?php echo $avatar; ?>" height="128" width="128">
@@ -22,6 +23,7 @@
             </span>
             <?php } ?>
           </center>
+          
           <div class="form-group">
             <label>Name <strong class="text-danger">*</strong></label>
             <div class="input-group">
@@ -96,7 +98,8 @@
           <div class="form-group">
             <label>Avatar</label>
             <input type="file" class="form-control-file" accept="image/*;capture=camera" name="file">
-          </div>         
+          </div>
+                   
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
diff --git a/functions.php b/functions.php
index d0f2aada..13dde6b1 100644
--- a/functions.php
+++ b/functions.php
@@ -18,7 +18,7 @@ function keygen()
 
 function key32gen()
 {
-    $chars .= "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    $chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
     $chars .= "234567";
     while (1) {
         $key = '';
diff --git a/get_settings.php b/get_settings.php
index 89146c24..8fa2b60a 100644
--- a/get_settings.php
+++ b/get_settings.php
@@ -11,16 +11,16 @@ $config_base_url = $row['config_base_url'];
 
 //Company Info
 $config_company_name = $row['config_company_name'];
-$config_company_country = $row['config_company_country'];
 $config_company_address = $row['config_company_address'];
 $config_company_city = $row['config_company_city'];
 $config_company_state = $row['config_company_state'];
 $config_company_zip = $row['config_company_zip'];
+$config_company_country = $row['config_company_country'];
 $config_company_phone = $row['config_company_phone'];
 if(strlen($config_company_phone)>2){ 
   $config_company_phone = substr($row['config_company_phone'],0,3)."-".substr($row['config_company_phone'],3,3)."-".substr($row['config_company_phone'],6,4);
 }
-$config_company_country = $row['config_company_country'];
+$config_company_email = $row['config_company_email'];
 $config_company_site = $row['config_company_site'];
 
 //Mail
diff --git a/invoice.php b/invoice.php
index fbbb811a..a4ed1040 100644
--- a/invoice.php
+++ b/invoice.php
@@ -198,7 +198,7 @@ if(isset($_GET['invoice_id'])){
           </tr>
           <tr>
             <td>Due Date</td>
-            <td class="text-right"><div class="<?php echo $invoice_color; ?>"><?php echo $invoice_due; ?></div></td>
+            <td class="text-right"><?php echo $invoice_due; ?></td>
           </tr>
         </table>
       </div>
@@ -233,7 +233,9 @@ if(isset($_GET['invoice_id'])){
                 $item_subtotal = $row['item_price'];
                 $item_tax = $row['item_tax'];
                 $item_total = $row['item_total'];
+                $total_tax = 0;
                 $total_tax = $item_tax + $total_tax;
+                $sub_total = 0;
                 $sub_total = $item_price * $item_quantity + $sub_total;
 
               ?>
@@ -323,12 +325,6 @@ if(isset($_GET['invoice_id'])){
               <td>Subtotal</td>
               <td class="text-right text-monospace">$<?php echo number_format($sub_total,2); ?></td>
             </tr>
-            <?php if($discount > 0){ ?>
-            <tr class="border-bottom">
-              <td>Discount</td>
-              <td class="text-right text-monospace">$<?php echo number_format($invoice_discount,2); ?></td>          
-            </tr>
-            <?php } ?>
             <?php if($total_tax > 0){ ?>
             <tr class="border-bottom">
               <td>Tax</td>
diff --git a/login.php b/login.php
index d4e194eb..c73452b6 100644
--- a/login.php
+++ b/login.php
@@ -27,8 +27,9 @@ if(isset($_POST['login'])){
   $username = mysqli_real_escape_string($mysqli,$_POST['username']);
   $plain_password = $_POST['password'];
   $password = md5($_POST['password']);
-  $current_code = mysqli_real_escape_string($mysqli,$_POST['current_code']);
-
+  if(!empty($token)){
+    $current_code = mysqli_real_escape_string($mysqli,$_POST['current_code']);
+  }
   $sql = mysqli_query($mysqli,"SELECT * FROM users WHERE email = '$username' AND password = '$password'");
   
   if(mysqli_num_rows($sql) == 1){
@@ -130,7 +131,7 @@ if(isset($_POST['login'])){
               </div>
             </div>
           </div>
-          <?php echo $token_field; ?>
+          <?php if(!empty($token_field)){ echo $token_field; } ?>
           
           <button type="submit" class="btn btn-primary btn-block mb-3" name="login">Sign In</button>
         
diff --git a/logs.php b/logs.php
index 7cd53bde..d04011db 100644
--- a/logs.php
+++ b/logs.php
@@ -1,68 +1,96 @@
 <?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 = "log_id";
+}
 
-  //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 = "log_id";
-  }
-
-  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 logs 
-    WHERE log_type LIKE '%$q%' OR log_action LIKE '%$q%' OR log_description LIKE '%$q%'
-    AND (user_id IS NULL)
-    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 logs 
+  WHERE (log_type LIKE '%$q%' OR log_action LIKE '%$q%' OR log_description LIKE '%$q%')
+  AND DATE(log_created_at) BETWEEN '$dtf' AND '$dtt'
+  AND (user_id IS NULL)
+  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-book mr-2"></i>Logs</h6>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title"><i class="fa fa-fw fa-book"></i> Logs</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 Logs">
-        <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 Logs">
+            <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/payments.php b/payments.php
index e717b657..ec655c8f 100644
--- a/payments.php
+++ b/payments.php
@@ -64,7 +64,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 py-2"><i class="fa fa-fw fa-credit-card"></i> Payments</h3>
+    <h3 class="card-title"><i class="fa fa-fw fa-credit-card"></i> Payments</h3>
   </div>
 
   <div class="card-body">
diff --git a/post.php b/post.php
index eaf8c462..17ab1d31 100644
--- a/post.php
+++ b/post.php
@@ -164,12 +164,13 @@ if(isset($_GET['delete_user'])){
 if(isset($_POST['add_company'])){
 
     $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])));
-    $country = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['country'])));
     $address = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['address'])));
     $city = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['city'])));
     $state = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['state'])));
     $zip = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['zip'])));
+    $country = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['country'])));
     $phone = preg_replace("/[^0-9]/", '',$_POST['phone']);
+    $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email'])));
     $site = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['site'])));
 
     mysqli_query($mysqli,"INSERT INTO companies SET company_name = '$name', company_created_at = NOW()");
@@ -183,7 +184,7 @@ if(isset($_POST['add_company'])){
     mkdir("uploads/settings/$company_id");
     mkdir("uploads/tmp/$company_id");
  
-    mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$name', config_company_country = '$country', config_company_address = '$address', config_company_city = '$city', config_company_state = '$state', config_company_zip = '$zip', config_company_phone = '$phone', config_company_site = '$site', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_records_per_page = 10, config_send_invoice_reminders = 0, config_enable_cron = 0, config_ticket_next_number = 1");
+    mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$name', config_company_country = '$country', config_company_address = '$address', config_company_city = '$city', config_company_state = '$state', config_company_zip = '$zip', config_company_phone = '$phone', config_company_email = '$email', config_company_site = '$site', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_records_per_page = 10, config_send_invoice_reminders = 0, config_enable_cron = 0, config_ticket_next_number = 1");
 
     //logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Company', log_action = 'Create', log_description = '$name', log_created_at = NOW()");
@@ -203,11 +204,12 @@ if(isset($_POST['edit_company'])){
     $state = strip_tags(mysqli_real_escape_string($mysqli,$_POST['state']));
     $zip = strip_tags(mysqli_real_escape_string($mysqli,$_POST['zip']));
     $phone = preg_replace("/[^0-9]/", '',$_POST['phone']);
+    $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email'])));
     $site = strip_tags(mysqli_real_escape_string($mysqli,$_POST['site']));
 
     mysqli_query($mysqli,"UPDATE companies SET company_name = '$name', company_updated_at = NOW() WHERE company_id = $company_id");
 
-     mysqli_query($mysqli,"UPDATE settings SET config_company_name = '$name', config_company_country = '$country', config_company_address = '$address', config_company_city = '$city', config_company_state = '$state', config_company_zip = '$zip', config_company_phone = '$phone', config_company_site = '$site' WHERE company_id = $company_id");
+     mysqli_query($mysqli,"UPDATE settings SET config_company_name = '$name', config_company_country = '$country', config_company_address = '$address', config_company_city = '$city', config_company_state = '$state', config_company_zip = '$zip', config_company_phone = '$phone', config_company_email = '$email', config_company_site = '$site' WHERE company_id = $company_id");
 
     //logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Company', log_action = 'Modified', log_description = '$name', log_created_at = NOW()");
@@ -290,6 +292,7 @@ if(isset($_POST['edit_company_settings'])){
     $config_company_state = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_state']));
     $config_company_zip = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_zip']));
     $config_company_phone = preg_replace("/[^0-9]/", '',$_POST['config_company_phone']);
+    $config_company_email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_email'])));
     $config_company_site = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_site']));
 
     $path = "$config_invoice_logo";
@@ -304,7 +307,7 @@ if(isset($_POST['edit_company_settings'])){
         move_uploaded_file($_FILES['file']['tmp_name'], $path);   
     }
 
-    mysqli_query($mysqli,"UPDATE settings SET config_company_name = '$config_company_name', config_company_country = '$config_company_country', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_phone = '$config_company_phone', config_company_site = '$config_company_site', config_invoice_logo = '$path' WHERE company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE settings SET config_company_name = '$config_company_name', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_country = '$config_company_country', config_company_phone = '$config_company_phone', config_company_email = '$config_company_email', config_company_site = '$config_company_site', config_invoice_logo = '$path' WHERE company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modified', log_description = 'Company', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
diff --git a/quote.php b/quote.php
index cbbe6534..c8db773f 100644
--- a/quote.php
+++ b/quote.php
@@ -199,7 +199,9 @@ if(isset($_GET['quote_id'])){
                 $item_subtotal = $row['item_price'];
                 $item_tax = $row['item_tax'];
                 $item_total = $row['item_total'];
+                $total_tax = 0;
                 $total_tax = $item_tax + $total_tax;
+                $sub_total = 0;
                 $sub_total = $item_price * $item_quantity + $sub_total;
 
               ?>
@@ -288,12 +290,6 @@ if(isset($_GET['quote_id'])){
               <td>Subtotal</td>
               <td class="text-right">$<?php echo number_format($sub_total,2); ?></td>
             </tr>
-            <?php if($discount > 0){ ?>
-            <tr class="border-bottom">
-              <td>Discount</td>
-              <td class="text-right">$<?php echo number_format($quote_discount,2); ?></td>          
-            </tr>
-            <?php } ?>
             <?php if($total_tax > 0){ ?>
             <tr class="border-bottom">
               <td>Tax</td>
diff --git a/recurring_invoice.php b/recurring_invoice.php
index ea067cef..18568dd1 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -16,7 +16,7 @@ if(isset($_GET['recurring_id'])){
   $recurring_scope = $row['recurring_scope'];
   $recurring_frequency = $row['recurring_frequency'];
   $recurring_status = $row['recurring_status'];
-  $recurring_start_date = $row['recurring_start_date'];
+  $recurring_created_at = $row['recurring_created_at'];
   $recurring_last_sent = $row['recurring_last_sent'];
   if($recurring_last_sent == 0){
     $recurring_last_sent = '-';
@@ -132,8 +132,8 @@ if(isset($_GET['recurring_id'])){
       <div class="col-sm-4">
         <table class="table">
           <tr>
-            <td>Start Date</td>
-            <td class="text-right"><?php echo $recurring_start_date; ?></td>
+            <td>Created</td>
+            <td class="text-right"><?php echo $recurring_created_at; ?></td>
           </tr>
           <tr>
             <td>Next Date</td>
@@ -177,7 +177,9 @@ if(isset($_GET['recurring_id'])){
                 $item_subtotal = $row['item_price'];
                 $item_tax = $row['item_tax'];
                 $item_total = $row['item_total'];
+                $total_tax = 0;
                 $total_tax = $item_tax + $total_tax;
+                $sub_total = 0;
                 $sub_total = $item_price * $item_quantity + $sub_total;
 
               ?>
@@ -265,12 +267,6 @@ if(isset($_GET['recurring_id'])){
               <td>Subtotal</td>
               <td class="text-right">$<?php echo number_format($sub_total,2); ?></td>
             </tr>
-            <?php if($discount > 0){ ?>
-            <tr class="border-bottom">
-              <td>Discount</td>
-              <td class="text-right">$<?php echo number_format($invoice_discount,2); ?></td>          
-            </tr>
-            <?php } ?>
             <?php if($total_tax > 0){ ?>
             <tr class="border-bottom">
               <td>Tax</td>
diff --git a/settings-company.php b/settings-company.php
index ec8981c6..647c25b2 100644
--- a/settings-company.php
+++ b/settings-company.php
@@ -63,16 +63,6 @@
         </div>
       </div>
 
-      <div class="form-group">
-        <label>Phone</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-          </div>
-          <input type="text" class="form-control" name="config_company_phone" placeholder="Phone Number" value="<?php echo $config_company_phone; ?>" data-inputmask="'mask': '999-999-9999'" > 
-        </div>
-      </div>
-
       <div class="form-group">
         <label>Country</label>
         <div class="input-group">
@@ -88,6 +78,26 @@
         </div>
       </div>
 
+      <div class="form-group">
+        <label>Phone</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+          </div>
+          <input type="text" class="form-control" name="config_company_phone" placeholder="Phone Number" value="<?php echo $config_company_phone; ?>" data-inputmask="'mask': '999-999-9999'" > 
+        </div>
+      </div>
+
+      <div class="form-group">
+        <label>Email</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+          </div>
+          <input type="email" class="form-control" name="config_company_email" placeholder="Email Address" value="<?php echo $config_company_email; ?>">
+        </div>
+      </div>
+
       <div class="form-group">
         <label>Website</label>
         <div class="input-group">
diff --git a/taxes.php b/taxes.php
index 9ee2943b..0ba432bf 100644
--- a/taxes.php
+++ b/taxes.php
@@ -1,38 +1,39 @@
 <?php include("header.php"); 
 
-  //Rebuild URL
+if(!empty($_GET['sb'])){
+  $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
+}else{
+  $sb = "tax_name";
+}
 
-  $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 = "tax_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 * FROM taxes WHERE company_id = $session_company_id ORDER BY $sb $o");
+//Rebuild URL
+$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
-  $num_rows = mysqli_num_rows($sql);
+$sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE company_id = $session_company_id ORDER BY $sb $o");
 
-  ?>
+$num_rows = mysqli_num_rows($sql);
 
-<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-balance-scale mr-2"></i>Taxes</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addTaxModal"><i class="fas fa-plus"></i></button>
+?>
+
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-balance-scale"></i> Taxes</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTaxModal"><i class="fas fa-fw fa-plus"></i> New Tax</button>
+    </div>
   </div>
   <div class="card-body">
     <div class="table-responsive">
@@ -58,20 +59,23 @@
             <td><?php echo "$tax_percent%"; ?></td>
             <td>
               <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown">
+                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
                   <i class="fas fa-ellipsis-h"></i>
                 </button>
-                <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                <div class="dropdown-menu">
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTaxModal<?php echo $tax_id; ?>">Edit</a>
+                  <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="post.php?delete_tax=<?php echo $tax_id; ?>">Delete</a>
                 </div>
               </div>
-              <?php include("edit_tax_modal.php"); ?> 
             </td>
           </tr>
 
           <?php
+
+          include("edit_tax_modal.php");
           }
+          
           ?>
 
           <?php
diff --git a/user_clients_modal.php b/user_clients_modal.php
index 32f55e90..1ea0fd97 100644
--- a/user_clients_modal.php
+++ b/user_clients_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="editUserClientsModal<?php echo $user_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-users mr-2"></i><?php echo $name; ?> Clients</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-users"></i> <?php echo $name; ?> Clients</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/user_companies_modal.php b/user_companies_modal.php
index 1224d969..1868353b 100644
--- a/user_companies_modal.php
+++ b/user_companies_modal.php
@@ -1,10 +1,10 @@
 <div class="modal" id="editUserCompaniesModal<?php echo $user_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-building mr-2"></i><?php echo $name; ?> Companies</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-building"></i> <?php echo $name; ?> Companies</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/users.php b/users.php
index 056524ad..f4756734 100644
--- a/users.php
+++ b/users.php
@@ -37,7 +37,6 @@
   }
 
   //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 users, permissions
@@ -46,16 +45,15 @@
     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-users mr-2"></i>Users</h6>
-    <button type="button" class="btn btn-primary btn-sm mr-auto float-right" data-toggle="modal" data-target="#addUserModal"><i class="fas fa-fw fa-plus"></i></button>
+<div class="card card-dark">
+  <div class="card-header">
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-users"></i> Users</h3>
+    <div class="card-tools">
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addUserModal"><i class="fas fa-fw fa-plus"></i> New User</button>
+    </div>
   </div>
   <div class="card-body">
     <form autocomplete="off">
@@ -66,6 +64,7 @@
         </div>
       </div>
     </form>
+    <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
         <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
@@ -138,10 +137,10 @@
             <td><?php echo $log_created_at; ?> <br> <small class="text-secondary"><?php echo $log_description; ?></small></td>
             <td>
               <div class="dropdown dropleft text-center">
-                <button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
                   <i class="fas fa-ellipsis-h"></i>
                 </button>
-                <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                <div class="dropdown-menu">
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editUserModal<?php echo $user_id; ?>">Edit</a>
                   <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editUserCompaniesModal<?php echo $user_id; ?>">Company Access</a>
@@ -149,14 +148,15 @@
                   <div class="dropdown-divider"></div>
                   <a class="dropdown-item" href="post.php?delete_user=<?php echo $user_id; ?>">Delete</a>
                 </div>
-              </div>
-              <?php include("edit_user_modal.php"); ?>
-              <?php include("user_companies_modal.php"); ?>
-              <?php include("user_clients_modal.php"); ?>  
+              </div>   
             </td>
           </tr>
 
           <?php
+
+          include("edit_user_modal.php");
+          include("user_companies_modal.php");
+          include("user_clients_modal.php");
           
           }
       
diff --git a/view_file_modal.php b/view_file_modal.php
index bc9f8e2e..a4888ab0 100644
--- a/view_file_modal.php
+++ b/view_file_modal.php
@@ -2,9 +2,9 @@
   <div class="modal-dialog modal-xl ">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title text-white"><i class="fa fa-fw fa-image mr-2"></i><?php echo basename($file_name); ?></h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-image"></i> <?php echo basename($file_name); ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>