Fixing some scrolling issues