Updated Invoicing

Updated Invoicing
and some whitespace changes
can you change these also?