Add button changes (not persistent yet)

@spencereldred