Demo template tweaks & cleanup. Also closes #76.