Change toolbar components to use props.children instead of arrays of js objects as props