Improved edit text field

TODO: test