Improved the form-related code
Fixed a bug