Updated Form controls