Remove TextField and Select2, add CustomTextField