Fixed profile page
Fixed profile page for users
Merge branch 'JonM' into dev