Improved drawing on Mac