Update buttons
updated profile image tag
Merge conflict