Fix profile screen
Merge branch 'model_refactor' of https://github.com/ubc/acj-versus into model_refactor