even better handling of scroll position when saving!