Demo site improvements