Partial implementation of scroll down fix and upgrade