Fixed "form-within-form" issue