diff --git a/client_print.php b/client_print.php
index 290a625b..228b0dc2 100644
--- a/client_print.php
+++ b/client_print.php
@@ -19,6 +19,7 @@ if(isset($_GET['client_id'])){
     $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4);
   }
   $client_website = $row['client_website'];
+  $client_net_terms = $row['client_net_terms'];
 
   //Query each table and store them in their array
   $sql_contacts = mysqli_query($mysqli,"SELECT * FROM contacts WHERE client_id = $client_id ORDER BY contact_id DESC");
@@ -29,15 +30,15 @@ if(isset($_GET['client_id'])){
   $sql_networks = mysqli_query($mysqli,"SELECT * FROM networks WHERE client_id = $client_id ORDER BY network_id DESC");
   $sql_domains = mysqli_query($mysqli,"SELECT * FROM domains WHERE client_id = $client_id ORDER BY domain_id DESC");
   $sql_applications = mysqli_query($mysqli,"SELECT * FROM applications WHERE client_id = $client_id ORDER BY application_id DESC");
-  $sql_invoices = mysqli_query($mysqli,"SELECT * FROM invoices WHERE client_id = $client_id ORDER BY invoice_date DESC");
+  $sql_invoices = mysqli_query($mysqli,"SELECT * FROM invoices WHERE client_id = $client_id ORDER BY invoice_id DESC");
 
   $sql_payments = mysqli_query($mysqli,"SELECT * FROM payments, invoices, accounts
     WHERE invoices.client_id = $client_id
     AND payments.invoice_id = invoices.invoice_id
     AND payments.account_id = accounts.account_id
-    ORDER BY invoices.invoice_number DESC"); 
+    ORDER BY payments.payment_id DESC"); 
   
-  $sql_quotes = mysqli_query($mysqli,"SELECT * FROM quotes WHERE client_id = $client_id ORDER BY quote_number DESC");
+  $sql_quotes = mysqli_query($mysqli,"SELECT * FROM quotes WHERE client_id = $client_id ORDER BY quote_id DESC");
 
   $sql_recurring = mysqli_query($mysqli,"SELECT * FROM recurring_invoices, invoices
     WHERE invoices.invoice_id = recurring_invoices.invoice_id
@@ -118,6 +119,10 @@ if(isset($_GET['client_id'])){
         <th>Website</th>
         <td><?php echo $client_website; ?></td>
       </tr>
+      <tr>
+        <th>Net Terms</th>
+        <td><?php echo $client_net_terms; ?> Day</td>
+      </tr>
     </table>
   </div>
   <div class="col-3">
@@ -156,6 +161,7 @@ if(isset($_GET['client_id'])){
       <th>Name</th>
       <th>Title</th>
       <th>Phone</th>
+      <th>Mobile</th>
       <th>Email</th>
     </tr>
   </thead>
@@ -170,6 +176,10 @@ if(isset($_GET['client_id'])){
       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);
       }
+      $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);
+      }
       $contact_email = $row['contact_email'];
 
     ?>
@@ -177,6 +187,7 @@ if(isset($_GET['client_id'])){
       <td><?php echo $contact_name; ?></td>
       <td><?php echo $contact_title; ?></td>
       <td><?php echo $contact_phone; ?></td>
+      <td><?php echo $contact_mobile; ?></td>
       <td><?php echo $contact_email; ?></td>
     </tr>
 
@@ -280,6 +291,9 @@ if(isset($_GET['client_id'])){
     <tr>
       <th>Vendor</th>
       <th>Description</th>
+      <th>Contact Name</th>
+      <th>Phone</th>
+      <th>Email</th>
       <th>Account Number</th>
     </tr>
   </thead>
@@ -291,11 +305,20 @@ if(isset($_GET['client_id'])){
       $vendor_name = $row['vendor_name'];
       $vendor_description = $row['vendor_description'];
       $vendor_account_number = $row['vendor_account_number'];
+      $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'];
 
     ?>
     <tr>
       <td><?php echo $vendor_name; ?></td>
       <td><?php echo $vendor_description; ?></td>
+      <td><?php echo $vendor_contact_name; ?></td>
+      <td><?php echo $vendor_phone; ?></td>
+      <td><?php echo $vendor_email; ?></td>
       <td><?php echo $vendor_account_number; ?></td>
     </tr>
 
@@ -520,6 +543,7 @@ if(isset($_GET['client_id'])){
       <th class="text-right">Amount</th>
       <th>Account</th>
       <th>Method</th>
+      <th>Check #</th>
     </tr>
   </thead>
   <tbody>
@@ -532,16 +556,18 @@ if(isset($_GET['client_id'])){
       $payment_date = $row['payment_date'];
       $payment_method = $row['payment_method'];
       $payment_amount = $row['payment_amount'];
+      $payment_reference = $row['payment_reference'];
       $account_name = $row['account_name'];
 
     ?>
 
     <tr>
       <td><?php echo $payment_date; ?></td>
-      <td>INV-<?php echo $invoice_number; ?></td>
+      <td><?php echo $invoice_number; ?></td>
       <td class="text-right text-monospace">$<?php echo number_format($payment_amount,2); ?></td>
       <td><?php echo $account_name; ?></td>
       <td><?php echo $payment_method; ?></td>
+      <td><?php echo $payment_reference; ?></td>
     </tr>
 
     <?php
diff --git a/client_tickets.php b/client_tickets.php
index af31e6c0..741dba3c 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -118,15 +118,13 @@ $total_pages = ceil($total_found_rows / 10);
                   <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="#viewTicketModal<?php echo $ticket_id; ?>">Details</a>
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketModal<?php echo $ticket_id; ?>">Edit</a>
-                  <a class="dropdown-item" href="post.php?delete_invoice=<?php echo $invoice_id; ?>">Delete</a>
+                  <a class="dropdown-item" href="post.php?delete_ticket=<?php echo $ticket_id; ?>">Delete</a>
                 </div>
               </div>
               <?php
 
               include("edit_ticket_modal.php");
-              include("view_ticket_modal.php");
 
               ?>      
             </td>
diff --git a/client_vendors.php b/client_vendors.php
index 00c60eca..2bb581ea 100644
--- a/client_vendors.php
+++ b/client_vendors.php
@@ -73,6 +73,7 @@ $total_pages = ceil($total_found_rows / 10);
           <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>
+            <th>Contact</th>
             <th><a class="text-secondary" href="?<?php echo $url_query_strings_sb; ?>&sb=vendor_account_number&o=<?php echo $disp; ?>">Account Number</a></th>
             <th></th>
             <th class="text-center">Action</th>
@@ -109,6 +110,32 @@ $total_pages = ceil($total_found_rows / 10);
           <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>
               <?php
diff --git a/cron.php b/cron.php
index 626f0c60..c492c24b 100644
--- a/cron.php
+++ b/cron.php
@@ -29,7 +29,6 @@ while($row = mysqli_fetch_array($sql_companies)){
   $config_mail_from_email = $row['config_mail_from_email'];
   $config_mail_from_name = $row['config_mail_from_name'];
   $config_recurring_auto_send_invoice = $row['config_recurring_auto_send_invoice'];
-  $config_base_url = $row['config_base_url'];
 
   if($config_enable_cron == 1){
 
diff --git a/db.sql b/db.sql
index 299eed34..22b59531 100644
--- a/db.sql
+++ b/db.sql
@@ -615,7 +615,6 @@ CREATE TABLE `settings` (
   `config_quote_email_body` varchar(200) DEFAULT NULL,
   `config_invoice_next_number` int(11) DEFAULT NULL,
   `config_recurring_auto_send_invoice` int(1) DEFAULT NULL,
-  `config_base_url` varchar(200) DEFAULT NULL,
   `config_api_key` varchar(200) DEFAULT NULL,
   `config_invoice_prefix` varchar(200) DEFAULT NULL,
   `config_send_invoice_reminders` int(1) DEFAULT NULL,
@@ -625,6 +624,8 @@ CREATE TABLE `settings` (
   `config_ticket_prefix` varchar(200) DEFAULT NULL,
   `config_ticket_next_number` int(11) NOT NULL,
   `config_enable_cron` int(1) NOT NULL,
+  `enable_alert_domain_expire` int(1) DEFAULT NULL,
+  `enable_alert_low_balance` int(1) NOT NULL,
   PRIMARY KEY (`company_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -812,4 +813,4 @@ CREATE TABLE `vendors` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2019-08-23 16:36:23
+-- Dump completed on 2019-08-24 20:19:43
diff --git a/get_settings.php b/get_settings.php
index 0ffcac93..87baede7 100644
--- a/get_settings.php
+++ b/get_settings.php
@@ -58,8 +58,6 @@ $config_recurring_auto_send_invoice = $row['config_recurring_auto_send_invoice']
 $config_api_key = $row['config_api_key'];
 $config_enable_cron = $row['config_enable_cron'];
 
-$config_base_url = $row['config_base_url'];
-
 $client_types_array = array(
     'Residential',
    	'Law',
diff --git a/invoice.php b/invoice.php
index 96acd031..85c2507d 100644
--- a/invoice.php
+++ b/invoice.php
@@ -310,13 +310,13 @@ if(isset($_GET['invoice_id'])){
             <?php
       
             while($row = mysqli_fetch_array($sql_history)){
-              $history_date = $row['history_date'];
+              $history_created_at = $row['history_created_at'];
               $history_status = $row['history_status'];
               $history_description = $row['history_description'];
              
             ?>
             <tr>
-              <td><?php echo $history_date; ?></td>
+              <td><?php echo $history_created_at; ?></td>
               <td><?php echo $history_status; ?></td>
               <td><?php echo $history_description; ?></td>
             </tr>
diff --git a/post.php b/post.php
index d02b9eac..251c5ad2 100644
--- a/post.php
+++ b/post.php
@@ -136,7 +136,6 @@ if(isset($_POST['edit_general_settings'])){
     $config_start_page = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_start_page']));
     $config_account_balance_threshold = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_account_balance_threshold']));
     $config_api_key = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_api_key']));
-    $config_enable_cron = intval($_POST['config_enable_cron']);
     
     $path = "$config_invoice_logo";
 
@@ -150,7 +149,7 @@ if(isset($_POST['edit_general_settings'])){
         move_uploaded_file($_FILES['file']['tmp_name'], $path);   
     }
 
-    mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$config_start_page', config_account_balance_threshold = '$config_account_balance_threshold', config_invoice_logo = '$path', config_api_key = '$config_api_key', config_enable_cron = $config_enable_cron WHERE company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$config_start_page', config_account_balance_threshold = '$config_account_balance_threshold', config_invoice_logo = '$path', config_api_key = '$config_api_key' WHERE company_id = $session_company_id");
 
     $_SESSION['alert_message'] = "Settings updated";
 
@@ -182,8 +181,10 @@ if(isset($_POST['edit_mail_settings'])){
     $config_smtp_port = intval($_POST['config_smtp_port']);
     $config_smtp_username = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_smtp_username']));
     $config_smtp_password = mysqli_real_escape_string($mysqli,$_POST['config_smtp_password']);
+    $config_mail_from_email = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_mail_from_email']));
+    $config_mail_from_name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_mail_from_name']));
 
-    mysqli_query($mysqli,"UPDATE settings SET config_smtp_host = '$config_smtp_host', config_smtp_port = $config_smtp_port, config_smtp_username = '$config_smtp_username', config_smtp_password = '$config_smtp_password' WHERE company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE settings SET config_smtp_host = '$config_smtp_host', config_smtp_port = $config_smtp_port, config_smtp_username = '$config_smtp_username', config_smtp_password = '$config_smtp_password', config_mail_from_email = '$config_mail_from_email', config_mail_from_name = '$config_mail_from_name' WHERE company_id = $session_company_id");
 
     $_SESSION['alert_message'] = "Mail Settings updated";
 
@@ -195,13 +196,9 @@ if(isset($_POST['edit_invoice_settings'])){
 
     $config_invoice_prefix = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_invoice_prefix']));
     $config_invoice_next_number = intval($_POST['config_invoice_next_number']);
-    $config_mail_from_email = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_mail_from_email']));
-    $config_mail_from_name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_mail_from_name']));
     $config_invoice_footer = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_invoice_footer']));
-    $config_send_invoice_reminders = intval($_POST['config_send_invoice_reminders']);
-    $config_invoice_overdue_reminders = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_invoice_overdue_reminders']));
 
-    mysqli_query($mysqli,"UPDATE settings SET config_invoice_prefix = '$config_invoice_prefix', config_invoice_next_number = $config_invoice_next_number, config_mail_from_email = '$config_mail_from_email', config_mail_from_name = '$config_mail_from_name', config_invoice_footer = '$config_invoice_footer', config_send_invoice_reminders = $config_send_invoice_reminders, config_invoice_overdue_reminders = '$config_invoice_overdue_reminders' WHERE company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE settings SET config_invoice_prefix = '$config_invoice_prefix', config_invoice_next_number = $config_invoice_next_number, config_invoice_footer = '$config_invoice_footer' WHERE company_id = $session_company_id");
 
     $_SESSION['alert_message'] = "Invoice Settings updated";
 
@@ -254,6 +251,20 @@ if(isset($_POST['edit_default_settings'])){
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 }
 
+if(isset($_POST['edit_alert_settings'])){
+
+    $config_enable_cron = intval($_POST['config_enable_cron']);
+    $config_send_invoice_reminders = intval($_POST['config_send_invoice_reminders']);
+    $config_invoice_overdue_reminders = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_invoice_overdue_reminders']));
+
+    mysqli_query($mysqli,"UPDATE settings SET config_send_invoice_reminders = $config_send_invoice_reminders, config_invoice_overdue_reminders = '$config_invoice_overdue_reminders', config_enable_cron = $config_enable_cron WHERE company_id = $session_company_id");
+
+    $_SESSION['alert_message'] = "Alert Settings updated";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if(isset($_POST['enable_2fa'])){
 
     $token = mysqli_real_escape_string($mysqli,$_POST['token']);
@@ -1514,7 +1525,7 @@ if(isset($_GET['email_quote'])){
     $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4);
     }
     $client_website = $row['client_website'];
-    $base_url = $_SERVER['HTTP_HOST'];
+    $base_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']);
 
     $mail = new PHPMailer(true);
 
@@ -2906,7 +2917,7 @@ if(isset($_GET['force_recurring'])){
     //update the recurring invoice with the new dates
     mysqli_query($mysqli,"UPDATE recurring SET recurring_last_sent = CURDATE(), recurring_next_date = DATE_ADD(CURDATE(), INTERVAL 1 $recurring_frequency), recurring_updated_at = NOW() WHERE recurring_id = $recurring_id");
 
-    if($config_recurring_email_auto_send == 1){
+    if($config_recurring_auto_send_invoice == 1){
         $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients
             WHERE invoices.client_id = clients.client_id
             AND invoices.invoice_id = $new_invoice_id"
@@ -2954,7 +2965,7 @@ if(isset($_GET['force_recurring'])){
             $mail->isHTML(true);                                  // Set email format to HTML
 
             $mail->Subject = "Invoice $invoice_number";
-            $mail->Body    = "Hello $client_name,<br><br>Please view the details of the invoice below.<br><br>Invoice: $invoice_number<br>Issue Date: $invoice_date<br>Total: $$invoice_amount<br>Due Date: $invoice_due<br><br><br>To view your invoice online click <a href='https://$config_base_url/guest_view_invoice.php?invoice_id=$new_invoice_id&url_key=$invoice_url_key'>here</a><br><br><br>~<br>$company_name<br>$config_company_phone";
+            $mail->Body    = "Hello $client_name,<br><br>Please view the details of the invoice below.<br><br>Invoice: $invoice_number<br>Issue Date: $invoice_date<br>Total: $$invoice_amount<br>Due Date: $invoice_due<br><br><br>To view your invoice online click <a href='https://$base_url/guest_view_invoice.php?invoice_id=$new_invoice_id&url_key=$invoice_url_key'>here</a><br><br><br>~<br>$company_name<br>$config_company_phone";
 
             $mail->send();
 
diff --git a/settings-alerts.php b/settings-alerts.php
index c5b85aac..3390da26 100644
--- a/settings-alerts.php
+++ b/settings-alerts.php
@@ -4,39 +4,25 @@
 
 <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-bell mr-2"></i>Alerts and Reminders</h6>
+    <h6 class="float-left mt-1"><i class="fa fa-fw fa-bell mr-2"></i>Alerts</h6>
   </div>
   <div class="card-body">
     <form class="p-3" action="post.php" method="post" autocomplete="off">
-      
+
       <div class="custom-control custom-switch mb-2">
-        <input type="checkbox" class="custom-control-input" name="config_alerts_domains" <?php if($config_alerts_domains == 1){ echo "checked"; } ?> value="1" id="customSwitch">
-        <label class="custom-control-label" for="customSwitch">Enable Domain Expiration Alerts</label>
+        <input type="checkbox" class="custom-control-input" name="config_enable_cron" <?php if($config_enable_cron == 1){ echo "checked"; } ?> value="1" id="customSwitch1">
+        <label class="custom-control-label" for="customSwitch1">Enable Cron <small>(cron.php must also be added to cron and run nightly at 11:00PM for alerts to work)</small></label>
       </div>
 
-      <?php if($config_alerts_domains == 1){ ?>
-
-      <div class="form-group">
-        <label>Domain (Number of Days)</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
-          </div>
-          <input type="text" class="form-control" name="config_alert_domain_days" placeholder="Alert Before Days" value="<?php echo $config_alert_domain_days; ?>">
-        </div>
-      </div>
-
-      <?php } ?>
-
       <div class="custom-control custom-switch mb-2">
         <input type="checkbox" class="custom-control-input" name="config_alerts_domains" <?php if($config_alerts_low_balance == 1){ echo "checked"; } ?> value="1" id="customSwitch2">
         <label class="custom-control-label" for="customSwitch2">Enable Low Balance Alerts</label>
       </div>
 
-      <?php if($config_alerts_domains == 1){ ?>
+      <?php if($config_alert_low_balance == 1){ ?>
 
       <div class="form-group">
-        <label>Account Threshold</label>
+        <label>Threshold</label>
         <div class="input-group">
           <div class="input-group-prepend">
             <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
@@ -47,13 +33,32 @@
 
       <?php } ?>
 
-      <div class="custom-control custom-switch mb-5">
-        <input type="checkbox" class="custom-control-input" name="config_alerts_domains" <?php if($config_alerts_domains == 1){ echo "checked"; } ?> value="1" id="customSwitch3">
+      <div class="custom-control custom-switch mb-2">
+        <input type="checkbox" class="custom-control-input" name="config_alerts_domains" <?php if($config_alert_domain_expire == 1){ echo "checked"; } ?> value="1" id="customSwitch3">
         <label class="custom-control-label" for="customSwitch3">Enable Domain Expiration Alerts</label>
       </div>
 
-      <hr>
-      <button type="submit" name="edit_default_settings" class="btn btn-primary">Save</button>
+      <div class="custom-control custom-switch mb-2">
+        <input type="checkbox" class="custom-control-input" name="config_send_invoice_reminders" <?php if($config_send_invoice_reminders == 1){ echo "checked"; } ?> value="1" id="customSwitch1">
+        <label class="custom-control-label" for="customSwitch1">Send Invoice Reminders</label>
+      </div>
+
+      <?php if($config_send_invoice_reminders == 1){ ?>
+
+      <div class="form-group">
+        <label>Overdue Reminders</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
+          </div>
+          <input type="text" class="form-control" name="config_invoice_overdue_reminders" placeholder="Send After Due Days" value="<?php echo $config_invoice_overdue_reminders; ?>">
+        </div>
+      </div>
+
+      <?php } ?>
+
+      <hr class="mt-5">
+      <button type="submit" name="edit_alert_settings" class="btn btn-primary">Save</button>
         
     </form>
   </div>
diff --git a/settings-company.php b/settings-company.php
index 1a6aad34..acc15f3d 100644
--- a/settings-company.php
+++ b/settings-company.php
@@ -14,7 +14,7 @@
           <div class="input-group-prepend">
             <span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
           </div>
-          <input type="text" class="form-control" name="config_company_name" placeholder="Company Name" value="<?php echo $config_company_name; ?>" required autofocus>  
+          <input type="text" class="form-control" name="config_company_name" placeholder="Company Name" value="<?php echo $config_company_name; ?>" required>  
         </div>
       </div>
       
diff --git a/settings-defaults.php b/settings-defaults.php
index 37cc9ec3..9ce5878f 100644
--- a/settings-defaults.php
+++ b/settings-defaults.php
@@ -157,7 +157,7 @@
       </div>
 
       <div class="form-group">
-        <label>Default Calendar</label>
+        <label>Calendar</label>
         <div class="input-group">
           <div class="input-group-prepend">
             <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
@@ -182,7 +182,7 @@
       </div>
 
       <div class="form-group mb-5">
-        <label>Default Net Terms</label>
+        <label>Net Terms</label>
         <div class="input-group">
           <div class="input-group-prepend">
             <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
diff --git a/settings-general.php b/settings-general.php
index 12435249..d4e5965c 100644
--- a/settings-general.php
+++ b/settings-general.php
@@ -35,11 +35,6 @@
         </div>
       </div>
 
-      <div class="custom-control custom-switch mb-2">
-        <input type="checkbox" class="custom-control-input" name="config_enable_cron" <?php if($config_enable_cron == 1){ echo "checked"; } ?> value="1" id="customSwitch1">
-        <label class="custom-control-label" for="customSwitch1">Enable Cron <small>(cron.php must also be added to cron and run nightly at 12:00AM for auto jobs to work)</small></label>
-      </div>
-
       <div class="form-group mb-4">
         <label>Logo</label>
         <input type="file" class="form-control-file" name="file">
diff --git a/settings-invoice.php b/settings-invoice.php
index 885b96c7..91711abe 100644
--- a/settings-invoice.php
+++ b/settings-invoice.php
@@ -29,45 +29,6 @@
         </div>
       </div>
 
-      <div class="custom-control custom-switch mb-2">
-        <input type="checkbox" class="custom-control-input" name="config_send_invoice_reminders" <?php if($config_send_invoice_reminders == 1){ echo "checked"; } ?> value="1" id="customSwitch1">
-        <label class="custom-control-label" for="customSwitch1">Send Invoice Reminders</label>
-      </div>
-
-      <?php if($config_send_invoice_reminders == 1){ ?>
-
-      <div class="form-group">
-        <label>Overdue Reminders</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-barcode"></i></span>
-          </div>
-          <input type="text" class="form-control" name="config_invoice_overdue_reminders" placeholder="Send After Due Days" value="<?php echo $config_invoice_overdue_reminders; ?>">
-        </div>
-      </div>
-      
-      <div class="form-group">
-        <label>Email From</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_mail_from_email" placeholder="Email Address" value="<?php echo $config_mail_from_email; ?>">
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label>Email Name From</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>
-          <input type="text" class="form-control" name="config_mail_from_name" placeholder="Name" value="<?php echo $config_mail_from_name; ?>">
-        </div>
-      </div>
-
-      <?php } ?>
-
       <div class="form-group">
         <label>Invoice Footer</label>
         <textarea class="form-control" rows="4" name="config_invoice_footer"><?php echo $config_invoice_footer; ?></textarea>
diff --git a/settings-mail.php b/settings-mail.php
index d2c9f862..3455b730 100644
--- a/settings-mail.php
+++ b/settings-mail.php
@@ -14,7 +14,7 @@
           <div class="input-group-prepend">
             <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
           </div>
-          <input type="text" class="form-control" name="config_smtp_host" placeholder="Mail Server Address" value="<?php echo $config_smtp_host; ?>" required autofocus>
+          <input type="text" class="form-control" name="config_smtp_host" placeholder="Mail Server Address" value="<?php echo $config_smtp_host; ?>" required>
         </div>
       </div>
 
@@ -38,7 +38,7 @@
         </div>
       </div>
 
-      <div class="form-group mb-5">
+      <div class="form-group">
         <label>SMTP Password</label>
         <div class="input-group">
           <div class="input-group-prepend">
@@ -48,6 +48,26 @@
         </div>
       </div>
 
+      <div class="form-group">
+        <label>Email Address</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_mail_from_email" placeholder="Email Address" value="<?php echo $config_mail_from_email; ?>">
+        </div>
+      </div>
+
+      <div class="form-group mb-5">
+        <label>Name</label>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+          </div>
+          <input type="text" class="form-control" name="config_mail_from_name" placeholder="Name" value="<?php echo $config_mail_from_name; ?>">
+        </div>
+      </div>
+
       <hr>
       <button type="submit" name="edit_mail_settings" class="btn btn-primary">Save</button>
         
diff --git a/tickets.php b/tickets.php
index 5d78f0bd..58d58f2f 100644
--- a/tickets.php
+++ b/tickets.php
@@ -120,7 +120,6 @@
                   <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="#viewTicketModal<?php echo $ticket_id; ?>">Details</a>
                   <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTicketModal<?php echo $ticket_id; ?>">Edit</a>
                   <a class="dropdown-item" href="post.php?delete_ticket=<?php echo $ticket_id; ?>">Delete</a>
                 </div>
@@ -128,7 +127,6 @@
               <?php
 
               include("edit_ticket_modal.php");
-              include("view_ticket_modal.php");
 
               ?>      
             </td>
diff --git a/vendors.php b/vendors.php
index 5cb8e072..d99a0226 100644
--- a/vendors.php
+++ b/vendors.php
@@ -70,6 +70,7 @@
           <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>
@@ -98,6 +99,32 @@
           <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">
diff --git a/view_ticket_modal.php b/view_ticket_modal.php
deleted file mode 100644
index 3d4f91f6..00000000
--- a/view_ticket_modal.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<div class="modal" id="viewTicketModal<?php echo $ticket_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-tag mr-2"></i>Ticket # <?php echo $ticket_id; ?></h5>
-        <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <form action="post.php" method="post" autocomplete="off">
-        <div class="modal-body bg-white">
-          <div class="row">
-            <div class="col-10">
-              <h4><?php echo $client_name; ?></h4>
-            </div>
-            <div class="col-2">
-              <h6>
-                <span class="p-2 float-right badge badge-<?php echo $ticket_badge_color; ?>">
-                  <?php echo $ticket_status; ?>
-                </span>
-              </h6>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col">
-              <div class="text-secondary"><i class="far fa-fw fa-clock"></i> <?php echo $ticket_created_at; ?></div>
-            </div>
-          </div>
-          <hr>
-          <center><h5><?php echo $ticket_subject; ?></h5></center>
-          <p><?php echo $ticket_details; ?></p>
-          <hr>
-
-          <form>
-            <textarea class="form-control" rows="8" name="details"></textarea>
-          </form>
-        </div>
-        <div class="modal-footer bg-white">
-          <button type="button" class="btn btn-success">Resolve</button>
-          <button type="button" class="btn btn-secondary">Close</button>
-          <button type="submit" name="add_ticket" class="btn btn-primary">Save</button>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
\ No newline at end of file