switch scrolling to container
Merge pull request #176 from jpecht/master

switch scrolling to container