Improve input field