Improved navigation a bit