Textfield rework