Faster and clearer invoicing

improved