set accurate fields in model and corrected form layout