Fixes some innerHTML usage
Merge pull request #951 from fmoloney/FixInnerHTML

Fixes some innerHTML usage