Scrolling issue fixed