Changes for country Drop down and UI changes