Better HTML. Fixes #559