Working on fixing the endless scroll functionality