Fix refactoring

Seems surface should be container - otherwise it throws error `add of
undefined`
Merge pull request #20 from raix/scrollcontainer-refactoring-surface-container

Fix refactoring