Refactoring InvoiceStuffPage