Fixed drawing order, did other... stuff