z-position issues fixed