refactor navigation to sythesis like other navigations