Improved GraphCanvas