Fixed z-index conflict