Social feed edit

As per the meeting discussion. Let me know if there is a problem.