Remove use of innerHTML
Merge pull request #948 from markewallace/RemoveMoreInnerHtml

Remove use of innerHTML