simplified the activity feed
Merge branch 'capright' into testing