Further changes for the demo (mainly) - new button style