Re-factoring and fixing the clickable city/countries