Fixed country list, layout changes