Improve style and add i18n