Some changes to make it easier to have multiple country pages later