clean up html and use i18n more