Switch to new HTML method.
Merge pull request #1 from benjie/htmlfix

Switch to new HTML method.
Whitespace only.
More pleasant appearance.
Add security.