Added labels and i18n for them