Fix markup to not have . on next line. Add i18n