Fixed the demo page to work after the reorganization