diff --git a/add_company_modal.php b/add_company_modal.php
index c851a5d2..dac5f258 100644
--- a/add_company_modal.php
+++ b/add_company_modal.php
@@ -1,13 +1,13 @@
 <div class="modal" id="addCompanyModal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-building mr-2"></i>New Company</h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-building"></i> New Company</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
-      <form action="post.php" method="post" autocomplete="off">
+      <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
         <div class="modal-body bg-white">
 
           <div class="form-group">
@@ -90,16 +90,31 @@
             </div>
           </div>
 
-          <div class="form-group mb-5">
+          <div class="form-group">
+            <label>Email</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+              </div>
+              <input type="email" class="form-control" name="email" placeholder="Email address"> 
+            </div>
+          </div>
+
+          <div class="form-group">
             <label>Website</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="site" placeholder="Website address">
+              <input type="text" class="form-control" name="website" placeholder="Website address">
             </div>
           </div>
 
+          <div class="form-group mb-4">
+            <label>Logo</label>
+            <input type="file" class="form-control-file" name="file">
+          </div>
+
         </div>
         <div class="modal-footer bg-white">
           <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
diff --git a/companies.php b/companies.php
index 69b33d6d..012fbac9 100644
--- a/companies.php
+++ b/companies.php
@@ -39,9 +39,8 @@ if(isset($_GET['o'])){
 //Rebuild URL
 $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
 
-$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM companies, settings
-  WHERE companies.company_id = settings.company_id 
-  AND companies.company_name LIKE '%$q%'
+$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM companies
+  WHERE company_name LIKE '%$q%'
   ORDER BY $sb $o LIMIT $record_from, $record_to");
 
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
@@ -69,6 +68,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
         <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><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=company_address&o=<?php echo $disp; ?>">Address</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=company_phone&o=<?php echo $disp; ?>">Phone</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=company_email&o=<?php echo $disp; ?>">Email</a></th>
+            <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=company_website&o=<?php echo $disp; ?>">Website</a></th>
             <th class="text-center">Action</th>
           </tr>
         </thead>
@@ -84,10 +87,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $company_state = $row['company_state'];
             $company_zip = $row['company_zip'];
             $company_phone = $row['company_phone'];
-            $company_site = $row['company_site'];
-            $company_logo = $row['company_invoice_logo'];
+            if(strlen($company_phone)>2){ 
+              $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
+            }
+            $company_email = $row['company_email'];
+            $company_website = $row['company_website'];
+            $company_logo = $row['company_logo'];
             
-            $initials = initials($company_name);
+            $company_initials = initials($company_name);
       
           ?>
           <tr>
@@ -98,7 +105,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                 <?php }else{ ?>
                 <span class="fa-stack fa-2x">
                   <i class="fa fa-circle fa-stack-2x text-secondary"></i>
-                  <span class="fa fa-stack-1x text-white"><?php echo $initials; ?></span>
+                  <span class="fa fa-stack-1x text-white"><?php echo $company_initials; ?></span>
                 </span>
                 <br>
                 <?php } ?>
@@ -106,6 +113,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                 <div class="text-secondary"><?php echo $company_name; ?></div>
               </a>
             </td>
+            <td><?php echo $company_address; ?></td>
+            <td><?php echo $company_phone; ?></td>
+            <td><?php echo $company_email; ?></td>
+            <td><?php echo $company_website; ?></td>
             <td>
               <div class="dropdown dropleft text-center">
                 <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
diff --git a/cron.php b/cron.php
index 10682210..c493ac44 100644
--- a/cron.php
+++ b/cron.php
@@ -17,10 +17,12 @@ $sql_companies = mysqli_query($mysqli,"SELECT * FROM companies, settings WHERE c
 while($row = mysqli_fetch_array($sql_companies)){
   $company_id = $row['company_id'];
   $company_name = $row['company_name'];
-  $config_company_phone = $row['config_company_phone'];
-  if(strlen($config_company_phone)>2){ 
-    $config_company_phone = substr($row['config_company_phone'],0,3)."-".substr($row['config_company_phone'],3,3)."-".substr($row['config_company_phone'],6,4);
+  $company_phone = $row['company_phone'];
+  if(strlen($company_phone)>2){ 
+    $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
   }
+  $company_email = $row['company_email'];
+  $company_website = $row['company_website'];
   $config_enable_cron = $row['config_enable_cron'];
   $config_invoice_overdue_reminders = $row['config_invoice_overdue_reminders'];
   $config_invoice_prefix = $row['config_invoice_prefix'];
@@ -118,9 +120,9 @@ while($row = mysqli_fetch_array($sql_companies)){
           $mail->isHTML(true);                                  // Set email format to HTML
 
           $mail->Subject = "Overdue Invoice $invoice_number";
-          $mail->Body    = "Hello $client_name,<br><br>According to our records, we have not received payment for invoice $invoice_number. Please submit your payment as soon as possible. If you have any questions please contact us at $config_company_phone.
+          $mail->Body    = "Hello $client_name,<br><br>According to our records, we have not received payment for invoice $invoice_number. Please submit your payment as soon as possible. If you have any questions please contact us at $company_phone.
             <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=$invoice_id&url_key=$invoice_url_key'>here</a><br><br><br>~<br>$company_name<br>$config_company_phone";
+            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=$invoice_id&url_key=$invoice_url_key'>here</a><br><br><br>~<br>$company_name<br>$company_phone";
           
           $mail->send();
 
@@ -266,7 +268,7 @@ while($row = mysqli_fetch_array($sql_companies)){
           $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://$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>$company_phone";
           
           $mail->send();
 
diff --git a/db.sql b/db.sql
index e64a2174..70b6c8a4 100644
--- a/db.sql
+++ b/db.sql
@@ -187,6 +187,15 @@ DROP TABLE IF EXISTS `companies`;
 CREATE TABLE `companies` (
   `company_id` int(11) NOT NULL AUTO_INCREMENT,
   `company_name` varchar(200) NOT NULL,
+  `company_address` varchar(200) DEFAULT NULL,
+  `company_city` varchar(200) DEFAULT NULL,
+  `company_state` varchar(200) DEFAULT NULL,
+  `company_zip` varchar(200) DEFAULT NULL,
+  `company_country` varchar(200) DEFAULT NULL,
+  `company_phone` varchar(200) DEFAULT NULL,
+  `company_email` varchar(200) DEFAULT NULL,
+  `company_website` varchar(200) DEFAULT NULL,
+  `company_logo` varchar(250) DEFAULT NULL,
   `company_created_at` datetime NOT NULL,
   `company_updated_at` datetime DEFAULT NULL,
   PRIMARY KEY (`company_id`)
@@ -680,15 +689,6 @@ CREATE TABLE `settings` (
   `config_default_calendar` int(11) DEFAULT NULL,
   `config_default_net_terms` int(11) DEFAULT NULL,
   `config_records_per_page` int(10) NOT NULL,
-  `config_company_name` varchar(200) DEFAULT NULL,
-  `config_company_country` varchar(200) DEFAULT NULL,
-  `config_company_address` varchar(200) DEFAULT NULL,
-  `config_company_city` varchar(200) DEFAULT NULL,
-  `config_company_state` varchar(200) DEFAULT NULL,
-  `config_company_zip` varchar(200) DEFAULT NULL,
-  `config_company_phone` varchar(200) DEFAULT NULL,
-  `config_company_email` varchar(200) DEFAULT NULL,
-  `config_company_site` varchar(200) DEFAULT NULL,
   `config_smtp_host` varchar(200) DEFAULT NULL,
   `config_smtp_username` varchar(200) DEFAULT NULL,
   `config_smtp_password` varchar(200) DEFAULT NULL,
@@ -928,4 +928,4 @@ CREATE TABLE `vendors` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-02-04 17:43:24
+-- Dump completed on 2021-02-04 21:53:53
diff --git a/edit_company_modal.php b/edit_company_modal.php
index 6cd35a23..c06bc239 100644
--- a/edit_company_modal.php
+++ b/edit_company_modal.php
@@ -1,14 +1,15 @@
 <div class="modal" id="editCompanyModal<?php echo $company_id; ?>" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
-      <div class="modal-header text-white">
-        <h5 class="modal-title"><i class="fa fa-fw fa-building mr-2"></i><?php echo $company_name; ?></h5>
+      <div class="modal-header">
+        <h5 class="modal-title"><i class="fa fa-fw fa-building"></i> <?php echo $company_name; ?></h5>
         <button type="button" class="close text-white" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
+          <span>&times;</span>
         </button>
       </div>
-      <form action="post.php" method="post" autocomplete="off">
+      <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
         <input type="hidden" name="company_id" value="<?php echo $company_id; ?>">
+        <input type="hidden" name="current_file_path" value="<?php echo $company_logo; ?>">
         <div class="modal-body bg-white">
 
           <div class="form-group">
@@ -91,13 +92,34 @@
             </div>
           </div>
 
-          <div class="form-group mb-5">
+          <div class="form-group">
+            <label>Email</label>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+              </div>
+              <input type="email" class="form-control" name="email" placeholder="Email address" value="<?php echo $company_email; ?>">
+            </div>
+          </div>
+
+          <div class="form-group">
             <label>Website</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="site" placeholder="Website address" value="<?php echo $company_site; ?>">
+              <input type="text" class="form-control" name="website" placeholder="Website address" value="<?php echo $company_website; ?>">
+            </div>
+          </div>
+
+          <div class="form-group mb-4">
+            <label>Logo</label>
+            <input type="file" class="form-control-file" name="file">
+          </div>
+
+          <div class="card col-md-2">
+            <div class="card-body">
+              <img class="img-fluid" src="<?php echo $company_logo; ?>">
             </div>
           </div>
 
diff --git a/get_settings.php b/get_settings.php
index 8fa2b60a..3bb13ffb 100644
--- a/get_settings.php
+++ b/get_settings.php
@@ -9,20 +9,6 @@ $config_api_key = $row['config_api_key'];
 $config_aes_key = $row['config_aes_key'];
 $config_base_url = $row['config_base_url'];
 
-//Company Info
-$config_company_name = $row['config_company_name'];
-$config_company_address = $row['config_company_address'];
-$config_company_city = $row['config_company_city'];
-$config_company_state = $row['config_company_state'];
-$config_company_zip = $row['config_company_zip'];
-$config_company_country = $row['config_company_country'];
-$config_company_phone = $row['config_company_phone'];
-if(strlen($config_company_phone)>2){ 
-  $config_company_phone = substr($row['config_company_phone'],0,3)."-".substr($row['config_company_phone'],3,3)."-".substr($row['config_company_phone'],6,4);
-}
-$config_company_email = $row['config_company_email'];
-$config_company_site = $row['config_company_site'];
-
 //Mail
 $config_smtp_host = $row['config_smtp_host'];
 $config_smtp_username = $row['config_smtp_username'];
diff --git a/guest_post.php b/guest_post.php
index c2fc55aa..15457bdf 100644
--- a/guest_post.php
+++ b/guest_post.php
@@ -11,8 +11,10 @@ if(isset($_GET['pdf_invoice'], $_GET['url_key'])){
     $invoice_id = intval($_GET['pdf_invoice']);
     $url_key = mysqli_real_escape_string($mysqli,$_GET['url_key']);
 
-    $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients
+    $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients, companies, settings
     WHERE invoices.client_id = clients.client_id
+    AND invoices.company_id = companies.company_id
+    AND settings.company_id = companies.company_id
     AND invoices.invoice_id = $invoice_id
     AND invoices.invoice_url_key = '$url_key'"
     );
@@ -42,21 +44,18 @@ if(isset($_GET['pdf_invoice'], $_GET['url_key'])){
         }
         $client_website = $row['client_website'];
         $company_id = $row['company_id'];
-
-        $sql_company = mysqli_query($mysqli,"SELECT * FROM settings, companies WHERE settings.company_id = companies.company_id AND companies.company_id = $company_id");
-        $row = mysqli_fetch_array($sql_company);
-
         $company_name = $row['company_name'];
-        $config_company_address = $row['config_company_address'];
-        $config_company_city = $row['config_company_city'];
-        $config_company_state = $row['config_company_state'];
-        $config_company_zip = $row['config_company_zip'];
-        $config_company_phone = $row['config_company_phone'];
-        if(strlen($config_company_phone)>2){ 
-          $config_company_phone = substr($row['config_company_phone'],0,3)."-".substr($row['config_company_phone'],3,3)."-".substr($row['config_company_phone'],6,4);
+        $company_address = $row['company_address'];
+        $company_city = $row['company_city'];
+        $company_state = $row['company_state'];
+        $company_zip = $row['company_zip'];
+        $company_phone = $row['company_phone'];
+        if(strlen($company_phone)>2){ 
+          $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
         }
-        $config_company_email = $row['config_company_email'];
-        $config_invoice_logo = $row['config_invoice_logo']; 
+        $company_email = $row['company_email'];
+        $company_logo = $row['company_logo'];
+        $config_invoice_footer = $row['config_invoice_footer'];
 
         //Mark downloaded in history
         mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = '$invoice_status', history_description = 'Invoice downloaded', history_created_at = NOW(), invoice_id = $invoice_id, company_id = $company_id");
@@ -139,8 +138,8 @@ if(isset($_GET['pdf_invoice'], $_GET['url_key'])){
             <!--mpdf
             <htmlpageheader name="myheader">
             <table width="100%"><tr>
-            <td width="15%"><img width="75" height="75" src=" /'.$config_invoice_logo.' "></img></td>
-            <td width="50%"><span style="font-weight: bold; font-size: 14pt;"> '.$company_name.' </span><br />' .$config_company_address.' <br /> '.$config_company_city.' '.$config_company_state.' '.$config_company_zip.'<br /> '.$config_company_phone.' </td>
+            <td width="15%"><img width="75" height="75" src=" /'.$company_logo.' "></img></td>
+            <td width="50%"><span style="font-weight: bold; font-size: 14pt;"> '.$company_name.' </span><br />' .$company_address.' <br /> '.$company_city.' '.$company_state.' '.$company_zip.'<br /> '.$company_phone.' </td>
             <td width="35%" style="text-align: right;">Invoice No.<br /><span style="font-weight: bold; font-size: 12pt;"> '.$invoice_number.' </span></td>
             </tr></table>
             </htmlpageheader>
@@ -233,8 +232,10 @@ if(isset($_GET['pdf_quote'], $_GET['url_key'])){
     $quote_id = intval($_GET['pdf_quote']);
     $url_key = mysqli_real_escape_string($mysqli,$_GET['url_key']);
 
-    $sql = mysqli_query($mysqli,"SELECT * FROM quotes, clients
+    $sql = mysqli_query($mysqli,"SELECT * FROM quotes, clients, companies, settings
     WHERE quotes.client_id = clients.client_id
+    AND quotes.company_id = companies.company_id
+    AND settings.company_id = companies.company_id
     AND quotes.quote_id = $quote_id
     AND quotes.quote_url_key = '$url_key'"
     );
@@ -262,21 +263,18 @@ if(isset($_GET['pdf_quote'], $_GET['url_key'])){
         }
         $client_website = $row['client_website'];
         $company_id = $row['company_id'];
-
-        $sql_company = mysqli_query($mysqli,"SELECT * FROM settings, companies WHERE settings.company_id = companies.company_id AND companies.company_id = $company_id");
-        $row = mysqli_fetch_array($sql_company);
-
         $company_name = $row['company_name'];
-        $config_company_address = $row['config_company_address'];
-        $config_company_city = $row['config_company_city'];
-        $config_company_state = $row['config_company_state'];
-        $config_company_zip = $row['config_company_zip'];
-        $config_company_phone = $row['config_company_phone'];
-        if(strlen($config_company_phone)>2){ 
-          $config_company_phone = substr($row['config_company_phone'],0,3)."-".substr($row['config_company_phone'],3,3)."-".substr($row['config_company_phone'],6,4);
+        $company_address = $row['company_address'];
+        $company_city = $row['company_city'];
+        $company_state = $row['company_state'];
+        $company_zip = $row['company_zip'];
+        $company_phone = $row['company_phone'];
+        if(strlen($company_phone)>2){ 
+          $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
         }
-        $config_company_email = $row['config_company_email'];
-        $config_invoice_logo = $row['config_invoice_logo']; 
+        $company_email = $row['company_email'];
+        $company_logo = $row['company_logo'];
+        $config_quote_footer = $row['config_quote_footer'];
 
         $sql_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE quote_id = $quote_id ORDER BY item_id ASC");
 
@@ -348,8 +346,8 @@ if(isset($_GET['pdf_quote'], $_GET['url_key'])){
         <!--mpdf
         <htmlpageheader name="myheader">
         <table width="100%"><tr>
-        <td width="15%"><img width="75" height="75" src=" /'.$config_invoice_logo.' "></img></td>
-        <td width="50%"><span style="font-weight: bold; font-size: 14pt;"> '.$company_name.' </span><br />' .$config_company_address.' <br /> '.$config_company_city.' '.$config_company_state.' '.$config_company_zip.'<br /> '.$config_company_phone.' </td>
+        <td width="15%"><img width="75" height="75" src=" /'.$company_logo.' "></img></td>
+        <td width="50%"><span style="font-weight: bold; font-size: 14pt;"> '.$company_name.' </span><br />' .$company_address.' <br /> '.$company_city.' '.$company_state.' '.$company_zip.'<br /> '.$company_phone.' </td>
         <td width="35%" style="text-align: right;">Quote No.<br /><span style="font-weight: bold; font-size: 12pt;"> '.$quote_number.' </span></td>
         </tr></table>
         </htmlpageheader>
diff --git a/guest_view_invoice.php b/guest_view_invoice.php
index 6ad9c595..dc8f3143 100644
--- a/guest_view_invoice.php
+++ b/guest_view_invoice.php
@@ -7,8 +7,10 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
   $url_key = mysqli_real_escape_string($mysqli,$_GET['url_key']);
   $invoice_id = intval($_GET['invoice_id']);
 
-  $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients
+  $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients, settings, companies
     WHERE invoices.client_id = clients.client_id
+    AND settings.company_id = companies.company_id 
+    AND companies.company_id = invoices.company_id
     AND invoices.invoice_id = $invoice_id 
     AND invoices.invoice_url_key = '$url_key'"
   );
@@ -46,21 +48,17 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
       $client_net_terms = $config_default_net_terms;
     }
     $company_id = $row['company_id'];
-
-    $sql_company = mysqli_query($mysqli,"SELECT * FROM settings, companies WHERE settings.company_id = companies.company_id AND companies.company_id = $company_id");
-    $row = mysqli_fetch_array($sql_company);
-
     $company_name = $row['company_name'];
-    $config_company_address = $row['config_company_address'];
-    $config_company_city = $row['config_company_city'];
-    $config_company_state = $row['config_company_state'];
-    $config_company_zip = $row['config_company_zip'];
-    $config_company_phone = $row['config_company_phone'];
-    if(strlen($config_company_phone)>2){ 
-      $config_company_phone = substr($row['config_company_phone'],0,3)."-".substr($row['config_company_phone'],3,3)."-".substr($row['config_company_phone'],6,4);
+    $company_address = $row['company_address'];
+    $company_city = $row['company_city'];
+    $company_state = $row['company_state'];
+    $company_zip = $row['company_zip'];
+    $company_phone = $row['company_phone'];
+    if(strlen($company_phone)>2){ 
+      $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
     }
-    $config_company_email = $row['config_company_email'];
-    $config_invoice_logo = $row['config_invoice_logo'];
+    $company_email = $row['company_email'];
+    $company_logo = $row['company_logo'];
     $config_invoice_footer = $row['config_invoice_footer'];
     $config_stripe_enable = $row['config_stripe_enable'];
     $config_stripe_publishable = $row['config_stripe_publishable'];
@@ -131,7 +129,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
     <div class="card-body">
       <div class="row mb-4">
         <div class="col-sm-2">
-          <img class="img-fluid" src="<?php echo $config_invoice_logo; ?>">
+          <img class="img-fluid" src="<?php echo $company_logo; ?>">
         </div>
         <div class="col-sm-10">
           <?php if($invoice_status == "Paid"){ ?>
@@ -148,10 +146,10 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
         <div class="col-sm">    
           <ul class="list-unstyled">
             <li><h4><strong><?php echo $company_name; ?></strong></h4></li>
-            <li><?php echo $config_company_address; ?></li>
-            <li><?php echo "$config_company_city $config_company_state $config_company_zip"; ?></li>
-            <li><?php echo $config_company_phone; ?></li>
-            <li><?php echo $config_company_email; ?></li>
+            <li><?php echo $company_address; ?></li>
+            <li><?php echo "$company_city $company_state $company_zip"; ?></li>
+            <li><?php echo $company_phone; ?></li>
+            <li><?php echo $company_email; ?></li>
           </ul>
           
         </div>
@@ -213,7 +211,9 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
                   $item_subtotal = $row['item_price'];
                   $item_tax = $row['item_tax'];
                   $item_total = $row['item_total'];
+                  $total_tax = 0;
                   $total_tax = $item_tax + $total_tax;
+                  $sub_total = 0;
                   $sub_total = $item_price * $item_quantity + $sub_total;
 
                 ?>
@@ -254,12 +254,6 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
                 <td>Subtotal</td>
                 <td class="text-right text-monospace">$<?php echo number_format($sub_total,2); ?></td>
               </tr>
-              <?php if($discount > 0){ ?>
-              <tr class="border-bottom">
-                <td>Discount</td>
-                <td class="text-right text-monospace">$<?php echo number_format($invoice_discount,2); ?></td>          
-              </tr>
-              <?php } ?>
               <?php if($total_tax > 0){ ?>
               <tr class="border-bottom">
                 <td>Tax</td>
diff --git a/guest_view_quote.php b/guest_view_quote.php
index 2cc5a4ef..2cf31f5b 100644
--- a/guest_view_quote.php
+++ b/guest_view_quote.php
@@ -7,8 +7,10 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
   $url_key = mysqli_real_escape_string($mysqli,$_GET['url_key']);
   $quote_id = intval($_GET['quote_id']);
 
-  $sql = mysqli_query($mysqli,"SELECT * FROM quotes, clients
+  $sql = mysqli_query($mysqli,"SELECT * FROM quotes, clients, settings, companies
     WHERE quotes.client_id = clients.client_id
+    AND settings.company_id = companies.company_id 
+    AND companies.company_id = quotes.company_id
     AND quotes.quote_id = $quote_id
     AND quotes.quote_url_key = '$url_key'"
   );
@@ -46,22 +48,18 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
       $client_net_terms = $config_default_net_terms;
     }
     $company_id = $row['company_id'];
-
-    $sql_company = mysqli_query($mysqli,"SELECT * FROM settings, companies WHERE settings.company_id = companies.company_id AND companies.company_id = $company_id");
-    $row = mysqli_fetch_array($sql_company);
-
     $company_name = $row['company_name'];
-    $config_company_address = $row['config_company_address'];
-    $config_company_city = $row['config_company_city'];
-    $config_company_state = $row['config_company_state'];
-    $config_company_zip = $row['config_company_zip'];
-    $config_company_phone = $row['config_company_phone'];
-    if(strlen($config_company_phone)>2){ 
-      $config_company_phone = substr($row['config_company_phone'],0,3)."-".substr($row['config_company_phone'],3,3)."-".substr($row['config_company_phone'],6,4);
+    $company_address = $row['company_address'];
+    $company_city = $row['company_city'];
+    $company_state = $row['company_state'];
+    $company_zip = $row['company_zip'];
+    $company_phone = $row['company_phone'];
+    if(strlen($company_phone)>2){ 
+      $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
     }
-    $config_company_email = $row['config_company_email'];
-    $config_invoice_logo = $row['config_invoice_logo'];
-    $config_quote_footer = $row['config_quote_footer'];
+    $company_email = $row['company_email'];
+    $company_logo = $row['company_logo'];
+    $quote_footer = $row['quote_footer'];
 
     $ip = get_ip();
     $os = get_os();
@@ -123,10 +121,10 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
         <div class="col-sm">
           <ul class="list-unstyled">
             <li><h4><strong><?php echo $company_name; ?></strong></h4></li>
-            <li><?php echo $config_company_address; ?></li>
-            <li><?php echo "$config_company_city $config_company_state $config_company_zip"; ?></li>
-            <li><?php echo $config_company_phone; ?></li>
-            <li><?php echo $config_company_email; ?></li>
+            <li><?php echo $company_address; ?></li>
+            <li><?php echo "$company_city $company_state $company_zip"; ?></li>
+            <li><?php echo $company_phone; ?></li>
+            <li><?php echo $company_email; ?></li>
           </ul>
           
         </div>
diff --git a/invoice.php b/invoice.php
index a4ed1040..215ba69b 100644
--- a/invoice.php
+++ b/invoice.php
@@ -6,10 +6,10 @@ if(isset($_GET['invoice_id'])){
 
   $invoice_id = intval($_GET['invoice_id']);
 
-  $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients
+  $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients, companies
     WHERE invoices.client_id = clients.client_id
-    AND invoices.invoice_id = $invoice_id
-    AND invoices.company_id = $session_company_id"
+    AND invoices.company_id = companies.company_id
+    AND invoices.invoice_id = $invoice_id"
   );
 
   if(mysqli_num_rows($sql) == 0){
@@ -48,6 +48,19 @@ if(isset($_GET['invoice_id'])){
   if($client_net_terms == 0){
     $client_net_terms = $config_default_net_terms;
   }
+  $company_name = $row['company_name'];
+  $company_country = $row['company_country'];
+  $company_address = $row['company_address'];
+  $company_city = $row['company_city'];
+  $company_state = $row['company_state'];
+  $company_zip = $row['company_zip'];
+  $company_phone = $row['company_phone'];
+  if(strlen($company_phone)>2){ 
+    $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
+  }
+  $company_email = $row['company_email'];
+  $company_website = $row['company_website'];
+  $company_logo = $row['company_logo'];
 
   $sql_history = mysqli_query($mysqli,"SELECT * FROM history WHERE invoice_id = $invoice_id ORDER BY history_id DESC");
   
@@ -153,7 +166,7 @@ if(isset($_GET['invoice_id'])){
       
     <div class="row mb-4">
       <div class="col-sm-2">
-        <img class="img-fluid" src="<?php echo $config_invoice_logo; ?>">
+        <img class="img-fluid" src="<?php echo $company_logo; ?>">
       </div>
       <div class="col-sm-10">
         <div class="ribbon-wrapper">
@@ -169,11 +182,12 @@ if(isset($_GET['invoice_id'])){
     <div class="row mb-4">
       <div class="col-sm">
         <ul class="list-unstyled">
-          <li><h4><strong><?php echo $config_company_name; ?></strong></h4></li>
-          <li><?php echo $config_company_address; ?></li>
-          <li><?php echo "$config_company_city $config_company_state $config_company_zip"; ?></li>
-          <li><?php echo $config_company_phone; ?></li>
-          <li><?php echo $config_company_email; ?></li>
+          <li><h4><strong><?php echo $company_name; ?></strong></h4></li>
+          <li><?php echo $company_address; ?></li>
+          <li><?php echo "$company_city $company_state $company_zip"; ?></li>
+          <li><?php echo $company_phone; ?></li>
+          <li><?php echo $company_email; ?></li>
+          <li><?php echo $company_website; ?></li>
         </ul>
       </div>
       <div class="col-sm">
diff --git a/post.php b/post.php
index 17ab1d31..a719d38e 100644
--- a/post.php
+++ b/post.php
@@ -171,9 +171,9 @@ if(isset($_POST['add_company'])){
     $country = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['country'])));
     $phone = preg_replace("/[^0-9]/", '',$_POST['phone']);
     $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email'])));
-    $site = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['site'])));
+    $website = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['website'])));
 
-    mysqli_query($mysqli,"INSERT INTO companies SET company_name = '$name', company_created_at = NOW()");
+    mysqli_query($mysqli,"INSERT INTO companies SET company_name = '$name', company_address = '$address', company_city = '$city', company_state = '$state', company_zip = '$zip', company_country = '$country', company_phone = '$phone', company_email = '$email', company_website = '$website', company_created_at = NOW()");
 
     $config_api_key = keygen();
     $config_base_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']);
@@ -183,8 +183,18 @@ if(isset($_POST['add_company'])){
     mkdir("uploads/expenses/$company_id");
     mkdir("uploads/settings/$company_id");
     mkdir("uploads/tmp/$company_id");
- 
-    mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$name', config_company_country = '$country', config_company_address = '$address', config_company_city = '$city', config_company_state = '$state', config_company_zip = '$zip', config_company_phone = '$phone', config_company_email = '$email', config_company_site = '$site', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_records_per_page = 10, config_send_invoice_reminders = 0, config_enable_cron = 0, config_ticket_next_number = 1");
+
+    if($_FILES['file']['tmp_name']!='') {
+        $path = "uploads/settings/$company_id/";
+        $path = $path . time() . basename( $_FILES['file']['name']);
+        $file_name = basename($path);
+        move_uploaded_file($_FILES['file']['tmp_name'], $path);
+    
+        mysqli_query($mysqli,"UPDATE companies SET company_logo = '$path' WHERE company_id = $company_id");
+
+    }
+
+    mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_records_per_page = 10, config_send_invoice_reminders = 0, config_enable_cron = 0, config_ticket_next_number = 1, config_base_url = '$config_base_url'");
 
     //logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Company', log_action = 'Create', log_description = '$name', log_created_at = NOW()");
@@ -198,18 +208,29 @@ if(isset($_POST['add_company'])){
 if(isset($_POST['edit_company'])){
     $company_id = intval($_POST['company_id']);
     $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
-    $country = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['country'])));
     $address = strip_tags(mysqli_real_escape_string($mysqli,$_POST['address']));
     $city = strip_tags(mysqli_real_escape_string($mysqli,$_POST['city']));
     $state = strip_tags(mysqli_real_escape_string($mysqli,$_POST['state']));
     $zip = strip_tags(mysqli_real_escape_string($mysqli,$_POST['zip']));
+    $country = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['country'])));
     $phone = preg_replace("/[^0-9]/", '',$_POST['phone']);
     $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email'])));
-    $site = strip_tags(mysqli_real_escape_string($mysqli,$_POST['site']));
+    $website = strip_tags(mysqli_real_escape_string($mysqli,$_POST['website']));
 
-    mysqli_query($mysqli,"UPDATE companies SET company_name = '$name', company_updated_at = NOW() WHERE company_id = $company_id");
+    $path = strip_tags(mysqli_real_escape_string($mysqli,$_POST['current_file_path']));
 
-     mysqli_query($mysqli,"UPDATE settings SET config_company_name = '$name', config_company_country = '$country', config_company_address = '$address', config_company_city = '$city', config_company_state = '$state', config_company_zip = '$zip', config_company_phone = '$phone', config_company_email = '$email', config_company_site = '$site' WHERE company_id = $company_id");
+    if(!file_exists("uploads/settings/$company_id/")) {
+        mkdir("uploads/settings/$company_id");
+    }
+
+    if($_FILES['file']['tmp_name']!='') {
+        $path = "uploads/settings/$company_id/";
+        $path = $path . time() . basename( $_FILES['file']['name']);
+        $file_name = basename($path);
+        move_uploaded_file($_FILES['file']['tmp_name'], $path);
+    }
+
+    mysqli_query($mysqli,"UPDATE companies SET company_name = '$name', company_address = '$address', company_city = '$city', company_state = '$state', company_zip = '$zip', company_country = '$country', company_phone = '$phone', company_email = '$email', company_website = '$website', company_logo = '$path', company_updated_at = NOW() WHERE company_id = $company_id");
 
     //logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Company', log_action = 'Modified', log_description = '$name', log_created_at = NOW()");
@@ -283,41 +304,6 @@ if(isset($_POST['edit_general_settings'])){
 
 }
 
-if(isset($_POST['edit_company_settings'])){
-
-    $config_company_name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_name']));
-    $config_company_country = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_country']));
-    $config_company_address = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_address']));
-    $config_company_city = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_city']));
-    $config_company_state = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_state']));
-    $config_company_zip = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_zip']));
-    $config_company_phone = preg_replace("/[^0-9]/", '',$_POST['config_company_phone']);
-    $config_company_email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_email'])));
-    $config_company_site = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_site']));
-
-    $path = "$config_invoice_logo";
-
-    if($_FILES['file']['tmp_name']!='') {
-        //delete old avatar file
-        unlink($path);
-        //Update with new path
-        $path = "uploads/settings/$session_company_id/";
-        $path = $path . basename( $_FILES['file']['name']);
-        $file_name = basename($path);
-        move_uploaded_file($_FILES['file']['tmp_name'], $path);   
-    }
-
-    mysqli_query($mysqli,"UPDATE settings SET config_company_name = '$config_company_name', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_country = '$config_company_country', config_company_phone = '$config_company_phone', config_company_email = '$config_company_email', config_company_site = '$config_company_site', config_invoice_logo = '$path' WHERE company_id = $session_company_id");
-
-    //Logging
-    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Settings', log_action = 'Modified', log_description = 'Company', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
-
-    $_SESSION['alert_message'] = "Company Settings updated";
-
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
 if(isset($_POST['edit_mail_settings'])){
 
     $config_smtp_host = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_smtp_host']));
@@ -647,10 +633,23 @@ if(isset($_POST['add_event'])){
     //If email is checked
     if($email_event == 1){
 
-        $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE client_id = $client AND company_id = $session_company_id");
+        $sql = mysqli_query($mysqli,"SELECT * FROM clients, companies WHERE client_id = $client AND companies.company_id = $session_company_id");
         $row = mysqli_fetch_array($sql);
         $client_name = $row['client_name'];
         $client_email = $row['client_email'];
+        $company_name = $row['company_name'];
+        $company_country = $row['company_country'];
+        $company_address = $row['company_address'];
+        $company_city = $row['company_city'];
+        $company_state = $row['company_state'];
+        $company_zip = $row['company_zip'];
+        $company_phone = $row['company_phone'];
+        if(strlen($company_phone)>2){ 
+          $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
+        }
+        $company_email = $row['company_email'];
+        $company_website = $row['company_website'];
+        $company_logo = $row['company_logo'];
 
         $mail = new PHPMailer(true);
 
@@ -674,7 +673,7 @@ if(isset($_POST['add_event'])){
             // Content
             $mail->isHTML(true);                                  // Set email format to HTML
             $mail->Subject = "New Calendar Event";
-            $mail->Body    = "Hello $client_name,<br><br>A calendar event has been scheduled: $title at $start<br><br><br>~<br>$config_company_name<br>$config_company_phone";
+            $mail->Body    = "Hello $client_name,<br><br>A calendar event has been scheduled: $title at $start<br><br><br>~<br>$company_name<br>$company_phone";
 
             $mail->send();
             echo 'Message has been sent';
@@ -711,10 +710,23 @@ if(isset($_POST['edit_event'])){
     //If email is checked
     if($email_event == 1){
 
-        $sql = mysqli_query($mysqli,"SELECT * FROM clients WHERE client_id = $client AND company_id = $session_company_id");
+        $sql = mysqli_query($mysqli,"SELECT * FROM clients, companies WHERE client_id = $client AND companies.company_id = $session_company_id");
         $row = mysqli_fetch_array($sql);
         $client_name = $row['client_name'];
         $client_email = $row['client_email'];
+        $company_name = $row['company_name'];
+        $company_country = $row['company_country'];
+        $company_address = $row['company_address'];
+        $company_city = $row['company_city'];
+        $company_state = $row['company_state'];
+        $company_zip = $row['company_zip'];
+        $company_phone = $row['company_phone'];
+        if(strlen($company_phone)>2){ 
+          $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
+        }
+        $company_email = $row['company_email'];
+        $company_website = $row['company_website'];
+        $company_logo = $row['company_logo'];
 
         $mail = new PHPMailer(true);
 
@@ -738,7 +750,7 @@ if(isset($_POST['edit_event'])){
             // Content
             $mail->isHTML(true);                                  // Set email format to HTML
             $mail->Subject = "Calendar Event Rescheduled";
-            $mail->Body    = "Hello $client_name,<br><br>A calendar event has been rescheduled: $title at $start<br><br><br>~<br>$config_company_name<br>$config_company_phone";
+            $mail->Body    = "Hello $client_name,<br><br>A calendar event has been rescheduled: $title at $start<br><br><br>~<br>$company_name<br>$company_phone";
 
             $mail->send();
             echo 'Message has been sent';
@@ -1864,8 +1876,9 @@ if(isset($_GET['pdf_quote'])){
 
     $quote_id = intval($_GET['pdf_quote']);
 
-    $sql = mysqli_query($mysqli,"SELECT * FROM quotes, clients
+    $sql = mysqli_query($mysqli,"SELECT * FROM quotes, clients, companies
     WHERE quotes.client_id = clients.client_id
+    AND quotes.company_id = companies.company_id
     AND quotes.quote_id = $quote_id
     AND quotes.company_id = $session_company_id"
     );
@@ -1895,6 +1908,19 @@ if(isset($_GET['pdf_quote'])){
       $client_mobile = substr($row['client_mobile'],0,3)."-".substr($row['client_mobile'],3,3)."-".substr($row['client_mobile'],6,4);
     }
     $client_website = $row['client_website'];
+    $company_name = $row['company_name'];
+    $company_country = $row['company_country'];
+    $company_address = $row['company_address'];
+    $company_city = $row['company_city'];
+    $company_state = $row['company_state'];
+    $company_zip = $row['company_zip'];
+    $company_phone = $row['company_phone'];
+    if(strlen($company_phone)>2){ 
+      $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
+    }
+    $company_email = $row['company_email'];
+    $company_website = $row['company_website'];
+    $company_logo = $row['company_logo'];
 
     $sql_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE quote_id = $quote_id AND company_id = $session_company_id ORDER BY item_id ASC");
 
@@ -1966,8 +1992,8 @@ if(isset($_GET['pdf_quote'])){
     <!--mpdf
     <htmlpageheader name="myheader">
     <table width="100%"><tr>
-    <td width="15%"><img width="75" height="75" src=" /'.$config_invoice_logo.' "></img></td>
-    <td width="50%"><span style="font-weight: bold; font-size: 14pt;"> '.$config_company_name.' </span><br />' .$config_company_address.' <br /> '.$config_company_city.' '.$config_company_state.' '.$config_company_zip.'<br /> '.$config_company_phone.' </td>
+    <td width="15%"><img width="75" height="75" src=" /'.$company_logo.' "></img></td>
+    <td width="50%"><span style="font-weight: bold; font-size: 14pt;"> '.$company_name.' </span><br />' .$company_address.' <br /> '.$company_city.' '.$company_state.' '.$company_zip.'<br /> '.$company_phone.' </td>
     <td width="35%" style="text-align: right;">Quote No.<br /><span style="font-weight: bold; font-size: 12pt;"> '.$quote_number.' </span></td>
     </tr></table>
     </htmlpageheader>
@@ -2028,8 +2054,8 @@ if(isset($_GET['pdf_quote'])){
     'margin_footer' => 10
     ]);
     $mpdf->SetProtection(array('print'));
-    $mpdf->SetTitle("$config_company_name - Quote");
-    $mpdf->SetAuthor("$config_company_name");
+    $mpdf->SetTitle("$company_name - Quote");
+    $mpdf->SetAuthor("$company_name");
     $mpdf->SetWatermarkText("Quote");
     $mpdf->showWatermarkText = true;
     $mpdf->watermark_font = 'DejaVuSansCondensed';
@@ -2046,8 +2072,9 @@ if(isset($_GET['pdf_quote'])){
 if(isset($_GET['email_quote'])){
     $quote_id = intval($_GET['email_quote']);
 
-    $sql = mysqli_query($mysqli,"SELECT * FROM quotes, clients
+    $sql = mysqli_query($mysqli,"SELECT * FROM quotes, clients, companies
     WHERE quotes.client_id = clients.client_id
+    AND quotes.company_id = companies.company_id
     AND quotes.quote_id = $quote_id
     AND quotes.company_id = $session_company_id"
     );
@@ -2073,6 +2100,19 @@ if(isset($_GET['email_quote'])){
     }
     $client_website = $row['client_website'];
     $base_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']);
+    $company_name = $row['company_name'];
+    $company_country = $row['company_country'];
+    $company_address = $row['company_address'];
+    $company_city = $row['company_city'];
+    $company_state = $row['company_state'];
+    $company_zip = $row['company_zip'];
+    $company_phone = $row['company_phone'];
+    if(strlen($company_phone)>2){ 
+      $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
+    }
+    $company_email = $row['company_email'];
+    $company_website = $row['company_website'];
+    $company_logo = $row['company_logo'];
 
     $mail = new PHPMailer(true);
 
@@ -2102,7 +2142,7 @@ if(isset($_GET['email_quote'])){
         $mail->isHTML(true);                                  // Set email format to HTML
 
         $mail->Subject = "Quote";
-        $mail->Body    = "Hello $client_name,<br><br>Thank you for your inquiry, we are pleased to provide you with the following estimate.<br><br><br>Total Cost: $$quote_amount<br><br><br>View and accept your estimate online <a href='https://$base_url/guest_view_quote.php?quote_id=$quote_id&url_key=$quote_url_key'>here</a><br><br><br>~<br>$config_company_name<br>$config_company_phone";
+        $mail->Body    = "Hello $client_name,<br><br>Thank you for your inquiry, we are pleased to provide you with the following estimate.<br><br><br>Total Cost: $$quote_amount<br><br><br>View and accept your estimate online <a href='https://$base_url/guest_view_quote.php?quote_id=$quote_id&url_key=$quote_url_key'>here</a><br><br><br>~<br>$company_name<br>$company_phone";
         
         $mail->send();
         echo 'Message has been sent';
@@ -2528,13 +2568,32 @@ if(isset($_POST['add_payment'])){
         $total_payments_amount = $row['payments_amount'];
         
         //Get the invoice total
-        $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients WHERE invoices.client_id = clients.client_id AND invoices.invoice_id = $invoice_id AND invoices.company_id = $session_company_id");
+        $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients, companies 
+            WHERE invoices.client_id = clients.client_id 
+            AND invoices.invoice_id = $invoice_id 
+            AND invoices.company_id = companies.company_id 
+            AND invoices.company_id = $session_company_id"
+        );
+
         $row = mysqli_fetch_array($sql);
         $invoice_amount = $row['invoice_amount'];
         $invoice_number = $row['invoice_number'];
         $invoice_url_key = $row['invoice_url_key'];
         $client_name = $row['client_name'];
         $client_email = $row['client_email'];
+        $company_name = $row['company_name'];
+        $company_country = $row['company_country'];
+        $company_address = $row['company_address'];
+        $company_city = $row['company_city'];
+        $company_state = $row['company_state'];
+        $company_zip = $row['company_zip'];
+        $company_phone = $row['company_phone'];
+        if(strlen($company_phone)>2){ 
+          $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
+        }
+        $company_email = $row['company_email'];
+        $company_website = $row['company_website'];
+        $company_logo = $row['company_logo'];
 
         //Calculate the Invoice balance
         $invoice_balance = $invoice_amount - $total_payments_amount;
@@ -2569,7 +2628,7 @@ if(isset($_POST['add_payment'])){
                   // Content
                   $mail->isHTML(true);                                  // Set email format to HTML
                   $mail->Subject = "Payment Recieved - Invoice $invoice_number";
-                  $mail->Body    = "Hello $client_name,<br><br>We have recieved your payment in the amount of $$formatted_amount for invoice <a href='https://$base_url/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key'>$invoice_number</a>. Please keep this email as a receipt for your records.<br><br>Amount: $$formatted_amount<br>Balance: $$formatted_invoice_balance<br><br>Thank you for your business!<br><br><br>~<br>$config_company_name<br>$config_company_phone";
+                  $mail->Body    = "Hello $client_name,<br><br>We have recieved your payment in the amount of $$formatted_amount for invoice <a href='https://$base_url/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key'>$invoice_number</a>. Please keep this email as a receipt for your records.<br><br>Amount: $$formatted_amount<br>Balance: $$formatted_invoice_balance<br><br>Thank you for your business!<br><br><br>~<br>$company_name<br>$company_phone";
 
                   $mail->send();
                   echo 'Message has been sent';
@@ -2605,7 +2664,7 @@ if(isset($_POST['add_payment'])){
                   // Content
                   $mail->isHTML(true);                                  // Set email format to HTML
                   $mail->Subject = "Partial Payment Recieved - Invoice $invoice_number";
-                  $mail->Body    = "Hello $client_name,<br><br>We have recieved partial payment in the amount of $$formatted_amount and it has been applied to invoice <a href='https://$base_url/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key'>$invoice_number</a>. Please keep this email as a receipt for your records.<br><br>Amount: $$formatted_amount<br>Balance: $$formatted_invoice_balance<br><br>Thank you for your business!<br><br><br>~<br>$config_company_name<br>$config_company_phone";
+                  $mail->Body    = "Hello $client_name,<br><br>We have recieved partial payment in the amount of $$formatted_amount and it has been applied to invoice <a href='https://$base_url/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key'>$invoice_number</a>. Please keep this email as a receipt for your records.<br><br>Amount: $$formatted_amount<br>Balance: $$formatted_invoice_balance<br><br>Thank you for your business!<br><br><br>~<br>$company_name<br>$company_phone";
 
                   $mail->send();
                   echo 'Message has been sent';
@@ -2682,8 +2741,9 @@ if(isset($_GET['delete_payment'])){
 if(isset($_GET['email_invoice'])){
     $invoice_id = intval($_GET['email_invoice']);
 
-    $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients
+    $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients, companies
     WHERE invoices.client_id = clients.client_id
+    AND invoices.company_id = companies.company_id
     AND invoices.invoice_id = $invoice_id"
     );
 
@@ -2708,6 +2768,19 @@ if(isset($_GET['email_invoice'])){
     }
     $client_website = $row['client_website'];
     $base_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']);
+    $company_name = $row['company_name'];
+    $company_country = $row['company_country'];
+    $company_address = $row['company_address'];
+    $company_city = $row['company_city'];
+    $company_state = $row['company_state'];
+    $company_zip = $row['company_zip'];
+    $company_phone = $row['company_phone'];
+    if(strlen($company_phone)>2){ 
+      $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
+    }
+    $company_email = $row['company_email'];
+    $company_website = $row['company_website'];
+    $company_logo = $row['company_logo'];
 
     $sql_payments = mysqli_query($mysqli,"SELECT * FROM payments, accounts WHERE payments.account_id = accounts.account_id AND payments.invoice_id = $invoice_id AND payments.company_id = $session_company_id ORDER BY payments.payment_id DESC");
 
@@ -2743,12 +2816,12 @@ if(isset($_GET['email_invoice'])){
         if($invoice_status == 'Paid'){
 
             $mail->Subject = "Invoice $invoice_number Copy";
-            $mail->Body    = "Hello $client_name,<br><br>Please click on the link below to see your invoice marked <b>paid</b>.<br><br><a href='https://$base_url/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key'>Invoice Link</a><br><br><br>~<br>$config_company_name<br>Automated Billing Department<br>$config_company_phone";
+            $mail->Body    = "Hello $client_name,<br><br>Please click on the link below to see your invoice marked <b>paid</b>.<br><br><a href='https://$base_url/guest_view_invoice.php?invoice_id=$invoice_id&url_key=$invoice_url_key'>Invoice Link</a><br><br><br>~<br>$company_name<br>Automated Billing Department<br>$company_phone";
 
         }else{
 
             $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>Balance Due: $$balance<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=$invoice_id&url_key=$invoice_url_key'>here</a><br><br><br>~<br>$config_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>Balance Due: $$balance<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=$invoice_id&url_key=$invoice_url_key'>here</a><br><br><br>~<br>$company_name<br>$company_phone";
             //$mail->AltBody = 'This is the body in plain text for non-HTML mail clients';
         }
         
@@ -2838,8 +2911,9 @@ if(isset($_GET['pdf_invoice'])){
 
     $invoice_id = intval($_GET['pdf_invoice']);
 
-    $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients
+    $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients, companies
     WHERE invoices.client_id = clients.client_id
+    AND companies.company_id = invoices.company_id
     AND invoices.invoice_id = $invoice_id
     AND invoices.company_id = $session_company_id"
     );
@@ -2865,6 +2939,19 @@ if(isset($_GET['pdf_invoice'])){
     $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'];
+    $company_name = $row['company_name'];
+    $company_country = $row['company_country'];
+    $company_address = $row['company_address'];
+    $company_city = $row['company_city'];
+    $company_state = $row['company_state'];
+    $company_zip = $row['company_zip'];
+    $company_phone = $row['company_phone'];
+    if(strlen($company_phone)>2){ 
+      $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
+    }
+    $company_email = $row['company_email'];
+    $company_website = $row['company_website'];
+    $company_logo = $row['company_logo'];
 
     $sql_payments = mysqli_query($mysqli,"SELECT * FROM payments, accounts WHERE payments.account_id = accounts.account_id AND payments.invoice_id = $invoice_id AND payments.company_id = $session_company_id ORDER BY payments.payment_id DESC");
 
@@ -2944,8 +3031,8 @@ if(isset($_GET['pdf_invoice'])){
         <!--mpdf
         <htmlpageheader name="myheader">
         <table width="100%"><tr>
-        <td width="15%"><img width="75" height="75" src=" /'.$config_invoice_logo.' "></img></td>
-        <td width="50%"><span style="font-weight: bold; font-size: 14pt;"> '.$config_company_name.' </span><br />' .$config_company_address.' <br /> '.$config_company_city.' '.$config_company_state.' '.$config_company_zip.'<br /> '.$config_company_phone.' </td>
+        <td width="15%"><img width="75" height="75" src=" /'.$company_logo.' "></img></td>
+        <td width="50%"><span style="font-weight: bold; font-size: 14pt;"> '.$company_name.' </span><br />' .$company_address.' <br /> '.$company_city.' '.$company_state.' '.$company_zip.'<br /> '.$company_phone.' </td>
         <td width="35%" style="text-align: right;">Invoice No.<br /><span style="font-weight: bold; font-size: 12pt;"> '.$invoice_number.' </span></td>
         </tr></table>
         </htmlpageheader>
@@ -3016,8 +3103,8 @@ if(isset($_GET['pdf_invoice'])){
     ]);
 
     $mpdf->SetProtection(array('print'));
-    $mpdf->SetTitle("$config_company_name - Invoice");
-    $mpdf->SetAuthor("$config_company_name");
+    $mpdf->SetTitle("$company_name - Invoice");
+    $mpdf->SetAuthor("$company_name");
     if($invoice_status == 'Paid'){
         $mpdf->SetWatermarkText("Paid");
     }
diff --git a/quote.php b/quote.php
index c8db773f..f788ff94 100644
--- a/quote.php
+++ b/quote.php
@@ -6,8 +6,9 @@ if(isset($_GET['quote_id'])){
 
   $quote_id = intval($_GET['quote_id']);
 
-  $sql = mysqli_query($mysqli,"SELECT * FROM quotes, clients
+  $sql = mysqli_query($mysqli,"SELECT * FROM quotes, clients, companies
     WHERE quotes.client_id = clients.client_id
+    AND quotes.company_id = companies.company_id
     AND quotes.quote_id = $quote_id"
   );
 
@@ -42,6 +43,19 @@ if(isset($_GET['quote_id'])){
   if($client_net_terms == 0){
     $client_net_terms = $config_default_net_terms;
   }
+  $company_name = $row['company_name'];
+  $company_country = $row['company_country'];
+  $company_address = $row['company_address'];
+  $company_city = $row['company_city'];
+  $company_state = $row['company_state'];
+  $company_zip = $row['company_zip'];
+  $company_phone = $row['company_phone'];
+  if(strlen($company_phone)>2){ 
+    $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
+  }
+  $company_email = $row['company_email'];
+  $company_website = $row['company_website'];
+  $company_logo = $row['company_logo'];
 
   $sql_history = mysqli_query($mysqli,"SELECT * FROM history WHERE quote_id = $quote_id ORDER BY history_id DESC");
   
@@ -129,7 +143,7 @@ if(isset($_GET['quote_id'])){
 
     <div class="row mb-4">
       <div class="col-sm-2">
-        <img class="img-fluid" src="<?php echo $config_invoice_logo; ?>">
+        <img class="img-fluid" src="<?php echo $company_logo; ?>">
       </div>
       <div class="col-sm-10">
         <h3 class="text-right"><strong>Quote</strong><br><small class="text-secondary"><?php echo $quote_number; ?></small></h3>
@@ -138,11 +152,11 @@ if(isset($_GET['quote_id'])){
     <div class="row mb-4">
       <div class="col-sm">
         <ul class="list-unstyled">
-          <li><h4><strong><?php echo $config_company_name; ?></strong></h4></li>
-          <li><?php echo $config_company_address; ?></li>
-          <li><?php echo "$config_company_city $config_company_state $config_company_zip"; ?></li>
-          <li><?php echo $config_company_phone; ?></li>
-          <li><?php echo $config_company_email; ?></li>
+          <li><h4><strong><?php echo $company_name; ?></strong></h4></li>
+          <li><?php echo $company_address; ?></li>
+          <li><?php echo "$company_city $company_state $company_zip"; ?></li>
+          <li><?php echo $company_phone; ?></li>
+          <li><?php echo $company_email; ?></li>
         </ul>
       </div>
       <div class="col-sm">
diff --git a/recurring_invoice.php b/recurring_invoice.php
index 18568dd1..e800cdb3 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -6,8 +6,9 @@ if(isset($_GET['recurring_id'])){
 
   $recurring_id = intval($_GET['recurring_id']);
 
-  $sql = mysqli_query($mysqli,"SELECT * FROM clients, recurring
+  $sql = mysqli_query($mysqli,"SELECT * FROM clients, recurring, companies
     WHERE recurring.client_id = clients.client_id
+    AND recurring.company_id = companies.company_id
     AND recurring.recurring_id = $recurring_id"
   );
 
@@ -51,6 +52,19 @@ if(isset($_GET['recurring_id'])){
     $status = "Inactive";
     $status_badge_color = "secondary";
   }
+  $company_name = $row['company_name'];
+  $company_country = $row['company_country'];
+  $company_address = $row['company_address'];
+  $company_city = $row['company_city'];
+  $company_state = $row['company_state'];
+  $company_zip = $row['company_zip'];
+  $company_phone = $row['company_phone'];
+  if(strlen($company_phone)>2){ 
+    $company_phone = substr($row['company_phone'],0,3)."-".substr($row['company_phone'],3,3)."-".substr($row['company_phone'],6,4);
+  }
+  $company_email = $row['company_email'];
+  $company_website = $row['company_website'];
+  $company_logo = $row['company_logo'];
 
   $sql_history = mysqli_query($mysqli,"SELECT * FROM history WHERE recurring_id = $recurring_id ORDER BY history_id DESC");
 
@@ -99,7 +113,7 @@ if(isset($_GET['recurring_id'])){
 
     <div class="row mb-4">
       <div class="col-sm-2">
-        <img class="img-fluid" src="<?php echo $config_invoice_logo; ?>">
+        <img class="img-fluid" src="<?php echo $company_logo; ?>">
       </div>
       <div class="col-sm-10">
         <h3 class="text-right"><strong>Recurring Invoice</strong><br><small class="text-secondary"><?php echo ucwords($recurring_frequency); ?>ly</small></h3>
@@ -108,11 +122,11 @@ if(isset($_GET['recurring_id'])){
     <div class="row mb-4">
       <div class="col-sm">
         <ul class="list-unstyled">
-          <li><h4><strong><?php echo $config_company_name; ?></strong></h4></li>
-          <li><?php echo $config_company_address; ?></li>
-          <li><?php echo "$config_company_city $config_company_state $config_company_zip"; ?></li>
-          <li><?php echo $config_company_phone; ?></li>
-          <li><?php echo $config_company_email; ?></li>
+          <li><h4><strong><?php echo $company_name; ?></strong></h4></li>
+          <li><?php echo $company_address; ?></li>
+          <li><?php echo "$company_city $company_state $company_zip"; ?></li>
+          <li><?php echo $company_phone; ?></li>
+          <li><?php echo $company_email; ?></li>
         </ul>
       </div>
       <div class="col-sm">
diff --git a/settings-company.php b/settings-company.php
deleted file mode 100644
index 647c25b2..00000000
--- a/settings-company.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php include("header.php"); ?>
-
-<?php include("settings-nav.php"); ?>
-
-<div class="card card-dark">
-  <div class="card-header">
-    <h3 class="card-title"><i class="fa fa-fw fa-building"></i> Company Settings</h3>
-  </div>
-  <div class="card-body">
-    <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-      <div class="form-group">
-        <label>Company Name</label>
-        <div class="input-group">
-          <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>  
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label>Address</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-          </div>
-          <input type="text" class="form-control" name="config_company_address" placeholder="Street Address" value="<?php echo $config_company_address; ?>" >
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label>City</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
-          </div>
-          <input type="text" class="form-control" name="config_company_city" placeholder="City" value="<?php echo $config_company_city; ?>" >
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label>State</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-          </div>
-          <select class="form-control select2" name="config_company_state">
-            <option value="">Select a state...</option>
-              <?php foreach($states_array as $state_abbr => $state_name) { ?>
-              <option <?php if($config_company_state == $state_abbr) { echo "selected"; } ?> value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
-              <?php } ?>
-          </select>
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label>Zip</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
-          </div>
-          <input type="text" class="form-control" name="config_company_zip" placeholder="Postal Code" value="<?php echo $config_company_zip; ?>">
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label>Country</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-          </div>
-          <select class="form-control select2" name="config_company_country">
-            <option value="">- Country -</option>
-            <?php foreach($countries_array as $country_name) { ?>
-            <option <?php if($config_company_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
-            <?php } ?>
-          </select>
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label>Phone</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-          </div>
-          <input type="text" class="form-control" name="config_company_phone" placeholder="Phone Number" value="<?php echo $config_company_phone; ?>" data-inputmask="'mask': '999-999-9999'" > 
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label>Email</label>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-          </div>
-          <input type="email" class="form-control" name="config_company_email" placeholder="Email Address" value="<?php echo $config_company_email; ?>">
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label>Website</label>
-        <div class="input-group">
-          <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="config_company_site" placeholder="Website address https://" value="<?php echo $config_company_site; ?>" >
-        </div>
-      </div>
-
-      <div class="form-group mb-4">
-        <label>Logo</label>
-        <input type="file" class="form-control-file" name="file">
-      </div>
-
-      <div class="card col-md-2">
-        <div class="card-body">
-          <img class="img-fluid" src="<?php echo $config_invoice_logo; ?>">
-        </div>
-        
-      </div>
-      
-      <hr>
-      
-      <button type="submit" name="edit_company_settings" class="btn btn-primary">Save</button>
-        
-    </form>
-  </div>
-</div>
-
-<?php include("footer.php");
\ No newline at end of file
diff --git a/settings-nav.php b/settings-nav.php
index 4bb9ec6d..4f74952b 100644
--- a/settings-nav.php
+++ b/settings-nav.php
@@ -8,14 +8,6 @@
     </a> 
   </li>
 
-  <li class="nav-item">
-    <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-company.php") { echo "active"; } ?>" 
-      href="settings-company.php">
-      <i class="fa fa-fw fa-2x fa-building"></i><br>
-      Company
-    </a> 
-  </li>
-
   <li class="nav-item">
     <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-mail.php") { echo "active"; } ?>" 
       href="settings-mail.php">
diff --git a/setup.php b/setup.php
index bc526227..1a39a65e 100644
--- a/setup.php
+++ b/setup.php
@@ -176,30 +176,40 @@ if(isset($_POST['add_company_settings'])){
   $row = mysqli_fetch_array($sql);
   $user_id = $row['user_id'];
 
-  $config_company_name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_name']));
-  $config_company_country = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_country']));
-  $config_company_address = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_address']));
-  $config_company_city = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_city']));
-  $config_company_state = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_state']));
-  $config_company_zip = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_zip']));
-  $config_company_phone = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_phone']));
-  $config_company_phone = preg_replace("/[^0-9]/", '',$config_company_phone);
-  $config_company_site = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_site']));
-  $config_api_key = keygen();
+  $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
+  $country = strip_tags(mysqli_real_escape_string($mysqli,$_POST['country']));
+  $address = strip_tags(mysqli_real_escape_string($mysqli,$_POST['address']));
+  $city = strip_tags(mysqli_real_escape_string($mysqli,$_POST['city']));
+  $state = strip_tags(mysqli_real_escape_string($mysqli,$_POST['state']));
+  $zip = strip_tags(mysqli_real_escape_string($mysqli,$_POST['zip']));
+  $phone = preg_replace("/[^0-9]/", '',$_POST['phone']);
+  $website = strip_tags(mysqli_real_escape_string($mysqli,$_POST['website']));
+  $email = strip_tags(mysqli_real_escape_string($mysqli,$_POST['email']));
 
-  mysqli_query($mysqli,"INSERT INTO companies SET company_name = '$config_company_name', company_created_at = NOW()");
+  mysqli_query($mysqli,"INSERT INTO companies SET company_name = '$name', company_address = '$address', company_city = '$city', company_state = '$state', company_zip = '$zip', company_country = '$country', company_phone = '$phone', company_email = '$email', company_website = '$website', company_logo = '$path', company_created_at = NOW()");
 
   $company_id = mysqli_insert_id($mysqli);
+  $config_api_key = keygen();
+  $config_base_url = $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']);
 
   mkdir("uploads/clients/$company_id");
   mkdir("uploads/expenses/$company_id");
   mkdir("uploads/settings/$company_id");
   mkdir("uploads/tmp/$company_id");
 
+  if($_FILES['file']['tmp_name']!='') {
+    $path = "uploads/settings/$company_id/";
+    $path = $path . time() . basename( $_FILES['file']['name']);
+    $file_name = basename($path);
+    move_uploaded_file($_FILES['file']['tmp_name'], $path);
+
+    mysqli_query($mysqli,"UPDATE companies SET company_logo = '$path' WHERE company_id = $company_id");
+  }
+
   //Create Permissions
   mysqli_query($mysqli,"INSERT INTO permissions SET permission_level = 5, permission_default_company = $company_id, permission_companies = $company_id, user_id = $user_id");
  
-  mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_company_name = '$config_company_name', config_company_country = '$config_company_country', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_phone = '$config_company_phone', config_company_site = '$config_company_site', config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_records_per_page = 10, config_send_invoice_reminders = 0, config_enable_cron = 0, config_ticket_next_number = 1");
+  mysqli_query($mysqli,"INSERT INTO settings SET company_id = $company_id, config_invoice_prefix = 'INV-', config_invoice_next_number = 1, config_invoice_overdue_reminders = '1,3,7', config_quote_prefix = 'QUO-', config_quote_next_number = 1, config_api_key = '$config_api_key', config_recurring_auto_send_invoice = 1, config_default_net_terms = 7, config_records_per_page = 10, config_send_invoice_reminders = 0, config_enable_cron = 0, config_ticket_next_number = 1, config_base_url = '$config_base_url'");
 
   //Create Some Data
 
@@ -464,13 +474,14 @@ if(isset($_POST['add_company_settings'])){
             </div>
             <div class="card-body">
               <form class="p-3" method="post"  autocomplete="off">
+                
                 <div class="form-group">
                   <label>Company Name</label>
                   <div class="input-group">
                     <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" autofocus required>  
+                    <input type="text" class="form-control" name="name" placeholder="Company Name" autofocus required>  
                   </div>
                 </div>
                 
@@ -480,7 +491,7 @@ if(isset($_POST['add_company_settings'])){
                     <div class="input-group-prepend">
                       <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
                     </div>
-                    <input type="text" class="form-control" name="config_company_address" placeholder="Street Address">
+                    <input type="text" class="form-control" name="address" placeholder="Street Address">
                   </div>
                 </div>
 
@@ -490,7 +501,7 @@ if(isset($_POST['add_company_settings'])){
                     <div class="input-group-prepend">
                       <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
                     </div>
-                    <input type="text" class="form-control" name="config_company_city" placeholder="City">
+                    <input type="text" class="form-control" name="city" placeholder="City">
                   </div>
                 </div>
 
@@ -500,7 +511,7 @@ if(isset($_POST['add_company_settings'])){
                     <div class="input-group-prepend">
                       <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
                     </div>
-                    <select class="form-control select2" name="config_company_state">
+                    <select class="form-control select2" name="state">
                       <option value="">Select a state...</option>
                         <?php foreach($states_array as $state_abbr => $state_name) { ?>
                         <option value="<?php echo $state_abbr; ?>"><?php echo $state_name; ?></option>
@@ -515,17 +526,7 @@ if(isset($_POST['add_company_settings'])){
                     <div class="input-group-prepend">
                       <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
                     </div>
-                    <input type="text" class="form-control" name="config_company_zip" placeholder="Postal Code">
-                  </div>
-                </div>
-
-                <div class="form-group">
-                  <label>Phone</label>
-                  <div class="input-group">
-                    <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                    </div>
-                    <input type="text" class="form-control" name="config_company_phone" placeholder="Phone Number" data-inputmask="'mask': '999-999-9999'"> 
+                    <input type="text" class="form-control" name="zip" placeholder="Postal Code">
                   </div>
                 </div>
 
@@ -544,15 +545,40 @@ if(isset($_POST['add_company_settings'])){
                   </div>
                 </div>
 
-                <div class="form-group mb-5">
+                <div class="form-group">
+                  <label>Phone</label>
+                  <div class="input-group">
+                    <div class="input-group-prepend">
+                      <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
+                    </div>
+                    <input type="text" class="form-control" name="phone" placeholder="Phone Number" data-inputmask="'mask': '999-999-9999'"> 
+                  </div>
+                </div>
+
+                <div class="form-group">
+                  <label>Email</label>
+                  <div class="input-group">
+                    <div class="input-group-prepend">
+                      <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
+                    </div>
+                    <input type="email" class="form-control" name="email" placeholder="Email address"> 
+                  </div>
+                </div>
+
+                <div class="form-group">
                   <label>Website</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="config_company_site" placeholder="Website address">
+                    <input type="text" class="form-control" name="website" placeholder="Website address">
                   </div>
                 </div>
+
+                <div class="form-group mb-5">
+                  <label>Logo</label>
+                  <input type="file" class="form-control-file" name="file">
+                </div>
                 
                 <hr>