matched profile pic fix
refactored
Merge branch 'frontendAC'