Some bug still existed with the z-index