Changes for Alan & Neal / z-index fix