diff --git a/guest/guest_view_invoice.php b/guest/guest_view_invoice.php
index 45d6e8f1..175cef38 100644
--- a/guest/guest_view_invoice.php
+++ b/guest/guest_view_invoice.php
@@ -159,193 +159,193 @@ if ($balance > 0) {
 
 ?>
 
-    <div class="card">
-        <div class="card-header bg-light d-print-none">
-            <div class="row">
-                <div class="col-6">
-                    <h4 class="mt-1">Account Balance: <b><?php echo numfmt_format_currency($currency_format, $account_balance, $invoice_currency_code); ?></b></h4>
-                </div>
-                <div class="col-6">
-                    <div class="float-right">
-                        <a class="btn btn-default" href="#" onclick="window.print();"><i class="fas fa-fw fa-print mr-2"></i>Print</a>
-                        <a class="btn btn-default" href="guest_post.php?export_invoice_pdf=<?php echo $invoice_id; ?>&url_key=<?php echo $url_key; ?>">
-                            <i class="fa fa-fw fa-download mr-2"></i>Download
-                        </a>
-                        <?php
-                        if ($invoice_status !== "Paid" && $invoice_status  !== "Cancelled" && $invoice_status !== "Draft" && $config_stripe_enable == 1) { ?>
-                            <a class="btn btn-success" href="guest_pay_invoice_stripe.php?invoice_id=<?php echo $invoice_id; ?>&url_key=<?php echo $url_key; ?>"><i class="fa fa-fw fa-credit-card mr-2"></i>Pay Now </a>
-                        <?php } ?>
-                    </div>
-                </div>
+<div class="card">
+    <div class="card-header bg-light d-print-none">
+        <div class="row">
+            <div class="col-6">
+                <h4 class="mt-1">Account Balance: <b><?php echo numfmt_format_currency($currency_format, $account_balance, $invoice_currency_code); ?></b></h4>
             </div>
-        </div>
-        <div class="card-body">
-
-            <div class="row mb-3">
-                <?php if (file_exists("../uploads/settings/$company_logo")) { ?>
-                <div class="col-sm-2">
-                    <img class="img-fluid" src="<?php echo "../uploads/settings/$company_logo"; ?>" alt="Company logo">
-                </div>
-                <?php } ?>
-                <div class="col-sm-6 <?php if (!file_exists("../uploads/settings/$company_logo")) { echo "col-sm-8"; } ?>">
-                    <ul class="list-unstyled">
-                        <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, $company_country"; ?></li>
-                        <li><?php echo "$company_email | $company_phone"; ?></li>
-                        <li><?php echo $company_website; ?></li>
-                        <?php if ($company_tax_id_display) { ?>
-                        <li><?php echo $company_tax_id_display; ?></li>
-                        <?php } ?>
-                    </ul>
-                </div>
-
-                <div class="col-sm-4">
-                    <h3 class="text-right"><strong>INVOICE</strong></h3>
-                    <h5 class="badge badge-<?php echo $invoice_badge_color; ?> p-2 float-right">
-                        <?php echo "$invoice_status"; ?>
-                    </h5>
-                    <table class="table table-sm table-borderless">
-                        <tr>
-                            <th>Invoice #:</th>
-                            <td class="text-right"><?php echo "$invoice_prefix$invoice_number"; ?></td>
-                        </tr>
-                        <tr>
-                            <th>Date:</th>
-                            <td class="text-right"><?php echo $invoice_date; ?></td>
-                        </tr>
-                        <tr>
-                            <th>Due:</th>
-                            <td class="text-right"><?php echo $invoice_due; ?></td>
-                        </tr>
-                    </table>
-                </div>
-
-            </div>
-            <div class="row mb-3 bg-light p-3">
-                <div class="col">
-                    <h6><strong>Bill To:</strong></h6>
-                    <ul class="list-unstyled mb-0">
-                        <li><?php echo $client_name; ?></li>
-                        <li><?php echo $location_address; ?></li>
-                        <li><?php echo "$location_city $location_state $location_zip, $location_country"; ?></li>
-                        <li><?php echo "$contact_email | $contact_phone $contact_extension"; ?></li>
-                    </ul>
-                </div>
-            </div>
-
-            <div class="row mb-3">
-                <div class="col-md-12">
-                    <div class="card">
-                        <div class="table-responsive">
-                            <table class="table table-borderless">
-                                <thead class="bg-light">
-                                <tr>
-                                    <th>Item</th>
-                                    <th>Description</th>
-                                    <th class="text-center">Qty</th>
-                                    <th class="text-right">Unit Price</th>
-                                    <th class="text-right">Tax</th>
-                                    <th class="text-right">Amount</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <?php
-
-                                $total_tax = 0.00;
-                                $sub_total = 0.00 - $invoice_discount;
-
-                                while ($row = mysqli_fetch_array($sql_invoice_items)) {
-                                    $item_id = intval($row['item_id']);
-                                    $item_name = nullable_htmlentities($row['item_name']);
-                                    $item_description = nullable_htmlentities($row['item_description']);
-                                    $item_quantity = floatval($row['item_quantity']);
-                                    $item_price = floatval($row['item_price']);
-                                    $item_tax = floatval($row['item_tax']);
-                                    $item_total = floatval($row['item_total']);
-                                    $total_tax = $item_tax + $total_tax;
-                                    $sub_total = $item_price * $item_quantity + $sub_total;
-
-                                    ?>
-
-                                    <tr>
-                                        <td><?php echo $item_name; ?></td>
-                                        <td><?php echo nl2br($item_description); ?></td>
-                                        <td class="text-center"><?php echo $item_quantity; ?></td>
-                                        <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_price, $invoice_currency_code); ?></td>
-                                        <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_tax, $invoice_currency_code); ?></td>
-                                        <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_total, $invoice_currency_code); ?></td>
-                                    </tr>
-
-                                <?php } ?>
-
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="row mb-3">
-                <div class="col-sm-7">
-                    <?php if (!empty($invoice_note)) { ?>
-                        <div class="card">
-                            <div class="card-body">
-                                <?php echo nl2br($invoice_note); ?>
-                            </div>
-                        </div>
+            <div class="col-6">
+                <div class="float-right">
+                    <a class="btn btn-default" href="#" onclick="window.print();"><i class="fas fa-fw fa-print mr-2"></i>Print</a>
+                    <a class="btn btn-default" href="guest_post.php?export_invoice_pdf=<?php echo $invoice_id; ?>&url_key=<?php echo $url_key; ?>">
+                        <i class="fa fa-fw fa-download mr-2"></i>Download
+                    </a>
+                    <?php
+                    if ($invoice_status !== "Paid" && $invoice_status  !== "Cancelled" && $invoice_status !== "Draft" && $config_stripe_enable == 1) { ?>
+                        <a class="btn btn-success" href="guest_pay_invoice_stripe.php?invoice_id=<?php echo $invoice_id; ?>&url_key=<?php echo $url_key; ?>"><i class="fa fa-fw fa-credit-card mr-2"></i>Pay Now </a>
                     <?php } ?>
                 </div>
-                <div class="col-sm-3 offset-sm-2">
-                    <table class="table table-borderless">
-                        <tbody>
-                        <tr>
-                            <td>Subtotal:</td>
-                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $sub_total, $invoice_currency_code); ?></td>
-                        </tr>
-                        <?php
-                        if ($invoice_discount > 0) {
-                            ?>
-                            <tr>
-                                <td>Discount:</td>
-                                <td class="text-right">-<?php echo numfmt_format_currency($currency_format, $invoice_discount, $invoice_currency_code); ?></td>
-                            </tr>
-                        <?php
-                        }
-                        ?>
-                        <?php if ($total_tax > 0) { ?>
-                            <tr>
-                                <td>Tax:</td>
-                                <td class="text-right"><?php echo numfmt_format_currency($currency_format, $total_tax, $invoice_currency_code); ?></td>
-                            </tr>
-                        <?php } ?>
-                        <tr>
-                            <td>Total:</td>
-                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
-                        </tr>
-                        <?php if ($amount_paid > 0) { ?>
-                            <tr>
-                                <td><div class="text-success">Paid:</div></td>
-                                <td class="text-right text-success"><?php echo numfmt_format_currency($currency_format, $amount_paid, $invoice_currency_code); ?></td>
-                            </tr>
-                        <?php
-                        } 
-                        ?>
-                        <tr class="border-top h5 text-bold">
-                            <td>Balance:</td>
-                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $balance, $invoice_currency_code); ?></td>
-                        </tr>
-
-                        </tbody>
-                    </table>
-                </div>
             </div>
-
-            <hr class="mt-5">
-
-            <div class="text-center text-secondary"><?php echo nl2br($config_invoice_footer); ?></div>
         </div>
     </div>
+    <div class="card-body">
+
+        <div class="row mb-3">
+            <?php if (file_exists("../uploads/settings/$company_logo")) { ?>
+            <div class="col-sm-2">
+                <img class="img-fluid" src="<?php echo "../uploads/settings/$company_logo"; ?>" alt="Company logo">
+            </div>
+            <?php } ?>
+            <div class="col-sm-6 <?php if (!file_exists("../uploads/settings/$company_logo")) { echo "col-sm-8"; } ?>">
+                <ul class="list-unstyled">
+                    <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, $company_country"; ?></li>
+                    <li><?php echo "$company_email | $company_phone"; ?></li>
+                    <li><?php echo $company_website; ?></li>
+                    <?php if ($company_tax_id_display) { ?>
+                    <li><?php echo $company_tax_id_display; ?></li>
+                    <?php } ?>
+                </ul>
+            </div>
+
+            <div class="col-sm-4">
+                <h3 class="text-right"><strong>INVOICE</strong></h3>
+                <h5 class="badge badge-<?php echo $invoice_badge_color; ?> p-2 float-right">
+                    <?php echo "$invoice_status"; ?>
+                </h5>
+                <table class="table table-sm table-borderless">
+                    <tr>
+                        <th>Invoice #:</th>
+                        <td class="text-right"><?php echo "$invoice_prefix$invoice_number"; ?></td>
+                    </tr>
+                    <tr>
+                        <th>Date:</th>
+                        <td class="text-right"><?php echo $invoice_date; ?></td>
+                    </tr>
+                    <tr>
+                        <th>Due:</th>
+                        <td class="text-right"><?php echo $invoice_due; ?></td>
+                    </tr>
+                </table>
+            </div>
+
+        </div>
+        <div class="row mb-3 bg-light p-3">
+            <div class="col">
+                <h6><strong>Bill To:</strong></h6>
+                <ul class="list-unstyled mb-0">
+                    <li><?php echo $client_name; ?></li>
+                    <li><?php echo $location_address; ?></li>
+                    <li><?php echo "$location_city $location_state $location_zip, $location_country"; ?></li>
+                    <li><?php echo "$contact_email | $contact_phone $contact_extension"; ?></li>
+                </ul>
+            </div>
+        </div>
+
+        <div class="row mb-3">
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="table-responsive">
+                        <table class="table table-borderless">
+                            <thead class="bg-light">
+                            <tr>
+                                <th>Item</th>
+                                <th>Description</th>
+                                <th class="text-center">Qty</th>
+                                <th class="text-right">Unit Price</th>
+                                <th class="text-right">Tax</th>
+                                <th class="text-right">Amount</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <?php
+
+                            $total_tax = 0.00;
+                            $sub_total = 0.00 - $invoice_discount;
+
+                            while ($row = mysqli_fetch_array($sql_invoice_items)) {
+                                $item_id = intval($row['item_id']);
+                                $item_name = nullable_htmlentities($row['item_name']);
+                                $item_description = nullable_htmlentities($row['item_description']);
+                                $item_quantity = floatval($row['item_quantity']);
+                                $item_price = floatval($row['item_price']);
+                                $item_tax = floatval($row['item_tax']);
+                                $item_total = floatval($row['item_total']);
+                                $total_tax = $item_tax + $total_tax;
+                                $sub_total = $item_price * $item_quantity + $sub_total;
+
+                                ?>
+
+                                <tr>
+                                    <td><?php echo $item_name; ?></td>
+                                    <td><?php echo nl2br($item_description); ?></td>
+                                    <td class="text-center"><?php echo $item_quantity; ?></td>
+                                    <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_price, $invoice_currency_code); ?></td>
+                                    <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_tax, $invoice_currency_code); ?></td>
+                                    <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_total, $invoice_currency_code); ?></td>
+                                </tr>
+
+                            <?php } ?>
+
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="row mb-3">
+            <div class="col-sm-7">
+                <?php if (!empty($invoice_note)) { ?>
+                    <div class="card">
+                        <div class="card-body">
+                            <?php echo nl2br($invoice_note); ?>
+                        </div>
+                    </div>
+                <?php } ?>
+            </div>
+            <div class="col-sm-3 offset-sm-2">
+                <table class="table table-borderless">
+                    <tbody>
+                    <tr>
+                        <td>Subtotal:</td>
+                        <td class="text-right"><?php echo numfmt_format_currency($currency_format, $sub_total, $invoice_currency_code); ?></td>
+                    </tr>
+                    <?php
+                    if ($invoice_discount > 0) {
+                        ?>
+                        <tr>
+                            <td>Discount:</td>
+                            <td class="text-right">-<?php echo numfmt_format_currency($currency_format, $invoice_discount, $invoice_currency_code); ?></td>
+                        </tr>
+                    <?php
+                    }
+                    ?>
+                    <?php if ($total_tax > 0) { ?>
+                        <tr>
+                            <td>Tax:</td>
+                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $total_tax, $invoice_currency_code); ?></td>
+                        </tr>
+                    <?php } ?>
+                    <tr>
+                        <td>Total:</td>
+                        <td class="text-right"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
+                    </tr>
+                    <?php if ($amount_paid > 0) { ?>
+                        <tr>
+                            <td><div class="text-success">Paid:</div></td>
+                            <td class="text-right text-success"><?php echo numfmt_format_currency($currency_format, $amount_paid, $invoice_currency_code); ?></td>
+                        </tr>
+                    <?php
+                    } 
+                    ?>
+                    <tr class="border-top h5 text-bold">
+                        <td>Balance:</td>
+                        <td class="text-right"><?php echo numfmt_format_currency($currency_format, $balance, $invoice_currency_code); ?></td>
+                    </tr>
+
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
+        <hr class="mt-5">
+
+        <div class="text-center text-secondary"><?php echo nl2br($config_invoice_footer); ?></div>
+    </div>
+</div>
 
 <?php
 
@@ -357,51 +357,52 @@ $current_invoices_count = mysqli_num_rows($sql_current_invoices);
 
 if ($current_invoices_count > 0) { ?>
 
-    <div class="card d-print-none card-dark">
-        <div class="card-header">
-            <strong><i class="fas fa-fw fa-clock mr-2"></i><b><?php echo $current_invoices_count; ?></b> Current Invoices</strong>
-        </div>
-        <div card="card-body">
-            <table class="table table-sm">
-                <thead>
-                <tr>
-                    <th class="text-center">Invoice</th>
-                    <th>Date</th>
-                    <th>Due</th>
-                    <th class="text-right">Amount</th>
-                </tr>
-                </thead>
-                <tbody>
-                <?php
-
-                while ($row = mysqli_fetch_array($sql_current_invoices)) {
-                    $invoice_id = intval($row['invoice_id']);
-                    $invoice_prefix = nullable_htmlentities($row['invoice_prefix']);
-                    $invoice_number = intval($row['invoice_number']);
-                    $invoice_date = nullable_htmlentities($row['invoice_date']);
-                    $invoice_due = nullable_htmlentities($row['invoice_due']);
-                    $invoice_amount = floatval($row['invoice_amount']);
-                    $invoice_currency_code = nullable_htmlentities($row['invoice_currency_code']);
-                    $invoice_url_key = nullable_htmlentities($row['invoice_url_key']);
-                    $invoice_tally_total = $invoice_amount + $invoice_tally_total;
-                    $difference = strtotime($invoice_due) - time();
-                    $days = floor($difference / (60*60*24));
-
-                    ?>
-
-                    <tr <?php if ($_GET['invoice_id'] == $invoice_id) { echo "class='table-primary'"; } ?>>
-                        <th class="text-center"><a href="guest_view_invoice.php?invoice_id=<?php echo $invoice_id; ?>&url_key=<?php echo $invoice_url_key; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></th>
-                        <td><?php echo $invoice_date; ?></td>
-                        <td><?php echo $invoice_due; ?> (Due in <?php echo $days; ?> Days)</td>
-                        <td class="text-right text-bold"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
-                    </tr>
-
-                <?php } ?>
-
-                </tbody>
-            </table>
-        </div>
+<div class="card d-print-none card-dark">
+    <div class="card-header">
+        <strong><i class="fas fa-fw fa-clock mr-2"></i><b><?php echo $current_invoices_count; ?></b> Current Invoices</strong>
     </div>
+    <div card="card-body">
+        <table class="table table-sm">
+            <thead>
+            <tr>
+                <th class="text-center">Invoice</th>
+                <th>Date</th>
+                <th>Due</th>
+                <th class="text-right">Amount</th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php
+
+            while ($row = mysqli_fetch_array($sql_current_invoices)) {
+                $invoice_id = intval($row['invoice_id']);
+                $invoice_prefix = nullable_htmlentities($row['invoice_prefix']);
+                $invoice_number = intval($row['invoice_number']);
+                $invoice_date = nullable_htmlentities($row['invoice_date']);
+                $invoice_due = nullable_htmlentities($row['invoice_due']);
+                $invoice_amount = floatval($row['invoice_amount']);
+                $invoice_currency_code = nullable_htmlentities($row['invoice_currency_code']);
+                $invoice_url_key = nullable_htmlentities($row['invoice_url_key']);
+                $invoice_tally_total = $invoice_amount + $invoice_tally_total;
+                $difference = strtotime($invoice_due) - time();
+                $days = floor($difference / (60*60*24));
+
+                ?>
+
+                <tr <?php if ($_GET['invoice_id'] == $invoice_id) { echo "class='table-primary'"; } ?>>
+                    <th class="text-center"><a href="guest_view_invoice.php?invoice_id=<?php echo $invoice_id; ?>&url_key=<?php echo $invoice_url_key; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></th>
+                    <td><?php echo $invoice_date; ?></td>
+                    <td><?php echo $invoice_due; ?> (Due in <?php echo $days; ?> Days)</td>
+                    <td class="text-right text-bold"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
+                </tr>
+
+            <?php } ?>
+
+            </tbody>
+        </table>
+    </div>
+</div>
+
 <?php
 
 }
@@ -418,53 +419,53 @@ $outstanding_invoices_count = mysqli_num_rows($sql_outstanding_invoices);
 
 if ($outstanding_invoices_count > 0) { ?>
 
-    <div class="card d-print-none card-danger">
-        <div class="card-header">
-            <strong><i class="fa fa-fw fa-exclamation-triangle mr-2"></i><b><?php echo $outstanding_invoices_count; ?></b> Outstanding Invoices</strong>
-        </div>
-        <div card="card-body">
-            <table class="table table-sm">
-                <thead>
-                <tr>
-                    <th class="text-center">Invoice</th>
-                    <th>Date</th>
-                    <th>Due</th>
-                    <th class="text-right">Amount</th>
-                </tr>
-                </thead>
-                <tbody>
-                <?php
+<div class="card d-print-none card-danger">
+    <div class="card-header">
+        <strong><i class="fa fa-fw fa-exclamation-triangle mr-2"></i><b><?php echo $outstanding_invoices_count; ?></b> Outstanding Invoices</strong>
+    </div>
+    <div card="card-body">
+        <table class="table table-sm">
+            <thead>
+            <tr>
+                <th class="text-center">Invoice</th>
+                <th>Date</th>
+                <th>Due</th>
+                <th class="text-right">Amount</th>
+            </tr>
+            </thead>
+            <tbody>
+            <?php
 
-                while ($row = mysqli_fetch_array($sql_outstanding_invoices)) {
-                    $invoice_id = intval($row['invoice_id']);
-                    $invoice_prefix = nullable_htmlentities($row['invoice_prefix']);
-                    $invoice_number = intval($row['invoice_number']);
-                    $invoice_date = nullable_htmlentities($row['invoice_date']);
-                    $invoice_due = nullable_htmlentities($row['invoice_due']);
-                    $invoice_amount = floatval($row['invoice_amount']);
-                    $invoice_currency_code = nullable_htmlentities($row['invoice_currency_code']);
-                    $invoice_url_key = nullable_htmlentities($row['invoice_url_key']);
-                    $invoice_tally_total = $invoice_amount + $invoice_tally_total;
-                    $difference = time() - strtotime($invoice_due);
-                    $days = floor($difference / (60*60*24));
+            while ($row = mysqli_fetch_array($sql_outstanding_invoices)) {
+                $invoice_id = intval($row['invoice_id']);
+                $invoice_prefix = nullable_htmlentities($row['invoice_prefix']);
+                $invoice_number = intval($row['invoice_number']);
+                $invoice_date = nullable_htmlentities($row['invoice_date']);
+                $invoice_due = nullable_htmlentities($row['invoice_due']);
+                $invoice_amount = floatval($row['invoice_amount']);
+                $invoice_currency_code = nullable_htmlentities($row['invoice_currency_code']);
+                $invoice_url_key = nullable_htmlentities($row['invoice_url_key']);
+                $invoice_tally_total = $invoice_amount + $invoice_tally_total;
+                $difference = time() - strtotime($invoice_due);
+                $days = floor($difference / (60*60*24));
 
-                    ?>
-
-                    <tr <?php if ($_GET['invoice_id'] == $invoice_id) { echo "class='table-primary'"; } ?>>
-                        <th class="text-center"><a href="guest_view_invoice.php?invoice_id=<?php echo $invoice_id; ?>&url_key=<?php echo $invoice_url_key; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></th>
-                        <td><?php echo $invoice_date; ?></td>
-                        <td class="text-danger"><?php echo $invoice_due; ?> (Over Due by <?php echo $days; ?> Days)</td>
-                        <td class="text-right text-bold"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
-                    </tr>
-
-                    <?php
-                }
                 ?>
 
-                </tbody>
-            </table>
-        </div>
+                <tr <?php if ($_GET['invoice_id'] == $invoice_id) { echo "class='table-primary'"; } ?>>
+                    <th class="text-center"><a href="guest_view_invoice.php?invoice_id=<?php echo $invoice_id; ?>&url_key=<?php echo $invoice_url_key; ?>"><?php echo "$invoice_prefix$invoice_number"; ?></a></th>
+                    <td><?php echo $invoice_date; ?></td>
+                    <td class="text-danger"><?php echo $invoice_due; ?> (Over Due by <?php echo $days; ?> Days)</td>
+                    <td class="text-right text-bold"><?php echo numfmt_format_currency($currency_format, $invoice_amount, $invoice_currency_code); ?></td>
+                </tr>
+
+                <?php
+            }
+            ?>
+
+            </tbody>
+        </table>
     </div>
+</div>
 
 <?php } // End previous unpaid invoices
 
diff --git a/guest/guest_view_quote.php b/guest/guest_view_quote.php
index f09c7067..19eb9f3c 100644
--- a/guest/guest_view_quote.php
+++ b/guest/guest_view_quote.php
@@ -117,187 +117,187 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
 
 ?>
 
-    <div class="card">
+<div class="card">
 
-        <div class="card-header d-print-none">
+    <div class="card-header d-print-none">
 
-            <div class="float-right">
-                <a class="btn btn-primary" href="#" onclick="window.print();"><i class="fas fa-fw fa-print mr-2"></i>Print</a>
-                <a class="btn btn-primary" href="guest_post.php?export_quote_pdf=<?php echo $quote_id; ?>&url_key=<?php echo $url_key; ?>">
-                    <i class="fa fa-fw fa-download mr-2"></i>Download
-                </a>
+        <div class="float-right">
+            <a class="btn btn-primary" href="#" onclick="window.print();"><i class="fas fa-fw fa-print mr-2"></i>Print</a>
+            <a class="btn btn-primary" href="guest_post.php?export_quote_pdf=<?php echo $quote_id; ?>&url_key=<?php echo $url_key; ?>">
+                <i class="fa fa-fw fa-download mr-2"></i>Download
+            </a>
+        </div>
+    </div>
+    <div class="card-body">
+
+        <div class="row mb-3">
+            <?php if (file_exists("../uploads/settings/$company_logo")) { ?>
+            <div class="col-sm-2">
+                <img class="img-fluid" src="<?php echo "../uploads/settings/$company_logo"; ?>" alt="Company logo">
+            </div>
+            <?php } ?>
+            <div class="col-sm-6 <?php if (!file_exists("../uploads/settings/$company_logo")) { echo "col-sm-8"; } ?>">
+                <ul class="list-unstyled">
+                    <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, $company_country"; ?></li>
+                    <li><?php echo "$company_email | $company_phone"; ?></li>
+                    <li><?php echo $company_website; ?></li>
+                </ul>
+            </div>
+
+            <div class="col-sm-4">
+                <h3 class="text-right"><strong>QUOTE</strong></h3>
+                <h5 class="badge badge-<?php echo $quote_badge_color; ?> p-2 float-right">
+                    <?php echo "$quote_status"; ?>
+                </h5>
+                <table class="table table-sm table-borderless">
+                    <tr>
+                        <th>Quote #:</th>
+                        <td class="text-right"><?php echo "$quote_prefix$quote_number"; ?></td>
+                    </tr>
+                    <tr>
+                        <th>Date:</th>
+                        <td class="text-right"><?php echo $quote_date; ?></td>
+                    </tr>
+                    <tr>
+                        <th>Expires:</th>
+                        <td class="text-right"><?php echo $quote_expire; ?></td>
+                    </tr>
+                </table>
+            </div>
+
+        </div>
+        <div class="row mb-3 bg-light p-3">
+            <div class="col">
+                <h6><strong>To:</strong></h6>
+                <ul class="list-unstyled mb-0">
+                    <li><?php echo $client_name; ?></li>
+                    <li><?php echo $location_address; ?></li>
+                    <li><?php echo "$location_city $location_state $location_zip, $location_country"; ?></li>
+                    <li><?php echo "$contact_email | $contact_phone $contact_extension"; ?></li>
+                </ul>
             </div>
         </div>
-        <div class="card-body">
 
-            <div class="row mb-3">
-                <?php if (file_exists("../uploads/settings/$company_logo")) { ?>
-                <div class="col-sm-2">
-                    <img class="img-fluid" src="<?php echo "../uploads/settings/$company_logo"; ?>" alt="Company logo">
-                </div>
-                <?php } ?>
-                <div class="col-sm-6 <?php if (!file_exists("../uploads/settings/$company_logo")) { echo "col-sm-8"; } ?>">
-                    <ul class="list-unstyled">
-                        <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, $company_country"; ?></li>
-                        <li><?php echo "$company_email | $company_phone"; ?></li>
-                        <li><?php echo $company_website; ?></li>
-                    </ul>
-                </div>
+        <?php $sql_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_order ASC"); ?>
 
-                <div class="col-sm-4">
-                    <h3 class="text-right"><strong>QUOTE</strong></h3>
-                    <h5 class="badge badge-<?php echo $quote_badge_color; ?> p-2 float-right">
-                        <?php echo "$quote_status"; ?>
-                    </h5>
-                    <table class="table table-sm table-borderless">
-                        <tr>
-                            <th>Quote #:</th>
-                            <td class="text-right"><?php echo "$quote_prefix$quote_number"; ?></td>
-                        </tr>
-                        <tr>
-                            <th>Date:</th>
-                            <td class="text-right"><?php echo $quote_date; ?></td>
-                        </tr>
-                        <tr>
-                            <th>Expires:</th>
-                            <td class="text-right"><?php echo $quote_expire; ?></td>
-                        </tr>
-                    </table>
-                </div>
+        <div class="row mb-3">
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="table-responsive">
+                        <table class="table table-borderless">
+                            <thead class="bg-light">
+                            <tr>
+                                <th>Item</th>
+                                <th>Description</th>
+                                <th class="text-center">Qty</th>
+                                <th class="text-right">Unit Price</th>
+                                <th class="text-right">Tax</th>
+                                <th class="text-right">Amount</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <?php
 
-            </div>
-            <div class="row mb-3 bg-light p-3">
-                <div class="col">
-                    <h6><strong>To:</strong></h6>
-                    <ul class="list-unstyled mb-0">
-                        <li><?php echo $client_name; ?></li>
-                        <li><?php echo $location_address; ?></li>
-                        <li><?php echo "$location_city $location_state $location_zip, $location_country"; ?></li>
-                        <li><?php echo "$contact_email | $contact_phone $contact_extension"; ?></li>
-                    </ul>
-                </div>
-            </div>
+                            $total_tax = $sub_total = 0; // Default 0
 
-            <?php $sql_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE item_quote_id = $quote_id ORDER BY item_order ASC"); ?>
-
-            <div class="row mb-3">
-                <div class="col-md-12">
-                    <div class="card">
-                        <div class="table-responsive">
-                            <table class="table table-borderless">
-                                <thead class="bg-light">
-                                <tr>
-                                    <th>Item</th>
-                                    <th>Description</th>
-                                    <th class="text-center">Qty</th>
-                                    <th class="text-right">Unit Price</th>
-                                    <th class="text-right">Tax</th>
-                                    <th class="text-right">Amount</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                <?php
-
-                                $total_tax = $sub_total = 0; // Default 0
-
-                                while ($row = mysqli_fetch_array($sql_items)) {
-                                    $item_id = intval($row['item_id']);
-                                    $item_name = nullable_htmlentities($row['item_name']);
-                                    $item_description = nullable_htmlentities($row['item_description']);
-                                    $item_quantity = floatval($row['item_quantity']);
-                                    $item_price = floatval($row['item_price']);
-                                    $item_tax = floatval($row['item_tax']);
-                                    $item_total = floatval($row['item_total']);
-                                    $total_tax = $item_tax + $total_tax;
-                                    $sub_total = $item_price * $item_quantity + $sub_total;
-
-                                    ?>
-
-                                    <tr>
-                                        <td><?php echo $item_name; ?></td>
-                                        <td><?php echo nl2br($item_description); ?></td>
-                                        <td class="text-center"><?php echo $item_quantity; ?></td>
-                                        <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_price, $quote_currency_code); ?></td>
-                                        <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_tax, $quote_currency_code); ?></td>
-                                        <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_total, $quote_currency_code); ?></td>
-                                    </tr>
-
-                                    <?php
-
-                                }
+                            while ($row = mysqli_fetch_array($sql_items)) {
+                                $item_id = intval($row['item_id']);
+                                $item_name = nullable_htmlentities($row['item_name']);
+                                $item_description = nullable_htmlentities($row['item_description']);
+                                $item_quantity = floatval($row['item_quantity']);
+                                $item_price = floatval($row['item_price']);
+                                $item_tax = floatval($row['item_tax']);
+                                $item_total = floatval($row['item_total']);
+                                $total_tax = $item_tax + $total_tax;
+                                $sub_total = $item_price * $item_quantity + $sub_total;
 
                                 ?>
 
-                                </tbody>
-                            </table>
-                        </div>
+                                <tr>
+                                    <td><?php echo $item_name; ?></td>
+                                    <td><?php echo nl2br($item_description); ?></td>
+                                    <td class="text-center"><?php echo $item_quantity; ?></td>
+                                    <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_price, $quote_currency_code); ?></td>
+                                    <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_tax, $quote_currency_code); ?></td>
+                                    <td class="text-right"><?php echo numfmt_format_currency($currency_format, $item_total, $quote_currency_code); ?></td>
+                                </tr>
+
+                                <?php
+
+                            }
+
+                            ?>
+
+                            </tbody>
+                        </table>
                     </div>
                 </div>
             </div>
-
-            <div class="row mb-3">
-                <div class="col-sm-7">
-                    <?php if (!empty($quote_note)) { ?>
-                        <div class="card">
-                            <div class="card-body">
-                                <?php echo nl2br($quote_note); ?>
-                            </div>
-                        </div>
-                    <?php } ?>
-                </div>
-
-                <div class="col-sm-3 offset-sm-2">
-                    <table class="table table-borderless">
-                        <tbody>
-                        <tr>
-                            <td>Subtotal:</td>
-                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $sub_total, $quote_currency_code); ?></td>
-                        </tr>
-                        <?php if ($quote_discount > 0) { ?>
-                            <tr>
-                                <td>Discount:</td>
-                                <td class="text-right"><?php echo numfmt_format_currency($currency_format, -$quote_discount, $quote_currency_code); ?></td>
-                            </tr>
-                        <?php } ?>
-                        <?php if ($total_tax > 0) { ?>
-                            <tr>
-                                <td>Tax:</td>
-                                <td class="text-right"><?php echo numfmt_format_currency($currency_format, $total_tax, $quote_currency_code); ?></td>
-                            </tr>
-                        <?php } ?>
-                        <tr class="border-top h5 text-bold">
-                            <td><strong>Total:</strong></td>
-                            <td class="text-right"><strong><?php echo numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code); ?></strong></td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-
-            <hr class="mt-5">
-
-            <div class="text-center"><?php echo nl2br($config_quote_footer); ?></div>
-            <div class="">
-                <?php
-                    if ($quote_status == "Sent" || $quote_status == "Viewed" && strtotime($quote_expire) > strtotime("now")) { ?>
-                        <a class="btn btn-success confirm-link" href="guest_post.php?accept_quote=<?php echo $quote_id; ?>&url_key=<?php echo $url_key; ?>">
-                            <i class="fas fa-fw fa-thumbs-up mr-2"></i>Accept
-                        </a>
-                        <a class="btn btn-danger confirm-link" href="guest_post.php?decline_quote=<?php echo $quote_id; ?>&url_key=<?php echo $url_key; ?>">
-                            <i class="fas fa-fw fa-thumbs-down mr-2"></i>Decline
-                        </a>
-                    <?php } ?>
-                    <?php if ($quote_status == "Accepted") { ?>
-                        <button type="button" class="btn btn-success" data-toggle="modal" data-target="#uploadFileModal">
-                            <i class="fas fa-fw fa-cloud-upload-alt mr-2"></i>Upload File
-                        </button>
-                    <?php } ?>
-            </div>
-
         </div>
+
+        <div class="row mb-3">
+            <div class="col-sm-7">
+                <?php if (!empty($quote_note)) { ?>
+                    <div class="card">
+                        <div class="card-body">
+                            <?php echo nl2br($quote_note); ?>
+                        </div>
+                    </div>
+                <?php } ?>
+            </div>
+
+            <div class="col-sm-3 offset-sm-2">
+                <table class="table table-borderless">
+                    <tbody>
+                    <tr>
+                        <td>Subtotal:</td>
+                        <td class="text-right"><?php echo numfmt_format_currency($currency_format, $sub_total, $quote_currency_code); ?></td>
+                    </tr>
+                    <?php if ($quote_discount > 0) { ?>
+                        <tr>
+                            <td>Discount:</td>
+                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, -$quote_discount, $quote_currency_code); ?></td>
+                        </tr>
+                    <?php } ?>
+                    <?php if ($total_tax > 0) { ?>
+                        <tr>
+                            <td>Tax:</td>
+                            <td class="text-right"><?php echo numfmt_format_currency($currency_format, $total_tax, $quote_currency_code); ?></td>
+                        </tr>
+                    <?php } ?>
+                    <tr class="border-top h5 text-bold">
+                        <td><strong>Total:</strong></td>
+                        <td class="text-right"><strong><?php echo numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code); ?></strong></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
+        <hr class="mt-5">
+
+        <div class="text-center"><?php echo nl2br($config_quote_footer); ?></div>
+        <div class="">
+            <?php
+                if ($quote_status == "Sent" || $quote_status == "Viewed" && strtotime($quote_expire) > strtotime("now")) { ?>
+                    <a class="btn btn-success confirm-link" href="guest_post.php?accept_quote=<?php echo $quote_id; ?>&url_key=<?php echo $url_key; ?>">
+                        <i class="fas fa-fw fa-thumbs-up mr-2"></i>Accept
+                    </a>
+                    <a class="btn btn-danger confirm-link" href="guest_post.php?decline_quote=<?php echo $quote_id; ?>&url_key=<?php echo $url_key; ?>">
+                        <i class="fas fa-fw fa-thumbs-down mr-2"></i>Decline
+                    </a>
+                <?php } ?>
+                <?php if ($quote_status == "Accepted") { ?>
+                    <button type="button" class="btn btn-success" data-toggle="modal" data-target="#uploadFileModal">
+                        <i class="fas fa-fw fa-cloud-upload-alt mr-2"></i>Upload File
+                    </button>
+                <?php } ?>
+        </div>
+
     </div>
+</div>
 
 <?php
 require_once "guest_quote_upload_file_modal.php";
diff --git a/quote.php b/quote.php
index aca9028e..f73f0033 100644
--- a/quote.php
+++ b/quote.php
@@ -91,9 +91,6 @@ if (isset($_GET['quote_id'])) {
     $company_email = nullable_htmlentities($row['company_email']);
     $company_website = nullable_htmlentities($row['company_website']);
     $company_logo = nullable_htmlentities($row['company_logo']);
-    if (!empty($company_logo)) {
-        $company_logo_base64 = base64_encode(file_get_contents("uploads/settings/$company_logo"));
-    }
 
     $sql_history = mysqli_query($mysqli, "SELECT * FROM history WHERE history_quote_id = $quote_id ORDER BY history_id DESC");