Navigation bugfixing