Bug fixes with z-index