Move update-ctrl and update-scroll to 'the right place'. Fix update-ctrl from operating on wrong x,y.