Added validate-fields to form