Refactor Add Activity functionality