Smooth scroll; optimization and more tidy up.