[#23] Fix HTML, so it validates.
Merge branch 'bug/23-html-validation' into develop