Locales and few template changes