Added reminder to refactor navigation code