Added a new button type, changed the layout of the demo