Demo page fixing