Profile logic updated
Merge branch 'back-end' into development
Some minor refactoring