Bug fixes and more work on invoices page