Some UI changes to the demo form