Demo page improvements