Added SmartScroller and a few other changes