clean up demo templates a bit, improve error message on #View template=X