Added random option; Scroll on update