Re-arrange dependent fields

It would be good to be able to format the fields to look like the rest for the form rather than all the field just displayed one after another in a single column.