Re-arrange dependent fields

Please add this feature, forms are unrefined without it.