Final fixes for MasterclassPanel