Add ButtonToolbar and improve demo