Added duration and fixed scrolling bug