Adding demo data & a few minor bug fixes in the default template.