TOP: Better scrollDisabler & small refactoring