Hopefully fix scrolling
Final commit.