Added user avatar and updated facebook mapping