Small cleanup + fixup svg charts drawing