Updates to layout & forms for generalized data entry