Added infinite scroll and scrollbar