HTML5 tweaks/improvements. Closes #1408

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1409 from Oldiesmann/release-2.1

HTML5 tweaks/improvements. Closes #1408