refactorying navigation maker