Working on the z-index and positioning of elements to fix this bug