diff --git a/add_certificate_modal.php b/add_certificate_modal.php
index b69556f9..9323b168 100644
--- a/add_certificate_modal.php
+++ b/add_certificate_modal.php
@@ -22,12 +22,12 @@
           </div>
 
           <div class="form-group">
-            <label>Domain</label>
+            <label>Domain <strong class="text-danger">*</strong></label>
             <div class="input-group">
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
               </div>
-              <input type="text" class="form-control" name="domain" placeholder="Domain name">
+              <input type="text" class="form-control" name="domain" placeholder="Domain name" required>
             </div>
           </div>
           
diff --git a/add_vendor_modal.php b/add_vendor_modal.php
index 5bf7ebdf..b924ceef 100644
--- a/add_vendor_modal.php
+++ b/add_vendor_modal.php
@@ -45,7 +45,7 @@
               </div>
               
               <div class="form-group">
-                <label>Description <strong class="text-danger">*</strong></label>
+                <label>Description</label>
                 <div class="input-group">
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
diff --git a/client_assets.php b/client_assets.php
index 31e8163e..ec8748df 100644
--- a/client_assets.php
+++ b/client_assets.php
@@ -91,8 +91,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $asset_make = $row['asset_make'];
             $asset_model = $row['asset_model'];
             $asset_serial = $row['asset_serial'];
+            if(empty($asset_serial)){
+              $asset_serial_display = "-";
+            }else{
+              $asset_serial_display = $asset_serial;
+            }
             $asset_os = $row['asset_os'];
             $asset_ip = $row['asset_ip'];
+            if(empty($asset_ip)){
+              $asset_ip_display = "-";
+            }else{
+              $asset_ip_display = "$asset_ip<button class='btn btn-sm' data-clipboard-text='$asset_ip'><i class='far fa-copy text-secondary'></i></button>";
+            }
             $asset_mac = $row['asset_mac'];
             $asset_purchase_date = $row['asset_purchase_date'];
             $asset_warranty_expire = $row['asset_warranty_expire'];
@@ -199,8 +209,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             </th>
             <td><i class="fa fa-fw text-secondary fa-<?php echo $device_icon; ?> mr-2"></i><?php echo $asset_type; ?></td>
             <td><?php echo "$asset_make $asset_model"; ?></td>
-            <td><?php echo $asset_ip; ?></td>
-            <td><?php echo $asset_serial; ?></td>
+            <td><?php echo $asset_ip_display; ?></td>
+            <td><?php echo $asset_serial_display; ?></td>
             <td><?php echo $contact_name; ?></td>
             <td><?php echo $location_name; ?></td>
             <td>
diff --git a/client_certificates.php b/client_certificates.php
index 1bc0e92b..aabddcd5 100644
--- a/client_certificates.php
+++ b/client_certificates.php
@@ -74,7 +74,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=certificate_domain&o=<?php echo $disp; ?>">Domain</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=certificate_issued_by&o=<?php echo $disp; ?>">Issued By</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=certificate_expire&o=<?php echo $disp; ?>">Expire</a></th>
-            <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=certificate_updated_at&o=<?php echo $disp; ?>">Updated</a></th>
             <th class="text-center">Action</th>
           </tr>
         </thead>
@@ -95,7 +94,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <td><?php echo $certificate_domain; ?></td>
             <td><?php echo $certificate_issued_by; ?></td>
             <td><?php echo $certificate_expire; ?></td>
-            <td><?php echo $certificate_updated_at; ?></td>
             <td>
               <div class="dropdown dropleft text-center">
                 <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
diff --git a/client_contacts.php b/client_contacts.php
index 0fee6ff0..437a24cd 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -72,6 +72,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_title&o=<?php echo $disp; ?>">Title</a></th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=contact_email&o=<?php echo $disp; ?>">Email</a></th>
             <th>Phone</th>
+            <th>Mobile</th>
             <th class="text-center">Action</th>
           </tr>
         </thead>
@@ -82,16 +83,36 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $contact_id = $row['contact_id'];
             $contact_name = $row['contact_name'];
             $contact_title = $row['contact_title'];
+            if(empty($contact_title)){
+              $contact_title_display = "-";
+            }else{
+              $contact_title_display = $contact_title;
+            }
             $contact_phone = $row['contact_phone'];
             if(strlen($contact_phone)>2){ 
               $contact_phone = substr($row['contact_phone'],0,3)."-".substr($row['contact_phone'],3,3)."-".substr($row['contact_phone'],6,4);
             }
+            if(empty($contact_phone)){
+              $contact_phone_display = "-";
+            }else{
+              $contact_phone_display = "$contact_phone";
+            }
             $contact_extension = $row['contact_extension'];
             $contact_mobile = $row['contact_mobile'];
             if(strlen($contact_mobile)>2){ 
               $contact_mobile = substr($row['contact_mobile'],0,3)."-".substr($row['contact_mobile'],3,3)."-".substr($row['contact_mobile'],6,4);
             }
+            if(empty($contact_mobile)){
+              $contact_mobile_display = "-";
+            }else{
+              $contact_mobile_display = "$contact_mobile";
+            }
             $contact_email = $row['contact_email'];
+            if(empty($contact_email)){
+              $contact_email_display = "-";
+            }else{
+              $contact_email_display = "<a href='mailto:$contact_email'>$contact_email</a><button class='btn btn-sm' data-clipboard-text='$contact_email'><i class='far fa-copy text-secondary'></i></button>";
+            }
             $contact_photo = $row['contact_photo'];
             $contact_initials = initials($contact_name);
             $contact_notes = $row['contact_notes'];
@@ -118,26 +139,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
               </a>
             </th>
             
-            <td><?php echo $contact_title; ?></td>
-            <td><a href="mailto:<?php echo $contact_email; ?>"><?php echo $contact_email; ?></a></td>
-            <td>
-              <?php
-              if(!empty($contact_phone) OR !empty($contact_extension)){
-              ?>
-              <i class="fa fa-fw fa-phone text-secondary mr-2 mb-2"></i><?php echo $contact_phone; ?> <?php if(!empty($contact_extension)){ echo "x$contact_extension"; } ?>
-              <br>
-              <?php
-              }
-              ?>
-              <?php
-              if(!empty($contact_mobile)){
-              ?>
-              <i class="fa fa-fw fa-mobile-alt text-secondary mr-2 mb-2"></i><?php echo $contact_mobile; ?>
-              <br>
-              <?php
-              }
-              ?>
-            </td>
+            <td><?php echo $contact_title_display; ?></td>
+            <td><?php echo $contact_email_display; ?></td>
+            <td><?php echo $contact_phone_display; ?> <?php if(!empty($contact_extension)){ echo "x$contact_extension"; } ?></td>
+            <td><?php echo $contact_mobile_display; ?></td>
             <td>
               <div class="dropdown dropleft text-center">
                 <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
diff --git a/client_domains.php b/client_domains.php
index 7f9db681..8a7aba4b 100644
--- a/client_domains.php
+++ b/client_domains.php
@@ -91,10 +91,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $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_name = $row['vendor_name'];
+            if(empty($domain_registrar_name)){
+              $domain_registrar_name = "-";
+            }
 
             $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_name = $row['vendor_name'];
+            if(empty($domain_webhost_name)){
+              $domain_webhost_name = "-";
+            }
 
           ?>
           <tr>
diff --git a/client_invoices.php b/client_invoices.php
index e4487c69..002ae359 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -90,6 +90,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $invoice_prefix = $row['invoice_prefix'];
             $invoice_number = $row['invoice_number'];
             $invoice_scope = $row['invoice_scope'];
+            if(empty($invoice_scope)){
+              $invoice_scope_display = "-";
+            }else{
+              $invoice_scope_display = $invoice_scope;
+            }
             $invoice_status = $row['invoice_status'];
             $invoice_date = $row['invoice_date'];
             $invoice_due = $row['invoice_due'];
@@ -125,7 +130,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
           <tr>
             <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
-            <td><?php echo $invoice_scope; ?></td>
+            <td><?php echo $invoice_scope_display; ?></td>
             <td class="text-right">$<?php echo number_format($invoice_amount,2); ?></td>
             <td><?php echo $invoice_date; ?></td>
             <td><div class="<?php echo $overdue_color; ?>"><?php echo $invoice_due; ?></div></td>
diff --git a/client_locations.php b/client_locations.php
index 351c68e0..b3d55a4d 100644
--- a/client_locations.php
+++ b/client_locations.php
@@ -93,9 +93,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             if(strlen($location_phone)>2){ 
               $location_phone = substr($row['location_phone'],0,3)."-".substr($row['location_phone'],3,3)."-".substr($row['location_phone'],6,4);
             }
+            if(empty($location_phones)){
+              $location_phone_display = "-";
+            }else{
+              $location_phone_display = $location_phone;
+            }
             $location_hours = $row['location_hours'];
             if(empty($location_hours)){
-              $location_hours = '-';
+              $location_hours_display = "-";
+            }else{
+              $location_hours_display = $location_hours;
             }
             $location_photo = $row['location_photo'];
             $location_notes = $row['location_notes'];
@@ -110,8 +117,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
               <a class="text-dark" href="#" data-toggle="modal" data-target="#editLocationModal<?php echo $location_id; ?>"><?php echo $location_name; ?></a>
             </th>
             <td><a href="//maps.<?php echo $session_map_source; ?>.com?q=<?php echo "$location_address $location_zip"; ?>" target="_blank"><?php echo $location_address; ?><br><?php echo "$location_city $location_state $location_zip"; ?></a></td>
-            <td><?php echo $location_phone; ?></td>
-            <td><?php echo $location_hours; ?></td>
+            <td><?php echo $location_phone_display; ?></td>
+            <td><?php echo $location_hours_display; ?></td>
             <td>
               <div class="dropdown dropleft text-center">
                 <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
diff --git a/client_networks.php b/client_networks.php
index 5f91314d..868bd42a 100644
--- a/client_networks.php
+++ b/client_networks.php
@@ -86,9 +86,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $network_id = $row['network_id'];
             $network_name = $row['network_name'];
             $network_vlan = $row['network_vlan'];
+            if(empty($network_vlan)){
+              $network_vlan_display = "-";
+            }else{
+              $network_vlan_display = $network_vlan;
+            }
             $network = $row['network'];
             $network_gateway = $row['network_gateway'];
             $network_dhcp_range = $row['network_dhcp_range'];
+            if(empty($network_dhcp_range)){
+              $network_dhcp_range_display = "-";
+            }else{
+              $network_dhcp_range_display = $network_dhcp_range;
+            }
             $network_created_at = $row['network_created_at'];
             $location_id = $row['location_id'];
       
@@ -97,10 +107,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <th>
               <i class="fa fa-fw fa-network-wired text-secondary"></i> 
               <a class="text-dark" href="#" data-toggle="modal" data-target="#editNetworkModal<?php echo $network_id; ?>"><?php echo $network_name; ?></a></th>
-            <td><?php echo $network_vlan; ?></td>
+            <td><?php echo $network_vlan_display; ?></td>
             <td><?php echo $network; ?></td>
             <td><?php echo $network_gateway; ?></td>
-            <td><?php echo $network_dhcp_range; ?></td>
+            <td><?php echo $network_dhcp_range_display; ?></td>
             <td>
               <div class="dropdown dropleft text-center">
                 <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
diff --git a/client_payments.php b/client_payments.php
index ada705b9..574eb878 100644
--- a/client_payments.php
+++ b/client_payments.php
@@ -93,6 +93,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $payment_date = $row['payment_date'];
             $payment_method = $row['payment_method'];
             $payment_reference = $row['payment_reference'];
+            if(empty($payment_reference)){
+              $payment_reference_display = "-";
+            }else{
+              $payment_reference_display = $payment_reference;
+            }
             $payment_amount = $row['payment_amount'];
             $account_name = $row['account_name'];
 
@@ -105,7 +110,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <td class="text-right">$<?php echo number_format($invoice_amount,2); ?></td>
             <td class="text-right">$<?php echo number_format($payment_amount,2); ?></td>
             <td><?php echo $payment_method; ?></td>
-            <td><?php echo $payment_reference; ?></td>
+            <td><?php echo $payment_reference_display; ?></td>
             <td><?php echo $account_name; ?></td>
           </tr>
 
diff --git a/client_quotes.php b/client_quotes.php
index f1344a20..e8ba4936 100644
--- a/client_quotes.php
+++ b/client_quotes.php
@@ -89,6 +89,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $quote_prefix = $row['quote_prefix'];
             $quote_number = $row['quote_number'];
             $quote_scope = $row['quote_scope'];
+            if(empty($quote_scope)){
+              $quote_scope_display = "-";
+            }else{
+              $quote_scope_display = $quote_scope;
+            }
             $quote_status = $row['quote_status'];
             $quote_date = $row['quote_date'];
             $quote_amount = $row['quote_amount'];
@@ -116,7 +121,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
           <tr>
             <td><a href="quote.php?quote_id=<?php echo $quote_id; ?>"><?php echo "$quote_prefix$quote_number"; ?></a></td>
-            <td><?php echo $quote_scope; ?></td>
+            <td><?php echo $quote_scope_display; ?></td>
             <td class="text-right">$<?php echo number_format($quote_amount,2); ?></td>
             <td><?php echo $quote_date; ?></td>
             <td><?php echo $category_name; ?></td>
diff --git a/client_software.php b/client_software.php
index 174515e4..24daafe7 100644
--- a/client_software.php
+++ b/client_software.php
@@ -86,6 +86,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $software_name = $row['software_name'];
             $software_type = $row['software_type'];
             $software_license = $row['software_license'];
+            if(empty($software_license)){
+              $software_license_display = "-";
+            }else{
+              $software_license_display = $software_license;
+            }
             $software_notes = $row['software_notes'];
 
             $sql_login = mysqli_query($mysqli,"SELECT *, AES_DECRYPT(login_password, '$config_aes_key') AS login_password FROM logins WHERE software_id = $software_id");
@@ -99,7 +104,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
           <tr>
             <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editSoftwareModal<?php echo $software_id; ?>"><?php echo $software_name; ?></a></td>
             <td><?php echo $software_type; ?></td>
-            <td><?php echo $software_license; ?></td>
+            <td><?php echo $software_license_display; ?></td>
             <td>
               <?php
               if($software_id == $software_id_relation){
diff --git a/client_tickets.php b/client_tickets.php
index 0313f0d4..2bdc4ff1 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -96,6 +96,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $ticket_status = $row['ticket_status'];
             $ticket_created_at = $row['ticket_created_at'];
             $ticket_updated_at = $row['ticket_updated_at'];
+            if(empty($ticket_updated_at)){
+              $ticket_updated_at_display = "<p class='text-danger'>Never</p>";
+            }else{
+              $ticket_updated_at_display = $ticket_updated_at;
+            }
             $ticket_closed_at = $row['ticket_closed_at'];
             
             if($ticket_status == "Open"){
@@ -124,7 +129,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <td><?php echo $ticket_status_display; ?></td>
             <td><?php echo $ticket_subject; ?></td>
             <td>- UNASSIGNED -</td>
-            <td><?php echo $ticket_updated_at; ?></td>
+            <td><?php echo $ticket_updated_at_display; ?></td>
             <td><?php echo $ticket_created_at; ?></td>
             <td>
               <div class="dropdown dropleft text-center">
diff --git a/client_vendors.php b/client_vendors.php
index 019fcbba..c59c758c 100644
--- a/client_vendors.php
+++ b/client_vendors.php
@@ -84,6 +84,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $vendor_id = $row['vendor_id'];
             $vendor_name = $row['vendor_name'];
             $vendor_description = $row['vendor_description'];
+            if(empty($vendor_description)){
+              $vendor_description_display = "-";
+            }else{
+              $vendor_description_display = $vendor_description;
+            }
             $vendor_account_number = $row['vendor_account_number'];
             $vendor_country = $row['vendor_country'];
             $vendor_address = $row['vendor_address'];
@@ -91,6 +96,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $vendor_state = $row['vendor_state'];
             $vendor_zip = $row['vendor_zip'];
             $vendor_contact_name = $row['vendor_contact_name'];
+            if(empty($vendor_contact_name)){
+              $vendor_contact_name_display = "-";
+            }else{
+              $vendor_contact_name_display = $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);
@@ -114,14 +124,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
               }
               ?>
             </th>
-            <td><?php echo $vendor_description; ?></td>
+            <td><?php echo $vendor_description_display; ?></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; ?>
+              <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $vendor_contact_name_display; ?>
               <br>
               <?php
+              }else{
+                echo $vendor_contact_name_display;
               }
               ?>
               <?php
diff --git a/clients.php b/clients.php
index 615deebe..c0503096 100644
--- a/clients.php
+++ b/clients.php
@@ -172,7 +172,17 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $client_city = $row['client_city'];
             $client_state = $row['client_state'];
             $client_zip = $row['client_zip'];
+            if(empty($client_address)){
+              $client_address_display = "-";
+            }else{
+              $client_address_display = "$client_address<br>$client_city $client_state $client_zip";
+            }
             $client_contact = $row['client_contact'];
+            if(empty($client_contact)){
+              $client_contact_display = "-";
+            }else{
+              $client_contact_display = $client_contact;
+            }
             $client_phone = $row['client_phone'];
             if(strlen($client_phone)>2){ 
               $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4);
@@ -222,9 +232,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
               <br>
               <small class="text-secondary"><b>Contract started: </b><?php echo $client_created_at; ?></small>
             </td>
-            <td>
-              <?php echo "$client_address<br>$client_city $client_state $client_zip"; ?>
-            </td>
+            <td><?php echo $client_address_display; ?></td>
             <td>
               <?php
               if(!empty($client_contact)){
@@ -232,6 +240,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
               <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $client_contact; ?>
               <br>
               <?php
+              }else{
+                echo $client_contact_display;
               }
               ?>
               <?php
diff --git a/edit_certificate_modal.php b/edit_certificate_modal.php
index 0111148c..16f5fa67 100644
--- a/edit_certificate_modal.php
+++ b/edit_certificate_modal.php
@@ -22,12 +22,12 @@
           </div>
 
           <div class="form-group">
-            <label>Domain</label>
+            <label>Domain <strong class="text-danger">*</strong></label>
             <div class="input-group">
               <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
               </div>
-              <input type="text" class="form-control" name="domain" placeholder="Domain" value="<?php echo $certificate_domain; ?>">
+              <input type="text" class="form-control" name="domain" placeholder="Domain" value="<?php echo $certificate_domain; ?>" required>
             </div>
           </div>
 
diff --git a/edit_vendor_modal.php b/edit_vendor_modal.php
index 987d1ad5..5391c781 100644
--- a/edit_vendor_modal.php
+++ b/edit_vendor_modal.php
@@ -43,7 +43,7 @@
               </div>
               
               <div class="form-group">
-                <label>Description <strong class="text-danger">*</strong></label>
+                <label>Description</label>
                 <div class="input-group">
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-angle-right"></i></span>
diff --git a/invoices.php b/invoices.php
index e4da0c72..71e1f950 100644
--- a/invoices.php
+++ b/invoices.php
@@ -272,6 +272,11 @@
             $invoice_prefix = $row['invoice_prefix'];
             $invoice_number = $row['invoice_number'];
             $invoice_scope = $row['invoice_scope'];
+            if(empty($invoice_scope)){
+              $invoice_scope_display = "-";
+            }else{
+              $invoice_scope_display = $invoice_scope;
+            }
             $invoice_status = $row['invoice_status'];
             $invoice_date = $row['invoice_date'];
             $invoice_due = $row['invoice_due'];
@@ -314,7 +319,7 @@
 
           <tr>
             <td><a href="invoice.php?invoice_id=<?php echo $invoice_id; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></td>
-            <td><?php echo $invoice_scope; ?></td>
+            <td><?php echo $invoice_scope_display; ?></td>
             <td><a href="client.php?client_id=<?php echo $client_id; ?>&tab=invoices"><?php echo $client_name; ?></a></td>
             <td class="text-right">$<?php echo number_format($invoice_amount,2); ?></td>
             <td><?php echo $invoice_date; ?></td>
diff --git a/payments.php b/payments.php
index 63dd63a0..e3e03a8b 100644
--- a/payments.php
+++ b/payments.php
@@ -165,6 +165,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $payment_method = $row['payment_method'];
             $payment_amount = $row['payment_amount'];
             $payment_reference = $row['payment_reference'];
+            if(empty($payment_reference)){
+              $payment_reference_display = "-";
+            }else{
+              $payment_reference_display = $payment_reference;
+            }
             $client_id = $row['client_id'];
             $client_name = $row['client_name'];
             $account_name = $row['account_name'];
@@ -178,7 +183,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <td><a href="client.php?client_id=<?php echo $client_id; ?>&tab=payments"><?php echo $client_name; ?></a></td>
             <td class="text-right">$<?php echo number_format($payment_amount,2); ?></td>
             <td><?php echo $payment_method; ?></td>
-            <td><?php echo $payment_reference; ?></td>
+            <td><?php echo $payment_reference_display; ?></td>
             <td><?php echo $account_name; ?></td>
           </tr>
 
diff --git a/products.php b/products.php
index 61f4fb36..8f05dc52 100644
--- a/products.php
+++ b/products.php
@@ -89,6 +89,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $product_id = $row['product_id'];
             $product_name = $row['product_name'];
             $product_description = $row['product_description'];
+            if(empty($product_description)){
+              $product_description_display = "-";
+            }else{
+              $product_description_display = $product_description;
+            }
             $product_cost = $row['product_cost'];
             $product_created_at = $row['product_created_at'];
             $category_id = $row['category_id'];
@@ -99,7 +104,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
           <tr>
             <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editProductModal<?php echo $product_id; ?>"><?php echo $product_name; ?></a></td>
             <td><?php echo $category_name; ?></td>
-            <td><?php echo $product_description; ?></td>
+            <td><?php echo $product_description_display; ?></td>
             <td class="text-right">$<?php echo number_format($product_cost,2); ?></td>
             <td>
               <div class="dropdown dropleft text-center">
diff --git a/quotes.php b/quotes.php
index 769f614f..f3f3bf45 100644
--- a/quotes.php
+++ b/quotes.php
@@ -163,6 +163,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $quote_prefix = $row['quote_prefix'];
             $quote_number = $row['quote_number'];
             $quote_scope = $row['quote_scope'];
+            if(empty($quote_scope)){
+              $quote_scope_display = "-";
+            }else{
+              $quote_scope_display = $quote_scope;
+            }
             $quote_status = $row['quote_status'];
             $quote_date = $row['quote_date'];
             $quote_amount = $row['quote_amount'];
@@ -196,7 +201,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
           <tr>
             <td><a href="quote.php?quote_id=<?php echo $quote_id; ?>"><?php echo "$quote_prefix$quote_number"; ?></a></td>
-            <td><?php echo $quote_scope; ?></td>
+            <td><?php echo $quote_scope_display; ?></td>
             <td><a href="client.php?client_id=<?php echo $client_id; ?>&tab=quotes"><?php echo $client_name; ?></a></td>
             <td class="text-right">$<?php echo number_format($quote_amount,2); ?></td>
             <td><?php echo $quote_date; ?></td>
diff --git a/revenues.php b/revenues.php
index e57ab49f..f6f58318 100644
--- a/revenues.php
+++ b/revenues.php
@@ -159,6 +159,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $revenue_id = $row['revenue_id'];
             $revenue_description = $row['revenue_description'];
             $revenue_reference = $row['revenue_reference'];
+            if(empty($revenue_reference)){
+              $revenue_reference_display = "-";
+            }else{
+              $revenue_reference_display = $revenue_reference;
+            }
             $revenue_date = $row['revenue_date'];
             $revenue_payment_method = $row['revenue_payment_method'];
             $revenue_amount = $row['revenue_amount'];
@@ -176,7 +181,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             <td><?php echo $category_name; ?></td>
             <td class="text-right">$<?php echo number_format($revenue_amount,2); ?></td>
             <td><?php echo $revenue_payment_method; ?></td>
-            <td><?php echo $revenue_reference; ?></td>
+            <td><?php echo $revenue_reference_display; ?></td>
             <td><?php echo $account_name; ?></td>
             <td>
               <div class="dropdown dropleft text-center">
diff --git a/tickets.php b/tickets.php
index 53c821f5..00ade04e 100644
--- a/tickets.php
+++ b/tickets.php
@@ -182,6 +182,11 @@
             $ticket_status = $row['ticket_status'];
             $ticket_created_at = $row['ticket_created_at'];
             $ticket_updated_at = $row['ticket_updated_at'];
+            if(empty($ticket_updated_at)){
+              $ticket_updated_at_display = "<p class='text-danger'>Never</p>";
+            }else{
+              $ticket_updated_at_display = $ticket_updated_at;
+            }
             $ticket_closed_at = $row['ticket_closed_at'];
             $client_id = $row['client_id'];
             $client_name = $row['client_name'];
@@ -214,8 +219,8 @@
             <td><a href="client.php?client_id=<?php echo $client_id; ?>&tab=tickets"><?php echo $client_name; ?></a></td>
             <td><?php echo $ticket_subject; ?></td>
             <td>- UNASSIGNED -</td>
+            <td><?php echo $ticket_updated_at_display; ?></td>
             <td><?php echo $ticket_created_at; ?></td>
-            <td><?php echo $ticket_updated_at; ?></td>
             <td>
               <div class="dropdown dropleft text-center">
                 <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
diff --git a/vendors.php b/vendors.php
index 139dd785..bbece55c 100644
--- a/vendors.php
+++ b/vendors.php
@@ -118,6 +118,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $vendor_id = $row['vendor_id'];
             $vendor_name = $row['vendor_name'];
             $vendor_description = $row['vendor_description'];
+            if(empty($vendor_description)){
+              $vendor_description_display = "-";
+            }else{
+              $vendor_description_display = $vendor_description;
+            }
             $vendor_account_number = $row['vendor_account_number'];
             $vendor_country = $row['vendor_country'];
             $vendor_address = $row['vendor_address'];
@@ -125,6 +130,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $vendor_state = $row['vendor_state'];
             $vendor_zip = $row['vendor_zip'];
             $vendor_contact_name = $row['vendor_contact_name'];
+            if(empty($vendor_contact_name)){
+              $vendor_contact_name_display = "-";
+            }else{
+              $vendor_contact_name_display = $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);
@@ -149,7 +159,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
               ?>
 
             </td>
-            <td><?php echo $vendor_description; ?></td>
+            <td><?php echo $vendor_description_display; ?></td>
             <td>
               <?php
               if(!empty($vendor_contact_name)){
@@ -157,6 +167,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
               <i class="fa fa-fw fa-user text-secondary mr-2 mb-2"></i><?php echo $vendor_contact_name; ?>
               <br>
               <?php
+              }else{
+                echo $vendor_contact_name_display;
               }
               ?>
               <?php