Marc: ReDesign of ViewCustomerInvoicePanel2.java