Made demo working on /demo/index page;