Navigation improvements
🧬

Navigation improvements