reorder children

Minor changes to fix DSC-302 and DSC-728