refactor textfield to match with old version