Added uploading profile picture
Merged with some changes