refactor navigation-view