Smooth scrolling; tidy up for PR.