diff --git a/invoices.php b/invoices.php
index 886ac945..4420581c 100644
--- a/invoices.php
+++ b/invoices.php
@@ -27,37 +27,37 @@ $cancelled_count = $row['num'];
 $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_status NOT LIKE 'Cancelled' AND invoice_due < CURDATE()"));
 $overdue_count = $row['num'];
 
-$sql_total_draft = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_draft FROM invoices WHERE invoice_status = 'Draft'");
-$row = mysqli_fetch_array($sql_total_draft);
-$total_draft = floatval($row['total_draft']);
+$sql_total_draft_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_draft_amount FROM invoices WHERE invoice_status = 'Draft'");
+$row = mysqli_fetch_array($sql_total_draft_amount);
+$total_draft_amount = floatval($row['total_draft_amount']);
 
-$sql_total_sent = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_sent FROM invoices WHERE invoice_status = 'Sent'");
-$row = mysqli_fetch_array($sql_total_sent);
-$total_sent = floatval($row['total_sent']);
+$sql_total_sent_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_sent_amount FROM invoices WHERE invoice_status = 'Sent'");
+$row = mysqli_fetch_array($sql_total_sent_amount);
+$total_sent_amount = floatval($row['total_sent_amount']);
 
-$sql_total_viewed = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_viewed FROM invoices WHERE invoice_status = 'Viewed'");
-$row = mysqli_fetch_array($sql_total_viewed);
-$total_viewed = floatval($row['total_viewed']);
+$sql_total_viewed_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_viewed_amount FROM invoices WHERE invoice_status = 'Viewed'");
+$row = mysqli_fetch_array($sql_total_viewed_amount);
+$total_viewed_amount = floatval($row['total_viewed_amount']);
 
-$sql_total_cancelled = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_cancelled FROM invoices WHERE invoice_status = 'Cancelled'");
-$row = mysqli_fetch_array($sql_total_cancelled);
-$total_cancelled = floatval($row['total_cancelled']);
+$sql_total_cancelled_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_cancelled_amount FROM invoices WHERE invoice_status = 'Cancelled'");
+$row = mysqli_fetch_array($sql_total_cancelled_amount);
+$total_cancelled_amount = floatval($row['total_cancelled_amount']);
 
-$sql_total_partial = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_partial FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial'");
-$row = mysqli_fetch_array($sql_total_partial);
-$total_partial = floatval($row['total_partial']);
-$total_partial_count = mysqli_num_rows($sql_total_partial);
+$sql_total_partial_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_partial_amount FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial'");
+$row = mysqli_fetch_array($sql_total_partial_amount);
+$total_partial_amount = floatval($row['total_partial_amount']);
+$total_partial_count = mysqli_num_rows($sql_total_partial_amount);
 
-$sql_total_overdue_partial = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_overdue_partial FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' AND invoice_due < CURDATE()");
-$row = mysqli_fetch_array($sql_total_overdue_partial);
-$total_overdue_partial = floatval($row['total_overdue_partial']);
+$sql_total_overdue_partial_amount = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS total_overdue_partial_amount FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_status = 'Partial' AND invoice_due < CURDATE()");
+$row = mysqli_fetch_array($sql_total_overdue_partial_amount);
+$total_overdue_partial_amount = floatval($row['total_overdue_partial_amount']);
 
-$sql_total_overdue = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_overdue FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_status NOT LIKE 'Cancelled' AND invoice_due < CURDATE()");
-$row = mysqli_fetch_array($sql_total_overdue);
-$total_overdue = floatval($row['total_overdue']);
+$sql_total_overdue_amount = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS total_overdue_amount FROM invoices WHERE invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Paid' AND invoice_status NOT LIKE 'Cancelled' AND invoice_due < CURDATE()");
+$row = mysqli_fetch_array($sql_total_overdue_amount);
+$total_overdue_amount = floatval($row['total_overdue_amount']);
 
 $real_overdue_amount = $total_overdue - $total_overdue_partial;
-$total_unpaid = $total_sent + $total_viewed + $total_partial;
+$total_unpaid_amount = $total_sent_amount + $total_viewed_amount + $total_partial_amount;
 $unpaid_count = $sent_count + $viewed_count + $partial_count;
 
 //Invoice status from GET
@@ -96,7 +96,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <!-- small box -->
             <a href="?<?php echo $url_query_strings_sort; ?>&status=Draft" class="small-box bg-secondary">
                 <div class="inner">
-                    <h3><?php echo numfmt_format_currency($currency_format, $total_draft, $session_company_currency); ?></h3>
+                    <h3><?php echo numfmt_format_currency($currency_format, $total_draft_amount, $session_company_currency); ?></h3>
                     <p><?php echo $draft_count; ?> Draft</p>
                 </div>
                 <div class="icon">
@@ -110,7 +110,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
             <!-- small box -->
             <a href="?<?php echo $url_query_strings_sort; ?>&status=Unpaid" class="small-box bg-info">
                 <div class="inner text-white">
-                    <h3><?php echo numfmt_format_currency($currency_format, $total_unpaid, $session_company_currency); ?></h3>
+                    <h3><?php echo numfmt_format_currency($currency_format, $total_unpaid_amount, $session_company_currency); ?></h3>
                     <p><?php echo $unpaid_count; ?> Unpaid</p>
                 </div>
                 <div class="icon">