Moved duplicate code over to make_navigation_choices function