More data entry UI goodness