Improve Strict Navigation