stopped scrolling page stuff.
Merge origin/master