Pedagogy UI fixes continued