Fix name and textfield