fixed input fields
merge