Professor page bugs
Merge branch 'vic-MASTERbranch'