refactored EditActivities