Re-arrange dependent fields

Just came across this issue and was just about to suggest the same.

+1 for this quality of life idea