Move initial fields into relevant tabs.