fixes on scrolling