More z-index fixes