changes for activity feed template + implementation of popup