Fixed text field issues