Improved drawing order