Improvements on the billing form