Form field required and bug fixes