Refactor navigation from noteIndex