Demo button fixes