demo page fixes