Vertical Scrolling fixes