Reworking scene to fix z-ordering problems