Improving HTML and adding translations