Demo style fixes and modernisation.