Separate Customer Details and Billing Address into separate boxes. #1684