Complete redesign of demo