Refactor navigation concern