Improving demo page