Improve country edition in admin console