Demo updates, splitting up buttons