demo3 fixes, UI changes to class, class_discussion, class_lab