SVG and HTML clean up