Fixed Scrolling bug