- Course Picker enhancements