2014.5.23.1206

Modifications to scrolling