Patched many parts of the navigation