Patch 9.9 - Few display and HTML 5 validation fix

Hopefully Final Commit