Improved demo page