Added country and language formatting, fixed billing fields