Add ScrollTo and clean files