More work in invoices views