restored ids to link labels to form elements