Update markup and structure for conditional country selection