Making the toolbar more configurable + updating the demo page