Changed the demo to use the XML provider, refactored some things, fixed some broken pages in the demo