Merge branch '192-refactor-textfield-to-match-with-old-version' into 'dev'

Resolve "refactor textfield to match with old version"

Closes #192

See merge request !599