clean up and fix bug with scroll position