diff --git a/server.js b/server.js
index 5eb6af5..67ff222 100644
--- a/server.js
+++ b/server.js
@@ -1230,13 +1230,13 @@ app.get('/api/quotes/:id/pdf', async (req, res) => {
         // Totals
         itemsHTML += `
             <tr class="footer-row">
-                <td colspan="3" class="total-label">Subtotal:</td>
+                <td colspan="3" class="subtotal-label">Subtotal:</td>
                 <td class="total-amount">$${parseFloat(quote.subtotal).toFixed(2)}</td>
             </tr>`;
         if (!quote.tax_exempt) {
             itemsHTML += `
             <tr class="footer-row">
-                <td colspan="3" class="total-label">Tax (${quote.tax_rate}%):</td>
+                <td colspan="3" class="tax-label">Tax (${quote.tax_rate}%):</td>
                 <td class="total-amount">$${parseFloat(quote.tax_amount).toFixed(2)}</td>
             </tr>`;
         }
@@ -1352,13 +1352,13 @@ app.get('/api/invoices/:id/pdf', async (req, res) => {
         
         itemsHTML += `
             <tr class="footer-row">
-                <td colspan="3" class="total-label">Subtotal:</td>
+                <td colspan="3" class="subtotal-label">Subtotal:</td>
                 <td class="total-amount">$${parseFloat(invoice.subtotal).toFixed(2)}</td>
             </tr>`;
         if (!invoice.tax_exempt) {
             itemsHTML += `
             <tr class="footer-row">
-                <td colspan="3" class="total-label">Tax (${invoice.tax_rate}%):</td>
+                <td colspan="3" class="tax-label">Tax (${invoice.tax_rate}%):</td>
                 <td class="total-amount">$${parseFloat(invoice.tax_amount).toFixed(2)}</td>
             </tr>`;
         }
@@ -1374,7 +1374,7 @@ app.get('/api/invoices/:id/pdf', async (req, res) => {
         if (amountPaid > 0) {
             itemsHTML += `
             <tr class="footer-row">
-                <td colspan="3" class="total-label" style="font-size: 12px; color: #059669;">Downpayment:</td>
+                <td colspan="3" class="downpayment-label" style="font-size: 12px; color: #059669;">Downpayment:</td>
                 <td class="total-amount" style="font-size: 12px; color: #059669;">-$${amountPaid.toFixed(2)}</td>
             </tr>
             <tr class="footer-row">
@@ -1490,13 +1490,13 @@ app.get('/api/quotes/:id/html', async (req, res) => {
         
         itemsHTML += `
             <tr class="footer-row">
-                <td colspan="3" class="total-label">Subtotal:</td>
+                <td colspan="3" class="subtotal-label">Subtotal:</td>
                 <td class="total-amount">$${parseFloat(quote.subtotal).toFixed(2)}</td>
             </tr>`;
         if (!quote.tax_exempt) {
             itemsHTML += `
             <tr class="footer-row">
-                <td colspan="3" class="total-label">Tax (${quote.tax_rate}%):</td>
+                <td colspan="3" class="tax-label">Tax (${quote.tax_rate}%):</td>
                 <td class="total-amount">$${parseFloat(quote.tax_amount).toFixed(2)}</td>
             </tr>`;
         }
@@ -1595,13 +1595,13 @@ app.get('/api/invoices/:id/html', async (req, res) => {
         
         itemsHTML += `
             <tr class="footer-row">
-                <td colspan="3" class="total-label">Subtotal:</td>
+                <td colspan="3" class="subtotal-label">Subtotal:</td>
                 <td class="total-amount">$${parseFloat(invoice.subtotal).toFixed(2)}</td>
             </tr>`;
         if (!invoice.tax_exempt) {
             itemsHTML += `
             <tr class="footer-row">
-                <td colspan="3" class="total-label">Tax (${invoice.tax_rate}%):</td>
+                <td colspan="3" class="tax-label">Tax (${invoice.tax_rate}%):</td>
                 <td class="total-amount">$${parseFloat(invoice.tax_amount).toFixed(2)}</td>
             </tr>`;
         }
@@ -1617,7 +1617,7 @@ app.get('/api/invoices/:id/html', async (req, res) => {
         if (amountPaid > 0) {
             itemsHTML += `
             <tr class="footer-row">
-                <td colspan="3" class="total-label" style="font-size: 12px; color: #059669;">Downpayment:</td>
+                <td colspan="3" class="downpayment-label" style="font-size: 12px; color: #059669;">Downpayment:</td>
                 <td class="total-amount" style="font-size: 12px; color: #059669;">-$${amountPaid.toFixed(2)}</td>
             </tr>
             <tr class="footer-row">
diff --git a/templates/invoice-template.html b/templates/invoice-template.html
index 74aff1b..be5705e 100644
--- a/templates/invoice-template.html
+++ b/templates/invoice-template.html
@@ -179,12 +179,29 @@
         }
         
         .total-label {
+            text-align: right;
+            font-size: 16px;
+            font-weight: bold;
+            padding-right: 20px !important;
+        }
+        .subtotal-label {
+            text-align: right;
+            font-size: 14px;
+            font-weight: bold;
+            padding-right: 20px !important;
+        }
+        .tax-label {
+            text-align: right;
+            font-size: 14px;
+            font-weight: bold;
+            padding-right: 20px !important;
+        }
+        .downpayment-label {
             text-align: right;
             font-size: 14px;
             font-weight: bold;
             padding-right: 20px !important;
         }
-        
         .total-amount {
             text-align: right;
             font-size: 14px;
diff --git a/templates/quote-template.html b/templates/quote-template.html
index 9932192..4637c53 100644
--- a/templates/quote-template.html
+++ b/templates/quote-template.html
@@ -175,6 +175,24 @@
         }
         
         .total-label {
+            text-align: right;
+            font-size: 16px;
+            font-weight: bold;
+            padding-right: 20px !important;
+        }
+        .subtotal-label {
+            text-align: right;
+            font-size: 14px;
+            font-weight: bold;
+            padding-right: 20px !important;
+        }
+        .tax-label {
+            text-align: right;
+            font-size: 14px;
+            font-weight: bold;
+            padding-right: 20px !important;
+        }
+        .downpayment-label {
             text-align: right;
             font-size: 14px;
             font-weight: bold;