Teacher Dashboard Iteration 12 - Cleaning up for demo