form now uses fields from model