Some UI changes on demo page made