Make project navigation work better