Improve temporary navigation

fixes #1973