issue #39, improving HTML