Fixes and improvements

SVG improvements to save client memory, fixed the <div> issue