Simplify CSS and fix a z-index issue