Organize and add window scrolling