Refactored List, rewrite Invoiceform