diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 2feaa7073b..28b6730510 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -78,7 +78,7 @@ class SetupController extends Controller
         $db_database = $request->input('db_database');
         $db_username = $request->input('db_username');
         $db_password = $request->input('db_password');
-        $mail_port = $request->input('mail_port');
+        $mail_port = $request->input('mail_port',0);
         $encryption = $request->input('encryption');
         $mail_host = $request->input('mail_host');
         $mail_username = $request->input('mail_username');
diff --git a/resources/views/pdf-designs/calm.html b/resources/views/pdf-designs/calm.html
index a80a294857..fbd855aadb 100644
--- a/resources/views/pdf-designs/calm.html
+++ b/resources/views/pdf-designs/calm.html
@@ -56,7 +56,13 @@
         grid-template-areas: "a b c";
         grid-auto-columns: minmax(0, 5fr);
         grid-auto-flow: column;
-        justify-content: left;
+        justify-content: space-between;
+
+    }
+
+    .header-wrapper2 .entity-container {
+        justify-self: end;
+        align-self: start;
     }
 
     .company-logo {
@@ -95,7 +101,6 @@
     }
 
     .header-wrapper #entity-details {
-        padding-right: 0.5rem;
         text-align: left;
         line-height: var(--line-height);
         width: 100%;
@@ -112,6 +117,10 @@
         background-color: #e6e6e6;
     }
 
+    .entity-label {
+        padding-left: 1rem;
+    }
+    
     #entity-details {
         text-align: left;
         width: 100%;
@@ -120,7 +129,7 @@
     #entity-details th {
         font-weight: normal;
         line-height: 1.5rem;
-        padding-right: 2rem;
+        padding-left: 1rem;
     }
 
     #client-details {
@@ -404,7 +413,7 @@
                             <div id="client-details"></div>
                             <div id="vendor-details"></div>
                             <div id="shipping-details"></div>
-                            <div>
+                            <div class="entity-container">
                                 <p class="entity-label"
                                     style="font-size:32px; font-weight: bold; color:$primary_color;">$entity_label</p>
                                 <table id="entity-details" cellspacing="0" cellpadding="0" dir="ltr"></table>
diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html
index 43be53fa46..dde2c19325 100644
--- a/resources/views/pdf-designs/clean.html
+++ b/resources/views/pdf-designs/clean.html
@@ -93,7 +93,7 @@
     .client-and-entity-wrapper {
         padding: 1rem;
         display: grid;
-        grid-template-columns: 1fr auto 1fr;
+        grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr);
         align-items: start;
         border-top: 1px solid #d8d8d8;
         border-bottom: 1px solid #d8d8d8;
diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html
index 2517cd8aa2..fe24621331 100644
--- a/resources/views/pdf-designs/plain.html
+++ b/resources/views/pdf-designs/plain.html
@@ -73,7 +73,7 @@
         line-height: var(--line-height) !important;
         white-space: nowrap;
         border: 0px solid #000;
-       float:right;
+        float:right;
     }
 
     #entity-details>tr,
@@ -111,7 +111,6 @@
         min-width: 100%;
         table-layout: fixed;
         overflow-wrap: break-word;
-        margin-bottom: 5px;
     }
 
     .task-time-details {
@@ -146,7 +145,6 @@
         margin-top: 0rem;
         display: grid;
         grid-template-columns: 2fr 1fr;
-        padding-top: .5rem;
         margin-right: .75rem;
         gap: 80px;
         page-break-inside: auto;
@@ -241,54 +239,11 @@
 
     [data-ref='product_table-product.description-td'],
     [data-ref='task_table-task.description-th']{
-        min-width: 100px !important;
+        min-width: 150px !important;
         overflow-wrap: break-word;
     }
 
     
-    [data-ref='product_table-product.item-th'],
-    [data-ref='product_table-product.unit_cost-th'],
-    [data-ref='task_table-task.service-th'],
-    [data-ref='task_table-task.cost-th']{
-        width: 12%;
-    }
-
-    [data-ref='product_table-product.quantity-th'],
-    [data-ref='task_table-task.hours-th'],
-    [data-ref='task_table-task.quantity-th'],
-    [data-ref='product_table-product.product1-th'],
-    [data-ref='product_table-product.product2-th'],
-    [data-ref='product_table-product.product3-th'],
-    [data-ref='product_table-product.product4-th'] {
-        width: 10%;
-    }
-
-    [data-ref='product_table-product.tax1-th'] {
-        width: 6%;
-    }
-
-    [data-ref='product_table-product.line_total-th'],
-    [data-ref='product_table-product.line_total-td'],
-    [data-ref='task_table-task.line_total-th'],
-    [data-ref='task_table-task.line_total-td'] {
-        width: 12%;
-        text-align: right;
-    }
-
-    [data-ref='task_table-task.discount-th'],
-    [data-ref='task_table-task.task1-th'],
-    [data-ref='task_table-task.task2-th'],
-    [data-ref='task_table-task.task3-th'],
-    [data-ref='task_table-task.task4-th'] {
-        width: 10%;
-    }
-
-    
-    
-    [data-ref='task_table-task.tax1-th'] {
-        width: 10%;
-    }
-
     .stamp {
         transform: rotate(12deg);
         color: #555;
diff --git a/resources/views/pdf-designs/tech.html b/resources/views/pdf-designs/tech.html
index 8b2343c561..91b523abb2 100644
--- a/resources/views/pdf-designs/tech.html
+++ b/resources/views/pdf-designs/tech.html
@@ -279,7 +279,7 @@
 
     [data-ref='product_table-product.description-td'],
     [data-ref='task_table-task.description-td']{
-        min-width: 100px !important;
+        min-width: 150px !important;
         overflow-wrap: break-word;
     }
 
@@ -288,51 +288,6 @@
         width: 10%;
     }
 
-    [data-ref='product_table-product.unit_cost-th'],
-    [data-ref='task_table-task.cost-th'] {
-        width: 13%;
-    }
-
-    [data-ref='product_table-product.quantity-th'],
-    [data-ref='task_table-task.hours-th'],
-    [data-ref='product_table-product.product1-th'],
-    [data-ref='product_table-product.product2-th'],
-    [data-ref='product_table-product.product3-th'],
-    [data-ref='product_table-product.product4-th'] {
-        width: 8%;
-    }
-
-    [data-ref='product_table-product.tax1-th'] {
-        width: 6%;
-    }
-
-    [data-ref='product_table-product.line_total-th'],
-    [data-ref='product_table-product.line_total-td'] {
-        width: 13%;
-        text-align: right;
-    }
-
-    [data-ref='task_table-task.discount-th'],
-    [data-ref='task_table-task.quantity-th'],
-    [data-ref='task_table-task.task1-th'],
-    [data-ref='task_table-task.task2-th'],
-    [data-ref='task_table-task.task3-th'],
-    [data-ref='task_table-task.task4-th'] {
-        width: 10%;
-    }
-
-    
-    [data-ref='task_table-task.tax1-th'] {
-        width: 10%;
-    }
-
-    [data-ref='task_table-task.line_total-th'],
-    [data-ref='task_table-task.line_total-td'] {
-        width: 13%;
-        text-align: right !important;
-    }
-
-
     .stamp {
       transform: rotate(12deg);
         color: #555;
diff --git a/tests/Pdf/PdfServiceTest.php b/tests/Pdf/PdfServiceTest.php
index bf612e17fd..be422adc08 100644
--- a/tests/Pdf/PdfServiceTest.php
+++ b/tests/Pdf/PdfServiceTest.php
@@ -66,6 +66,7 @@ class PdfServiceTest extends TestCase
         $settings->use_credits_payment = 'always';
         $settings->timezone_id = '1';
         $settings->entity_send_time = 0;
+        $settings->hide_empty_columns_on_pdf = true;
 
         $company = Company::factory()->create([
             'account_id' => $this->account->id,
@@ -141,6 +142,7 @@ class PdfServiceTest extends TestCase
         $settings->use_credits_payment = 'always';
         $settings->timezone_id = '1';
         $settings->entity_send_time = 0;
+        $settings->hide_empty_columns_on_pdf = true;
 
         $company = Company::factory()->create([
             'account_id' => $this->account->id,