Re-work the demo page