UI Scrolling fixes