Fix cliente validation data. Reorder form layout.