- Optimize Navigation Listener