Enhance display of the demos