Refactor ActivitiesList