Merge pull request #1 from Kazberovich/feature/textfields-tuning

Feature/textfields tuning