Minor changes and fixes in demo page