UI tweaks, addition of country codes