Enhancing the demo page