Optimize navigation