Added the invoice panel stuff generically...