Fix overlay issues with z-index