Tweaked UI messages and country code