More progress on demo page