Fix up the country/currency select field interaction