Cleanup: remove grouping elements

[ppetru]

There's a few places where we wrap the output of a component in a div tag just to be able to return multiple elements. React now has native support for this which we should use instead: https://reactjs.org/docs/fragments.html