fix c5 conflicts, nav z-index