Complete redone of infinite scroll X & Y