loads of style changes, totally redoing instructor view(now with class)