Add locales, links and routes fixes