Fixed zindex bugs