fix Window menu bug

and better SVG output