Various changes for the invoicing form