diff --git a/accounts.php b/accounts.php
index 3d44cb85..f8374019 100644
--- a/accounts.php
+++ b/accounts.php
@@ -66,7 +66,7 @@
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=account_name&o=<?php echo $disp; ?>">Name</a></th>
             <th class="text-right">Balance</th>
diff --git a/alerts.php b/alerts.php
index c8da22ed..3343e37e 100644
--- a/alerts.php
+++ b/alerts.php
@@ -21,7 +21,7 @@ if($_GET['status'] == "archived"){
   <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">
+        <thead class="thead-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th>Date</th>
             <th>Type</th>
diff --git a/categories.php b/categories.php
index 8783cce9..5b6bdf76 100644
--- a/categories.php
+++ b/categories.php
@@ -65,7 +65,7 @@
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=category_name&o=<?php echo $disp; ?>">Name</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=category_type&o=<?php echo $disp; ?>">Type</a></th>
diff --git a/client_assets.php b/client_assets.php
index 1b72d9e6..9b79eea4 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -69,7 +69,7 @@ $total_pages = ceil($total_found_rows / 10);
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=asset_type&o=<?php echo $disp; ?>">Type</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=asset_name&o=<?php echo $disp; ?>">Name</a></th>
diff --git a/client_contacts.php b/client_contacts.php
index 9895c6d7..cebc29e3 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -67,7 +67,7 @@ $total_pages = ceil($total_found_rows / 10);
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th class="text-center"><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_name&o=<?php echo $disp; ?>">Name</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_title&o=<?php echo $disp; ?>">Title</a></th>
diff --git a/client_domains.php b/client_domains.php
index b6b0eac6..76b08c53 100644
--- a/client_domains.php
+++ b/client_domains.php
@@ -68,7 +68,7 @@ $total_pages = ceil($total_found_rows / 10);
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=domain_name&o=<?php echo $disp; ?>">Domain</a></th>
             <th>Registrar</th>
diff --git a/client_invoices.php b/client_invoices.php
index c996886c..e2c078e9 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -70,7 +70,7 @@ $total_pages = ceil($total_found_rows / 10);
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_number&o=<?php echo $disp; ?>">Number</a></th>
             <th class="text-right"><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_amount&o=<?php echo $disp; ?>">Amount</a></th>
diff --git a/client_locations.php b/client_locations.php
index a2d3849a..ab72e8e0 100644
--- a/client_locations.php
+++ b/client_locations.php
@@ -69,7 +69,7 @@ $total_pages = ceil($total_found_rows / 10);
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead>
+        <thead class="<?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <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>
diff --git a/client_logins.php b/client_logins.php
index a44d10e7..dea1e9da 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -70,7 +70,7 @@ $total_pages = ceil($total_found_rows / 10);
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=login_description&o=<?php echo $disp; ?>">Description</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=login_username&o=<?php echo $disp; ?>">Username</a></th>
diff --git a/client_networks.php b/client_networks.php
index f9384f02..63305279 100644
--- a/client_networks.php
+++ b/client_networks.php
@@ -69,7 +69,7 @@ $total_pages = ceil($total_found_rows / 10);
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=network_name&o=<?php echo $disp; ?>">Name</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=network&o=<?php echo $disp; ?>">Network</a></th>
diff --git a/client_notes.php b/client_notes.php
index 7aa5650c..769d0058 100644
--- a/client_notes.php
+++ b/client_notes.php
@@ -1,4 +1,55 @@
-<?php $sql = mysqli_query($mysqli,"SELECT * FROM notes WHERE client_id = $client_id ORDER BY note_id DESC"); ?>
+<?php
+
+//Rebuild URL
+
+$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
+
+if(isset($_GET['p'])){
+  $p = intval($_GET['p']);
+  $record_from = (($p)-1)*10;
+  $record_to =  10;
+}else{
+  $record_from = 0;
+  $record_to = 10;
+  $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 = "note_id";
+}
+
+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 notes 
+  WHERE notes.client_id = $client_id
+  AND notes.company_id = $session_company_id
+  AND (note_subject 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">
@@ -6,50 +57,83 @@
     <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addNoteModal"><i class="fa fa-plus"></i></button>
   </div>
   <div class="card-body">
+    <form autocomplete="off">
+      <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
+      <input type="hidden" name="tab" value="<?php echo $_GET['tab']; ?>">
+      <div class="input-group">
+        <input type="search" class="form-control " name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search <?php echo ucwords($_GET['tab']); ?>">
+        <div class="input-group-append">
+          <button class="btn btn-secondary"><i class="fa fa-search"></i></button>
+        </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"; } ?>">
+          <tr>
+            <th>
+              <a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=note_subject&o=<?php echo $disp; ?>">Note</a>
+            </th>
+            <th>
+              <a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=note_created_at&o=<?php echo $disp; ?>">Created</a>
+            </th>
+            <th>
+              <a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=note_updated_at&o=<?php echo $disp; ?>">Updated</a>
+            </th>
+            <th class="text-center">
+              Action
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <?php
+      
+          while($row = mysqli_fetch_array($sql)){
+            $note_id = $row['note_id'];
+            $note_subject = $row['note_subject'];
+            $note_body = $row['note_body'];
+            $note_created_at = $row['note_created_at'];
+            $note_updated_at = $row['note_updated_at'];
 
-    <?php
-    
-    while($row = mysqli_fetch_array($sql)){
-      $note_id = $row['note_id'];
-      $note_subject = $row['note_subject'];
-      $note_body = $row['note_body'];
-    
-    ?>
-        <div class="card mb-5">
-          <div class="card-header">
-            
-              <?php echo $note_subject; ?>
-              <div class="dropdown dropleft text-center float-right">
+          ?>
+
+          <tr>
+            <td>
+              <a href="#" data-toggle="modal" data-target="#viewNoteModal<?php echo $note_id; ?>"><?php echo $note_subject; ?></a>
+            </td>
+            <td><?php echo $note_created_at; ?></td>
+            <td><?php echo $note_updated_at; ?></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">
                   <i class="fas fa-ellipsis-h"></i>
                 </button>
                 <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#viewNoteModal<?php echo $note_id; ?>">View</a>
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editNoteModal<?php echo $note_id; ?>">Edit</a>
                   <a class="dropdown-item" href="post.php?delete_note=<?php echo $note_id; ?>">Delete</a>
                 </div>
-              </div>     
-            
-          </div>
-          <div class="card-body">
-            <?php
-            $Parsedown = new Parsedown();
-            echo $Parsedown->text("$note_body");
-            ?>
-          </div>
-          <div class="card-footer">
-            <small>Created 2019-02-13 - Updated 2019-04-22</small>
-          </div>
-        </div>
-     
-      <?php 
-      include("view_note_modal.php");
-      include("edit_note_modal.php");
-      
-    } 
+              </div>
+              <?php
+              include("edit_note_modal.php");
+              include("view_note_modal.php");
+              ?>      
+            </td>
+          </tr>
 
-    ?>
+          <?php
+          
+          }
+
+          ?>
+
+        </tbody>
+      </table>
+
+      <?php include("pagination.php"); ?>
+
+    </div>
   </div>
 </div>
 
-<?php include("add_note_modal.php"); ?>
+<?php include("add_note_modal.php"); ?>
\ No newline at end of file
diff --git a/client_payments.php b/client_payments.php
index bda86bea..751cb0ec 100644
--- a/client_payments.php
+++ b/client_payments.php
@@ -71,7 +71,7 @@ $total_pages = ceil($total_found_rows / 10);
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_date&o=<?php echo $disp; ?>">Date</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_number&o=<?php echo $disp; ?>">Invoice</a></th>
diff --git a/client_quotes.php b/client_quotes.php
index 5815f736..c796daac 100644
--- a/client_quotes.php
+++ b/client_quotes.php
@@ -70,7 +70,7 @@ $total_pages = ceil($total_found_rows / 10);
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_number&o=<?php echo $disp; ?>">Number</a></th>
             <th class="text-right"><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_amount&o=<?php echo $disp; ?>">Amount</a></th>
diff --git a/client_recurring.php b/client_recurring.php
index dc307444..f6e960a6 100644
--- a/client_recurring.php
+++ b/client_recurring.php
@@ -70,7 +70,7 @@ $total_pages = ceil($total_found_rows / 10);
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_frequency&o=<?php echo $disp; ?>">Frequency</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_last_sent&o=<?php echo $disp; ?>">Last Sent</a></th>
diff --git a/client_software.php b/client_software.php
index d291cec3..8d778daa 100644
--- a/client_software.php
+++ b/client_software.php
@@ -69,7 +69,7 @@ $total_pages = ceil($total_found_rows / 10);
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_name&o=<?php echo $disp; ?>">Software</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=software_type&o=<?php echo $disp; ?>">Type</a></th>
diff --git a/client_tickets.php b/client_tickets.php
index e62749e0..a9b7c5df 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -69,7 +69,7 @@ $total_pages = ceil($total_found_rows / 10);
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_id&o=<?php echo $disp; ?>">Number</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_subject&o=<?php echo $disp; ?>">Subject</a></th>
diff --git a/client_vendors.php b/client_vendors.php
index 475d2f94..8ef15711 100644
--- a/client_vendors.php
+++ b/client_vendors.php
@@ -69,7 +69,7 @@ $total_pages = ceil($total_found_rows / 10);
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_name&o=<?php echo $disp; ?>">Vendor</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_description&o=<?php echo $disp; ?>">Description</a></th>
diff --git a/clients.php b/clients.php
index 93fff5c7..4b32eba1 100644
--- a/clients.php
+++ b/clients.php
@@ -64,7 +64,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th class="w-40"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Name <i class="fa fa-sort-alpha<?php if($disp=='ASC'){ echo "-up"; }else{ echo "-down"; }?>"></i></a></th>
             <th class="w-15"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_type&o=<?php echo $disp; ?>">Type <i class="fa fa-sort"></i></a></th>
diff --git a/companies.php b/companies.php
index 0611ec27..d5f4c924 100644
--- a/companies.php
+++ b/companies.php
@@ -67,7 +67,7 @@
     </form>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th class="text-center"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=company_name&o=<?php echo $disp; ?>">Name</a></th>
             <th class="text-center">Action</th>
diff --git a/expenses.php b/expenses.php
index 45b89034..f1f076ca 100644
--- a/expenses.php
+++ b/expenses.php
@@ -70,7 +70,7 @@
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=expense_date&o=<?php echo $disp; ?>">Date</a></th>
             <th class="text-right"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=expense_amount&o=<?php echo $disp; ?>">Amount</a></th>
diff --git a/functions.php b/functions.php
index 031dd534..a209aef8 100644
--- a/functions.php
+++ b/functions.php
@@ -124,8 +124,6 @@ function get_os() {
     return $os_platform;
 }
 
-
-
 function get_device(){
     $tablet_browser = 0;
     $mobile_browser = 0;
diff --git a/invoices.php b/invoices.php
index 43c9406b..11e048ef 100644
--- a/invoices.php
+++ b/invoices.php
@@ -159,7 +159,7 @@
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_number&o=<?php echo $disp; ?>">Number</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client</a></th>
diff --git a/pagination.php b/pagination.php
index fd6db2de..911a2ed9 100644
--- a/pagination.php
+++ b/pagination.php
@@ -62,7 +62,11 @@ if ($total_found_rows > 10) {
 <?php
 
 }
-
-echo "<div class='justify-content-start'><br><b>Records:</b> $total_found_rows</div>";
+          
+if($total_found_rows == 0){
+echo "<center><h3 class='text-secondary'>No Records Here</h3></center>";
+}else{
+	echo "<div class='justify-content-start'><br><strong>Records:</strong> $total_found_rows</div>";
+}
 
 ?>
\ No newline at end of file
diff --git a/payments.php b/payments.php
index 814954c3..254024fb 100644
--- a/payments.php
+++ b/payments.php
@@ -69,7 +69,7 @@
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=payment_date&o=<?php echo $disp; ?>">Date</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=invoice_number&o=<?php echo $disp; ?>">Invoice</a></th>
diff --git a/products.php b/products.php
index 19bc901d..868aca48 100644
--- a/products.php
+++ b/products.php
@@ -65,7 +65,7 @@
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=product_name&o=<?php echo $disp; ?>">Name</a></th>
             <th>Description</th>
diff --git a/quotes.php b/quotes.php
index adba4923..061f00b8 100644
--- a/quotes.php
+++ b/quotes.php
@@ -69,7 +69,7 @@
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=quote_number&o=<?php echo $disp; ?>">Number</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client</a></th>
diff --git a/recurring.php b/recurring.php
index 0b90fe2e..feae2775 100644
--- a/recurring.php
+++ b/recurring.php
@@ -69,7 +69,7 @@
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=recurring_frequency&o=<?php echo $disp; ?>">Frequency</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client</a></th>
diff --git a/tickets.php b/tickets.php
index 6e72739e..744c8aad 100644
--- a/tickets.php
+++ b/tickets.php
@@ -68,7 +68,7 @@
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=ticket_id&o=<?php echo $disp; ?>">Number</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=client_name&o=<?php echo $disp; ?>">Client</a></th>
diff --git a/transfers.php b/transfers.php
index bb113e05..c5ee520c 100644
--- a/transfers.php
+++ b/transfers.php
@@ -65,7 +65,7 @@ $total_pages = ceil($total_found_rows / 10);
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=transfer_date&o=<?php echo $disp; ?>">Date</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=transfer_account_from&o=<?php echo $disp; ?>">From Account</a></th>
diff --git a/trips.php b/trips.php
index a91837cd..54dce2ef 100644
--- a/trips.php
+++ b/trips.php
@@ -67,7 +67,7 @@
     <hr>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_date&o=<?php echo $disp; ?>">Date</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=trip_purpose&o=<?php echo $disp; ?>">Purpose</a></th>
diff --git a/users.php b/users.php
index 6c748982..5655bbd9 100644
--- a/users.php
+++ b/users.php
@@ -66,7 +66,7 @@
     </form>
     <div class="table-responsive">
       <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
+        <thead class="text-dark <?php if($num_rows[0] == 0){ echo "d-none"; } ?>">
           <tr>
             <th class="text-center"><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=name&o=<?php echo $disp; ?>">Name</a></th>
             <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=email&o=<?php echo $disp; ?>">Email</a></th>
diff --git a/vendors.php b/vendors.php
index 759e4225..e69de29b 100644
--- a/vendors.php
+++ b/vendors.php
@@ -1,160 +0,0 @@
-<?php include("header.php");
-  
-  //Rebuild URL
-
-  $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
-
-  if(isset($_GET['p'])){
-    $p = intval($_GET['p']);
-    $record_from = (($p)-1)*10;
-    $record_to =  10;
-  }else{
-    $record_from = 0;
-    $record_to = 10;
-    $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 = "vendor_name";
-  }
-
-  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 vendors WHERE client_id = 0 AND company_id = $session_company_id AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number 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 mb-3">
-  <div class="card-header bg-dark text-white">
-    <h6 class="float-left mt-2"><i class="fa fa-fw fa-building mr-2"></i>Vendors</h6>
-    <button type="button" class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addVendorModal"><i class="fas fa-fw fa-plus"></i></button>
-  </div>
-  <div class="card-body">
-    <form autocomplete="off">
-      <div class="input-group">
-        <input type="search" class="form-control col-md-4" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Invoices">
-        <div class="input-group-append">
-          <button class="btn btn-primary"><i class="fa fa-search"></i></button>
-        </div>
-      </div>
-    </form>
-    <hr>
-    <div class="table-responsive">
-      <table class="table table-striped table-borderless table-hover">
-        <thead class="text-dark">
-          <tr>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_name&o=<?php echo $disp; ?>">Vendor</a></th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_description&o=<?php echo $disp; ?>">Description</a></th>
-            <th>Contact</th>
-            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_account_number&o=<?php echo $disp; ?>">Account Number</a></th>
-            <th class="text-center">Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          <?php
-      
-          while($row = mysqli_fetch_array($sql)){
-            $vendor_id = $row['vendor_id'];
-            $vendor_name = $row['vendor_name'];
-            $vendor_description = $row['vendor_description'];
-            $vendor_account_number = $row['vendor_account_number'];
-            $vendor_address = $row['vendor_address'];
-            $vendor_city = $row['vendor_city'];
-            $vendor_state = $row['vendor_state'];
-            $vendor_zip = $row['vendor_zip'];
-            $vendor_contact_name = $row['vendor_contact_name'];
-            $vendor_phone = $row['vendor_phone'];
-            if(strlen($vendor_phone)>2){ 
-              $vendor_phone = substr($row['vendor_phone'],0,3)."-".substr($row['vendor_phone'],3,3)."-".substr($row['vendor_phone'],6,4);
-            }
-            $vendor_email = $row['vendor_email'];
-            $vendor_website = $row['vendor_website'];
-
-          ?>
-          <tr>
-            <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editVendorModal<?php echo $vendor_id; ?>"><?php echo $vendor_name; ?></a></td>
-            <td><?php echo $vendor_description; ?></td>
-            <td>
-              <?php
-              if(!empty($vendor_contact_name)){
-              ?>
-              <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $vendor_contact_name; ?>
-              <br>
-              <?php
-              }
-              ?>
-              <?php
-              if(!empty($vendor_phone)){
-              ?>
-              <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $vendor_phone; ?>
-              <br>
-              <?php
-              }
-              ?>
-              <?php
-              if(!empty($vendor_email)){
-              ?>
-              <i class="fa fa-fw fa-envelope text-secondary mr-2 mb-2"></i><?php echo $vendor_email; ?>
-              <br>
-              <?php
-              }
-              ?>
-            </td>
-            <td><?php echo $vendor_account_number; ?></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">
-                  <i class="fas fa-ellipsis-h"></i>
-                </button>
-                <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                  <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editVendorModal<?php echo $vendor_id; ?>">Edit</a>
-                  <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
-          
-          }
-          
-          ?>
-
-        </tbody>
-      </table>
-
-      <?php include("pagination.php"); ?>
-
-    </div>
-  </div>
-</div>
-
-<?php include("add_vendor_modal.php"); ?>
-
-<?php include("footer.php");
\ No newline at end of file
diff --git a/view_client_note.php b/view_client_note.php
new file mode 100644
index 00000000..c18b574c
--- /dev/null
+++ b/view_client_note.php
@@ -0,0 +1,12 @@
+<div class="card">
+	<div class="card-header bg-dark text-white">
+		<h6 class="float-left mt-1"><i class="fa fa-edit"></i><?php echo $note_subject; ?></h6>
+		<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#editNoteModal"><i class="fa fa-plus"></i></button>
+	</div>
+	<div class="card-body">
+		<?php
+		$Parsedown = new Parsedown();
+		echo $Parsedown->text("$note_body");
+		?>
+	</div>
+</div>
\ No newline at end of file