Updated on-scroll events and CSS