Demo page fixup