Fixed button enabling and updated demo