Moved line in BroadcastActivity
Merging xml file changes, FollowActivity, and BroadcastActivity