Fixed HTML validity, closes #61