Bug fix and Scroll to added