Fix headers and country selector