NAVIGATION first step towards fixing the course selection mess. more fixes are in my head, but not done yet