Small improvements in preparation of scrollable demo