add z-index handling