Dramatic simplification of demo page