added scrollup
refactor scroll transitions