scroll and vid poster update
merge conflicts