layouts chore, locale fix