misc demo site improvements (templating, etc)