Updates to buttons and demo

Bug fixes, general tidy up