Updated with i18n fixes and router updates