Whitespace cleanup
Unescape HTML
Fix toolbar button rendering