Demos: improvements to header