navigation improvement (but incomplete)