Trends/Add Friend/Minor Re-factoring