More progress on the demo page