(Really) fix endless scrolling & clean up