Visual improvements on locale switching