[Yujun] Enhanced form control.