Demo page fixes