More improvements for invoices