diff --git a/guest_view_invoice.php b/guest_view_invoice.php
index 0f2fde85..d8e1b0ac 100644
--- a/guest_view_invoice.php
+++ b/guest_view_invoice.php
@@ -206,6 +206,9 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
               </thead>
               <tbody>
                 <?php
+                
+                $total_tax = 0;
+                $sub_total = 0;
           
                 while($row = mysqli_fetch_array($sql_invoice_items)){
                   $item_id = $row['item_id'];
@@ -216,9 +219,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
                   $item_subtotal = $row['item_price'];
                   $item_tax = $row['item_tax'];
                   $item_total = $row['item_total'];
-                  $total_tax = 0;
                   $total_tax = $item_tax + $total_tax;
-                  $sub_total = 0;
                   $sub_total = $item_price * $item_quantity + $sub_total;
 
                 ?>
@@ -285,6 +286,433 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
       <center><?php echo $config_invoice_footer; ?></center>
     </div>
   </div>
+  
+  <script src='plugins/pdfmake/pdfmake.js'></script>
+<script src='plugins/pdfmake/vfs_fonts.js'></script>
+<script>
+
+var docDefinition = {
+	info: {
+		title: '<?php echo "$company_name - Invoice"; ?>',
+		author: '<?php echo $company_name; ?>'
+	},
+	footer: {
+		columns: [
+			{ 
+				text: <?php echo json_encode($config_invoice_footer); ?>,
+				style: 'documentFooterCenter' 
+			},
+		]
+	},
+
+	//watermark: {text: '<?php echo $invoice_status; ?>', color: 'lightgrey', opacity: 0.3, bold: true, italics: false},
+
+	content: [
+		// Header
+		{
+			columns: [
+				<?php if(!empty($company_logo_base64)){ ?>
+				{
+					image: '<?php echo "data:image;base64,$company_logo_base64"; ?>',
+					width: 120
+				},
+				<?php } ?>
+		            
+				[
+					{
+						text: 'Invoice', 
+						style: 'invoiceTitle',
+						width: '*'
+					},
+					{
+						text: '<?php echo "$invoice_prefix$invoice_number"; ?>', 
+						style: 'invoiceNumber',
+						width: '*'
+					},
+		    ],
+	 		],
+		},
+		// Billing Headers
+		{
+			columns: [
+				{
+		    	text: <?php echo json_encode($company_name); ?>,
+		      style:'invoiceBillingTitle',
+		    },
+		    {
+		      text: <?php echo json_encode($client_name); ?>,
+		      style:'invoiceBillingTitleClient',        
+		    },
+			]
+		},
+		// Billing Address
+		{
+			columns: [
+		  	{
+		      text: <?php echo json_encode("$company_address \n $company_city $company_state $company_zip \n $company_phone \n $company_website"); ?>,
+		      style: 'invoiceBillingAddress'
+		    },
+		    {
+		      text: <?php echo json_encode("$client_address \n $client_city $client_state $client_zip \n $client_email \n $client_phone"); ?>,
+		      style: 'invoiceBillingAddressClient'
+		    },
+		  ]
+		},
+		//Invoice Dates Table
+		{
+			table: {
+		  	// headers are automatically repeated if the table spans over multiple pages
+		    // you can declare how many rows should be treated as headers
+		    headerRows: 0,
+		    widths: [ '*',80, 80 ],
+
+		    body: [
+		    	// Total
+		      [ 
+		      	{
+		      		text:'',
+		      		rowSpan: 3
+		      	},
+		      	{}, 
+						{},
+		      ],
+		      [ 
+		      	{},
+		      	{
+							text:'Invoice Date',
+							style:'invoiceDateTitle',
+						}, 
+						{
+							text:'<?php echo $invoice_date ?>',
+							style:'invoiceDateValue',
+						},
+		      ],
+		      [ 
+		      	{},
+		      	{
+							text:'Due Date',
+							style:'invoiceDateTitle',
+						}, 
+						{
+							text:'<?php echo $invoice_due ?>',
+							style:'invoiceDateValue',
+						},
+		      ],
+		    ]
+		  }, // table
+		  layout: 'lightHorizontalLines'
+		},
+		// Line breaks
+		'\n\n',
+		// Items
+		{
+			table: {
+				// headers are automatically repeated if the table spans over multiple pages
+				// you can declare how many rows should be treated as headers
+				headerRows: 1,
+				widths: [ '*', 40, 'auto', 'auto', 80 ],
+
+				body: [
+					// Table Header
+					[ 
+						{
+							text: 'Product',
+							style: [ 'itemsHeader', 'left']
+						}, 
+						{
+						  text: 'Qty',
+						  style: [ 'itemsHeader', 'center']
+						}, 
+						{
+						  text: 'Price',
+						  style: [ 'itemsHeader', 'right']
+						}, 
+						{
+						  text: 'Tax',
+						  style: [ 'itemsHeader', 'right']
+						}, 
+						{
+						  text: 'Total',
+						  style: [ 'itemsHeader', 'right']
+						} 
+					],
+		      // Items
+		      <?php 
+		      $total_tax = 0;
+		      $sub_total = 0;
+
+		      $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE invoice_id = $invoice_id ORDER BY item_id ASC");
+		      
+		      while($row = mysqli_fetch_array($sql_invoice_items)){
+		        $item_name = $row['item_name'];
+		        $item_description = $row['item_description'];
+		        $item_quantity = $row['item_quantity'];
+		        $item_price = $row['item_price'];
+		        $item_subtotal = $row['item_price'];
+		        $item_tax = $row['item_tax'];
+		        $item_total = $row['item_total'];
+		        $tax_id = $row['tax_id'];
+		        $total_tax = $item_tax + $total_tax;
+		        $total_tax = number_format($total_tax,2);
+		        $sub_total = $item_price * $item_quantity + $sub_total;
+		        $sub_total = number_format($sub_total, 2);
+		      ?>
+
+		      // Item
+		      [	 
+		        [
+		        	{
+		          	text: <?php echo json_encode($item_name); ?>,
+		            style:'itemTitle'
+		          },
+		          {
+		            text: <?php echo json_encode($item_description); ?>,
+		            style:'itemDescription'       
+		          }
+		        ], 
+		        {
+		        	text:'<?php echo $item_quantity; ?>',
+		          style:'itemQty'
+		        }, 
+		        {
+		        	text:'$<?php echo $item_price; ?>',
+		         	style:'itemNumber'
+		        }, 
+		        {
+		          text:'$<?php echo $item_tax; ?>',
+		          style:'itemNumber'
+		        }, 
+		        {
+		          text: '$<?php echo $item_total; ?>',
+		          style:'itemNumber'
+		        } 
+		    	],
+		
+					<?php
+					}
+					?>
+		      // END Items
+		    ]
+		  }, // table
+		  layout: 'lightHorizontalLines'
+	 	},
+	 	// TOTAL
+		{
+			table: {
+		  	// headers are automatically repeated if the table spans over multiple pages
+		    // you can declare how many rows should be treated as headers
+		    headerRows: 0,
+		    widths: [ '*','auto', 80 ],
+
+		    body: [
+		    	// Total
+		      [ 
+		      	{
+		      		text: 'Notes',
+		  				style:'notesTitle'
+		  			},
+		      	{},
+		      	{}
+		      ],
+		      [ 
+		      	{
+		      		rowSpan: 5,
+							text: <?php echo json_encode($invoice_note); ?>,
+		  				style:'notesText'
+		  			},
+		      	{
+		        	text:'Subtotal',
+		          style:'itemsFooterSubTitle'
+		        }, 
+		        { 
+		         	text:'$<?php echo $sub_total; ?>',
+		          style:'itemsFooterSubValue'
+		        }
+		      ],
+		      [ 
+		      	{},    	
+		      	{
+		        	text:'Tax',
+		          style:'itemsFooterSubTitle'
+		        },
+		        {
+		         	text: '$<?php echo number_format($total_tax,2); ?>',
+		          style:'itemsFooterSubValue'
+		        }
+		      ],
+		      [ 
+		      	{},
+		      	{
+		        	text:'Total',
+		          style:'itemsFooterSubTitle'
+		        }, 
+		        {
+		         	text: '$<?php echo number_format($invoice_amount,2); ?>',
+		          style:'itemsFooterSubValue'
+		        }
+		      ],
+		      [ 
+		      	{},
+		      	{
+		        	text:'Paid',
+		          style:'itemsFooterSubTitle'
+		        },
+		        {
+		          text: '$<?php echo number_format($amount_paid,2); ?>',
+		          style:'itemsFooterSubValue'
+		        }
+		      ],
+		      [ 
+		      	{},
+		      	{
+		        	text:'Balance',
+		          style:'itemsFooterTotalTitle'
+		        },
+		        {
+		        	text: '$<?php echo number_format($balance,2); ?>',
+		          
+		          style:'itemsFooterTotalTitle'
+		        }
+		      ],
+		    ]
+		  }, // table
+		  layout: 'lightHorizontalLines'
+		}
+	], //End Content,
+	styles: {
+		// Document Footer
+		documentFooterCenter: {
+			fontSize: 9,
+		  margin: [10,10,10,10],
+		  alignment:'center'
+		},
+		// Invoice Title
+		invoiceTitle: {
+			fontSize: 18,
+			bold: true,
+			alignment:'right',
+			margin:[0,0,0,3]
+		},
+		// Invoice Number
+		invoiceNumber: {
+			fontSize: 14,
+			alignment:'right'
+		},
+		// Billing Headers
+		invoiceBillingTitle: {
+			fontSize: 14,
+			bold: true,
+			alignment:'left',
+			margin:[0,20,0,5]
+		},
+		invoiceBillingTitleClient: {
+			fontSize: 14,
+			bold: true,
+			alignment:'right',
+			margin:[0,20,0,5]
+		},
+		// Billing Details
+		invoiceBillingAddress: {
+		  fontSize: 10,
+		  lineHeight: 1.2
+		},
+		invoiceBillingAddressClient: {
+			fontSize: 10,
+			lineHeight: 1.2,
+			alignment:'right',
+			margin:[0,0,0,30]
+		},
+		// Invoice Dates
+		invoiceDateTitle: {
+			fontSize: 10,
+			alignment:'left',
+			margin:[0,5,0,5]
+		},
+		invoiceDateValue: {
+			fontSize: 10,
+			alignment:'right',
+			margin:[0,5,0,5]
+		},
+		// Items Header
+		itemsHeader: {
+			fontSize: 10,
+			margin: [0,5,0,5],
+			bold: true,
+			alignment:'right'
+		},
+		// Item Title
+		itemTitle: {
+			fontSize: 10,
+			bold: true,
+			margin: [0,5,0,3]
+		},
+		itemDescription: {
+			italics: true,
+			fontSize: 9,
+			lineHeight: 1.1,
+			margin: [0,3,0,5]
+		},
+		itemQty: {
+			fontSize: 10,
+			margin: [0,5,0,5],
+			alignment: 'center',
+		},
+		itemNumber: {
+		  fontSize: 10,
+		  margin: [0,5,0,5],
+		  alignment: 'right',
+		},
+		itemTotal: {
+		  fontSize: 10,
+		  margin: [0,5,0,5],
+		  bold: true,
+		  alignment: 'right',
+		},
+		// Items Footer (Subtotal, Total, Tax, etc)
+		itemsFooterSubTitle: {
+		  fontSize: 10,
+		  margin: [0,5,0,5],
+		  alignment:'right',
+		},
+		itemsFooterSubValue: {
+		  fontSize: 10,
+		  margin: [0,5,0,5],
+		  bold: false,
+		  alignment:'right',
+		},
+		itemsFooterTotalTitle: {
+		  fontSize: 10,
+		  margin: [0,5,0,5],
+		  bold: true,
+		  alignment:'right',
+		},
+		itemsFooterTotalValue: {
+		  fontSize: 10,
+		  margin: [0,5,0,5],
+		  bold: true,
+		  alignment:'right',
+		},
+		notesTitle: {
+			fontSize: 10,
+			bold: true,  
+			margin: [0,5,0,5],
+		},
+		notesText: {
+			fontSize: 9,
+			margin: [0,5,50,5]
+		},
+		left: {
+			alignment:'left',
+		},
+		center: {
+			alignment:'center',
+		},
+	},
+	defaultStyle: {
+		columnGap: 20,
+	}
+}
+</script>
 
   <?php
 
@@ -500,412 +928,6 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
   }
   ?>
 
-  <script src='plugins/pdfmake/pdfmake.js'></script>
-        <script src='plugins/pdfmake/vfs_fonts.js'></script>
-
-        <script>
-
-        // Invoice markup
-        // Author: Max Kostinevich
-        // BETA (no styles)
-        // http://pdfmake.org/playground.html
-        // playground requires you to assign document definition to a variable called dd
-
-        // CodeSandbox Example: https://codesandbox.io/s/pdfmake-invoice-oj81y
-
-
-        var docDefinition = {
-        info: {
-        title: '<?php echo "$company_name - Invoice"; ?>',
-        author: '<?php echo $company_name; ?>'
-        },
-
-
-        footer: {
-        columns: [
-          
-          { text: '<?php echo $config_invoice_footer; ?>', style: 'documentFooterCenter' },
-         
-        ]
-        },
-
-        watermark: {text: '<?php echo $invoice_status; ?>', color: 'grey', opacity: 0.3, bold: true, italics: false},
-
-        content: [
-          // Header
-          {
-              columns: [
-                  <?php if(!empty($company_logo_base64)){ ?>
-                  {
-                        image: '<?php echo "data:image;base64,$company_logo_base64"; ?>',
-                        width: 120
-                  },
-                  <?php } ?>
-                      
-                  [
-                      {
-                          text: 'INVOICE', 
-                          style: 'invoiceTitle',
-                          width: '*'
-                      },
-                      {
-                        stack: [
-                             {
-                                 columns: [
-                                      {
-                                          text:'Invoice #', 
-                                          style:'invoiceSubTitle',
-                                          width: '*'
-                                          
-                                      }, 
-                                      {
-                                          text:'<?php echo "$invoice_prefix$invoice_number"; ?>',
-                                          style:'invoiceSubValue',
-                                          width: 100
-                                          
-                                      }
-                                      ]
-                             },
-                             {
-                                 columns: [
-                                     {
-                                         text:'Date Issued',
-                                         style:'invoiceSubTitle',
-                                         width: '*'
-                                     }, 
-                                     {
-                                         text:'<?php echo $invoice_date ?>',
-                                         style:'invoiceSubValue',
-                                         width: 100
-                                     }
-                                     ]
-                             },
-                             {
-                                 columns: [
-                                     {
-                                         text:'Due Date',
-                                         style:'invoiceSubTitle',
-                                         width: '*'
-                                     }, 
-                                     {
-                                         text:'<?php echo $invoice_due ?>',
-                                         style:'invoiceSubValue',
-                                         width: 100
-                                     }
-                                     ]
-                             },
-                         ]
-                      }
-                  ],
-              ],
-          },
-          // Billing Headers
-          {
-              columns: [
-                  {
-                      text: '<?php echo $company_name; ?>',
-                      style:'invoiceBillingTitle',
-                      
-                  },
-                  {
-                      text: '<?php echo $client_name; ?>',
-                      style:'invoiceBillingTitle',
-                      
-                  },
-              ]
-          },
-          
-          {
-              columns: [
-                  {
-                      text: '<?php echo $company_address; ?> \n <?php echo "$company_city $company_state $company_zip"; ?> \n \n <?php echo $company_phone; ?> \n <?php echo $company_website; ?>',
-                      style: 'invoiceBillingAddress'
-                  },
-                  {
-                      text: '<?php echo $client_address; ?> \n <?php echo "$client_city $client_state $client_zip"; ?> \n \n <?php echo $client_email; ?> \n <?php echo $client_phone; ?>',
-                      style: 'invoiceBillingAddress'
-                  },
-              ]
-          },
-            // Line breaks
-          '\n\n',
-          // Items
-            {
-              table: {
-                // headers are automatically repeated if the table spans over multiple pages
-                // you can declare how many rows should be treated as headers
-                headerRows: 1,
-                widths: [ '*', 40, 'auto', 'auto', 80 ],
-
-                body: [
-                  // Table Header
-                  [ 
-                      {
-                          text: 'Product',
-                          style: 'itemsHeader'
-                      }, 
-                      {
-                          text: 'Qty',
-                          style: [ 'itemsHeader', 'center']
-                      }, 
-                      {
-                          text: 'Price',
-                          style: [ 'itemsHeader', 'center']
-                      }, 
-                      {
-                          text: 'Tax',
-                          style: [ 'itemsHeader', 'center']
-                      }, 
-                      {
-                          text: 'Total',
-                          style: [ 'itemsHeader', 'center']
-                      } 
-                  ],
-                  // Items
-                  <?php 
-                  $total_tax = 0;
-                  $sub_total = 0;
-
-                  $sql_invoice_items = mysqli_query($mysqli,"SELECT * FROM invoice_items WHERE invoice_id = $invoice_id ORDER BY item_id ASC");
-                  
-                  while($row = mysqli_fetch_array($sql_invoice_items)){
-                    $item_name = $row['item_name'];
-                    $item_description = $row['item_description'];
-                    $item_quantity = $row['item_quantity'];
-                    $item_price = $row['item_price'];
-                    $item_subtotal = $row['item_price'];
-                    $item_tax = $row['item_tax'];
-                    $item_total = $row['item_total'];
-                    $tax_id = $row['tax_id'];
-                    $total_tax = $item_tax + $total_tax;
-                    $total_tax = number_format($total_tax,2);
-                    $sub_total = $item_price * $item_quantity + $sub_total;
-                    $sub_total = number_format($sub_total, 2);
-                    echo "
-
-                      // Item 1
-                      [ 
-                        [
-                            {
-                                text: '$item_name',
-                                style:'itemTitle'
-                            },
-                            {
-                                text: '$item_description',
-                                style:'itemSubTitle'
-                                
-                            }
-                        ], 
-                        {
-                            text:'$item_quantity',
-                            style:'itemNumber'
-                        }, 
-                        {
-                            text:'$$item_price',
-                            style:'itemNumber'
-                        }, 
-                        {
-                            text:'$$item_tax',
-                            style:'itemNumber'
-                        }, 
-                        {
-                            text: '$$item_total',
-                            style:'itemTotal'
-                        } 
-                    ],
-
-                    ";
-
-                  }
-
-                  ?>
-
-                  // END Items
-                ]
-              }, // table
-            //  layout: 'lightHorizontalLines'
-            },
-         // TOTAL
-            {
-              table: {
-                // headers are automatically repeated if the table spans over multiple pages
-                // you can declare how many rows should be treated as headers
-                headerRows: 0,
-                widths: [ '*', 80 ],
-
-                body: [
-                  // Total
-                  [ 
-                      {
-                          text:'Subtotal',
-                          style:'itemsFooterSubTitle'
-                      }, 
-                      { 
-                          text:'$<?php echo $sub_total; ?>',
-                          style:'itemsFooterSubValue'
-                      }
-                  ],
-                  [ 
-                      {
-                          text:'Tax',
-                          style:'itemsFooterSubTitle'
-                      },
-                      {
-                          text: '$<?php echo $total_tax; ?>',
-                          style:'itemsFooterSubValue'
-                      }
-                  ],
-                  [ 
-                      {
-                          text:'TOTAL',
-                          style:'itemsFooterTotalTitle'
-                      }, 
-                      {
-                          text: '$<?php echo $invoice_amount; ?>',
-                          style:'itemsFooterTotalValue'
-                      }
-                  ],
-                  [ 
-                      {
-                          text:'Paid',
-                          style:'itemsFooterSubTitle'
-                      },
-                      {
-                          text: '$<?php echo $amount_paid; ?>',
-                          style:'itemsFooterSubValue'
-                      }
-                  ],
-                  [ 
-                      {
-                          text:'Balance',
-                          style:'itemsFooterSubTitle'
-                      },
-                      {
-                          text: '$<?php echo $balance; ?>',
-                          style:'itemsFooterSubValue'
-                      }
-                  ],
-                ]
-              }, // table
-              layout: 'lightHorizontalLines'
-            },
-            { 
-                text: 'NOTES',
-                style:'notesTitle'
-            },
-            { 
-                text: '<?php ?>',
-                style:'notesText'
-            }
-        ],
-        styles: {
-          
-        // Document Footer
-        documentFooterCenter: {
-            fontSize: 10,
-            margin: [5,5,5,5],
-            alignment:'center'
-        },
-        // Invoice Title
-        invoiceTitle: {
-          fontSize: 22,
-          bold: true,
-          alignment:'right',
-          margin:[0,0,0,15]
-        },
-        // Invoice Details
-        invoiceSubTitle: {
-          fontSize: 12,
-          alignment:'right'
-        },
-        invoiceSubValue: {
-          fontSize: 12,
-          alignment:'right'
-        },
-        // Billing Headers
-        invoiceBillingTitle: {
-          fontSize: 14,
-          bold: true,
-          alignment:'left',
-          margin:[0,20,0,5],
-        },
-        // Billing Details
-        invoiceBillingDetails: {
-          alignment:'left'
-
-        },
-        invoiceBillingAddressTitle: {
-            margin: [0,7,0,3],
-            bold: true
-        },
-        invoiceBillingAddress: {
-            
-        },
-        // Items Header
-        itemsHeader: {
-            margin: [0,5,0,5],
-            bold: true
-        },
-        // Item Title
-        itemTitle: {
-            bold: true,
-        },
-        itemSubTitle: {
-                italics: true,
-                fontSize: 11
-        },
-        itemNumber: {
-            margin: [0,5,0,5],
-            alignment: 'center',
-        },
-        itemTotal: {
-            margin: [0,5,0,5],
-            bold: true,
-            alignment: 'center',
-        },
-
-        // Items Footer (Subtotal, Total, Tax, etc)
-        itemsFooterSubTitle: {
-            margin: [0,5,0,5],
-            bold: true,
-            alignment:'right',
-        },
-        itemsFooterSubValue: {
-            margin: [0,5,0,5],
-            bold: true,
-            alignment:'center',
-        },
-        itemsFooterTotalTitle: {
-            margin: [0,5,0,5],
-            bold: true,
-            alignment:'right',
-        },
-        itemsFooterTotalValue: {
-            margin: [0,5,0,5],
-            bold: true,
-            alignment:'center',
-        },
-        notesTitle: {
-          fontSize: 10,
-          bold: true,  
-          margin: [0,50,0,3],
-        },
-        notesText: {
-          fontSize: 10
-        },
-        center: {
-            alignment:'center',
-        },
-        },
-        defaultStyle: {
-        columnGap: 20,
-        }
-        };
-
-        </script>
-
-
-
 <?php 
   }else{
     echo "GTFO";
diff --git a/invoice.php b/invoice.php
index 45636407..6b5ba183 100644
--- a/invoice.php
+++ b/invoice.php
@@ -490,15 +490,6 @@ include("footer.php");
 <script src='plugins/pdfmake/vfs_fonts.js'></script>
 <script>
 
-// Invoice markup
-// Author: Max Kostinevich
-// BETA (no styles)
-// http://pdfmake.org/playground.html
-// playground requires you to assign document definition to a variable called dd
-
-// CodeSandbox Example: https://codesandbox.io/s/pdfmake-invoice-oj81y
-
-
 var docDefinition = {
 	info: {
 		title: '<?php echo "$company_name - Invoice"; ?>',
@@ -791,7 +782,7 @@ var docDefinition = {
 		// Document Footer
 		documentFooterCenter: {
 			fontSize: 9,
-		  margin: [5,5,5,5],
+		  margin: [10,10,10,10],
 		  alignment:'center'
 		},
 		// Invoice Title