Style bugfix, HTML escaping bugfix