Changes to data entry UI (popup and span class)