fixing demo and scrolling