Added scroll listener, still buggy