Demos: changed buttons to button-markup.