General styling

Improve classroom edit.