Mixed commit with the refresh control and a few improvements