Refactoring
Cleanup html, i18n