Test improved navigation