fixing merge conflicts
widen input field for id