Renamed Feed to ActivityFeed and moved more logic into it
Improved the ActivityFeed code