Update to include demo page changes from master branch