z-index
other fixes