Third commit, fixed scrolling