merge errors
fix some layout issue in classroom