issue #18864: Move country above state. Tweak CSS.