Fix teacher views a little and fix the menus