Countries in settings, minor UI changes