diff --git a/index.html b/index.html
index a34ebc0..df244df 100755
--- a/index.html
+++ b/index.html
@@ -131,7 +131,7 @@ <h3>
            </tr>
            <tr class="item odd">
              <td class="item_l">2 Days</td>
-             <td class="item_l">More d etails of project activity to be billed </td>
+             <td class="item_l">More details of project activity to be billed </td>
              <td class="item_r">1500.00</td>
              <td class="item_r">17.5%</td>
              <td class="item_r">1000.00</td>
diff --git a/styles/bauhaus.css b/styles/bauhaus.css
index c972831..efea53a 100755
--- a/styles/bauhaus.css
+++ b/styles/bauhaus.css
@@ -3,6 +3,11 @@ Bauhaus Theme
 Created by Roan Lavery
 18/02/08 */
 
+#invoice.pagestyle,
+.draft #invoice.pagestyle {
+  padding-top: 0;
+}
+
 /*=========================== TYPOGRAPHY =========================*/
 
 #invoice p,
@@ -11,7 +16,8 @@ Created by Roan Lavery
   margin: 0;
 }
 
-#invoice {
+#invoice.pagestyle {
+  border-top: 1mm solid #000 !important;
   color: #000;
   font-family: Helvetica, Arial,  sans-serif;
   line-height: 1.3;
@@ -87,10 +93,6 @@ th,
   margin-bottom: 1em;
 }
 
-#invoice .total {
-  font-size: 12pt;
-}
-
 #comments {
   color: #999;
   font-size: 10pt;
@@ -101,11 +103,6 @@ th,
 
 /*=========================== LAYOUT =========================*/
 
-#invoice {
-  border-top: 5px solid #000;
-  padding: 0 1cm 1cm 1cm;
-}
-
 #invoice-header #company-address {
   clear: right;
   float: right;
@@ -128,12 +125,11 @@ th,
 }
 
 #invoice-blank-header {
-  margin-top: 1.6cm;
+  margin-top: 2.6cm;
 }
 
 #client-details {
-  border-top: 1px solid #ddd;
-  border-top: 1px solid #ddd;
+  border-top: 1px solid #d8dde0;
   float: left;
   margin-bottom: 20px;
   margin-top: 20px;
@@ -142,7 +138,7 @@ th,
 }
 
 #invoice-info {
-  border-top: 1px solid #ddd;
+  border-top: 1px solid #d8dde0;
   clear: both;
   float: right;
   margin-bottom: 20px;
@@ -164,13 +160,13 @@ th,
 }
 
 #payment-details {
-  border-top: 1px solid #ddd;
+  border-top: 1px solid #d8dde0;
   float: left;
   width: 330px;
 }
 
 #invoice-other {
-  border-top: 1px solid #ddd;
+  border-top: 1px solid #d8dde0;
   clear: both;
   float: right;
   width: 270px;
@@ -194,9 +190,9 @@ th,
   text-align: left;
 }
 
-#invoice #header_row {
+#invoice #header_row th {
   background: #000;
-  color: #fff;
+  color: #fff !important;
 }
 
 #invoice-amount td.action {
@@ -226,7 +222,7 @@ th,
 }
 
 #invoice-amount td {
-  border-bottom: 1px solid #ddd;
+  border-bottom: 1px solid #d8dde0;
   margin: 0;
   white-space: nowrap;
 }
@@ -237,17 +233,19 @@ th,
   vertical-align: top;
 }
 
-#invoice-amount td.item_r {
+#invoice-amount .item_r {
   text-align: right;
 }
 
-#invoice-amount td.item_l {
+#invoice-amount .item_l {
   text-align: left;
   white-space: normal;
 }
 
-#invoice-amount td.total {
+#invoice-amount .total {
+  font-size: 12pt;
   font-weight: bold;
+  line-height: 1.3;
   text-align: right;
 }
 
@@ -274,19 +272,15 @@ th,
 }
 
 #invoice-amount .salestax_th {
-  text-align: center;
-  width: 8%;
-}
-
-#invoice-amount th.money_th {
   text-align: right;
+  width: 8%;
 }
 
 /* Invoice UK VAT Summary Table */
 #invoice #invoice-uk-vat-summary {
   background: #fff;
-  border-collapse: collapse;
   border: 0;
+  border-collapse: collapse;
   clear: both;
   margin: 25px 0 0 0;
   width: 100%;
diff --git a/styles/bauhaus_print.css b/styles/bauhaus_print.css
index 8d8751a..99e999e 100755
--- a/styles/bauhaus_print.css
+++ b/styles/bauhaus_print.css
@@ -11,7 +11,10 @@
   @bottom-center {
     color: #666;
     content: counter(page) "/" counter(pages);
-    font: normal 9pt Arial, Helvetica, sans-serif;
+    font-size: 9pt;
+    font-style: normal;
+    font-weight: normal;
+    font-family: Arial, Helvetica, sans-serif;
   }
 
 }
@@ -39,13 +42,12 @@
   page-break-inside: avoid;
 }
 
-#invoice {
-  border: 0;
-  padding: 1cm 1cm 0 1cm;
-}
-
-body {
-  border-top: 1mm solid #000;
+#invoice.pagestyle,
+.draft #invoice.pagestyle {
+  padding-bottom: 0;
+  padding-left: 1cm;
+  padding-right: 1cm;
+  padding-top: 0 !important;
 }
 
 table#invoice-amount td,
diff --git a/styles/ejs.css b/styles/ejs.css
index f071fd7..f167e67 100755
--- a/styles/ejs.css
+++ b/styles/ejs.css
@@ -185,12 +185,12 @@ some_nowhitespace {
 
 #invoice-info h2 {
   font-size: 14pt;
-  margin-bottom: 0px;
+  margin-bottom: 0;
   text-transform: uppercase;
 }
 
 #invoice-info h3 {
-  margin: 0px 0 0 0px;
+  margin: 0;
 }
 
 #invoice-amount {
@@ -221,13 +221,13 @@ some_nowhitespace {
 #comments {
   clear: both;
   float: right;
-  width: 210px;
+  width: 100%;
 }
 
 /*=========================== TABLES =========================*/
 
 #invoice table {
-  background: #eee;
+  background: #ebeeef;
   border-collapse: collapse;
   border-left: 1px solid #000;
   border-right: 1px solid #000;
@@ -263,7 +263,7 @@ some_nowhitespace {
 }
 
 #invoice-amount tr.item td {
-  background: #eee;
+  background: #ebeeef;
 }
 
 #invoice-amount td {
@@ -272,17 +272,18 @@ some_nowhitespace {
   vertical-align: top;
 }
 
-#invoice-amount td.item_r {
+#invoice-amount .item_r {
   text-align: right;
 }
 
-#invoice-amount td.item_l {
+#invoice-amount .item_l {
   text-align: left;
   white-space: normal;
 }
 
-#invoice-amount td.total {
+#invoice-amount .total {
   font-weight: bold;
+  line-height: 1.3;
   text-align: right;
 }
 
@@ -309,7 +310,7 @@ some_nowhitespace {
 }
 
 #invoice-amount .salestax_th {
-  text-align: center;
+  text-align: right;
   width: 8%;
 }
 
@@ -327,8 +328,8 @@ some_nowhitespace {
 
 #invoice #invoice-uk-vat-summary {
   background: #fff;
-  border-collapse: collapse;
   border: 0;
+  border-collapse: collapse;
   clear: both;
   margin: 25px 0 0 0;
   width: 100%;
diff --git a/styles/ejs_print.css b/styles/ejs_print.css
index 9711437..99dd1e3 100755
--- a/styles/ejs_print.css
+++ b/styles/ejs_print.css
@@ -11,7 +11,10 @@
   @bottom-center {
     color: #666;
     content: counter(page) "/" counter(pages);
-    font: normal 9pt Arial, Helvetica, sans-serif;
+    font-size: 9pt;
+    font-style: normal;
+    font-weight: normal;
+    font-family: Arial, Helvetica, sans-serif;
   }
 
 }
@@ -38,3 +41,7 @@ table#invoice-amount th,
 div {
   border-width: 0.05mm !important;
 }
+
+#invoice {
+  padding: 1cm !important;
+}
diff --git a/styles/horizon.css b/styles/horizon.css
index 3e4cfc0..5180150 100755
--- a/styles/horizon.css
+++ b/styles/horizon.css
@@ -47,11 +47,11 @@
   padding-right: 8px;
 }
 
-#payment-due:before {
+#payment-due::before {
   content: "(";
 }
 
-#payment-due:after {
+#payment-due::after {
   content: ")";
 }
 
@@ -64,7 +64,7 @@
 
 #invoice-info #payment-total {
   color: #76B618;
-  font-size: 16pt;
+  font-size: 12pt;
   font-weight: bold;
   line-height: 1.3;
 }
@@ -109,6 +109,7 @@ p#payment-due {
 
 #invoice .total {
   font-size: 12pt;
+  line-height: 1.3;
 }
 
 #comments {
@@ -292,19 +293,20 @@ p#payment-due {
   vertical-align: top;
 }
 
-#invoice-amount td.item_r {
+#invoice-amount .item_r {
   text-align: right;
 }
 
-#invoice-amount td.item_l {
+#invoice-amount .item_l {
   text-align: left;
   white-space: normal;
 }
 
-#invoice-amount td.total {
+#invoice-amount .total {
   color: #65A900;
   font-size: 12pt;
   font-weight: bold;
+  line-height: 1.3;
   text-align: right;
 }
 
@@ -326,8 +328,8 @@ p#payment-due {
 }
 
 #invoice-amount .subtotal_th {
-  width: 18%;
   text-align: right;
+  width: 18%;
 }
 
 #invoice-amount .unitprice_th {
@@ -336,7 +338,7 @@ p#payment-due {
 }
 
 #invoice-amount .salestax_th {
-  text-align: center;
+  text-align: right;
   width: 8%;
 }
 
@@ -344,8 +346,8 @@ p#payment-due {
 
 #invoice #invoice-uk-vat-summary {
   background: #fff;
-  border-collapse: collapse;
   border: 0;
+  border-collapse: collapse;
   clear: both;
   margin: 25px 0 0 0;
   width: 100%;
diff --git a/styles/horizon_print.css b/styles/horizon_print.css
index 8df6fea..803d0e9 100755
--- a/styles/horizon_print.css
+++ b/styles/horizon_print.css
@@ -11,7 +11,10 @@
   @bottom-center {
     color: #666;
     content: counter(page) "/" counter(pages);
-    font: normal 9pt Arial, Helvetica, sans-serif;
+    font-size: 9pt;
+    font-style: normal;
+    font-weight: normal;
+    font-family: Arial, Helvetica, sans-serif;
   }
 
 }
@@ -43,3 +46,7 @@ div,
 table#invoice-amount th {
   border-width: 0.05mm !important;
 }
+
+#invoice {
+  padding: 1cm !important;
+}
diff --git a/styles/lola.css b/styles/lola.css
index 2d4ad0d..053d0d5 100755
--- a/styles/lola.css
+++ b/styles/lola.css
@@ -7,74 +7,269 @@ Created by Olly Headey
 
 /*=========================== INVOICE LOLA =========================*/
 
-#invoice img { border: none; }
+#invoice img {
+    border: none;
+}
 
 /*=========================== TYPOGRAPHY =========================*/
 
-#invoice h1 {margin: 0;color: #699; font-size: 24px;text-transform: uppercase;}
-#invoice {font-family: "Gill Sans", "Gill Sans MT", Helvetica, Arial, Verdana, sans-serif; text-transform: none; color: #699}
-#invoice h2 {margin: 10px 0;font-size: 14pt; }
-#invoice-amount td, th {font-size: 11pt;}
-#invoice-header #company-address {clear: right; text-align: right; font-size: 11pt; line-height: 14pt; padding-top: 2em;}
-#invoice-header #company-address div.org {font-size: 13pt}
-#invoice #client-details, #invoice-info  p, #invoice #invoice-other, #invoice #payment-details {font-size: 11pt; line-height: 14pt;}
-#invoice-info h2, #invoice-info h3 {margin: 0; font-weight: normal; }
-#invoice-info h3 em { font-style: normal; font-size: 16pt; font-weight: normal; color: #699}
-#invoice-info h2 {font-weight: normal; font-size:24pt; text-transform: lowercase; color: #699}
-#invoice-info h3 {color: #699; font-size:15pt;}
-#invoice-info #payment-total{display:none}
-#invoice #invoice-info p {text-align:right;margin-top:0; color: #B8B885}
-#invoice-info p#payment-terms {display:none}
-#payment-details h2, #invoice-other h2 {color: #699; font-weight: bold}
-#payment-details #bank_name {color: #699}
-#payment-details .sort-code, #payment-details .account-number, #payment-details .payment-reference {color: #699; clear: left;}
-#payment-details strong {font-weight: normal; float: left; width: 10em;}
-#invoice-other #company-reg-number, #invoice-other #vat-reg-number, #invoice-other #contract-number {color: #699;}
-#invoice-other strong {font-weight: normal; float: left; width: 15em; }
-#comments {clear: both;  font-weight: bold; font-size:10pt}
-#invoice-other #contract-number{margin-bottom:3em}
+#invoice h1 {
+    color: #699;
+    font-size: 24px;
+    margin: 0;
+    text-transform: uppercase;
+}
+#invoice {
+    color: #699;
+    font-family: "Gill Sans", "Gill Sans MT", Helvetica, Arial, Verdana, sans-serif;
+    text-transform: none;
+}
+#invoice h2 {
+    font-size: 14pt;
+    margin: 10px 0;
+}
+#invoice-amount td,
+th {
+    font-size: 11pt;
+}
+#invoice-header #company-address {
+    clear: right;
+    font-size: 11pt;
+    line-height: 14pt;
+    text-align: right;
+}
+#invoice-header #company-address div.org {
+    font-size: 13pt;
+}
+#invoice #client-details,
+#invoice-info  p,
+#invoice #invoice-other,
+#invoice #payment-details {
+    font-size: 11pt;
+    line-height: 14pt;
+}
+#invoice-info h2,
+#invoice-info h3 {
+    font-weight: normal;
+    margin: 0;
+}
+#invoice-info h3 em {
+    color: #699;
+    font-size: 16pt;
+    font-style: normal;
+    font-weight: normal;     
+}
+#invoice-info h2 {
+    color: #699;
+    font-size: 24pt;
+    font-weight: normal;
+    text-transform: lowercase;
+}
+#invoice-info h3 {
+    color: #699;
+    font-size: 15pt;
+}
+#invoice-info #payment-total {
+    display: none;
+}
+#invoice #invoice-info p {
+    color: #B8B885;
+    margin-top: 0;
+    text-align: right;
+}
+#invoice-info p#payment-terms {
+    display: none;
+}
+#payment-details h2,
+#invoice-other h2 {
+    color: #699;
+    font-weight: bold;
+}
+#payment-details #bank_name {
+    color: #699;
+}
+#payment-details .sort-code,
+#payment-details .account-number,
+#payment-details .payment-reference {
+    clear: left;
+    color: #699;
+}
+#payment-details strong {
+    float: left;
+    font-weight: normal;
+    width: 10em;
+}
+#invoice-other #company-reg-number,
+#invoice-other #vat-reg-number,
+#invoice-other #contract-number {
+    color: #699;
+}
+#invoice-other strong {
+    float: left;
+    font-weight: normal;
+    width: 15em;
+}
+#comments {
+    clear: both;
+    font-size: 10pt;
+    font-weight: bold;
+}
+#invoice-other #contract-number {
+    margin-bottom: 3em;
+}
 
 /*=========================== LAYOUT =========================*/
 
-#invoice{padding:0 1cm 1cm 1cm; }
-#invoice-header .logo {float:right;}
-#invoice-header{margin:1em 0 0 0; padding-bottom:10px}
-#invoice-blank-header {margin-top: 1.6cm;}
-#invoice-info{margin: 0em 0 20px 0; width: 48%; float:right; text-align:right; }
-#client-details {margin: 1em 0 20px 2.5cm;float:left;width: 35%; }
-#invoice-other {text-align: right;clear:both; float: right;width:50%; }
-#invoice #payment-details{float:left; width:45%; margin-top:0;}
-#invoice-amount {margin: 2em 0; clear: both; }
-#company-address {margin: 0; padding: 0;}
+#invoice {
+    padding: 1cm;
+}
+#invoice-header .logo {
+    float: right;
+    margin-bottom: 2em;
+}
+#invoice-header {
+    padding-bottom: 10px;
+}
+#invoice-blank-header {
+    margin-top: 1.6cm;
+}
+#invoice-info {
+    float: right;
+    margin: 0 0 20px 0;
+    text-align: right;
+    width: 48%;
+}
+#client-details {
+    float: left;
+    margin: 1em 0 20px 2.5cm;
+    width: 35%;
+}
+#invoice-other {
+    clear: both;
+    float: right;
+    text-align: right;
+    width: 50%;
+}
+#invoice #payment-details {
+    float: left;
+    margin-top: 0;
+    width: 45%; 
+}
+#invoice-amount {
+    clear: both;
+    margin: 2em 0;
+}
+#company-address {
+    margin: 0;
+    padding: 0;
+}
 
-#invoice-amount .item_group_title td {padding-top: 0.6em;}
-#invoice-amount .item_group_title h2 {color: #699;}
+#invoice-amount .item_group_title td {
+    padding-top: 0.6em;
+}
+#invoice-amount .item_group_title h2 {
+    color: #699;
+}
 
 
-#comments{clear:both; padding-top:0.1cm}
+#comments {
+    clear: both;
+    padding-top: 0.1cm;
+}
 
 /*=========================== TABLES =========================*/
 
-#invoice table#invoice-amount { border-collapse:collapse; clear:both;  width:100%;}
-#invoice-amount th {color: #fff; text-align: left;white-space: nowrap;padding: 3px 5px 3px 5px; font-weight: normal;background: #B8B885; }
-#invoice-amount tr#discount_tr, #invoice-amount tr#net_total_tr, #invoice-amount tr#vat_tr {color: #699}
-#invoice-amount tr#total_tr {background: #B8B885; color: #fff; }
-#invoice-amount tr.item td {padding-top: 10px; padding-bottom: 10px;border-bottom: 1px solid #B8B885; background: #fff;}
-#invoice-amount td {margin: 0; padding:5px; vertical-align: top; }
-#invoice-amount td.item_r{text-align: right;}
-#invoice-amount td.item_l{text-align: left;white-space: normal; padding-bottom: 14px;}
-#invoice-amount td.total{text-align: right;font-weight: bold; padding: 3px 5px 3px 5px; }
-#invoice-amount span.currency {display: none}
+#invoice table#invoice-amount {
+    border-collapse: collapse;
+    clear: both;
+    width: 100%;
+}
+#invoice-amount th {
+    background: #B8B885;
+    color: #fff;
+    font-weight: normal;
+    padding: 3px 5px 3px 5px;
+}
+#invoice-amount tr#discount_tr,
+#invoice-amount tr#net_total_tr,
+#invoice-amount tr#vat_tr {
+    color: #699;
+}
+#invoice-amount tr#total_tr {
+    background: #B8B885;
+    color: #fff;
+}
+#invoice-amount tr.item td {
+    background: #fff;
+    border-bottom: 1px solid #B8B885;
+    padding-bottom: 10px;
+    padding-top: 10px;
+}
+#invoice-amount td {
+    margin: 0;
+    padding: 5px;
+    vertical-align: top;
+}
+#invoice-amount .item_r {
+    text-align: right;
+}
+#invoice-amount .item_l {
+    text-align: left;
+    white-space: normal;
+}
+#invoice-amount .total {
+    font-weight: bold;
+    line-height: 1.3;
+    padding: 3px 5px 3px 5px;
+    text-align: right;
+}
+#invoice-amount span.currency {
+    display: none;
+}
 
-#invoice-amount .details_th{width:54%}
-#invoice-amount .details_notax_th{width:62%}
-#invoice-amount .quantity_th{width:13%}
-#invoice-amount .subtotal_th{width:15%; text-align:right}
-#invoice-amount .unitprice_th{width:10%; text-align:right}
-#invoice-amount .salestax_th{width:8%; text-align:center}
+#invoice-amount .details_th,
+#invoice-amount td.description_td {
+    width: 47%;
+}
+#invoice-amount .details_notax_th {
+    width: 55%;
+}
+#invoice-amount .quantity_th {
+    width: 13%;
+}
+#invoice-amount .subtotal_th {
+    text-align: right;
+    width: 18%;
+}
+#invoice-amount .unitprice_th {
+    text-align: right;
+    width: 14%;
+}
+#invoice-amount .salestax_th {
+    text-align: right;
+    width: 8%;
+}
 
 /* Invoice UK VAT Summary Table */
-#invoice #invoice-uk-vat-summary{width:100%;border-collapse:collapse;margin:25px 0 0 0;clear:both;border:0; background:#fff; }
-#invoice tr#invoice-uk-vat-header th{padding:7px 0;border-top: 1px solid #ccc;}
-#invoice-uk-vat-summary td, #invoice #invoice-uk-vat-summary th{text-align:left; font-size:9pt;padding:2px 0;}
-#vat-total td, #vat-total th{border-top:1px solid #ccc;}
+#invoice #invoice-uk-vat-summary {
+    background: #fff;
+    border: 0;
+    border-collapse: collapse;
+    clear: both;
+    margin: 25px 0 0 0;
+    width: 100%;  
+}
+#invoice tr#invoice-uk-vat-header th {
+    border-top: 1px solid #ccc;
+    padding: 7px 0;
+}
+#invoice-uk-vat-summary td,
+#invoice #invoice-uk-vat-summary th {
+    font-size: 9pt;
+    padding: 2px 0;
+    text-align: left;
+}
+#vat-total td,
+#vat-total th {
+    border-top: 1px solid #ccc;
+}
diff --git a/styles/lola_print.css b/styles/lola_print.css
index bf2d8c6..34bd221 100755
--- a/styles/lola_print.css
+++ b/styles/lola_print.css
@@ -11,7 +11,10 @@
   @bottom-center {
     color: #666;
     content: counter(page) "/" counter(pages);
-    font: normal 9pt Arial, Helvetica, sans-serif;
+    font-size: 9pt;
+    font-style: normal;
+    font-weight: normal;
+    font-family: Arial, Helvetica, sans-serif;
   }
 
 }
@@ -34,7 +37,7 @@
 }
 
 #invoice {
-  padding-bottom: 0;
+  padding: 1cm 1cm 0 1cm !important;
 }
 
 table#invoice-amount td,
diff --git a/styles/modernist.css b/styles/modernist.css
index 011024b..8c060aa 100644
--- a/styles/modernist.css
+++ b/styles/modernist.css
@@ -10,7 +10,11 @@ May 2013
 #invoice {
   background: #fff url("/themes/modernist/border.png") no-repeat 0 60px;
   color: #353535;
-  font: normal 13px/18px "Helvetica Neue",Arial,Helvetica,sans-serif; /* 13px */
+  font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+  font-style: normal;
+  font-weight: normal;
   padding: 4.615em 0; /* 60/13px */
   position: relative;
   width: 764px;
@@ -19,7 +23,11 @@ May 2013
 #invoice h2,
 #invoice h3 {
   color: #353B45;
-  font: bold 1em "Helvetica Neue",Arial,Helvetica,sans-serif;
+  font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+  font-size: 1em;
+  font-style: normal;
+  font-weight: bold;
+  line-height: normal;
   margin: 0;
 }
 #invoice h3 {
@@ -90,9 +98,15 @@ May 2013
   float: right;
   margin-right: 2.2321429%; /* 20/896px */
   min-height: 12em;
-  width: 18.3035714%; /* 164/896px */
   position: relative;
+  width: 18.3035714%; /* 164/896px */
 }
+
+/* Push the main body down to counteract the absolute positioning */
+#invoice #invoice-blank-header {
+  height: 5.5em;
+}
+
 #invoice #client-details {
   left: 0;
 }
@@ -100,14 +114,15 @@ May 2013
   padding-right: 10.8695652%; /* 20/184px */
 }
 #invoice #invoice-header img {
-  margin-bottom: 1em;
   height: auto !important;
+  margin-bottom: 1em;
   width: 100% !important;
 }
 #invoice #company-postcode .postal-code {
   display: block;
 }
-#invoice #invoice-header .email {
+#invoice #invoice-header .email,
+#invoice #invoice-header .url {
   word-wrap: break-word;
 }
 #invoice #invoice-amount {
@@ -116,7 +131,7 @@ May 2013
 #invoice #invoice-amount,
 #invoice #client-details {
   margin: 0 4.4642857% !important; /* 40/896px */
-  width: 70.5357143%; /* 632/896px */
+  width: 70.5357143% !important; /* 632/896px */
 }
 #invoice #invoice-uk-vat-summary {
   clear: both;
@@ -172,8 +187,8 @@ May 2013
   display: inline;
   font-size: 1em;
 }
-#invoice #invoice-info h2:after,
-#invoice #invoice-info h3:after {
+#invoice #invoice-info h2::after,
+#invoice #invoice-info h3::after {
   content: " ·";
 }
 #invoice #invoice-info #payment-terms,
diff --git a/styles/modernist_print.css b/styles/modernist_print.css
index 0207d84..6cff4bb 100644
--- a/styles/modernist_print.css
+++ b/styles/modernist_print.css
@@ -20,7 +20,10 @@ October 3 2011
   @bottom-center {
     color: #666;
     content: counter(page) "/" counter(pages);
-    font: normal 9pt Arial, Helvetica, sans-serif;
+    font-size: 9pt;
+    font-style: normal;
+    font-weight: normal;
+    font-family: Arial, Helvetica, sans-serif;
   }
 
 }
@@ -52,8 +55,8 @@ body {
 }
 #invoice {
   background: #ffffff url("/themes/modernist/border_print.png") no-repeat 0 60px;
-  font-family: "Helvetica Neue",Arial,Helvetica,sans-serif;
   border: 0;
+  font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
   font-size: 9pt;
   line-height: 12pt;
   margin: 0;
@@ -67,9 +70,18 @@ body {
 #invoice #comments {
   background-image: url("/themes/modernist/border_emphasised_print.png");
 }
+#comments {
+  width: 70.5357143% !important;
+}
 #invoice #invoice-header {
   margin-top: 5em;
 }
+
+/* Push the main body down to counteract the absolute positioning */
+#invoice #invoice-blank-header {
+  height: 10.5em;
+}
+
 table#invoice-amount td,
 div {
   border-width: 0;
diff --git a/styles/simple.css b/styles/simple.css
index 5e141cf..8683352 100755
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -3,66 +3,260 @@ Invoice Simple Theme
 Created by Ed Molyneux
 
 */
+
+
 /*=========================== TYPOGRAPHY =========================*/
 
-#invoice{font-family: Helvetica, Arial, Verdana, sans-serif !important }
-#invoice h1 {margin: 0;color: #555;font-size: 24px;text-transform: uppercase;}
-#invoice h2, #invoice h3 {color:#000; text-transform: none;font-family: Helvetica, Arial, Verdana, sans-serif !important;}
-#invoice h2 {margin: 10px 0;font-size: 14pt;}
-#invoice-amount td, th {font-size: 9pt;}
-#invoice-header #company-address {text-align: right; font-size: 11pt; line-height: 14pt;}
-#invoice #client-details, #invoice-info  p, #invoice #invoice-other, #invoice #payment-details {font-size: 9pt; line-height: 12pt;}
-#invoice-info h2, #invoice-info h3 {margin: 0; font-weight: normal;}
-#invoice-info h2{text-transform:uppercase}
-#invoice-info h3 {font-size:12pt;}
-#invoice #invoice-info p {text-align:right;margin-top:0}
-#invoice-info #payment-total{display:none}
-#comments {font-weight:bold;margin-top:15px; font-size:10pt}
+#invoice {
+  font-family: Helvetica, Arial, Verdana, sans-serif !important;
+}
+
+#invoice h1 {
+  color: #555;
+  font-size: 24px;
+  margin: 0;
+  text-transform: uppercase;
+}
+
+#invoice h2,
+#invoice h3 {
+  color: #000;
+  font-family: Helvetica, Arial, Verdana, sans-serif !important;
+  text-transform: none;
+}
+
+#invoice h2 {
+  font-size: 14pt;
+  margin: 10px 0;
+}
+
+#invoice-amount td,
+th {
+  font-size: 9pt;
+}
+
+#invoice-header #company-address {
+  font-size: 11pt;
+  line-height: 14pt;
+  text-align: right;
+}
+
+#invoice #client-details,
+#invoice-info p,
+#invoice #invoice-other,
+#invoice #payment-details {
+  font-size: 9pt;
+  line-height: 12pt;
+}
+
+#invoice-info h2,
+#invoice-info h3 {
+  font-weight: normal;
+  margin: 0;
+}
+
+#invoice-info h2 {
+  text-transform: uppercase;
+}
+
+#invoice-info h3 {
+  font-size: 12pt;
+}
+
+#invoice #invoice-info p {
+  margin-top: 0;
+  text-align: right;
+}
+
+#invoice-info #payment-total {
+  display: none;
+}
+
+#comments {
+  font-size: 10pt;
+  font-weight: bold;
+  margin-top: 15px;
+}
+
 
 /*=========================== LAYOUT =========================*/
 
-#invoice{padding:0 1cm 1cm 1cm; }
-#invoice-header .logo {float:left;}
-#invoice-header{margin-top:0.3cm; border-bottom:4px solid #000;padding-bottom:10px; overflow:hidden}
-* html #invoice-header {height:1%}
-#invoice-blank-header {margin-top: 1.6cm;}
-#company-address {margin: 0; padding: 0; width:300px; float:right}
-#invoice-info{margin: 0.7cm 0 20px 0; width:250px; float:right; text-align:right}
-#client-details {margin:0.7cm 0 20px 2.5cm;float:left;width:250px}   /* Positioned to appear in a standard envelope window when printed */
-#invoice-other {text-align: right; float: right;width:250px; }
-#invoice #payment-details{float:left; width:250px;}
-#invoice-amount {margin: 1em 0; clear: both; }
-#invoice h1#company-name {display:block;}
+#invoice {
+  padding: 1cm;
+}
+
+#invoice-header .logo {
+  float: left;
+}
+
+#invoice-header {
+  border-bottom: 1px solid #bbb;
+  overflow: hidden;
+  padding-bottom: 10px;
+}
+
+#invoice-blank-header {
+  margin-top: 1.6cm;
+}
+
+#company-address {
+  float: right;
+  margin: 0;
+  padding: 0;
+  width: 300px;
+}
+
+#invoice-info {
+  float: right;
+  margin: 0.7cm 0 20px 0;
+  text-align: right;
+  width: 250px;
+}
+
+#client-details {
+  float: left;
+  margin: 0.7cm 0 20px 2.5cm;
+  width: 250px;
+}
+
+
+/* Positioned to appear in a standard envelope window when printed */
+
+#invoice-other {
+  float: right;
+  text-align: right;
+  width: 250px;
+}
+
+#invoice #payment-details {
+  float: left;
+  width: 250px;
+}
+
+#invoice-amount {
+  clear: both;
+  margin: 1em 0;
+}
+
+#invoice h1#company-name {
+  display: block;
+}
+
 #invoice-amount tr.item td {
   border-top: 0;
 }
+
 #invoice-amount tfoot td {
-  border-top: 1px solid #ddd;
+  border-top: 1px solid #dddddd;
+}
+
+#invoice-amount .item_group_title td {
+  padding-top: 0.75em;
+}
+
+#comments {
+  clear: both;
+  padding-top: 0.5cm;
 }
-#invoice-amount .item_group_title td {padding-top: 0.75em;}
 
-#comments{clear:both; padding-top:0.5cm}
 
 /*=========================== TABLES =========================*/
 
-#invoice table#invoice-amount { border-collapse:collapse; width:100%;clear:both;}
-#invoice-amount th {text-align: left;white-space: nowrap;padding: 1px 2px 0 5px; font-weight: bold;background: #FFF;border-bottom: solid 1px #444; }
-#invoice-amount tr.odd{background: #EEE;}
-#invoice-amount tr.even{background: #FFF;}
-#invoice-amount td {margin: 0;padding: 4px 5px; vertical-align: top;}
-#invoice-amount td.item_r{text-align: right;}
-#invoice-amount td.item_l{text-align: left;white-space: normal;}
-#invoice-amount td.total{text-align: right;font-weight: bold}
-
-#invoice-amount .details_th{width:54%}
-#invoice-amount .details_notax_th{width:62%}
-#invoice-amount .quantity_th{width:13%}
-#invoice-amount .subtotal_th{width:15%; text-align:right}
-#invoice-amount .unitprice_th{width:10%; text-align:right}
-#invoice-amount .salestax_th{width:8%; text-align:center}
+#invoice table#invoice-amount {
+  border-collapse: collapse;
+  clear: both;
+  width: 100%;
+}
+
+#invoice-amount th {
+  background: #FFF;
+  border-bottom: solid 1px #bbb;
+  font-weight: bold;
+  padding: 1px 2px 0 5px;
+}
+
+#invoice-amount tr.odd {
+  background: #ebeeef;
+}
+
+#invoice-amount tr.even {
+  background: #FFF;
+}
+
+#invoice-amount td {
+  margin: 0;
+  padding: 4px 5px;
+  vertical-align: top;
+}
+
+#invoice-amount .item_r {
+  text-align: right;
+}
+
+#invoice-amount .item_l {
+  text-align: left;
+  white-space: normal;
+}
+
+#invoice-amount .total {
+  font-weight: bold;
+  line-height: 1.3;
+  text-align: right;
+}
+
+#invoice-amount .details_th,
+#invoice-amount td.description_td {
+  width: 50%;
+}
+
+#invoice-amount .details_notax_th {
+  width: 58%;
+}
+
+#invoice-amount .quantity_th {
+  width: 13%;
+}
+
+#invoice-amount .subtotal_th {
+  text-align: right;
+  width: 15%;
+}
+
+#invoice-amount .unitprice_th {
+  text-align: right;
+  width: 14%;
+}
+
+#invoice-amount .salestax_th {
+  text-align: right;
+  width: 8%;
+}
+
 
 /* Invoice UK VAT Summary Table */
-#invoice #invoice-uk-vat-summary{width:100%;border-collapse:collapse;margin:25px 0 0 0;clear:both;border:0; background:#fff; }
-#invoice tr#invoice-uk-vat-header th{padding:7px 0;border-top: 1px solid #ccc;}
-#invoice-uk-vat-summary td, #invoice #invoice-uk-vat-summary th{text-align:left; font-size:9pt;padding:2px 0;}
-#vat-total td, #vat-total th{border-top:1px solid #ccc;}
+
+#invoice #invoice-uk-vat-summary {
+  background: #fff;
+  border: 0;
+  border-collapse: collapse;
+  clear: both;
+  margin: 25px 0 0 0;
+  width: 100%;
+}
+
+#invoice tr#invoice-uk-vat-header th {
+  border-top: 1px solid #ccc;
+  padding: 7px 0;
+}
+
+#invoice-uk-vat-summary td,
+#invoice #invoice-uk-vat-summary th {
+  font-size: 9pt;
+  padding: 2px 0;
+  text-align: left;
+}
+
+#vat-total td,
+#vat-total th {
+  border-top: 1px solid #ccc;
+}
diff --git a/styles/simple_print.css b/styles/simple_print.css
index 6ebef4d..4546139 100755
--- a/styles/simple_print.css
+++ b/styles/simple_print.css
@@ -11,7 +11,10 @@
   @bottom-center {
     color: #666;
     content: counter(page) "/" counter(pages);
-    font: normal 9pt Arial, Helvetica, sans-serif;
+    font-size: 9pt;
+    font-style: normal;
+    font-weight: normal;
+    font-family: Arial, Helvetica, sans-serif;
   }
 
 }
@@ -34,13 +37,25 @@
 }
 
 #invoice {
-  padding-bottom: 0;
+  padding: 1cm 1cm 0 1cm !important;
 }
 
-#invoice-header {
-  border-width: 4px !important;
+/**
+ * Make these `border` colours darker than their on-screen values to ensure that
+ * they render clearly on the generated PDF
+ */
+
+#invoice-header,
+#invoice-amount th {
+  border-color: #444 !important;
 }
 
+/**
+ * Make these `border` widths thicker than their on-screen values to ensure that
+ * they render clearly on the generated PDF
+ */
+
+#invoice-header,
 table#invoice-amount td,
 table#invoice-amount th,
 div {
diff --git a/styles/tranquility.css b/styles/tranquility.css
index 5eaabb3..df98f8b 100755
--- a/styles/tranquility.css
+++ b/styles/tranquility.css
@@ -76,7 +76,7 @@ th,
   font-variant: small-caps;
   font-weight: normal;
   letter-spacing: 0.1em;
-  margin-bottom: 0px;
+  margin-bottom: 0;
   text-transform: capitalize;
 }
 
@@ -117,7 +117,7 @@ th,
 
 #invoice {
   background: #fff url("/gallery/ripple.jpg") 0px 120px no-repeat;
-  padding: 0 0.8cm 1.8cm 0.8cm;
+  padding: 0.8cm 0.8cm 1.8cm 0.8cm;
 }
 
 #invoice-header #company-address {
@@ -134,13 +134,9 @@ th,
   width: 350px;
 }
 
-#invoice-header {
-  padding-top: 0.5cm;
-}
-
 #invoice-header .logo {
   float: left;
-  margin: 0px 0 0 0px;
+  margin: 0;
 }
 
 #invoice-blank-header {
@@ -149,7 +145,7 @@ th,
 
 #client-details {
   float: left;
-  margin: 0px 0 20px 10px;
+  margin: 0 0 20px 10px;
   padding-top: 10px;
   width: 330px;
 }
@@ -247,7 +243,7 @@ th,
 }
 
 #invoice-amount #total_tr td {
-  background: #eee;
+  background: #ebeeef;
   border-bottom: 0;
 }
 
@@ -256,7 +252,7 @@ th,
 }
 
 #invoice-amount td {
-  border-bottom: 1px solid #ddd;
+  border-bottom: 1px solid #d8dde0;
   margin: 0;
   padding: 2px;
   vertical-align: center;
@@ -269,17 +265,18 @@ th,
   vertical-align: top;
 }
 
-#invoice-amount td.item_r {
+#invoice-amount .item_r {
   text-align: right;
 }
 
-#invoice-amount td.item_l {
+#invoice-amount .item_l {
   text-align: left;
   white-space: normal;
 }
 
-#invoice-amount td.total {
+#invoice-amount .total {
   font-weight: bold;
+  line-height: 1.3;
   text-align: right;
 }
 
@@ -318,15 +315,15 @@ th,
 }
 
 #invoice-amount .salestax_th {
-  text-align: center;
+  text-align: right;
   width: 7%;
 }
 
 /* Invoice UK VAT Summary Table */
 #invoice #invoice-uk-vat-summary {
   background: #fff;
-  border-collapse: collapse;
   border: 0;
+  border-collapse: collapse;
   clear: both;
   margin: 25px 0 0 0;
   width: 100%;
diff --git a/styles/tranquility_print.css b/styles/tranquility_print.css
index 48181a7..1cc38c9 100755
--- a/styles/tranquility_print.css
+++ b/styles/tranquility_print.css
@@ -11,7 +11,10 @@
   @bottom-center {
     color: #666;
     content: counter(page) "/" counter(pages);
-    font: normal 9pt Arial, Helvetica, sans-serif;
+    font-size: 9pt;
+    font-style: normal;
+    font-weight: normal;
+    font-family: Arial, Helvetica, sans-serif;
   }
 
 }
@@ -38,3 +41,7 @@ table#invoice-amount th,
 div {
   border-width: 0.05mm !important;
 }
+
+#invoice {
+  padding: 1cm 1cm 0 1cm !important;
+}
diff --git a/styles/union.css b/styles/union.css
index 45939fe..da8f4db 100755
--- a/styles/union.css
+++ b/styles/union.css
@@ -5,69 +5,261 @@ Created by Olly Headey
 */
 /*=========================== TYPOGRAPHY =========================*/
 
-#invoice{font-family: "Century Gothic", Helvetica, Arial, Verdana, sans-serif !important; width: 603px; }
-#invoice h1 {margin: 0;color: #555;font-size: 24px;text-transform: uppercase;}
-#invoice h2, #invoice h3 {color:#000; text-transform: none;}
-#invoice h2 {margin: 10px 0;font-size: 14pt;}
-#invoice-amount td, th {font-size: 10pt;}
-#invoice-header #company-address {text-align: right; font-size: 11pt; line-height: 14pt;}
-#invoice #client-details, #invoice-info p {font-size: 10pt; line-height: 14pt;}
-#invoice #invoice-other, #invoice #payment-details {font-size: 10pt; line-height: 14pt;}
-#invoice-info h2, #invoice-info h3 {margin: 0; font-weight: normal;}
-#invoice #invoice-info h2{text-transform:uppercase; font-size: 18pt;}
-#invoice #invoice-info h3 {font-size:12pt;}
-#invoice #invoice-info p {text-align:right;margin-top:0}
-#invoice-info #payment-total{display:none}
-#comments {font-weight:bold;margin-top:0; font-size:10pt}
-#invoice #invoice-info h2, #invoice #company-address div.email, #invoice #invoice-other h2, #invoice #payment-details h2 {color: #a10000;}
-#invoice #invoice-other h2, #invoice #payment-details h2 {font-weight: normal; text-transform: uppercase;}
+#invoice {
+    font-family: "Century Gothic", CenturyGothic, AppleGothic, Helvetica, Arial, Verdana, sans-serif !important;
+    width: 603px;
+}
+#invoice h1 {
+    color: #555;
+    font-size: 24px;
+    margin: 0;
+    text-transform: uppercase;
+}
+#invoice h2,
+#invoice h3 {
+    color: #000;
+    text-transform: none;
+}
+#invoice h2 {
+    font-size: 14pt;
+    margin: 10px 0;
+}
+#invoice-amount td,
+th {
+    font-size: 10pt;
+}
+#invoice-header #company-address {
+    font-size: 11pt;
+    line-height: 14pt;
+    text-align: right;
+}
+#invoice #client-details,
+#invoice-info p {
+    font-size: 10pt;
+    line-height: 14pt;
+}
+#invoice #invoice-other, 
+#invoice #payment-details {
+    font-size: 10pt;
+    line-height: 14pt;
+}
+#invoice-info h2,
+#invoice-info h3 {
+    font-weight: normal;
+    margin: 0;
+}
+#invoice #invoice-info h2 {
+    font-size: 18pt;
+    text-transform: uppercase;
+}
+#invoice #invoice-info h3 {
+    font-size: 12pt;
+}
+#invoice #invoice-info p {
+    margin-top: 0;
+    text-align: right;
+}
+#invoice-info #payment-total {
+    display: none;
+}
+#comments {
+    font-size: 10pt;
+    font-weight: bold;
+    margin-top: 0;
+}
+#invoice #invoice-info h2,
+#invoice #company-address div.email,
+#invoice #invoice-other h2,
+#invoice #payment-details h2 {
+    color: #a10000;
+}
+#invoice #invoice-other h2,
+#invoice #payment-details h2 {
+    font-weight: normal;
+    text-transform: uppercase;
+}
 
 /*=========================== LAYOUT =========================*/
 
-#invoice {padding:0 1cm 1cm 1cm; border-left: 60px solid #99080d;}
-#invoice-header .logo {float:left;}
-#invoice-header{margin-top:1.5cm; border-bottom:1px solid #a10000;padding-bottom:10px; overflow:hidden}
-* html #invoice-header {height:1%}
-#invoice-blank-header {margin-top: 1.6cm;}
-#invoice-info{margin: 0.7cm 0 20px 0; width:55%; float:right; text-align:right;}
-#invoice-info #payment-terms {display:none;}
-#invoice-info #payment-due {font-style: italic;}
-#company-address {margin: 0; padding: 0; width:300px; float:right}
-#client-details {margin:0.7cm 0 20px 0cm;float:left;width:35%}   /* Positioned to appear in a standard envelope window when printed */
-#invoice-other {text-align: right;clear:both; float: right;width:50%;margin-top:0}
-#invoice #payment-details{float:left; width:45%;margin-top:0 }
-#payment-details .sort-code, #payment-details .account-number, #payment-details .payment-reference {clear: left;}
-#payment-details strong {font-weight: normal; float: left; width: 12em;}
-#invoice-other strong {font-weight: normal; float: left; width: 16em; }
-#invoice-other #comments {clear: both; margin-top: 0em; font-weight: normal; color: #a10000;}
-#invoice-other #contract-number{margin-bottom:3em}
-#invoice-amount .item_group_title td {padding-top: 0.75em;}
+#invoice {
+    border-left: 60px solid #99080d;
+    padding: 0 1cm 1cm;
+}
+#invoice-header .logo {
+    float: left;
+}
+#invoice-header {
+    border-bottom: 1px solid #a10000;
+    margin-top: 1.5cm;
+    overflow: hidden;
+    padding-bottom: 10px;
+}
+#invoice-blank-header {
+    margin-top: 1.6cm;
+}
+#invoice-info {
+    float: right;
+    margin: 0.7cm 0 20px;    
+    text-align: right;
+    width: 55%;
+}
+#invoice-info #payment-terms {
+    display: none;
+}
+#invoice-info #payment-due {
+    font-style: italic;
+}
+#company-address {
+    float: right;
+    margin: 0;
+    padding: 0;
+    width: 300px;
+}
+#client-details {
+    float: left;
+    margin: 0.7cm 0 20px;
+    width: 35%;
+} /* Positioned to appear in a standard envelope window when printed */
+#invoice-other {
+    clear: both;
+    float: right;
+    margin-top: 0;
+    text-align: right;
+    width: 50%;
+}
+#invoice #payment-details {
+    float: left;
+    margin-top: 0;
+    width: 45%;
+}
+#payment-details .sort-code,
+#payment-details .account-number,
+#payment-details .payment-reference {
+    clear: left;
+}
+#payment-details strong {
+    float: left;
+    font-weight: normal;
+    width: 12em;
+}
+#invoice-other strong {
+    float: left;
+    font-weight: normal;
+    width: 16em;
+}
+#invoice-other #comments {
+    clear: both;
+    color: #a10000;
+    font-weight: normal;
+    margin-top: 0;    
+}
+#invoice-other #contract-number {
+    margin-bottom: 3em;
+}
+#invoice-amount .item_group_title td {
+    padding-top: 0.75em;
+}
 
-#comments{clear:both; padding-top:0.3cm}
+#comments {
+    clear: both;
+    padding-top: 0.3cm;
+}
 
 /*=========================== TABLES =========================*/
 
-#invoice table#invoice-amount { border-collapse:collapse; width:100%;clear:both;margin:1cm 0 0.4cm 0; }
-#invoice-amount th {text-align: left;white-space: nowrap;padding: 6px 5px; font-weight: normal;background: #F2F2F2; }
-#invoice-amount td {margin: 0;padding: 5px; vertical-align: top;}
-#invoice-amount tr.item td {background:#fff;}
-#invoice-amount td.item_r{text-align: right;}
-#invoice-amount td.item_l{text-align: left;white-space: normal;}
-#invoice-amount td.total{text-align: right;font-weight: bold; /*color: #a10000;*/}
-#invoice-amount td.action{background: #FFF; width:7%;padding-right:0; white-space:nowrap;text-align:center}
-#invoice-amount tr#total_tr {background: #F2F2F2;}
-#invoice-amount td {border-top: 1px solid #F2F2F2;}
-#invoice-amount tr#discount_tr, #invoice-amount tr#net_total_tr, #invoice-amount tr#vat_tr {color: #777;}
+#invoice table#invoice-amount {
+    border-collapse: collapse;
+    clear: both; 
+    margin: 1cm 0 0.4cm;
+    width: 100%;
+}
+#invoice-amount th {
+    background: #F2F2F2;
+    font-weight: normal;
+    padding: 6px 5px;
+}
+#invoice-amount td {
+    margin: 0;
+    padding: 5px;
+    vertical-align: top;
+}
+#invoice-amount tr.item td {
+    background: #fff;
+}
+#invoice-amount .item_r {
+    text-align: right;
+}
+#invoice-amount .item_l {
+    text-align: left;
+    white-space: normal;
+}
+#invoice-amount .total {
+    font-weight: bold;
+    line-height: 1.3;
+    text-align: right;
+}
+#invoice-amount td.action {
+    background: #FFF;
+    padding-right: 0;
+    text-align: center;
+    white-space: nowrap;
+    width: 7%;
+}
+#invoice-amount tr#total_tr {
+    background: #F2F2F2;
+}
+#invoice-amount td {
+    border-top: 1px solid #F2F2F2;
+}
+#invoice-amount tr#discount_tr,
+#invoice-amount tr#net_total_tr,
+#invoice-amount tr#vat_tr {
+    color: #777;
+}
 
-#invoice-amount .details_th{width:46%}
-#invoice-amount .details_notax_th{width:54%}
-#invoice-amount .quantity_th{width:13%}
-#invoice-amount .subtotal_th{width:18%; text-align:right}
-#invoice-amount .unitprice_th{width:15%; text-align:right}
-#invoice-amount .salestax_th{width:8%; text-align:center}
+#invoice-amount .details_th,
+#invoice-amount td.description_td {
+    width: 46%;
+}
+#invoice-amount .details_notax_th {
+    width: 54%;
+}
+#invoice-amount .quantity_th {
+    width: 13%;
+}
+#invoice-amount .subtotal_th {
+    text-align: right;
+    width: 18%;
+}
+#invoice-amount .unitprice_th {
+    text-align: right;
+    width: 15%;
+}
+#invoice-amount .salestax_th {
+    text-align: right;
+    width: 8%;
+}
 
 /* Invoice UK VAT Summary Table */
-#invoice #invoice-uk-vat-summary{width:100%;border-collapse:collapse;margin:25px 0 0 0;clear:both;border:0; background:#fff; }
-#invoice tr#invoice-uk-vat-header th{padding:7px 0;border-top: 1px solid #ccc;}
-#invoice-uk-vat-summary td, #invoice #invoice-uk-vat-summary th{text-align:left; font-size:9pt;padding:2px 0;}
-#vat-total td, #vat-total th{border-top:1px solid #ccc;}
+#invoice #invoice-uk-vat-summary {
+    background: #fff;
+    border: 0;
+    border-collapse: collapse;
+    clear: both;
+    margin: 25px 0 0;
+    width: 100%;
+}
+#invoice tr#invoice-uk-vat-header th {
+    border-top: 1px solid #ccc;
+    padding: 7px 0;
+}
+#invoice-uk-vat-summary td,
+#invoice #invoice-uk-vat-summary th {
+    font-size: 9pt;
+    padding: 2px 0;
+    text-align: left;
+}
+#vat-total td,
+#vat-total th {
+    border-top: 1px solid #ccc;
+}
diff --git a/styles/union_print.css b/styles/union_print.css
index c3fd124..19bbdd3 100755
--- a/styles/union_print.css
+++ b/styles/union_print.css
@@ -3,6 +3,7 @@
  */
 
 @page {
+  border-left: 60px solid #99080d;
   counter-increment: page;
   margin-left: 0;
   margin-right: 0;
@@ -11,7 +12,10 @@
   @bottom-center {
     color: #666;
     content: counter(page) "/" counter(pages);
-    font: normal 9pt Arial, Helvetica, sans-serif;
+    font-size: 9pt;
+    font-style: normal;
+    font-weight: normal;
+    font-family: Arial, Helvetica, sans-serif;
   }
 
 }
@@ -33,13 +37,16 @@
   display: none;
 }
 
-body {
-  border-left: 60px solid #99080d;
-}
+/**
+ * 1. Left-hand border is removed from the `#invoice` element in this print CSS
+ *    and instead applied to the `@page` element to ensure the appearance of the
+ *    PDF is consistent with the on-screen preview
+ */
 
 #invoice {
+  /* 1 */
   border-left: 0;
-  padding-bottom: 0;
+  padding: 0 1cm 0 1cm !important;
 }
 
 #Main {