Final fixes for MasterclassPanel
Final fixes for MasterclassPanel