Added build for text fields
Added missing autowired