International field corrections
Moved carrier setup section before billing address calcuation