Reworked country selection