fix the scrolling. Need to adjust the positions