Improvements to invoice template