Some improvements to the demo site