navigation bugfixes