Cleaned up set_current_race
Extracted some responsibility for navigation handling to Navigator