Demo redesign