Fix Text Field Name and autofocus