add opt-in for button and lists