diff --git a/edit_contact_modal.php b/edit_contact_modal.php
index e1fb742d..cb5c9fa2 100644
--- a/edit_contact_modal.php
+++ b/edit_contact_modal.php
@@ -9,6 +9,7 @@
       </div>
       <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
         <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
+        <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
         <input type="hidden" name="current_avatar_path" value="<?php echo $contact_photo; ?>">
         <div class="modal-body bg-white">    
           <center>
diff --git a/get_settings.php b/get_settings.php
index 1cc989f6..b4795826 100644
--- a/get_settings.php
+++ b/get_settings.php
@@ -27,6 +27,7 @@ $config_smtp_port = $row['config_smtp_port'];
 $config_mail_from_email = $row['config_mail_from_email'];
 $config_mail_from_name = $row['config_mail_from_name'];
 $config_account_balance_threshold = $row['config_account_balance_threshold'];
+$config_send_invoice_reminders = $row['config_send_invoice_reminders'];
 $config_invoice_overdue_reminders = $row['config_invoice_overdue_reminders'];
 $config_invoice_prefix = $row['config_invoice_prefix'];
 
diff --git a/post.php b/post.php
index d0c46146..ec9173ad 100644
--- a/post.php
+++ b/post.php
@@ -21,7 +21,19 @@ if(isset($_POST['edit_general_settings'])){
     $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']));
 
-    mysqli_query($mysqli,"UPDATE settings SET config_start_page = '$config_start_page', config_account_balance_threshold = '$config_account_balance_threshold', config_api_key = '$config_api_key'");
+    $path = "$config_invoice_logo";
+
+    if($_FILES['file']['tmp_name']!='') {
+        //delete old avatar file
+        unlink($path);
+        //Update with new path
+        $path = "uploads/settings/";
+        $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_start_page = '$config_start_page', config_account_balance_threshold = '$config_account_balance_threshold', config_invoice_logo = '$path', config_api_key = '$config_api_key'");
 
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 
@@ -66,27 +78,15 @@ if(isset($_POST['edit_invoice_settings'])){
     $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_quote_footer = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_quote_footer']));
+    $config_send_invoice_reminders = $_POST['config_send_invoice_reminders'];
+    if($config_send_invoice_reminders == 1){
+        $config_send_invoice_reminders = 1;
+    }else{
+        $config_send_invoice_reminders = 0;
+    }
     $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_next_invoice_number = $config_next_invoice_number, config_mail_from_email = '$config_mail_from_email', config_mail_from_name = '$config_mail_from_name', config_invoice_footer = '$config_invoice_footer', config_invoice_overdue_reminders = '$config_invoice_overdue_reminders', config_quote_footer = '$config_quote_footer'");
-
-    header("Location: " . $_SERVER["HTTP_REFERER"]);
-
-}
-
-if(isset($_POST['edit_logo_settings'])){
-
-    if($_FILES['file']['tmp_name']!='') {
-        $path = "uploads/settings";
-        $path = $path . basename( $_FILES['file']['name']);
-        $file_name = basename($path);
-        move_uploaded_file($_FILES['file']['tmp_name'], $path);
-        $ext = pathinfo($path);
-        $ext = $ext['extension'];
-
-        mysqli_query($mysqli,"UPDATE settings SET config_invoice_logo = '$path'");
-
-    } 
+    mysqli_query($mysqli,"UPDATE settings SET config_invoice_prefix = '$config_invoice_prefix', config_next_invoice_number = $config_next_invoice_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', config_quote_footer = '$config_quote_footer'");
 
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 
@@ -1238,7 +1238,7 @@ 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="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="35%" style="text-align: right;">Quote No.<br /><span style="font-weight: bold; font-size: 12pt;"> QUO-'.$quote_number.' </span></td>
     </tr></table>
@@ -2032,7 +2032,7 @@ 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="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="35%" style="text-align: right;">Invoice No.<br /><span style="font-weight: bold; font-size: 12pt;"> INV-'.$invoice_number.' </span></td>
         </tr></table>
@@ -2145,6 +2145,7 @@ if(isset($_POST['add_contact'])){
 if(isset($_POST['edit_contact'])){
 
     $contact_id = intval($_POST['contact_id']);
+    $client_id = intval($_POST['client_id']);
     $name = strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']));
     $title = strip_tags(mysqli_real_escape_string($mysqli,$_POST['title']));
     $phone = strip_tags(mysqli_real_escape_string($mysqli,$_POST['phone']));
diff --git a/settings-general.php b/settings-general.php
index 5665004a..912f0392 100644
--- a/settings-general.php
+++ b/settings-general.php
@@ -7,7 +7,7 @@
     <h6 class="float-left mt-1"><i class="fa fa-cog mr-2"></i>General Settings</h6>
   </div>
   <div class="card-body">
-    <form class="p-3" action="post.php" method="post" autocomplete="off">
+    <form class="p-3" action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
       <div class="form-group">
         <label>Starting Page</label>
         <div class="input-group">
@@ -35,7 +35,7 @@
         </div>
       </div>
 
-      <div class="form-group mb-5">
+      <div class="form-group">
         <label>API Key</label>
         <div class="input-group">
           <div class="input-group-prepend">
@@ -44,6 +44,13 @@
           <input type="text" class="form-control" name="config_api_key" placeholder="No spaces only numbers and letters" value="<?php echo $config_api_key; ?>">
         </div>
       </div>
+
+      <img class="img-fluid" src="<?php echo $config_invoice_logo; ?>">
+
+      <div class="form-group mb-5">
+        <label>Logo</label>
+        <input type="file" class="form-control-file" name="file">
+      </div>
       
       <hr>
       
diff --git a/settings-invoice.php b/settings-invoice.php
index 6f2293c9..70674dca 100644
--- a/settings-invoice.php
+++ b/settings-invoice.php
@@ -7,7 +7,7 @@
     <h6 class="float-left mt-1"><i class="fa fa-fw fa-file mr-2"></i>Invoice Settings</h6>
   </div>
   <div class="card-body">
-    <form class="p-3" action="post.php" method="post" autocomplete="off"> 
+    <form class="p-3" action="post.php" method="post" autocomplete="off">
       
       <div class="form-group">
         <label>Invoice Prefix</label>
@@ -19,7 +19,6 @@
         </div>
       </div>
 
-
       <div class="form-group">
         <label>Next Number</label>
         <div class="input-group">
@@ -30,6 +29,13 @@
         </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">
@@ -60,6 +66,8 @@
         </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-logo.php b/settings-logo.php
deleted file mode 100644
index 87c25817..00000000
--- a/settings-logo.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php include("header.php"); ?>
-
-<?php include("settings-nav.php"); ?>
-
-<div class="card mb-3">
-  <div class="card-header">
-    <h6 class="float-left mt-1"><i class="fa fa-fw fa-image mr-2"></i>Logo</h6>
-  </div>
-  <div class="card-body">
-    <form class="p-3" action="post.php" method="post" enctype="multipart/form-data" autocomplete="off"> 
-      
-      <img class="img-fluid" src="<?php echo $config_invoice_logo; ?>">
-
-      <div class="form-group mb-5">
-        <label>Logo</label>
-        <input type="file" class="form-control-file" name="file">
-      </div>
-      
-      <hr>
-      <button type="submit" name="edit_logo_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 c3d74fac..dffcb8da 100644
--- a/settings-nav.php
+++ b/settings-nav.php
@@ -39,14 +39,6 @@
       Invoice
     </a> 
   </li>
-
-  <li class="nav-item">
-    <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-logo.php") { echo "active"; } ?>" 
-      href="settings-logo.php">
-      <i class="fa fa-fw fa-2x fa-image"></i><br>
-      Logo
-    </a> 
-  </li>
  
   <li class="nav-item">
     <a class="nav-link <?php if(basename($_SERVER["REQUEST_URI"]) == "settings-backup.php") { echo "active"; } ?>" 
diff --git a/setup.php b/setup.php
index 1afa6047..ab48f895 100644
--- a/setup.php
+++ b/setup.php
@@ -198,7 +198,7 @@ if(isset($_POST['add_company_settings'])){
     
           <div class="card mb-3">
             <div class="card-header">
-              <h6 class="mt-1"><i class="fa fa-database"></i> Setup Database</h6>
+              <h6 class="mt-1"><i class="fa fa-fw fa-database"></i> Setup Database</h6>
             </div>
             <div class="card-body">
               <form class="p-3" method="post" autocomplete="off">
@@ -207,7 +207,7 @@ if(isset($_POST['add_company_settings'])){
                   <label>Database Name</label>
                   <div class="input-group">
                     <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-database"></i></span>
+                      <span class="input-group-text"><i class="fa fa-fw fa-database"></i></span>
                     </div>
                     <input type="text" class="form-control" name="database" placeholder="Name of the database" required>
                   </div>
@@ -217,7 +217,7 @@ if(isset($_POST['add_company_settings'])){
                   <label>Username</label>
                   <div class="input-group">
                     <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-user"></i></span>
+                      <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                     </div>
                     <input type="text" class="form-control" name="username" placeholder="Username to access the database" required>
                   </div>
@@ -227,7 +227,7 @@ if(isset($_POST['add_company_settings'])){
                   <label>Password</label>
                   <div class="input-group">
                     <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-lock"></i></span>
+                      <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                     </div>
                     <input type="password" class="form-control" name="password" placeholder="Enter the password" required>
                   </div>
@@ -237,7 +237,7 @@ if(isset($_POST['add_company_settings'])){
                   <label>Database Host</label>
                   <div class="input-group">
                     <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-server"></i></span>
+                      <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
                     </div>
                     <input type="text" class="form-control" name="host" placeholder="Usually localhost" required>
                   </div>
@@ -254,7 +254,7 @@ if(isset($_POST['add_company_settings'])){
 
           <div class="card mb-3">
             <div class="card-header">
-              <h6 class="mt-1"><i class="fa fa-user"></i> Create your first user</h6>
+              <h6 class="mt-1"><i class="fa fa-fw fa-user"></i> Create your first user</h6>
             </div>
             <div class="card-body">
         
@@ -263,7 +263,7 @@ if(isset($_POST['add_company_settings'])){
                   <label>Name</label>
                   <div class="input-group">
                     <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-user"></i></span>
+                      <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
                     </div>
                     <input type="text" class="form-control" name="name" placeholder="Full Name" required>
                   </div>
@@ -273,7 +273,7 @@ if(isset($_POST['add_company_settings'])){
                   <label>Email</label>
                   <div class="input-group">
                     <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-envelope"></i></span>
+                      <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" required>
                   </div>
@@ -283,7 +283,7 @@ if(isset($_POST['add_company_settings'])){
                   <label>Password</label>
                   <div class="input-group">
                     <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-lock"></i></span>
+                      <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                     </div>
                     <input type="password" class="form-control" name="password" placeholder="Enter a Password" required>
                   </div>
@@ -302,7 +302,7 @@ if(isset($_POST['add_company_settings'])){
 
           <div class="card mb-3">
             <div class="card-header">
-              <h6 class="mt-1"><i class="fa fa-building"></i> Company Settings</h6>
+              <h6 class="mt-1"><i class="fa fa-fw fa-building"></i> Company Settings</h6>
             </div>
             <div class="card-body">
               <form class="p-3" method="post"  autocomplete="off">
@@ -310,7 +310,7 @@ if(isset($_POST['add_company_settings'])){
                   <label>Company Name</label>
                   <div class="input-group">
                     <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-building"></i></span>
+                      <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" required>  
                   </div>
@@ -320,7 +320,7 @@ if(isset($_POST['add_company_settings'])){
                   <label>Address</label>
                   <div class="input-group">
                     <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-map-marker"></i></span>
+                      <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">
                   </div>
@@ -328,29 +328,44 @@ if(isset($_POST['add_company_settings'])){
 
                 <div class="form-group">
                   <label>City</label>
-                  <input type="text" class="form-control" name="config_company_city" placeholder="City">
+                  <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">
+                  </div>
                 </div>
 
                 <div class="form-group">
                   <label>State</label>
-                  <select class="form-control selectpicker show-tick" data-live-search="true" name="config_company_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>
-                      <?php } ?>
-                  </select>
+                  <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 selectpicker show-tick" data-live-search="true" name="config_company_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>
+                        <?php } ?>
+                    </select>
+                  </div>
                 </div>
 
                 <div class="form-group">
                   <label>Zip</label>
-                  <input type="text" class="form-control" name="config_company_zip" placeholder="Zip Code">
+                  <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="Zip 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-phone"></i></span>
+                      <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'"> 
                   </div>
@@ -360,7 +375,7 @@ if(isset($_POST['add_company_settings'])){
                   <label>Website</label>
                   <div class="input-group">
                     <div class="input-group-prepend">
-                      <span class="input-group-text"><i class="fa fa-globe"></i></span>
+                      <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://">
                   </div>
@@ -378,7 +393,7 @@ if(isset($_POST['add_company_settings'])){
 
           <div class="card mb-3">
             <div class="card-header">
-              <h6 class="mt-1"><i class="fa fa-download"></i> Start Install <?php echo $database; ?></h6>
+              <h6 class="mt-1"><i class="fa fa-fw fa-download"></i> Start Install <?php echo $database; ?></h6>
             </div>
             <div class="card-body">
               <p>Click on the install button to start the install process, you must create a database before proceeding</p>