minor bug fixes in Form and FormPage