Refactored states for course-specific sub-views