Updated window scroll events