UI for #189

May break courses, who knows...