Adds fixes for z-index