added scrolling issue fix