Fixed Scrolling Bugs