diff --git a/app/Export/CSV/QuoteItemExport.php b/app/Export/CSV/QuoteItemExport.php
index fb00ab918877..ad1ded90ca73 100644
--- a/app/Export/CSV/QuoteItemExport.php
+++ b/app/Export/CSV/QuoteItemExport.php
@@ -78,7 +78,7 @@ class QuoteItemExport extends BaseExport
         'tax_name2' => 'item.tax_name2',
         'tax_name3' => 'item.tax_name3',
         'line_total' => 'item.line_total',
-        'gross_line_total' => 'item.gross_line_total',
+        // 'gross_line_total' => 'item.gross_line_total',
         'custom_value1' => 'item.custom_value1',
         'custom_value2' => 'item.custom_value2',
         'custom_value3' => 'item.custom_value3',
diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php
index 55a98d42a5c6..4f14a006b04b 100644
--- a/app/Http/Controllers/SelfUpdateController.php
+++ b/app/Http/Controllers/SelfUpdateController.php
@@ -135,30 +135,30 @@ class SelfUpdateController extends BaseController
 
         nlog("Extracting zip");
 
-        try{
-            $s = new Snappdf;
-            $s->getChromiumPath();
-            chmod($this->generatePlatformExecutable($s->getChromiumPath()), 0755);
-        }
-        catch(\Exception $e){
-            nlog("I could not set the file permissions for chrome");
-        }
+        // try{
+        //     $s = new Snappdf;
+        //     $s->getChromiumPath();
+        //     chmod($this->generatePlatformExecutable($s->getChromiumPath()), 0755);
+        // }
+        // catch(\Exception $e){
+        //     nlog("I could not set the file permissions for chrome");
+        // }
 
-        // $zipFile = new \PhpZip\ZipFile();
+        $zipFile = new \PhpZip\ZipFile();
 
-        // $zipFile->openFile($file);
+        $zipFile->openFile($file);
 
-        // $zipFile->extractTo(base_path());
+        $zipFile->extractTo(base_path());
 
-        // $zipFile->close();
+        $zipFile->close();
 
-        $zip = new \ZipArchive;
+        // $zip = new \ZipArchive;
         
-        $res = $zip->open($file);
-        if ($res === TRUE) {
-            $zip->extractTo(base_path());
-            $zip->close();
-        } 
+        // $res = $zip->open($file);
+        // if ($res === TRUE) {
+        //     $zip->extractTo(base_path());
+        //     $zip->close();
+        // } 
 
         nlog("Finished extracting files");
 
diff --git a/app/Models/Client.php b/app/Models/Client.php
index 2a00e87ff2b7..7a4e00c1753b 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -666,8 +666,6 @@ class Client extends BaseModel implements HasLocalePreference
 
         $offset -= $timezone->utc_offset;
         $offset += ($entity_send_time * 3600);
-
-        nlog("offset = {$offset}");
         
         return $offset;
     }
diff --git a/resources/views/email/template/admin.blade.php b/resources/views/email/template/admin.blade.php
index 20c85757beeb..1012e5108674 100644
--- a/resources/views/email/template/admin.blade.php
+++ b/resources/views/email/template/admin.blade.php
@@ -117,13 +117,20 @@
                     </div>
                 </tr>
                 <tr>
-                    <td>
+                    <td align="center">
                         <div class="dark-bg"
                              style="background-color:#f9f9f9; border: 1px solid #c2c2c2; border-bottom: none; padding-bottom: 20px; border-top-left-radius: 3px; border-top-right-radius: 3px;">
-                            <img class="logo-light"
-                                 style="margin-top: 20px; max-width: 155px; display: block; margin-left: auto; margin-right: auto; "
-                                 src="{{ $logo ?? '' }}"
-                                 width="155" />
+    
+                            <!--[if gte mso 9]>
+                            <img src="{{ $logo ?? '' }}" alt="" width="155" border="0" align="middle" style="display:block;" />
+                            <div style="mso-hide:all;">
+                            <![endif]-->
+                            <img class="logo-light" src="{{ $logo ?? '' }}" alt="" style="margin-top: 20px;  max-width: 155px; display: block; margin-left: auto; margin-right: auto;"/>
+                            <!--[if gte mso 9]>
+                            </div>
+                            <![endif]-->
+
+
                         </div>
                     </td>
                 </tr>
diff --git a/resources/views/email/template/client.blade.php b/resources/views/email/template/client.blade.php
index 48d85088224d..4288ead2501c 100644
--- a/resources/views/email/template/client.blade.php
+++ b/resources/views/email/template/client.blade.php
@@ -94,19 +94,24 @@
                     <div style="text-align: center;margin-top: 25px; margin-bottom: 10px;"></div>
                 </tr>
                 <tr>
-                    <td>
+                    <td align="center" cellpadding="20">
                         <div
                             style="border: 1px solid #c2c2c2; border-bottom: none; padding-bottom: 10px; border-top-left-radius: 3px; border-top-right-radius: 3px;">
 
-                            <img
-                                style="margin-top: 40px; height: 40px; display: block; margin-left: auto; margin-right: auto;"
-                                alt=""
-                                src="{{ $logo ?? '' }}"/>
+                            <!--[if gte mso 9]>
+                            <img src="{{ $logo ?? '' }}" alt="" width="400" border="0" align="middle" style="display:block;" />
+                            <div style="mso-hide:all;">
+                            <![endif]-->
+                            <img src="{{ $logo ?? '' }}" alt="" style="margin-top: 40px; display: block; margin-left: auto; margin-right: auto;"/>
+                            <!--[if gte mso 9]>
+                            </div>
+                            <![endif]-->
+
                         </div>
                     </td>
                 </tr>
                 <tr>
-                    <td>
+                    <td cellpadding="20">
                         <div style="border: 1px solid #c2c2c2; border-top: none; border-bottom: none; padding: 20px; text-align: center" id="content">
                                 <div style="padding-top: 10px;"></div>
 
@@ -120,10 +125,16 @@
                                 </div>
                            </div>
                     </td>
+                </tr>  
+                
+                <tr>
+                  <td height="20">
+                   <div style="border: 1px solid #c2c2c2; border-top: none; border-bottom: none; padding: 20px; text-align: center" id="content"> </div>
+                 </td>
                 </tr>
 
                 <tr>
-                    <td>
+                    <td cellpadding="20" bgcolor="#f9f9f9">
                         <div class="dark-bg dark-text-white"
                              style="text-align: center; padding-top: 10px; padding-bottom: 25px; background-color: #f9f9f9; border: 1px solid #c2c2c2; border-top: none; border-bottom-color: #f9f9f9;">
                             @isset($signature)
@@ -145,7 +156,7 @@
                 </tr>
 
                 <tr>
-                    <td>
+                    <td bgcolor="#242424"  cellpadding="20">
                         <div class="dark-bg-base"
                              style="padding-top: 10px;padding-bottom: 10px; background-color: #242424; border: 1px solid #c2c2c2; border-top-color: #242424; border-bottom-color: #242424;">
                             @if(isset($company))