Some Fixes to demo page.