Improvements to demo page