NAVIGATION more fixes for the course selection misery. not yet perfect, but much better