Improved drawing for Mavericks