Text in place, z-index fixes