Added scroll-tastic scrolling and better movement