Move grouping to own fieldset, rename output, improve static and dynamic XML layouts