fix field display and editing