changed: New demo page changes and some small refactorings to the base