Added the redirect and i18n