Fix issues with scrolling