Updates to demo page

WIP