Instructor widget slightly refactored