Shift activity to to 'activity' property