add classes to improve style and useless update on code to remove i18n