Small tweaks to demo editor