Fix scrolling issues,