Updated the country names styles
Refactored the code