Teacher's front-end fixes.