Issues with z-index when drawing geometry and text

This feels familiar, maybe