Re-arrange dependent fields

Just wrote support about this and they directed me here. Please implement