Demo page and other improvements