Feature/textfields tuning