Rework of tooltip and data input masks