Moved tokens under correct fieldset.