mega merge. fixed addition of instructor view