Some more reorganiation of views/modals

Also, removing tutorials from teacher console. They are out of sync
and no one seems to see them anyway