fix demo
fix toolbar constraint issues and button widths not setting properly. fixes #460