Added enhanced scrolling