some layout problems cleaned + i18n